Remove Import Cycle for ValueTypes

apps/docs/generator/src/main.ts

@@ -7,7 +7,6 @@ import { join } from 'path';
 
 import {
   type JayveeServices,
-  PrimitiveValuetypes,
   createJayveeServices,
   getAllBuiltinBlockTypes,
   getAllBuiltinConstraintTypes,
@@ -102,8 +101,9 @@ function generateValueTypeDocs(
     'value-types',
   );
   const userDocBuilder = new UserDocGenerator(services);
-  const valueTypeDoc =
-    userDocBuilder.generateValueTypesDoc(PrimitiveValuetypes);
+  const valueTypeDoc = userDocBuilder.generateValueTypesDoc(
+    services.ValueTypeProvider.Primitives.getAll(),
+  );
 
   const fileName = `built-in-value-types.md`;
   writeFileSync(join(docsPath, fileName), valueTypeDoc, {

apps/docs/generator/src/user-doc-generator.ts

@@ -26,9 +26,7 @@ export class UserDocGenerator
 {
   constructor(private services: JayveeServices) {}
 
-  generateValueTypesDoc(
-    valueTypes: Record<string, PrimitiveValueType>,
-  ): string {
+  generateValueTypesDoc(valueTypes: PrimitiveValueType[]): string {
     const builder = new UserDocMarkdownBuilder()
       .docTitle('Built-in Value Types')
       .generationComment()
@@ -42,16 +40,15 @@ that fullfil [_constraints_](./primitive-value-types#constraints).`.trim(),
       )
       .heading('Available built-in value types', 1);
 
-    Object.entries(valueTypes)
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      .filter(([_, valueType]) => valueType.isReferenceableByUser())
-      .forEach(([name, valueType]) => {
+    valueTypes
+      .filter((valueType) => valueType.isReferenceableByUser())
+      .forEach((valueType) => {
         assert(
           valueType.getUserDoc(),
           `Documentation is missing for user extendable value type: ${valueType.getName()}`,
         );
         builder
-          .heading(name, 2)
+          .heading(valueType.getName(), 2)
           .description(valueType.getUserDoc() ?? '', 3)
           .examples(
             [

libs/execution/src/lib/blocks/composite-block-executor.ts

@@ -14,7 +14,6 @@ import {
   type InternalValueRepresentation,
   type ValueType,
   type WrapperFactoryProvider,
-  createValueType,
   evaluateExpression,
   evaluatePropertyValue,
   getIOType,
@@ -121,7 +120,9 @@ export function createCompositeBlockExecutor(
       context: ExecutionContext,
     ) {
       properties.forEach((blockTypeProperty) => {
-        const valueType = createValueType(blockTypeProperty.valueType);
+        const valueType = context.wrapperFactories.ValueType.wrap(
+          blockTypeProperty.valueType,
+        );
 
         assert(
           valueType,

libs/execution/src/lib/constraints/executors/allowlist-constraint-executor.spec.ts

@@ -5,6 +5,7 @@
 import {
   type BlockDefinition,
   type InternalValueRepresentation,
+  type JayveeServices,
   type TypedConstraintDefinition,
   createJayveeServices,
 } from '@jvalue/jayvee-language-server';
@@ -32,6 +33,7 @@ describe('Validation of AllowlistConstraintExecutor', () => {
   ) => Promise<LangiumDocument<AstNode>>;
 
   let locator: AstNodeLocator;
+  let services: JayveeServices;
 
   const readJvTestAsset = readJvTestAssetHelper(
     __dirname,
@@ -57,13 +59,16 @@ describe('Validation of AllowlistConstraintExecutor', () => {
     return new AllowlistConstraintExecutor().isValid(
       value,
       // Execution context with initial stack containing usage block of constraint and constraint itself
-      getTestExecutionContext(locator, document, [usageBlock, constraint]),
+      getTestExecutionContext(locator, document, services, [
+        usageBlock,
+        constraint,
+      ]),
     );
   }
 
   beforeAll(() => {
     // Create language services
-    const services = createJayveeServices(NodeFileSystem).Jayvee;
+    services = createJayveeServices(NodeFileSystem).Jayvee;
     locator = services.workspace.AstNodeLocator;
     // Parse function for Jayvee (without validation)
     parse = parseHelper(services);

libs/execution/src/lib/constraints/executors/allowlist-constraint-executor.ts

@@ -2,11 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import {
-  CollectionValuetype,
-  type InternalValueRepresentation,
-  PrimitiveValuetypes,
-} from '@jvalue/jayvee-language-server';
+import { type InternalValueRepresentation } from '@jvalue/jayvee-language-server';
 
 import { type ExecutionContext } from '../../execution-context';
 import { implementsStatic } from '../../util/implements-static-decorator';
@@ -27,7 +23,9 @@ export class AllowlistConstraintExecutor implements ConstraintExecutor {
 
     const allowlist = context.getPropertyValue(
       'allowlist',
-      new CollectionValuetype(PrimitiveValuetypes.Text),
+      context.valueTypeProvider.createCollectionValueTypeOf(
+        context.valueTypeProvider.Primitives.Text,
+      ),
     );
     return allowlist.includes(value);
   }

libs/execution/src/lib/constraints/executors/denylist-constraint-executor.spec.ts

@@ -5,6 +5,7 @@
 import {
   type BlockDefinition,
   type InternalValueRepresentation,
+  type JayveeServices,
   type TypedConstraintDefinition,
   createJayveeServices,
 } from '@jvalue/jayvee-language-server';
@@ -32,6 +33,7 @@ describe('Validation of DenylistConstraintExecutor', () => {
   ) => Promise<LangiumDocument<AstNode>>;
 
   let locator: AstNodeLocator;
+  let services: JayveeServices;
 
   const readJvTestAsset = readJvTestAssetHelper(
     __dirname,
@@ -57,13 +59,16 @@ describe('Validation of DenylistConstraintExecutor', () => {
     return new DenylistConstraintExecutor().isValid(
       value,
       // Execution context with initial stack containing usage block of constraint and constraint itself
-      getTestExecutionContext(locator, document, [usageBlock, constraint]),
+      getTestExecutionContext(locator, document, services, [
+        usageBlock,
+        constraint,
+      ]),
     );
   }
 
   beforeAll(() => {
     // Create language services
-    const services = createJayveeServices(NodeFileSystem).Jayvee;
+    services = createJayveeServices(NodeFileSystem).Jayvee;
     locator = services.workspace.AstNodeLocator;
     // Parse function for Jayvee (without validation)
     parse = parseHelper(services);

libs/execution/src/lib/constraints/executors/denylist-constraint-executor.ts

@@ -2,11 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import {
-  CollectionValuetype,
-  type InternalValueRepresentation,
-  PrimitiveValuetypes,
-} from '@jvalue/jayvee-language-server';
+import { type InternalValueRepresentation } from '@jvalue/jayvee-language-server';
 
 import { type ExecutionContext } from '../../execution-context';
 import { implementsStatic } from '../../util/implements-static-decorator';
@@ -27,7 +23,9 @@ export class DenylistConstraintExecutor implements ConstraintExecutor {
 
     const denylist = context.getPropertyValue(
       'denylist',
-      new CollectionValuetype(PrimitiveValuetypes.Text),
+      context.valueTypeProvider.createCollectionValueTypeOf(
+        context.valueTypeProvider.Primitives.Text,
+      ),
     );
     return !denylist.includes(value);
   }

libs/execution/src/lib/constraints/executors/expression-constraint-executor.spec.ts

@@ -6,6 +6,7 @@ import {
   type BlockDefinition,
   type ExpressionConstraintDefinition,
   type InternalValueRepresentation,
+  type JayveeServices,
   createJayveeServices,
 } from '@jvalue/jayvee-language-server';
 import {
@@ -32,6 +33,7 @@ describe('Validation of AllowlistConstraintExecutor', () => {
   ) => Promise<LangiumDocument<AstNode>>;
 
   let locator: AstNodeLocator;
+  let services: JayveeServices;
 
   const readJvTestAsset = readJvTestAssetHelper(
     __dirname,
@@ -57,13 +59,16 @@ describe('Validation of AllowlistConstraintExecutor', () => {
     return new ExpressionConstraintExecutor(constraint).isValid(
       value,
       // Execution context with initial stack containing usage block of constraint and constraint itself
-      getTestExecutionContext(locator, document, [usageBlock, constraint]),
+      getTestExecutionContext(locator, document, services, [
+        usageBlock,
+        constraint,
+      ]),
     );
   }
 
   beforeAll(() => {
     // Create language services
-    const services = createJayveeServices(NodeFileSystem).Jayvee;
+    services = createJayveeServices(NodeFileSystem).Jayvee;
     locator = services.workspace.AstNodeLocator;
     // Parse function for Jayvee (without validation)
     parse = parseHelper(services);

libs/execution/src/lib/constraints/executors/expression-constraint-executor.ts

@@ -8,7 +8,6 @@ import {
   type AstNodeWrapper,
   type ExpressionConstraintDefinition,
   type InternalValueRepresentation,
-  PrimitiveValuetypes,
   evaluateExpression,
 } from '@jvalue/jayvee-language-server';
 
@@ -33,7 +32,11 @@ export class ExpressionConstraintExecutor
       context.evaluationContext,
       context.wrapperFactories,
     );
-    assert(PrimitiveValuetypes.Boolean.isInternalValueRepresentation(result));
+    assert(
+      context.valueTypeProvider.Primitives.Boolean.isInternalValueRepresentation(
+        result,
+      ),
+    );
 
     context.evaluationContext.deleteValueForValueKeyword();
 

libs/execution/src/lib/constraints/executors/length-constraint-executor.spec.ts

@@ -5,6 +5,7 @@
 import {
   type BlockDefinition,
   type InternalValueRepresentation,
+  type JayveeServices,
   type TypedConstraintDefinition,
   createJayveeServices,
 } from '@jvalue/jayvee-language-server';
@@ -32,6 +33,7 @@ describe('Validation of LengthConstraintExecutor', () => {
   ) => Promise<LangiumDocument<AstNode>>;
 
   let locator: AstNodeLocator;
+  let services: JayveeServices;
 
   const readJvTestAsset = readJvTestAssetHelper(
     __dirname,
@@ -57,13 +59,16 @@ describe('Validation of LengthConstraintExecutor', () => {
     return new LengthConstraintExecutor().isValid(
       value,
       // Execution context with initial stack containing usage block of constraint and constraint itself
-      getTestExecutionContext(locator, document, [usageBlock, constraint]),
+      getTestExecutionContext(locator, document, services, [
+        usageBlock,
+        constraint,
+      ]),
     );
   }
 
   beforeAll(() => {
     // Create language services
-    const services = createJayveeServices(NodeFileSystem).Jayvee;
+    services = createJayveeServices(NodeFileSystem).Jayvee;
     locator = services.workspace.AstNodeLocator;
     // Parse function for Jayvee (without validation)
     parse = parseHelper(services);

libs/execution/src/lib/constraints/executors/length-constraint-executor.ts

@@ -2,10 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import {
-  type InternalValueRepresentation,
-  PrimitiveValuetypes,
-} from '@jvalue/jayvee-language-server';
+import { type InternalValueRepresentation } from '@jvalue/jayvee-language-server';
 
 import { type ExecutionContext } from '../../execution-context';
 import { implementsStatic } from '../../util/implements-static-decorator';
@@ -26,11 +23,11 @@ export class LengthConstraintExecutor implements ConstraintExecutor {
 
     const minLength = context.getPropertyValue(
       'minLength',
-      PrimitiveValuetypes.Integer,
+      context.valueTypeProvider.Primitives.Integer,
     );
     const maxLength = context.getPropertyValue(
       'maxLength',
-      PrimitiveValuetypes.Integer,
+      context.valueTypeProvider.Primitives.Integer,
     );
 
     return minLength <= value.length && value.length <= maxLength;

libs/execution/src/lib/constraints/executors/range-constraint-executor.spec.ts

@@ -5,6 +5,7 @@
 import {
   type BlockDefinition,
   type InternalValueRepresentation,
+  type JayveeServices,
   type TypedConstraintDefinition,
   createJayveeServices,
   initializeWorkspace,
@@ -33,6 +34,7 @@ describe('Validation of RangeConstraintExecutor', () => {
   ) => Promise<LangiumDocument<AstNode>>;
 
   let locator: AstNodeLocator;
+  let services: JayveeServices;
 
   const readJvTestAsset = readJvTestAssetHelper(
     __dirname,
@@ -58,13 +60,16 @@ describe('Validation of RangeConstraintExecutor', () => {
     return new RangeConstraintExecutor().isValid(
       value,
       // Execution context with initial stack containing usage block of constraint and constraint itself
-      getTestExecutionContext(locator, document, [usageBlock, constraint]),
+      getTestExecutionContext(locator, document, services, [
+        usageBlock,
+        constraint,
+      ]),
     );
   }
 
   beforeAll(async () => {
     // Create language services
-    const services = createJayveeServices(NodeFileSystem).Jayvee;
+    services = createJayveeServices(NodeFileSystem).Jayvee;
     await initializeWorkspace(services);
 
     locator = services.workspace.AstNodeLocator;

libs/execution/src/lib/constraints/executors/range-constraint-executor.ts

@@ -2,10 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import {
-  type InternalValueRepresentation,
-  PrimitiveValuetypes,
-} from '@jvalue/jayvee-language-server';
+import { type InternalValueRepresentation } from '@jvalue/jayvee-language-server';
 
 import { type ExecutionContext } from '../../execution-context';
 import { implementsStatic } from '../../util/implements-static-decorator';
@@ -31,19 +28,19 @@ export class RangeConstraintExecutor implements ConstraintExecutor {
 
     const lowerBound = context.getPropertyValue(
       'lowerBound',
-      PrimitiveValuetypes.Decimal,
+      context.valueTypeProvider.Primitives.Decimal,
     );
     const lowerBoundInclusive = context.getPropertyValue(
       'lowerBoundInclusive',
-      PrimitiveValuetypes.Boolean,
+      context.valueTypeProvider.Primitives.Boolean,
     );
     const upperBound = context.getPropertyValue(
       'upperBound',
-      PrimitiveValuetypes.Decimal,
+      context.valueTypeProvider.Primitives.Decimal,
     );
     const upperBoundInclusive = context.getPropertyValue(
       'upperBoundInclusive',
-      PrimitiveValuetypes.Boolean,
+      context.valueTypeProvider.Primitives.Boolean,
     );
 
     const lowerBoundFulfilled = lowerBoundInclusive