@lionweb/utilities 0.10.0-alpha.0 → 0.10.0-alpha.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/CHANGELOG.md +6 -0
- package/dist/m3/textualizer.d.ts.map +1 -1
- package/dist/m3/textualizer.js +2 -2
- package/dist/m3/textualizer.js.map +1 -1
- package/dist/m3/ts-generation/common.js +1 -1
- 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 -4
- 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 +17 -14
- package/dist/serialization/textualizer.js.map +1 -1
- package/dist/utils/json.d.ts +8 -0
- package/dist/utils/json.d.ts.map +1 -1
- package/dist/utils/json.js +8 -0
- package/dist/utils/json.js.map +1 -1
- package/package.json +8 -5
- package/src/m3/textualizer.ts +3 -3
- package/src/m3/ts-generation/common.ts +1 -1
- package/src/m3/ts-generation/ts-types-generator.ts +3 -6
- package/src/serialization/textualizer.ts +27 -17
- package/src/utils/json.ts +8 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.10.0 — not yet released
|
|
4
|
+
|
|
5
|
+
* Deprecate the `readFileAsJson` and `writeJsonAsFile` functions in favor of the `readFileAsJsonSync` and `writeJsonAsFileSync` functions from `@lionweb/node-utils`.
|
|
6
|
+
(This change has been propagated throughout the entire codebase.)
|
|
7
|
+
|
|
8
|
+
|
|
3
9
|
## 0.9.0
|
|
4
10
|
|
|
5
11
|
* Expose types associated with the `measure` function — m.n. `Metrics`.
|
|
@@ -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,EAUX,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,7 +1,7 @@
|
|
|
1
|
-
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, isRef,
|
|
1
|
+
import { Annotation, Concept, Containment, Enumeration, EnumerationLiteral, Interface, isRef, Language, Link, nameOf, nameSorted, PrimitiveType, Property, tryToRenderAsText } from "@lionweb/core";
|
|
2
2
|
import { asString, indentWith } from "littoral-templates";
|
|
3
3
|
const indented = indentWith(" ")(1);
|
|
4
|
-
const refAsText = (ref) => (ref
|
|
4
|
+
const refAsText = (ref) => tryToRenderAsText(ref) ?? `???`;
|
|
5
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) => {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/m3/textualizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export const tsTypeFor = (datatype) => {
|
|
|
14
14
|
if (datatype instanceof Enumeration) {
|
|
15
15
|
return datatype.name;
|
|
16
16
|
}
|
|
17
|
-
return `unknown /* [ERROR] can't compute a TS type for this datatype: ${datatype} */`;
|
|
17
|
+
return `unknown /* [ERROR] can't compute a TS type for this datatype: ${datatype.toString()} */`;
|
|
18
18
|
};
|
|
19
19
|
export const isINamed = (entity) => entity instanceof Interface
|
|
20
20
|
&& entity.language.key === builtinsFacade.classifiers.inamed.language.key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/common.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,OAAO,EAEP,WAAW,EACX,SAAS,EACT,KAAK,EAEL,eAAe,EACf,aAAa,EAEhB,MAAM,eAAe,CAAA;AAGtB,MAAM,EAAE,cAAc,EAAE,GAAG,eAAe,CAAC,OAAO,CAAA;AAElD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAU,EAAE;IAC/D,IAAI,QAAQ,YAAY,aAAa,EAAE,CAAC;QACpC,QAAQ,QAAQ,CAAC,GAAG,EAAE,CAAC;YACnB,KAAK,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,SAAS,CAAA;YACxE,KAAK,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,QAAQ,CAAA;YACtE,KAAK,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,QAAQ,CAAA;YACvE,KAAK,cAAc,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,SAAS,CAAA;YACrE;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;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/common.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,OAAO,EAEP,WAAW,EACX,SAAS,EACT,KAAK,EAEL,eAAe,EACf,aAAa,EAEhB,MAAM,eAAe,CAAA;AAGtB,MAAM,EAAE,cAAc,EAAE,GAAG,eAAe,CAAC,OAAO,CAAA;AAElD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAU,EAAE;IAC/D,IAAI,QAAQ,YAAY,aAAa,EAAE,CAAC;QACpC,QAAQ,QAAQ,CAAC,GAAG,EAAE,CAAC;YACnB,KAAK,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,SAAS,CAAA;YACxE,KAAK,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,QAAQ,CAAA;YACtE,KAAK,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,QAAQ,CAAA;YACvE,KAAK,cAAc,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,SAAS,CAAA;YACrE;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,CAAC,QAAQ,EAAE,KAAK,CAAA;AACpG,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAsB,EAAW,EAAE,CACrD,MAAM,YAAY,SAAS;OAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG;OACtE,MAAM,CAAC,GAAG,KAAK,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAA;AAG3D,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;AAsDtB,oBAAY,iBAAiB;IACzB,YAAY,IAAA;CACf;AAGD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,UAAU,QAAQ,EAAE,GAAG,mBAAmB,iBAAiB,EAAE,WAwIlG,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { allFeaturesOf, Annotation, Classifier, Concept, conceptsOf, Enumeration, inheritsDirectlyFrom, Interface, isConcrete, isRef,
|
|
1
|
+
import { allFeaturesOf, Annotation, Classifier, Concept, conceptsOf, Enumeration, inheritsDirectlyFrom, Interface, isConcrete, isRef, Link, LionWebVersions, nameOf, nameSorted, PrimitiveType, Property, tryToRenderAsText } 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: `${
|
|
23
|
+
type: `${(tryToRenderAsText(type) ?? `unknown`)}${multiple ? `[]` : ``}`
|
|
24
24
|
});
|
|
25
25
|
const fieldForProperty = ({ name, type, optional }) => ({
|
|
26
26
|
name,
|
|
@@ -114,10 +114,8 @@ export const tsTypeDefsForLanguage = (language, ...generationOptions) => {
|
|
|
114
114
|
...inheritsDirectlyFrom(classifier),
|
|
115
115
|
...allFeaturesOf(classifier)
|
|
116
116
|
.filter((feature) => feature instanceof Link)
|
|
117
|
-
.map((feature) => feature)
|
|
118
117
|
.flatMap(({ type }) => type)
|
|
119
118
|
.filter((type) => type instanceof Classifier)
|
|
120
|
-
.map((classifier) => classifier)
|
|
121
119
|
];
|
|
122
120
|
const coreImports = [
|
|
123
121
|
...(language.entities.every(usesINamedDirectly) ? [] : [`DynamicNode`]),
|
|
@@ -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,EAIH,QAAQ,EAGX,MAAM,eAAe,CAAA;AACtB,OAAO,EAEH,gBAAgB,EAOnB,MAAM,eAAe,CAAA;AActB,eAAO,MAAM,iBAAiB,GAAI,WAAW,gBAAgB,EAAE,YAAW,QAAQ,EAAO,WA+ExF,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Enumeration, isUnresolvedReference, MemoisingSymbolTable, Property } from "@lionweb/core";
|
|
1
|
+
import { Enumeration, isReferenceToSet, 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);
|
|
@@ -11,23 +11,26 @@ export const genericAsTreeText = ({ nodes }, languages = []) => {
|
|
|
11
11
|
const nodesById = byIdMap(nodes);
|
|
12
12
|
const symbolTable = new MemoisingSymbolTable(languages);
|
|
13
13
|
const nameOrKey = (classifier, feature) => symbolTable.featureMatching(classifier, feature)?.name ?? `[${feature.key}]`;
|
|
14
|
+
const realPropertyAsText = ({ type }, value) => {
|
|
15
|
+
if (type instanceof Enumeration) {
|
|
16
|
+
return type.literals.find(literal => literal.key === value)?.name ?? value;
|
|
17
|
+
}
|
|
18
|
+
if (type === undefined || isReferenceToSet(type)) {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
if (isUnresolvedReference(type)) {
|
|
22
|
+
return type.resolveInfo;
|
|
23
|
+
}
|
|
24
|
+
switch (type.name) {
|
|
25
|
+
case "String": return `'${value}'`;
|
|
26
|
+
default: return value;
|
|
27
|
+
}
|
|
28
|
+
};
|
|
14
29
|
const propertyAsText = (classifier, { property: propertyMetaPointer, value }) => {
|
|
15
30
|
const property = symbolTable.featureMatching(classifier, propertyMetaPointer);
|
|
16
31
|
const identification = nameOrKey(classifier, propertyMetaPointer);
|
|
17
32
|
const displayValue = property instanceof Property
|
|
18
|
-
? property
|
|
19
|
-
? (property.type.literals.find(literal => literal.key === value)?.name ?? value)
|
|
20
|
-
: (() => {
|
|
21
|
-
if (property.type === undefined || isUnresolvedReference(property.type)) {
|
|
22
|
-
return `???`;
|
|
23
|
-
}
|
|
24
|
-
switch (property.type.name) {
|
|
25
|
-
case "String":
|
|
26
|
-
return `'${value}'`;
|
|
27
|
-
default:
|
|
28
|
-
return value;
|
|
29
|
-
}
|
|
30
|
-
})()
|
|
33
|
+
? realPropertyAsText(property, value) ?? `???`
|
|
31
34
|
: value;
|
|
32
35
|
return `${identification} = ${displayValue}`;
|
|
33
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"textualizer.js","sourceRoot":"","sources":["../../src/serialization/textualizer.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/json.d.ts
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @deprecated Use `writeJsonAsFileSync` from `@lionweb/node-utils` instead,
|
|
3
|
+
* so that the utilities package doesn’t need to depend on Node.js.
|
|
4
|
+
*/
|
|
1
5
|
export declare const writeJsonAsFile: (path: string, json: unknown) => void;
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated Use `writeJsonAsFileSync` from `@lionweb/node-utils` instead.
|
|
8
|
+
* so that the utilities package doesn’t need to depend on Node.js.
|
|
9
|
+
*/
|
|
2
10
|
export declare const readFileAsJson: (path: string) => unknown;
|
|
3
11
|
//# sourceMappingURL=json.d.ts.map
|
package/dist/utils/json.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,MAAM,OAAO,SAAkD,CAAA;AAE7G,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,OAAoD,CAAA"}
|
|
1
|
+
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,MAAM,OAAO,SAAkD,CAAA;AAE7G;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,OAAoD,CAAA"}
|
package/dist/utils/json.js
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import { asPrettyJsonString } from "@lionweb/ts-utils";
|
|
2
2
|
import { readFileSync, writeFileSync } from "fs";
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated Use `writeJsonAsFileSync` from `@lionweb/node-utils` instead,
|
|
5
|
+
* so that the utilities package doesn’t need to depend on Node.js.
|
|
6
|
+
*/
|
|
3
7
|
export const writeJsonAsFile = (path, json) => writeFileSync(path, asPrettyJsonString(json));
|
|
8
|
+
/**
|
|
9
|
+
* @deprecated Use `writeJsonAsFileSync` from `@lionweb/node-utils` instead.
|
|
10
|
+
* so that the utilities package doesn’t need to depend on Node.js.
|
|
11
|
+
*/
|
|
4
12
|
export const readFileAsJson = (path) => JSON.parse(readFileSync(path).toString());
|
|
5
13
|
//# sourceMappingURL=json.js.map
|
package/dist/utils/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAGhD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,IAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAA;AAE7G,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAGhD;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,IAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAA;AAE7G;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lionweb/utilities",
|
|
3
|
-
"version": "0.10.0-alpha.
|
|
3
|
+
"version": "0.10.0-alpha.2",
|
|
4
4
|
"description": "LionWeb utilities",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,13 +15,16 @@
|
|
|
15
15
|
"url": "https://github.com/LionWeb-io/lionweb-typescript/issues"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@lionweb/core": "0.10.0-alpha.
|
|
19
|
-
"@lionweb/json": "0.10.0-alpha.
|
|
20
|
-
"@lionweb/textgen-utils": "0.10.0-alpha.
|
|
21
|
-
"@lionweb/ts-utils": "0.10.0-alpha.
|
|
18
|
+
"@lionweb/core": "0.10.0-alpha.2",
|
|
19
|
+
"@lionweb/json": "0.10.0-alpha.2",
|
|
20
|
+
"@lionweb/textgen-utils": "0.10.0-alpha.2",
|
|
21
|
+
"@lionweb/ts-utils": "0.10.0-alpha.2",
|
|
22
22
|
"littoral-templates": "0.5.1",
|
|
23
23
|
"nanoid": "5.1.6"
|
|
24
24
|
},
|
|
25
|
+
"optionalDependencies": {
|
|
26
|
+
"@types/node": "25.2.2"
|
|
27
|
+
},
|
|
25
28
|
"scripts": {
|
|
26
29
|
"clean": "npx rimraf dist node_modules -g lionweb-utilities-*.tgz",
|
|
27
30
|
"build": "tsc",
|
package/src/m3/textualizer.ts
CHANGED
|
@@ -8,7 +8,6 @@ import {
|
|
|
8
8
|
INamed,
|
|
9
9
|
Interface,
|
|
10
10
|
isRef,
|
|
11
|
-
isUnresolvedReference,
|
|
12
11
|
Language,
|
|
13
12
|
Link,
|
|
14
13
|
M3Node,
|
|
@@ -17,14 +16,15 @@ import {
|
|
|
17
16
|
Node,
|
|
18
17
|
PrimitiveType,
|
|
19
18
|
Property,
|
|
20
|
-
SingleRef
|
|
19
|
+
SingleRef,
|
|
20
|
+
tryToRenderAsText
|
|
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
26
|
const refAsText = <NT extends INamed & Node>(ref: SingleRef<NT>): string =>
|
|
27
|
-
(ref
|
|
27
|
+
tryToRenderAsText(ref) ?? `???`
|
|
28
28
|
|
|
29
29
|
const recurse = <NT extends M3Node>(ts: NT[], header: string, func: (t: NT) => Template = asText): Template =>
|
|
30
30
|
(ts === undefined || ts.length === 0) ? [] : indented([header, indented(ts.map(func))])
|
|
@@ -28,7 +28,7 @@ export const tsTypeFor = (datatype: SingleRef<Datatype>): string => {
|
|
|
28
28
|
if (datatype instanceof Enumeration) {
|
|
29
29
|
return datatype.name
|
|
30
30
|
}
|
|
31
|
-
return `unknown /* [ERROR] can't compute a TS type for this datatype: ${datatype} */`
|
|
31
|
+
return `unknown /* [ERROR] can't compute a TS type for this datatype: ${datatype.toString()} */`
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export const isINamed = (entity: LanguageEntity): boolean =>
|
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
Interface,
|
|
13
13
|
isConcrete,
|
|
14
14
|
isRef,
|
|
15
|
-
isUnresolvedReference,
|
|
16
15
|
Language,
|
|
17
16
|
LanguageEntity,
|
|
18
17
|
Link,
|
|
@@ -20,7 +19,8 @@ import {
|
|
|
20
19
|
nameOf,
|
|
21
20
|
nameSorted,
|
|
22
21
|
PrimitiveType,
|
|
23
|
-
Property
|
|
22
|
+
Property,
|
|
23
|
+
tryToRenderAsText
|
|
24
24
|
} from "@lionweb/core"
|
|
25
25
|
import { indent } from "@lionweb/textgen-utils"
|
|
26
26
|
import { groupBy, mapValues, uniquesAmong } from "@lionweb/ts-utils"
|
|
@@ -43,12 +43,11 @@ const fieldForFeature = (feature: Feature) => {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
|
|
47
46
|
const fieldForLink = ({name, type, optional, multiple}: Link): Field =>
|
|
48
47
|
({
|
|
49
48
|
name,
|
|
50
49
|
optional: optional && !multiple,
|
|
51
|
-
type: `${
|
|
50
|
+
type: `${(tryToRenderAsText(type) ?? `unknown`)}${multiple ? `[]` : ``}`
|
|
52
51
|
})
|
|
53
52
|
|
|
54
53
|
|
|
@@ -172,10 +171,8 @@ export const tsTypeDefsForLanguage = (language: Language, ...generationOptions:
|
|
|
172
171
|
...inheritsDirectlyFrom(classifier),
|
|
173
172
|
...allFeaturesOf(classifier)
|
|
174
173
|
.filter((feature) => feature instanceof Link)
|
|
175
|
-
.map((feature) => feature as Link)
|
|
176
174
|
.flatMap(({type}) => type)
|
|
177
175
|
.filter((type) => type instanceof Classifier)
|
|
178
|
-
.map((classifier) => classifier as Classifier)
|
|
179
176
|
]
|
|
180
177
|
|
|
181
178
|
const coreImports = [
|
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
Enumeration,
|
|
3
|
+
isReferenceToSet,
|
|
4
|
+
isUnresolvedReference,
|
|
5
|
+
Language,
|
|
6
|
+
MemoisingSymbolTable,
|
|
7
|
+
Property
|
|
8
|
+
} from "@lionweb/core"
|
|
2
9
|
import {
|
|
3
10
|
LionWebId,
|
|
4
11
|
LionWebJsonChunk,
|
|
@@ -30,25 +37,28 @@ export const genericAsTreeText = ({ nodes }: LionWebJsonChunk, languages: Langua
|
|
|
30
37
|
const nameOrKey = (classifier: LionWebJsonMetaPointer, feature: LionWebJsonMetaPointer): string =>
|
|
31
38
|
symbolTable.featureMatching(classifier, feature)?.name ?? `[${feature.key}]`
|
|
32
39
|
|
|
40
|
+
const realPropertyAsText = ({type}: Property, value: string | null): string | null | undefined => {
|
|
41
|
+
if (type instanceof Enumeration) {
|
|
42
|
+
return type.literals.find(literal => literal.key === value)?.name ?? value
|
|
43
|
+
}
|
|
44
|
+
if (type === undefined || isReferenceToSet(type)) {
|
|
45
|
+
return undefined
|
|
46
|
+
}
|
|
47
|
+
if (isUnresolvedReference(type)) {
|
|
48
|
+
return type.resolveInfo
|
|
49
|
+
}
|
|
50
|
+
switch (type.name) {
|
|
51
|
+
case "String": return `'${value}'`
|
|
52
|
+
default: return value
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
33
56
|
const propertyAsText = (classifier: LionWebJsonMetaPointer, { property: propertyMetaPointer, value }: LionWebJsonProperty) => {
|
|
34
57
|
const property = symbolTable.featureMatching(classifier, propertyMetaPointer)
|
|
35
58
|
const identification = nameOrKey(classifier, propertyMetaPointer)
|
|
36
|
-
const displayValue =
|
|
37
|
-
property
|
|
38
|
-
|
|
39
|
-
? (property.type.literals.find(literal => literal.key === value)?.name ?? value)
|
|
40
|
-
: (() => {
|
|
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
|
-
}
|
|
50
|
-
})()
|
|
51
|
-
: value
|
|
59
|
+
const displayValue = property instanceof Property
|
|
60
|
+
? realPropertyAsText(property, value) ?? `???`
|
|
61
|
+
: value
|
|
52
62
|
return `${identification} = ${displayValue}`
|
|
53
63
|
}
|
|
54
64
|
|
package/src/utils/json.ts
CHANGED
|
@@ -2,7 +2,15 @@ import { asPrettyJsonString } from "@lionweb/ts-utils"
|
|
|
2
2
|
import { readFileSync, writeFileSync } from "fs"
|
|
3
3
|
|
|
4
4
|
|
|
5
|
+
/**
|
|
6
|
+
* @deprecated Use `writeJsonAsFileSync` from `@lionweb/node-utils` instead,
|
|
7
|
+
* so that the utilities package doesn’t need to depend on Node.js.
|
|
8
|
+
*/
|
|
5
9
|
export const writeJsonAsFile = (path: string, json: unknown) => writeFileSync(path, asPrettyJsonString(json))
|
|
6
10
|
|
|
11
|
+
/**
|
|
12
|
+
* @deprecated Use `writeJsonAsFileSync` from `@lionweb/node-utils` instead.
|
|
13
|
+
* so that the utilities package doesn’t need to depend on Node.js.
|
|
14
|
+
*/
|
|
7
15
|
export const readFileAsJson = (path: string): unknown => JSON.parse(readFileSync(path).toString())
|
|
8
16
|
|