Extract expression evaluators to utils package

jitsedesmet · Oct 8, 2024 · 1320785 · 1320785
1 parent 35fe59c
commit 1320785
Show file tree

Hide file tree

Showing 532 changed files with 1,046 additions and 1,127 deletions.
diff --git a/.componentsjs-generator-config.json b/.componentsjs-generator-config.json
@@ -13,6 +13,7 @@
     "packages/statistic-base",
     "packages/statistic-link-dereference",
     "packages/statistic-link-discovery",
+    "packages/utils-expression-evaluator",
     "packages/utils-bindings-factory",
     "packages/utils-bindings-index",
     "packages/utils-data-factory",
@@ -82,106 +83,7 @@
     "ExpressionEvaluator",
     "AggregateEvaluator",
     "ExpressionFunctionBase",
-    "TermFunctionBase",
-
-    "TermTransformer",
-    "IInternalEvaluator",
-    "FunctionApplication",
-    "IEvalContext",
-    "OverloadTree",
-    "FunctionArgumentsCache",
-    "prepareEvaluatorActionContext",
-    "declare",
-    "bool",
-    "string",
-    "double",
-    "integer",
-    "dateTime",
-    "langString",
-    "decimal",
-    "float",
-    "expressionToVar",
-    "Builder",
-    "ExpressionError",
-    "isExpressionError",
-    "EmptyAggregateError",
-    "RDFEqualTypeError",
-    "IncompatibleLanguageOperation",
-    "InvalidTimezoneCall",
-    "InvalidArgumentTypes",
-    "CoalesceError",
-    "InError",
-    "NoAggregator",
-    "UnboundVariableError",
-    "CastError",
-    "ExtensionFunctionError",
-    "InvalidLexicalForm",
-    "InvalidArity",
-    "UnknownOperator",
-    "typedLiteral",
-    "TypeURL",
-    "TypeAlias",
-    "SparqlOperator",
-    "SparqlOperators",
-    "NamedOperator",
-    "GeneralOperator",
-    "KnownOperator",
-    "KnownLiteralTypes",
-    "isSubTypeOf",
-    "dayTimeDurationsToSeconds",
-    "defaultedDateTimeRepresentation",
-    "defaultedDayTimeDurationRepresentation",
-    "defaultedDurationRepresentation",
-    "defaultedYearMonthDurationRepresentation",
-    "extractRawTimeZone",
-    "negateDuration",
-    "toDateTimeRepresentation",
-    "toUTCDate",
-    "yearMonthDurationsToMonths",
-    "DateTimeLiteral",
-    "DayTimeDurationLiteral",
-    "DateLiteral",
-    "DurationLiteral",
-    "TimeLiteral",
-    "LangStringLiteral",
-    "Term",
-    "YearMonthDurationLiteral",
-    "Quad",
-    "Operator",
-    "NamedNode",
-    "Variable",
-    "NumericLiteral",
-    "BooleanLiteral",
-    "BlankNode",
-    "DecimalLiteral",
-    "DefaultGraph",
-    "DoubleLiteral",
-    "Aggregate",
-    "Existence",
-    "ExpressionType",
-    "Literal",
-    "IntegerLiteral",
-    "FloatLiteral",
-    "NonLexicalLiteral",
-    "StringLiteral",
-    "TermExpression",
-    "VariableExpression",
-    "Expression",
-    "isNonLexicalLiteral",
-    "OperatorExpression",
-    "addDurationToDateTime",
-    "elapsedDuration",
-    "parseDateTime",
-    "parseDayTimeDuration",
-    "parseDuration",
-    "parseTime",
-    "parseYearMonthDuration",
-    "parseXSDDecimal",
-    "parseXSDFloat",
-    "parseXSDInteger",
-    "parseDate",
-    "trimToYearMonthDuration",
-    "trimToDayTimeDuration"
+    "TermFunctionBase"
   ],
   "modulePrefix": {
     "@comunica/actor-query-operation-service": "caqoser",

diff --git a/jest.config.ts b/jest.config.ts
@@ -39,7 +39,7 @@ const config: Config.InitialOptions = {
       transform,
       coveragePathIgnorePatterns: [
         '<rootDir>/engines/query-sparql/test/util.ts',
-        '<rootDir>/packages/expression-evaluator/test/util/',
+        '<rootDir>/packages/utils-expression-evaluator/test/util/',
         'engine-default.js',
         'index.js',
         'node_modules',

diff --git a/...es/actor-bindings-aggregator-factory-average/lib/ActorBindingsAggregatorFactoryAverage.ts b/...es/actor-bindings-aggregator-factory-average/lib/ActorBindingsAggregatorFactoryAverage.ts
@@ -9,7 +9,7 @@ import type { MediatorFunctionFactory, MediatorFunctionFactoryUnsafe } from '@co
 import { KeysInitQuery } from '@comunica/context-entries';
 import type { IActorTest, TestResult } from '@comunica/core';
 import { failTest, passTestVoid } from '@comunica/core';
-import { SparqlOperator } from '@comunica/expression-evaluator';
+import { SparqlOperator } from '@comunica/utils-expression-evaluator';
 import { AverageAggregator } from './AverageAggregator';
 
 export interface IActorBindingsAggregatorFactoryAverageArgs extends IActorBindingsAggregatorFactoryArgs {

diff --git a/packages/actor-bindings-aggregator-factory-average/lib/AverageAggregator.ts b/packages/actor-bindings-aggregator-factory-average/lib/AverageAggregator.ts
@@ -1,9 +1,8 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import { AggregateEvaluator } from '@comunica/bus-bindings-aggregator-factory';
 import type { ITermFunction } from '@comunica/bus-function-factory';
-import type { IExpressionEvaluator } from '@comunica/expression-evaluator';
-import * as Eval from '@comunica/expression-evaluator';
-import type { ComunicaDataFactory } from '@comunica/types';
+import type { ComunicaDataFactory, IExpressionEvaluator } from '@comunica/types';
+import * as Eval from '@comunica/utils-expression-evaluator';
 import type * as RDF from '@rdfjs/types';
 
 interface IAverageState {

diff --git a/packages/actor-bindings-aggregator-factory-average/package.json b/packages/actor-bindings-aggregator-factory-average/package.json
@@ -41,8 +41,8 @@
     "@comunica/bus-function-factory": "^3.2.1",
     "@comunica/context-entries": "^3.2.1",
     "@comunica/core": "^3.2.1",
-    "@comunica/expression-evaluator": "^3.2.1",
     "@comunica/types": "^3.2.1",
+    "@comunica/utils-expression-evaluator": "^3.2.1",
     "@rdfjs/types": "*"
   }
 }
diff --git a/...or-bindings-aggregator-factory-average/test/ActorBindingsAggregatorFactoryAverage-test.ts b/...or-bindings-aggregator-factory-average/test/ActorBindingsAggregatorFactoryAverage-test.ts
@@ -5,8 +5,13 @@ import type { MediatorFunctionFactory } from '@comunica/bus-function-factory';
 import { createFuncMediator } from '@comunica/bus-function-factory/test/util';
 import { Bus } from '@comunica/core';
 import type { IActionContext } from '@comunica/types';
-import { getMockEEActionContext, getMockMediatorExpressionEvaluatorFactory, makeAggregate } from '@comunica/utils-jest';
+import {
+  getMockEEActionContext,
+  getMockMediatorExpressionEvaluatorFactory,
+  makeAggregate,
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import { ActorBindingsAggregatorFactoryAverage } from '../lib';
+import '@comunica/utils-jest';
 
 describe('ActorBindingsAggregatorFactoryAverage', () => {
   let bus: any;

diff --git a/packages/actor-bindings-aggregator-factory-average/test/AverageAggregator-test.ts b/packages/actor-bindings-aggregator-factory-average/test/AverageAggregator-test.ts
@@ -5,8 +5,8 @@ import type { ActorExpressionEvaluatorFactory } from '@comunica/bus-expression-e
 import type { MediatorFunctionFactory } from '@comunica/bus-function-factory';
 import { createFuncMediator } from '@comunica/bus-function-factory/test/util';
 import { KeysInitQuery } from '@comunica/context-entries';
-import { SparqlOperator } from '@comunica/expression-evaluator';
 import type { IActionContext } from '@comunica/types';
+import { SparqlOperator } from '@comunica/utils-expression-evaluator';
 import {
   BF,
   decimal,
@@ -17,7 +17,7 @@ import {
   getMockEEFactory,
   int,
   makeAggregate,
-} from '@comunica/utils-jest';
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import type * as RDF from '@rdfjs/types';
 import { AverageAggregator } from '../lib/AverageAggregator';
 

diff --git a/packages/actor-bindings-aggregator-factory-count/lib/CountAggregator.ts b/packages/actor-bindings-aggregator-factory-count/lib/CountAggregator.ts
@@ -1,7 +1,7 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import { AggregateEvaluator } from '@comunica/bus-bindings-aggregator-factory';
-import type { IExpressionEvaluator } from '@comunica/expression-evaluator';
-import { typedLiteral, TypeURL } from '@comunica/expression-evaluator';
+import type { IExpressionEvaluator } from '@comunica/types';
+import { typedLiteral, TypeURL } from '@comunica/utils-expression-evaluator';
 import type * as RDF from '@rdfjs/types';
 
 export class CountAggregator extends AggregateEvaluator implements IBindingsAggregator {

diff --git a/packages/actor-bindings-aggregator-factory-count/package.json b/packages/actor-bindings-aggregator-factory-count/package.json
@@ -39,7 +39,8 @@
   "dependencies": {
     "@comunica/bus-bindings-aggregator-factory": "^3.2.1",
     "@comunica/core": "^3.2.1",
-    "@comunica/expression-evaluator": "^3.2.1",
+    "@comunica/types": "^3.2.1",
+    "@comunica/utils-expression-evaluator": "^3.2.1",
     "@rdfjs/types": "*",
     "sparqlalgebrajs": "^4.2.0"
   }

diff --git a/.../actor-bindings-aggregator-factory-count/test/ActorBindingsAggregatorFactoryCount-test.ts b/.../actor-bindings-aggregator-factory-count/test/ActorBindingsAggregatorFactoryCount-test.ts
@@ -3,10 +3,15 @@ import type {
 } from '@comunica/bus-expression-evaluator-factory';
 import { Bus } from '@comunica/core';
 import type { IActionContext } from '@comunica/types';
-import { getMockEEActionContext, getMockMediatorExpressionEvaluatorFactory, makeAggregate } from '@comunica/utils-jest';
+import {
+  getMockEEActionContext,
+  getMockMediatorExpressionEvaluatorFactory,
+  makeAggregate,
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import { Algebra } from 'sparqlalgebrajs';
 import { Wildcard } from 'sparqljs';
 import { ActorBindingsAggregatorFactoryCount } from '../lib';
+import '@comunica/utils-jest';
 
 describe('ActorExpressionEvaluatorAggregateCount', () => {
   let bus: any;

diff --git a/packages/actor-bindings-aggregator-factory-count/test/CountAggregator-test.ts b/packages/actor-bindings-aggregator-factory-count/test/CountAggregator-test.ts
@@ -1,7 +1,14 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import type { ActorExpressionEvaluatorFactory } from '@comunica/bus-expression-evaluator-factory';
 import type { IActionContext } from '@comunica/types';
-import { BF, DF, getMockEEActionContext, getMockEEFactory, int, makeAggregate } from '@comunica/utils-jest';
+import {
+  BF,
+  DF,
+  getMockEEActionContext,
+  getMockEEFactory,
+  int,
+  makeAggregate,
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import type * as RDF from '@rdfjs/types';
 import { CountAggregator } from '../lib';
 

diff --git a/packages/actor-bindings-aggregator-factory-group-concat/lib/GroupConcatAggregator.ts b/packages/actor-bindings-aggregator-factory-group-concat/lib/GroupConcatAggregator.ts
@@ -1,7 +1,7 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import { AggregateEvaluator } from '@comunica/bus-bindings-aggregator-factory';
-import * as Eval from '@comunica/expression-evaluator';
-import type { ComunicaDataFactory } from '@comunica/types';
+import type { ComunicaDataFactory, IExpressionEvaluator } from '@comunica/types';
+import * as Eval from '@comunica/utils-expression-evaluator';
 import type * as RDF from '@rdfjs/types';
 
 export class GroupConcatAggregator extends AggregateEvaluator implements IBindingsAggregator {
@@ -11,7 +11,7 @@ export class GroupConcatAggregator extends AggregateEvaluator implements IBindin
   private readonly separator: string;
 
   public constructor(
-    evaluator: Eval.IExpressionEvaluator,
+    evaluator: IExpressionEvaluator,
     distinct: boolean,
     private readonly dataFactory: ComunicaDataFactory,
     separator?: string,

diff --git a/packages/actor-bindings-aggregator-factory-group-concat/package.json b/packages/actor-bindings-aggregator-factory-group-concat/package.json
@@ -40,8 +40,8 @@
     "@comunica/bus-bindings-aggregator-factory": "^3.2.1",
     "@comunica/context-entries": "^3.2.1",
     "@comunica/core": "^3.2.1",
-    "@comunica/expression-evaluator": "^3.2.1",
     "@comunica/types": "^3.2.1",
+    "@comunica/utils-expression-evaluator": "^3.2.1",
     "@rdfjs/types": "*"
   }
 }
diff --git a/...gs-aggregator-factory-group-concat/test/ActorBindingsAggregatorFactoryGroupConcat-test.ts b/...gs-aggregator-factory-group-concat/test/ActorBindingsAggregatorFactoryGroupConcat-test.ts
@@ -7,9 +7,10 @@ import {
   getMockEEActionContext,
   getMockMediatorExpressionEvaluatorFactory,
   makeAggregate,
-} from '@comunica/utils-jest';
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import { ArrayIterator } from 'asynciterator';
 import { ActorBindingsAggregatorFactoryGroupConcat } from '../lib';
+import '@comunica/utils-jest';
 
 describe('ActorBindingsAggregatorFactoryGroupConcat', () => {
   let bus: any;

diff --git a/packages/actor-bindings-aggregator-factory-group-concat/test/GroupConcatAggregator-test.ts b/packages/actor-bindings-aggregator-factory-group-concat/test/GroupConcatAggregator-test.ts
@@ -2,7 +2,14 @@ import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-fact
 import type { ActorExpressionEvaluatorFactory } from '@comunica/bus-expression-evaluator-factory';
 import { KeysInitQuery } from '@comunica/context-entries';
 import type { IActionContext } from '@comunica/types';
-import { BF, DF, getMockEEActionContext, getMockEEFactory, int, makeAggregate } from '@comunica/utils-jest';
+import {
+  BF,
+  DF,
+  getMockEEActionContext,
+  getMockEEFactory,
+  int,
+  makeAggregate,
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import type * as RDF from '@rdfjs/types';
 import { GroupConcatAggregator } from '../lib/GroupConcatAggregator';
 

diff --git a/packages/actor-bindings-aggregator-factory-max/lib/MaxAggregator.ts b/packages/actor-bindings-aggregator-factory-max/lib/MaxAggregator.ts
@@ -1,7 +1,7 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import { AggregateEvaluator } from '@comunica/bus-bindings-aggregator-factory';
 import type { ITermComparator } from '@comunica/bus-term-comparator-factory';
-import type { IExpressionEvaluator } from '@comunica/expression-evaluator';
+import type { IExpressionEvaluator } from '@comunica/types';
 import type * as RDF from '@rdfjs/types';
 
 export class MaxAggregator extends AggregateEvaluator implements IBindingsAggregator {

diff --git a/packages/actor-bindings-aggregator-factory-max/package.json b/packages/actor-bindings-aggregator-factory-max/package.json
@@ -39,10 +39,10 @@
   "dependencies": {
     "@comunica/bus-bindings-aggregator-factory": "^3.2.1",
     "@comunica/core": "^3.2.1",
+    "@comunica/types": "^3.2.1",
     "@rdfjs/types": "*"
   },
   "devDependencies": {
-    "@comunica/bus-term-comparator-factory": "^3.2.1",
-    "@comunica/expression-evaluator": "^3.2.1"
+    "@comunica/bus-term-comparator-factory": "^3.2.1"
   }
 }
diff --git a/...ages/actor-bindings-aggregator-factory-max/test/ActorBindingsAggregatorFactoryMax-test.ts b/...ages/actor-bindings-aggregator-factory-max/test/ActorBindingsAggregatorFactoryMax-test.ts
@@ -10,9 +10,10 @@ import {
   getMockEEActionContext,
   getMockMediatorExpressionEvaluatorFactory,
   makeAggregate,
-} from '@comunica/utils-jest';
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import { ArrayIterator } from 'asynciterator';
 import { ActorBindingsAggregatorFactoryMax } from '../lib';
+import '@comunica/utils-jest';
 
 describe('ActorBindingsAggregatorFactoryMax', () => {
   let bus: any;

diff --git a/packages/actor-bindings-aggregator-factory-max/test/MaxAggregator-test.ts b/packages/actor-bindings-aggregator-factory-max/test/MaxAggregator-test.ts
@@ -15,7 +15,7 @@ import {
   makeAggregate,
   nonLiteral,
   string,
-} from '@comunica/utils-jest';
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import type * as RDF from '@rdfjs/types';
 import { MaxAggregator } from '../lib';
 

diff --git a/packages/actor-bindings-aggregator-factory-min/lib/MinAggregator.ts b/packages/actor-bindings-aggregator-factory-min/lib/MinAggregator.ts
@@ -1,7 +1,7 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import { AggregateEvaluator } from '@comunica/bus-bindings-aggregator-factory';
 import type { ITermComparator } from '@comunica/bus-term-comparator-factory';
-import type { IExpressionEvaluator } from '@comunica/expression-evaluator';
+import type { IExpressionEvaluator } from '@comunica/types';
 import type * as RDF from '@rdfjs/types';
 
 export class MinAggregator extends AggregateEvaluator implements IBindingsAggregator {

diff --git a/packages/actor-bindings-aggregator-factory-min/package.json b/packages/actor-bindings-aggregator-factory-min/package.json
@@ -39,10 +39,10 @@
   "dependencies": {
     "@comunica/bus-bindings-aggregator-factory": "^3.2.1",
     "@comunica/core": "^3.2.1",
+    "@comunica/types": "^3.2.1",
     "@rdfjs/types": "*"
   },
   "devDependencies": {
-    "@comunica/bus-term-comparator-factory": "^3.2.1",
-    "@comunica/expression-evaluator": "^3.2.1"
+    "@comunica/bus-term-comparator-factory": "^3.2.1"
   }
 }
diff --git a/...ages/actor-bindings-aggregator-factory-min/test/ActorBindingsAggregatorFactoryMin-test.ts b/...ages/actor-bindings-aggregator-factory-min/test/ActorBindingsAggregatorFactoryMin-test.ts
@@ -9,9 +9,10 @@ import {
   getMockEEActionContext,
   getMockMediatorExpressionEvaluatorFactory,
   makeAggregate,
-} from '@comunica/utils-jest';
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import { ArrayIterator } from 'asynciterator';
 import { ActorBindingsAggregatorFactoryMin } from '../lib';
+import '@comunica/utils-jest';
 
 describe('ActorBindingsAggregatorFactoryMin', () => {
   let bus: any;

diff --git a/packages/actor-bindings-aggregator-factory-min/test/MinAggregator-test.ts b/packages/actor-bindings-aggregator-factory-min/test/MinAggregator-test.ts
@@ -15,7 +15,7 @@ import {
   makeAggregate,
   nonLiteral,
   string,
-} from '@comunica/utils-jest';
+} from '@comunica/utils-expression-evaluator/test/util/helpers';
 import type * as RDF from '@rdfjs/types';
 import { MinAggregator } from '../lib/MinAggregator';
 

diff --git a/packages/actor-bindings-aggregator-factory-sample/lib/SampleAggregator.ts b/packages/actor-bindings-aggregator-factory-sample/lib/SampleAggregator.ts
@@ -1,6 +1,6 @@
 import type { IBindingsAggregator } from '@comunica/bus-bindings-aggregator-factory';
 import { AggregateEvaluator } from '@comunica/bus-bindings-aggregator-factory';
-import type { IExpressionEvaluator } from '@comunica/expression-evaluator';
+import type { IExpressionEvaluator } from '@comunica/types';
 import type * as RDF from '@rdfjs/types';
 
 export class SampleAggregator extends AggregateEvaluator implements IBindingsAggregator {