@lionweb/utilities 0.7.2-beta.2 → 0.7.2-beta.4
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/CHANGELOG.md +6 -1
- package/dist/m3/diagrams/Mermaid-generator.js +6 -3
- package/dist/m3/diagrams/Mermaid-generator.js.map +1 -1
- package/dist/m3/diagrams/PlantUML-generator.js +4 -4
- package/dist/m3/diagrams/PlantUML-generator.js.map +1 -1
- package/dist/m3/textualizer.d.ts.map +1 -1
- package/dist/m3/textualizer.js +5 -5
- package/dist/m3/textualizer.js.map +1 -1
- package/dist/m3/ts-generation/common.d.ts.map +1 -1
- package/dist/m3/ts-generation/common.js +4 -4
- package/dist/m3/ts-generation/common.js.map +1 -1
- package/dist/m3/ts-generation/ts-types-generator.d.ts.map +1 -1
- package/dist/m3/ts-generation/ts-types-generator.js +2 -2
- package/dist/m3/ts-generation/ts-types-generator.js.map +1 -1
- package/dist/serialization/textualizer.d.ts.map +1 -1
- package/dist/serialization/textualizer.js +18 -10
- package/dist/serialization/textualizer.js.map +1 -1
- package/package.json +5 -5
- package/src/m3/diagrams/Mermaid-generator.ts +6 -3
- package/src/m3/diagrams/PlantUML-generator.ts +4 -4
- package/src/m3/textualizer.ts +5 -4
- package/src/m3/ts-generation/common.ts +4 -3
- package/src/m3/ts-generation/ts-types-generator.ts +2 -1
- package/src/serialization/textualizer.ts +23 -17
package/CHANGELOG.md
CHANGED
|
@@ -2,8 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
## 0.7.2
|
|
4
4
|
|
|
5
|
-
*
|
|
5
|
+
* W.r.t. the `generate{PlantUml|Mermaid}ForLanguage` diagram generation functions:
|
|
6
6
|
* (Expose a `DiagramRenderer` type to unify these two diagram generation functions type-wise.)
|
|
7
|
+
* Add an optional second argument to both functions, that determines which entities to focus on.
|
|
8
|
+
* Fix the `generationMermaidForLanguage` function to correctly deal with concepts that are partitions, and classifiers that are annotations.
|
|
9
|
+
* Modify both functions to make the relation between annotations and annotated classifier clearer.
|
|
10
|
+
* The `genericAsTreeText` function now renders nodes without any feature values without curly braces — i.e., without empty `{…}` block.
|
|
11
|
+
* (Because of the modification of the `MultRef<T>` type (from `@lionweb/core`) unresolved references are now filtered out actively.)
|
|
7
12
|
|
|
8
13
|
|
|
9
14
|
## 0.7.1
|
|
@@ -21,21 +21,24 @@ export const generateMermaidForLanguage = ({ entities }, focusEntities = nameSor
|
|
|
21
21
|
]);
|
|
22
22
|
const generateForEnumeration = ({ name, literals }) => withNewLine(block(`class ${name}`, [`<<enumeration>>`, literals.map(({ name }) => name)]));
|
|
23
23
|
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }) => [
|
|
24
|
-
block([`class ${name}
|
|
24
|
+
block([`class ${name}`], nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
25
|
+
`<<Annotation>> ${name}`,
|
|
26
|
+
isRef(annotates) ? `${name} ..> ${annotates.name} : <i>annotates</i>` : [],
|
|
25
27
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
26
28
|
implements_.filter(isRef).map(interface_ => `${interface_.name} <|.. ${name}`),
|
|
27
29
|
``
|
|
28
30
|
];
|
|
29
31
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_ /*, implements: implements_*/, partition }) => [
|
|
30
|
-
block(`class ${
|
|
32
|
+
block(`class ${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
31
33
|
abstract_ ? `<<Abstract>> ${name}` : [],
|
|
34
|
+
partition ? `<<Partition>> ${name}` : [],
|
|
32
35
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
33
36
|
``
|
|
34
37
|
];
|
|
35
38
|
const generateForInterface = ({ name, features, extends: extends_ }) => [
|
|
36
39
|
block(`class ${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
37
40
|
`<<Interface>> ${name}`,
|
|
38
|
-
extends_.map(({ name: extendsName }) => `${extendsName} <|-- ${name}`),
|
|
41
|
+
extends_.filter(isRef).map(({ name: extendsName }) => `${extendsName} <|-- ${name}`),
|
|
39
42
|
``
|
|
40
43
|
];
|
|
41
44
|
const generateForNonRelationalFeature = (feature) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,WAAW,EAEX,SAAS,EACT,oBAAoB,EACpB,KAAK,EAGL,IAAI,EACJ,UAAU,EACV,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAY,MAAM,oBAAoB,CAAA;AAKnE,iDAAiD;AAEjD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC,MAAM,KAAK,GAAG,CAAC,MAAgB,EAAE,QAAoB,EAAY,EAAE,CAC/D,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAA;AAE7E,MAAM,WAAW,GAAG,CAAC,OAAiB,EAAY,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;AAElE;;;;GAIG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAoB,CAAC,EAAE,QAAQ,EAAY,EAAE,gBAAkC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,CAC1I,QAAQ,CAAC;IACL,YAAY;IACZ,cAAc;IACd,EAAE;IACF,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC9C,EAAE;IACF,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACnD,EAAE;IACF,KAAK;CACR,CAAC,CAAA;AAEN,MAAM,sBAAsB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAe,EAAE,EAAE,CAC/D,WAAW,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAE5F,MAAM,qBAAqB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAc,EAAE,EAAE,CAAC;IACrH,KAAK,CACD,CAAC,SAAS,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,11 +35,11 @@ const generateForAnnotation = ({ name, features, extends: extends_, implements:
|
|
|
35
35
|
fragments.push(`extends`, extends_.name);
|
|
36
36
|
}
|
|
37
37
|
if (implements_.length > 0) {
|
|
38
|
-
fragments.push(`implements`, implements_.map(nameOf).sort().join(", "));
|
|
38
|
+
fragments.push(`implements`, implements_.filter(isRef).map(nameOf).sort().join(", "));
|
|
39
39
|
}
|
|
40
40
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
41
41
|
return nonRelationalFeatures_.length === 0
|
|
42
|
-
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name}
|
|
42
|
+
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name} ..# ${annotates.name} : <i>annotates</i>` : [], ``]
|
|
43
43
|
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``];
|
|
44
44
|
};
|
|
45
45
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_, implements: implements_, partition }) => {
|
|
@@ -55,7 +55,7 @@ const generateForConcept = ({ name, features, abstract: abstract_, extends: exte
|
|
|
55
55
|
fragments.push(`extends`, extends_.name);
|
|
56
56
|
}
|
|
57
57
|
if (implements_.length > 0) {
|
|
58
|
-
fragments.push(`implements`, implements_.map(nameOf).sort().join(", "));
|
|
58
|
+
fragments.push(`implements`, implements_.filter(isRef).map(nameOf).sort().join(", "));
|
|
59
59
|
}
|
|
60
60
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
61
61
|
return nonRelationalFeatures_.length === 0
|
|
@@ -65,7 +65,7 @@ const generateForConcept = ({ name, features, abstract: abstract_, extends: exte
|
|
|
65
65
|
const generateForInterface = ({ name, extends: extends_, features }) => {
|
|
66
66
|
const fragments = [`interface`, name];
|
|
67
67
|
if (extends_.length > 0) {
|
|
68
|
-
fragments.push(`extends`, extends_.map(superInterface => superInterface.name).join(", "));
|
|
68
|
+
fragments.push(`extends`, extends_.filter(isRef).map(superInterface => superInterface.name).join(", "));
|
|
69
69
|
}
|
|
70
70
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
71
71
|
return nonRelationalFeatures_.length === 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,OAAO,EACP,WAAW,EACX,WAAW,EAEX,SAAS,EACT,oBAAoB,EACpB,KAAK,EAGL,IAAI,EACJ,MAAM,EACN,UAAU,EACV,qBAAqB,EACrB,aAAa,EACb,WAAW,EACX,IAAI,EACJ,UAAU,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAKzD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC;;;;GAIG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAoB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAY,EAAE,gBAAkC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,CACjJ,QAAQ,CAAC;IACL,WAAW;IACX,oBAAoB;IACpB,EAAE;IACF,sBAAsB,IAAI,GAAG;IAC7B,EAAE;IACF,EAAE;IACF,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC;IACpC,EAAE;IACF,EAAE;IACF,cAAc;IACd,EAAE;IACF,aAAa,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACzC,EAAE;IACF,SAAS;CACZ,CAAC,CAAA;AAEN,MAAM,sBAAsB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAe,EAAE,EAAE,CAAC;IAChE,QAAQ,IAAI,IAAI;IAChB,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1C,GAAG;IACH,EAAE;CACL,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAc,EAAE,EAAE;IACpH,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAUH,QAAQ,EASX,MAAM,eAAe,CAAA;AA0EtB,eAAO,MAAM,cAAc,GAAI,UAAU,QAAQ,WAA+B,CAAA;AAEhF,eAAO,MAAM,eAAe,GAAI,WAAW,QAAQ,EAAE,KAAG,MAAiF,CAAA"}
|
package/dist/m3/textualizer.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, Language, Link, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, isRef, Language, Link, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
|
|
2
2
|
import { asString, indentWith } from "littoral-templates";
|
|
3
3
|
const indented = indentWith(" ")(1);
|
|
4
4
|
const refAsText = (ref) => (ref === unresolved ? `???` : ref.name);
|
|
@@ -7,20 +7,20 @@ const featuresOf = (classifier) => recurse(nameSorted(classifier.features), `fea
|
|
|
7
7
|
const asText = (node) => {
|
|
8
8
|
if (node instanceof Annotation) {
|
|
9
9
|
return [
|
|
10
|
-
`annotation ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements).map(nameOf).join(", ")}`}`,
|
|
10
|
+
`annotation ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements.filter(isRef)).map(nameOf).join(", ")}`}`,
|
|
11
11
|
indented([`annotates: ${refAsText(node.annotates)}`]),
|
|
12
12
|
featuresOf(node)
|
|
13
13
|
];
|
|
14
14
|
}
|
|
15
15
|
if (node instanceof Concept) {
|
|
16
16
|
return [
|
|
17
|
-
`${node.partition ? `<<partition>> ` : ``}${node.abstract ? `abstract ` : ``}concept ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements).map(nameOf).join(", ")}`}`,
|
|
17
|
+
`${node.partition ? `<<partition>> ` : ``}${node.abstract ? `abstract ` : ``}concept ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements.filter(isRef)).map(nameOf).join(", ")}`}`,
|
|
18
18
|
featuresOf(node)
|
|
19
19
|
];
|
|
20
20
|
}
|
|
21
21
|
if (node instanceof Interface) {
|
|
22
22
|
return [
|
|
23
|
-
`interface ${node.name}${node.extends.length === 0 ? `` : ` extends ${nameSorted(node.extends).map(nameOf).join(", ")}`}`,
|
|
23
|
+
`interface ${node.name}${node.extends.length === 0 ? `` : ` extends ${nameSorted(node.extends.filter(isRef)).map(nameOf).join(", ")}`}`,
|
|
24
24
|
featuresOf(node)
|
|
25
25
|
];
|
|
26
26
|
}
|
|
@@ -40,7 +40,7 @@ const asText = (node) => {
|
|
|
40
40
|
`version: ${node.version}`,
|
|
41
41
|
node.dependsOn.length === 0
|
|
42
42
|
? []
|
|
43
|
-
: [`dependsOn:`, indented(node.dependsOn.map(language => `${language.name} (${language.version})`))],
|
|
43
|
+
: [`dependsOn:`, indented(node.dependsOn.filter(isRef).map(language => `${language.name} (${language.version})`))],
|
|
44
44
|
`entities (↓name):`,
|
|
45
45
|
``,
|
|
46
46
|
indented(nameSorted(node.entities).map(entity => [asText(entity), ``]))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EAEV,OAAO,EACP,WAAW,EACX,WAAW,EACX,kBAAkB,EAElB,SAAS,EACT,QAAQ,EACR,IAAI,EAEJ,MAAM,EACN,UAAU,EACV,aAAa,EACb,QAAQ,EAER,UAAU,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAY,MAAM,oBAAoB,CAAA;AAEnE,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAEtC,MAAM,SAAS,GAAG,CAAmB,GAAiB,EAAU,EAAE,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAE1G,MAAM,OAAO,GAAG,CAAmB,EAAO,EAAE,MAAc,EAAE,OAA2B,MAAM,EAAY,EAAE,CACvG,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,UAAU,GAAG,CAAC,UAAsB,EAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,CAAA;AAEtH,MAAM,MAAM,GAAG,CAAC,IAAY,EAAY,EAAE;IACtC,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;QAC7B,OAAO;YACH,cAAc,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,QAAQ,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,QAAQ,EAIR,cAAc,EAEd,SAAS,EACZ,MAAM,eAAe,CAAA;AAGtB,eAAO,MAAM,SAAS,GAAI,UAAU,SAAS,CAAC,QAAQ,CAAC,KAAG,MAezD,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,QAAQ,cAAc,KAAG,OACV,CAAA;AAGxC,eAAO,MAAM,kBAAkB,GAAI,QAAQ,cAAc,KAAG,OAW3D,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Annotation, builtinClassifiers, builtinPrimitives, Concept, Enumeration, Interface, PrimitiveType } from "@lionweb/core";
|
|
1
|
+
import { Annotation, builtinClassifiers, builtinPrimitives, Concept, Enumeration, Interface, isRef, PrimitiveType } from "@lionweb/core";
|
|
2
2
|
export const tsTypeFor = (datatype) => {
|
|
3
3
|
if (datatype instanceof PrimitiveType) {
|
|
4
4
|
switch (datatype) {
|
|
@@ -18,13 +18,13 @@ export const tsTypeFor = (datatype) => {
|
|
|
18
18
|
export const isINamed = (entity) => entity === builtinClassifiers.inamed;
|
|
19
19
|
export const usesINamedDirectly = (entity) => {
|
|
20
20
|
if (entity instanceof Annotation) {
|
|
21
|
-
return entity.implements.some(isINamed);
|
|
21
|
+
return entity.implements.filter(isRef).some(isINamed);
|
|
22
22
|
}
|
|
23
23
|
if (entity instanceof Concept) {
|
|
24
|
-
return entity.implements.some(isINamed);
|
|
24
|
+
return entity.implements.filter(isRef).some(isINamed);
|
|
25
25
|
}
|
|
26
26
|
if (entity instanceof Interface) {
|
|
27
|
-
return entity.extends.some(isINamed);
|
|
27
|
+
return entity.extends.filter(isRef).some(isINamed);
|
|
28
28
|
}
|
|
29
29
|
return false;
|
|
30
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/common.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EAEP,WAAW,EACX,SAAS,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/common.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,OAAO,EAEP,WAAW,EACX,SAAS,EACT,KAAK,EAEL,aAAa,EAEhB,MAAM,eAAe,CAAA;AAGtB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAU,EAAE;IAC/D,IAAI,QAAQ,YAAY,aAAa,EAAE,CAAC;QACpC,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,eAAe,CAAC,CAAC,OAAO,SAAS,CAAA;YACxD,KAAK,iBAAiB,CAAC,cAAc,CAAC,CAAC,OAAO,QAAQ,CAAA;YACtD,KAAK,iBAAiB,CAAC,eAAe,CAAC,CAAC,OAAO,QAAQ,CAAA;YACvD,KAAK,iBAAiB,CAAC,YAAY,CAAC,CAAC,OAAO,SAAS,CAAA;YACrD;gBACI,OAAO,QAAQ,CAAA;QACvB,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,YAAY,WAAW,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,IAAI,CAAA;IACxB,CAAC;IACD,OAAO,iEAAiE,QAAQ,KAAK,CAAA;AACzF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAsB,EAAW,EAAE,CACxD,MAAM,KAAK,kBAAkB,CAAC,MAAM,CAAA;AAGxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAsB,EAAW,EAAE;IAClE,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACzD,CAAC;IACD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACzD,CAAC;IACD,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACtD,CAAC;IACD,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-types-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/ts-types-generator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ts-types-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/ts-types-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAcH,QAAQ,EASX,MAAM,eAAe,CAAA;AAuDtB,oBAAY,iBAAiB;IACzB,YAAY,IAAA;CACf;AAGD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,UAAU,QAAQ,EAAE,GAAG,mBAAmB,iBAAiB,EAAE,WA0IlG,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { allFeaturesOf, Annotation, Classifier, Concept, conceptsOf, Enumeration, inheritsDirectlyFrom, Interface, isConcrete, Link, lioncoreBuiltins, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
|
|
1
|
+
import { allFeaturesOf, Annotation, Classifier, Concept, conceptsOf, Enumeration, inheritsDirectlyFrom, Interface, isConcrete, isRef, Link, lioncoreBuiltins, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
|
|
2
2
|
import { indent } from "@lionweb/textgen-utils";
|
|
3
3
|
import { groupBy, mapValues, uniquesAmong } from "@lionweb/ts-utils";
|
|
4
4
|
import { asString, when } from "littoral-templates";
|
|
@@ -86,7 +86,7 @@ export const tsTypeDefsForLanguage = (language, ...generationOptions) => {
|
|
|
86
86
|
const typeForInterface = (intface) => tsFromTypeDef({
|
|
87
87
|
modifier: TypeDefModifier.interface,
|
|
88
88
|
name: intface.name,
|
|
89
|
-
mixinNames: intface.extends.length === 0 ? [`DynamicNode`] : intface.extends.map(nameOf),
|
|
89
|
+
mixinNames: intface.extends.length === 0 ? [`DynamicNode`] : intface.extends.filter(isRef).map(nameOf),
|
|
90
90
|
fields: fieldsForClassifier(intface)
|
|
91
91
|
});
|
|
92
92
|
const typeForLanguageEntity = (entity) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-types-generator.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/ts-types-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EAGV,WAAW,EAEX,oBAAoB,EACpB,SAAS,EACT,UAAU,
|
|
1
|
+
{"version":3,"file":"ts-types-generator.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/ts-types-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAkC,MAAM,eAAe,CAAA;AACrF,OAAO,EAEH,gBAAgB,EAOnB,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAkC,MAAM,eAAe,CAAA;AACrF,OAAO,EAEH,gBAAgB,EAOnB,MAAM,eAAe,CAAA;AActB,eAAO,MAAM,iBAAiB,GAAI,WAAW,gBAAgB,EAAE,YAAW,QAAQ,EAAO,WAyExF,CAAA"}
|
|
@@ -3,6 +3,10 @@ import { byIdMap } from "@lionweb/ts-utils";
|
|
|
3
3
|
import { asString, indentWith } from "littoral-templates";
|
|
4
4
|
const indent = indentWith(" ")(1);
|
|
5
5
|
const prependWith = (template, prefix) => prefix + asString(template);
|
|
6
|
+
const hasFeatureValuesToDisplay = (node) => node.properties.length > 0
|
|
7
|
+
|| node.containments.some(({ children }) => children.length > 0)
|
|
8
|
+
|| node.references.some(({ targets }) => targets.length > 0)
|
|
9
|
+
|| node.annotations.length > 0;
|
|
6
10
|
export const genericAsTreeText = ({ nodes }, languages = []) => {
|
|
7
11
|
const nodesById = byIdMap(nodes);
|
|
8
12
|
const symbolTable = new MemoisingSymbolTable(languages);
|
|
@@ -34,16 +38,20 @@ export const genericAsTreeText = ({ nodes }, languages = []) => {
|
|
|
34
38
|
? prependWith(asText(nodesById[annotationId]), "@ ")
|
|
35
39
|
: `<annotation with id=${annotationId} not present in this chunk>`;
|
|
36
40
|
const curry1 = (func, t1) => (t2) => func(t1, t2);
|
|
37
|
-
const asText = (
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
41
|
+
const asText = (node) => {
|
|
42
|
+
const { id, classifier: classifierMetaPointer, properties, containments, references, annotations } = node;
|
|
43
|
+
const isBlockNonEmpty = hasFeatureValuesToDisplay(node);
|
|
44
|
+
return [
|
|
45
|
+
`${symbolTable.entityMatching(classifierMetaPointer)?.name ?? `[${classifierMetaPointer.key}]`} (id: ${id})${isBlockNonEmpty ? " {" : ""}`,
|
|
46
|
+
indent([
|
|
47
|
+
properties.map(curry1(propertyAsText, classifierMetaPointer)),
|
|
48
|
+
references.flatMap(curry1(referenceAsText, classifierMetaPointer)),
|
|
49
|
+
containments.flatMap(curry1(containmentAsText, classifierMetaPointer)),
|
|
50
|
+
annotations.map(annotationAsText)
|
|
51
|
+
]),
|
|
52
|
+
isBlockNonEmpty ? `}` : []
|
|
53
|
+
];
|
|
54
|
+
};
|
|
47
55
|
return asString(nodes
|
|
48
56
|
.filter(node => node.parent === null) // root nodes
|
|
49
57
|
.map(asText));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAY,oBAAoB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAWrF,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAY,MAAM,oBAAoB,CAAA;AAEnE,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAEpC,MAAM,WAAW,GAAG,CAAC,QAAkB,EAAE,MAAc,EAAY,EAAE,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAEjG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAoB,EAAE,YAAwB,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/utilities",
|
|
3
|
-
"version": "0.7.2-beta.
|
|
3
|
+
"version": "0.7.2-beta.4",
|
|
4
4
|
"description": "LionWeb utilities",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"url": "https://github.com/LionWeb-io/lionweb-typescript/issues"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@lionweb/core": "0.7.2-beta.
|
|
19
|
-
"@lionweb/json": "0.7.2-beta.
|
|
20
|
-
"@lionweb/textgen-utils": "0.7.2-beta.
|
|
21
|
-
"@lionweb/ts-utils": "0.7.2-beta.
|
|
18
|
+
"@lionweb/core": "0.7.2-beta.4",
|
|
19
|
+
"@lionweb/json": "0.7.2-beta.4",
|
|
20
|
+
"@lionweb/textgen-utils": "0.7.2-beta.4",
|
|
21
|
+
"@lionweb/ts-utils": "0.7.2-beta.4",
|
|
22
22
|
"littoral-templates": "0.5.1",
|
|
23
23
|
"nanoid": "5.1.5"
|
|
24
24
|
},
|
|
@@ -53,9 +53,11 @@ const generateForEnumeration = ({ name, literals }: Enumeration) =>
|
|
|
53
53
|
|
|
54
54
|
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }: Annotation) => [
|
|
55
55
|
block(
|
|
56
|
-
[`class ${name}
|
|
56
|
+
[`class ${name}`],
|
|
57
57
|
nonRelationalFeatures(features).map(generateForNonRelationalFeature)
|
|
58
58
|
),
|
|
59
|
+
`<<Annotation>> ${name}`,
|
|
60
|
+
isRef(annotates) ? `${name} ..> ${annotates.name} : <i>annotates</i>` : [],
|
|
59
61
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
60
62
|
implements_.filter(isRef).map(interface_ => `${interface_.name} <|.. ${name}`),
|
|
61
63
|
``
|
|
@@ -68,8 +70,9 @@ const generateForConcept = ({
|
|
|
68
70
|
extends: extends_ /*, implements: implements_*/,
|
|
69
71
|
partition
|
|
70
72
|
}: Concept) => [
|
|
71
|
-
block(`class ${
|
|
73
|
+
block(`class ${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
72
74
|
abstract_ ? `<<Abstract>> ${name}` : [],
|
|
75
|
+
partition ? `<<Partition>> ${name}` : [],
|
|
73
76
|
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
74
77
|
``
|
|
75
78
|
]
|
|
@@ -77,7 +80,7 @@ const generateForConcept = ({
|
|
|
77
80
|
const generateForInterface = ({ name, features, extends: extends_ }: Interface) => [
|
|
78
81
|
block(`class ${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
79
82
|
`<<Interface>> ${name}`,
|
|
80
|
-
extends_.map(({ name: extendsName }) => `${extendsName} <|-- ${name}`),
|
|
83
|
+
extends_.filter(isRef).map(({ name: extendsName }) => `${extendsName} <|-- ${name}`),
|
|
81
84
|
``
|
|
82
85
|
]
|
|
83
86
|
|
|
@@ -62,11 +62,11 @@ const generateForAnnotation = ({ name, features, extends: extends_, implements:
|
|
|
62
62
|
fragments.push(`extends`, extends_.name)
|
|
63
63
|
}
|
|
64
64
|
if (implements_.length > 0) {
|
|
65
|
-
fragments.push(`implements`, implements_.map(nameOf).sort().join(", "))
|
|
65
|
+
fragments.push(`implements`, implements_.filter(isRef).map(nameOf).sort().join(", "))
|
|
66
66
|
}
|
|
67
67
|
const nonRelationalFeatures_ = nonRelationalFeatures(features)
|
|
68
68
|
return nonRelationalFeatures_.length === 0
|
|
69
|
-
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name}
|
|
69
|
+
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name} ..# ${annotates.name} : <i>annotates</i>` : [], ``]
|
|
70
70
|
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``]
|
|
71
71
|
}
|
|
72
72
|
|
|
@@ -83,7 +83,7 @@ const generateForConcept = ({ name, features, abstract: abstract_, extends: exte
|
|
|
83
83
|
fragments.push(`extends`, extends_.name)
|
|
84
84
|
}
|
|
85
85
|
if (implements_.length > 0) {
|
|
86
|
-
fragments.push(`implements`, implements_.map(nameOf).sort().join(", "))
|
|
86
|
+
fragments.push(`implements`, implements_.filter(isRef).map(nameOf).sort().join(", "))
|
|
87
87
|
}
|
|
88
88
|
const nonRelationalFeatures_ = nonRelationalFeatures(features)
|
|
89
89
|
return nonRelationalFeatures_.length === 0
|
|
@@ -94,7 +94,7 @@ const generateForConcept = ({ name, features, abstract: abstract_, extends: exte
|
|
|
94
94
|
const generateForInterface = ({ name, extends: extends_, features }: Interface) => {
|
|
95
95
|
const fragments: string[] = [`interface`, name]
|
|
96
96
|
if (extends_.length > 0) {
|
|
97
|
-
fragments.push(`extends`, extends_.map(superInterface => superInterface.name).join(", "))
|
|
97
|
+
fragments.push(`extends`, extends_.filter(isRef).map(superInterface => superInterface.name).join(", "))
|
|
98
98
|
}
|
|
99
99
|
const nonRelationalFeatures_ = nonRelationalFeatures(features)
|
|
100
100
|
return nonRelationalFeatures_.length === 0
|
package/src/m3/textualizer.ts
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
EnumerationLiteral,
|
|
8
8
|
INamed,
|
|
9
9
|
Interface,
|
|
10
|
+
isRef,
|
|
10
11
|
Language,
|
|
11
12
|
Link,
|
|
12
13
|
M3Node,
|
|
@@ -31,7 +32,7 @@ const featuresOf = (classifier: Classifier): Template => recurse(nameSorted(clas
|
|
|
31
32
|
const asText = (node: M3Node): Template => {
|
|
32
33
|
if (node instanceof Annotation) {
|
|
33
34
|
return [
|
|
34
|
-
`annotation ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements).map(nameOf).join(", ")}`}`,
|
|
35
|
+
`annotation ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements.filter(isRef)).map(nameOf).join(", ")}`}`,
|
|
35
36
|
indented([`annotates: ${refAsText(node.annotates)}`]),
|
|
36
37
|
featuresOf(node)
|
|
37
38
|
]
|
|
@@ -39,14 +40,14 @@ const asText = (node: M3Node): Template => {
|
|
|
39
40
|
|
|
40
41
|
if (node instanceof Concept) {
|
|
41
42
|
return [
|
|
42
|
-
`${node.partition ? `<<partition>> ` : ``}${node.abstract ? `abstract ` : ``}concept ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements).map(nameOf).join(", ")}`}`,
|
|
43
|
+
`${node.partition ? `<<partition>> ` : ``}${node.abstract ? `abstract ` : ``}concept ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements.filter(isRef)).map(nameOf).join(", ")}`}`,
|
|
43
44
|
featuresOf(node)
|
|
44
45
|
]
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
if (node instanceof Interface) {
|
|
48
49
|
return [
|
|
49
|
-
`interface ${node.name}${node.extends.length === 0 ? `` : ` extends ${nameSorted(node.extends).map(nameOf).join(", ")}`}`,
|
|
50
|
+
`interface ${node.name}${node.extends.length === 0 ? `` : ` extends ${nameSorted(node.extends.filter(isRef)).map(nameOf).join(", ")}`}`,
|
|
50
51
|
featuresOf(node)
|
|
51
52
|
]
|
|
52
53
|
}
|
|
@@ -70,7 +71,7 @@ const asText = (node: M3Node): Template => {
|
|
|
70
71
|
`version: ${node.version}`,
|
|
71
72
|
node.dependsOn.length === 0
|
|
72
73
|
? []
|
|
73
|
-
: [`dependsOn:`, indented(node.dependsOn.map(language => `${language.name} (${language.version})`))],
|
|
74
|
+
: [`dependsOn:`, indented(node.dependsOn.filter(isRef).map(language => `${language.name} (${language.version})`))],
|
|
74
75
|
`entities (↓name):`,
|
|
75
76
|
``,
|
|
76
77
|
indented(nameSorted(node.entities).map(entity => [asText(entity), ``]))
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
Datatype,
|
|
7
7
|
Enumeration,
|
|
8
8
|
Interface,
|
|
9
|
+
isRef,
|
|
9
10
|
LanguageEntity,
|
|
10
11
|
PrimitiveType,
|
|
11
12
|
SingleRef
|
|
@@ -35,13 +36,13 @@ export const isINamed = (entity: LanguageEntity): boolean =>
|
|
|
35
36
|
|
|
36
37
|
export const usesINamedDirectly = (entity: LanguageEntity): boolean => {
|
|
37
38
|
if (entity instanceof Annotation) {
|
|
38
|
-
return entity.implements.some(isINamed)
|
|
39
|
+
return entity.implements.filter(isRef).some(isINamed)
|
|
39
40
|
}
|
|
40
41
|
if (entity instanceof Concept) {
|
|
41
|
-
return entity.implements.some(isINamed)
|
|
42
|
+
return entity.implements.filter(isRef).some(isINamed)
|
|
42
43
|
}
|
|
43
44
|
if (entity instanceof Interface) {
|
|
44
|
-
return entity.extends.some(isINamed)
|
|
45
|
+
return entity.extends.filter(isRef).some(isINamed)
|
|
45
46
|
}
|
|
46
47
|
return false
|
|
47
48
|
}
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
inheritsDirectlyFrom,
|
|
12
12
|
Interface,
|
|
13
13
|
isConcrete,
|
|
14
|
+
isRef,
|
|
14
15
|
Language,
|
|
15
16
|
LanguageEntity,
|
|
16
17
|
Link,
|
|
@@ -140,7 +141,7 @@ export const tsTypeDefsForLanguage = (language: Language, ...generationOptions:
|
|
|
140
141
|
tsFromTypeDef({
|
|
141
142
|
modifier: TypeDefModifier.interface,
|
|
142
143
|
name: intface.name,
|
|
143
|
-
mixinNames: intface.extends.length === 0 ? [`DynamicNode`] : intface.extends.map(nameOf),
|
|
144
|
+
mixinNames: intface.extends.length === 0 ? [`DynamicNode`] : intface.extends.filter(isRef).map(nameOf),
|
|
144
145
|
fields: fieldsForClassifier(intface)
|
|
145
146
|
})
|
|
146
147
|
|
|
@@ -16,7 +16,14 @@ const indent = indentWith(" ")(1)
|
|
|
16
16
|
|
|
17
17
|
const prependWith = (template: Template, prefix: string): Template => prefix + asString(template)
|
|
18
18
|
|
|
19
|
+
const hasFeatureValuesToDisplay = (node: LionWebJsonNode) =>
|
|
20
|
+
node.properties.length > 0
|
|
21
|
+
|| node.containments.some(({ children }) => children.length > 0)
|
|
22
|
+
|| node.references.some(({ targets }) => targets.length > 0)
|
|
23
|
+
|| node.annotations.length > 0
|
|
24
|
+
|
|
19
25
|
export const genericAsTreeText = ({ nodes }: LionWebJsonChunk, languages: Language[] = []) => {
|
|
26
|
+
|
|
20
27
|
const nodesById: { [id: LionWebId]: LionWebJsonNode } = byIdMap(nodes)
|
|
21
28
|
const symbolTable = new MemoisingSymbolTable(languages)
|
|
22
29
|
|
|
@@ -67,27 +74,26 @@ export const genericAsTreeText = ({ nodes }: LionWebJsonChunk, languages: Langua
|
|
|
67
74
|
(t2: T2) =>
|
|
68
75
|
func(t1, t2)
|
|
69
76
|
|
|
70
|
-
const asText = ({
|
|
71
|
-
id,
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
]),
|
|
85
|
-
`}`
|
|
86
|
-
]
|
|
77
|
+
const asText = (node: LionWebJsonNode): Template => {
|
|
78
|
+
const { id, classifier: classifierMetaPointer, properties, containments, references, annotations } = node
|
|
79
|
+
const isBlockNonEmpty = hasFeatureValuesToDisplay(node)
|
|
80
|
+
return [
|
|
81
|
+
`${symbolTable.entityMatching(classifierMetaPointer)?.name ?? `[${classifierMetaPointer.key}]`} (id: ${id})${isBlockNonEmpty ? " {" : ""}`,
|
|
82
|
+
indent([
|
|
83
|
+
properties.map(curry1(propertyAsText, classifierMetaPointer)),
|
|
84
|
+
references.flatMap(curry1(referenceAsText, classifierMetaPointer)),
|
|
85
|
+
containments.flatMap(curry1(containmentAsText, classifierMetaPointer)),
|
|
86
|
+
annotations.map(annotationAsText)
|
|
87
|
+
]),
|
|
88
|
+
isBlockNonEmpty ? `}` : []
|
|
89
|
+
]
|
|
90
|
+
}
|
|
87
91
|
|
|
88
92
|
return asString(
|
|
89
93
|
nodes
|
|
90
94
|
.filter(node => node.parent === null) // root nodes
|
|
91
95
|
.map(asText)
|
|
92
96
|
)
|
|
97
|
+
|
|
93
98
|
}
|
|
99
|
+
|