@lionweb/utilities 0.6.0 → 0.6.2
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.
- package/README.md +20 -0
- package/dist/m3/diagrams/Mermaid-generator.d.ts.map +1 -1
- package/dist/m3/diagrams/Mermaid-generator.js +13 -8
- package/dist/m3/diagrams/Mermaid-generator.js.map +1 -1
- package/dist/m3/diagrams/PlantUML-generator.d.ts.map +1 -1
- package/dist/m3/diagrams/PlantUML-generator.js +8 -10
- package/dist/m3/diagrams/PlantUML-generator.js.map +1 -1
- package/dist/m3/index.d.ts +0 -2
- package/dist/m3/index.d.ts.map +1 -1
- package/dist/m3/index.js +0 -2
- package/dist/m3/index.js.map +1 -1
- package/dist/serialization/chunk.js +1 -0
- package/dist/serialization/chunk.js.map +1 -1
- package/dist/serialization/index.d.ts +1 -0
- package/dist/serialization/index.d.ts.map +1 -1
- package/dist/serialization/index.js +1 -0
- package/dist/serialization/index.js.map +1 -1
- package/dist/serialization/measurer.d.ts +21 -0
- package/dist/serialization/measurer.d.ts.map +1 -0
- package/dist/serialization/measurer.js +30 -0
- package/dist/serialization/measurer.js.map +1 -0
- package/package.json +2 -2
- package/dist/m3/ecore/importer.d.ts +0 -7
- package/dist/m3/ecore/importer.d.ts.map +0 -1
- package/dist/m3/ecore/importer.js +0 -102
- package/dist/m3/ecore/importer.js.map +0 -1
- package/dist/m3/ecore/types.d.ts +0 -60
- package/dist/m3/ecore/types.d.ts.map +0 -1
- package/dist/m3/ecore/types.js +0 -2
- package/dist/m3/ecore/types.js.map +0 -1
package/README.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# The `utilities` package
|
|
2
2
|
|
|
3
|
+
[
|
|
4
|
+
](./LICENSE)
|
|
5
|
+
[
|
|
6
|
+
](https://github.com/LionWeb-io/lionweb-typescript/actions/workflows/test.yaml)
|
|
7
|
+
[
|
|
8
|
+
](https://www.npmjs.com/package/@lionweb/utilities)
|
|
9
|
+
|
|
3
10
|
An NPM package that can be added to a Node.js/NPM codebase as follows:
|
|
4
11
|
|
|
5
12
|
```shell
|
|
@@ -15,6 +22,19 @@ It contains utilities on top of the `core` package, such as:
|
|
|
15
22
|
|
|
16
23
|
## Changelog
|
|
17
24
|
|
|
25
|
+
### 0.6.2
|
|
26
|
+
|
|
27
|
+
* Add a function `measure` that computes metrics on a serialization chunk.
|
|
28
|
+
|
|
29
|
+
### 0.6.1
|
|
30
|
+
|
|
31
|
+
* Improve PlantUML and Mermaid diagram generation:
|
|
32
|
+
* Primitive types now rendered as classes marked as "<<primitive type>>".
|
|
33
|
+
* Concepts or Annotations that extend the "Node" concept built into LionCore don't show that.
|
|
34
|
+
* Optional (single-valued) features are now shown with a question mark (`?`) directly after the type, instead of being marked as "<<optional>>".
|
|
35
|
+
* Fix/add support for annotations.
|
|
36
|
+
* **Remove** all Ecore functionality (=[issue #121](https://github.com/LionWeb-io/lionweb-typescript/issues/121))
|
|
37
|
+
|
|
18
38
|
### 0.6.0
|
|
19
39
|
|
|
20
40
|
* Add support for annotations in diagram generation (PlantUML and Mermaid), and textualization.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mermaid-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAUH,QAAQ,EAQX,MAAM,eAAe,CAAA;AAuBtB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,iBAAgB,QAAQ,WAWzD,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { asString, indentWith } from "littoral-templates";
|
|
2
|
-
import { Annotation, Concept, Containment, entitiesSortedByName, Enumeration, Interface, isRef, Link, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
2
|
+
import { Annotation, Concept, Containment, entitiesSortedByName, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
3
3
|
// define some layouting basics/building algebra:
|
|
4
4
|
const indented = indentWith(` `)(1);
|
|
5
5
|
const block = (header, elements) => elements.length === 0
|
|
@@ -32,15 +32,20 @@ const generateForEnumeration = ({ name, literals }) => withNewLine(block(`class
|
|
|
32
32
|
`<<enumeration>>`,
|
|
33
33
|
literals.map(({ name }) => name)
|
|
34
34
|
]));
|
|
35
|
-
const generateForAnnotation = ({ name, features, extends: extends_
|
|
36
|
-
block(
|
|
37
|
-
|
|
35
|
+
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }) => [
|
|
36
|
+
block([
|
|
37
|
+
`class ${name}`,
|
|
38
|
+
`<<Annotation>> ${name}`,
|
|
39
|
+
isRef(annotates) ? `${name} ..> ${annotates.name}` : []
|
|
40
|
+
], nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
41
|
+
(isRef(extends_) && !isBuiltinNodeConcept(extends_)) ? `${extends_.name} <|-- ${name}` : [],
|
|
42
|
+
implements_.filter(isRef).map((interface_) => `${interface_.name} <|.. ${name}`),
|
|
38
43
|
``
|
|
39
44
|
];
|
|
40
45
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_ /*, implements: implements_*/, partition }) => [
|
|
41
46
|
block(`class ${partition ? `<<partition>> ` : ``}${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
42
47
|
abstract_ ? `<<Abstract>> ${name}` : [],
|
|
43
|
-
isRef(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
48
|
+
(isRef(extends_) && !isBuiltinNodeConcept(extends_)) ? `${extends_.name} <|-- ${name}` : [],
|
|
44
49
|
``
|
|
45
50
|
];
|
|
46
51
|
const generateForInterface = ({ name, features, extends: extends_ }) => [
|
|
@@ -56,10 +61,10 @@ const generateForNonRelationalFeature = (feature) => {
|
|
|
56
61
|
const typeText = `${multiple ? `List~` : ``}${type_ === unresolved ? `???` : type_.name}${multiple ? `~` : ``}${optional ? `?` : ``}`;
|
|
57
62
|
return `+${typeText} ${name}`;
|
|
58
63
|
};
|
|
59
|
-
const generateForPrimitiveType = ({ name }) =>
|
|
64
|
+
const generateForPrimitiveType = ({ name }) => `class ${name}
|
|
65
|
+
<<PrimitiveType>> ${name}
|
|
60
66
|
|
|
61
67
|
`;
|
|
62
|
-
// Note: No construct for PrimitiveType exists in PlantUML.
|
|
63
68
|
const generateForEntity = (entity) => {
|
|
64
69
|
if (entity instanceof Annotation) {
|
|
65
70
|
return generateForAnnotation(entity);
|
|
@@ -96,6 +101,6 @@ const generateForRelation = ({ name: leftName }, relation) => {
|
|
|
96
101
|
}
|
|
97
102
|
return optional ? "0..1" : "1";
|
|
98
103
|
})();
|
|
99
|
-
return `${leftName} "${leftMultiplicity}" ${isContainment ? `o` : ``}
|
|
104
|
+
return `${leftName} "${leftMultiplicity}" ${isContainment ? `o` : ``}--> "${rightMultiplicity}" ${rightName}: ${relationName}`;
|
|
100
105
|
};
|
|
101
106
|
//# sourceMappingURL=Mermaid-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAe,MAAM,oBAAoB,CAAA;AACrE,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,WAAW,EAEX,SAAS,EACT,KAAK,EAGL,IAAI,EACJ,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AAGtB,iDAAiD;AAEjD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC,MAAM,KAAK,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAe,MAAM,oBAAoB,CAAA;AACrE,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,WAAW,EAEX,SAAS,EACT,oBAAoB,EACpB,KAAK,EAGL,IAAI,EACJ,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AAGtB,iDAAiD;AAEjD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC,MAAM,KAAK,GAAG,CAAC,MAAoB,EAAE,QAAsB,EAAgB,EAAE,CACzE,QAAQ,CAAC,MAAM,KAAK,CAAC;IACjB,CAAC,CAAC,MAAM;IACR,CAAC,CAAC;QACE,GAAG,MAAM,IAAI;QACb,QAAQ,CAAC,QAAQ,CAAC;QAClB,GAAG;KACN,CAAA;AAET,MAAM,WAAW,GAAG,CAAC,OAAqB,EAAgB,EAAE,CACxD;IACI,OAAO;IACP,EAAE;CACL,CAAA;AAGL;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EAAC,QAAQ,EAAW,EAAE,EAAE,CAC/D,QAAQ,CAAC;IACL,YAAY;IACZ;;CAEP;IACO,QAAQ,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC/D,EAAE;IACF,QAAQ,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACpE,EAAE;IACF,KAAK;CACR,CAAC,CAAA;AAGN,MAAM,sBAAsB,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAc,EAAE,EAAE,CAC7D,WAAW,CAAC,KAAK,CACb,SAAS,IAAI,EAAE,EACf;IACI,iBAAiB;IACjB,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC;CACjC,CACJ,CAAC,CAAA;AAGN,MAAM,qBAAqB,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAa,EAAE,EAAE,CAClH;IACI,KAAK,CACD;QACI,SAAS,IAAI,EAAE;QACf,kBAAkB,IAAI,EAAE;QACxB,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;KAC1D,EACD,qBAAqB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAA+B,CAAC,CACvE;IACD,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;IAC3F,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,SAAS,IAAI,EAAE,CAAC;IAChF,EAAE;CACL,CAAA;AAEL,MAAM,kBAAkB,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAA,6BAA6B,EAAE,SAAS,EAAU,EAAE,EAAE,CACrI;IACI,KAAK,CACD,SAAS,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,EACnD,qBAAqB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAA+B,CAAC,CACvE;IACD,SAAS,CAAC,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;IACvC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;IAC3F,EAAE;CACL,CAAA;AAGL,MAAM,oBAAoB,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAY,EAAE,EAAE,CAC5E;IACI,KAAK,CACD,SAAS,IAAI,EAAE,EACf,qBAAqB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAA+B,CAAC,CACvE;IACD,iBAAiB,IAAI,EAAE;IACvB,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,EAAE,CAAC,GAAG,WAAW,SAAS,IAAI,EAAE,CAAC;IACpE,EAAE;CACL,CAAA;AAGL,MAAM,+BAA+B,GAAG,CAAC,OAAgB,EAAE,EAAE;IACzD,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAA;IAChC,MAAM,QAAQ,GAAG,OAAO,YAAY,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAA;IAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,MAAM,QAAQ,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACrI,OAAO,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAA;AACjC,CAAC,CAAA;AAGD,MAAM,wBAAwB,GAAG,CAAC,EAAC,IAAI,EAAgB,EAAE,EAAE,CAC3D,SAAS,IAAI;oBACO,IAAI;;CAEvB,CAAA;AAGD,MAAM,iBAAiB,GAAG,CAAC,MAAsB,EAAE,EAAE;IACjD,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;QAC/B,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IACD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC5B,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACrC,CAAC;IACD,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;QAChC,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IACD,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;QAC9B,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IACD,IAAI,MAAM,YAAY,aAAa,EAAE,CAAC;QAClC,OAAO,wBAAwB,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC;IACD,OAAO,kCAAkC,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAA;AACrF,CAAC,CAAA;AAGD,MAAM,sBAAsB,GAAG,CAAC,MAAsB,EAAE,EAAE;IACtD,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IACrC,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC;QACzB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,SAAS;aACN,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAA;AACrE,CAAC,CAAA;AAGD,MAAM,mBAAmB,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAiB,EAAE,QAAc,EAAE,EAAE;IAC7E,MAAM,EAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAC,GAAG,QAAQ,CAAA;IAC/D,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;IAC7F,MAAM,aAAa,GAAG,QAAQ,YAAY,WAAW,CAAA;IACrD,MAAM,gBAAgB,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IAClD,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE;QAC5B,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,GAAG,CAAA;QACd,CAAC;QACD,OAAO,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAA;IAClC,CAAC,CAAC,EAAE,CAAA;IACJ,OAAO,GAAG,QAAQ,KAAK,gBAAgB,KAAK,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,iBAAiB,KAAK,SAAS,KAAK,YAAY,EAAE,CAAA;AAClI,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlantUML-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"PlantUML-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAUH,QAAQ,EASX,MAAM,eAAe,CAAA;AAMtB;;;GAGG;AACH,eAAO,MAAM,2BAA2B,uBAAsB,QAAQ,WAmBpE,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { asString, indentWith } from "littoral-templates";
|
|
2
|
-
import { Annotation, Concept, Containment, entitiesSortedByName, Enumeration, Interface, isRef, Link, nameOf, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
2
|
+
import { Annotation, Concept, Containment, entitiesSortedByName, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nameOf, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
3
3
|
const indented = indentWith(` `)(1);
|
|
4
4
|
/**
|
|
5
5
|
* Generates a string with a PlantUML class diagram
|
|
@@ -31,10 +31,10 @@ const generateForEnumeration = ({ name, literals }) => [
|
|
|
31
31
|
|
|
32
32
|
`
|
|
33
33
|
];
|
|
34
|
-
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_ }) => {
|
|
34
|
+
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }) => {
|
|
35
35
|
const fragments = [];
|
|
36
36
|
fragments.push(`annotation`, name);
|
|
37
|
-
if (isRef(extends_)) {
|
|
37
|
+
if (isRef(extends_) && !isBuiltinNodeConcept(extends_)) {
|
|
38
38
|
fragments.push(`extends`, extends_.name);
|
|
39
39
|
}
|
|
40
40
|
if (implements_.length > 0) {
|
|
@@ -44,6 +44,7 @@ const generateForAnnotation = ({ name, features, extends: extends_, implements:
|
|
|
44
44
|
return nonRelationalFeatures_.length === 0
|
|
45
45
|
? [
|
|
46
46
|
`${fragments.join(" ")}`,
|
|
47
|
+
isRef(annotates) ? `${name} ..> ${annotates.name}` : [],
|
|
47
48
|
``
|
|
48
49
|
]
|
|
49
50
|
: [
|
|
@@ -62,7 +63,7 @@ const generateForConcept = ({ name, features, abstract: abstract_, extends: exte
|
|
|
62
63
|
if (partition) {
|
|
63
64
|
fragments.push(`<<partition>>`);
|
|
64
65
|
}
|
|
65
|
-
if (isRef(extends_)) {
|
|
66
|
+
if (isRef(extends_) && !isBuiltinNodeConcept(extends_)) {
|
|
66
67
|
fragments.push(`extends`, extends_.name);
|
|
67
68
|
}
|
|
68
69
|
if (implements_.length > 0) {
|
|
@@ -100,12 +101,9 @@ const generateForNonRelationalFeature = (feature) => {
|
|
|
100
101
|
const { name, optional } = feature;
|
|
101
102
|
const multiple = feature instanceof Link && feature.multiple;
|
|
102
103
|
const type_ = type(feature);
|
|
103
|
-
return `${name}: ${multiple ? `List<` : ``}${type_ === unresolved ? `???` : type_.name}${multiple ?
|
|
104
|
+
return `${name}: ${multiple ? `List<` : ``}${type_ === unresolved ? `???` : type_.name}${(optional && !multiple) ? `?` : ``}${multiple ? `>` : ``}`;
|
|
104
105
|
};
|
|
105
|
-
const generateForPrimitiveType = ({ name }) => `
|
|
106
|
-
|
|
107
|
-
`;
|
|
108
|
-
// Note: No construct for PrimitiveType exists in PlantUML.
|
|
106
|
+
const generateForPrimitiveType = ({ name }) => `class "${name}" <<primitive type>>`;
|
|
109
107
|
const generateForEntity = (entity) => {
|
|
110
108
|
if (entity instanceof Annotation) {
|
|
111
109
|
return generateForAnnotation(entity);
|
|
@@ -138,7 +136,7 @@ const generateForRelation = ({ name: leftName }, relation) => {
|
|
|
138
136
|
const isContainment = relation instanceof Containment;
|
|
139
137
|
const leftMultiplicity = isContainment ? `1` : `*`;
|
|
140
138
|
const rightMultiplicity = multiple ? "*" : (optional ? "0..1" : "1");
|
|
141
|
-
return `${leftName} "${leftMultiplicity}" ${isContainment ? `o` : ``}
|
|
139
|
+
return `${leftName} "${leftMultiplicity}" ${isContainment ? `o` : ``}--> "${rightMultiplicity}" ${rightName}: ${relationName}`;
|
|
142
140
|
};
|
|
143
141
|
/*
|
|
144
142
|
Notes:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAA;AACvD,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,oBAAoB,EACpB,WAAW,EAEX,SAAS,EACT,KAAK,EAGL,IAAI,EACJ,MAAM,EACN,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AAGtB,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAGpC;;;GAGG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAW,EAAE,EAAE,CACtE,QAAQ,CAAC;IACb;;;qBAGqB,IAAI;;;CAGxB;IACG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC;IACzD;;;;CAIC;IACG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC9D;;CAEC;CACA,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"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"}
|
package/dist/m3/index.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
export * from "./diagrams/Mermaid-generator.js";
|
|
2
2
|
export * from "./diagrams/PlantUML-generator.js";
|
|
3
|
-
export * from "./ecore/importer.js";
|
|
4
|
-
export * from "./ecore/types.js";
|
|
5
3
|
export * from "./ts-generation/ts-types-generator.js";
|
|
6
4
|
export * from "./textualizer.js";
|
|
7
5
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/m3/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/m3/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/m3/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,uCAAuC,CAAA;AACrD,cAAc,kBAAkB,CAAA"}
|
package/dist/m3/index.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
export * from "./diagrams/Mermaid-generator.js";
|
|
2
2
|
export * from "./diagrams/PlantUML-generator.js";
|
|
3
|
-
export * from "./ecore/importer.js";
|
|
4
|
-
export * from "./ecore/types.js";
|
|
5
3
|
export * from "./ts-generation/ts-types-generator.js";
|
|
6
4
|
export * from "./textualizer.js";
|
|
7
5
|
//# sourceMappingURL=index.js.map
|
package/dist/m3/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/m3/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/m3/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,kCAAkC,CAAA;AAChD,cAAc,uCAAuC,CAAA;AACrD,cAAc,kBAAkB,CAAA"}
|
|
@@ -36,4 +36,5 @@ export const tryLoadAsLanguages = async (path) => {
|
|
|
36
36
|
};
|
|
37
37
|
export const tryLoadAllAsLanguages = async (paths) => (await Promise.all(paths.map(tryLoadAsLanguages))).flat();
|
|
38
38
|
// TODO load languages “in dependency order”, i.e.: later-named languages can be dependent on earlier-named languages -- (this is a foldRight, really)
|
|
39
|
+
// TODO make names consistent: "load" vs. "read", "chunk" vs. "serialization chunk"
|
|
39
40
|
//# sourceMappingURL=chunk.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk.js","sourceRoot":"","sources":["../../src/serialization/chunk.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iCAAiC,EACjC,oBAAoB,EAEpB,WAAW,EAEd,MAAM,eAAe,CAAA;AACtB,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAA;AAGzC,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC5C,IAAI,CAAC;QACD,OAAO,cAAc,CAAC,IAAI,CAAuB,CAAA;IACrD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,2BAA2B,CAAC,CAAA;QACjD,MAAM,CAAC,CAAA;IACX,CAAC;AACL,CAAC,CAAA;AAGD,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAmC,EAAE,CAChE,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEpD,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,IAAa,EAAW,EAAE,CACnE,QAAQ,CAAC,IAAI,CAAC;OACX,IAAI,CAAC,4BAA4B,CAAC,KAAK,iCAAiC;OACxE,WAAW,IAAI,IAAI;OACnB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;OAChC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,WAAW,CAAC,CAAA;AAGlG;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAuB,EAAE;IAC1E,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,gEAAgE,CAAC,CAAA;QACtF,OAAO,EAAE,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACD,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAC1C,8DAA8D;IAC1D,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,mEAAmE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QACpG,OAAO,EAAE,CAAA;IACb,CAAC;AACL,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,KAAe,EAAuB,EAAE,CAChF,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;AAC7D,uJAAuJ"}
|
|
1
|
+
{"version":3,"file":"chunk.js","sourceRoot":"","sources":["../../src/serialization/chunk.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iCAAiC,EACjC,oBAAoB,EAEpB,WAAW,EAEd,MAAM,eAAe,CAAA;AACtB,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAA;AAGzC,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;IAC5C,IAAI,CAAC;QACD,OAAO,cAAc,CAAC,IAAI,CAAuB,CAAA;IACrD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,2BAA2B,CAAC,CAAA;QACjD,MAAM,CAAC,CAAA;IACX,CAAC;AACL,CAAC,CAAA;AAGD,MAAM,QAAQ,GAAG,CAAC,IAAa,EAAmC,EAAE,CAChE,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEpD,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,IAAa,EAAW,EAAE,CACnE,QAAQ,CAAC,IAAI,CAAC;OACX,IAAI,CAAC,4BAA4B,CAAC,KAAK,iCAAiC;OACxE,WAAW,IAAI,IAAI;OACnB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;OAChC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,WAAW,CAAC,CAAA;AAGlG;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAuB,EAAE;IAC1E,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;IACnC,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,gEAAgE,CAAC,CAAA;QACtF,OAAO,EAAE,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACD,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAC1C,8DAA8D;IAC1D,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,mEAAmE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QACpG,OAAO,EAAE,CAAA;IACb,CAAC;AACL,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,KAAe,EAAuB,EAAE,CAChF,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;AAC7D,uJAAuJ;AAGvJ,oFAAoF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { looksLikeSerializedLanguages, readChunk, tryLoadAllAsLanguages, tryLoadAsLanguages } from "./chunk.js";
|
|
2
|
+
export { measure } from "./measurer.js";
|
|
2
3
|
export { orderedSerializationChunk } from "./ordering.js";
|
|
3
4
|
export { sortedSerializationChunk } from "./sorting.js";
|
|
4
5
|
export { genericAsTreeText } from "./textualizer.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/serialization/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAE,SAAS,EAAE,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,YAAY,CAAA;AAC7G,OAAO,EAAC,yBAAyB,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,cAAc,CAAA;AACrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/serialization/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAE,SAAS,EAAE,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,YAAY,CAAA;AAC7G,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EAAC,yBAAyB,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,cAAc,CAAA;AACrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { looksLikeSerializedLanguages, readChunk, tryLoadAllAsLanguages, tryLoadAsLanguages } from "./chunk.js";
|
|
2
|
+
export { measure } from "./measurer.js";
|
|
2
3
|
export { orderedSerializationChunk } from "./ordering.js";
|
|
3
4
|
export { sortedSerializationChunk } from "./sorting.js";
|
|
4
5
|
export { genericAsTreeText } from "./textualizer.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/serialization/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAE,SAAS,EAAE,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,YAAY,CAAA;AAC7G,OAAO,EAAC,yBAAyB,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,cAAc,CAAA;AACrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/serialization/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAE,SAAS,EAAE,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,YAAY,CAAA;AAC7G,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EAAC,yBAAyB,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,cAAc,CAAA;AACrD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAA"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Language, MetaPointer, SerializationChunk } from "@lionweb/core";
|
|
2
|
+
type ClassifierInstantiationMetric = {
|
|
3
|
+
key: string;
|
|
4
|
+
language: string;
|
|
5
|
+
version: string;
|
|
6
|
+
name?: string;
|
|
7
|
+
count: number;
|
|
8
|
+
};
|
|
9
|
+
type Metrics = {
|
|
10
|
+
instantiations: ClassifierInstantiationMetric[];
|
|
11
|
+
unusedConcreteConcepts: MetaPointer[];
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* Computes {@link Metrics metrics} on the given {@link SerializationChunk serializationChunk}.
|
|
15
|
+
* Passing it {@link Language languages} make this language-aware:
|
|
16
|
+
* * classifier names are looked up,
|
|
17
|
+
* * unused concrete concepts are computed as well.
|
|
18
|
+
*/
|
|
19
|
+
export declare const measure: (serializationChunk: SerializationChunk, languages: Language[]) => Metrics;
|
|
20
|
+
export {};
|
|
21
|
+
//# sourceMappingURL=measurer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"measurer.d.ts","sourceRoot":"","sources":["../../src/serialization/measurer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAwB,WAAW,EAAE,kBAAkB,EAAC,MAAM,eAAe,CAAA;AAGlH,KAAK,6BAA6B,GAAG;IACjC,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CAEhB,CAAA;AAED,KAAK,OAAO,GAAG;IACX,cAAc,EAAE,6BAA6B,EAAE,CAAA;IAC/C,sBAAsB,EAAE,WAAW,EAAE,CAAA;CACxC,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,OAAO,uBAAwB,kBAAkB,aAAa,QAAQ,EAAE,KAAG,OA0BvF,CAAA"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { conceptsOf, groupBy, MemoisingSymbolTable } from "@lionweb/core";
|
|
2
|
+
/**
|
|
3
|
+
* Computes {@link Metrics metrics} on the given {@link SerializationChunk serializationChunk}.
|
|
4
|
+
* Passing it {@link Language languages} make this language-aware:
|
|
5
|
+
* * classifier names are looked up,
|
|
6
|
+
* * unused concrete concepts are computed as well.
|
|
7
|
+
*/
|
|
8
|
+
export const measure = (serializationChunk, languages) => {
|
|
9
|
+
const symbolTable = new MemoisingSymbolTable(languages);
|
|
10
|
+
const metaPointerAsText = (classifier) => `${classifier.key}:${classifier.language}:${classifier.version}`;
|
|
11
|
+
// group nodes by classifier key, language, and version:
|
|
12
|
+
const groupedInstantiations = groupBy(serializationChunk.nodes, ({ classifier }) => metaPointerAsText(classifier));
|
|
13
|
+
// map grouped nodes to instantiations with count:
|
|
14
|
+
const instantiations = Object.values(groupedInstantiations).map((nodes) => ({
|
|
15
|
+
...nodes[0].classifier,
|
|
16
|
+
name: symbolTable.entityMatching(nodes[0].classifier)?.name,
|
|
17
|
+
count: nodes.length
|
|
18
|
+
}));
|
|
19
|
+
// compute all concrete concepts for the language:
|
|
20
|
+
const concreteConcepts = languages.flatMap(conceptsOf).filter((concept) => !concept.abstract);
|
|
21
|
+
const unusedConcreteConcepts = concreteConcepts
|
|
22
|
+
.map((concept) => concept.metaPointer())
|
|
23
|
+
.filter((metaPointer) => !(metaPointerAsText(metaPointer) in groupedInstantiations));
|
|
24
|
+
// return the metrics object:
|
|
25
|
+
return {
|
|
26
|
+
instantiations,
|
|
27
|
+
unusedConcreteConcepts
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
//# sourceMappingURL=measurer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"measurer.js","sourceRoot":"","sources":["../../src/serialization/measurer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAY,oBAAoB,EAAkC,MAAM,eAAe,CAAA;AAiBlH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,kBAAsC,EAAE,SAAqB,EAAW,EAAE;IAC9F,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAA;IAEvD,MAAM,iBAAiB,GAAG,CAAC,UAAuB,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,OAAO,EAAE,CAAA;IAEvH,wDAAwD;IACxD,MAAM,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAA;IAElH,kDAAkD;IAClD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU;QACtB,IAAI,EAAE,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,IAAI;QAC3D,KAAK,EAAE,KAAK,CAAC,MAAM;KACtB,CAAC,CAAC,CAAA;IAEH,kDAAkD;IAClD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC7F,MAAM,sBAAsB,GAAG,gBAAgB;SAC1C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;SACvC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAA;IAExF,6BAA6B;IAC7B,OAAO;QACH,cAAc;QACd,sBAAsB;KACzB,CAAA;AACL,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/utilities",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.2",
|
|
4
4
|
"description": "LionWeb utilities",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"url": "https://github.com/LionWeb-io/lionweb-typescript/issues"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@lionweb/core": "0.6.
|
|
18
|
+
"@lionweb/core": "0.6.2",
|
|
19
19
|
"littoral-templates": "0.2.2",
|
|
20
20
|
"nanoid": "4.0.2"
|
|
21
21
|
},
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import { Language } from "@lionweb/core";
|
|
2
|
-
import { EcoreXml } from "./types.js";
|
|
3
|
-
/**
|
|
4
|
-
* Converts a parsed Ecore XML metamodel (file) to a {@link Language LionCore instance}.
|
|
5
|
-
*/
|
|
6
|
-
export declare const asLionCoreLanguage: (ecoreXml: EcoreXml, version: string) => Language;
|
|
7
|
-
//# sourceMappingURL=importer.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../../../src/m3/ecore/importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAWH,QAAQ,EAOX,MAAM,eAAe,CAAA;AAStB,OAAO,EAAsB,QAAQ,EAA4B,MAAM,YAAY,CAAA;AAuBnF;;GAEG;AACH,eAAO,MAAM,kBAAkB,aAAc,QAAQ,WAAW,MAAM,KAAG,QA4HxE,CAAA"}
|
|
@@ -1,102 +0,0 @@
|
|
|
1
|
-
import { asArray, builtinPrimitives, chain, concatenator, duplicatesAmong, keyOf, LanguageFactory, lastOf, namedsOf, qualifiedNameOf } from "@lionweb/core";
|
|
2
|
-
import { chain as chainHashers, checkDefinedData, checkUniqueData, checkUniqueId, checkValidId, hasher } from "../../hashing.js";
|
|
3
|
-
const localRefPrefix = "#//";
|
|
4
|
-
/**
|
|
5
|
-
* "Dereferences" a type descriptor string by removing the optional <pre>"#//"</pre> prefix.
|
|
6
|
-
*/
|
|
7
|
-
const deref = (typeDescriptor) => typeDescriptor.startsWith(localRefPrefix)
|
|
8
|
-
? typeDescriptor.substring(localRefPrefix.length)
|
|
9
|
-
: typeDescriptor;
|
|
10
|
-
const { booleanDatatype, integerDatatype, stringDatatype } = builtinPrimitives;
|
|
11
|
-
const typeDesc2primitiveType = {
|
|
12
|
-
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString": stringDatatype,
|
|
13
|
-
"ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String": stringDatatype,
|
|
14
|
-
"ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean": booleanDatatype,
|
|
15
|
-
"ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int": integerDatatype
|
|
16
|
-
};
|
|
17
|
-
/**
|
|
18
|
-
* Converts a parsed Ecore XML metamodel (file) to a {@link Language LionCore instance}.
|
|
19
|
-
*/
|
|
20
|
-
export const asLionCoreLanguage = (ecoreXml, version) => {
|
|
21
|
-
const idGen = chainHashers(hasher(), checkDefinedData, checkUniqueData, checkValidId, checkUniqueId);
|
|
22
|
-
const ePackage = ecoreXml["ecore:EPackage"];
|
|
23
|
-
// TODO (#10) an Ecore XML can contain multiple EPackage-s
|
|
24
|
-
const factory = new LanguageFactory(ePackage["$"]["name"], version, chain(concatenator("-"), idGen), lastOf);
|
|
25
|
-
// phase 1: convert EClassifiers but without their EStructuralFeatures (in the case of EClasses)
|
|
26
|
-
const convertEClassifier = (eClassifier) => {
|
|
27
|
-
const xsiType = eClassifier["$"]["xsi:type"];
|
|
28
|
-
if (xsiType === "ecore:EClass") {
|
|
29
|
-
return factory.concept(eClassifier["$"]["name"], false);
|
|
30
|
-
}
|
|
31
|
-
if (xsiType === "ecore:EEnum") {
|
|
32
|
-
return factory.enumeration(eClassifier["$"]["name"]);
|
|
33
|
-
}
|
|
34
|
-
throw new Error(`don't know how to convert an EClassifier with descriptor "${xsiType}"`);
|
|
35
|
-
};
|
|
36
|
-
// TODO (#10) Interface?
|
|
37
|
-
const convertedEClassifiers = ePackage["eClassifiers"]
|
|
38
|
-
.map((eClassifier) => [eClassifier, convertEClassifier(eClassifier)]);
|
|
39
|
-
const eClassifierConversionFor = (eClassifierName) => convertedEClassifiers
|
|
40
|
-
.find(([source, _]) => source["$"]["name"] === eClassifierName)[1];
|
|
41
|
-
// phase 2: also convert features of EClasses
|
|
42
|
-
const convertEStructuralFeature = (container, feature) => {
|
|
43
|
-
const metaType = feature["$"]["xsi:type"];
|
|
44
|
-
const name = feature["$"]["name"];
|
|
45
|
-
switch (metaType) {
|
|
46
|
-
case "ecore:EAttribute": {
|
|
47
|
-
const typeDesc = feature["$"]["eType"];
|
|
48
|
-
const property = factory.property(container, name)
|
|
49
|
-
.ofType(typeDesc in typeDesc2primitiveType
|
|
50
|
-
? typeDesc2primitiveType[typeDesc]
|
|
51
|
-
: eClassifierConversionFor(deref(typeDesc)));
|
|
52
|
-
if (feature["$"]["lowerBound"] === "0") {
|
|
53
|
-
property.isOptional();
|
|
54
|
-
}
|
|
55
|
-
return property;
|
|
56
|
-
}
|
|
57
|
-
case "ecore:EReference": {
|
|
58
|
-
const link = (feature["$"]["containment"]
|
|
59
|
-
? factory.containment(container, name)
|
|
60
|
-
: factory.reference(container, name))
|
|
61
|
-
.ofType(eClassifierConversionFor(deref(feature["$"]["eType"])));
|
|
62
|
-
if (feature["$"]["lowerBound"] === "0") {
|
|
63
|
-
link.isOptional();
|
|
64
|
-
}
|
|
65
|
-
if (feature["$"]["upperBound"] === "-1") {
|
|
66
|
-
link.isMultiple();
|
|
67
|
-
}
|
|
68
|
-
return link;
|
|
69
|
-
}
|
|
70
|
-
default:
|
|
71
|
-
throw new Error(`feature of meta type ${metaType} not handled`);
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
convertedEClassifiers.forEach(([source, target]) => {
|
|
75
|
-
const xsiType = source["$"]["xsi:type"];
|
|
76
|
-
if (xsiType === "ecore:EClass") {
|
|
77
|
-
const classifier = target;
|
|
78
|
-
classifier
|
|
79
|
-
.havingFeatures(...asArray(source.eStructuralFeatures)
|
|
80
|
-
.map((feature) => convertEStructuralFeature(classifier, feature)));
|
|
81
|
-
if (source["$"]["eSuperTypes"] !== undefined) {
|
|
82
|
-
target.extends = eClassifierConversionFor(deref(source["$"]["eSuperTypes"]));
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
if (xsiType === "ecore:EEnum") {
|
|
86
|
-
const classifier = target;
|
|
87
|
-
classifier
|
|
88
|
-
.havingLiterals(...asArray(source.eLiterals)
|
|
89
|
-
.map((literal) => factory.enumerationLiteral(classifier, literal["$"]["name"])));
|
|
90
|
-
}
|
|
91
|
-
});
|
|
92
|
-
// phase 3: put all converted things into the metamodel
|
|
93
|
-
factory.language
|
|
94
|
-
.havingEntities(...convertedEClassifiers.map(([_, mmElement]) => mmElement));
|
|
95
|
-
// phase 4: dedup keys (crudely, using the qualified name) where necessary
|
|
96
|
-
Object.entries(duplicatesAmong(namedsOf(factory.language), keyOf))
|
|
97
|
-
.forEach(([_, mmElements]) => {
|
|
98
|
-
mmElements.forEach((mmElement) => mmElement.havingKey(qualifiedNameOf(mmElement, "_")));
|
|
99
|
-
});
|
|
100
|
-
return factory.language;
|
|
101
|
-
};
|
|
102
|
-
//# sourceMappingURL=importer.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"importer.js","sourceRoot":"","sources":["../../../src/m3/ecore/importer.ts"],"names":[],"mappings":"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"}
|
package/dist/m3/ecore/types.d.ts
DELETED
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import { AnyNumberOf } from "@lionweb/core";
|
|
2
|
-
/**
|
|
3
|
-
* Type definitions that correspond to an Ecore XML metamodel (file),
|
|
4
|
-
* parsed using the <tt>xml2js</tt> XML parser library
|
|
5
|
-
* (or with a parser exactly compatible with that.)
|
|
6
|
-
*
|
|
7
|
-
* For completeness' sake, the required code could look as follows:
|
|
8
|
-
* ```ts
|
|
9
|
-
* import {parseString} from "xml2js"
|
|
10
|
-
*
|
|
11
|
-
* parseString(data, (err, ecoreXml) => {
|
|
12
|
-
* const language = asLionCoreLanguage(ecoreXml as EcoreXml, "1")
|
|
13
|
-
* })
|
|
14
|
-
* ```
|
|
15
|
-
* (It's assumed that {@link EcoreXml} is already imported.)
|
|
16
|
-
*/
|
|
17
|
-
export type ENamed = {
|
|
18
|
-
"$": {
|
|
19
|
-
"name": string;
|
|
20
|
-
};
|
|
21
|
-
};
|
|
22
|
-
export type EcoreXml = {
|
|
23
|
-
"ecore:EPackage": EcorePackage;
|
|
24
|
-
};
|
|
25
|
-
export type EcorePackage = ENamed & {
|
|
26
|
-
"eClassifiers": EClassifier[];
|
|
27
|
-
};
|
|
28
|
-
export type EClassifier = EClass | EEnum;
|
|
29
|
-
export type EClass = ENamed & {
|
|
30
|
-
"$": {
|
|
31
|
-
"xsi:type": "ecore:EClass";
|
|
32
|
-
"eSuperTypes"?: string;
|
|
33
|
-
};
|
|
34
|
-
"eStructuralFeatures"?: AnyNumberOf<EStructuralFeature>;
|
|
35
|
-
};
|
|
36
|
-
export type EStructuralFeature = EAttribute | EReference;
|
|
37
|
-
export type EAttribute = ENamed & {
|
|
38
|
-
"$": {
|
|
39
|
-
"xsi:type": "ecore:EAttribute";
|
|
40
|
-
"lowerBound": string;
|
|
41
|
-
"eType": string;
|
|
42
|
-
};
|
|
43
|
-
};
|
|
44
|
-
export type EReference = ENamed & {
|
|
45
|
-
"$": {
|
|
46
|
-
"xsi:type": "ecore:EReference";
|
|
47
|
-
"lowerBound"?: string;
|
|
48
|
-
"upperBound": string;
|
|
49
|
-
"eType": string;
|
|
50
|
-
"containment"?: boolean;
|
|
51
|
-
};
|
|
52
|
-
};
|
|
53
|
-
export type EEnum = ENamed & {
|
|
54
|
-
"$": {
|
|
55
|
-
"xsi:type": "ecore:EEnum";
|
|
56
|
-
};
|
|
57
|
-
"eLiterals"?: AnyNumberOf<EEnumLiteral>;
|
|
58
|
-
};
|
|
59
|
-
export type EEnumLiteral = ENamed;
|
|
60
|
-
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/m3/ecore/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AAGzC;;;;;;;;;;;;;;GAcG;AAEH,MAAM,MAAM,MAAM,GAAG;IACjB,GAAG,EAAE;QACD,MAAM,EAAE,MAAM,CAAA;KACjB,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACnB,gBAAgB,EAAE,YAAY,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAChC,cAAc,EAAE,WAAW,EAAE,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAA;AAExC,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG;IAC1B,GAAG,EAAE;QACD,UAAU,EAAE,cAAc,CAAA;QAC1B,aAAa,CAAC,EAAE,MAAM,CAAA;KACzB,CAAA;IACD,qBAAqB,CAAC,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,UAAU,CAAA;AAExD,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAC9B,GAAG,EAAE;QACD,UAAU,EAAE,kBAAkB,CAAA;QAC9B,YAAY,EAAE,MAAM,CAAA;QACpB,OAAO,EAAE,MAAM,CAAA;KAClB,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAC9B,GAAG,EAAE;QACD,UAAU,EAAE,kBAAkB,CAAA;QAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,YAAY,EAAE,MAAM,CAAA;QACpB,OAAO,EAAE,MAAM,CAAA;QACf,aAAa,CAAC,EAAE,OAAO,CAAA;KAC1B,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG;IACzB,GAAG,EAAE;QACD,UAAU,EAAE,aAAa,CAAA;KAC5B,CAAA;IACD,WAAW,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA"}
|
package/dist/m3/ecore/types.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/m3/ecore/types.ts"],"names":[],"mappings":""}
|