@finos/legend-graph 0.2.4 → 0.4.1

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

@@ -248,7 +248,8 @@ const isCompatibleDerivedProperty = (
 ): boolean =>
   o.name === name &&
   Array.isArray(o.parameters) &&
-  o.parameters.length === params.length;
+  // We add 1 to account for the `this` parameter in the derived property
+  o.parameters.length + 1 === params.length;
 
 export const V1_getAppliedProperty = (
   parentClass: Class,

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

@@ -33,6 +33,7 @@ import type { AuthenticationStrategy } from '../../../../../../../metamodels/pur
 import {
   SnowflakePublicAuthenticationStrategy,
   GCPApplicationDefaultCredentialsAuthenticationStrategy,
+  UsernamePasswordAuthenticationStrategy,
   OAuthAuthenticationStrategy,
   DefaultH2AuthenticationStrategy,
   DelegatedKerberosAuthenticationStrategy,
@@ -58,6 +59,7 @@ import {
   V1_DelegatedKerberosAuthenticationStrategy,
   V1_TestDatabaseAuthenticationStrategy,
   V1_UserPasswordAuthenticationStrategy,
+  V1_UsernamePasswordAuthenticationStrategy,
 } from '../../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy';
 import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../../StoreRelational_PureProtocolProcessorPlugin_Extension';
 
@@ -134,6 +136,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(
@@ -248,6 +251,22 @@ export const V1_buildAuthenticationStrategy = (
       protocol.userName,
       protocol.passwordVaultReference,
     );
+  } else if (protocol instanceof V1_UsernamePasswordAuthenticationStrategy) {
+    assertNonEmptyString(
+      protocol.userNameVaultReference,
+      `Username password authentication strategy 'userNameVaultReference' field is missing or empty`,
+    );
+    assertNonEmptyString(
+      protocol.passwordVaultReference,
+      `Username password authentication strategy 'passwordVaultReference' field is missing or empty`,
+    );
+
+    const metamodel = new UsernamePasswordAuthenticationStrategy(
+      protocol.userNameVaultReference,
+      protocol.passwordVaultReference,
+    );
+    metamodel.baseVaultReference = protocol.baseVaultReference;
+    return metamodel;
   }
   const extraConnectionAuthenticationStrategyBuilders =
     context.extensions.plugins.flatMap(

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,
@@ -265,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;
   }
 
@@ -690,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;

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

@@ -23,6 +23,7 @@ import {
   SKIP,
   serialize,
   deserialize,
+  object,
 } from 'serializr';
 import type { PlainObject } from '@finos/legend-shared';
 import {
@@ -46,6 +47,7 @@ import { V1_packageableElementPointerDeserializerSchema } from '../../transforma
 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 {
   ALLOY = 'alloy',
@@ -55,6 +57,7 @@ export enum V1_PureModelContextType {
   DATA = 'data',
   POINTER = 'pointer',
   COMPOSITE = 'composite',
+  TEXT = 'text',
 }
 
 export const V1_entitiesToPureModelContextData = async (
@@ -109,10 +112,13 @@ const alloySDLCSerializationModelSchema = createModelSchema(V1_AlloySDLC, {
   ),
 });
 
-export const V1_pureModelContextDataPropSchema = custom(
-  (value) =>
-    value === undefined ? SKIP : serialize(V1_PureModelContextData, value),
-  (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()),
+  },
 );
 
 const V1_pureModelContextPointerModelSchema = createModelSchema(
@@ -129,7 +135,7 @@ const V1_pureModelContextCompositeModelSchema = createModelSchema(
   {
     _type: usingConstantValueSchema(V1_PureModelContextType.COMPOSITE),
     serializer: usingModelSchema(V1_Protocol.serialization.schema),
-    data: V1_pureModelContextDataPropSchema,
+    data: object(V1_PureModelContextData),
     pointer: usingModelSchema(V1_pureModelContextPointerModelSchema),
   },
 );
@@ -172,9 +178,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

@@ -57,6 +57,7 @@ import {
   V1_DelegatedKerberosAuthenticationStrategy,
   V1_TestDatabaseAuthenticationStrategy,
   V1_UserPasswordAuthenticationStrategy,
+  V1_UsernamePasswordAuthenticationStrategy,
 } from '../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin';
 import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../StoreRelational_PureProtocolProcessorPlugin_Extension';
@@ -175,6 +176,7 @@ const snowflakeDatasourceSpecificationModelSchema = createModelSchema(
     proxyPort: optional(primitive()),
     quotedIdentifiersIgnoreCase: optional(primitive()),
     region: primitive(),
+    role: optional(primitive()),
     warehouseName: primitive(),
   },
 );
@@ -284,6 +286,7 @@ enum V1_AuthenticationStrategyType {
   TEST = 'test',
   OAUTH = 'oauth',
   USER_PASSWORD = 'userPassword',
+  USERNAME_PASSWORD = 'userNamePassword',
 }
 
 const V1_delegatedKerberosAuthenticationStrategyModelSchema = createModelSchema(
@@ -336,6 +339,18 @@ const V1_GCPApplicationDefaultCredentialsAuthenticationStrategyModelSchema =
     ),
   });
 
+const V1_UsernamePasswordAuthenticationStrategyModelSchema = createModelSchema(
+  V1_UsernamePasswordAuthenticationStrategy,
+  {
+    _type: usingConstantValueSchema(
+      V1_AuthenticationStrategyType.USERNAME_PASSWORD,
+    ),
+    baseVaultReference: optional(primitive()),
+    userNameVaultReference: primitive(),
+    passwordVaultReference: primitive(),
+  },
+);
+
 const V1_oAuthAuthenticationStrategyModelSchema = createModelSchema(
   V1_OAuthAuthenticationStrategy,
   {
@@ -381,6 +396,11 @@ export const V1_serializeAuthenticationStrategy = (
       V1_userPasswordAuthenticationStrategyModelSchema,
       protocol,
     );
+  } else if (protocol instanceof V1_UsernamePasswordAuthenticationStrategy) {
+    return serialize(
+      V1_UsernamePasswordAuthenticationStrategyModelSchema,
+      protocol,
+    );
   }
   const extraConnectionAuthenticationStrategyProtocolSerializers =
     plugins.flatMap(
@@ -436,6 +456,11 @@ export const V1_deserializeAuthenticationStrategy = (
       );
     case V1_AuthenticationStrategyType.OAUTH:
       return deserialize(V1_oAuthAuthenticationStrategyModelSchema, json);
+    case V1_AuthenticationStrategyType.USERNAME_PASSWORD:
+      return deserialize(
+        V1_UsernamePasswordAuthenticationStrategyModelSchema,
+        json,
+      );
     default: {
       const extraConnectionAuthenticationStrategyProtocolDeserializers =
         plugins.flatMap(

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

@@ -21,13 +21,13 @@ import {
   list,
   deserialize,
   serialize,
-  SKIP,
   object,
   alias,
   optional,
 } from 'serializr';
 import type { PlainObject } from '@finos/legend-shared';
 import {
+  optionalCustom,
   usingConstantValueSchema,
   deserializeArray,
   UnsupportedOperationError,
@@ -343,11 +343,9 @@ const V1_elementWithJoinsModelSchema = createModelSchema(V1_ElementWithJoins, {
     V1_RelationalOperationElementType.ELEMENT_WITH_JOINS,
   ),
   joins: list(usingModelSchema(V1_joinPointerModelSchema)),
-  relationalElement: custom(
-    (val) =>
-      val === undefined ? SKIP : V1_serializeRelationalOperationElement(val),
-    (val) =>
-      val === undefined ? SKIP : V1_deserializeRelationalOperationElement(val),
+  relationalElement: optionalCustom(
+    V1_serializeRelationalOperationElement,
+    V1_deserializeRelationalOperationElement,
   ),
 });
 

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

@@ -251,10 +251,7 @@ export const V1_constraintSchema = createModelSchema(V1_Constraint, {
   enforcementLevel: optional(primitive()),
   externalId: optional(primitive()),
   functionDefinition: usingModelSchema(V1_rawLambdaModelSchema),
-  messageFunction: custom(
-    (value) => (value ? serialize(V1_rawLambdaModelSchema, value) : SKIP),
-    (value) => deserialize(V1_rawLambdaModelSchema, value),
-  ),
+  messageFunction: optional(usingModelSchema(V1_rawLambdaModelSchema)),
   name: primitive(),
 });
 

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

@@ -577,7 +577,7 @@ function V1_serializeClassMapping(
   } else if (value instanceof V1_AggregationAwareClassMapping) {
     return serialize(aggregationAwareClassMappingModelSchema, value);
   }
-  if (plugins !== undefined) {
+  if (plugins) {
     const extraClassMappingSerializers = plugins.flatMap(
       (plugin) =>
         (
@@ -615,7 +615,7 @@ function V1_deserializeClassMapping(
     case V1_ClassMappingType.AGGREGATION_AWARE:
       return deserialize(aggregationAwareClassMappingModelSchema, json);
     default: {
-      if (plugins !== undefined) {
+      if (plugins) {
         const extraClassMappingDeserializers = plugins.flatMap(
           (plugin) =>
             (
@@ -1007,18 +1007,8 @@ export const V1_mappingModelSchema = (
     ),
     classMappings: list(
       custom(
-        (val) => {
-          if (plugins !== undefined) {
-            return V1_serializeClassMapping(val, plugins);
-          }
-          return V1_serializeClassMapping(val);
-        },
-        (val) => {
-          if (plugins !== undefined) {
-            return V1_deserializeClassMapping(val, plugins);
-          }
-          return V1_deserializeClassMapping(val);
-        },
+        (val) => V1_serializeClassMapping(val, plugins),
+        (val) => V1_deserializeClassMapping(val, plugins),
       ),
     ),
     enumerationMappings: list(

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

@@ -16,16 +16,15 @@
 
 import type { PlainObject } from '@finos/legend-shared';
 import {
+  optionalCustom,
   usingConstantValueSchema,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import {
   createModelSchema,
-  custom,
   deserialize,
   primitive,
   serialize,
-  SKIP,
 } from 'serializr';
 import { V1_BusinessMilestoning } from '../../../model/packageableElements/store/relational/model/milestoning/V1_BusinessMilestoning';
 import { V1_BusinessSnapshotMilestoning } from '../../../model/packageableElements/store/relational/model/milestoning/V1_BusinessSnapshotMilestoning';
@@ -49,9 +48,9 @@ const businessMilestoningModelSchema = createModelSchema(
   {
     _type: usingConstantValueSchema(V1_MilestoningType.BUSINESS_MILESTONING),
     from: primitive(),
-    infinityDate: custom(
-      (val) => (val ? V1_serializeRawValueSpecification(val) : SKIP),
-      (val) => (val ? V1_deserializeRawValueSpecification(val) : SKIP),
+    infinityDate: optionalCustom(
+      V1_serializeRawValueSpecification,
+      V1_deserializeRawValueSpecification,
     ),
     thru: primitive(),
     thruIsInclusive: primitive(),
@@ -64,9 +63,9 @@ const businessSnapshotMilestoningModelSchema = createModelSchema(
     _type: usingConstantValueSchema(
       V1_MilestoningType.BUSINESS_SNAPSHOT_MILESTONING,
     ),
-    infinityDate: custom(
-      (val) => (val ? V1_serializeRawValueSpecification(val) : SKIP),
-      (val) => (val ? V1_deserializeRawValueSpecification(val) : SKIP),
+    infinityDate: optionalCustom(
+      V1_serializeRawValueSpecification,
+      V1_deserializeRawValueSpecification,
     ),
     snapshotDate: primitive(),
   },
@@ -77,9 +76,9 @@ const processingMilestoningModelSchema = createModelSchema(
   {
     _type: usingConstantValueSchema(V1_MilestoningType.PROCESSING_MILESTONING),
     in: primitive(),
-    infinityDate: custom(
-      (val) => (val ? V1_serializeRawValueSpecification(val) : SKIP),
-      (val) => (val ? V1_deserializeRawValueSpecification(val) : SKIP),
+    infinityDate: optionalCustom(
+      V1_serializeRawValueSpecification,
+      V1_deserializeRawValueSpecification,
     ),
     out: primitive(),
     outIsInclusive: primitive(),

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

@@ -22,10 +22,10 @@ import {
   primitive,
   list,
   optional,
-  SKIP,
 } from 'serializr';
 import type { PlainObject } from '@finos/legend-shared';
 import {
+  optionalCustom,
   deserializeArray,
   serializeArray,
   deseralizeMap,
@@ -64,9 +64,9 @@ const dataTypeResultTypeModelSchema = createModelSchema(V1_DataTypeResultType, {
 
 const TDSColumnModelSchema = createModelSchema(V1_TDSColumn, {
   doc: optional(primitive()),
-  enumMapping: custom(
-    (val) => (val ? serializeMap(val) : SKIP),
-    (val) => (val ? deseralizeMap(val) : undefined),
+  enumMapping: optionalCustom(
+    (val: Map<string, unknown>) => serializeMap(val),
+    deseralizeMap,
   ),
   name: primitive(),
   relationalType: optional(primitive()),

package/tsconfig.json

@@ -70,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",
@@ -265,6 +267,7 @@
     "./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",
@@ -275,6 +278,7 @@
     "./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",