@finos/legend-graph 14.0.3 → 14.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-graph",
-  "version": "14.0.3",
+  "version": "14.0.6",
   "description": "Legend graph and graph manager",
   "keywords": [
     "legend",
@@ -39,23 +39,23 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-shared": "6.0.1",
-    "@finos/legend-storage": "3.0.5",
-    "date-fns": "2.29.1",
-    "mobx": "6.6.1",
+    "@finos/legend-shared": "6.0.4",
+    "@finos/legend-storage": "3.0.8",
+    "date-fns": "2.29.2",
+    "mobx": "6.6.2",
     "mobx-react-lite": "3.4.0",
     "react": "18.2.0",
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.11",
-    "@jest/globals": "28.1.3",
+    "@finos/legend-dev-utils": "2.0.14",
+    "@jest/globals": "29.0.2",
     "cross-env": "7.0.3",
-    "eslint": "8.22.0",
-    "jest": "28.1.3",
+    "eslint": "8.23.0",
+    "jest": "29.0.2",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "typescript": "4.7.4"
+    "typescript": "4.8.2"
   },
   "publishConfig": {
     "directory": "build/publishContent"

package/src/graph/MetaModelUtils.ts

@@ -39,10 +39,14 @@ export const extractElementNameFromPath = (fullPath: string): string =>
 
 export const matchFunctionName = (
   functionName: string,
-  functionFullPath: string,
+  functionFullPaths: string | string[],
 ): boolean =>
-  functionName === functionFullPath ||
-  extractElementNameFromPath(functionFullPath) === functionName;
+  Array.isArray(functionFullPaths)
+    ? functionFullPaths.some((functionFullPath) =>
+        matchFunctionName(functionName, functionFullPath),
+      )
+    : functionName === functionFullPaths ||
+      extractElementNameFromPath(functionFullPaths) === functionName;
 
 /**
  * This method concatenate 2 fully-qualified elementh paths to form a single one

package/src/graph/helpers/DomainHelper.ts

@@ -361,7 +361,7 @@ export const getOwnProperty = (
   );
 
 /**
- * Get all super types of a class, accounted for loop and duplication (which should be caught by compiler)
+ * Get all superclasses of a class, accounted for loop and duplication (which should be caught by compiler)
  * NOTE: we intentionally leave out `Any`
  */
 export const getAllSuperclasses = (c: Class): Class[] => {

package/src/graphManager/AbstractPureGraphManager.ts

@@ -381,6 +381,7 @@ export abstract class AbstractPureGraphManager {
     version: string | undefined,
     server: string,
     executionMode: ServiceExecutionMode,
+    TEMPORARY__useStoreModel: boolean,
   ): Promise<ServiceRegistrationResult>;
   abstract activateService(
     serviceUrl: string,

package/src/graphManager/action/EngineError.ts

@@ -24,6 +24,7 @@ export class EngineError extends ApplicationError {
 export class ParserError extends EngineError {}
 
 export class CompilationError extends EngineError {}
+
 export class ExternalFormatError extends CompilationError {
   schemaSourceInformation?: SourceInformation | undefined;
 }

package/src/graphManager/action/analytics/MappingModelCoverageAnalysis.ts

@@ -41,6 +41,13 @@ export class MappedProperty {
 
 export class EntityMappedProperty extends MappedProperty {
   entityPath: string;
+  /**
+   * If this attribute is set, we need to understand this `mapped property` slightly differently
+   * as this will represent a subtype of the class corresponding to the parent mapped entity.
+   *
+   * For example: class A extends B, assuming that A is mapped and B is mapped, in the list of
+   * mapped properties of B, we should see a mapped property with subtype A.
+   */
   subType: string | undefined;
 
   constructor(name: string, entityPath: string, subType: string | undefined) {

package/src/graphManager/protocol/pure/v1/V1_PureGraphManager.ts

@@ -2105,6 +2105,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     version: string | undefined,
     server: string,
     executionMode: ServiceExecutionMode,
+    TEMPORARY__useStoreModel: boolean,
   ): Promise<ServiceRegistrationResult> {
     const serverServiceInfo = await this.engine.getServerServiceInfo();
     // input
@@ -2176,7 +2177,12 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       }
     }
     return V1_buildServiceRegistrationResult(
-      await this.engine.registerService(input, server, executionMode),
+      await this.engine.registerService(
+        input,
+        server,
+        executionMode,
+        TEMPORARY__useStoreModel,
+      ),
     );
   }
 

package/src/graphManager/protocol/pure/v1/engine/V1_Engine.ts

@@ -75,7 +75,6 @@ import {
 import { V1_ServiceStorage } from './service/V1_ServiceStorage.js';
 import { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult.js';
 import type { V1_PureModelContext } from '../model/context/V1_PureModelContext.js';
-import { ServiceExecutionMode } from '../../../../../graphManager/action/service/ServiceExecutionMode.js';
 import { deserialize, serialize } from 'serializr';
 import { V1_ExecutionError } from './execution/V1_ExecutionError.js';
 import { V1_PureModelContextText } from '../model/context/V1_PureModelContextText.js';
@@ -92,6 +91,7 @@ import {
   V1_MappingModelCoverageAnalysisInput,
   V1_MappingModelCoverageAnalysisResult,
 } from './analytics/V1_MappingModelCoverageAnalysis.js';
+import type { ServiceExecutionMode } from '../../../../action/service/ServiceExecutionMode.js';
 
 class V1_EngineConfig extends TEMPORARY__AbstractEngineConfig {
   private engine: V1_Engine;
@@ -607,16 +607,14 @@ export class V1_Engine {
     input: V1_PureModelContext,
     server: string,
     executionMode: ServiceExecutionMode,
+    TEMPORARY__useStoreModel: boolean,
   ): Promise<V1_ServiceRegistrationResult> {
     return V1_ServiceRegistrationResult.serialization.fromJson(
       await this.engineServerClient.registerService(
         V1_serializePureModelContext(input),
         server,
-        executionMode === ServiceExecutionMode.FULL_INTERACTIVE
-          ? 'fullInteractive'
-          : executionMode === ServiceExecutionMode.SEMI_INTERACTIVE
-          ? 'semiInteractive'
-          : undefined,
+        executionMode,
+        TEMPORARY__useStoreModel,
       ),
     );
   }

package/src/graphManager/protocol/pure/v1/engine/V1_EngineServerClient.ts

@@ -49,6 +49,7 @@ import type { V1_RawRelationalOperationElement } from '../model/packageableEleme
 import type { V1_RenderStyle } from './grammar/V1_RenderStyle.js';
 import type { V1_ParserError } from './grammar/V1_ParserError.js';
 import type { V1_MappingModelCoverageAnalysisResult } from './analytics/V1_MappingModelCoverageAnalysis.js';
+import { ServiceExecutionMode } from '../../../../action/service/ServiceExecutionMode.js';
 
 enum CORE_ENGINE_ACTIVITY_TRACE {
   GRAMMAR_TO_JSON = 'transform Pure code to protocol',
@@ -522,20 +523,36 @@ export class V1_EngineServerClient extends AbstractServerClient {
   getServerServiceInfo = (): Promise<
     PlainObject<V1_ServiceConfigurationInfo>
   > => this.get(`${this._server()}/info/services`);
+  getRegisterServiceUrlFromExecMode = (
+    serviceExecutionMode: ServiceExecutionMode,
+  ): string => {
+    const REGISTER_ENDPOINT_PREFIX = 'register';
+    switch (serviceExecutionMode) {
+      case ServiceExecutionMode.FULL_INTERACTIVE:
+        return `${REGISTER_ENDPOINT_PREFIX}_fullInteractive`;
+      case ServiceExecutionMode.SEMI_INTERACTIVE:
+        return `${REGISTER_ENDPOINT_PREFIX}_semiInteractive`;
+      default:
+        return REGISTER_ENDPOINT_PREFIX;
+    }
+  };
   registerService = (
     graphModelData: PlainObject<V1_PureModelContext>,
     serviceServerUrl: string,
-    serviceExecutionMode: string | undefined,
+    serviceExecutionMode: ServiceExecutionMode,
+    TEMPORARY__useStoreModel: boolean,
   ): Promise<PlainObject<V1_ServiceRegistrationResult>> =>
     this.postWithTracing(
       this.getTraceData(CORE_ENGINE_ACTIVITY_TRACE.REGISTER_SERVICE),
-      `${this._service(serviceServerUrl)}/register${
-        serviceExecutionMode ? `_${serviceExecutionMode}` : ''
-      }`,
+      `${this._service(
+        serviceServerUrl,
+      )}/${this.getRegisterServiceUrlFromExecMode(serviceExecutionMode)}`,
       graphModelData,
       {},
       undefined,
-      undefined,
+      serviceExecutionMode === ServiceExecutionMode.FULL_INTERACTIVE
+        ? { storeModel: TEMPORARY__useStoreModel }
+        : undefined,
       { enableCompression: true },
     );
   getServiceVersionInfo = (

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_ValueSpecificationTransformer.ts

@@ -298,8 +298,8 @@ class V1_ValueSpecificationTransformer
       valueSpecification.multiplicity.upperBound;
     collection.values = valueSpecification.values
       .filter(filterByType(ValueSpecification))
-      .map((e) =>
-        e.accept_ValueSpecificationVisitor(
+      .map((value) =>
+        value.accept_ValueSpecificationVisitor(
           new V1_ValueSpecificationTransformer(
             this.inScope,
             this.open,
@@ -316,8 +316,8 @@ class V1_ValueSpecificationTransformer
   ): V1_ValueSpecification {
     const appliedFunc = new V1_AppliedFunction();
     appliedFunc.function = valueSpecification.functionName;
-    appliedFunc.parameters = valueSpecification.parametersValues.map((e) =>
-      e.accept_ValueSpecificationVisitor(
+    appliedFunc.parameters = valueSpecification.parametersValues.map((value) =>
+      value.accept_ValueSpecificationVisitor(
         new V1_ValueSpecificationTransformer(
           this.inScope,
           this.open,
@@ -334,8 +334,8 @@ class V1_ValueSpecificationTransformer
   ): V1_ValueSpecification {
     const appliedFunc = new V1_AppliedFunction();
     appliedFunc.function = valueSpecification.functionName;
-    appliedFunc.parameters = valueSpecification.parametersValues.map((e) =>
-      e.accept_ValueSpecificationVisitor(
+    appliedFunc.parameters = valueSpecification.parametersValues.map((value) =>
+      value.accept_ValueSpecificationVisitor(
         new V1_ValueSpecificationTransformer(
           this.inScope,
           this.open,
@@ -374,8 +374,8 @@ class V1_ValueSpecificationTransformer
   ): V1_ValueSpecification {
     const _property = new V1_AppliedProperty();
     _property.property = valueSpecification.func.name;
-    _property.parameters = valueSpecification.parametersValues.map((e) =>
-      e.accept_ValueSpecificationVisitor(
+    _property.parameters = valueSpecification.parametersValues.map((value) =>
+      value.accept_ValueSpecificationVisitor(
         new V1_ValueSpecificationTransformer(
           this.inScope,
           this.open,
@@ -417,8 +417,8 @@ export function V1_transformGraphFetchTree(
   } else if (value instanceof PropertyGraphFetchTree) {
     const _propertyGraphTree = new V1_PropertyGraphFetchTree();
     _propertyGraphTree.alias = value.alias;
-    _propertyGraphTree.parameters = value.parameters.map((e) =>
-      e.accept_ValueSpecificationVisitor(
+    _propertyGraphTree.parameters = value.parameters.map((parameter) =>
+      parameter.accept_ValueSpecificationVisitor(
         new V1_ValueSpecificationTransformer(
           inScope,
           open,
@@ -429,9 +429,9 @@ export function V1_transformGraphFetchTree(
     );
     _propertyGraphTree.property = value.property.value.name;
     _propertyGraphTree.subType = value.subType?.value.path;
-    _propertyGraphTree.subTrees = value.subTrees.map((e) =>
+    _propertyGraphTree.subTrees = value.subTrees.map((subTree) =>
       V1_transformGraphFetchTree(
-        e,
+        subTree,
         inScope,
         open,
         isParameter,
@@ -450,8 +450,8 @@ export const V1_transformLambdaBody = (
   useAppliedFunction: boolean,
 ): V1_ValueSpecification[] => {
   const inScope = lambdaFunc.functionType.parameters.map((p) => p.name);
-  return lambdaFunc.expressionSequence.map((p) =>
-    p.accept_ValueSpecificationVisitor(
+  return lambdaFunc.expressionSequence.map((expression) =>
+    expression.accept_ValueSpecificationVisitor(
       new V1_ValueSpecificationTransformer(
         inScope,
         new Map<string, unknown[]>(),
@@ -468,9 +468,9 @@ export function V1_transformLambdaFunctionInstanceValue(
 ): V1_Lambda {
   const lambdaFunc = guaranteeNonNullable(valueSpecification.values[0]);
   const lambda = new V1_Lambda();
-  lambda.parameters = lambdaFunc.functionType.parameters.map((p) =>
+  lambda.parameters = lambdaFunc.functionType.parameters.map((parameter) =>
     guaranteeType(
-      p.accept_ValueSpecificationVisitor(
+      parameter.accept_ValueSpecificationVisitor(
         new V1_ValueSpecificationTransformer(
           [],
           new Map<string, unknown[]>(),

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts

@@ -613,14 +613,14 @@ export function V1_buildLambdaBody(
 ): LambdaFunction {
   processingContext.push('Creating new lambda');
   const pureParameters = parameters.map(
-    (p) =>
-      p.accept_ValueSpecificationVisitor(
+    (parameter) =>
+      parameter.accept_ValueSpecificationVisitor(
         new V1_ValueSpecificationBuilder(context, processingContext, []),
       ) as VariableExpression,
   );
   const openVariables: string[] = [];
-  const _expressions = expressions.map((e) =>
-    e.accept_ValueSpecificationVisitor(
+  const _expressions = expressions.map((value) =>
+    value.accept_ValueSpecificationVisitor(
       new V1_ValueSpecificationBuilder(
         context,
         processingContext,
@@ -849,8 +849,8 @@ export function V1_processProperty(
   property: string,
 ): ValueSpecification {
   const firstParameter = parameters[0];
-  const processedParameters = parameters.map((p) =>
-    p.accept_ValueSpecificationVisitor(
+  const processedParameters = parameters.map((parameter) =>
+    parameter.accept_ValueSpecificationVisitor(
       new V1_ValueSpecificationBuilder(
         context,
         processingContext,
@@ -968,8 +968,10 @@ export function V1_buildFunctionExpression(
   processingContext: V1_ProcessingContext,
 ): [SimpleFunctionExpression, ValueSpecification[]] {
   if (
-    matchFunctionName(functionName, SUPPORTED_FUNCTIONS.TODAY) ||
-    matchFunctionName(functionName, SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER)
+    matchFunctionName(functionName, [
+      SUPPORTED_FUNCTIONS.TODAY,
+      SUPPORTED_FUNCTIONS.FIRST_DAY_OF_QUARTER,
+    ])
   ) {
     const expression = V1_buildGenericFunctionExpression(
       functionName,
@@ -999,15 +1001,13 @@ export function V1_buildFunctionExpression(
     );
     return expression;
   } else if (
-    (
-      [
-        SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
-        SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
-        SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
-        SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
-        SUPPORTED_FUNCTIONS.ADJUST,
-      ] as string[]
-    ).some((fn) => matchFunctionName(functionName, fn))
+    matchFunctionName(functionName, [
+      SUPPORTED_FUNCTIONS.FIRST_DAY_OF_YEAR,
+      SUPPORTED_FUNCTIONS.FIRST_DAY_OF_MONTH,
+      SUPPORTED_FUNCTIONS.FIRST_DAY_OF_WEEK,
+      SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK,
+      SUPPORTED_FUNCTIONS.ADJUST,
+    ])
   ) {
     const expression = V1_buildGenericFunctionExpression(
       functionName,
@@ -1023,9 +1023,7 @@ export function V1_buildFunctionExpression(
     );
     return expression;
   } else if (
-    Object.values(SUPPORTED_FUNCTIONS).some((fn) =>
-      matchFunctionName(functionName, fn),
-    )
+    matchFunctionName(functionName, Object.values(SUPPORTED_FUNCTIONS))
   ) {
     // NOTE: this is a catch-all builder that is only meant for basic function expression
     // such as and(), or(), etc. It will fail when type-inferencing/function-matching is required

package/tsconfig.json

@@ -21,7 +21,7 @@
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
-    "forceConsistentCasingInFileNames": true,
+    "forceConsistentCasingInFileNames": false,
     "outDir": "./lib",
     "tsBuildInfoFile": "./build/prod.tsbuildinfo",
     "rootDir": "./src",

package/tsconfig.package.json

@@ -21,7 +21,7 @@
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
-    "forceConsistentCasingInFileNames": true,
+    "forceConsistentCasingInFileNames": false,
     "outDir": "./lib",
     "tsBuildInfoFile": "./build/package.tsbuildinfo",
     "rootDir": "./"