@finos/legend-graph 0.0.6 → 0.1.3

package/src/helpers/MappingResolutionHelper.ts

@@ -22,17 +22,22 @@ import type { PropertyMapping } from '../models/metamodels/pure/packageableEleme
 import type { Property } from '../models/metamodels/pure/packageableElements/domain/Property';
 import type { Mapping } from '../models/metamodels/pure/packageableElements/mapping/Mapping';
 import type { Class } from '../models/metamodels/pure/packageableElements/domain/Class';
-import { getClassMappingsByClass } from './MappingHelper';
+import {
+  getClassMappingsByClass,
+  getOwnClassMappingsByClass,
+} from './MappingHelper';
 
 /**
  * If this is the only mapping element for the target class, automatically mark it as root,
  * otherwise, if there is another set implementation make it non-root,
- * otherwise, leave other set implementation root status as-is
+ * otherwise, leave other set implementation root status as-is.
+ * NOTE: use get `OWN` class mappings as we are smartly updating the current mapping in the form editor,
+ * which does not support `include` mappings as of now.
  */
 export const updateRootSetImplementationOnCreate = (
   setImp: SetImplementation,
 ): void => {
-  const classMappingsWithSimilarTarget = getClassMappingsByClass(
+  const classMappingsWithSimilarTarget = getOwnClassMappingsByClass(
     setImp.parent,
     setImp.class.value,
   ).filter((si) => si !== setImp);
@@ -48,11 +53,13 @@ export const updateRootSetImplementationOnCreate = (
 
 /**
  * If only one set implementation remained, it will be nominated as the new root
+ * NOTE: use get `OWN` class mappings as we are smartly updating the current mapping in the form editor,
+ * which does not support `include` mappings as of now.
  */
 export const updateRootSetImplementationOnDelete = (
   setImp: SetImplementation,
 ): void => {
-  const classMappingsWithSimilarTarget = getClassMappingsByClass(
+  const classMappingsWithSimilarTarget = getOwnClassMappingsByClass(
     setImp.parent,
     setImp.class.value,
   ).filter((si) => si !== setImp);
@@ -64,11 +71,13 @@ export const updateRootSetImplementationOnDelete = (
 /**
  * Make the nominated set implementation root and flip the root flag of all other
  * set implementations with the same target
+ * NOTE: use get `OWN` class mappings as we are smartly updating the current mapping in the form editor,
+ * which does not support `include` mappings as of now.
  */
 export const nominateRootSetImplementation = (
   setImp: SetImplementation,
 ): void => {
-  const classMappingsWithSimilarTarget = getClassMappingsByClass(
+  const classMappingsWithSimilarTarget = getOwnClassMappingsByClass(
     setImp.parent,
     setImp.class.value,
   );

package/src/index.ts

@@ -65,6 +65,10 @@ export {
   StereotypeReference,
   StereotypeExplicitReference,
 } from './models/metamodels/pure/packageableElements/domain/StereotypeReference';
+export {
+  TagReference,
+  TagExplicitReference,
+} from './models/metamodels/pure/packageableElements/domain/TagReference';
 
 // V1 protocols
 export * from './models/protocols/pure/v1/model/packageableElements/V1_PackageableElement';
@@ -224,6 +228,7 @@ export { V1_serializeValueSpecification } from './models/protocols/pure/v1/trans
 export { V1_deserializeRawValueSpecification } from './models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_RawValueSpecificationSerializationHelper';
 export { V1_serializeRawValueSpecification } from './models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_RawValueSpecificationSerializationHelper';
 export { V1_ValueSpecificationBuilder } from './models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper';
+export * from './models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper';
 
 // --------------------------------------------- TO BE MODULARIZED --------------------------------------------------
 

package/src/models/metamodels/pure/packageableElements/connection/Connection.ts

@@ -28,6 +28,7 @@ import type { PackageableElementReference } from '../PackageableElementReference
 import type { ModelChainConnection } from '../store/modelToModel/connection/ModelChainConnection';
 
 export interface ConnectionVisitor<T> {
+  visit_Connection(connection: Connection): T;
   visit_ConnectionPointer(connection: ConnectionPointer): T;
   visit_ModelChainConnection(connection: ModelChainConnection): T;
   visit_JsonModelConnection(connection: JsonModelConnection): T;

package/src/models/metamodels/pure/packageableElements/domain/Multiplicity.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { observable, computed, makeObservable } from 'mobx';
+import { observable, computed, makeObservable, action } from 'mobx';
 import { hashArray } from '@finos/legend-shared';
 import {
   CORE_HASH_STRUCTURE,
@@ -32,12 +32,22 @@ export class Multiplicity implements Hashable {
       upperBound: observable,
       str: computed,
       hashCode: computed,
+      setLowerBound: action,
+      setUpperBound: action,
     });
 
     this.lowerBound = lowerBound;
     this.upperBound = upperBound;
   }
 
+  setLowerBound(val: number): void {
+    this.lowerBound = val;
+  }
+
+  setUpperBound(val: number | undefined): void {
+    this.upperBound = val;
+  }
+
   get str(): string {
     if (this.lowerBound === this.upperBound) {
       return this.lowerBound.toString();

package/src/models/metamodels/pure/packageableElements/mapping/Mapping.ts

@@ -52,8 +52,8 @@ export class Mapping extends PackageableElement implements Hashable, Stubable {
       deleteAssociationMapping: action,
       deleteTest: action,
       addTest: action,
-      allClassMappings: computed,
-      allEnumerationMappings: computed,
+      allOwnClassMappings: computed,
+      allOwnEnumerationMappings: computed,
       allIncludedMappings: computed,
       isStub: computed,
       _elementHashCode: override,
@@ -92,13 +92,11 @@ export class Mapping extends PackageableElement implements Hashable, Stubable {
     addUniqueEntry(this.tests, val);
   }
 
-  // TODO: account for mapping includes
-  get allClassMappings(): SetImplementation[] {
+  get allOwnClassMappings(): SetImplementation[] {
     return this.classMappings;
   }
 
-  // TODO: account for mapping includes
-  get allEnumerationMappings(): EnumerationMapping[] {
+  get allOwnEnumerationMappings(): EnumerationMapping[] {
     return this.enumerationMappings;
   }
 

package/src/models/metamodels/pure/packageableElements/mapping/PropertyMappingsImplementation.ts

@@ -20,4 +20,5 @@ import type { PropertyMapping } from './PropertyMapping';
 export interface PropertyMappingsImplementation
   extends PropertyOwnerImplementation {
   propertyMappings: PropertyMapping[];
+  superSetImplementationId?: string | undefined;
 }

package/src/models/metamodels/pure/packageableElements/store/relational/connection/DatasourceSpecification.ts

@@ -169,6 +169,11 @@ export class SnowflakeDatasourceSpecification
   databaseName: string;
   cloudType?: string | undefined;
   quotedIdentifiersIgnoreCase?: boolean | undefined;
+  proxyHost?: string | undefined;
+  proxyPort?: string | undefined;
+  nonProxyHosts?: string | undefined;
+  organization?: string | undefined;
+  accountType?: string | undefined;
 
   constructor(
     accountName: string,
@@ -185,12 +190,22 @@ export class SnowflakeDatasourceSpecification
       databaseName: observable,
       cloudType: observable,
       quotedIdentifiersIgnoreCase: observable,
+      proxyHost: observable,
+      proxyPort: observable,
+      nonProxyHosts: observable,
+      organization: observable,
+      accountType: observable,
       hashCode: computed,
       setAccountName: action,
       setRegion: action,
       setWarehouseName: action,
       setDatabaseName: action,
       setCloudType: action,
+      setProxyHost: action,
+      setProxyPort: action,
+      setNonProxyHosts: action,
+      setOrganization: action,
+      setAccountType: action,
       setQuotedIdentifiersIgnoreCase: action,
     });
 
@@ -224,6 +239,26 @@ export class SnowflakeDatasourceSpecification
     this.quotedIdentifiersIgnoreCase = val;
   }
 
+  setProxyHost(val: string | undefined): void {
+    this.proxyHost = val;
+  }
+
+  setProxyPort(val: string | undefined): void {
+    this.proxyPort = val;
+  }
+
+  setNonProxyHosts(val: string | undefined): void {
+    this.nonProxyHosts = val;
+  }
+
+  setOrganization(val: string | undefined): void {
+    this.organization = val;
+  }
+
+  setAccountType(val: string | undefined): void {
+    this.accountType = val;
+  }
+
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.SNOWFLAKE_DATASOURCE_SPECIFICATION,
@@ -232,6 +267,11 @@ export class SnowflakeDatasourceSpecification
       this.warehouseName,
       this.databaseName,
       this.cloudType ?? '',
+      this.proxyHost ?? '',
+      this.proxyPort ?? '',
+      this.nonProxyHosts ?? '',
+      this.organization ?? '',
+      this.accountType ?? '',
       this.quotedIdentifiersIgnoreCase?.toString() ?? '',
     ]);
   }

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/InlineEmbeddedRelationalInstanceSetImplementation.ts

@@ -28,7 +28,8 @@ import type { RootRelationalInstanceSetImplementation } from './RootRelationalIn
 import type { PackageableElementReference } from '../../../PackageableElementReference';
 import type { Class } from '../../../domain/Class';
 import type { InferableMappingElementIdValue } from '../../../mapping/InferableMappingElementId';
-import { UnsupportedOperationError } from '@finos/legend-shared';
+import { hashArray, UnsupportedOperationError } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
 
 export class InlineEmbeddedRelationalInstanceSetImplementation
   extends EmbeddedRelationalInstanceSetImplementation
@@ -71,4 +72,12 @@ export class InlineEmbeddedRelationalInstanceSetImplementation
   ): T {
     throw new UnsupportedOperationError();
   }
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.INLINE_EMBEDDED_REALTIONAL_PROPERTY_MAPPING,
+      this.property.pointerHashCode,
+      this.inlineSetImplementation.id.valueForSerialization ?? '',
+    ]);
+  }
 }

package/src/models/metamodels/pure/packageableElements/store/relational/mapping/RootRelationalInstanceSetImplementation.ts

@@ -42,7 +42,8 @@ export class RootRelationalInstanceSetImplementation
   filter?: FilterMapping | undefined;
   distinct?: boolean | undefined;
   groupBy?: GroupByMapping | undefined;
-  mainTableAlias!: TableAlias;
+  mainTableAlias?: TableAlias;
+  superSetImplementationId?: string | undefined;
 
   constructor(
     id: InferableMappingElementIdValue,
@@ -58,6 +59,7 @@ export class RootRelationalInstanceSetImplementation
       distinct: observable,
       groupBy: observable,
       mainTableAlias: observable,
+      superSetImplementationId: observable,
       setPropertyMappings: action,
       hashCode: computed,
     });
@@ -77,10 +79,11 @@ export class RootRelationalInstanceSetImplementation
     return hashArray([
       CORE_HASH_STRUCTURE.ROOT_RELATIONAL_INSTANCE_SET_IMPLEMENTATION,
       super.hashCode,
-      this.mainTableAlias.relation.pointerHashCode,
+      this.mainTableAlias?.relation.pointerHashCode ?? '',
       this.distinct?.toString() ?? '',
       hashArray(this.groupBy?.columns ?? []),
       this.filter ?? '',
+      this.superSetImplementationId ?? '',
     ]);
   }
 }

