Move value type utils to wrapper/utils directory

jvalue · Apr 18, 2024 · 9ae2670 · 9ae2670
1 parent 436e692
commit 9ae2670
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/libs/language-server/src/lib/ast/expressions/type-inference.ts b/libs/language-server/src/lib/ast/expressions/type-inference.ts
@@ -43,7 +43,7 @@ import {
   getValuetypeHierarchyStack,
   pickCommonAtomicValueType,
   pickCommonPrimitiveValuetype,
-} from '../wrappers/value-type/util';
+} from '../wrappers/util/value-type-util';
 
 import { isEveryValueDefined } from './typeguards';
 

diff --git a/libs/language-server/src/lib/ast/wrappers/index.ts b/libs/language-server/src/lib/ast/wrappers/index.ts
@@ -2,6 +2,9 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
+export * from './wrapper-factory-provider';
+export * from './util';
+
 /*
  * Note: Only export types if possible to enforce usage of WrapperFactory outside this directory.
  * This allows us to avoid dependency cycles between the language server and interpreter.
@@ -20,9 +23,11 @@ export { type PipelineWrapper } from './pipeline-wrapper';
 export { type BlockTypeWrapper } from './typed-object/block-type-wrapper';
 export { type CompositeBlockTypeWrapper } from './typed-object/composite-block-type-wrapper';
 export { type ConstraintTypeWrapper } from './typed-object/constrainttype-wrapper';
-export * from './typed-object/typed-object-wrapper';
+export {
+  ExampleDoc,
+  PropertyDocs,
+  PropertySpecification,
+  type TypedObjectWrapper,
+} from './typed-object/typed-object-wrapper';
 
 export * from './value-type'; // type export handled one level deeper
-
-export * from './util';
-export * from './wrapper-factory-provider';
diff --git a/libs/language-server/src/lib/ast/wrappers/util/index.ts b/libs/language-server/src/lib/ast/wrappers/util/index.ts
@@ -5,3 +5,4 @@
 export * from './column-id-util';
 export * from './cell-index';
 export * from './cell-range-util';
+export * from './value-type-util';
diff --git a/...r/src/lib/ast/wrappers/value-type/util.ts → .../lib/ast/wrappers/util/value-type-util.ts b/...r/src/lib/ast/wrappers/value-type/util.ts → .../lib/ast/wrappers/util/value-type-util.ts
@@ -4,9 +4,15 @@
 
 import { strict as assert } from 'assert';
 
-import { type AtomicValueType, isAtomicValueType } from './atomic-value-type';
-import { type PrimitiveValueType, isPrimitiveValueType } from './primitive';
-import { type ValueType } from './value-type';
+import {
+  type AtomicValueType,
+  isAtomicValueType,
+} from '../value-type/atomic-value-type';
+import {
+  type PrimitiveValueType,
+  isPrimitiveValueType,
+} from '../value-type/primitive';
+import { type ValueType } from '../value-type/value-type';
 
 type ValuetypeHierarchyStack = [PrimitiveValueType, ...AtomicValueType[]];
 

diff --git a/libs/language-server/src/lib/ast/wrappers/value-type/index.ts b/libs/language-server/src/lib/ast/wrappers/value-type/index.ts
@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-export * from './util';
-
 /*
  * Note: Only export types if possible to enforce usage of WrapperFactory outside this directory.
  * This allows us to avoid dependency cycles between the language server and interpreter.