npm - @finos/legend-graph - Versions diffs - 32.0.1 → 32.0.3 - Mend

@finos/legend-graph 32.0.1 → 32.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

package/lib/graph/helpers/PureLanguageHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PureLanguageHelper.d.ts","sourceRoot":"","sources":["../../../src/graph/helpers/PureLanguageHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8EAA8E,CAAC;AAC/H,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sDAAsD,CAAC;AAIjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,WAAW,SAAS;IACpB,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,SAAS,aAAa;IACtB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,eAAe,mBAAmB;IAClC,wBAAwB,4BAA4B;IACpD,YAAY,SAAS;IACrB,qBAAqB,yBAAyB;CAC/C;AAED,oBAAY,oBAAoB;IAC9B,qBAAqB,wBAAwB;IAC7C,oBAAoB,uBAAuB;IAC3C,sBAAsB,yBAAyB;IAC/C,8BAA8B,iCAAiC;IAC/D,oBAAoB,uBAAuB;CAC5C;AAED,oBAAY,WAAW;IACrB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,UAAU,eAAe;IACzB,wBAAwB,4BAA4B;IACpD,6BAA6B,mBAAmB;IAChD,IAAI,SAAS;CACd;AAED,eAAO,MAAM,0BAA0B,eACzB,MAAM,cACN,MAAM,GAAG,SAAS,KAC7B,MASF,CAAC;AAEF,eAAO,MAAM,oCAAoC,SACzC,IAAI,GAAG,SAAS,SACf,MAAM,KACZ,MAAM,GAAG,MAAM,GAAG,OAiCpB,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC5B,0BAA0B,KAClC,MAaF,CAAC;AAEF,eAAO,MAAM,kDAAkD,UACtD,SAAS,gBACF,oBAAoB,KACjC,~~MAqBF~~,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC5B,0BAA0B,YACzB;IACR,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,KACA,MAyBC,CAAC"}
1	+ {"version":3,"file":"PureLanguageHelper.d.ts","sourceRoot":"","sources":["../../../src/graph/helpers/PureLanguageHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8EAA8E,CAAC;AAC/H,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sDAAsD,CAAC;AAIjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,WAAW,SAAS;IACpB,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,SAAS,aAAa;IACtB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,eAAe,mBAAmB;IAClC,wBAAwB,4BAA4B;IACpD,YAAY,SAAS;IACrB,qBAAqB,yBAAyB;CAC/C;AAED,oBAAY,oBAAoB;IAC9B,qBAAqB,wBAAwB;IAC7C,oBAAoB,uBAAuB;IAC3C,sBAAsB,yBAAyB;IAC/C,8BAA8B,iCAAiC;IAC/D,oBAAoB,uBAAuB;CAC5C;AAED,oBAAY,WAAW;IACrB,IAAI,SAAS;IACb,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,UAAU,eAAe;IACzB,wBAAwB,4BAA4B;IACpD,6BAA6B,mBAAmB;IAChD,IAAI,SAAS;CACd;AAED,eAAO,MAAM,0BAA0B,eACzB,MAAM,cACN,MAAM,GAAG,SAAS,KAC7B,MASF,CAAC;AAEF,eAAO,MAAM,oCAAoC,SACzC,IAAI,GAAG,SAAS,SACf,MAAM,KACZ,MAAM,GAAG,MAAM,GAAG,OAiCpB,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC5B,0BAA0B,KAClC,MAaF,CAAC;AAEF,eAAO,MAAM,kDAAkD,UACtD,SAAS,gBACF,oBAAoB,KACjC,MAsBF,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC5B,0BAA0B,YACzB;IACR,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,KACA,MAyBC,CAAC"}

package/lib/graph/helpers/PureLanguageHelper.js CHANGED Viewed

@@ -120,13 +120,14 @@ export const generateFunctionCallStringFromFunctionAnalysisInfo = (graph, functi
     const parameterLength = functionInfo.parameterInfoList.length;
     if (parameterLength > 0) {
         for (let i = 0; i < parameterLength; i++) {
+            const info = functionInfo.parameterInfoList[i];
             let paramType;
-            if (functionInfo.parameterInfoList[i] !== undefined) {
+            if (info !== undefined) {
                 try {
-                    paramType = graph.getType(functionInfo.parameterInfoList[i].type);
+                    paramType = graph.getType(info.type);
                 }
                 catch {
-                    // graph might not contain classes used as type, set it to undefine
+                    // graph might not contain classes used as type, do nothing here
                 }
             }
             const separator = i !== parameterLength - 1 ? ', ' : '';

package/lib/graph/helpers/PureLanguageHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PureLanguageHelper.js","sourceRoot":"","sources":["../../../src/graph/helpers/PureLanguageHelper.ts"],"names":[],"mappings":"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~~SAAS~~,~~CAAC;YACd,IAAI,~~YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;~~gBACpD~~,IAAI,CAAC;oBACH,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,~~YAAY~~,CAAC,~~iBAAiB,CAAC,CAAC,CAAE,CAAC,~~IAAI,CAAC,CAAC;~~gBACrE~~,CAAC;gBAAC,MAAM,CAAC;oBACP,~~mEAAmE~~;~~gBACrE~~,CAAC;YACH,CAAC;YACD,MAAM,SAAS,GAAG,CAAC,KAAK,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,YAAY;gBACV,YAAY;oBACZ,oCAAoC,CAAC,SAAS,EAAE,CAAC,CAAC;oBAClD,SAAS,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,GAAG,YAAY,CAAC,WAAW,GAAG,sBAAsB,GAAG,YAAY,CAAC,YAAY,IAAI,YAAY,GAAG,CAAC;AAC7G,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,OAAmC,EACnC,OAIC,EACO,EAAE,CACV,GACE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,GAAG,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAC5E,GAAG,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU;KAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,OAAO,EAAE,mBAAmB;IAC3B,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,0BAA0B,CAC3D,CAAC,CAAC,YAAY,CAAC,UAAU,EACzB,CAAC,CAAC,YAAY,CAAC,UAAU,CAC1B,GAAG;IACN,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,0BAA0B,CAChD,CAAC,CAAC,YAAY,CAAC,UAAU,EACzB,CAAC,CAAC,YAAY,CAAC,UAAU,CAC1B,GAAG,CACT;KACA,IAAI,CAAC,IAAI,CAAC,MACX,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAC3B,IAAI,0BAA0B,CAC5B,OAAO,CAAC,kBAAkB,CAAC,UAAU,EACrC,OAAO,CAAC,kBAAkB,CAAC,UAAU,CACtC,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;IAC/B,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"PureLanguageHelper.js","sourceRoot":"","sources":["../../../src/graph/helpers/PureLanguageHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,qBAAqB,EACrB,2BAA2B,EAC3B,cAAc,GACf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,aAAa,EAAE,MAAM,+DAA+D,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,6DAA6D,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,MAAM,CAAN,IAAY,iBAiBX;AAjBD,WAAY,iBAAiB;IAC3B,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,yCAAoB,CAAA;IACpB,wCAAmB,CAAA;IACnB,gDAA2B,CAAA;IAC3B,0CAAqB,CAAA;IACrB,wCAAmB,CAAA;IACnB,2CAAsB,CAAA;IACtB,0CAAqB,CAAA;IACrB,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,8CAAyB,CAAA;IACzB,uDAAkC,CAAA;IAClC,yEAAoD,CAAA;IACpD,0CAAqB,CAAA;IACrB,mEAA8C,CAAA;AAChD,CAAC,EAjBW,iBAAiB,KAAjB,iBAAiB,QAiB5B;AAED,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC9B,qEAA6C,CAAA;IAC7C,mEAA2C,CAAA;IAC3C,uEAA+C,CAAA;IAC/C,uFAA+D,CAAA;IAC/D,mEAA2C,CAAA;AAC7C,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B;AAED,MAAM,CAAN,IAAY,WAWX;AAXD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,wCAAyB,CAAA;IACzB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,oCAAqB,CAAA;IACrB,wCAAyB,CAAA;IACzB,mEAAoD,CAAA;IACpD,+DAAgD,CAAA;IAChD,4BAAa,CAAA;AACf,CAAC,EAXW,WAAW,KAAX,WAAW,QAWtB;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,UAAkB,EAClB,UAA8B,EACtB,EAAE;IACV,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;SAAM,IAAI,UAAU,KAAK,CAAC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QACxD,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IACD,OAAO,GAAG,UAAU,GAAG,2BAA2B,GAChD,UAAU,IAAI,qBAChB,EAAE,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAClD,IAAsB,EACtB,KAAa,EACc,EAAE;IAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,QAAQ,KAAK,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAC7B,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE;YACxC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC;IACtB,CAAC;SAAM,IAAI,IAAI,YAAY,aAAa,EAAE,CAAC;QACzC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,cAAc,CAAC,OAAO;gBACzB,OAAO,IAAI,CAAC;YACd,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO;gBACzB,OAAO,GAAG,CAAC;YACb,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO;gBACzB,OAAO,CAAC,CAAC;YACX,KAAK,cAAc,CAAC,IAAI,CAAC;YACzB,KAAK,cAAc,CAAC,UAAU;gBAC5B,OAAO,IAAI,UAAU,CAAC,IAAI,IAAI,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC;YACnD,KAAK,cAAc,CAAC,QAAQ;gBAC1B,OAAO,IAAI,UAAU,CAAC,IAAI,IAAI,EAAE,EAAE,WAAW,CAAC,WAAW,CAAC;YAC5D,KAAK,cAAc,CAAC,UAAU;gBAC5B,OAAO,WAAW,CAAC;YACrB,KAAK,cAAc,CAAC,MAAM;gBACxB,OAAO,IAAI,CAAC;YACd;gBACE,OAAO,QAAQ,KAAK,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,wCAAwC;IACxC,OAAO,QAAQ,KAAK,EAAE,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,OAAmC,EAC3B,EAAE;IACV,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;YACpD,MAAM,SAAS,GAAG,CAAC,KAAK,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,YAAY;gBACV,YAAY;oBACZ,oCAAoC,CAAC,SAAS,EAAE,CAAC,CAAC;oBAClD,SAAS,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,GAAG,sBAAsB,GAAG,OAAO,CAAC,YAAY,IAAI,YAAY,GAAG,CAAC;AACrG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kDAAkD,GAAG,CAChE,KAAgB,EAChB,YAAkC,EAC1B,EAAE;IACV,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,MAAM,eAAe,GAAG,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC;IAC9D,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC/C,IAAI,SAAS,CAAC;YACd,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvC,CAAC;gBAAC,MAAM,CAAC;oBACP,gEAAgE;gBAClE,CAAC;YACH,CAAC;YACD,MAAM,SAAS,GAAG,CAAC,KAAK,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,YAAY;gBACV,YAAY;oBACZ,oCAAoC,CAAC,SAAS,EAAE,CAAC,CAAC;oBAClD,SAAS,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,GAAG,YAAY,CAAC,WAAW,GAAG,sBAAsB,GAAG,YAAY,CAAC,YAAY,IAAI,YAAY,GAAG,CAAC;AAC7G,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,OAAmC,EACnC,OAIC,EACO,EAAE,CACV,GACE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,GAAG,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAC5E,GAAG,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU;KAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,OAAO,EAAE,mBAAmB;IAC3B,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,0BAA0B,CAC3D,CAAC,CAAC,YAAY,CAAC,UAAU,EACzB,CAAC,CAAC,YAAY,CAAC,UAAU,CAC1B,GAAG;IACN,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,0BAA0B,CAChD,CAAC,CAAC,YAAY,CAAC,UAAU,EACzB,CAAC,CAAC,YAAY,CAAC,UAAU,CAC1B,GAAG,CACT;KACA,IAAI,CAAC,IAAI,CAAC,MACX,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAC3B,IAAI,0BAA0B,CAC5B,OAAO,CAAC,kBAAkB,CAAC,UAAU,EACrC,OAAO,CAAC,kBAAkB,CAAC,UAAU,CACtC,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;IAC/B,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC"}

package/lib/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.d.ts CHANGED Viewed

@@ -1,3 +1,18 @@
+/**
+ * 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 { SubstituteStore } from './SubstituteStore.js';
 import { MappingInclude } from './MappingInclude.js';
 export declare class MappingIncludeMapping extends MappingInclude {

package/lib/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MappingIncludeMapping.d.ts","sourceRoot":"","sources":["../../../../../../src/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.ts"],"names":[],"mappings":"~~AAiBA~~,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,kBAAkB,EAAE,eAAe,EAAE,CAAM;IAE3C,IAAa,QAAQ,IAAI,MAAM,~~CAS9B~~;CACF"}
1	+ {"version":3,"file":"MappingIncludeMapping.d.ts","sourceRoot":"","sources":["../../../../../../src/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,kBAAkB,EAAE,eAAe,EAAE,CAAM;IAE3C,IAAa,QAAQ,IAAI,MAAM,CAO9B;CACF"}

package/lib/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.js CHANGED Viewed

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { CORE_HASH_STRUCTURE } from '../../../../../graph/Core_HashUtils.js';
-import { hashArray, getNullableFirstEntry } from '@finos/legend-shared';
+import { hashArray } from '@finos/legend-shared';
 import { MappingInclude } from './MappingInclude.js';
 export class MappingIncludeMapping extends MappingInclude {
     storeSubstitutions = [];
@@ -22,10 +22,8 @@ export class MappingIncludeMapping extends MappingInclude {
         return hashArray([
             CORE_HASH_STRUCTURE.MAPPING_INCLUDE_MAPPING,
             this.included.valueForSerialization ?? '',
-            getNullableFirstEntry(this.storeSubstitutions)?.original
-                .valueForSerialization ?? '',
-            getNullableFirstEntry(this.storeSubstitutions)?.substitute
-                .valueForSerialization ?? '',
+            this.storeSubstitutions[0]?.original.valueForSerialization ?? '',
+            this.storeSubstitutions[0]?.substitute.valueForSerialization ?? '',
         ]);
     }
 }

package/lib/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MappingIncludeMapping.js","sourceRoot":"","sources":["../../../../../../src/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;~~AACH~~,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,~~qBAAqB,EAAE,~~MAAM,sBAAsB,CAAC;~~AAExE~~,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IACvD,kBAAkB,GAAsB,EAAE,CAAC;IAE3C,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,uBAAuB;YAC3C,IAAI,CAAC,QAAQ,CAAC,qBAAqB,IAAI,EAAE;YACzC,~~qBAAqB~~,CAAC,~~IAAI~~,CAAC,~~kBAAkB~~,CAAC,EAAE,QAAQ~~;iBACrD~~,qBAAqB,IAAI,EAAE;~~YAC9B~~,~~qBAAqB~~,CAAC,~~IAAI~~,CAAC,~~kBAAkB~~,CAAC,EAAE,UAAU~~;iBACvD~~,qBAAqB,IAAI,EAAE;~~SAC/B~~,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"MappingIncludeMapping.js","sourceRoot":"","sources":["../../../../../../src/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IACvD,kBAAkB,GAAsB,EAAE,CAAC;IAE3C,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,uBAAuB;YAC3C,IAAI,CAAC,QAAQ,CAAC,qBAAqB,IAAI,EAAE;YACzC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,qBAAqB,IAAI,EAAE;YAChE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,qBAAqB,IAAI,EAAE;SACnE,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/graph-manager/__test-utils__/EngineTestSupport.d.ts CHANGED Viewed

@@ -25,13 +25,13 @@ export declare const ENGINE_TEST_SUPPORT_API_URL = "http://localhost:6300/api";
 export declare function ENGINE_TEST_SUPPORT__getClassifierPathMapping(): Promise<ClassifierPathMapping[]>;
 export declare function ENGINE_TEST_SUPPORT__getSubtypeInfo(): Promise<SubtypeInfo>;
 export declare function ENGINE_TEST_SUPPORT__execute(executionInput: V1_ExecuteInput): Promise<PlainObject<V1_ExecutionResult>>;
-export declare function ENGINE_TEST_SUPPORT__grammarToJSON_model(code: string): Promise<{
+export declare function ENGINE_TEST_SUPPORT__grammarToJSON_model(code: string, returnSourceInformation?: boolean | undefined): Promise<{
     elements: object[];
 }>;
-export declare function ENGINE_TEST_SUPPORT__JsonToGrammar_valueSpecification(code: PlainObject<V1_ValueSpecification>): Promise<string>;
-export declare function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(code: string): Promise<PlainObject<V1_ValueSpecification>>;
-export declare function ENGINE_TEST_SUPPORT__JSONToGrammar_model(modelDataContext: PlainObject<V1_PureModelContext>): Promise<string>;
-export declare function ENGINE_TEST_SUPPORT__compile(modelDataContext: PlainObject<V1_PureModelContext>): Promise<AxiosResponse<{
+export declare function ENGINE_TEST_SUPPORT__JSONToGrammar_valueSpecification(value: PlainObject<V1_ValueSpecification>, pretty?: boolean | undefined): Promise<string>;
+export declare function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(code: string, returnSourceInformation?: boolean | undefined): Promise<PlainObject<V1_ValueSpecification>>;
+export declare function ENGINE_TEST_SUPPORT__JSONToGrammar_model(model: PlainObject<V1_PureModelContext>, pretty?: boolean | undefined): Promise<string>;
+export declare function ENGINE_TEST_SUPPORT__compile(model: PlainObject<V1_PureModelContext>): Promise<AxiosResponse<{
     message: string;
 }>>;
 export declare function ENGINE_TEST_SUPPORT__generateArtifacts(input: V1_ArtifactGenerationExtensionInput): Promise<PlainObject<V1_ArtifactGenerationExtensionOutput>>;

package/lib/graph-manager/__test-utils__/EngineTestSupport.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EngineTestSupport.d.ts","sourceRoot":"","sources":["../../../src/graph-manager/__test-utils__/EngineTestSupport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,qBAAqB,EACrB,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAC5C,OAAc,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4DAA4D,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAC1F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AACpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uEAAuE,CAAC;AACnH,OAAO,EACL,mCAAmC,EACnC,KAAK,oCAAoC,EAC1C,MAAM,4EAA4E,CAAC;AAEpF,eAAO,MAAM,2BAA2B,8BAA8B,CAAC;AAEvE,wBAAsB,6CAA6C,IAAI,OAAO,CAC5E,qBAAqB,EAAE,CACxB,CAMA;AAED,wBAAsB,mCAAmC,IAAI,OAAO,CAAC,WAAW,CAAC,CAMhF;AAED,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,eAAe,GAC9B,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAY1C;AAED,wBAAsB,wCAAwC,CAC5D,IAAI,EAAE,MAAM,~~GACX~~,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAejC;AAED,wBAAsB,qDAAqD,CACzE,~~IAAI~~,EAAE,WAAW,CAAC,qBAAqB,CAAC,~~GACvC~~,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qDAAqD,CACzE,IAAI,EAAE,MAAM,~~GACX~~,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,CAe7C;AAED,wBAAsB,wCAAwC,CAC5D,~~gBAAgB~~,EAAE,WAAW,CAAC,mBAAmB,CAAC,~~GACjD~~,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,4BAA4B,CAChD,~~gBAAgB~~,EAAE,WAAW,CAAC,mBAAmB,CAAC,~~GACjD~~,OAAO,CAAC,aAAa,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAK7C;AAED,wBAAsB,sCAAsC,CAC1D,KAAK,EAAE,mCAAmC,GACzC,OAAO,CAAC,WAAW,CAAC,oCAAoC,CAAC,CAAC,CAO5D"}
1	+ {"version":3,"file":"EngineTestSupport.d.ts","sourceRoot":"","sources":["../../../src/graph-manager/__test-utils__/EngineTestSupport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EACV,qBAAqB,EACrB,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAC5C,OAAc,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4DAA4D,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAC1F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AACpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uEAAuE,CAAC;AACnH,OAAO,EACL,mCAAmC,EACnC,KAAK,oCAAoC,EAC1C,MAAM,4EAA4E,CAAC;AAEpF,eAAO,MAAM,2BAA2B,8BAA8B,CAAC;AAEvE,wBAAsB,6CAA6C,IAAI,OAAO,CAC5E,qBAAqB,EAAE,CACxB,CAMA;AAED,wBAAsB,mCAAmC,IAAI,OAAO,CAAC,WAAW,CAAC,CAMhF;AAED,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,eAAe,GAC9B,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAY1C;AAED,wBAAsB,wCAAwC,CAC5D,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,OAAO,GAAG,SAAS,GAC5C,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAejC;AAED,wBAAsB,qDAAqD,CACzE,KAAK,EAAE,WAAW,CAAC,qBAAqB,CAAC,EACzC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qDAAqD,CACzE,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,OAAO,GAAG,SAAS,GAC5C,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,CAe7C;AAED,wBAAsB,wCAAwC,CAC5D,KAAK,EAAE,WAAW,CAAC,mBAAmB,CAAC,EACvC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAC3B,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,WAAW,CAAC,mBAAmB,CAAC,GACtC,OAAO,CAAC,aAAa,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAK7C;AAED,wBAAsB,sCAAsC,CAC1D,KAAK,EAAE,mCAAmC,GACzC,OAAO,CAAC,WAAW,CAAC,oCAAoC,CAAC,CAAC,CAO5D"}

package/lib/graph-manager/__test-utils__/EngineTestSupport.js CHANGED Viewed

@@ -31,49 +31,49 @@ export async function ENGINE_TEST_SUPPORT__execute(executionInput) {
         },
     })).data;
 }
-export async function ENGINE_TEST_SUPPORT__grammarToJSON_model(code) {
+export async function ENGINE_TEST_SUPPORT__grammarToJSON_model(code, returnSourceInformation) {
     return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/grammarToJson/model`, code, {
         headers: {
             [HttpHeader.CONTENT_TYPE]: ContentType.TEXT_PLAIN,
         },
         params: {
-            returnSourceInformation: false,
+            returnSourceInformation,
         },
     })).data;
 }
-export async function ENGINE_TEST_SUPPORT__JsonToGrammar_valueSpecification(code) {
-    return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/jsonToGrammar/valueSpecification`, code, {
+export async function ENGINE_TEST_SUPPORT__JSONToGrammar_valueSpecification(value, pretty) {
+    return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/jsonToGrammar/valueSpecification`, value, {
         headers: {
             [HttpHeader.CONTENT_TYPE]: ContentType.APPLICATION_JSON,
             [HttpHeader.ACCEPT]: ContentType.TEXT_PLAIN,
         },
         params: {
-            renderStyle: 'STANDARD',
+            renderStyle: pretty ? 'PRETTY' : 'STANDARD',
         },
     })).data;
 }
-export async function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(code) {
+export async function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(code, returnSourceInformation) {
     return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/grammarToJson/valueSpecification`, code, {
         headers: {
             [HttpHeader.CONTENT_TYPE]: ContentType.TEXT_PLAIN,
         },
         params: {
-            returnSourceInformation: false,
+            returnSourceInformation,
         },
     })).data;
 }
-export async function ENGINE_TEST_SUPPORT__JSONToGrammar_model(modelDataContext) {
-    return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/jsonToGrammar/model`, modelDataContext, {
+export async function ENGINE_TEST_SUPPORT__JSONToGrammar_model(model, pretty) {
+    return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/jsonToGrammar/model`, model, {
         headers: {
             [HttpHeader.ACCEPT]: ContentType.TEXT_PLAIN,
         },
         params: {
-            renderStyle: 'STANDARD',
+            renderStyle: pretty ? 'PRETTY' : 'STANDARD',
         },
     })).data;
 }
-export async function ENGINE_TEST_SUPPORT__compile(modelDataContext) {
-    return axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/compilation/compile`, modelDataContext);
+export async function ENGINE_TEST_SUPPORT__compile(model) {
+    return axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/compilation/compile`, model);
 }
 export async function ENGINE_TEST_SUPPORT__generateArtifacts(input) {
     return (await axios.post(`${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/generation/generateArtifacts`, V1_ArtifactGenerationExtensionInput.serialization.toJson(input))).data;

package/lib/graph-manager/__test-utils__/EngineTestSupport.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EngineTestSupport.js","sourceRoot":"","sources":["../../../src/graph-manager/__test-utils__/EngineTestSupport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EAAE,EAAsB,MAAM,OAAO,CAAC;AAClD,OAAO,EACL,WAAW,EACX,UAAU,GAEX,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,yDAAyD,CAAC;AAG1F,OAAO,EACL,mCAAmC,GAEpC,MAAM,4EAA4E,CAAC;AAEpF,MAAM,CAAC,MAAM,2BAA2B,GAAG,2BAA2B,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,6CAA6C;IAGjE,OAAO,CACL,MAAM,KAAK,CAAC,GAAG,CACb,GAAG,2BAA2B,6CAA6C,CAC5E,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC;IACvD,OAAO,CACL,MAAM,KAAK,CAAC,GAAG,CACb,GAAG,2BAA2B,uCAAuC,CACtE,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,cAA+B;IAE/B,OAAO,CACL,MAAM,KAAK,CAAC,IAAI,CACd,GAAG,2BAA2B,4BAA4B,EAC1D,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,EACpD;QACE,OAAO,EAAE;YACP,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,gBAAgB;SACxD;KACF,CACF,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAC5D,IAAY;~~IAEZ~~,OAAO,CACL,MAAM,KAAK,CAAC,IAAI,CACd,GAAG,2BAA2B,sCAAsC,EACpE,IAAI,EACJ;QACE,OAAO,EAAE;YACP,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,UAAU;SAClD;QACD,MAAM,EAAE;YACN,uBAAuB~~,EAAE,KAAK~~;~~SAC/B~~;KACF,CACF,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qDAAqD,CACzE,~~IAAwC~~;~~IAExC~~,OAAO,CACL,MAAM,KAAK,CAAC,IAAI,CACd,GAAG,2BAA2B,mDAAmD,EACjF,~~IAAI~~,~~EACJ~~;QACE,OAAO,EAAE;YACP,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,gBAAgB;YACvD,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,UAAU;SAC5C;QACD,MAAM,EAAE;YACN,WAAW,EAAE,UAAU;~~SACxB~~;KACF,CACF,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qDAAqD,CACzE,IAAY;~~IAEZ~~,OAAO,CACL,MAAM,KAAK,CAAC,IAAI,CACd,GAAG,2BAA2B,mDAAmD,EACjF,IAAI,EACJ;QACE,OAAO,EAAE;YACP,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,UAAU;SAClD;QACD,MAAM,EAAE;YACN,uBAAuB~~,EAAE,KAAK~~;~~SAC/B~~;KACF,CACF,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAC5D,~~gBAAkD~~;~~IAElD~~,OAAO,CACL,MAAM,KAAK,CAAC,IAAI,CACd,GAAG,2BAA2B,sCAAsC,EACpE,~~gBAAgB~~,~~EAChB~~;QACE,OAAO,EAAE;YACP,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,UAAU;SAC5C;QACD,MAAM,EAAE;YACN,WAAW,EAAE,UAAU;~~SACxB~~;KACF,CACF,CACF,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,~~gBAAkD~~;~~IAElD~~,OAAO,KAAK,CAAC,IAAI,CACf,GAAG,2BAA2B,8BAA8B,EAC5D,~~gBAAgB~~,~~CACjB~~,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sCAAsC,CAC1D,KAA0C;IAE1C,OAAO,CACL,MAAM,KAAK,CAAC,IAAI,CACd,GAAG,2BAA2B,uCAAuC,EACrE,mCAAmC,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAChE,CACF,CAAC,IAAI,CAAC;AACT,CAAC"}
1	+ {"version":3,"file":"EngineTestSupport.js","sourceRoot":"","sources":["../../../src/graph-manager/__test-utils__/EngineTestSupport.ts"],"names":[],"mappings":"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"}

package/lib/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.js CHANGED Viewed

@@ -322,7 +322,7 @@ export const observe_SubstituteStore = skipObserved((metamodel) => {
     return metamodel;
 });
 export const observe_MappingInclude = skipObserved((metamodel) => {
-    // TODO: handle for mapping include dataspace
+    // TODO: handle for mapping include data product
     if (metamodel instanceof MappingIncludeMapping) {
         makeObservable(metamodel, {
             included: observable,

package/lib/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DSL_Mapping_ObserverHelper.js","sourceRoot":"","sources":["../../../../src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"DSL_Mapping_ObserverHelper.js","sourceRoot":"","sources":["../../../../src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts"],"names":[],"mappings":"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"}

package/lib/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_DomainHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AAC5H,OAAO,EAAE,cAAc,EAAE,MAAM,qDAAqD,CAAC;AAGrF,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAE5E,eAAO,MAAM,yBAAyB,QAAS,cAAc,KAAG,MAO/D,CAAC;AAuBF,eAAO,MAAM,+BAA+B,SACpC,6BAA6B,KAClC,MAK4E,CAAC;AAEhF,eAAO,MAAM,yBAAyB,SAC9B,6BAA6B,KAClC,MAKF,CAAC;AAEF,eAAO,MAAM,kCAAkC,SACvC,6BAA6B,KAClC,MAKF,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC5B,6BAA6B,YAC5B;IACR,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,KACA,MAyBC,CAAC;AAEL,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,MAAM,GACX,cAAc,CAMhB;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,OAAO,GAAG,cAAc,CAI7E;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,qBAAqB,EAAE,GAC/B,eAAe,CAIjB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,qBAAqB,~~CAKvB~~"}
1	+ {"version":3,"file":"V1_DomainHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AAC5H,OAAO,EAAE,cAAc,EAAE,MAAM,qDAAqD,CAAC;AAGrF,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAE5E,eAAO,MAAM,yBAAyB,QAAS,cAAc,KAAG,MAO/D,CAAC;AAuBF,eAAO,MAAM,+BAA+B,SACpC,6BAA6B,KAClC,MAK4E,CAAC;AAEhF,eAAO,MAAM,yBAAyB,SAC9B,6BAA6B,KAClC,MAKF,CAAC;AAEF,eAAO,MAAM,kCAAkC,SACvC,6BAA6B,KAClC,MAKF,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC5B,6BAA6B,YAC5B;IACR,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,KACA,MAyBC,CAAC;AAEL,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,MAAM,GACX,cAAc,CAMhB;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,OAAO,GAAG,cAAc,CAI7E;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,qBAAqB,EAAE,GAC/B,eAAe,CAIjB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,qBAAqB,CAMvB"}

package/lib/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.js CHANGED Viewed

@@ -16,6 +16,7 @@
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { generateMultiplicityString } from '../../../../../graph/helpers/PureLanguageHelper.js';
 import { ELEMENT_PATH_DELIMITER, FUNCTION_SIGNATURE_MULTIPLICITY_INFINITE_TOKEN, } from '../../../../../graph/MetaModelConst.js';
+import { V1_Multiplicity } from '../model/packageableElements/domain/V1_Multiplicity.js';
 import { V1_GenericType } from '../model/packageableElements/type/V1_GenericType.js';
 import { V1_PackageableType } from '../model/packageableElements/type/V1_PackageableType.js';
 import { V1_RelationType, V1_RelationTypeColumn, } from '../model/packageableElements/type/V1_RelationType.js';
@@ -86,6 +87,7 @@ export function V1_createRelationTypeColumn(name, type) {
     const column = new V1_RelationTypeColumn();
     column.name = name;
     column.genericType = V1_createGenericTypeWithElementPath(type);
+    column.multiplicity = V1_Multiplicity.ZERO_ONE;
     return column;
 }
 //# sourceMappingURL=V1_DomainHelper.js.map

package/lib/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_DomainHelper.js","sourceRoot":"","sources":["../../../../../../src/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,oDAAoD,CAAC;AAChG,OAAO,EACL,sBAAsB,EACtB,8CAA8C,GAC/C,MAAM,wCAAwC,CAAC;~~AAGhD~~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"}
1	+ {"version":3,"file":"V1_DomainHelper.js","sourceRoot":"","sources":["../../../../../../src/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.ts"],"names":[],"mappings":"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"}

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_EnumerationMapping.d.ts","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,~~EAGL~~,KAAK,QAAQ,~~EACd~~,MAAM,sBAAsB,CAAC;~~AAE9B~~,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,mEAAmE,CAAC;AAC3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAEhF,qBAAa,qBAAsB,YAAW,QAAQ;IACpD,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,WAAW,EAAG,4BAA4B,CAAC;IAC3C;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IAE9C,IAAI,QAAQ,IAAI,MAAM,~~CAqBrB~~;CACF"}
1	+ {"version":3,"file":"V1_EnumerationMapping.d.ts","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,mEAAmE,CAAC;AAC3E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAEhF,qBAAa,qBAAsB,YAAW,QAAQ;IACpD,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,WAAW,EAAG,4BAA4B,CAAC;IAC3C;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IAE9C,IAAI,QAAQ,IAAI,MAAM,CAmBrB;CACF"}

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.js CHANGED Viewed

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { hashArray, getNullableFirstEntry, } from '@finos/legend-shared';
+import { hashArray } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
 import { V1_getEnumValueMappingSourceValueType, } from '../../../model/packageableElements/mapping/V1_EnumValueMapping.js';
 export class V1_EnumerationMapping {
@@ -36,7 +36,7 @@ export class V1_EnumerationMapping {
             // otherwise, we don't need to account for the source type in hash computation
             // If there is no enum value mapping, ignore the source type since it's synthetic and used by the editor
             this.enumValueMappings.length
-                ? (getNullableFirstEntry(Array.from(new Set(this.enumValueMappings.flatMap((evm) => evm.sourceValues.map(V1_getEnumValueMappingSourceValueType))).values())) ?? '')
+                ? (Array.from(new Set(this.enumValueMappings.flatMap((evm) => evm.sourceValues.map(V1_getEnumValueMappingSourceValueType))).values())[0] ?? '')
                 : '', // source type
             hashArray(this.enumValueMappings),
         ]);

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_EnumerationMapping.js","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,~~EACL~~,SAAS,~~EACT~~,~~qBAAqB,GAEtB,~~MAAM,sBAAsB,CAAC;~~AAC9B~~,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAEL,qCAAqC,GACtC,MAAM,mEAAmE,CAAC;AAG3E,MAAM,OAAO,qBAAqB;IAChC,EAAE,CAAsB;IACxB,WAAW,CAAgC;IAC3C;;;;;OAKG;IACH,UAAU,CAAsB;IAChC,iBAAiB,GAA0B,EAAE,CAAC;IAE9C,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,mBAAmB;YACvC,IAAI,CAAC,EAAE,IAAI,EAAE;YACb,IAAI,CAAC,WAAW,CAAC,IAAI;YACrB,mGAAmG;YACnG,8EAA8E;YAC9E,wGAAwG;YACxG,IAAI,CAAC,iBAAiB,CAAC,MAAM;gBAC3B,CAAC,CAAC,CAAC,~~qBAAqB,CACpB,~~KAAK,CAAC,IAAI,~~CACR~~,IAAI,GAAG,CACL,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAC5D,CACF,CAAC,MAAM,EAAE,CACX,~~CACF~~,IAAI,EAAE,CAAC;~~gBACV~~,CAAC,CAAC,EAAE,EAAE,cAAc;YACtB,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"V1_EnumerationMapping.js","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAEL,qCAAqC,GACtC,MAAM,mEAAmE,CAAC;AAG3E,MAAM,OAAO,qBAAqB;IAChC,EAAE,CAAsB;IACxB,WAAW,CAAgC;IAC3C;;;;;OAKG;IACH,UAAU,CAAsB;IAChC,iBAAiB,GAA0B,EAAE,CAAC;IAE9C,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,mBAAmB;YACvC,IAAI,CAAC,EAAE,IAAI,EAAE;YACb,IAAI,CAAC,WAAW,CAAC,IAAI;YACrB,mGAAmG;YACnG,8EAA8E;YAC9E,wGAAwG;YACxG,IAAI,CAAC,iBAAiB,CAAC,MAAM;gBAC3B,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CACT,IAAI,GAAG,CACL,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAC5D,CACF,CAAC,MAAM,EAAE,CACX,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACb,CAAC,CAAC,EAAE,EAAE,cAAc;YACtB,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.d.ts CHANGED Viewed

@@ -16,9 +16,11 @@
 import { type Hashable } from '@finos/legend-shared';
 import type { V1_Type } from './V1_Type.js';
 import type { V1_GenericType } from './V1_GenericType.js';
+import type { V1_Multiplicity } from '../domain/V1_Multiplicity.js';
 export declare class V1_RelationTypeColumn implements Hashable {
     name: string;
     genericType: V1_GenericType;
+    multiplicity: V1_Multiplicity;
     get hashCode(): string;
 }
 export declare class V1_RelationType implements V1_Type {

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_RelationType.d.ts","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;~~AAE1D~~,qBAAa,qBAAsB,YAAW,QAAQ;IACpD,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,EAAG,cAAc,CAAC;~~IAE7B~~,IAAI,QAAQ,IAAI,MAAM,CAMrB;CACF;AAED,qBAAa,eAAgB,YAAW,OAAO;IAC7C,OAAO,EAAE,qBAAqB,EAAE,CAAM;IAEtC,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}
1	+ {"version":3,"file":"V1_RelationType.d.ts","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,qBAAa,qBAAsB,YAAW,QAAQ;IACpD,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,EAAG,cAAc,CAAC;IAC7B,YAAY,EAAG,eAAe,CAAC;IAE/B,IAAI,QAAQ,IAAI,MAAM,CAMrB;CACF;AAED,qBAAa,eAAgB,YAAW,OAAO;IAC7C,OAAO,EAAE,qBAAqB,EAAE,CAAM;IAEtC,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.js CHANGED Viewed

@@ -18,6 +18,7 @@ import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.j
 export class V1_RelationTypeColumn {
     name;
     genericType;
+    multiplicity;
     get hashCode() {
         return hashArray([
             CORE_HASH_STRUCTURE.RELATION_TYPE,

package/lib/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_RelationType.js","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;~~AAGnF~~,MAAM,OAAO,qBAAqB;IAChC,IAAI,CAAU;IACd,WAAW,CAAkB;~~IAE7B~~,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,aAAa;YACjC,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,WAAW;SACjB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IAC1B,OAAO,GAA4B,EAAE,CAAC;IAEtC,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,aAAa;YACjC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"V1_RelationType.js","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAInF,MAAM,OAAO,qBAAqB;IAChC,IAAI,CAAU;IACd,WAAW,CAAkB;IAC7B,YAAY,CAAmB;IAE/B,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,aAAa;YACjC,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,WAAW;SACjB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,eAAe;IAC1B,OAAO,GAA4B,EAAE,CAAC;IAEtC,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,aAAa;YACjC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_TypeSerializationHelper.d.ts","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAC;AAE3F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EAQL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EACL,eAAe,EAEhB,MAAM,4DAA4D,CAAC;AAEpE,oBAAY,YAAY;IACtB,gBAAgB,oBAAoB;IACpC,aAAa,iBAAiB;CAC/B;AAED,eAAO,MAAM,yBAAyB,iDA6BpC,CAAC;~~AA+BH~~,eAAO,MAAM,0BAA0B,kDAGrC,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAWtE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAOxE;AAWD,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,MAAM,GACxC,cAAc,CA0BhB"}
1	+ {"version":3,"file":"V1_TypeSerializationHelper.d.ts","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAC;AAE3F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EAQL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EACL,eAAe,EAEhB,MAAM,4DAA4D,CAAC;AAEpE,oBAAY,YAAY;IACtB,gBAAgB,oBAAoB;IACpC,aAAa,iBAAiB;CAC/B;AAED,eAAO,MAAM,yBAAyB,iDA6BpC,CAAC;AAgCH,eAAO,MAAM,0BAA0B,kDAGrC,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAWtE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAOxE;AAWD,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,MAAM,GACxC,cAAc,CA0BhB"}

package/lib/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.js CHANGED Viewed

@@ -50,7 +50,6 @@ const packageableTypeModelSchema = createModelSchema(V1_PackageableType, {
     fullPath: primitive(),
 });
 const V1_relationTypeColumnModelSchema = createModelSchema(V1_RelationTypeColumn, {
-    name: primitive(),
     genericType: custom((val) => serialize(V1_genericTypeModelSchema, val), (val) => V1_deserializeGenericType(val), {
         beforeDeserialize: function (callback, jsonValue, jsonParentValue) {
             /** @backwardCompatibility */
@@ -63,6 +62,8 @@ const V1_relationTypeColumnModelSchema = createModelSchema(V1_RelationTypeColumn
             }
         },
     }),
+    multiplicity: usingModelSchema(V1_multiplicityModelSchema),
+    name: primitive(),
 });
 export const V1_relationTypeModelSchema = createModelSchema(V1_RelationType, {
     _type: usingConstantValueSchema(V1_Type_Type.RELATION_TYPE),

package/lib/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"V1_TypeSerializationHelper.js","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,iBAAiB,EACjB,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,SAAS,EACT,IAAI,GACL,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,+DAA+D,CAAC;AAEnG,OAAO,EACL,UAAU,EACV,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,8DAA8D,CAAC;AAC/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EACL,eAAe,EACf,qBAAqB,GACtB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,oDAAoC,CAAA;IACpC,8CAA8B,CAAA;AAChC,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,cAAc,EAAE;IACzE,qBAAqB,EAAE,UAAU,CAC/B,CAAC,GAAoB,EAAE,EAAE,CAAC,SAAS,CAAC,0BAA0B,EAAE,GAAG,CAAC,EACpE,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,0BAA0B,EAAE,GAAG,CAAC,EACrD;QACE,gCAAgC,EAAE,IAAI;KACvC,CACF;IACD,OAAO,EAAE,MAAM,CACb,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,CACjC;IACD,aAAa,EAAE,kBAAkB;IAC/B,kFAAkF;IAClF,oDAAoD;IACpD,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,KAAK,CAAC,EAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,KAAK,CAAC,EAC7C;QACE,gCAAgC,EAAE,IAAI;KACvC,CACF;IACD,kBAAkB,EAAE,kBAAkB;IACpC,OAAO;IACP,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EACf,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EACf;QACE,gCAAgC,EAAE,IAAI;KACvC,CACF;CACF,CAAC,CAAC;AAEH,MAAM,0BAA0B,GAAG,iBAAiB,CAAC,kBAAkB,EAAE;IACvE,KAAK,EAAE,wBAAwB,CAAC,YAAY,CAAC,gBAAgB,CAAC;IAC9D,QAAQ,EAAE,SAAS,EAAE;CACtB,CAAC,CAAC;AAEH,MAAM,gCAAgC,GAAG,iBAAiB,CACxD,qBAAqB,EACrB;IACE,~~IAAI,EAAE,SAAS,EAAE;IACjB,~~WAAW,EAAE,MAAM,CACjB,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,yBAAyB,EAAE,GAAG,CAAC,EAClD,CAAC,GAAG,EAAE,EAAE,CAAC,yBAAyB,CAAC,GAAG,CAAC,EACvC;QACE,iBAAiB,EAAE,UAAU,QAAQ,EAAE,SAAS,EAAE,eAAe;YAC/D,6BAA6B;YAC7B,IACE,eAAe,CAAC,IAAI,KAAK,SAAS;gBAClC,eAAe,CAAC,WAAW,KAAK,SAAS,EACzC,CAAC;gBACD,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;KACF,CACF;~~CACF~~,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,iBAAiB,CAAC,eAAe,EAAE;IAC3E,KAAK,EAAE,wBAAwB,CAAC,YAAY,CAAC,aAAa,CAAC;IAC3D,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,gCAAgC,CAAC,CAAC;CAClE,CAAC,CAAC;AAEH,MAAM,UAAU,kBAAkB,CAAC,IAA0B;IAC3D,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,KAAK,YAAY,CAAC,gBAAgB;YAChC,OAAO,WAAW,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;QACvD,KAAK,YAAY,CAAC,aAAa;YAC7B,OAAO,WAAW,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;QACvD;YACE,MAAM,IAAI,yBAAyB,CACjC,4BAA4B,IAAI,CAAC,KAAK,GAAG,CAC1C,CAAC;IACN,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAiB;IAChD,IAAI,QAAQ,YAAY,kBAAkB,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC,0BAA0B,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;SAAM,IAAI,QAAQ,YAAY,eAAe,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAC,0BAA0B,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,IAAI,yBAAyB,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,oBAAoB,GAAG,CAAC,OAAuB,EAAQ,EAAE;IAC7D,OAAO,CAAC,qBAAqB,GAAG,CAAC,IAAI,eAAe,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAC1C,QAAQ,CAAC,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC;IACvC,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;IACvC,SAAS,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC7B,OAAO,CAAC,aAAa,GAAG,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,UAAU,yBAAyB,CACvC,GAAyC;IAEzC,6BAA6B;IAC7B,IAAI,WAA2B,CAAC;IAChC,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAClB,WAAW,GAAG,IAAI,cAAc,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACjD,eAAe,CAAC,QAAQ,GAAG,GAAG,CAAC;QAC/B,WAAW,CAAC,OAAO,GAAG,eAAe,CAAC;QACtC,IAAI,iBAAiB,CAAC,GAAG,EAAE,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;YAC1D,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,WAAW,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,EAAE,CACxC,yBAAyB,CAAC,WAAW,CAAC,CACvC,CAAC;IACF,IACE,SAAS;QACT,iBAAiB,CAAC,SAAS,EAAE,cAAc,CAAC,cAAc,CAAC;QAC3D,CAAC,WAAW,CAAC,qBAAqB,CAAC,MAAM;QACzC,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,EACjC,CAAC;QACD,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC"}
1	+ {"version":3,"file":"V1_TypeSerializationHelper.js","sourceRoot":"","sources":["../../../../../../../../src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.ts"],"names":[],"mappings":"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"}

package/lib/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-graph",
-    "version": "32.0.1",
+    "version": "32.0.3",
     "description": "Legend graph and graph manager",
     "keywords": [
         "legend",
@@ -52,11 +52,11 @@
         "@jest/globals": "29.7.0",
         "axios": "1.7.9",
         "cross-env": "7.0.3",
-        "eslint": "9.17.0",
+        "eslint": "9.18.0",
         "jest": "29.7.0",
         "npm-run-all": "4.1.5",
         "rimraf": "6.0.1",
-        "typescript": "5.7.2"
+        "typescript": "5.7.3"
     },
     "publishConfig": {
         "directory": "build/publishContent"

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-graph",
-  "version": "32.0.1",
+  "version": "32.0.3",
   "description": "Legend graph and graph manager",
   "keywords": [
     "legend",
@@ -42,21 +42,21 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-shared": "10.0.66",
-    "@finos/legend-storage": "3.0.117",
+    "@finos/legend-shared": "11.0.0",
+    "@finos/legend-storage": "3.0.119",
     "mobx": "6.13.5",
     "serializr": "3.0.3"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.1.34",
+    "@finos/legend-dev-utils": "2.1.36",
     "@jest/globals": "29.7.0",
     "axios": "1.7.9",
     "cross-env": "7.0.3",
-    "eslint": "9.17.0",
+    "eslint": "9.18.0",
     "jest": "29.7.0",
     "npm-run-all": "4.1.5",
     "rimraf": "6.0.1",
-    "typescript": "5.7.2"
+    "typescript": "5.7.3"
   },
   "publishConfig": {
     "directory": "build/publishContent"

package/src/graph/helpers/PureLanguageHelper.ts CHANGED Viewed

@@ -146,12 +146,13 @@ export const generateFunctionCallStringFromFunctionAnalysisInfo = (
   const parameterLength = functionInfo.parameterInfoList.length;
   if (parameterLength > 0) {
     for (let i = 0; i < parameterLength; i++) {
+      const info = functionInfo.parameterInfoList[i];
       let paramType;
-      if (functionInfo.parameterInfoList[i] !== undefined) {
+      if (info !== undefined) {
         try {
-          paramType = graph.getType(functionInfo.parameterInfoList[i]!.type);
+          paramType = graph.getType(info.type);
         } catch {
-          // graph might not contain classes used as type, set it to undefine
+          // graph might not contain classes used as type, do nothing here
         }
       }
       const separator = i !== parameterLength - 1 ? ', ' : '';

package/src/graph/metamodel/pure/packageableElements/mapping/MappingIncludeMapping.ts CHANGED Viewed

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 import { CORE_HASH_STRUCTURE } from '../../../../../graph/Core_HashUtils.js';
-import { hashArray, getNullableFirstEntry } from '@finos/legend-shared';
+import { hashArray } from '@finos/legend-shared';
 import type { SubstituteStore } from './SubstituteStore.js';
 import { MappingInclude } from './MappingInclude.js';
@@ -25,10 +26,8 @@ export class MappingIncludeMapping extends MappingInclude {
     return hashArray([
       CORE_HASH_STRUCTURE.MAPPING_INCLUDE_MAPPING,
       this.included.valueForSerialization ?? '',
-      getNullableFirstEntry(this.storeSubstitutions)?.original
-        .valueForSerialization ?? '',
-      getNullableFirstEntry(this.storeSubstitutions)?.substitute
-        .valueForSerialization ?? '',
+      this.storeSubstitutions[0]?.original.valueForSerialization ?? '',
+      this.storeSubstitutions[0]?.substitute.valueForSerialization ?? '',
     ]);
   }
 }

package/src/graph-manager/__test-utils__/EngineTestSupport.ts CHANGED Viewed

@@ -72,6 +72,7 @@ export async function ENGINE_TEST_SUPPORT__execute(
 export async function ENGINE_TEST_SUPPORT__grammarToJSON_model(
   code: string,
+  returnSourceInformation?: boolean | undefined,
 ): Promise<{ elements: object[] }> {
   return (
     await axios.post<unknown, AxiosResponse<{ elements: object[] }>>(
@@ -82,27 +83,28 @@ export async function ENGINE_TEST_SUPPORT__grammarToJSON_model(
           [HttpHeader.CONTENT_TYPE]: ContentType.TEXT_PLAIN,
         },
         params: {
-          returnSourceInformation: false,
+          returnSourceInformation,
         },
       },
     )
   ).data;
 }
-export async function ENGINE_TEST_SUPPORT__JsonToGrammar_valueSpecification(
-  code: PlainObject<V1_ValueSpecification>,
+export async function ENGINE_TEST_SUPPORT__JSONToGrammar_valueSpecification(
+  value: PlainObject<V1_ValueSpecification>,
+  pretty?: boolean | undefined,
 ): Promise<string> {
   return (
     await axios.post<unknown, AxiosResponse<string>>(
       `${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/jsonToGrammar/valueSpecification`,
-      code,
+      value,
       {
         headers: {
           [HttpHeader.CONTENT_TYPE]: ContentType.APPLICATION_JSON,
           [HttpHeader.ACCEPT]: ContentType.TEXT_PLAIN,
         },
         params: {
-          renderStyle: 'STANDARD',
+          renderStyle: pretty ? 'PRETTY' : 'STANDARD',
         },
       },
     )
@@ -111,6 +113,7 @@ export async function ENGINE_TEST_SUPPORT__JsonToGrammar_valueSpecification(
 export async function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(
   code: string,
+  returnSourceInformation?: boolean | undefined,
 ): Promise<PlainObject<V1_ValueSpecification>> {
   return (
     await axios.post<unknown, AxiosResponse<{ elements: object[] }>>(
@@ -121,7 +124,7 @@ export async function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(
           [HttpHeader.CONTENT_TYPE]: ContentType.TEXT_PLAIN,
         },
         params: {
-          returnSourceInformation: false,
+          returnSourceInformation,
         },
       },
     )
@@ -129,18 +132,19 @@ export async function ENGINE_TEST_SUPPORT__grammarToJSON_valueSpecification(
 }
 export async function ENGINE_TEST_SUPPORT__JSONToGrammar_model(
-  modelDataContext: PlainObject<V1_PureModelContext>,
+  model: PlainObject<V1_PureModelContext>,
+  pretty?: boolean | undefined,
 ): Promise<string> {
   return (
     await axios.post<unknown, AxiosResponse<string>>(
       `${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/grammar/jsonToGrammar/model`,
-      modelDataContext,
+      model,
       {
         headers: {
           [HttpHeader.ACCEPT]: ContentType.TEXT_PLAIN,
         },
         params: {
-          renderStyle: 'STANDARD',
+          renderStyle: pretty ? 'PRETTY' : 'STANDARD',
         },
       },
     )
@@ -148,11 +152,11 @@ export async function ENGINE_TEST_SUPPORT__JSONToGrammar_model(
 }
 export async function ENGINE_TEST_SUPPORT__compile(
-  modelDataContext: PlainObject<V1_PureModelContext>,
+  model: PlainObject<V1_PureModelContext>,
 ): Promise<AxiosResponse<{ message: string }>> {
   return axios.post<unknown, AxiosResponse<{ message: string }>>(
     `${ENGINE_TEST_SUPPORT_API_URL}/pure/v1/compilation/compile`,
-    modelDataContext,
+    model,
   );
 }

package/src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts CHANGED Viewed

@@ -675,7 +675,7 @@ export const observe_SubstituteStore = skipObserved(
 export const observe_MappingInclude = skipObserved(
   (metamodel: MappingInclude): MappingInclude => {
-    // TODO: handle for mapping include dataspace
+    // TODO: handle for mapping include data product
     if (metamodel instanceof MappingIncludeMapping) {
       makeObservable(metamodel, {
         included: observable,

package/src/graph-manager/protocol/pure/v1/helpers/V1_DomainHelper.ts CHANGED Viewed

@@ -20,7 +20,7 @@ import {
   ELEMENT_PATH_DELIMITER,
   FUNCTION_SIGNATURE_MULTIPLICITY_INFINITE_TOKEN,
 } from '../../../../../graph/MetaModelConst.js';
-import type { V1_Multiplicity } from '../model/packageableElements/domain/V1_Multiplicity.js';
+import { V1_Multiplicity } from '../model/packageableElements/domain/V1_Multiplicity.js';
 import type { V1_ConcreteFunctionDefinition } from '../model/packageableElements/function/V1_ConcreteFunctionDefinition.js';
 import { V1_GenericType } from '../model/packageableElements/type/V1_GenericType.js';
 import type { V1_RawVariable } from '../model/rawValueSpecification/V1_RawVariable.js';
@@ -153,5 +153,6 @@ export function V1_createRelationTypeColumn(
   const column = new V1_RelationTypeColumn();
   column.name = name;
   column.genericType = V1_createGenericTypeWithElementPath(type);
+  column.multiplicity = V1_Multiplicity.ZERO_ONE;
   return column;
 }

package/src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_EnumerationMapping.ts CHANGED Viewed

@@ -14,11 +14,7 @@
  * limitations under the License.
  */
-import {
-  hashArray,
-  getNullableFirstEntry,
-  type Hashable,
-} from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
 import {
   type V1_EnumValueMapping,
@@ -47,15 +43,13 @@ export class V1_EnumerationMapping implements Hashable {
       // otherwise, we don't need to account for the source type in hash computation
       // If there is no enum value mapping, ignore the source type since it's synthetic and used by the editor
       this.enumValueMappings.length
-        ? (getNullableFirstEntry(
-            Array.from(
-              new Set(
-                this.enumValueMappings.flatMap((evm) =>
-                  evm.sourceValues.map(V1_getEnumValueMappingSourceValueType),
-                ),
-              ).values(),
-            ),
-          ) ?? '')
+        ? (Array.from(
+            new Set(
+              this.enumValueMappings.flatMap((evm) =>
+                evm.sourceValues.map(V1_getEnumValueMappingSourceValueType),
+              ),
+            ).values(),
+          )[0] ?? '')
         : '', // source type
       hashArray(this.enumValueMappings),
     ]);

package/src/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.ts CHANGED Viewed

@@ -18,10 +18,12 @@ import { hashArray, type Hashable } from '@finos/legend-shared';
 import type { V1_Type } from './V1_Type.js';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
 import type { V1_GenericType } from './V1_GenericType.js';
+import type { V1_Multiplicity } from '../domain/V1_Multiplicity.js';
 export class V1_RelationTypeColumn implements Hashable {
   name!: string;
   genericType!: V1_GenericType;
+  multiplicity!: V1_Multiplicity;
   get hashCode(): string {
     return hashArray([

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TypeSerializationHelper.ts CHANGED Viewed

@@ -90,7 +90,6 @@ const packageableTypeModelSchema = createModelSchema(V1_PackageableType, {
 const V1_relationTypeColumnModelSchema = createModelSchema(
   V1_RelationTypeColumn,
   {
-    name: primitive(),
     genericType: custom(
       (val) => serialize(V1_genericTypeModelSchema, val),
       (val) => V1_deserializeGenericType(val),
@@ -108,6 +107,8 @@ const V1_relationTypeColumnModelSchema = createModelSchema(
         },
       },
     ),
+    multiplicity: usingModelSchema(V1_multiplicityModelSchema),
+    name: primitive(),
   },
 );