@finos/legend-graph 0.2.1 → 0.3.0

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_RelationalConnectionBuilderHelper.ts

@@ -134,6 +134,7 @@ export const V1_buildDatasourceSpecification = (
     snowflakeSpec.nonProxyHosts = protocol.nonProxyHosts;
     snowflakeSpec.organization = protocol.organization;
     snowflakeSpec.accountType = protocol.accountType;
+    snowflakeSpec.role = protocol.role;
     return snowflakeSpec;
   } else if (protocol instanceof V1_BigQueryDatasourceSpecification) {
     assertNonEmptyString(

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

@@ -19,6 +19,8 @@ import {
   guaranteeNonNullable,
   guaranteeType,
   UnsupportedOperationError,
+  isNonNullable,
+  uniq,
 } from '@finos/legend-shared';
 import {
   TYPICAL_MULTIPLICITY_TYPE,
@@ -203,7 +205,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 +214,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,
@@ -260,6 +267,17 @@ export class V1_ValueSpecificationBuilder
       ),
     );
     instance.values = transformed;
+    // NOTE: Engine applies a more sophisticated `findMostCommon()` algorithm to find the collection's generic type. Here we only handle the case where the collection has one type.
+    const typeValues = uniq(
+      instance.values
+        .map((v) => v.genericType?.value.rawType)
+        .filter(isNonNullable),
+    );
+    if (typeValues.length === 1) {
+      instance.genericType = GenericTypeExplicitReference.create(
+        new GenericType(guaranteeNonNullable(typeValues[0])),
+      );
+    }
     return instance;
   }
 
@@ -598,7 +616,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 +626,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;
 }
 
@@ -684,7 +703,7 @@ function buildPropertyGraphFetchTree(
 ): PropertyGraphFetchTree {
   let property: AbstractProperty;
   let pureParameters: ValueSpecification[] = [];
-  if (!propertyGraphFetchTree.parameters.length) {
+  if (propertyGraphFetchTree.parameters.length) {
     const thisVariable = new V1_Variable();
     thisVariable.name = 'this';
     thisVariable.class = parentClass.path;
@@ -836,7 +855,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 +865,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,15 @@ 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';
+import { V1_PureModelContextText } from '../../model/context/V1_PureModelContextText';
 
-enum V1_SdlcType {
+enum V1_SDLCType {
   ALLOY = 'alloy',
 }
 
@@ -55,6 +56,7 @@ export enum V1_PureModelContextType {
   DATA = 'data',
   POINTER = 'pointer',
   COMPOSITE = 'composite',
+  TEXT = 'text',
 }
 
 export const V1_entitiesToPureModelContextData = async (
@@ -98,8 +100,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(),
@@ -115,12 +117,29 @@ export const V1_pureModelContextDataPropSchema = custom(
   (value) => deserialize(V1_PureModelContextData, value),
 );
 
+const V1_pureModelContextTextSchema = createModelSchema(
+  V1_PureModelContextText,
+  {
+    _type: usingConstantValueSchema(V1_PureModelContextType.TEXT),
+    serializer: usingModelSchema(V1_Protocol.serialization.schema),
+    code: optional(primitive()),
+  },
+);
+
+export const V1_pureModelContextTextPropSchema = custom(
+  (value) =>
+    value === undefined
+      ? SKIP
+      : serialize(V1_pureModelContextTextSchema, value),
+  (value) => deserialize(V1_pureModelContextTextSchema, value),
+);
+
 const V1_pureModelContextPointerModelSchema = createModelSchema(
   V1_PureModelContextPointer,
   {
     _type: usingConstantValueSchema(V1_PureModelContextType.POINTER),
     serializer: usingModelSchema(V1_Protocol.serialization.schema),
-    sdlcInfo: usingModelSchema(alloySdlcSerializationModelSchema),
+    sdlcInfo: usingModelSchema(alloySDLCSerializationModelSchema),
   },
 );
 
@@ -172,9 +191,17 @@ export const V1_serializePureModelContext = (
     return V1_serializePureModelContextData(pureModelContext);
   } else if (pureModelContext instanceof V1_PureModelContextComposite) {
     return serialize(V1_pureModelContextCompositeModelSchema, pureModelContext);
+  } else if (pureModelContext instanceof V1_PureModelContextText) {
+    return serialize(V1_pureModelContextTextSchema, pureModelContext);
   }
   throw new UnsupportedOperationError(
     `Can't serialize Pure model context`,
     pureModelContext,
   );
 };
+
+export const V1_pureModelContextPropSchema = custom(
+  (val: V1_PureModelContext) => V1_serializePureModelContext(val),
+  // TODO: we will populate this when we need to `deserialize`
+  (val) => SKIP,
+);

package/src/models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ConnectionSerializationHelper.ts

@@ -175,6 +175,7 @@ const snowflakeDatasourceSpecificationModelSchema = createModelSchema(
     proxyPort: optional(primitive()),
     quotedIdentifiersIgnoreCase: optional(primitive()),
     region: primitive(),
+    role: optional(primitive()),
     warehouseName: primitive(),
   },
 );

package/tsconfig.json

@@ -22,6 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "noImplicitOverride": true,
+    "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "./lib",
@@ -69,10 +70,12 @@
     "./src/graphManager/action/generation/GenerationOutput.ts",
     "./src/graphManager/action/generation/ImportConfigurationDescription.ts",
     "./src/graphManager/action/query/Query.ts",
+    "./src/graphManager/action/query/QuerySearchSpecification.ts",
     "./src/graphManager/action/service/ServiceExecutionMode.ts",
     "./src/graphManager/action/service/ServiceRegistrationResult.ts",
     "./src/graphManager/action/service/ServiceTestResult.ts",
     "./src/helpers/DatabaseHelper.ts",
+    "./src/helpers/DomainHelper.ts",
     "./src/helpers/MappingHelper.ts",
     "./src/helpers/MappingResolutionHelper.ts",
     "./src/helpers/ServiceHelper.ts",
@@ -264,17 +267,19 @@
     "./src/models/protocols/pure/v1/engine/import/V1_ImportConfigurationDescription.ts",
     "./src/models/protocols/pure/v1/engine/import/V1_PureModelContextGenerationInput.ts",
     "./src/models/protocols/pure/v1/engine/query/V1_Query.ts",
+    "./src/models/protocols/pure/v1/engine/query/V1_QuerySearchSpecification.ts",
     "./src/models/protocols/pure/v1/engine/service/V1_ServiceConfiguration.ts",
     "./src/models/protocols/pure/v1/engine/service/V1_ServiceRegistrationResult.ts",
     "./src/models/protocols/pure/v1/engine/service/V1_ServiceStorage.ts",
     "./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_PureModelContextText.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"}