@finos/legend-extension-dsl-text 1.0.33 → 1.0.36

package/lib/graphManager/DSLText_GraphManagerHelper.d.ts

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { PureModel } from '@finos/legend-graph';
+import type { BasicModel, PureModel } from '@finos/legend-graph';
 import { Text } from '../models/metamodels/pure/model/packageableElements/text/DSLText_Text';
 export declare const getText: (path: string, graph: PureModel) => Text;
+export declare const getOwnText: (path: string, graph: BasicModel) => Text;
 //# sourceMappingURL=DSLText_GraphManagerHelper.d.ts.map

package/lib/graphManager/DSLText_GraphManagerHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DSLText_GraphManagerHelper.d.ts","sourceRoot":"","sources":["../../src/graphManager/DSLText_GraphManagerHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,uEAAuE,CAAC;AAE7F,eAAO,MAAM,OAAO,SAAU,MAAM,SAAS,SAAS,KAAG,IACmB,CAAC"}
+{"version":3,"file":"DSLText_GraphManagerHelper.d.ts","sourceRoot":"","sources":["../../src/graphManager/DSLText_GraphManagerHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEjE,OAAO,EAAE,IAAI,EAAE,MAAM,uEAAuE,CAAC;AAE7F,eAAO,MAAM,OAAO,SAAU,MAAM,SAAS,SAAS,KAAG,IACmB,CAAC;AAE7E,eAAO,MAAM,UAAU,SAAU,MAAM,SAAS,UAAU,KAAG,IAI1D,CAAC"}

package/lib/graphManager/DSLText_GraphManagerHelper.js

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import { Text } from '../models/metamodels/pure/model/packageableElements/text/DSLText_Text';
 export const getText = (path, graph) => graph.getExtensionElement(path, Text, `Can't find text element '${path}'`);
+export const getOwnText = (path, graph) => guaranteeNonNullable(graph.getOwnNullableExtensionElement(path, Text), `Can't find text '${path}'`);
 //# sourceMappingURL=DSLText_GraphManagerHelper.js.map

package/lib/graphManager/DSLText_GraphManagerHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DSLText_GraphManagerHelper.js","sourceRoot":"","sources":["../../src/graphManager/DSLText_GraphManagerHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,uEAAuE,CAAC;AAE7F,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,KAAgB,EAAQ,EAAE,CAC9D,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,4BAA4B,IAAI,GAAG,CAAC,CAAC"}
+{"version":3,"file":"DSLText_GraphManagerHelper.js","sourceRoot":"","sources":["../../src/graphManager/DSLText_GraphManagerHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,uEAAuE,CAAC;AAE7F,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,KAAgB,EAAQ,EAAE,CAC9D,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,4BAA4B,IAAI,GAAG,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,KAAiB,EAAQ,EAAE,CAClE,oBAAoB,CAClB,KAAK,CAAC,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,EAChD,oBAAoB,IAAI,GAAG,CAC5B,CAAC"}

package/lib/index.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-extension-dsl-text v1.0.33
+/** @license @finos/legend-extension-dsl-text v1.0.36
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/models/metamodels/pure/model/packageableElements/text/DSLText_Text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DSLText_Text.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/model/packageableElements/text/DSLText_Text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,KAAK,yBAAyB,EAC9B,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAE7B,oBAAY,SAAS;IACnB,UAAU,cAAc;IACxB,QAAQ,aAAa;CACtB;AAED,qBAAa,IAAK,SAAQ,kBAAmB,YAAW,QAAQ;IAC9D,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;gBAEJ,IAAI,EAAE,MAAM;IAMxB,cAAuB,gBAAgB,IAAI,MAAM,CAOhD;IAED,gCAAgC,CAAC,CAAC,EAChC,OAAO,EAAE,yBAAyB,CAAC,CAAC,CAAC,GACpC,CAAC;CAGL"}
+{"version":3,"file":"DSLText_Text.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/model/packageableElements/text/DSLText_Text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,KAAK,yBAAyB,EAC9B,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAG7B,oBAAY,SAAS;IACnB,UAAU,cAAc;IACxB,QAAQ,aAAa;CACtB;AAED,qBAAa,IAAK,SAAQ,kBAAmB,YAAW,QAAQ;IAC9D,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;gBAEJ,IAAI,EAAE,MAAM;IAMxB,cAAuB,gBAAgB,IAAI,MAAM,CAOhD;IAED,gCAAgC,CAAC,CAAC,EAChC,OAAO,EAAE,yBAAyB,CAAC,CAAC,CAAC,GACpC,CAAC;CAGL"}

package/lib/models/metamodels/pure/model/packageableElements/text/DSLText_Text.js

@@ -16,6 +16,7 @@
 import { hashArray } from '@finos/legend-shared';
 import { TEXT_HASH_STRUCTURE } from '../../../../../DSLText_ModelUtils';
 import { PackageableElement, } from '@finos/legend-graph';
+// TODO: to be moved out of metamodel
 export var TEXT_TYPE;
 (function (TEXT_TYPE) {
     TEXT_TYPE["PLAIN_TEXT"] = "plainText";

package/lib/models/metamodels/pure/model/packageableElements/text/DSLText_Text.js.map

@@ -1 +1 @@
-{"version":3,"file":"DSLText_Text.js","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/model/packageableElements/text/DSLText_Text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAEL,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,qCAAwB,CAAA;IACxB,kCAAqB,CAAA;AACvB,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,OAAO,IAAK,SAAQ,kBAAkB;IAC1C,IAAI,CAAY;IAChB,OAAO,CAAS;IAEhB,YAAY,IAAY;QACtB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAuB,gBAAgB;QACrC,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,IAAI;YACxB,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,OAAO;SACb,CAAC,CAAC;IACL,CAAC;IAED,gCAAgC,CAC9B,OAAqC;QAErC,OAAO,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CACF"}
+{"version":3,"file":"DSLText_Text.js","sourceRoot":"","sources":["../../../../../../../src/models/metamodels/pure/model/packageableElements/text/DSLText_Text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAEL,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAE7B,qCAAqC;AACrC,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,qCAAwB,CAAA;IACxB,kCAAqB,CAAA;AACvB,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,OAAO,IAAK,SAAQ,kBAAkB;IAC1C,IAAI,CAAY;IAChB,OAAO,CAAS;IAEhB,YAAY,IAAY;QACtB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAuB,gBAAgB;QACrC,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,IAAI;YACxB,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,OAAO;SACb,CAAC,CAAC;IACL,CAAC;IAED,gCAAgC,CAC9B,OAAqC;QAErC,OAAO,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CACF"}

package/lib/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DSLText_PureProtocolProcessorPlugin.d.ts","sourceRoot":"","sources":["../../../../src/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAmBH,OAAO,EAEL,KAAK,sCAAsC,EAC3C,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EACjC,KAAK,qBAAqB,EAG1B,KAAK,qBAAqB,EAC1B,2BAA2B,EAC3B,iBAAiB,EAElB,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,mCAAoC,SAAQ,2BAA2B;;IAQzE,0BAA0B,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,EAAE;IAyCxE,uCAAuC,IAAI,sCAAsC,EAAE;IAWnF,qCAAqC,IAAI,4BAA4B,EAAE;IAcvE,uCAAuC,IAAI,8BAA8B,EAAE;IAc3E,8BAA8B,IAAI,qBAAqB,EAAE;CAmBnE"}
+{"version":3,"file":"DSLText_PureProtocolProcessorPlugin.d.ts","sourceRoot":"","sources":["../../../../src/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAmBH,OAAO,EAEL,KAAK,sCAAsC,EAC3C,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,EACjC,KAAK,qBAAqB,EAG1B,KAAK,qBAAqB,EAC1B,2BAA2B,EAC3B,iBAAiB,EAGlB,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,mCAAoC,SAAQ,2BAA2B;;IAQzE,0BAA0B,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,EAAE;IAyCxE,uCAAuC,IAAI,sCAAsC,EAAE;IAWnF,qCAAqC,IAAI,4BAA4B,EAAE;IAcvE,uCAAuC,IAAI,8BAA8B,EAAE;IAc3E,8BAA8B,IAAI,qBAAqB,EAAE;CAmBnE"}

package/lib/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.js

@@ -18,9 +18,9 @@ import { V1_Text } from './v1/model/packageableElements/text/V1_DSLText_Text';
 import { guaranteeNonNullable, assertType, } from '@finos/legend-shared';
 import { deserialize, serialize } from 'serializr';
 import { V1_textModelSchema, V1_TEXT_ELEMENT_PROTOCOL_TYPE, } from './v1/transformation/pureProtocol/V1_DSLText_ProtocolHelper';
-import { getText } from '../../../graphManager/DSLText_GraphManagerHelper';
+import { getOwnText } from '../../../graphManager/DSLText_GraphManagerHelper';
 import { Text, TEXT_TYPE, } from '../../metamodels/pure/model/packageableElements/text/DSLText_Text';
-import { PureProtocolProcessorPlugin, V1_ElementBuilder, V1_initPackageableElement, } from '@finos/legend-graph';
+import { PureProtocolProcessorPlugin, V1_ElementBuilder, V1_initPackageableElement, V1_buildFullPath, } from '@finos/legend-graph';
 const TEXT_ELEMENT_CLASSIFIER_PATH = 'meta::pure::metamodel::text::Text';
 export class DSLText_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {
     constructor() {
@@ -34,14 +34,14 @@ export class DSLText_PureProtocolProcessorPlugin extends PureProtocolProcessorPl
                 firstPass: (elementProtocol, context) => {
                     assertType(elementProtocol, V1_Text);
                     const element = new Text(elementProtocol.name);
-                    const path = context.currentSubGraph.buildPath(elementProtocol.package, elementProtocol.name);
+                    const path = V1_buildFullPath(elementProtocol.package, elementProtocol.name);
                     context.currentSubGraph.setOwnElementInExtension(path, element, Text);
                     return element;
                 },
                 secondPass: (elementProtocol, context) => {
                     assertType(elementProtocol, V1_Text);
-                    const path = context.graph.buildPath(elementProtocol.package, elementProtocol.name);
-                    const element = getText(path, context.graph);
+                    const path = V1_buildFullPath(elementProtocol.package, elementProtocol.name);
+                    const element = getOwnText(path, context.currentSubGraph);
                     element.type =
                         Object.values(TEXT_TYPE).find((type) => type === elementProtocol.type) ?? TEXT_TYPE.PLAIN_TEXT;
                     element.content = guaranteeNonNullable(elementProtocol.content, `Text element 'content' field is missing`);

package/lib/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"DSLText_PureProtocolProcessorPlugin.js","sourceRoot":"","sources":["../../../../src/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DSLText_PureProtocolProcessorPlugin.js","sourceRoot":"","sources":["../../../../src/models/protocols/pure/DSLText_PureProtocolProcessorPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,WAAW,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qDAAqD,CAAC;AAC9E,OAAO,EAEL,oBAAoB,EACpB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EACL,kBAAkB,EAClB,6BAA6B,GAC9B,MAAM,4DAA4D,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,kDAAkD,CAAC;AAC9E,OAAO,EACL,IAAI,EACJ,SAAS,GACV,MAAM,mEAAmE,CAAC;AAC3E,OAAO,EASL,2BAA2B,EAC3B,iBAAiB,EACjB,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AAEzE,MAAM,OAAO,mCAAoC,SAAQ,2BAA2B;IAClF;QACE,KAAK,CACH,WAAW,CAAC,UAAU,CAAC,2BAA2B,EAClD,WAAW,CAAC,OAAO,CACpB,CAAC;IACJ,CAAC;IAEQ,0BAA0B;QACjC,OAAO;YACL,IAAI,iBAAiB,CAAU;gBAC7B,gBAAgB,EAAE,MAAM;gBACxB,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,CACT,eAAsC,EACtC,OAA+B,EACX,EAAE;oBACtB,UAAU,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;oBACrC,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;oBAC/C,MAAM,IAAI,GAAG,gBAAgB,CAC3B,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,IAAI,CACrB,CAAC;oBACF,OAAO,CAAC,eAAe,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;oBACtE,OAAO,OAAO,CAAC;gBACjB,CAAC;gBACD,UAAU,EAAE,CACV,eAAsC,EACtC,OAA+B,EACzB,EAAE;oBACR,UAAU,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;oBACrC,MAAM,IAAI,GAAG,gBAAgB,CAC3B,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,IAAI,CACrB,CAAC;oBACF,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;oBAC1D,OAAO,CAAC,IAAI;wBACV,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAC3B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,CACxC,IAAI,SAAS,CAAC,UAAU,CAAC;oBAC5B,OAAO,CAAC,OAAO,GAAG,oBAAoB,CACpC,eAAe,CAAC,OAAO,EACvB,yCAAyC,CAC1C,CAAC;gBACJ,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAEQ,uCAAuC;QAC9C,OAAO;YACL,CAAC,eAAsC,EAAsB,EAAE;gBAC7D,IAAI,eAAe,YAAY,OAAO,EAAE;oBACtC,OAAO,4BAA4B,CAAC;iBACrC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC;IACJ,CAAC;IAEQ,qCAAqC;QAC5C,OAAO;YACL,CACE,eAAsC,EACtC,OAAsC,EACU,EAAE;gBAClD,IAAI,eAAe,YAAY,OAAO,EAAE;oBACtC,OAAO,SAAS,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;iBACvD;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC;IACJ,CAAC;IAEQ,uCAAuC;QAC9C,OAAO;YACL,CACE,IAAwC,EACxC,OAAsC,EACH,EAAE;gBACrC,IAAI,IAAI,CAAC,KAAK,KAAK,6BAA6B,EAAE;oBAChD,OAAO,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;iBAC9C;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC;IACJ,CAAC;IAEQ,8BAA8B;QACrC,OAAO;YACL,CACE,SAA6B,EAC7B,OAAmC,EACA,EAAE;gBACrC,IAAI,SAAS,YAAY,IAAI,EAAE;oBAC7B,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;oBAC/B,yBAAyB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBAC/C,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;oBAC/B,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,QAAQ,IAAI,EAAE,CAAC;oBACrD,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;oBACrC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;oBAC/B,OAAO,QAAQ,CAAC;iBACjB;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;SACF,CAAC;IACJ,CAAC;CACF"}

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-extension-dsl-text",
-    "version": "1.0.33",
+    "version": "1.0.36",
     "description": "Legend extension for Text DSL",
     "keywords": [
         "legend",
@@ -49,7 +49,6 @@
         "@types/react": "17.0.43",
         "mobx": "6.5.0",
         "mobx-react-lite": "3.3.0",
-        "monaco-editor": "0.33.0",
         "react": "17.0.2",
         "serializr": "2.0.5"
     },
@@ -60,7 +59,7 @@
         "jest": "27.5.1",
         "npm-run-all": "4.1.5",
         "rimraf": "3.0.2",
-        "sass": "1.50.0",
+        "sass": "1.50.1",
         "typescript": "4.6.3"
     },
     "peerDependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-extension-dsl-text",
-  "version": "1.0.33",
+  "version": "1.0.36",
   "description": "Legend extension for Text DSL",
   "keywords": [
     "legend",
@@ -40,27 +40,26 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "2.0.12",
-    "@finos/legend-art": "0.3.16",
-    "@finos/legend-graph": "4.0.2",
-    "@finos/legend-model-storage": "0.0.29",
-    "@finos/legend-shared": "1.3.0",
-    "@finos/legend-studio": "7.0.0",
+    "@finos/legend-application": "2.0.14",
+    "@finos/legend-art": "0.3.18",
+    "@finos/legend-graph": "5.0.0",
+    "@finos/legend-model-storage": "0.0.30",
+    "@finos/legend-shared": "1.3.1",
+    "@finos/legend-studio": "8.0.0",
     "@types/react": "17.0.43",
     "mobx": "6.5.0",
     "mobx-react-lite": "3.3.0",
-    "monaco-editor": "0.33.0",
     "react": "17.0.2",
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "0.3.20",
+    "@finos/legend-dev-utils": "0.3.21",
     "cross-env": "7.0.3",
     "eslint": "8.13.0",
     "jest": "27.5.1",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.50.0",
+    "sass": "1.50.1",
     "typescript": "4.6.3"
   },
   "peerDependencies": {

package/src/graphManager/DSLText_GraphManagerHelper.ts

@@ -14,8 +14,15 @@
  * limitations under the License.
  */
 
-import type { PureModel } from '@finos/legend-graph';
+import type { BasicModel, PureModel } from '@finos/legend-graph';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import { Text } from '../models/metamodels/pure/model/packageableElements/text/DSLText_Text';
 
 export const getText = (path: string, graph: PureModel): Text =>
   graph.getExtensionElement(path, Text, `Can't find text element '${path}'`);
+
+export const getOwnText = (path: string, graph: BasicModel): Text =>
+  guaranteeNonNullable(
+    graph.getOwnNullableExtensionElement(path, Text),
+    `Can't find text '${path}'`,
+  );

package/src/models/metamodels/pure/model/packageableElements/text/DSLText_Text.ts

@@ -21,6 +21,7 @@ import {
   PackageableElement,
 } from '@finos/legend-graph';
 
+// TODO: to be moved out of metamodel
 export enum TEXT_TYPE {
   PLAIN_TEXT = 'plainText',
   MARKDOWN = 'markdown',

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

@@ -26,7 +26,7 @@ import {
   V1_textModelSchema,
   V1_TEXT_ELEMENT_PROTOCOL_TYPE,
 } from './v1/transformation/pureProtocol/V1_DSLText_ProtocolHelper';
-import { getText } from '../../../graphManager/DSLText_GraphManagerHelper';
+import { getOwnText } from '../../../graphManager/DSLText_GraphManagerHelper';
 import {
   Text,
   TEXT_TYPE,
@@ -43,6 +43,7 @@ import {
   PureProtocolProcessorPlugin,
   V1_ElementBuilder,
   V1_initPackageableElement,
+  V1_buildFullPath,
 } from '@finos/legend-graph';
 
 const TEXT_ELEMENT_CLASSIFIER_PATH = 'meta::pure::metamodel::text::Text';
@@ -66,7 +67,7 @@ export class DSLText_PureProtocolProcessorPlugin extends PureProtocolProcessorPl
         ): PackageableElement => {
           assertType(elementProtocol, V1_Text);
           const element = new Text(elementProtocol.name);
-          const path = context.currentSubGraph.buildPath(
+          const path = V1_buildFullPath(
             elementProtocol.package,
             elementProtocol.name,
           );
@@ -78,11 +79,11 @@ export class DSLText_PureProtocolProcessorPlugin extends PureProtocolProcessorPl
           context: V1_GraphBuilderContext,
         ): void => {
           assertType(elementProtocol, V1_Text);
-          const path = context.graph.buildPath(
+          const path = V1_buildFullPath(
             elementProtocol.package,
             elementProtocol.name,
           );
-          const element = getText(path, context.graph);
+          const element = getOwnText(path, context.currentSubGraph);
           element.type =
             Object.values(TEXT_TYPE).find(
               (type) => type === elementProtocol.type,