@lionweb/utilities 0.8.0-beta.3 → 0.8.0-beta.5
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 +1 -0
- package/README.md +4 -1
- package/dist/m3/diagrams/Mermaid-generator.js +3 -3
- package/dist/m3/diagrams/Mermaid-generator.js.map +1 -1
- package/dist/m3/diagrams/PlantUML-generator.js +3 -3
- package/dist/m3/diagrams/PlantUML-generator.js.map +1 -1
- package/dist/m3/textualizer.d.ts.map +1 -1
- package/dist/m3/textualizer.js +3 -3
- package/dist/m3/textualizer.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 +5 -2
- package/dist/serialization/textualizer.js.map +1 -1
- package/package.json +5 -5
- package/src/m3/diagrams/Mermaid-generator.ts +4 -4
- package/src/m3/diagrams/PlantUML-generator.ts +4 -4
- package/src/m3/textualizer.ts +6 -5
- package/src/m3/ts-generation/ts-types-generator.ts +3 -3
- package/src/serialization/textualizer.ts +10 -7
package/CHANGELOG.md
CHANGED
package/README.md
CHANGED
|
@@ -22,12 +22,15 @@ It contains utilities on top of the `core` package, such as:
|
|
|
22
22
|
* Infer a (partial) M2 from a serialization chunk.
|
|
23
23
|
* Generation of TypeScript type definitions from an M2.
|
|
24
24
|
|
|
25
|
+
Note that this package implicitly relies on Node.js, so effectively on the `@types/node` package, without stating that explicitly as a (production) dependency in `package.json`.
|
|
26
|
+
This enables using this package in browsers, as long as you don’t use the `readFileAsJson` and `writeJsonAsFile` functions.
|
|
27
|
+
|
|
25
28
|
|
|
26
29
|
## Development
|
|
27
30
|
|
|
28
31
|
Build it from source as follows:
|
|
29
32
|
|
|
30
|
-
```
|
|
33
|
+
```shell
|
|
31
34
|
npm run build
|
|
32
35
|
```
|
|
33
36
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Annotation, Concept, Containment, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nameSorted, nonRelationalFeatures, PrimitiveType, relationsOf, type
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, Interface, isBuiltinNodeConcept, isRef, isUnresolvedReference, Link, nameSorted, nonRelationalFeatures, PrimitiveType, relationsOf, type } from "@lionweb/core";
|
|
2
2
|
import { asString, indentWith } from "littoral-templates";
|
|
3
3
|
// define some layouting basics/building algebra:
|
|
4
4
|
const indented = indentWith(` `)(1);
|
|
@@ -45,7 +45,7 @@ const generateForNonRelationalFeature = (feature) => {
|
|
|
45
45
|
const { name, optional } = feature;
|
|
46
46
|
const multiple = feature instanceof Link && feature.multiple;
|
|
47
47
|
const type_ = type(feature);
|
|
48
|
-
const typeText = `${multiple ? `List~` : ``}${type_
|
|
48
|
+
const typeText = `${multiple ? `List~` : ``}${isUnresolvedReference(type_) ? `???` : type_.name}${multiple ? `~` : ``}${optional ? `?` : ``}`;
|
|
49
49
|
return `+${typeText} ${name}`;
|
|
50
50
|
};
|
|
51
51
|
const generateForPrimitiveType = ({ name }) => [
|
|
@@ -77,7 +77,7 @@ const generateForRelationsOf = (entity) => {
|
|
|
77
77
|
};
|
|
78
78
|
const generateForRelation = ({ name: leftName }, relation) => {
|
|
79
79
|
const { name: relationName, optional, multiple, type } = relation;
|
|
80
|
-
const rightName = isRef(type) ? type.name : type
|
|
80
|
+
const rightName = isRef(type) ? type.name : isUnresolvedReference(type) ? `<unresolved>` : `<null>`;
|
|
81
81
|
const isContainment = relation instanceof Containment;
|
|
82
82
|
const leftMultiplicity = isContainment ? `1` : `*`;
|
|
83
83
|
const rightMultiplicity = (() => {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"Mermaid-generator.js","sourceRoot":"","sources":["../../../src/m3/diagrams/Mermaid-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Annotation, Concept, Containment, Enumeration, Interface, isBuiltinNodeConcept, isRef, Link, nameOf, nameSorted, nonRelationalFeatures, PrimitiveType, relationsOf, type
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, Interface, isBuiltinNodeConcept, isRef, isUnresolvedReference, Link, nameOf, nameSorted, nonRelationalFeatures, PrimitiveType, relationsOf, type } from "@lionweb/core";
|
|
2
2
|
import { asString, indentWith } from "littoral-templates";
|
|
3
3
|
const indented = indentWith(` `)(1);
|
|
4
4
|
/**
|
|
@@ -76,7 +76,7 @@ const generateForNonRelationalFeature = (feature) => {
|
|
|
76
76
|
const { name, optional } = feature;
|
|
77
77
|
const multiple = feature instanceof Link && feature.multiple;
|
|
78
78
|
const type_ = type(feature);
|
|
79
|
-
return `${name}: ${multiple ? `List<` : ``}${type_
|
|
79
|
+
return `${name}: ${multiple ? `List<` : ``}${isUnresolvedReference(type_) ? `???` : type_.name}${optional && !multiple ? `?` : ``}${multiple ? `>` : ``}`;
|
|
80
80
|
};
|
|
81
81
|
const generateForPrimitiveType = ({ name }) => `class "${name}" <<primitive type>>`;
|
|
82
82
|
const generateForEntity = (entity) => {
|
|
@@ -106,7 +106,7 @@ const generateForRelationsOf = (entity) => {
|
|
|
106
106
|
};
|
|
107
107
|
const generateForRelation = ({ name: leftName }, relation) => {
|
|
108
108
|
const { name: relationName, type, optional, multiple } = relation;
|
|
109
|
-
const rightName = isRef(type) ? type.name : type
|
|
109
|
+
const rightName = isRef(type) ? type.name : isUnresolvedReference(type) ? `<unresolved>` : `<null>`;
|
|
110
110
|
const isContainment = relation instanceof Containment;
|
|
111
111
|
const leftMultiplicity = isContainment ? `1` : `*`;
|
|
112
112
|
const rightMultiplicity = multiple ? "*" : optional ? "0..1" : "1";
|
|
@@ -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,
|
|
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,EAWH,QAAQ,EASX,MAAM,eAAe,CAAA;AA2EtB,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,8 +1,8 @@
|
|
|
1
|
-
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, isRef, Language, Link, nameOf, nameSorted, PrimitiveType, Property
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, isRef, isUnresolvedReference, Language, Link, nameOf, nameSorted, PrimitiveType, Property } from "@lionweb/core";
|
|
2
2
|
import { asString, indentWith } from "littoral-templates";
|
|
3
3
|
const indented = indentWith(" ")(1);
|
|
4
|
-
const refAsText = (ref) => (ref ===
|
|
5
|
-
const recurse = (ts, header, func = asText) => ts.length === 0 ? [] : indented([header, indented(ts.map(func))]);
|
|
4
|
+
const refAsText = (ref) => (ref === undefined || isUnresolvedReference(ref)) ? `???` : ref.name;
|
|
5
|
+
const recurse = (ts, header, func = asText) => (ts === undefined || ts.length === 0) ? [] : indented([header, indented(ts.map(func))]);
|
|
6
6
|
const featuresOf = (classifier) => recurse(nameSorted(classifier.features), `features (↓name):`);
|
|
7
7
|
const asText = (node) => {
|
|
8
8
|
if (node instanceof Annotation) {
|
|
@@ -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,KAAK,EACL,QAAQ,EACR,IAAI,
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAeH,QAAQ,EAQX,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, isRef, Link, lioncoreBuiltins, nameOf, nameSorted, PrimitiveType, Property
|
|
1
|
+
import { allFeaturesOf, Annotation, Classifier, Concept, conceptsOf, Enumeration, inheritsDirectlyFrom, Interface, isConcrete, isRef, isUnresolvedReference, Link, lioncoreBuiltins, nameOf, nameSorted, PrimitiveType, Property } 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";
|
|
@@ -20,7 +20,7 @@ const fieldForFeature = (feature) => {
|
|
|
20
20
|
const fieldForLink = ({ name, type, optional, multiple }) => ({
|
|
21
21
|
name,
|
|
22
22
|
optional: optional && !multiple,
|
|
23
|
-
type: `${type
|
|
23
|
+
type: `${isUnresolvedReference(type) ? `unknown` : type.name}${multiple ? `[]` : ``}`
|
|
24
24
|
});
|
|
25
25
|
const fieldForProperty = ({ name, type, optional }) => ({
|
|
26
26
|
name,
|
|
@@ -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,EACV,KAAK,
|
|
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,
|
|
1
|
+
{"version":3,"file":"textualizer.d.ts","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,QAAQ,EAAkC,MAAM,eAAe,CAAA;AAC5G,OAAO,EAEH,gBAAgB,EAOnB,MAAM,eAAe,CAAA;AActB,eAAO,MAAM,iBAAiB,GAAI,WAAW,gBAAgB,EAAE,YAAW,QAAQ,EAAO,WA4ExF,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Enumeration, MemoisingSymbolTable, Property } from "@lionweb/core";
|
|
1
|
+
import { Enumeration, isUnresolvedReference, MemoisingSymbolTable, Property } from "@lionweb/core";
|
|
2
2
|
import { byIdMap } from "@lionweb/ts-utils";
|
|
3
3
|
import { asString, indentWith } from "littoral-templates";
|
|
4
4
|
const indent = indentWith(" ")(1);
|
|
@@ -18,7 +18,10 @@ export const genericAsTreeText = ({ nodes }, languages = []) => {
|
|
|
18
18
|
? property.type instanceof Enumeration
|
|
19
19
|
? (property.type.literals.find(literal => literal.key === value)?.name ?? value)
|
|
20
20
|
: (() => {
|
|
21
|
-
|
|
21
|
+
if (property.type === undefined || isUnresolvedReference(property.type)) {
|
|
22
|
+
return `???`;
|
|
23
|
+
}
|
|
24
|
+
switch (property.type.name) {
|
|
22
25
|
case "String":
|
|
23
26
|
return `'${value}'`;
|
|
24
27
|
default:
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAY,oBAAoB,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAW5G,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,yBAAyB,GAAG,CAAC,IAAqB,EAAE,EAAE,CACrD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;OAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;OAC7D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;OACzD,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAA;AAElC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAoB,EAAE,YAAwB,EAAE,EAAE,EAAE;IAEzF,MAAM,SAAS,GAAyC,OAAO,CAAC,KAAK,CAAC,CAAA;IACtE,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,CAAC,UAAkC,EAAE,OAA+B,EAAU,EAAE,CAC9F,WAAW,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,IAAI,IAAI,IAAI,OAAO,CAAC,GAAG,GAAG,CAAA;IAEhF,MAAM,cAAc,GAAG,CAAC,UAAkC,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAuB,EAAE,EAAE;QACzH,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;QAC7E,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;QACjE,MAAM,YAAY,GACd,QAAQ,YAAY,QAAQ;YACxB,CAAC,CAAC,QAAQ,CAAC,IAAI,YAAY,WAAW;gBAClC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,KAAK,KAAK,CAAC,EAAE,IAAI,IAAI,KAAK,CAAC;gBAChF,CAAC,CAAC,CAAC,GAAG,EAAE;oBACJ,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,IAAI,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACtE,OAAO,KAAK,CAAA;oBAChB,CAAC;oBACD,QAAQ,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBAC3B,KAAK,QAAQ;4BACT,OAAO,IAAI,KAAK,GAAG,CAAA;wBACvB;4BACI,OAAO,KAAK,CAAA;oBAClB,CAAC;gBACH,CAAC,CAAC,EAAE;YACV,CAAC,CAAC,KAAK,CAAA;QACf,OAAO,GAAG,cAAc,MAAM,YAAY,EAAE,CAAA;IAChD,CAAC,CAAA;IAED,MAAM,qBAAqB,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAA8B,EAAE,EAAE,CAClG,GAAG,WAAW,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,EAAE,CAAA;IAE3E,MAAM,eAAe,GAAG,CAAC,UAAkC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAwB,EAAE,EAAE,CACzG,GAAG,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IAE/H,MAAM,iBAAiB,GAAG,CAAC,UAAkC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAA0B,EAAE,EAAE,CAAC;QACjH,GAAG,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;QACjF,MAAM,CACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CACnB,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,OAAO,6BAA6B,CAC7G,CACJ;KACJ,CAAA;IAED,MAAM,gBAAgB,GAAG,CAAC,YAAuB,EAAE,EAAE,CACjD,YAAY,IAAI,SAAS;QACrB,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC;QACpD,CAAC,CAAC,uBAAuB,YAAY,6BAA6B,CAAA;IAE1E,MAAM,MAAM,GACR,CAAY,IAA2B,EAAE,EAAM,EAAmB,EAAE,CACpE,CAAC,EAAM,EAAE,EAAE,CACP,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;IAEpB,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAY,EAAE;QAC/C,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,qBAAqB,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;QACzG,MAAM,eAAe,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAA;QACvD,OAAO;YACH,GAAG,WAAW,CAAC,cAAc,CAAC,qBAAqB,CAAC,EAAE,IAAI,IAAI,IAAI,qBAAqB,CAAC,GAAG,GAAG,SAAS,EAAE,IAAI,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1I,MAAM,CAAC;gBACH,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;gBAC7D,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;gBAClE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;gBACtE,WAAW,CAAC,GAAG,CAAC,gBAAgB,CAAC;aACpC,CAAC;YACF,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;SAC7B,CAAA;IACL,CAAC,CAAA;IAED,OAAO,QAAQ,CACX,KAAK;SACA,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,aAAa;SAClD,GAAG,CAAC,MAAM,CAAC,CACnB,CAAA;AAEL,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/utilities",
|
|
3
|
-
"version": "0.8.0-beta.
|
|
3
|
+
"version": "0.8.0-beta.5",
|
|
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.8.0-beta.
|
|
19
|
-
"@lionweb/json": "0.8.0-beta.
|
|
20
|
-
"@lionweb/textgen-utils": "0.8.0-beta.
|
|
21
|
-
"@lionweb/ts-utils": "0.8.0-beta.
|
|
18
|
+
"@lionweb/core": "0.8.0-beta.5",
|
|
19
|
+
"@lionweb/json": "0.8.0-beta.5",
|
|
20
|
+
"@lionweb/textgen-utils": "0.8.0-beta.5",
|
|
21
|
+
"@lionweb/ts-utils": "0.8.0-beta.5",
|
|
22
22
|
"littoral-templates": "0.5.1",
|
|
23
23
|
"nanoid": "5.1.5"
|
|
24
24
|
},
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
Interface,
|
|
8
8
|
isBuiltinNodeConcept,
|
|
9
9
|
isRef,
|
|
10
|
+
isUnresolvedReference,
|
|
10
11
|
Language,
|
|
11
12
|
LanguageEntity,
|
|
12
13
|
Link,
|
|
@@ -14,8 +15,7 @@ import {
|
|
|
14
15
|
nonRelationalFeatures,
|
|
15
16
|
PrimitiveType,
|
|
16
17
|
relationsOf,
|
|
17
|
-
type
|
|
18
|
-
unresolved
|
|
18
|
+
type
|
|
19
19
|
} from "@lionweb/core"
|
|
20
20
|
import { asString, indentWith, Template } from "littoral-templates"
|
|
21
21
|
|
|
@@ -88,7 +88,7 @@ const generateForNonRelationalFeature = (feature: Feature) => {
|
|
|
88
88
|
const { name, optional } = feature
|
|
89
89
|
const multiple = feature instanceof Link && feature.multiple
|
|
90
90
|
const type_ = type(feature)
|
|
91
|
-
const typeText = `${multiple ? `List~` : ``}${type_
|
|
91
|
+
const typeText = `${multiple ? `List~` : ``}${isUnresolvedReference(type_) ? `???` : type_.name}${multiple ? `~` : ``}${optional ? `?` : ``}`
|
|
92
92
|
return `+${typeText} ${name}`
|
|
93
93
|
}
|
|
94
94
|
|
|
@@ -124,7 +124,7 @@ const generateForRelationsOf = (entity: LanguageEntity) => {
|
|
|
124
124
|
|
|
125
125
|
const generateForRelation = ({ name: leftName }: LanguageEntity, relation: Link) => {
|
|
126
126
|
const { name: relationName, optional, multiple, type } = relation
|
|
127
|
-
const rightName = isRef(type) ? type.name : type
|
|
127
|
+
const rightName = isRef(type) ? type.name : isUnresolvedReference(type) ? `<unresolved>` : `<null>`
|
|
128
128
|
const isContainment = relation instanceof Containment
|
|
129
129
|
const leftMultiplicity = isContainment ? `1` : `*`
|
|
130
130
|
const rightMultiplicity = (() => {
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
Interface,
|
|
8
8
|
isBuiltinNodeConcept,
|
|
9
9
|
isRef,
|
|
10
|
+
isUnresolvedReference,
|
|
10
11
|
Language,
|
|
11
12
|
LanguageEntity,
|
|
12
13
|
Link,
|
|
@@ -15,8 +16,7 @@ import {
|
|
|
15
16
|
nonRelationalFeatures,
|
|
16
17
|
PrimitiveType,
|
|
17
18
|
relationsOf,
|
|
18
|
-
type
|
|
19
|
-
unresolved
|
|
19
|
+
type
|
|
20
20
|
} from "@lionweb/core"
|
|
21
21
|
import { asString, indentWith } from "littoral-templates"
|
|
22
22
|
|
|
@@ -106,7 +106,7 @@ const generateForNonRelationalFeature = (feature: Feature) => {
|
|
|
106
106
|
const { name, optional } = feature
|
|
107
107
|
const multiple = feature instanceof Link && feature.multiple
|
|
108
108
|
const type_ = type(feature)
|
|
109
|
-
return `${name}: ${multiple ? `List<` : ``}${type_
|
|
109
|
+
return `${name}: ${multiple ? `List<` : ``}${isUnresolvedReference(type_) ? `???` : type_.name}${optional && !multiple ? `?` : ``}${multiple ? `>` : ``}`
|
|
110
110
|
}
|
|
111
111
|
|
|
112
112
|
const generateForPrimitiveType = ({ name }: PrimitiveType) => `class "${name}" <<primitive type>>`
|
|
@@ -140,7 +140,7 @@ const generateForRelationsOf = (entity: LanguageEntity) => {
|
|
|
140
140
|
|
|
141
141
|
const generateForRelation = ({ name: leftName }: LanguageEntity, relation: Link) => {
|
|
142
142
|
const { name: relationName, type, optional, multiple } = relation
|
|
143
|
-
const rightName = isRef(type) ? type.name : type
|
|
143
|
+
const rightName = isRef(type) ? type.name : isUnresolvedReference(type) ? `<unresolved>` : `<null>`
|
|
144
144
|
const isContainment = relation instanceof Containment
|
|
145
145
|
const leftMultiplicity = isContainment ? `1` : `*`
|
|
146
146
|
const rightMultiplicity = multiple ? "*" : optional ? "0..1" : "1"
|
package/src/m3/textualizer.ts
CHANGED
|
@@ -8,25 +8,26 @@ import {
|
|
|
8
8
|
INamed,
|
|
9
9
|
Interface,
|
|
10
10
|
isRef,
|
|
11
|
+
isUnresolvedReference,
|
|
11
12
|
Language,
|
|
12
13
|
Link,
|
|
13
14
|
M3Node,
|
|
14
|
-
Node,
|
|
15
15
|
nameOf,
|
|
16
16
|
nameSorted,
|
|
17
|
+
Node,
|
|
17
18
|
PrimitiveType,
|
|
18
19
|
Property,
|
|
19
|
-
SingleRef
|
|
20
|
-
unresolved
|
|
20
|
+
SingleRef
|
|
21
21
|
} from "@lionweb/core"
|
|
22
22
|
import { asString, indentWith, Template } from "littoral-templates"
|
|
23
23
|
|
|
24
24
|
const indented = indentWith(" ")(1)
|
|
25
25
|
|
|
26
|
-
const refAsText = <NT extends INamed & Node>(ref: SingleRef<NT>): string =>
|
|
26
|
+
const refAsText = <NT extends INamed & Node>(ref: SingleRef<NT>): string =>
|
|
27
|
+
(ref === undefined || isUnresolvedReference(ref)) ? `???` : ref.name
|
|
27
28
|
|
|
28
29
|
const recurse = <NT extends M3Node>(ts: NT[], header: string, func: (t: NT) => Template = asText): Template =>
|
|
29
|
-
ts.length === 0 ? [] : indented([header, indented(ts.map(func))])
|
|
30
|
+
(ts === undefined || ts.length === 0) ? [] : indented([header, indented(ts.map(func))])
|
|
30
31
|
|
|
31
32
|
const featuresOf = (classifier: Classifier): Template => recurse(nameSorted(classifier.features), `features (↓name):`)
|
|
32
33
|
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
Interface,
|
|
13
13
|
isConcrete,
|
|
14
14
|
isRef,
|
|
15
|
+
isUnresolvedReference,
|
|
15
16
|
Language,
|
|
16
17
|
LanguageEntity,
|
|
17
18
|
Link,
|
|
@@ -19,8 +20,7 @@ import {
|
|
|
19
20
|
nameOf,
|
|
20
21
|
nameSorted,
|
|
21
22
|
PrimitiveType,
|
|
22
|
-
Property
|
|
23
|
-
unresolved
|
|
23
|
+
Property
|
|
24
24
|
} from "@lionweb/core"
|
|
25
25
|
import { indent } from "@lionweb/textgen-utils"
|
|
26
26
|
import { groupBy, mapValues, uniquesAmong } from "@lionweb/ts-utils"
|
|
@@ -48,7 +48,7 @@ const fieldForLink = ({name, type, optional, multiple}: Link): Field =>
|
|
|
48
48
|
({
|
|
49
49
|
name,
|
|
50
50
|
optional: optional && !multiple,
|
|
51
|
-
type: `${type
|
|
51
|
+
type: `${isUnresolvedReference(type) ? `unknown` : type.name}${multiple ? `[]` : ``}`
|
|
52
52
|
})
|
|
53
53
|
|
|
54
54
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Enumeration, Language, MemoisingSymbolTable, Property } from "@lionweb/core"
|
|
1
|
+
import { Enumeration, isUnresolvedReference, Language, MemoisingSymbolTable, Property } from "@lionweb/core"
|
|
2
2
|
import {
|
|
3
3
|
LionWebId,
|
|
4
4
|
LionWebJsonChunk,
|
|
@@ -38,12 +38,15 @@ export const genericAsTreeText = ({ nodes }: LionWebJsonChunk, languages: Langua
|
|
|
38
38
|
? property.type instanceof Enumeration
|
|
39
39
|
? (property.type.literals.find(literal => literal.key === value)?.name ?? value)
|
|
40
40
|
: (() => {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
41
|
+
if (property.type === undefined || isUnresolvedReference(property.type)) {
|
|
42
|
+
return `???`
|
|
43
|
+
}
|
|
44
|
+
switch (property.type.name) {
|
|
45
|
+
case "String":
|
|
46
|
+
return `'${value}'`
|
|
47
|
+
default:
|
|
48
|
+
return value
|
|
49
|
+
}
|
|
47
50
|
})()
|
|
48
51
|
: value
|
|
49
52
|
return `${identification} = ${displayValue}`
|