package/src/models/metamodels/pure/valueSpecification/ValueSpecification.ts

@@ -39,6 +39,7 @@ import type {
 } from './SimpleFunctionExpression';
 import type { INTERNAL__UnknownValueSpecification } from './INTERNAL__UnknownValueSpecification';
 import type { VariableExpression } from './VariableExpression';
+import { makeObservable, observable, action } from 'mobx';
 
 export interface ValueSpecificationVisitor<T> {
   visit_RootGraphFetchTreeInstanceValue(
@@ -83,10 +84,18 @@ export abstract class ValueSpecification {
     multiplicity: Multiplicity,
     genericTypeReference?: GenericTypeReference,
   ) {
+    makeObservable<ValueSpecification>(this, {
+      multiplicity: observable,
+      setMultiplicity: action,
+    });
     this.multiplicity = multiplicity;
     this.genericType = genericTypeReference;
   }
 
+  setMultiplicity(val: Multiplicity): void {
+    this.multiplicity = val;
+  }
+
   abstract accept_ValueSpecificationVisitor<T>(
     visitor: ValueSpecificationVisitor<T>,
   ): T;

package/src/models/metamodels/pure/valueSpecification/VariableExpression.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { makeObservable, observable, action } from 'mobx';
+import type { GenericTypeReference } from '../packageableElements/domain/GenericTypeReference';
 import type { Multiplicity } from '../packageableElements/domain/Multiplicity';
 import type { ValueSpecificationVisitor } from './ValueSpecification';
 import { ValueSpecification } from './ValueSpecification';
@@ -21,9 +23,23 @@ import { ValueSpecification } from './ValueSpecification';
 export class VariableExpression extends ValueSpecification {
   name: string;
 
-  constructor(name: string, multiplicity: Multiplicity) {
+  constructor(
+    name: string,
+    multiplicity: Multiplicity,
+    genericType?: GenericTypeReference | undefined,
+  ) {
     super(multiplicity);
+    makeObservable<VariableExpression>(this, {
+      name: observable,
+      genericType: observable,
+      setName: action,
+    });
     this.name = name;
+    this.genericType = genericType;
+  }
+
+  setName(val: string): void {
+    this.name = val;
   }
 
   accept_ValueSpecificationVisitor<T>(

package/src/models/protocols/pure/DSLMapping_PureProtocolProcessorPlugin_Extension.ts

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { PlainObject } from '@finos/legend-shared';
+import type { Connection } from '../../metamodels/pure/packageableElements/connection/Connection';
+import { PureProtocolProcessorPlugin } from './PureProtocolProcessorPlugin';
+import type { V1_Connection } from '../pure/v1/model/packageableElements/connection/V1_Connection';
+import type { V1_GraphTransformerContext } from './v1/transformation/pureGraph/from/V1_GraphTransformerContext';
+import type { V1_GraphBuilderContext } from './v1/transformation/pureGraph/to/V1_GraphBuilderContext';
+import type { Store } from '../../metamodels/pure/packageableElements/store/Store';
+import type { PackageableElementReference } from '../../metamodels/pure/packageableElements/PackageableElementReference';
+
+export type V1_ConnectionBuilder = (
+  connection: V1_Connection,
+  context: V1_GraphBuilderContext,
+  store?: PackageableElementReference<Store> | undefined,
+) => Connection | undefined;
+
+export type V1_ConnectionTransformer = (
+  metamodel: Connection,
+  context: V1_GraphTransformerContext,
+) => V1_Connection | undefined;
+
+export type V1_ConnectionProtocolSerializer = (
+  connection: V1_Connection,
+) => PlainObject<V1_Connection> | undefined;
+
+export type V1_ConnectionProtocolDeserializer = (
+  json: PlainObject<V1_Connection>,
+) => V1_Connection | undefined;
+
+export abstract class DSLMapping_PureProtocolProcessorPlugin_Extension extends PureProtocolProcessorPlugin {
+  V1_getExtraConnectionBuilders?(): V1_ConnectionBuilder[];
+
+  V1_getExtraConnectionTransformers?(): V1_ConnectionTransformer[];
+
+  V1_getExtraConnectionProtocolSerializers?(): V1_ConnectionProtocolSerializer[];
+
+  V1_getExtraConnectionProtocolDeserializers?(): V1_ConnectionProtocolDeserializer[];
+}

package/src/models/protocols/pure/v1/V1_PureGraphManager.ts

@@ -119,7 +119,7 @@ import type { V1_RawLambda } from './model/rawValueSpecification/V1_RawLambda';
 import { V1_ExecuteInput } from './engine/execution/V1_ExecuteInput';
 import type { V1_PureModelContextGenerationInput } from './engine/import/V1_PureModelContextGenerationInput';
 import { V1_buildValueSpecification } from './transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper';
-import { V1_ValueSpecificationTransformer } from './transformation/pureGraph/from/V1_ValueSpecificationTransformer';
+import { V1_transformRootValueSpecification } from './transformation/pureGraph/from/V1_ValueSpecificationTransformer';
 import { V1_Profile } from './model/packageableElements/domain/V1_Profile';
 import { V1_Class } from './model/packageableElements/domain/V1_Class';
 import { V1_Enumeration } from './model/packageableElements/domain/V1_Enumeration';
@@ -148,6 +148,7 @@ import {
   V1_DatabaseBuilderConfig,
   V1_DatabaseBuilderInput,
   V1_DatabasePattern,
+  V1_setupDatabaseBuilderInputSerialization,
   V1_TargetDatabase,
 } from './engine/generation/V1_DatabaseBuilderInput';
 import { V1_transformRelationalDatabaseConnection } from './transformation/pureGraph/from/V1_ConnectionTransformer';
@@ -157,6 +158,10 @@ import { V1_ServiceStore } from './model/packageableElements/store/relational/V1
 import type { V1_Multiplicity } from './model/packageableElements/domain/V1_Multiplicity';
 import type { V1_RawVariable } from './model/rawValueSpecification/V1_RawVariable';
 import { V1_setupDatabaseSerialization } from './transformation/pureProtocol/serializationHelpers/V1_DatabaseSerializationHelper';
+import {
+  V1_setupEngineRuntimeSerialization,
+  V1_setupLegacyRuntimeSerialization,
+} from './transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper';
 import type { DSLGenerationSpecification_PureProtocolProcessorPlugin_Extension } from '../DSLGenerationSpecification_PureProtocolProcessorPlugin_Extension';
 import type { RawRelationalOperationElement } from '../../../metamodels/pure/packageableElements/store/relational/model/RawRelationalOperationElement';
 import { V1_GraphTransformerContextBuilder } from './transformation/pureGraph/from/V1_GraphTransformerContext';
@@ -379,13 +384,22 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     this.extensions = new V1_GraphBuilderExtensions(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
-    // setup (de)serializer using plugins
+    // setup serialization plugins
     V1_setupPureModelContextDataSerialization(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
     V1_setupDatabaseSerialization(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
+    V1_setupEngineRuntimeSerialization(
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+    );
+    V1_setupLegacyRuntimeSerialization(
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+    );
+    V1_setupDatabaseBuilderInputSerialization(
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+    );
   }
 
   TEMP__getEngineConfig(): TEMP__AbstractEngineConfig {
@@ -1661,14 +1675,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     valueSpecification: ValueSpecification,
   ): Record<PropertyKey, unknown> {
     return V1_serializeValueSpecification(
-      valueSpecification.accept_ValueSpecificationVisitor(
-        new V1_ValueSpecificationTransformer(
-          [],
-          new Map<string, unknown[]>(),
-          true,
-          false,
-        ),
-      ),
+      V1_transformRootValueSpecification(valueSpecification),
     ) as Record<PropertyKey, unknown>;
   }
 
@@ -1942,7 +1949,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
   async registerService(
     graph: PureModel,
     service: Service,
-    projectId: string,
+    groupdId: string,
+    artifactId: string,
     server: string,
     executionMode: ServiceExecutionMode,
     version: string | undefined,
@@ -1962,7 +1970,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.SEMI_INTERACTIVE: {
-        const sdlcInfo = new V1_AlloySdlc(projectId, version);
+        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         // data
         const data = new V1_PureModelContextData();
@@ -1988,7 +1996,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.PROD: {
-        const sdlcInfo = new V1_AlloySdlc(projectId, version);
+        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         sdlcInfo.packageableElementPointers = [
           new V1_PackageableElementPointer(
@@ -2029,17 +2037,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     /* @MARKER: NEW ELEMENT TYPE SUPPORT --- consider adding new element type handler here whenever support for a new element type is added to the app */
     const prunedGraphData = new V1_PureModelContextData();
     prunedGraphData.elements = graphData.elements.filter(
-      (element) =>
-        element instanceof V1_Class ||
-        element instanceof V1_Enumeration ||
-        element instanceof V1_Profile ||
-        element instanceof V1_Association ||
-        element instanceof V1_ConcreteFunctionDefinition ||
-        element instanceof V1_Measure ||
-        element instanceof V1_Store ||
-        element instanceof V1_PackageableConnection ||
-        element instanceof V1_Mapping ||
-        element instanceof V1_PackageableRuntime,
+      (element) => !(element instanceof V1_Service),
     );
     prunedGraphData.elements.push(this.elementToProtocol<V1_Service>(service));
     return prunedGraphData;

package/src/models/protocols/pure/v1/engine/V1_Engine.ts

@@ -81,6 +81,7 @@ import { V1_ServiceStorage } from './service/V1_ServiceStorage';
 import { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult';
 import type { V1_PureModelContext } from '../model/context/V1_PureModelContext';
 import { ServiceExecutionMode } from '../../../../../graphManager/action/service/ServiceExecutionMode';
+import { serialize } from 'serializr';
 
 class V1_EngineConfig extends TEMP__AbstractEngineConfig {
   private engine: V1_Engine;
@@ -598,7 +599,7 @@ export class V1_Engine {
   ): Promise<V1_PureModelContextData> {
     return V1_deserializePureModelContextData(
       await this.engineServerClient.buildDatabase(
-        V1_DatabaseBuilderInput.serialization.toJson(input),
+        serialize(V1_DatabaseBuilderInput, input),
       ),
     );
   }