@lionweb/utilities 0.6.13-beta.7 → 0.7.0-alpha.1
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 +2 -1
- package/dist/hashing.d.ts.map +1 -1
- package/dist/hashing.js +1 -1
- package/dist/hashing.js.map +1 -1
- package/dist/m3/diagrams/Mermaid-generator.d.ts.map +1 -1
- package/dist/m3/diagrams/Mermaid-generator.js +12 -32
- 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 +14 -40
- package/dist/m3/diagrams/PlantUML-generator.js.map +1 -1
- package/dist/m3/infer-languages.d.ts +4 -3
- package/dist/m3/infer-languages.d.ts.map +1 -1
- package/dist/m3/infer-languages.js +2 -1
- package/dist/m3/infer-languages.js.map +1 -1
- package/dist/m3/textualizer.d.ts.map +1 -1
- package/dist/m3/textualizer.js +7 -20
- package/dist/m3/textualizer.js.map +1 -1
- package/dist/m3/ts-generation/textgen.d.ts.map +1 -1
- package/dist/m3/ts-generation/textgen.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 +26 -33
- package/dist/m3/ts-generation/ts-types-generator.js.map +1 -1
- package/dist/m3/ts-generation/type-def.d.ts.map +1 -1
- package/dist/m3/ts-generation/type-def.js +1 -5
- package/dist/m3/ts-generation/type-def.js.map +1 -1
- package/dist/serialization/annotation-remover.d.ts +6 -6
- package/dist/serialization/annotation-remover.d.ts.map +1 -1
- package/dist/serialization/annotation-remover.js +3 -3
- package/dist/serialization/annotation-remover.js.map +1 -1
- package/dist/serialization/chunk.d.ts +6 -5
- package/dist/serialization/chunk.d.ts.map +1 -1
- package/dist/serialization/chunk.js +6 -6
- package/dist/serialization/chunk.js.map +1 -1
- package/dist/serialization/measurer.d.ts +8 -3
- package/dist/serialization/measurer.d.ts.map +1 -1
- package/dist/serialization/measurer.js +24 -18
- package/dist/serialization/measurer.js.map +1 -1
- package/dist/serialization/metric-types.d.ts +3 -2
- package/dist/serialization/metric-types.d.ts.map +1 -1
- package/dist/serialization/ordering.d.ts +6 -6
- package/dist/serialization/ordering.d.ts.map +1 -1
- package/dist/serialization/ordering.js +3 -3
- package/dist/serialization/ordering.js.map +1 -1
- package/dist/serialization/sorting.d.ts +2 -2
- package/dist/serialization/sorting.d.ts.map +1 -1
- package/dist/serialization/sorting.js +4 -5
- package/dist/serialization/sorting.js.map +1 -1
- package/dist/serialization/textualizer.d.ts +3 -2
- package/dist/serialization/textualizer.d.ts.map +1 -1
- package/dist/serialization/textualizer.js +12 -11
- package/dist/serialization/textualizer.js.map +1 -1
- package/dist/utils/json.d.ts.map +1 -1
- package/dist/utils/json.js.map +1 -1
- package/package.json +12 -8
- package/dist/utils/array.d.ts +0 -9
- package/dist/utils/array.d.ts.map +0 -1
- package/dist/utils/array.js +0 -9
- package/dist/utils/array.js.map +0 -1
- package/dist/utils/nested-map.d.ts +0 -46
- package/dist/utils/nested-map.d.ts.map +0 -1
- package/dist/utils/nested-map.js +0 -50
- package/dist/utils/nested-map.js.map +0 -1
- package/dist/utils/object.d.ts +0 -5
- package/dist/utils/object.d.ts.map +0 -1
- package/dist/utils/object.js +0 -5
- package/dist/utils/object.js.map +0 -1
package/README.md
CHANGED
|
@@ -7,11 +7,12 @@
|
|
|
7
7
|
[
|
|
8
8
|
](https://www.npmjs.com/package/@lionweb/utilities)
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
This NPM package can be added to a TypeScript codebase as follows:
|
|
11
11
|
|
|
12
12
|
```shell
|
|
13
13
|
$ npm add @lionweb/utilities
|
|
14
14
|
```
|
|
15
|
+
|
|
15
16
|
It contains utilities on top of the `core` package, such as:
|
|
16
17
|
|
|
17
18
|
* Diagram generation (PlantUML and Mermaid) from an M2.
|
package/dist/hashing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashing.d.ts","sourceRoot":"","sources":["../src/hashing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hashing.d.ts","sourceRoot":"","sources":["../src/hashing.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;AAGlD;;GAEG;AACH,eAAO,MAAM,SAAS,QAAO,YACV,CAAA;AAGnB,QAAA,MAAM,oBAAoB,WAAW,CAAA;AAErC;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,oBAAoB,GAAG,MAAM,CAAA;IAChD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,WAAW,GAAG,QAAQ,CAAA;CACpC,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,YAAa,kBAAkB,KAAG,YAcpD,CAAA;AAGD;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAAY,YAAY,KAAG,YAStD,CAAA;AAGD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WAAY,YAAY,KAAG,YAMnD,CAAA;AAGL;;;GAGG;AACH,eAAO,MAAM,aAAa,WAAY,YAAY,KAAG,YAWpD,CAAA;AAGD;;;;;GAKG;AACH,eAAO,MAAM,YAAY,WAAY,YAAY,KAAG,YAO/C,CAAA;AAGL;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAA;AAE5E;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,WAAY,YAAY,yBAAyB,uBAAuB,EAAE,KAAG,YAC1B,CAAA;AAGrE;;;GAGG;AACH,eAAO,MAAM,QAAQ,WAAY,YAAY,KAAG,YAO3C,CAAA"}
|
package/dist/hashing.js
CHANGED
package/dist/hashing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../src/hashing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../src/hashing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mermaid-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EASX,MAAM,eAAe,CAAA;AAYtB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,iBAAkB,QAAQ,WAW3D,CAAA"}
|
|
@@ -1,19 +1,9 @@
|
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nameSorted, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
1
2
|
import { asString, indentWith } from "littoral-templates";
|
|
2
|
-
import { Annotation, Concept, Containment, entitiesSortedByName, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
3
|
-
import { picker } from "../../utils/object.js";
|
|
4
3
|
// define some layouting basics/building algebra:
|
|
5
4
|
const indented = indentWith(` `)(1);
|
|
6
|
-
const block = (header, elements) => elements.length === 0
|
|
7
|
-
|
|
8
|
-
: [
|
|
9
|
-
`${header} {`,
|
|
10
|
-
indented(elements),
|
|
11
|
-
`}`
|
|
12
|
-
];
|
|
13
|
-
const withNewLine = (content) => [
|
|
14
|
-
content,
|
|
15
|
-
``
|
|
16
|
-
];
|
|
5
|
+
const block = (header, elements) => elements.length === 0 ? header : [`${header} {`, indented(elements), `}`];
|
|
6
|
+
const withNewLine = (content) => [content, ``];
|
|
17
7
|
/**
|
|
18
8
|
* Generates a string with a Mermaid class diagram
|
|
19
9
|
* representing the given {@link Language LionCore instance}.
|
|
@@ -23,30 +13,23 @@ export const generateMermaidForLanguage = ({ entities }) => asString([
|
|
|
23
13
|
`classDiagram
|
|
24
14
|
|
|
25
15
|
`,
|
|
26
|
-
indented(
|
|
16
|
+
indented(nameSorted(entities).map(generateForEntity)),
|
|
27
17
|
``,
|
|
28
|
-
indented(
|
|
18
|
+
indented(nameSorted(entities).map(generateForRelationsOf)),
|
|
29
19
|
``,
|
|
30
20
|
"```"
|
|
31
21
|
]);
|
|
32
|
-
const generateForEnumeration = ({ name, literals }) => withNewLine(block(`class ${name}`, [
|
|
33
|
-
`<<enumeration>>`,
|
|
34
|
-
literals.map(picker("name"))
|
|
35
|
-
]));
|
|
22
|
+
const generateForEnumeration = ({ name, literals }) => withNewLine(block(`class ${name}`, [`<<enumeration>>`, literals.map(({ name }) => name)]));
|
|
36
23
|
const generateForAnnotation = ({ name, features, extends: extends_, implements: implements_, annotates }) => [
|
|
37
|
-
block([
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
isRef(annotates) ? `${name} ..> ${annotates.name}` : []
|
|
41
|
-
], nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
42
|
-
(isRef(extends_) && !isBuiltinNodeConcept(extends_)) ? `${extends_.name} <|-- ${name}` : [],
|
|
43
|
-
implements_.filter(isRef).map((interface_) => `${interface_.name} <|.. ${name}`),
|
|
24
|
+
block([`class ${name}`, `<<Annotation>> ${name}`, isRef(annotates) ? `${name} ..> ${annotates.name}` : []], nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
25
|
+
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
26
|
+
implements_.filter(isRef).map(interface_ => `${interface_.name} <|.. ${name}`),
|
|
44
27
|
``
|
|
45
28
|
];
|
|
46
29
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_ /*, implements: implements_*/, partition }) => [
|
|
47
30
|
block(`class ${partition ? `<<partition>> ` : ``}${name}`, nonRelationalFeatures(features).map(generateForNonRelationalFeature)),
|
|
48
31
|
abstract_ ? `<<Abstract>> ${name}` : [],
|
|
49
|
-
|
|
32
|
+
isRef(extends_) && !isBuiltinNodeConcept(extends_) ? `${extends_.name} <|-- ${name}` : [],
|
|
50
33
|
``
|
|
51
34
|
];
|
|
52
35
|
const generateForInterface = ({ name, features, extends: extends_ }) => [
|
|
@@ -86,14 +69,11 @@ const generateForEntity = (entity) => {
|
|
|
86
69
|
};
|
|
87
70
|
const generateForRelationsOf = (entity) => {
|
|
88
71
|
const relations = relationsOf(entity);
|
|
89
|
-
return relations.length === 0
|
|
90
|
-
? ``
|
|
91
|
-
: relations
|
|
92
|
-
.map((relation) => generateForRelation(entity, relation));
|
|
72
|
+
return relations.length === 0 ? `` : relations.map(relation => generateForRelation(entity, relation));
|
|
93
73
|
};
|
|
94
74
|
const generateForRelation = ({ name: leftName }, relation) => {
|
|
95
75
|
const { name: relationName, optional, multiple, type } = relation;
|
|
96
|
-
const rightName = isRef(type) ? type.name :
|
|
76
|
+
const rightName = isRef(type) ? type.name : type === unresolved ? `<unresolved>` : `<null>`;
|
|
97
77
|
const isContainment = relation instanceof Containment;
|
|
98
78
|
const leftMultiplicity = isContainment ? `1` : `*`;
|
|
99
79
|
const rightMultiplicity = (() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlantUML-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PlantUML-generator.d.ts","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EAUX,MAAM,eAAe,CAAA;AAKtB;;;GAGG;AACH,eAAO,MAAM,2BAA2B,uBAAwB,QAAQ,WAmBlE,CAAA"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nameOf, nameSorted, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
1
2
|
import { asString, indentWith } from "littoral-templates";
|
|
2
|
-
import { Annotation, Concept, Containment, entitiesSortedByName, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nameOf, nonRelationalFeatures, PrimitiveType, relationsOf, type, unresolved } from "@lionweb/core";
|
|
3
|
-
import { picker } from "../../utils/object.js";
|
|
4
3
|
const indented = indentWith(` `)(1);
|
|
5
4
|
/**
|
|
6
5
|
* Generates a string with a PlantUML class diagram
|
|
@@ -14,20 +13,20 @@ hide empty members
|
|
|
14
13
|
|
|
15
14
|
|
|
16
15
|
`,
|
|
17
|
-
|
|
16
|
+
nameSorted(entities).map(generateForEntity),
|
|
18
17
|
`
|
|
19
18
|
|
|
20
19
|
' relations:
|
|
21
20
|
|
|
22
21
|
`,
|
|
23
|
-
|
|
22
|
+
nameSorted(entities).map(generateForRelationsOf),
|
|
24
23
|
`
|
|
25
24
|
@enduml
|
|
26
25
|
`
|
|
27
26
|
]);
|
|
28
27
|
const generateForEnumeration = ({ name, literals }) => [
|
|
29
28
|
`enum ${name} {`,
|
|
30
|
-
indented(literals.map(
|
|
29
|
+
indented(literals.map(({ name }) => name)),
|
|
31
30
|
`}
|
|
32
31
|
|
|
33
32
|
`
|
|
@@ -43,17 +42,8 @@ const generateForAnnotation = ({ name, features, extends: extends_, implements:
|
|
|
43
42
|
}
|
|
44
43
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
45
44
|
return nonRelationalFeatures_.length === 0
|
|
46
|
-
? [
|
|
47
|
-
|
|
48
|
-
isRef(annotates) ? `${name} ..> ${annotates.name}` : [],
|
|
49
|
-
``
|
|
50
|
-
]
|
|
51
|
-
: [
|
|
52
|
-
`${fragments.join(" ")} {`,
|
|
53
|
-
indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)),
|
|
54
|
-
`}`,
|
|
55
|
-
``
|
|
56
|
-
];
|
|
45
|
+
? [`${fragments.join(" ")}`, isRef(annotates) ? `${name} ..> ${annotates.name}` : [], ``]
|
|
46
|
+
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``];
|
|
57
47
|
};
|
|
58
48
|
const generateForConcept = ({ name, features, abstract: abstract_, extends: extends_, implements: implements_, partition }) => {
|
|
59
49
|
const fragments = [];
|
|
@@ -72,37 +62,24 @@ const generateForConcept = ({ name, features, abstract: abstract_, extends: exte
|
|
|
72
62
|
}
|
|
73
63
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
74
64
|
return nonRelationalFeatures_.length === 0
|
|
75
|
-
? [
|
|
76
|
-
|
|
77
|
-
``
|
|
78
|
-
]
|
|
79
|
-
: [
|
|
80
|
-
`${fragments.join(" ")} {`,
|
|
81
|
-
indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)),
|
|
82
|
-
`}`,
|
|
83
|
-
``
|
|
84
|
-
];
|
|
65
|
+
? [`${fragments.join(" ")}`, ``]
|
|
66
|
+
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``];
|
|
85
67
|
};
|
|
86
68
|
const generateForInterface = ({ name, extends: extends_, features }) => {
|
|
87
69
|
const fragments = [`interface`, name];
|
|
88
70
|
if (extends_.length > 0) {
|
|
89
|
-
fragments.push(`extends`, extends_.map(
|
|
71
|
+
fragments.push(`extends`, extends_.map(superInterface => superInterface.name).join(", "));
|
|
90
72
|
}
|
|
91
73
|
const nonRelationalFeatures_ = nonRelationalFeatures(features);
|
|
92
74
|
return nonRelationalFeatures_.length === 0
|
|
93
75
|
? `${fragments.join(" ")}`
|
|
94
|
-
: [
|
|
95
|
-
`${fragments.join(" ")} {`,
|
|
96
|
-
indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)),
|
|
97
|
-
`}`,
|
|
98
|
-
``
|
|
99
|
-
];
|
|
76
|
+
: [`${fragments.join(" ")} {`, indented(nonRelationalFeatures_.map(generateForNonRelationalFeature)), `}`, ``];
|
|
100
77
|
};
|
|
101
78
|
const generateForNonRelationalFeature = (feature) => {
|
|
102
79
|
const { name, optional } = feature;
|
|
103
80
|
const multiple = feature instanceof Link && feature.multiple;
|
|
104
81
|
const type_ = type(feature);
|
|
105
|
-
return `${name}: ${multiple ? `List<` : ``}${type_ === unresolved ? `???` : type_.name}${
|
|
82
|
+
return `${name}: ${multiple ? `List<` : ``}${type_ === unresolved ? `???` : type_.name}${optional && !multiple ? `?` : ``}${multiple ? `>` : ``}`;
|
|
106
83
|
};
|
|
107
84
|
const generateForPrimitiveType = ({ name }) => `class "${name}" <<primitive type>>`;
|
|
108
85
|
const generateForEntity = (entity) => {
|
|
@@ -126,17 +103,14 @@ const generateForEntity = (entity) => {
|
|
|
126
103
|
};
|
|
127
104
|
const generateForRelationsOf = (entity) => {
|
|
128
105
|
const relations = relationsOf(entity);
|
|
129
|
-
return relations.length === 0
|
|
130
|
-
? ``
|
|
131
|
-
: relations
|
|
132
|
-
.map((relation) => generateForRelation(entity, relation));
|
|
106
|
+
return relations.length === 0 ? `` : relations.map(relation => generateForRelation(entity, relation));
|
|
133
107
|
};
|
|
134
108
|
const generateForRelation = ({ name: leftName }, relation) => {
|
|
135
109
|
const { name: relationName, type, optional, multiple } = relation;
|
|
136
|
-
const rightName = isRef(type) ? type.name :
|
|
110
|
+
const rightName = isRef(type) ? type.name : type === unresolved ? `<unresolved>` : `<null>`;
|
|
137
111
|
const isContainment = relation instanceof Containment;
|
|
138
112
|
const leftMultiplicity = isContainment ? `1` : `*`;
|
|
139
|
-
const rightMultiplicity = multiple ? "*" :
|
|
113
|
+
const rightMultiplicity = multiple ? "*" : optional ? "0..1" : "1";
|
|
140
114
|
return `${leftName} "${leftMultiplicity}" ${isContainment ? `o` : ``}--> "${rightMultiplicity}" ${rightName}: ${relationName}`;
|
|
141
115
|
};
|
|
142
116
|
/*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"PlantUML-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/PlantUML-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Language
|
|
2
|
-
|
|
3
|
-
export declare const
|
|
1
|
+
import { Language } from "@lionweb/core";
|
|
2
|
+
import { LionWebJsonChunk, LionWebKey } from "@lionweb/json";
|
|
3
|
+
export declare const inferLanguagesFromSerializationChunk: (chunk: LionWebJsonChunk) => Language[];
|
|
4
|
+
export declare const deriveLikelyPropertyName: (key: LionWebKey) => string;
|
|
4
5
|
//# sourceMappingURL=infer-languages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infer-languages.d.ts","sourceRoot":"","sources":["../../src/m3/infer-languages.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"infer-languages.d.ts","sourceRoot":"","sources":["../../src/m3/infer-languages.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAIX,MAAM,eAAe,CAAA;AACtB,OAAO,EAAa,gBAAgB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAWvE,eAAO,MAAM,oCAAoC,UAAW,gBAAgB,KAAG,QAAQ,EAuGtF,CAAA;AAUD,eAAO,MAAM,wBAAwB,QAAS,UAAU,WASvD,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Concept, Containment, Language, Property, Reference
|
|
1
|
+
import { builtinPrimitives, Concept, Containment, Language, Property, Reference } from "@lionweb/core";
|
|
2
|
+
import { asArray, chain, concatenator, lastOf } from "@lionweb/ts-utils";
|
|
2
3
|
import { hasher } from "../hashing.js";
|
|
3
4
|
const possibleKeySeparators = ["-", "_"];
|
|
4
5
|
const id = chain(concatenator("-"), hasher());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infer-languages.js","sourceRoot":"","sources":["../../src/m3/infer-languages.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,WAAW,EACX,QAAQ,EAER,QAAQ,EACR,SAAS,
|
|
1
|
+
{"version":3,"file":"infer-languages.js","sourceRoot":"","sources":["../../src/m3/infer-languages.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,EASH,QAAQ,EASX,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EASX,MAAM,eAAe,CAAA;AA0EtB,eAAO,MAAM,cAAc,aAAc,QAAQ,WAA+B,CAAA;AAEhF,eAAO,MAAM,eAAe,cAAe,QAAQ,EAAE,KAAG,MAAiF,CAAA"}
|
package/dist/m3/textualizer.js
CHANGED
|
@@ -1,21 +1,14 @@
|
|
|
1
1
|
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, 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
|
-
const refAsText = (ref) => ref === unresolved ? `???` : ref.name;
|
|
5
|
-
const recurse = (ts, header, func = asText) => ts.length === 0
|
|
6
|
-
? []
|
|
7
|
-
: indented([
|
|
8
|
-
header,
|
|
9
|
-
indented(ts.map(func))
|
|
10
|
-
]);
|
|
4
|
+
const refAsText = (ref) => (ref === unresolved ? `???` : ref.name);
|
|
5
|
+
const recurse = (ts, header, func = asText) => ts.length === 0 ? [] : indented([header, indented(ts.map(func))]);
|
|
11
6
|
const featuresOf = (classifier) => recurse(nameSorted(classifier.features), `features (↓name):`);
|
|
12
7
|
const asText = (node) => {
|
|
13
8
|
if (node instanceof Annotation) {
|
|
14
9
|
return [
|
|
15
10
|
`annotation ${node.name}${node.extends === undefined ? `` : ` extends ${refAsText(node.extends)}`}${node.implements.length === 0 ? `` : ` implements ${nameSorted(node.implements).map(nameOf).join(", ")}`}`,
|
|
16
|
-
indented([
|
|
17
|
-
`annotates: ${refAsText(node.annotates)}`
|
|
18
|
-
]),
|
|
11
|
+
indented([`annotates: ${refAsText(node.annotates)}`]),
|
|
19
12
|
featuresOf(node)
|
|
20
13
|
];
|
|
21
14
|
}
|
|
@@ -35,10 +28,7 @@ const asText = (node) => {
|
|
|
35
28
|
return `${node.name}${node instanceof Containment ? `:` : ` ->`} ${refAsText(node.type)}${node.multiple ? `[${node.optional ? `0` : `1`}..*]` : ``}${node.optional && !node.multiple ? `?` : ``}`;
|
|
36
29
|
}
|
|
37
30
|
if (node instanceof Enumeration) {
|
|
38
|
-
return [
|
|
39
|
-
`enumeration ${node.name}`,
|
|
40
|
-
recurse(node.literals, `literals:`)
|
|
41
|
-
];
|
|
31
|
+
return [`enumeration ${node.name}`, recurse(node.literals, `literals:`)];
|
|
42
32
|
}
|
|
43
33
|
if (node instanceof EnumerationLiteral) {
|
|
44
34
|
return `${node.name}`;
|
|
@@ -50,13 +40,10 @@ const asText = (node) => {
|
|
|
50
40
|
`version: ${node.version}`,
|
|
51
41
|
node.dependsOn.length === 0
|
|
52
42
|
? []
|
|
53
|
-
: [
|
|
54
|
-
`dependsOn:`,
|
|
55
|
-
indented(node.dependsOn.map((language) => `${language.name} (${language.version})`))
|
|
56
|
-
],
|
|
43
|
+
: [`dependsOn:`, indented(node.dependsOn.map(language => `${language.name} (${language.version})`))],
|
|
57
44
|
`entities (↓name):`,
|
|
58
45
|
``,
|
|
59
|
-
indented(nameSorted(node.entities).map(
|
|
46
|
+
indented(nameSorted(node.entities).map(entity => [asText(entity), ``]))
|
|
60
47
|
]),
|
|
61
48
|
``
|
|
62
49
|
];
|
|
@@ -70,5 +57,5 @@ const asText = (node) => {
|
|
|
70
57
|
return `node (key=${node.key}, ID=${node.id}) of class ${node.constructor.name} not handled`;
|
|
71
58
|
};
|
|
72
59
|
export const languageAsText = (language) => asString(asText(language));
|
|
73
|
-
export const languagesAsText = (languages) => asString(nameSorted(languages).map(
|
|
60
|
+
export const languagesAsText = (languages) => asString(nameSorted(languages).map(language => [asText(language), ``]));
|
|
74
61
|
//# sourceMappingURL=textualizer.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textgen.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/textgen.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"textgen.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/textgen.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM,wDAAwB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textgen.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/textgen.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"textgen.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/textgen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,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,EAgBH,QAAQ,EAUX,MAAM,eAAe,CAAA;AA6EtB,oBAAY,iBAAiB;IACzB,YAAY,IAAA;CACf;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,aAAc,QAAQ,wBAAwB,iBAAiB,EAAE,WAsH/F,CAAA"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { allFeaturesOf, Annotation, builtinClassifiers, builtinPrimitives, Classifier, Concept, conceptsOf, Enumeration,
|
|
1
|
+
import { allFeaturesOf, Annotation, builtinClassifiers, builtinPrimitives, Classifier, Concept, conceptsOf, Enumeration, inheritsFrom, Interface, isConcrete, Link, lioncoreBuiltins, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
|
|
2
|
+
import { groupBy, mapValues, uniquesAmong } from "@lionweb/ts-utils";
|
|
2
3
|
import { asString, when } from "littoral-templates";
|
|
3
4
|
import { indent } from "./textgen.js";
|
|
4
5
|
import { tsFromTypeDef, TypeDefModifier } from "./type-def.js";
|
|
5
|
-
import { uniquesAmong } from "../../utils/array.js";
|
|
6
|
-
import { picker } from "../../utils/object.js";
|
|
7
6
|
const fieldForFeature = (feature) => {
|
|
8
7
|
if (feature instanceof Link) {
|
|
9
8
|
return fieldForLink(feature);
|
|
@@ -25,10 +24,14 @@ const fieldForLink = ({ name, type, optional, multiple }) => ({
|
|
|
25
24
|
const tsTypeFor = (datatype) => {
|
|
26
25
|
if (datatype instanceof PrimitiveType) {
|
|
27
26
|
switch (datatype) {
|
|
28
|
-
case builtinPrimitives.booleanDatatype:
|
|
29
|
-
|
|
30
|
-
case builtinPrimitives.
|
|
31
|
-
|
|
27
|
+
case builtinPrimitives.booleanDatatype:
|
|
28
|
+
return `boolean`;
|
|
29
|
+
case builtinPrimitives.stringDatatype:
|
|
30
|
+
return `string`;
|
|
31
|
+
case builtinPrimitives.integerDatatype:
|
|
32
|
+
return `number`;
|
|
33
|
+
case builtinPrimitives.jsonDatatype:
|
|
34
|
+
return `unknown`;
|
|
32
35
|
default:
|
|
33
36
|
return `string`;
|
|
34
37
|
}
|
|
@@ -62,10 +65,7 @@ const typeForEnumeration = (enumeration) => [
|
|
|
62
65
|
`}`,
|
|
63
66
|
``
|
|
64
67
|
];
|
|
65
|
-
const typeForPrimitiveType = (datatype) => [
|
|
66
|
-
`export type ${datatype.name} = ${tsTypeFor(datatype)};`,
|
|
67
|
-
``
|
|
68
|
-
];
|
|
68
|
+
const typeForPrimitiveType = (datatype) => [`export type ${datatype.name} = ${tsTypeFor(datatype)};`, ``];
|
|
69
69
|
export var GenerationOptions;
|
|
70
70
|
(function (GenerationOptions) {
|
|
71
71
|
GenerationOptions[GenerationOptions["assumeSealed"] = 0] = "assumeSealed";
|
|
@@ -76,16 +76,15 @@ export var GenerationOptions;
|
|
|
76
76
|
*/
|
|
77
77
|
export const tsTypesForLanguage = (language, ...generationOptions) => {
|
|
78
78
|
const fieldsForClassifier = (classifier) => {
|
|
79
|
-
const map = mapValues(groupBy(allFeaturesOf(classifier), nameOf),
|
|
79
|
+
const map = mapValues(groupBy(allFeaturesOf(classifier), nameOf), features => features.map(feature => [feature, fieldForFeature(feature)]));
|
|
80
80
|
Object.values(map)
|
|
81
|
-
.filter(
|
|
82
|
-
.forEach(
|
|
81
|
+
.filter(fieldsWithOrigin => fieldsWithOrigin.length > 1)
|
|
82
|
+
.forEach(fieldsWithOrigin => {
|
|
83
83
|
fieldsWithOrigin.forEach(([feature, field]) => {
|
|
84
84
|
field.name = `${field.name}_${feature.parent.name}`;
|
|
85
85
|
});
|
|
86
86
|
});
|
|
87
|
-
return Object.values(map)
|
|
88
|
-
.flatMap((fieldsWithOrigin) => fieldsWithOrigin.map(([_, field]) => field));
|
|
87
|
+
return Object.values(map).flatMap(fieldsWithOrigin => fieldsWithOrigin.map(([_, field]) => field));
|
|
89
88
|
};
|
|
90
89
|
const typeForAnnotation = (annotation) => {
|
|
91
90
|
const superTypes = inheritsFrom(annotation);
|
|
@@ -99,9 +98,9 @@ export const tsTypesForLanguage = (language, ...generationOptions) => {
|
|
|
99
98
|
const typeForConcept = (concept) => {
|
|
100
99
|
const superTypes = inheritsFrom(concept);
|
|
101
100
|
const subClassifiers = concept.abstract
|
|
102
|
-
?
|
|
103
|
-
? conceptsOf(language).filter(
|
|
104
|
-
: []
|
|
101
|
+
? generationOptions.indexOf(GenerationOptions.assumeSealed) > -1
|
|
102
|
+
? conceptsOf(language).filter(entity => entity.extends === concept)
|
|
103
|
+
: []
|
|
105
104
|
: [concept];
|
|
106
105
|
return tsFromTypeDef({
|
|
107
106
|
modifier: concept.abstract ? TypeDefModifier.abstract : TypeDefModifier.none,
|
|
@@ -133,28 +132,22 @@ export const tsTypesForLanguage = (language, ...generationOptions) => {
|
|
|
133
132
|
if (entity instanceof PrimitiveType) {
|
|
134
133
|
return typeForPrimitiveType(entity);
|
|
135
134
|
}
|
|
136
|
-
return [
|
|
137
|
-
`// unhandled language entity <${entity.constructor.name}>"${entity.name}"`,
|
|
138
|
-
``
|
|
139
|
-
];
|
|
135
|
+
return [`// unhandled language entity <${entity.constructor.name}>"${entity.name}"`, ``];
|
|
140
136
|
};
|
|
141
137
|
const dependenciesOfClassifier = (classifier) => [
|
|
142
138
|
...inheritsFrom(classifier),
|
|
143
139
|
...allFeaturesOf(classifier)
|
|
144
|
-
.filter(
|
|
145
|
-
.map(
|
|
146
|
-
.flatMap(
|
|
147
|
-
.filter(
|
|
148
|
-
.map(
|
|
140
|
+
.filter(feature => feature instanceof Link)
|
|
141
|
+
.map(feature => feature)
|
|
142
|
+
.flatMap(({ type }) => type)
|
|
143
|
+
.filter(type => type instanceof Classifier)
|
|
144
|
+
.map(classifier => classifier)
|
|
149
145
|
];
|
|
150
146
|
const coreImports = [
|
|
151
147
|
...when(!language.entities.every(usesINamedDirectly))([`DynamicNode`]),
|
|
152
148
|
...when(language.entities.some(usesINamedDirectly))([`INamed`])
|
|
153
149
|
];
|
|
154
|
-
const generatedDependencies = uniquesAmong(language.entities
|
|
155
|
-
.filter((entity) => entity instanceof Classifier)
|
|
156
|
-
.flatMap((entity) => dependenciesOfClassifier(entity)))
|
|
157
|
-
.filter((classifier) => classifier.language !== language && classifier.language !== lioncoreBuiltins);
|
|
150
|
+
const generatedDependencies = uniquesAmong(language.entities.filter(entity => entity instanceof Classifier).flatMap(entity => dependenciesOfClassifier(entity))).filter(classifier => classifier.language !== language && classifier.language !== lioncoreBuiltins);
|
|
158
151
|
const importsPerPackage = groupBy(generatedDependencies, ({ language }) => language.name);
|
|
159
152
|
const concreteClassifiers = language.entities.filter(isConcrete);
|
|
160
153
|
return asString([
|
|
@@ -170,7 +163,7 @@ export const tsTypesForLanguage = (language, ...generationOptions) => {
|
|
|
170
163
|
when(coreImports.length > 0)(`import {${coreImports.join(`, `)}} from "@lionweb/core";`),
|
|
171
164
|
Object.keys(importsPerPackage)
|
|
172
165
|
.sort()
|
|
173
|
-
.map(
|
|
166
|
+
.map(packageName => `import {${nameSorted(importsPerPackage[packageName]).map(nameOf).join(", ")}} from "./${packageName}.js";`),
|
|
174
167
|
``,
|
|
175
168
|
``,
|
|
176
169
|
nameSorted(language.entities).map(typeForLanguageEntity),
|