@finos/legend-extension-dsl-persistence 2.0.9 → 2.0.10

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

@@ -21,11 +21,23 @@ export { DSLPersistence_LegendStudioPlugin } from './components/studio/DSLPersis
 
 // 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/protocols/pure/DSLPersistence_PureProtocolProcessorPlugin.ts

@@ -16,13 +16,21 @@
 
 import packageJson from '../../../../package.json';
 import { Persistence } from '../../metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../../metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import { V1_Persistence } from './v1/model/packageableElements/persistence/V1_DSLPersistence_Persistence.js';
+import { V1_PersistenceContext } from './v1/model/packageableElements/persistence/V1_DSLPersistence_PersistenceContext.js';
 import {
   V1_PERSISTENCE_ELEMENT_PROTOCOL_TYPE,
   V1_persistenceModelSchema,
 } from './v1/transformation/pureProtocol/V1_DSLPersistence_ProtocolHelper.js';
+import {
+  V1_PERSISTENCE_CONTEXT_ELEMENT_PROTOCOL_TYPE,
+  V1_persistenceContextModelSchema,
+} from './v1/transformation/pureProtocol/V1_DSLPersistenceContext_ProtocolHelper.js';
 import { V1_buildPersistence } from './v1/transformation/pureGraph/to/V1_PersistenceBuilder.js';
+import { V1_buildPersistenceContext } from './v1/transformation/pureGraph/to/V1_PersistenceContextBuilder.js';
 import { V1_transformPersistence } from './v1/transformation/pureGraph/from/V1_PersistenceTransformer.js';
+import { V1_transformPersistenceContext } from './v1/transformation/pureGraph/from/V1_PersistenceContextTransformer.js';
 import {
   type PackageableElement,
   PureProtocolProcessorPlugin,
@@ -42,6 +50,9 @@ import { deserialize, serialize } from 'serializr';
 export const PERSISTENCE_ELEMENT_CLASSIFIER_PATH =
   'meta::pure::persistence::metamodel::Persistence';
 
+export const PERSISTENCE_CONTEXT_ELEMENT_CLASSIFIER_PATH =
+  'meta::pure::persistence::metamodel::PersistenceContext';
+
 export class DSLPersistence_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {
   constructor() {
     super(
@@ -80,6 +91,34 @@ export class DSLPersistence_PureProtocolProcessorPlugin extends PureProtocolProc
           V1_buildPersistence(elementProtocol, context);
         },
       }),
+      new V1_ElementBuilder<V1_PersistenceContext>({
+        elementClassName: 'PersistenceContext',
+        _class: V1_PersistenceContext,
+        firstPass: (
+          elementProtocol: V1_PackageableElement,
+          context: V1_GraphBuilderContext,
+        ): PackageableElement => {
+          assertType(elementProtocol, V1_PersistenceContext);
+          const element = new PersistenceContext(elementProtocol.name);
+          const path = V1_buildFullPath(
+            elementProtocol.package,
+            elementProtocol.name,
+          );
+          context.currentSubGraph.setOwnElementInExtension(
+            path,
+            element,
+            PersistenceContext,
+          );
+          return element;
+        },
+        secondPass: (
+          elementProtocol: V1_PackageableElement,
+          context: V1_GraphBuilderContext,
+        ): void => {
+          assertType(elementProtocol, V1_PersistenceContext);
+          V1_buildPersistenceContext(elementProtocol, context);
+        },
+      }),
     ];
   }
 
@@ -88,6 +127,8 @@ export class DSLPersistence_PureProtocolProcessorPlugin extends PureProtocolProc
       (elementProtocol: V1_PackageableElement): string | undefined => {
         if (elementProtocol instanceof V1_Persistence) {
           return PERSISTENCE_ELEMENT_CLASSIFIER_PATH;
+        } else if (elementProtocol instanceof V1_PersistenceContext) {
+          return PERSISTENCE_CONTEXT_ELEMENT_CLASSIFIER_PATH;
         }
         return undefined;
       },
@@ -102,6 +143,11 @@ export class DSLPersistence_PureProtocolProcessorPlugin extends PureProtocolProc
       ): PlainObject<V1_PackageableElement> | undefined => {
         if (elementProtocol instanceof V1_Persistence) {
           return serialize(V1_persistenceModelSchema(plugins), elementProtocol);
+        } else if (elementProtocol instanceof V1_PersistenceContext) {
+          return serialize(
+            V1_persistenceContextModelSchema(plugins),
+            elementProtocol,
+          );
         }
         return undefined;
       },
