@finos/legend-extension-dsl-persistence 2.0.8 → 2.0.11

package/src/components/studio/{DSLPersistence_LegendStudioPlugin.tsx → DSLPersistence_LegendStudioApplicationPlugin.tsx}

@@ -15,12 +15,13 @@
  */
 
 import packageJson from '../../../package.json';
-import { MeteorIcon } from '@finos/legend-art';
+import type { DocumentationEntry } from '@finos/legend-application';
+import { MeteorIcon, PuzzlePieceIcon } from '@finos/legend-art';
 import type { PackageableElement } from '@finos/legend-graph';
 import {
-  LegendStudioPlugin,
+  LegendStudioApplicationPlugin,
   UnsupportedElementEditorState,
-  type DSL_LegendStudioPlugin_Extension,
+  type DSL_LegendStudioApplicationPlugin_Extension,
   type EditorStore,
   type ElementEditorState,
   type ElementEditorStateCreator,
@@ -36,21 +37,29 @@ import {
   type PureGrammarParserDocumentationGetter,
 } from '@finos/legend-studio';
 import { Persistence } from '../../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import {
+  PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL,
   PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL,
   PURE_GRAMMAR_PERSISTENCE_PARSER_NAME,
 } from '../../graphManager/DSLPersistence_PureGraphManagerPlugin.js';
+import {
+  BLANK_PERSISTENCE_CONTEXT_SNIPPET,
+  BLANK_PERSISTENCE_SNIPPET,
+} from './DSLPersistence_CodeSnippets.js';
 import { DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY } from './DSLPersistence_LegendStudioDocumentation.js';
-import { BLANK_PERSISTENCE_SNIPPET } from './DSLPersistence_CodeSnippets.js';
-import type { LegendApplicationDocumentationEntry } from '@finos/legend-application';
 
 const PERSISTENCE_ELEMENT_TYPE = 'PERSISTENCE';
+const PERSISTENCE_CONTEXT_ELEMENT_TYPE = 'PERSISTENCE_CONTEXT';
+
 const PERSISTENCE_ELEMENT_PROJECT_EXPLORER_DND_TYPE =
   'PROJECT_EXPLORER_PERSISTENCE';
+const PERSISTENCE_CONTEXT_ELEMENT_PROJECT_EXPLORER_DND_TYPE =
+  'PROJECT_EXPLORER_PERSISTENCE_CONTEXT';
 
-export class DSLPersistence_LegendStudioPlugin
-  extends LegendStudioPlugin
-  implements DSL_LegendStudioPlugin_Extension
+export class DSLPersistence_LegendStudioApplicationPlugin
+  extends LegendStudioApplicationPlugin
+  implements DSL_LegendStudioApplicationPlugin_Extension
 {
   constructor() {
     super(packageJson.extensions.studioPlugin, packageJson.version);
@@ -59,12 +68,13 @@ export class DSLPersistence_LegendStudioPlugin
   override getExtraRequiredDocumentationKeys(): string[] {
     return [
       DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY.GRAMMAR_ELEMENT_PERSISTENCE,
+      DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY.GRAMMAR_ELEMENT_PERSISTENCE_CONTEXT,
       DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY.GRAMMAR_PARSER,
     ];
   }
 
   getExtraSupportedElementTypes(): string[] {
-    return [PERSISTENCE_ELEMENT_TYPE];
+    return [PERSISTENCE_ELEMENT_TYPE, PERSISTENCE_CONTEXT_ELEMENT_TYPE];
   }
 
   getExtraElementTypeGetters(): ElementTypeGetter[] {
@@ -72,6 +82,8 @@ export class DSLPersistence_LegendStudioPlugin
       (element: PackageableElement): string | undefined => {
         if (element instanceof Persistence) {
           return PERSISTENCE_ELEMENT_TYPE;
+        } else if (element instanceof PersistenceContext) {
+          return PERSISTENCE_CONTEXT_ELEMENT_TYPE;
         }
         return undefined;
       },
@@ -87,6 +99,12 @@ export class DSLPersistence_LegendStudioPlugin
               <MeteorIcon />
             </div>
           );
+        } else if (type === PERSISTENCE_CONTEXT_ELEMENT_TYPE) {
+          return (
+            <div className="icon icon--persistence-context">
+              <PuzzlePieceIcon />
+            </div>
+          );
         }
         return undefined;
       },
