Inject evaluator and type-computer registry as service

jvalue · Apr 2, 2024 · e593726 · e593726
1 parent ea89232
commit e593726
Show file tree

Hide file tree

Showing 43 changed files with 413 additions and 219 deletions.
diff --git a/libs/execution/test/utils/test-infrastructure-util.ts b/libs/execution/test/utils/test-infrastructure-util.ts
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import {
+  DefaultExpressionEvaluatorRegistry,
   EvaluationContext,
   PipelineDefinition,
   RuntimeParameterProvider,
@@ -61,7 +62,10 @@ export function getTestExecutionContext(
     new DefaultConstraintExtension(),
     new CachedLogger(runOptions.isDebugMode, undefined, loggerPrintLogs),
     runOptions,
-    new EvaluationContext(new RuntimeParameterProvider()),
+    new EvaluationContext(
+      new RuntimeParameterProvider(),
+      new DefaultExpressionEvaluatorRegistry(),
+    ),
   );
 
   initialStack.forEach((node) => executionContext.enterNode(node));

diff --git a/libs/interpreter-lib/src/interpreter.ts b/libs/interpreter-lib/src/interpreter.ts
@@ -136,7 +136,7 @@ export async function interpretModel(
     model,
     new StdExecExtension(),
     new DefaultConstraintExtension(),
-    services.RuntimeParameterProvider,
+    services,
     loggerFactory,
     {
       debug: options.debug,
@@ -177,7 +177,7 @@ async function interpretJayveeModel(
   model: JayveeModel,
   executionExtension: JayveeExecExtension,
   constraintExtension: JayveeConstraintExtension,
-  runtimeParameterProvider: RuntimeParameterProvider,
+  jayveeServices: JayveeServices,
   loggerFactory: LoggerFactory,
   runOptions: InterpreterOptions,
 ): Promise<ExitCode> {
@@ -186,7 +186,7 @@ async function interpretJayveeModel(
       pipeline,
       executionExtension,
       constraintExtension,
-      runtimeParameterProvider,
+      jayveeServices,
       loggerFactory,
       runOptions,
     );
@@ -203,7 +203,7 @@ async function runPipeline(
   pipeline: PipelineDefinition,
   executionExtension: JayveeExecExtension,
   constraintExtension: JayveeConstraintExtension,
-  runtimeParameterProvider: RuntimeParameterProvider,
+  jayveeServices: JayveeServices,
   loggerFactory: LoggerFactory,
   runOptions: InterpreterOptions,
 ): Promise<ExitCode> {
@@ -217,12 +217,15 @@ async function runPipeline(
       debugGranularity: runOptions.debugGranularity,
       debugTargets: runOptions.debugTargets,
     },
-    new EvaluationContext(runtimeParameterProvider),
+    new EvaluationContext(
+      jayveeServices.RuntimeParameterProvider,
+      jayveeServices.operators.ExpressionEvaluatorRegistry,
+    ),
   );
 
   logPipelineOverview(
     pipeline,
-    runtimeParameterProvider,
+    jayveeServices.RuntimeParameterProvider,
     executionContext.logger,
   );
 

diff --git a/libs/interpreter-lib/src/validation-checks/runtime-parameter-literal.spec.ts b/libs/interpreter-lib/src/validation-checks/runtime-parameter-literal.spec.ts
@@ -6,6 +6,8 @@ import * as path from 'path';
 
 import { parseValueToInternalRepresentation } from '@jvalue/jayvee-execution';
 import {
+  DefaultExpressionEvaluatorRegistry,
+  DefaultTypeComputerRegistry,
   EvaluationContext,
   RuntimeParameterLiteral,
   RuntimeParameterProvider,
@@ -62,8 +64,14 @@ describe('Validation of validateRuntimeParameterLiteral', () => {
 
     validateRuntimeParameterLiteral(
       runtimeParameter,
-      new ValidationContext(validationAcceptorMock),
-      new EvaluationContext(runtimeProvider),
+      new ValidationContext(
+        validationAcceptorMock,
+        new DefaultTypeComputerRegistry(),
+      ),
+      new EvaluationContext(
+        runtimeProvider,
+        new DefaultExpressionEvaluatorRegistry(),
+      ),
     );
   }
 

diff --git a/libs/language-server/src/lib/ast/expressions/evaluate-expression.ts b/libs/language-server/src/lib/ast/expressions/evaluate-expression.ts
@@ -26,11 +26,6 @@ import { CellRangeWrapper, Valuetype } from '../wrappers';
 import { type EvaluationContext } from './evaluation-context';
 import { EvaluationStrategy } from './evaluation-strategy';
 import { type InternalValueRepresentation } from './internal-value-representation';
-import {
-  binaryOperatorRegistry,
-  ternaryOperatorRegistry,
-  unaryOperatorRegistry,
-} from './operator-registry';
 import { isEveryValueDefined } from './typeguards';
 
 export function evaluatePropertyValue<T extends InternalValueRepresentation>(
@@ -101,17 +96,17 @@ export function evaluateExpression(
   }
   if (isUnaryExpression(expression)) {
     const operator = expression.operator;
-    const evaluator = unaryOperatorRegistry[operator].evaluation;
+    const evaluator = evaluationContext.operatorRegistry.unary[operator];
     return evaluator.evaluate(expression, evaluationContext, strategy, context);
   }
   if (isBinaryExpression(expression)) {
     const operator = expression.operator;
-    const evaluator = binaryOperatorRegistry[operator].evaluation;
+    const evaluator = evaluationContext.operatorRegistry.binary[operator];
     return evaluator.evaluate(expression, evaluationContext, strategy, context);
   }
   if (isTernaryExpression(expression)) {
     const operator = expression.operator;
-    const evaluator = ternaryOperatorRegistry[operator].evaluation;
+    const evaluator = evaluationContext.operatorRegistry.ternary[operator];
     return evaluator.evaluate(expression, evaluationContext, strategy, context);
   }
   assertUnreachable(expression);

diff --git a/libs/language-server/src/lib/ast/expressions/evaluation-context.ts b/libs/language-server/src/lib/ast/expressions/evaluation-context.ts
@@ -19,10 +19,12 @@ import {
   isTransformPortDefinition,
   isValueKeywordLiteral,
 } from '../generated/ast';
+// eslint-disable-next-line import/no-cycle
 import { PrimitiveValuetypes } from '../wrappers/value-type/primitive/primitive-valuetypes';
 import { type Valuetype } from '../wrappers/value-type/valuetype';
 
 import { type InternalValueRepresentation } from './internal-value-representation';
+import { type ExpressionEvaluatorRegistry } from './operator-registry';
 
 export class EvaluationContext {
   private readonly variableValues = new Map<
@@ -34,6 +36,7 @@ export class EvaluationContext {
 
   constructor(
     public readonly runtimeParameterProvider: RuntimeParameterProvider,
+    public readonly operatorRegistry: ExpressionEvaluatorRegistry,
   ) {}
 
   getValueFor(

diff --git a/libs/language-server/src/lib/ast/expressions/index.ts b/libs/language-server/src/lib/ast/expressions/index.ts
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 export * from './evaluation-strategy';
+// eslint-disable-next-line import/no-cycle
 export * from './evaluation-context';
 export * from './internal-value-representation';
 export * from './operator-registry';

diff --git a/libs/language-server/src/lib/ast/expressions/operator-evaluator.ts b/libs/language-server/src/lib/ast/expressions/operator-evaluator.ts
@@ -11,6 +11,7 @@ import {
   type UnaryExpression,
 } from '../generated/ast';
 
+// eslint-disable-next-line import/no-cycle
 import { evaluateExpression } from './evaluate-expression';
 import { type EvaluationContext } from './evaluation-context';
 import { EvaluationStrategy } from './evaluation-strategy';
@@ -230,7 +231,6 @@ export abstract class DefaultTernaryOperatorEvaluator<
       validationContext,
       strategy,
     );
-    EvaluationContext
 
     const secondValue = evaluateExpression(
       expression.second,