@finos/legend-graph 0.2.1 → 0.2.2

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelPropertyMappingBuilder.ts

@@ -40,10 +40,7 @@ import { InferableMappingElementIdExplicitValue } from '../../../../../../metamo
 import type { PackageableElementReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { PackageableElementImplicitReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import type { PropertyReference } from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
-import {
-  PropertyImplicitReference,
-  PropertyExplicitReference,
-} from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
+import { PropertyImplicitReference } from '../../../../../../metamodels/pure/packageableElements/domain/PropertyReference';
 import { RootRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RootRelationalInstanceSetImplementation';
 import { OtherwiseEmbeddedRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/OtherwiseEmbeddedRelationalInstanceSetImplementation';
 import { EmbeddedRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/EmbeddedRelationalInstanceSetImplementation';
@@ -80,6 +77,7 @@ import {
 import { V1_transformRelationalOperationElement } from '../from/V1_DatabaseTransformer';
 import { V1_GraphTransformerContextBuilder } from '../from/V1_GraphTransformerContext';
 import {
+  getAllEnumerationMappings,
   getClassMappingById,
   getClassMappingsByClass,
 } from '../../../../../../../helpers/MappingHelper';
@@ -638,7 +636,9 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
             this.context,
             embedded,
             this.topParent,
-            this.topParent?.parent.enumerationMappings ?? [],
+            this.topParent?.parent
+              ? getAllEnumerationMappings(this.topParent.parent)
+              : [],
             this.tableAliasMap,
           ),
         ),
@@ -696,7 +696,9 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
             this.context,
             otherwiseEmbedded,
             this.topParent,
-            this.topParent?.parent.enumerationMappings ?? [],
+            this.topParent?.parent
+              ? getAllEnumerationMappings(this.topParent.parent)
+              : [],
             this.tableAliasMap,
           ),
         ),
@@ -707,7 +709,9 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
           this.context,
           otherwiseEmbedded,
           this.topParent,
-          this.topParent?.parent.enumerationMappings ?? [],
+          this.topParent?.parent
+            ? getAllEnumerationMappings(this.topParent.parent)
+            : [],
           this.tableAliasMap,
         ),
       ),
@@ -750,10 +754,13 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
     );
     const xStorePropertyMapping = new XStorePropertyMapping(
       xStoreParent,
-      // NOTE: this should be `implicit` because this comes from an association
-      // that we should have inferred. But we need to test the impact of changing it to `implicit`.
-      // This might cause bugs in the future.
-      PropertyExplicitReference.create(property),
+      PropertyImplicitReference.create(
+        PackageableElementImplicitReference.create(
+          _association,
+          protocol.property.class,
+        ),
+        property,
+      ),
       guaranteeNonNullable(sourceSetImplementation),
       targetSetImplementation,
     );

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_AssociationMappingHelper.ts

@@ -27,6 +27,7 @@ import { V1_ProtocolToMetaModelPropertyMappingBuilder } from '../../../../transf
 import type { V1_AssociationMapping } from '../../../../model/packageableElements/mapping/V1_AssociationMapping';
 import { V1_XStoreAssociationMapping } from '../../../../model/packageableElements/mapping/xStore/V1_XStoreAssociationMapping';
 import { XStoreAssociationImplementation } from '../../../../../../../metamodels/pure/packageableElements/mapping/xStore/XStoreAssociationImplementation';