@@ -102,6 +120,8 @@ export class DSLPersistence_LegendStudioPlugin
       ): PackageableElement | undefined => {
         if (type === PERSISTENCE_ELEMENT_TYPE) {
           return new Persistence(name);
+        } else if (type === PERSISTENCE_CONTEXT_ELEMENT_TYPE) {
+          return new PersistenceContext(name);
         }
         return undefined;
       },
@@ -116,6 +136,8 @@ export class DSLPersistence_LegendStudioPlugin
       ): ElementEditorState | undefined => {
         if (element instanceof Persistence) {
           return new UnsupportedElementEditorState(editorStore, element);
+        } else if (element instanceof PersistenceContext) {
+          return new UnsupportedElementEditorState(editorStore, element);
         }
         return undefined;
       },
@@ -127,6 +149,8 @@ export class DSLPersistence_LegendStudioPlugin
       (element: PackageableElement): string | undefined => {
         if (element instanceof Persistence) {
           return PERSISTENCE_ELEMENT_PROJECT_EXPLORER_DND_TYPE;
+        } else if (element instanceof PersistenceContext) {
+          return PERSISTENCE_CONTEXT_ELEMENT_PROJECT_EXPLORER_DND_TYPE;
         }
         return undefined;
       },
@@ -134,7 +158,10 @@ export class DSLPersistence_LegendStudioPlugin
   }
 
   getExtraGrammarTextEditorDnDTypes(): string[] {
-    return [PERSISTENCE_ELEMENT_PROJECT_EXPLORER_DND_TYPE];
+    return [
+      PERSISTENCE_ELEMENT_PROJECT_EXPLORER_DND_TYPE,
+      PERSISTENCE_CONTEXT_ELEMENT_PROJECT_EXPLORER_DND_TYPE,
+    ];
   }
 
   getExtraPureGrammarParserElementDocumentationGetters(): PureGrammarParserElementDocumentationGetter[] {
@@ -143,12 +170,19 @@ export class DSLPersistence_LegendStudioPlugin
         editorStore: EditorStore,
         parserKeyword: string,
         elementKeyword: string,
-      ): LegendApplicationDocumentationEntry | undefined => {
+      ): DocumentationEntry | undefined => {
         if (parserKeyword === PURE_GRAMMAR_PERSISTENCE_PARSER_NAME) {
           if (elementKeyword === PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL) {
             return editorStore.applicationStore.documentationService.getDocEntry(
               DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY.GRAMMAR_ELEMENT_PERSISTENCE,
             );
+          } else if (
+            elementKeyword ===
+            PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL
+          ) {
+            return editorStore.applicationStore.documentationService.getDocEntry(
+              DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY.GRAMMAR_ELEMENT_PERSISTENCE_CONTEXT,
+            );
           }
         }
         return undefined;
@@ -161,7 +195,7 @@ export class DSLPersistence_LegendStudioPlugin
       (
         editorStore: EditorStore,
         parserKeyword: string,
-      ): LegendApplicationDocumentationEntry | undefined => {
+      ): DocumentationEntry | undefined => {
         if (parserKeyword === PURE_GRAMMAR_PERSISTENCE_PARSER_NAME) {
           return editorStore.applicationStore.documentationService.getDocEntry(
             DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY.GRAMMAR_PARSER,
@@ -201,6 +235,11 @@ export class DSLPersistence_LegendStudioPlugin
                 description: '(blank)',
                 insertText: BLANK_PERSISTENCE_SNIPPET,
               },
+              {
+                text: PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL,
+                description: '(blank)',
+                insertText: BLANK_PERSISTENCE_CONTEXT_SNIPPET,
+              },
             ]
           : undefined,
     ];

package/src/components/studio/DSLPersistence_LegendStudioDocumentation.ts

@@ -17,4 +17,5 @@
 export enum DSL_PERSISTENCE_LEGEND_STUDIO_DOCUMENTATION_KEY {
   GRAMMAR_PARSER = 'dsl-persistence.grammar.parser',
   GRAMMAR_ELEMENT_PERSISTENCE = 'dsl-persistence.grammar.element.persistence',
+  GRAMMAR_ELEMENT_PERSISTENCE_CONTEXT = 'dsl-persistence.grammar.element.persistence-context',
 }

package/src/graph/DSLPersistence_PureGraphPlugin.ts

@@ -16,6 +16,7 @@
 
 import packageJson from '../../package.json';
 import { Persistence } from '../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import type { Clazz } from '@finos/legend-shared';
 import { type PackageableElement, PureGraphPlugin } from '@finos/legend-graph';
 
@@ -25,6 +26,6 @@ export class DSLPersistence_PureGraphPlugin extends PureGraphPlugin {
   }
 
   override getExtraPureGraphExtensionClasses(): Clazz<PackageableElement>[] {
-    return [Persistence];
+    return [Persistence, PersistenceContext];
   }
 }