@@ -116,6 +162,10 @@ export class DSLPersistence_PureProtocolProcessorPlugin extends PureProtocolProc
       ): V1_PackageableElement | undefined => {
         if (json._type === V1_PERSISTENCE_ELEMENT_PROTOCOL_TYPE) {
           return deserialize(V1_persistenceModelSchema(plugins), json);
+        } else if (
+          json._type === V1_PERSISTENCE_CONTEXT_ELEMENT_PROTOCOL_TYPE
+        ) {
+          return deserialize(V1_persistenceContextModelSchema(plugins), json);
         }
         return undefined;
       },
@@ -130,6 +180,8 @@ export class DSLPersistence_PureProtocolProcessorPlugin extends PureProtocolProc
       ): V1_PackageableElement | undefined => {
         if (metamodel instanceof Persistence) {
           return V1_transformPersistence(metamodel, context);
+        } else if (metamodel instanceof PersistenceContext) {
+          return V1_transformPersistenceContext(metamodel, context);
         }
         return undefined;
       },

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

@@ -0,0 +1,57 @@
+/**
+ * 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 { V1_PersistencePlatform } from './v1/model/packageableElements/persistence/V1_DSLPersistence_PersistencePlatform.js';
+import type { PersistencePlatform } from '../../metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistencePlatform.js';
+import type {
+  PureProtocolProcessorPlugin,
+  V1_GraphBuilderContext,
+  V1_GraphTransformerContext,
+} from '@finos/legend-graph';
+import type { PlainObject } from '@finos/legend-shared';
+
+// types: persistence platform
+
+export type V1_PersistencePlatformBuilder = (
+  protocol: V1_PersistencePlatform,
+  context: V1_GraphBuilderContext,
+) => PersistencePlatform | undefined;
+
+export type V1_PersistencePlatformTransformer = (
+  metamodel: PersistencePlatform,
+  context: V1_GraphTransformerContext,
+) => V1_PersistencePlatform | undefined;
+
+export type V1_PersistencePlatformProtocolSerializer = (
+  protocol: V1_PersistencePlatform,
+) => PlainObject<V1_PersistencePlatform> | undefined;
+
+export type V1_PersistencePlatformProtocolDeserializer = (
+  json: PlainObject<V1_PersistencePlatform>,
+) => V1_PersistencePlatform | undefined;
+
+export interface DSLPersistence_PureProtocolProcessorPlugin_Extension
+  extends PureProtocolProcessorPlugin {
+  // extension hooks: persistence platform
+
+  V1_getExtraPersistencePlatformBuilders?(): V1_PersistencePlatformBuilder[];
+
+  V1_getExtraPersistencePlatformTransformers?(): V1_PersistencePlatformTransformer[];
+
+  V1_getExtraPersistencePlatformProtocolSerializers?(): V1_PersistencePlatformProtocolSerializer[];
+
+  V1_getExtraPersistencePlatformProtocolDeserializers?(): V1_PersistencePlatformProtocolDeserializer[];
+}

package/src/models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistenceContext.ts

@@ -0,0 +1,51 @@
+/**
+ * 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 { V1_PersistencePlatform } from './V1_DSLPersistence_PersistencePlatform.js';
+import type { V1_ServiceParameter } from './V1_DSLPersistence_ServiceParameter.js';
+import {
+  type V1_Connection,
+  V1_PackageableElement,
+  type V1_PackageableElementVisitor,
+} from '@finos/legend-graph';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+
+export class V1_PersistenceContext
+  extends V1_PackageableElement
+  implements Hashable
+{
+  persistence!: string;
+  platform!: V1_PersistencePlatform;
+  serviceParameters: V1_ServiceParameter[] = [];
+  sinkConnection?: V1_Connection;
+
+  override get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.PERSISTENCE_CONTEXT,
+      this.persistence,
+      this.platform,
+      hashArray(this.serviceParameters),
+      this.sinkConnection ?? '',
+    ]);
+  }
+
+  accept_PackageableElementVisitor<T>(
+    visitor: V1_PackageableElementVisitor<T>,
+  ): T {
+    return visitor.visit_PackageableElement(this);
+  }
+}

package/src/models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistencePlatform.ts

@@ -0,0 +1,31 @@
+/**
+ * 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 V1_PersistencePlatform implements Hashable {
+  abstract get hashCode(): string;
+}
+
+export class V1_DefaultPersistencePlatform
+  extends V1_PersistencePlatform
+  implements Hashable
+{
+  override get hashCode(): string {
+    return hashArray([PERSISTENCE_HASH_STRUCTURE.DEFAULT_PERSISTENCE_PLATFORM]);
+  }
+}

package/src/models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_ServiceParameter.ts

@@ -0,0 +1,64 @@
+/**
+ * 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 { V1_Connection, V1_ValueSpecification } from '@finos/legend-graph';
+import { type Hashable, hashArray } from '@finos/legend-shared';
+
+export class V1_ServiceParameter implements Hashable {
+  name!: string;
+  value!: V1_ServiceParameterValue;
+
+  get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.SERVICE_PARAMETER,
+      this.name,
+      this.value,
+    ]);
+  }
+}
+
+export abstract class V1_ServiceParameterValue implements Hashable {
+  abstract get hashCode(): string;
+}
+
+export class V1_PrimitiveTypeValue
+  extends V1_ServiceParameterValue
+  implements Hashable
+{
+  primitiveType!: V1_ValueSpecification;
+
+  override get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.PRIMITIVE_TYPE_VALUE_SERVICE_PARAMETER,
+      //TODO: ledav -- hash value specification
+    ]);
+  }
+}
+
+export class V1_ConnectionValue
+  extends V1_ServiceParameterValue
+  implements Hashable
+{
+  connection!: V1_Connection;
+
+  override get hashCode(): string {
+    return hashArray([
+      PERSISTENCE_HASH_STRUCTURE.CONNECTION_VALUE_SERVICE_PARAMETER,
+      this.connection,
+    ]);
+  }
+}

package/src/models/protocols/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_Sink.ts

@@ -23,11 +23,15 @@ export abstract class V1_Sink implements Hashable {
 }
 
 export class V1_RelationalSink extends V1_Sink implements Hashable {
+  //TODO: ledav -- make required once persistence changes are rolled out in engine
+  database?: string;
+  //TODO: ledav -- remove once persistence changes are rolled out in engine
   connection?: V1_Connection;
 
   override get hashCode(): string {
     return hashArray([
       PERSISTENCE_HASH_STRUCTURE.RELATIONAL_SINK,
+      this.database ?? '',
       this.connection ?? '',
     ]);
   }
@@ -35,13 +39,14 @@ export class V1_RelationalSink extends V1_Sink implements Hashable {
 
 export class V1_ObjectStorageSink extends V1_Sink implements Hashable {
   binding!: string;
-  connection!: V1_Connection;
+  //TODO: ledav -- remove once persistence changes are rolled out in engine
+  connection?: V1_Connection;
 
   override get hashCode(): string {
     return hashArray([
       PERSISTENCE_HASH_STRUCTURE.OBJECT_STORAGE_SINK,
       this.binding,
-      this.connection,
+      this.connection ?? '',
     ]);
   }
 }

package/src/models/protocols/pure/v1/transformation/pureGraph/V1_DSLPersistence_GraphBuilderHelper.ts

@@ -15,7 +15,11 @@
  */
 
 import type { Persistence } from '../../../../../metamodels/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
-import { getPersistence } from '../../../../../../graphManager/DSLPersistence_GraphManagerHelper.js';
+import type { PersistenceContext } from '../../../../../metamodels/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
+import {
+  getPersistence,
+  getPersistenceContext,
+} from '../../../../../../graphManager/DSLPersistence_GraphManagerHelper.js';
 import type {
   PackageableElementImplicitReference,
   V1_GraphBuilderContext,
@@ -28,3 +32,11 @@ export const V1_resolvePersistence = (
   context.createImplicitPackageableElementReference(path, (_path: string) =>
     getPersistence(_path, context.graph),
   );
+
+export const V1_resolvePersistenceContext = (
+  path: string,
+  context: V1_GraphBuilderContext,
+): PackageableElementImplicitReference<PersistenceContext> =>
+  context.createImplicitPackageableElementReference(path, (_path: string) =>
+    getPersistenceContext(_path, context.graph),
+  );