+import { getAllEnumerationMappings } from '../../../../../../../../helpers/MappingHelper';
 
 const getInferredAssociationMappingId = (
   _association: Association,
@@ -63,7 +64,7 @@ const buildRelationalAssociationMapping = (
           context,
           relationalAssociationImplementation,
           undefined,
-          parentMapping.enumerationMappings,
+          getAllEnumerationMappings(parentMapping),
           undefined,
           allClassMappings,
         ),
@@ -96,7 +97,7 @@ const buildXStoreAssociationMapping = (
           context,
           xStoreAssociationImplementation,
           undefined,
-          parentMapping.enumerationMappings,
+          getAllEnumerationMappings(parentMapping),
           undefined,
           allClassMappings,
           xStoreAssociationImplementation,

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_DatabaseBuilderHelper.ts

@@ -218,7 +218,10 @@ const buildJoinTreeNode = (
   joins: { joinReference: JoinReference; joinType?: JoinType | undefined }[],
   context: V1_GraphBuilderContext,
 ): JoinTreeNode => {
-  const joinWithJoinType = joins[0];
+  const joinWithJoinType = guaranteeNonNullable(
+    joins[0],
+    `Can't build join tree node: at least one child node is expected`,
+  );
   const res = new JoinTreeNode(
     joinWithJoinType.joinReference,
     joinWithJoinType.joinType,
@@ -599,7 +602,7 @@ export const V1_buildDatabaseJoin = (
       selfJoinTargets.length !== 0,
       `Can't build join of 1 table, unless it is a self-join. Please use the '{target}' notation in order to define a directed self-join`,
     );
-    const existingAlias = aliases[0];
+    const existingAlias = aliases[0] as TableAlias;
     const existingAliasName = existingAlias.name;
     const existingRelationalElement = existingAlias.relation;
     const tableAlias = new TableAlias();
@@ -628,8 +631,14 @@ export const V1_buildDatabaseJoin = (
     });
   }
   join.aliases = [
-    new Pair<TableAlias, TableAlias>(aliases[0], aliases[1]),
-    new Pair<TableAlias, TableAlias>(aliases[1], aliases[0]),
+    new Pair<TableAlias, TableAlias>(
+      aliases[0] as TableAlias,
+      aliases[1] as TableAlias,
+    ),
+    new Pair<TableAlias, TableAlias>(
+      aliases[1] as TableAlias,
+      aliases[0] as TableAlias,
+    ),
   ];
   join.owner = database;
   return join;

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_MappingBuilderHelper.ts

@@ -303,7 +303,9 @@ export const V1_resolveClassMappingRoot = (mapping: Mapping): void => {
   Array.from(classToSetImplMap.entries()).forEach((entries) => {
     const _classMappings = entries[1];
     if (_classMappings.size === 1) {
-      const classMapping = Array.from(_classMappings.values())[0];
+      const classMapping = Array.from(
+        _classMappings.values(),
+      )[0] as SetImplementation;
       // ensure you are only altering current mapping
       if (
         classMapping.root.value === false &&

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_ProcessingContext.ts

@@ -43,20 +43,24 @@ export class V1_ProcessingContext {
     return this.tags;
   }
 
-  getLastInferredVariableList(): Map<string, ValueSpecification> {
-    return this.inferredVariableList[this.inferredVariableList.length - 1];
+  private get lastInferredVariableList():
+    | Map<string, ValueSpecification>
+    | undefined {
+    return this.inferredVariableList.length
+      ? this.inferredVariableList[this.inferredVariableList.length - 1]
+      : undefined;
   }
 
   addInferredVariables(name: string, variable: ValueSpecification): void {
     if (!this.inferredVariableList.length) {
       this.addVariableToNewLevel(name, variable);
     } else {
-      this.getLastInferredVariableList().set(name, variable);
+      this.lastInferredVariableList?.set(name, variable);
     }
   }
 
   flushVariable(name: string): void {
-    this.getLastInferredVariableList().delete(name);
+    this.lastInferredVariableList?.delete(name);
   }
 
   removeLastVariableLevel(): void {

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts

@@ -203,7 +203,7 @@ export class V1_ValueSpecificationBuilder
       `Applying function '${appliedFunction.function}'`,
     );
     if (appliedFunction.function === LET_FUNCTION) {
-      const vs = appliedFunction.parameters.map((expression) =>
+      const parameters = appliedFunction.parameters.map((expression) =>
         expression.accept_ValueSpecificationVisitor(
           new V1_ValueSpecificationBuilder(
             this.context,
@@ -212,11 +212,16 @@ export class V1_ValueSpecificationBuilder
           ),
         ),
       );
-      const letName = guaranteeType(appliedFunction.parameters[0], V1_CString)
-        .values[0];
-      const ve = new VariableExpression(letName, vs[0].multiplicity);
-      ve.genericType = vs[0].genericType;
-      this.processingContext.addInferredVariables(letName, ve);
+      const letName = guaranteeNonNullable(
+        guaranteeType(appliedFunction.parameters[0], V1_CString).values[0],
+      );
+      const firstParam = guaranteeNonNullable(parameters[0]);
+      const variableExpression = new VariableExpression(
+        letName,
+        firstParam.multiplicity,
+      );
+      variableExpression.genericType = firstParam.genericType;
+      this.processingContext.addInferredVariables(letName, variableExpression);
     }
     const func = V1_buildFunctionExpression(
       appliedFunction.function,
@@ -598,7 +603,7 @@ export function V1_buildLambdaBody(
       ) as VariableExpression,
   );
   const openVariables: string[] = [];
-  const valueSpecifications = expressions.map((e) =>
+  const _expressions = expressions.map((e) =>
     e.accept_ValueSpecificationVisitor(
       new V1_ValueSpecificationBuilder(
         context,
@@ -608,15 +613,16 @@ export function V1_buildLambdaBody(
     ),
   );
   // Remove let variables
+  const firstExpression = guaranteeNonNullable(_expressions[0]);
   const functionType = buildFunctionType(
     pureParameters,
-    valueSpecifications[0].genericType?.value.rawType,
-    valueSpecifications[0].multiplicity,
+    firstExpression.genericType?.value.rawType,
+    firstExpression.multiplicity,
   );
   processingContext.pop();
   const _lambda = new LambdaFunction(functionType);
   _lambda.openVariables = [];
-  _lambda.expressionSequence = valueSpecifications;
+  _lambda.expressionSequence = _expressions;
   return _lambda;
 }
 
@@ -836,7 +842,7 @@ export function V1_processProperty(
       ),
     ),
   );
-  let inferredVariable: ValueSpecification;
+  let inferredVariable: ValueSpecification | undefined;
   if (firstParameter instanceof V1_Variable) {
     inferredVariable = guaranteeType(
       processingContext.getInferredVariable(firstParameter.name),
@@ -846,7 +852,7 @@ export function V1_processProperty(
     inferredVariable = processedParameters[0];
   }
   let inferredType: Type | undefined =
-    inferredVariable.genericType?.value.rawType;
+    inferredVariable?.genericType?.value.rawType;
   if (inferredVariable instanceof AbstractPropertyExpression) {
     inferredType = inferredVariable.func.genericType.value.rawType;
   }

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_PureProtocolSerialization.ts

@@ -40,14 +40,14 @@ import {
 } from '../../transformation/pureProtocol/V1_PackageableElementSerialization';
 import { V1_PureModelContextComposite } from '../../model/context/V1_PureModelContextComposite';
 import { V1_Protocol } from '../../model/V1_Protocol';
-import { V1_AlloySdlc } from '../../model/context/V1_AlloySdlc';
+import { V1_AlloySDLC } from '../../model/context/V1_SDLC';
 import type { V1_PureModelContext } from '../../model/context/V1_PureModelContext';
 import { V1_packageableElementPointerDeserializerSchema } from '../../transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper';
 import type { PureProtocolProcessorPlugin } from '../../../PureProtocolProcessorPlugin';
 import type { Entity } from '@finos/legend-model-storage';
 import { GraphDataDeserializationError } from '../../../../../../graphManager/GraphManagerUtils';
 
-enum V1_SdlcType {
+enum V1_SDLCType {
   ALLOY = 'alloy',
 }
 
@@ -98,8 +98,8 @@ export const V1_entitiesToPureModelContextData = async (
   }
 };
 
-const alloySdlcSerializationModelSchema = createModelSchema(V1_AlloySdlc, {
-  _type: usingConstantValueSchema(V1_SdlcType.ALLOY),
+const alloySDLCSerializationModelSchema = createModelSchema(V1_AlloySDLC, {
+  _type: usingConstantValueSchema(V1_SDLCType.ALLOY),
   baseVersion: optional(primitive()),
   version: primitive(),
   groupId: primitive(),
@@ -120,7 +120,7 @@ const V1_pureModelContextPointerModelSchema = createModelSchema(
   {
     _type: usingConstantValueSchema(V1_PureModelContextType.POINTER),
     serializer: usingModelSchema(V1_Protocol.serialization.schema),
-    sdlcInfo: usingModelSchema(alloySdlcSerializationModelSchema),
+    sdlcInfo: usingModelSchema(alloySDLCSerializationModelSchema),
   },
 );
 

package/tsconfig.json

@@ -22,6 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "./lib",
@@ -270,11 +271,11 @@
     "./src/models/protocols/pure/v1/engine/service/V1_ServiceTestResult.ts",
     "./src/models/protocols/pure/v1/model/V1_Protocol.ts",
     "./src/models/protocols/pure/v1/model/V1_SourceInformation.ts",
-    "./src/models/protocols/pure/v1/model/context/V1_AlloySdlc.ts",
     "./src/models/protocols/pure/v1/model/context/V1_PureModelContext.ts",
     "./src/models/protocols/pure/v1/model/context/V1_PureModelContextComposite.ts",
     "./src/models/protocols/pure/v1/model/context/V1_PureModelContextData.ts",
     "./src/models/protocols/pure/v1/model/context/V1_PureModelContextPointer.ts",
+    "./src/models/protocols/pure/v1/model/context/V1_SDLC.ts",
     "./src/models/protocols/pure/v1/model/executionPlan/V1_ExecutionPlan.ts",
     "./src/models/protocols/pure/v1/model/executionPlan/V1_SimpleExecutionPlan.ts",
     "./src/models/protocols/pure/v1/model/executionPlan/nodes/V1_ExecutionNode.ts",

package/tsconfig.package.json

@@ -22,6 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "./lib",

package/lib/models/protocols/pure/v1/model/context/V1_AlloySdlc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_AlloySdlc.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/model/context/V1_AlloySdlc.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uDAAuD,CAAC;AAE1G,8BAAsB,OAAO;IAC3B,WAAW,SAAY;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B,EAAE,4BAA4B,EAAE,CAAM;gBAEpD,OAAO,EAAE,MAAM,GAAG,SAAS;CAGxC;AAED,qBAAa,YAAa,SAAQ,OAAO;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;gBAGjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GAAG,SAAS;CAM9B"}

package/lib/models/protocols/pure/v1/model/context/V1_AlloySdlc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_AlloySdlc.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/model/context/V1_AlloySdlc.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,MAAM,OAAgB,OAAO;IAC3B,WAAW,GAAG,QAAQ,CAAC;IACvB,OAAO,CAAS;IAChB,0BAA0B,GAAmC,EAAE,CAAC;IAEhE,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,OAAO;IACvC,OAAO,CAAS;IAChB,UAAU,CAAS;IAEnB,YACE,OAAe,EACf,UAAkB,EAClB,OAA2B;QAE3B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF"}