package/src/graphManager/DSLPersistence_GraphManagerHelper.ts

@@ -15,6 +15,7 @@
  */
 
 import { Persistence } from '../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import type { BasicModel, PureModel } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 
@@ -25,6 +26,16 @@ export const getPersistence = (path: string, graph: PureModel): Persistence =>
     `Can't find persistence '${path}'`,
   );
 
+export const getPersistenceContext = (
+  path: string,
+  graph: PureModel,
+): PersistenceContext =>
+  graph.getExtensionElement(
+    path,
+    PersistenceContext,
+    `Can't find persistence context '${path}'`,
+  );
+
 export const getOwnPersistence = (
   path: string,
   graph: BasicModel,
@@ -33,3 +44,12 @@ export const getOwnPersistence = (
     graph.getOwnNullableExtensionElement(path, Persistence),
     `Can't find persistence '${path}'`,
   );
+
+export const getOwnPersistenceContext = (
+  path: string,
+  graph: BasicModel,
+): PersistenceContext =>
+  guaranteeNonNullable(
+    graph.getOwnNullableExtensionElement(path, PersistenceContext),
+    `Can't find persistence context '${path}'`,
+  );

package/src/graphManager/DSLPersistence_PureGraphManagerPlugin.ts

@@ -16,7 +16,9 @@
 
 import packageJson from '../../package.json';
 import { Persistence } from '../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import { observe_Persistence } from './action/changeDetection/DSLPersistence_ObserverHelper.js';
+import { observe_PersistenceContext } from './action/changeDetection/DSLPersistenceContext_ObserverHelper.js';
 import {
   PureGraphManagerPlugin,
   type PackageableElement,
@@ -27,6 +29,8 @@ import {
 
 export const PURE_GRAMMAR_PERSISTENCE_PARSER_NAME = 'Persistence';
 export const PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL = 'Persistence';
+export const PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL =
+  'PersistenceContext';
 
 export class DSLPersistence_PureGraphManagerPlugin extends PureGraphManagerPlugin {
   constructor() {
@@ -38,7 +42,10 @@ export class DSLPersistence_PureGraphManagerPlugin extends PureGraphManagerPlugi
   }
 
   override getExtraPureGrammarKeywords(): string[] {
-    return [PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL];
+    return [
+      PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL,
+      PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL,
+    ];
   }
 
   override getExtraPureGrammarElementLabelers(): PureGrammarElementLabeler[] {
@@ -46,6 +53,8 @@ export class DSLPersistence_PureGraphManagerPlugin extends PureGraphManagerPlugi
       (element: PackageableElement): string | undefined => {
         if (element instanceof Persistence) {
           return PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL;
+        } else if (element instanceof PersistenceContext) {
+          return PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL;
         }
         return undefined;
       },
@@ -60,6 +69,8 @@ export class DSLPersistence_PureGraphManagerPlugin extends PureGraphManagerPlugi
       ): PackageableElement | undefined => {
         if (element instanceof Persistence) {
           return observe_Persistence(element);
+        } else if (element instanceof PersistenceContext) {
+          return observe_PersistenceContext(element);
         }
         return undefined;
       },

package/src/graphManager/action/changeDetection/DSLPersistenceContext_ObserverHelper.ts

@@ -0,0 +1,38 @@
+/**
+ * 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 { PersistenceContext } from '../../../models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
+import {
+  observe_Abstract_PackageableElement,
+  skipObserved,
+} from '@finos/legend-graph';
+import { makeObservable, observable, override } from 'mobx';
+
+export const observe_PersistenceContext = skipObserved(
+  (metamodel: PersistenceContext): PersistenceContext => {
+    observe_Abstract_PackageableElement(metamodel);
+
+    makeObservable<PersistenceContext, '_elementHashCode'>(metamodel, {
+      persistence: observable,
+      platform: observable,
+      serviceParameters: observable,
+      sinkConnection: observable,
+      _elementHashCode: override,
+    });
+
+    return metamodel;
+  },
+);

package/src/index.ts

@@ -15,17 +15,29 @@
  */
 
 export * from './DSLPersistence_Extension.js';
-export { DSLPersistence_LegendStudioPlugin } from './components/studio/DSLPersistence_LegendStudioPlugin.js';
+export { DSLPersistence_LegendStudioApplicationPlugin } from './components/studio/DSLPersistence_LegendStudioApplicationPlugin.js';
 
 // ---------- PACKAGEABLE ELEMENT ----------
 
 // metamodels
 export { Persistence } from './models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+export { PersistenceContext } from './models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
+export { PersistencePlatform } from './models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistencePlatform.js';
 
 // v1 protocols
 export { V1_Persistence } from './models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_Persistence.js';
+export { V1_PersistenceContext } from './models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistenceContext.js';
+export { V1_PersistencePlatform } from './models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistencePlatform.js';
 
 // ---------- TRANSFORMATION ----------
 
-export { V1_transformPersistence } from './models/protocols/pure/v1/transformation/pureGraph/from/V1_PersistenceTransformer.js';
+// extension
+export * from './models/protocols/pure/DSLPersistence_PureProtocolProcessorPlugin_Extension.js';
+
+// builders
 export { V1_buildPersistence } from './models/protocols/pure/v1/transformation/pureGraph/to/V1_PersistenceBuilder.js';
+export { V1_buildPersistenceContext } from './models/protocols/pure/v1/transformation/pureGraph/to/V1_PersistenceContextBuilder.js';
+
+// transformers
+export { V1_transformPersistence } from './models/protocols/pure/v1/transformation/pureGraph/from/V1_PersistenceTransformer.js';
+export { V1_transformPersistenceContext } from './models/protocols/pure/v1/transformation/pureGraph/from/V1_PersistenceContextTransformer.js';

package/src/models/DSLPersistence_ModelUtils.ts

@@ -15,6 +15,20 @@
  */
 
 export enum PERSISTENCE_HASH_STRUCTURE {
+  // ----- PERSISTENCE CONTEXT -----
+
+  PERSISTENCE_CONTEXT = 'PERSISTENCE_CONTEXT',
+
+  // platform
+  DEFAULT_PERSISTENCE_PLATFORM = 'DEFAULT_PERSISTENCE_PLATFORM',
+
+  // service parameter
+  SERVICE_PARAMETER = 'SERVICE_PARAMETER',
+  PRIMITIVE_TYPE_VALUE_SERVICE_PARAMETER = 'PRIMITIVE_TYPE_VALUE_SERVICE_PARAMETER',
+  CONNECTION_VALUE_SERVICE_PARAMETER = 'CONNECTION_VALUE_SERVICE_PARAMETER',
+
+  // ----- PERSISTENCE -----
+
   PERSISTENCE = 'PERSISTENCE',
 
   // trigger

package/src/models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.ts

@@ -0,0 +1,50 @@
+/**
+ * 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 { Persistence } from './DSLPersistence_Persistence.js';
+import type { PersistencePlatform } from './DSLPersistence_PersistencePlatform.js';
+import type { ServiceParameter } from './DSLPersistence_ServiceParameter.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import {
+  type Connection,
+  PackageableElement,
+  type PackageableElementReference,
+  type PackageableElementVisitor,
+} from '@finos/legend-graph';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+
+export class PersistenceContext extends PackageableElement implements Hashable {
+  persistence!: PackageableElementReference<Persistence>;
+  platform!: PersistencePlatform;
+  serviceParameters: ServiceParameter[] = [];
+  sinkConnection?: Connection;
+
+  protected override get _elementHashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.PERSISTENCE_CONTEXT,
+      this.persistence.valueForSerialization ?? '',
+      this.platform,
+      hashArray(this.serviceParameters),
+      this.sinkConnection ?? '',
+    ]);
+  }
+
+  accept_PackageableElementVisitor<T>(
+    visitor: PackageableElementVisitor<T>,
+  ): T {
+    return visitor.visit_PackageableElement(this);
+  }
+}

package/src/models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistencePlatform.ts

@@ -0,0 +1,30 @@
+/**
+ * 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 { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+
+export abstract class PersistencePlatform implements Hashable {
+  abstract get hashCode(): string;
+}
+export class DefaultPersistencePlatform
+  extends PersistencePlatform
+  implements Hashable
+{
+  override get hashCode(): string {
+    return hashArray([PERSISTENCE_HASH_STRUCTURE.DEFAULT_PERSISTENCE_PLATFORM]);
+  }
+}

package/src/models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_ServiceParameter.ts

@@ -0,0 +1,61 @@
+/**
+ * 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 { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import type { Connection, ValueSpecification } from '@finos/legend-graph';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+
+export class ServiceParameter implements Hashable {
+  name!: string;
+  value!: ServiceParameterValue;
+
+  get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.SERVICE_PARAMETER,
+      this.name,
+      this.value,
+    ]);
+  }
+}
+
+export abstract class ServiceParameterValue implements Hashable {
+  abstract get hashCode(): string;
+}
+
+export class PrimitiveTypeValue
+  extends ServiceParameterValue
+  implements Hashable
+{
+  primitiveType!: ValueSpecification;
+
+  override get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.PRIMITIVE_TYPE_VALUE_SERVICE_PARAMETER,
+      //TODO: ledav -- hash value specification
+    ]);
+  }
+}
+
+export class ConnectionValue extends ServiceParameterValue implements Hashable {
+  connection!: Connection;
+
+  override get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.CONNECTION_VALUE_SERVICE_PARAMETER,
+      this.connection,
+    ]);
+  }
+}

package/src/models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_Sink.ts

@@ -18,6 +18,7 @@ import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelU
 import type {
   Binding,
   Connection,
+  Database,
   PackageableElementReference,
 } from '@finos/legend-graph';
 import { type Hashable, hashArray } from '@finos/legend-shared';
@@ -27,11 +28,15 @@ export abstract class Sink implements Hashable {
 }
 
 export class RelationalSink extends Sink implements Hashable {
+  //TODO: ledav -- make required once persistence changes are rolled out in engine
+  database?: PackageableElementReference<Database>;
+  //TODO: ledav -- remove once persistence changes are rolled out in engine
   connection?: Connection;
 
   override get hashCode(): string {
     return hashArray([
       PERSISTENCE_HASH_STRUCTURE.RELATIONAL_SINK,
+      this.database?.valueForSerialization ?? '',
       this.connection ?? '',
     ]);
   }
@@ -39,13 +44,14 @@ export class RelationalSink extends Sink implements Hashable {
 
 export class ObjectStorageSink extends Sink implements Hashable {
   binding!: PackageableElementReference<Binding>;
-  connection!: Connection;
+  //TODO: ledav -- remove once persistence changes are rolled out in engine
+  connection?: Connection;
 
   override get hashCode(): string {
     return hashArray([
       PERSISTENCE_HASH_STRUCTURE.OBJECT_STORAGE_SINK,
       this.binding.valueForSerialization ?? '',
-      this.connection,
+      this.connection ?? '',
     ]);
   }
 }

package/src/models/metamodels/pure/model/packageableElements/persistence/DSLPersistence_TargetShape.ts

@@ -17,18 +17,14 @@
 import type { DeduplicationStrategy } from './DSLPersistence_DeduplicationStrategy.js';
 import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
-import type {
-  Class,
-  OptionalPackageableElementReference,
-  PackageableElementReference,
-} from '@finos/legend-graph';
+import type { Class, PackageableElementReference } from '@finos/legend-graph';
 
 export abstract class TargetShape implements Hashable {
   abstract get hashCode(): string;
 }
 
 export class FlatTarget extends TargetShape implements Hashable {
-  modelClass!: OptionalPackageableElementReference<Class>;
+  modelClass?: PackageableElementReference<Class> | undefined;
   targetName!: string;
   partitionFields: string[] = [];
   deduplicationStrategy!: DeduplicationStrategy;
@@ -36,7 +32,7 @@ export class FlatTarget extends TargetShape implements Hashable {
   override get hashCode(): string {
     return hashArray([
       PERSISTENCE_HASH_STRUCTURE.FLAT_TARGET,
-      this.modelClass.valueForSerialization ?? '',
+      this.modelClass?.valueForSerialization ?? '',
       this.targetName,
       hashArray(this.partitionFields),
       this.deduplicationStrategy,