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

package/lib/{models/protocols → graphManager/protocol}/pure/v1/transformation/pureProtocol/V1_DSLPersistence_ProtocolHelper.js

@@ -390,11 +390,11 @@ var V1_SinkType;
 })(V1_SinkType || (V1_SinkType = {}));
 const V1_relationalSinkModelSchema = (plugins) => createModelSchema(V1_RelationalSink, {
     _type: usingConstantValueSchema(V1_SinkType.RELATIONAL_SINK),
-    database: optional(primitive()),
+    database: primitive(),
 });
 const V1_objectStorageSinkModelSchema = (plugins) => createModelSchema(V1_ObjectStorageSink, {
     _type: usingConstantValueSchema(V1_SinkType.OBJECT_STORAGE_SINK),
-    binding: optional(primitive()),
+    binding: primitive(),
 });
 export const V1_serializeSink = (protocol, plugins) => {
     if (protocol instanceof V1_RelationalSink) {
@@ -559,15 +559,15 @@ export const V1_deserializePersister = (json, plugins) => {
 /**********
  * trigger
  **********/
-var V1_TriggerType;
+export var V1_TriggerType;
 (function (V1_TriggerType) {
     V1_TriggerType["MANUAL_TRIGGER"] = "manualTrigger";
     V1_TriggerType["CRON_TRIGGER"] = "cronTrigger";
-})(V1_TriggerType || (V1_TriggerType = {}));
-const V1_manualTriggerModelSchema = createModelSchema(V1_ManualTrigger, {
+})(V1_TriggerType = V1_TriggerType || (V1_TriggerType = {}));
+export const V1_manualTriggerModelSchema = createModelSchema(V1_ManualTrigger, {
     _type: usingConstantValueSchema(V1_TriggerType.MANUAL_TRIGGER),
 });
-const V1_cronTriggerModelSchema = createModelSchema(V1_CronTrigger, {
+export const V1_cronTriggerModelSchema = createModelSchema(V1_CronTrigger, {
     _type: usingConstantValueSchema(V1_TriggerType.CRON_TRIGGER),
     minutes: primitive(),
     hours: primitive(),
@@ -575,24 +575,25 @@ const V1_cronTriggerModelSchema = createModelSchema(V1_CronTrigger, {
     month: primitive(),
     dayOfWeek: primitive(),
 });
-export const V1_serializeTrigger = (protocol) => {
-    if (protocol instanceof V1_ManualTrigger) {
-        return serialize(V1_manualTriggerModelSchema, protocol);
+export const V1_serializeTrigger = (protocol, plugins) => {
+    const extraTriggerProtocolSerializers = plugins.flatMap((plugin) => plugin.V1_getExtraTriggerProtocolSerializers?.() ?? []);
+    for (const serializer of extraTriggerProtocolSerializers) {
+        const triggerProtocolJson = serializer(protocol);
+        if (triggerProtocolJson) {
+            return triggerProtocolJson;
+        }
     }
-    else if (protocol instanceof V1_CronTrigger) {
-        return serialize(V1_cronTriggerModelSchema, protocol);
-    }
-    throw new UnsupportedOperationError(`Can't serialize trigger`, protocol);
+    throw new UnsupportedOperationError(`Can't serialize trigger: no compatible serializer available from plugins`, protocol);
 };
-export const V1_deserializeTrigger = (json) => {
-    switch (json._type) {
-        case V1_TriggerType.MANUAL_TRIGGER:
-            return deserialize(V1_manualTriggerModelSchema, json);
-        case V1_TriggerType.CRON_TRIGGER:
-            return deserialize(V1_cronTriggerModelSchema, json);
-        default:
-            throw new UnsupportedOperationError(`Can't deserialize trigger '${json._type}'`);
-    }
+export const V1_deserializeTrigger = (json, plugins) => {
+    const extraTriggerProtocolDeserializers = plugins.flatMap((plugin) => plugin.V1_getExtraTriggerProtocolDeserializers?.() ?? []);
+    for (const deserializer of extraTriggerProtocolDeserializers) {
+        const triggerProtocol = deserializer(json);
+        if (triggerProtocol) {
+            return triggerProtocol;
+        }
+    }
+    throw new UnsupportedOperationError(`Can't deserialize trigger of type '${json._type}': no compatible deserializer available from plugins`);
 };
 /**********
  * persistence
@@ -606,6 +607,6 @@ export const V1_persistenceModelSchema = (plugins) => createModelSchema(V1_Persi
     package: primitive(),
     persister: custom((val) => V1_serializePersister(val, plugins), (val) => V1_deserializePersister(val, plugins)),
     service: primitive(),
-    trigger: custom((val) => V1_serializeTrigger(val), (val) => V1_deserializeTrigger(val)),
+    trigger: custom((val) => V1_serializeTrigger(val, plugins), (val) => V1_deserializeTrigger(val, plugins)),
 });
 //# sourceMappingURL=V1_DSLPersistence_ProtocolHelper.js.map

package/lib/graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSLPersistence_ProtocolHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"V1_DSLPersistence_ProtocolHelper.js","sourceRoot":"","sources":["../../../../../../../src/graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSLPersistence_ProtocolHelper.ts"],"names":[],"mappings":"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"}

package/lib/index.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-extension-dsl-persistence v2.0.11
+/** @license @finos/legend-extension-dsl-persistence v3.0.2
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/index.d.ts

@@ -15,15 +15,17 @@
  */
 export * from './DSLPersistence_Extension.js';
 export { DSLPersistence_LegendStudioApplicationPlugin } from './components/studio/DSLPersistence_LegendStudioApplicationPlugin.js';
-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';
-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';
-export * from './models/protocols/pure/DSLPersistence_PureProtocolProcessorPlugin_Extension.js';
-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';
-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';
+export { Persistence } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+export { PersistenceContext } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
+export { PersistencePlatform } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistencePlatform.js';
+export { Trigger } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Trigger.js';
+export { V1_Persistence } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_Persistence.js';
+export { V1_PersistenceContext } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistenceContext.js';
+export { V1_PersistencePlatform } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistencePlatform.js';
+export { V1_Trigger } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_Trigger.js';
+export * from './graphManager/protocol/pure/DSLPersistence_PureProtocolProcessorPlugin_Extension.js';
+export { V1_buildPersistence } from './graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_PersistenceBuilder.js';
+export { V1_buildPersistenceContext } from './graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_PersistenceContextBuilder.js';
+export { V1_transformPersistence } from './graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_PersistenceTransformer.js';
+export { V1_transformPersistenceContext } from './graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_PersistenceContextTransformer.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,4CAA4C,EAAE,MAAM,qEAAqE,CAAC;AAKnI,OAAO,EAAE,WAAW,EAAE,MAAM,8FAA8F,CAAC;AAC3H,OAAO,EAAE,kBAAkB,EAAE,MAAM,qGAAqG,CAAC;AACzI,OAAO,EAAE,mBAAmB,EAAE,MAAM,sGAAsG,CAAC;AAG3I,OAAO,EAAE,cAAc,EAAE,MAAM,mGAAmG,CAAC;AACnI,OAAO,EAAE,qBAAqB,EAAE,MAAM,0GAA0G,CAAC;AACjJ,OAAO,EAAE,sBAAsB,EAAE,MAAM,2GAA2G,CAAC;AAKnJ,cAAc,iFAAiF,CAAC;AAGhG,OAAO,EAAE,mBAAmB,EAAE,MAAM,iFAAiF,CAAC;AACtH,OAAO,EAAE,0BAA0B,EAAE,MAAM,wFAAwF,CAAC;AAGpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,uFAAuF,CAAC;AAChI,OAAO,EAAE,8BAA8B,EAAE,MAAM,8FAA8F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,4CAA4C,EAAE,MAAM,qEAAqE,CAAC;AAKnI,OAAO,EAAE,WAAW,EAAE,MAAM,4FAA4F,CAAC;AACzH,OAAO,EAAE,kBAAkB,EAAE,MAAM,mGAAmG,CAAC;AACvI,OAAO,EAAE,mBAAmB,EAAE,MAAM,oGAAoG,CAAC;AACzI,OAAO,EAAE,OAAO,EAAE,MAAM,wFAAwF,CAAC;AAGjH,OAAO,EAAE,cAAc,EAAE,MAAM,wGAAwG,CAAC;AACxI,OAAO,EAAE,qBAAqB,EAAE,MAAM,+GAA+G,CAAC;AACtJ,OAAO,EAAE,sBAAsB,EAAE,MAAM,gHAAgH,CAAC;AACxJ,OAAO,EAAE,UAAU,EAAE,MAAM,oGAAoG,CAAC;AAKhI,cAAc,sFAAsF,CAAC;AAGrG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sFAAsF,CAAC;AAC3H,OAAO,EAAE,0BAA0B,EAAE,MAAM,6FAA6F,CAAC;AAGzI,OAAO,EAAE,uBAAuB,EAAE,MAAM,4FAA4F,CAAC;AACrI,OAAO,EAAE,8BAA8B,EAAE,MAAM,mGAAmG,CAAC"}

package/lib/index.js

@@ -17,20 +17,22 @@ export * from './DSLPersistence_Extension.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';
+export { Persistence } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+export { PersistenceContext } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
+export { PersistencePlatform } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistencePlatform.js';
+export { Trigger } from './graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Trigger.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';
+export { V1_Persistence } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_Persistence.js';
+export { V1_PersistenceContext } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistenceContext.js';
+export { V1_PersistencePlatform } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_PersistencePlatform.js';
+export { V1_Trigger } from './graphManager/protocol/pure/v1/model/packageableElements/persistence/V1_DSLPersistence_Trigger.js';
 // ---------- TRANSFORMATION ----------
 // extension
-export * from './models/protocols/pure/DSLPersistence_PureProtocolProcessorPlugin_Extension.js';
+export * from './graphManager/protocol/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';
+export { V1_buildPersistence } from './graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_PersistenceBuilder.js';
+export { V1_buildPersistenceContext } from './graphManager/protocol/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';
+export { V1_transformPersistence } from './graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_PersistenceTransformer.js';
+export { V1_transformPersistenceContext } from './graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_PersistenceContextTransformer.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,4CAA4C,EAAE,MAAM,qEAAqE,CAAC;AAEnI,4CAA4C;AAE5C,aAAa;AACb,OAAO,EAAE,WAAW,EAAE,MAAM,8FAA8F,CAAC;AAC3H,OAAO,EAAE,kBAAkB,EAAE,MAAM,qGAAqG,CAAC;AACzI,OAAO,EAAE,mBAAmB,EAAE,MAAM,sGAAsG,CAAC;AAE3I,eAAe;AACf,OAAO,EAAE,cAAc,EAAE,MAAM,mGAAmG,CAAC;AACnI,OAAO,EAAE,qBAAqB,EAAE,MAAM,0GAA0G,CAAC;AACjJ,OAAO,EAAE,sBAAsB,EAAE,MAAM,2GAA2G,CAAC;AAEnJ,uCAAuC;AAEvC,YAAY;AACZ,cAAc,iFAAiF,CAAC;AAEhG,WAAW;AACX,OAAO,EAAE,mBAAmB,EAAE,MAAM,iFAAiF,CAAC;AACtH,OAAO,EAAE,0BAA0B,EAAE,MAAM,wFAAwF,CAAC;AAEpI,eAAe;AACf,OAAO,EAAE,uBAAuB,EAAE,MAAM,uFAAuF,CAAC;AAChI,OAAO,EAAE,8BAA8B,EAAE,MAAM,8FAA8F,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,4CAA4C,EAAE,MAAM,qEAAqE,CAAC;AAEnI,4CAA4C;AAE5C,aAAa;AACb,OAAO,EAAE,WAAW,EAAE,MAAM,4FAA4F,CAAC;AACzH,OAAO,EAAE,kBAAkB,EAAE,MAAM,mGAAmG,CAAC;AACvI,OAAO,EAAE,mBAAmB,EAAE,MAAM,oGAAoG,CAAC;AACzI,OAAO,EAAE,OAAO,EAAE,MAAM,wFAAwF,CAAC;AAEjH,eAAe;AACf,OAAO,EAAE,cAAc,EAAE,MAAM,wGAAwG,CAAC;AACxI,OAAO,EAAE,qBAAqB,EAAE,MAAM,+GAA+G,CAAC;AACtJ,OAAO,EAAE,sBAAsB,EAAE,MAAM,gHAAgH,CAAC;AACxJ,OAAO,EAAE,UAAU,EAAE,MAAM,oGAAoG,CAAC;AAEhI,uCAAuC;AAEvC,YAAY;AACZ,cAAc,sFAAsF,CAAC;AAErG,WAAW;AACX,OAAO,EAAE,mBAAmB,EAAE,MAAM,sFAAsF,CAAC;AAC3H,OAAO,EAAE,0BAA0B,EAAE,MAAM,6FAA6F,CAAC;AAEzI,eAAe;AACf,OAAO,EAAE,uBAAuB,EAAE,MAAM,4FAA4F,CAAC;AACrI,OAAO,EAAE,8BAA8B,EAAE,MAAM,mGAAmG,CAAC"}

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-extension-dsl-persistence",
-    "version": "2.0.11",
+    "version": "3.0.2",
     "description": "Legend extension for Persistence DSL",
     "keywords": [
         "legend",
@@ -44,11 +44,11 @@
     },
     "dependencies": {
         "@finos/legend-application": "workspace:*",
+        "@finos/legend-application-studio": "workspace:*",
         "@finos/legend-art": "workspace:*",
         "@finos/legend-graph": "workspace:*",
-        "@finos/legend-model-storage": "workspace:*",
         "@finos/legend-shared": "workspace:*",
-        "@finos/legend-studio": "workspace:*",
+        "@finos/legend-storage": "workspace:*",
         "@types/react": "18.0.15",
         "mobx": "6.6.1",
         "react": "18.2.0",
@@ -58,7 +58,7 @@
         "@finos/legend-dev-utils": "workspace:*",
         "@jest/globals": "28.1.3",
         "cross-env": "7.0.3",
-        "eslint": "8.20.0",
+        "eslint": "8.21.0",
         "jest": "28.1.3",
         "npm-run-all": "4.1.5",
         "rimraf": "3.0.2",
@@ -72,10 +72,10 @@
         "directory": "build/publishContent"
     },
     "extensions": {
-        "graphPreset": "@finos/legend-graph-preset-dsl-persistence",
-        "pureProtocolProcessorPlugin": "@finos/legend-graph-plugin-dsl-persistence-protocol-processor",
-        "pureGraphManagerPlugin": "@finos/legend-graph-plugin-dsl-persistence-pure-graph-manager",
-        "pureGraphPlugin": "@finos/legend-graph-plugin-dsl-persistence-pure-graph",
-        "studioPlugin": "@finos/legend-studio-plugin-dsl-persistence"
+        "graphManagerPreset": "@finos/legend-graph-manager-preset-dsl-persistence",
+        "pureProtocolProcessorPlugin": "@finos/legend-pure-protocol-processor-plugin-dsl-persistence",
+        "pureGraphManagerPlugin": "@finos/legend-pure-graph-manager-plugin-dsl-persistence",
+        "pureGraphPlugin": "@finos/legend-pure-graph-plugin-dsl-persistence",
+        "applicationStudioPlugin": "@finos/legend-application-studio-plugin-dsl-persistence"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-extension-dsl-persistence",
-  "version": "2.0.11",
+  "version": "3.0.2",
   "description": "Legend extension for Persistence DSL",
   "keywords": [
     "legend",
@@ -43,22 +43,22 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "7.0.0",
-    "@finos/legend-art": "2.0.9",
-    "@finos/legend-graph": "11.0.0",
-    "@finos/legend-model-storage": "2.0.7",
-    "@finos/legend-shared": "5.0.0",
-    "@finos/legend-studio": "12.0.0",
+    "@finos/legend-application": "7.0.3",
+    "@finos/legend-application-studio": "13.0.2",
+    "@finos/legend-art": "2.0.12",
+    "@finos/legend-graph": "13.0.1",
+    "@finos/legend-shared": "5.0.2",
+    "@finos/legend-storage": "3.0.2",
     "@types/react": "18.0.15",
     "mobx": "6.6.1",
     "react": "18.2.0",
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.6",
+    "@finos/legend-dev-utils": "2.0.8",
     "@jest/globals": "28.1.3",
     "cross-env": "7.0.3",
-    "eslint": "8.20.0",
+    "eslint": "8.21.0",
     "jest": "28.1.3",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
@@ -72,10 +72,10 @@
     "directory": "build/publishContent"
   },
   "extensions": {
-    "graphPreset": "@finos/legend-graph-preset-dsl-persistence",
-    "pureProtocolProcessorPlugin": "@finos/legend-graph-plugin-dsl-persistence-protocol-processor",
-    "pureGraphManagerPlugin": "@finos/legend-graph-plugin-dsl-persistence-pure-graph-manager",
-    "pureGraphPlugin": "@finos/legend-graph-plugin-dsl-persistence-pure-graph",
-    "studioPlugin": "@finos/legend-studio-plugin-dsl-persistence"
+    "graphManagerPreset": "@finos/legend-graph-manager-preset-dsl-persistence",
+    "pureProtocolProcessorPlugin": "@finos/legend-pure-protocol-processor-plugin-dsl-persistence",
+    "pureGraphManagerPlugin": "@finos/legend-pure-graph-manager-plugin-dsl-persistence",
+    "pureGraphPlugin": "@finos/legend-pure-graph-plugin-dsl-persistence",
+    "applicationStudioPlugin": "@finos/legend-application-studio-plugin-dsl-persistence"
   }
 }

package/src/DSLPersistence_Extension.ts

@@ -18,11 +18,11 @@ import packageJson from '../package.json';
 import { AbstractPreset } from '@finos/legend-shared';
 import { DSLPersistence_PureGraphPlugin } from './graph/DSLPersistence_PureGraphPlugin.js';
 import { DSLPersistence_PureGraphManagerPlugin } from './graphManager/DSLPersistence_PureGraphManagerPlugin.js';
-import { DSLPersistence_PureProtocolProcessorPlugin } from './models/protocols/pure/DSLPersistence_PureProtocolProcessorPlugin.js';
+import { DSLPersistence_PureProtocolProcessorPlugin } from './graphManager/protocol/pure/DSLPersistence_PureProtocolProcessorPlugin.js';
 
-export class DSLPersistence_GraphPreset extends AbstractPreset {
+export class DSLPersistence_GraphManagerPreset extends AbstractPreset {
   constructor() {
-    super(packageJson.extensions.graphPreset, packageJson.version, [
+    super(packageJson.extensions.graphManagerPreset, packageJson.version, [
       new DSLPersistence_PureGraphPlugin(),
       new DSLPersistence_PureGraphManagerPlugin(),
       new DSLPersistence_PureProtocolProcessorPlugin(),

package/src/components/studio/DSLPersistence_LegendStudioApplicationPlugin.tsx

@@ -35,9 +35,10 @@ import {
   type PureGrammarTextSuggestion,
   type PureGrammarParserElementDocumentationGetter,
   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';
+  type ElementTypeLabelGetter,
+} from '@finos/legend-application-studio';
+import { Persistence } from '../../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import {
   PURE_GRAMMAR_PERSISTENCE_CONTEXT_ELEMENT_TYPE_LABEL,
   PURE_GRAMMAR_PERSISTENCE_ELEMENT_TYPE_LABEL,
@@ -62,7 +63,7 @@ export class DSLPersistence_LegendStudioApplicationPlugin
   implements DSL_LegendStudioApplicationPlugin_Extension
 {
   constructor() {
-    super(packageJson.extensions.studioPlugin, packageJson.version);
+    super(packageJson.extensions.applicationStudioPlugin, packageJson.version);
   }
 
   override getExtraRequiredDocumentationKeys(): string[] {
@@ -244,4 +245,15 @@ export class DSLPersistence_LegendStudioApplicationPlugin
           : undefined,
     ];
   }
+
+  getExtraElementTypeLabelGetters(): ElementTypeLabelGetter[] {
+    return [
+      (type: string): string | undefined => {
+        if (type === PERSISTENCE_CONTEXT_ELEMENT_TYPE) {
+          return 'Persistence Context';
+        }
+        return undefined;
+      },
+    ];
+  }
 }

package/src/graph/DSLPersistence_PureGraphPlugin.ts

@@ -15,8 +15,8 @@
  */
 
 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 { Persistence } from '../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import type { Clazz } from '@finos/legend-shared';
 import { type PackageableElement, PureGraphPlugin } from '@finos/legend-graph';
 

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Auditing.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class Auditing implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_DeduplicationStrategy.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class DeduplicationStrategy implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_IngestMode.ts

@@ -20,7 +20,7 @@ import type {
   TransactionMilestoning,
   ValidityMilestoning,
 } from './DSLPersistence_Milestoning.js';
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class IngestMode implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_MergeStrategy.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class MergeStrategy implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Milestoning.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 // transaction milestoning

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Notifier.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export class Notifier implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Persistence.ts

@@ -17,7 +17,7 @@
 import type { Notifier } from './DSLPersistence_Notifier.js';
 import type { Persister } from './DSLPersistence_Persister.js';
 import type { Trigger } from './DSLPersistence_Trigger.js';
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import {
   PackageableElement,
   type PackageableElementReference,

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.ts

@@ -17,7 +17,7 @@
 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 { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import {
   type Connection,
   PackageableElement,

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_PersistencePlatform.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class PersistencePlatform implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Persister.ts

@@ -17,7 +17,7 @@
 import type { IngestMode } from './DSLPersistence_IngestMode.js';
 import type { Sink } from './DSLPersistence_Sink.js';
 import type { TargetShape } from './DSLPersistence_TargetShape.js';
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class Persister implements Hashable {

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_ServiceParameter.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import type { Connection, ValueSpecification } from '@finos/legend-graph';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Sink.ts

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import type {
   Binding,
-  Connection,
   Database,
   PackageableElementReference,
 } from '@finos/legend-graph';
@@ -28,30 +27,23 @@ 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;
+  database!: PackageableElementReference<Database>;
 
   override get hashCode(): string {
     return hashArray([
       PERSISTENCE_HASH_STRUCTURE.RELATIONAL_SINK,
-      this.database?.valueForSerialization ?? '',
-      this.connection ?? '',
+      this.database.valueForSerialization ?? '',
     ]);
   }
 }
 
 export class ObjectStorageSink extends Sink implements Hashable {
   binding!: PackageableElementReference<Binding>;
-  //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 ?? '',
     ]);
   }
 }

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_TargetShape.ts

@@ -15,7 +15,7 @@
  */
 
 import type { DeduplicationStrategy } from './DSLPersistence_DeduplicationStrategy.js';
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import type { Class, PackageableElementReference } from '@finos/legend-graph';
 

package/src/{models/metamodels → graph/metamodel}/pure/model/packageableElements/persistence/DSLPersistence_Trigger.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_ModelUtils.js';
+import { PERSISTENCE_HASH_STRUCTURE } from '../../../../../DSLPersistence_HashUtils.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 
 export abstract class Trigger implements Hashable {

package/src/graphManager/DSLPersistence_GraphManagerHelper.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-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 { Persistence } from '../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_PersistenceContext.js';
 import type { BasicModel, PureModel } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 

package/src/graphManager/DSLPersistence_PureGraphManagerPlugin.ts

@@ -15,8 +15,8 @@
  */
 
 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 { Persistence } from '../graph/metamodel/pure/model/packageableElements/persistence/DSLPersistence_Persistence.js';
+import { PersistenceContext } from '../graph/metamodel/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 {