@lionweb/utilities 0.6.13-beta.7 → 0.7.0-alpha.10

package/dist/m3/ts-generation/ts-types-generator.js

@@ -1,9 +1,8 @@
-import { allFeaturesOf, Annotation, builtinClassifiers, builtinPrimitives, Classifier, Concept, conceptsOf, Enumeration, groupBy, inheritsFrom, Interface, isConcrete, Link, lioncoreBuiltins, mapValues, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
+import { allFeaturesOf, Annotation, builtinClassifiers, builtinPrimitives, Classifier, Concept, conceptsOf, Enumeration, inheritsDirectlyFrom, Interface, isConcrete, Link, lioncoreBuiltins, nameOf, nameSorted, PrimitiveType, Property, unresolved } from "@lionweb/core";
+import { indent } from "@lionweb/textgen-utils";
+import { groupBy, mapValues, uniquesAmong } from "@lionweb/ts-utils";
 import { asString, when } from "littoral-templates";
-import { indent } from "./textgen.js";
 import { tsFromTypeDef, TypeDefModifier } from "./type-def.js";
-import { uniquesAmong } from "../../utils/array.js";
-import { picker } from "../../utils/object.js";
 const fieldForFeature = (feature) => {
     if (feature instanceof Link) {
         return fieldForLink(feature);
@@ -22,21 +21,25 @@ const fieldForLink = ({ name, type, optional, multiple }) => ({
     optional: optional && !multiple,
     type: `${type === unresolved ? `unknown` : type.name}${multiple ? `[]` : ``}`
 });
-const tsTypeFor = (datatype) => {
-    if (datatype instanceof PrimitiveType) {
-        switch (datatype) {
-            case builtinPrimitives.booleanDatatype: return `boolean`;
-            case builtinPrimitives.stringDatatype: return `string`;
-            case builtinPrimitives.integerDatatype: return `number`;
-            case builtinPrimitives.jsonDatatype: return `unknown`;
+const tsTypeFor = (dataType) => {
+    if (dataType instanceof PrimitiveType) {
+        switch (dataType) {
+            case builtinPrimitives.booleanDataType:
+                return `boolean`;
+            case builtinPrimitives.stringDataType:
+                return `string`;
+            case builtinPrimitives.integerDataType:
+                return `number`;
+            case builtinPrimitives.jsonDataType:
+                return `unknown`;
             default:
                 return `string`;
         }
     }
-    if (datatype instanceof Enumeration) {
-        return datatype.name;
+    if (dataType instanceof Enumeration) {
+        return dataType.name;
     }
-    return `unknown /* [ERROR] can't compute a TS type for this datatype: ${datatype} */`;
+    return `unknown /* [ERROR] can't compute a TS type for this data type: ${dataType} */`;
 };
 const fieldForProperty = ({ name, type, optional }) => ({
     name,
@@ -62,10 +65,7 @@ const typeForEnumeration = (enumeration) => [
     `}`,
     ``
 ];
-const typeForPrimitiveType = (datatype) => [
-    `export type ${datatype.name} = ${tsTypeFor(datatype)};`,
-    ``
-];
+const typeForPrimitiveType = (primitiveType) => [`export type ${primitiveType.name} = ${tsTypeFor(primitiveType)};`, ``];
 export var GenerationOptions;
 (function (GenerationOptions) {
     GenerationOptions[GenerationOptions["assumeSealed"] = 0] = "assumeSealed";
@@ -76,19 +76,18 @@ export var GenerationOptions;
  */
 export const tsTypesForLanguage = (language, ...generationOptions) => {
     const fieldsForClassifier = (classifier) => {
-        const map = mapValues(groupBy(allFeaturesOf(classifier), nameOf), (features) => features.map((feature) => ([feature, fieldForFeature(feature)])));
+        const map = mapValues(groupBy(allFeaturesOf(classifier), nameOf), features => features.map(feature => [feature, fieldForFeature(feature)]));
         Object.values(map)
-            .filter((fieldsWithOrigin) => fieldsWithOrigin.length > 1)
-            .forEach((fieldsWithOrigin) => {
+            .filter(fieldsWithOrigin => fieldsWithOrigin.length > 1)
+            .forEach(fieldsWithOrigin => {
             fieldsWithOrigin.forEach(([feature, field]) => {
                 field.name = `${field.name}_${feature.parent.name}`;
             });
         });
-        return Object.values(map)
-            .flatMap((fieldsWithOrigin) => fieldsWithOrigin.map(([_, field]) => field));
+        return Object.values(map).flatMap(fieldsWithOrigin => fieldsWithOrigin.map(([_, field]) => field));
     };
     const typeForAnnotation = (annotation) => {
-        const superTypes = inheritsFrom(annotation);
+        const superTypes = inheritsDirectlyFrom(annotation);
         return tsFromTypeDef({
             modifier: TypeDefModifier.none,
             name: annotation.name,
@@ -97,11 +96,11 @@ export const tsTypesForLanguage = (language, ...generationOptions) => {
         });
     };
     const typeForConcept = (concept) => {
-        const superTypes = inheritsFrom(concept);
+        const superTypes = inheritsDirectlyFrom(concept);
         const subClassifiers = concept.abstract
-            ? (generationOptions.indexOf(GenerationOptions.assumeSealed) > -1
-                ? conceptsOf(language).filter((entity) => entity.extends === concept)
-                : [])
+            ? generationOptions.indexOf(GenerationOptions.assumeSealed) > -1
+                ? conceptsOf(language).filter(entity => entity.extends === concept)
+                : []
             : [concept];
         return tsFromTypeDef({
             modifier: concept.abstract ? TypeDefModifier.abstract : TypeDefModifier.none,
@@ -133,28 +132,22 @@ export const tsTypesForLanguage = (language, ...generationOptions) => {
         if (entity instanceof PrimitiveType) {
             return typeForPrimitiveType(entity);
         }
-        return [
-            `// unhandled language entity <${entity.constructor.name}>"${entity.name}"`,
-            ``
-        ];
+        return [`// unhandled language entity <${entity.constructor.name}>"${entity.name}"`, ``];
     };
     const dependenciesOfClassifier = (classifier) => [
-        ...inheritsFrom(classifier),
+        ...inheritsDirectlyFrom(classifier),
         ...allFeaturesOf(classifier)
-            .filter((feature) => feature instanceof Link)
-            .map((feature) => feature)
-            .flatMap(picker("type"))
-            .filter((type) => type instanceof Classifier)
-            .map((classifier) => classifier)
+            .filter(feature => feature instanceof Link)
+            .map(feature => feature)
+            .flatMap(({ type }) => type)
+            .filter(type => type instanceof Classifier)
+            .map(classifier => classifier)
     ];
     const coreImports = [
-        ...when(!language.entities.every(usesINamedDirectly))([`DynamicNode`]),
-        ...when(language.entities.some(usesINamedDirectly))([`INamed`])
+        ...(language.entities.every(usesINamedDirectly) ? [] : [`DynamicNode`]),
+        ...(language.entities.some(usesINamedDirectly) ? [`INamed`] : [])
     ];
-    const generatedDependencies = uniquesAmong(language.entities
-        .filter((entity) => entity instanceof Classifier)
-        .flatMap((entity) => dependenciesOfClassifier(entity)))
-        .filter((classifier) => classifier.language !== language && classifier.language !== lioncoreBuiltins);
+    const generatedDependencies = uniquesAmong(language.entities.filter(entity => entity instanceof Classifier).flatMap(entity => dependenciesOfClassifier(entity))).filter(classifier => classifier.language !== language && classifier.language !== lioncoreBuiltins);
     const importsPerPackage = groupBy(generatedDependencies, ({ language }) => language.name);
     const concreteClassifiers = language.entities.filter(isConcrete);
     return asString([
@@ -170,7 +163,7 @@ export const tsTypesForLanguage = (language, ...generationOptions) => {
         when(coreImports.length > 0)(`import {${coreImports.join(`, `)}} from "@lionweb/core";`),
         Object.keys(importsPerPackage)
             .sort()
-            .map((packageName) => `import {${nameSorted(importsPerPackage[packageName]).map(nameOf).join(", ")}} from "./${packageName}.js";`),
+            .map(packageName => `import {${nameSorted(importsPerPackage[packageName]).map(nameOf).join(", ")}} from "./${packageName}.js";`),
         ``,
         ``,
         nameSorted(language.entities).map(typeForLanguageEntity),

package/dist/m3/ts-generation/ts-types-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-types-generator.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/ts-types-generator.ts"],"names":[],"mappings":"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"}
+{"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,kBAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,UAAU,EAIV,WAAW,EAEX,oBAAoB,EACpB,SAAS,EACT,UAAU,EAGV,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,aAAa,EACb,QAAQ,EAER,UAAU,EACb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAY,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAS,aAAa,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAErE,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAE,EAAE;IACzC,IAAI,OAAO,YAAY,IAAI,EAAE,CAAC;QAC1B,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;QAC9B,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;IACD,OAAO;QACH,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,SAAS;KAClB,CAAA;AACL,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAQ,EAAS,EAAE,CAAC,CAAC;IACvE,IAAI;IACJ,QAAQ,EAAE,QAAQ,IAAI,CAAC,QAAQ;IAC/B,IAAI,EAAE,GAAG,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;CAChF,CAAC,CAAA;AAEF,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAU,EAAE;IACxD,IAAI,QAAQ,YAAY,aAAa,EAAE,CAAC;QACpC,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,eAAe;gBAClC,OAAO,SAAS,CAAA;YACpB,KAAK,iBAAiB,CAAC,cAAc;gBACjC,OAAO,QAAQ,CAAA;YACnB,KAAK,iBAAiB,CAAC,eAAe;gBAClC,OAAO,QAAQ,CAAA;YACnB,KAAK,iBAAiB,CAAC,YAAY;gBAC/B,OAAO,SAAS,CAAA;YACpB;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,kEAAkE,QAAQ,KAAK,CAAA;AAC1F,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAY,EAAS,EAAE,CAAC,CAAC;IACrE,IAAI;IACJ,QAAQ;IACR,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;CACxB,CAAC,CAAA;AAEF,MAAM,QAAQ,GAAG,CAAC,MAAsB,EAAW,EAAE,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM,CAAA;AAE1F,MAAM,kBAAkB,GAAG,CAAC,MAAsB,EAAW,EAAE;IAC3D,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IACD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IACD,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,WAAwB,EAAY,EAAE,CAAC;IAC/D,QAAQ,WAAW,CAAC,IAAI,IAAI;IAC5B,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,GAAG;IACH,EAAE;CACL,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,aAA4B,EAAY,EAAE,CAAC,CAAC,eAAe,aAAa,CAAC,IAAI,MAAM,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAEjJ,MAAM,CAAN,IAAY,iBAEX;AAFD,WAAY,iBAAiB;IACzB,yEAAY,CAAA;AAChB,CAAC,EAFW,iBAAiB,KAAjB,iBAAiB,QAE5B;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAkB,EAAE,GAAG,iBAAsC,EAAE,EAAE;IAChG,MAAM,mBAAmB,GAAG,CAAC,UAAsB,EAAE,EAAE;QACnD,MAAM,GAAG,GAAG,SAAS,CAAgC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,EAAE,CACxG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAC/D,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;aACb,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;aACvD,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACxB,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC1C,KAAK,CAAC,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC,MAAO,CAAC,IAAI,EAAE,CAAA;YACxD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACN,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IACtG,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,UAAsB,EAAE,EAAE;QACjD,MAAM,UAAU,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAA;QAEnD,OAAO,aAAa,CAAC;YACjB,QAAQ,EAAE,eAAe,CAAC,IAAI;YAC9B,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,UAAU,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC;YAC9E,MAAM,EAAE,mBAAmB,CAAC,UAAU,CAAC;SAC1C,CAAC,CAAA;IACN,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAChD,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ;YACnC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBAC5D,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC;gBACnE,CAAC,CAAC,EAAE;YACR,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAEf,OAAO,aAAa,CAAC;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI;YAC5E,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC;YAC9E,WAAW,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;YAC9G,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC;SACvC,CAAC,CAAA;IACN,CAAC,CAAA;IAED,MAAM,gBAAgB,GAAG,CAAC,OAAkB,EAAE,EAAE,CAC5C,aAAa,CAAC;QACV,QAAQ,EAAE,eAAe,CAAC,SAAS;QACnC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QACxF,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC;KACvC,CAAC,CAAA;IAEN,MAAM,qBAAqB,GAAG,CAAC,MAAsB,EAAE,EAAE;QACrD,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;YAC/B,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACpC,CAAC;QACD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;YAC5B,OAAO,cAAc,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC;QACD,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;YAChC,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAA;QACrC,CAAC;QACD,IAAI,MAAM,YAAY,SAAS,EAAE,CAAC;YAC9B,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;QACD,IAAI,MAAM,YAAY,aAAa,EAAE,CAAC;YAClC,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAA;QACvC,CAAC;QACD,OAAO,CAAC,iCAAiC,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAA;IAC5F,CAAC,CAAA;IAED,MAAM,wBAAwB,GAAG,CAAC,UAAsB,EAAgB,EAAE,CAAC;QACvE,GAAG,oBAAoB,CAAC,UAAU,CAAC;QACnC,GAAG,aAAa,CAAC,UAAU,CAAC;aACvB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,YAAY,IAAI,CAAC;aAC1C,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAe,CAAC;aAC/B,OAAO,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC;aACzB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,UAAU,CAAC;aAC1C,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAwB,CAAC;KACnD,CAAA;IAED,MAAM,WAAW,GAAG;QAChB,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACvE,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACpE,CAAA;IAED,MAAM,qBAAqB,GAAG,YAAY,CACtC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,wBAAwB,CAAC,MAAoB,CAAC,CAAC,CACrI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,QAAQ,IAAI,UAAU,CAAC,QAAQ,KAAK,gBAAgB,CAAC,CAAA;IACpG,MAAM,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEzF,MAAM,mBAAmB,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAEhE,OAAO,QAAQ,CAAC;QACZ,qCAAqC;QACrC,oEAAoE;QACpE,EAAE;QACF;;kBAEU,QAAQ,CAAC,IAAI;kBACb,QAAQ,CAAC,OAAO;IAC9B;QACI,EAAE;QACF,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC;QACxF,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;aACzB,IAAI,EAAE;aACN,GAAG,CACA,WAAW,CAAC,EAAE,CAAC,WAAW,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,WAAW,OAAO,CAC7H;QACL,EAAE;QACF,EAAE;QACF,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC;QACxD,IAAI,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACjC,EAAE;YACF,6DAA6D,QAAQ,CAAC,IAAI,MAAM;YAChF,uBAAuB,UAAU,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG;YACjF,EAAE;SACL,CAAC;KACL,CAAC,CAAA;AACN,CAAC,CAAA"}

package/dist/m3/ts-generation/type-def.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-def.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/type-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAO,MAAM,oBAAoB,CAAA;AAIjD,oBAAY,eAAe;IACvB,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;CACZ;AAED,MAAM,MAAM,OAAO,GAAG;IAClB,QAAQ,EAAE,eAAe,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,KAAK,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACf,CAAA;AAOD,eAAO,MAAM,aAAa,wDAAuD,OAAO,KAAG,QAiB1F,CAAA"}
+{"version":3,"file":"type-def.d.ts","sourceRoot":"","sources":["../../../src/m3/ts-generation/type-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAQ,MAAM,oBAAoB,CAAA;AAGnD,oBAAY,eAAe;IACvB,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,SAAS,IAAA;CACZ;AAED,MAAM,MAAM,OAAO,GAAG;IAClB,QAAQ,EAAE,eAAe,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,KAAK,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACf,CAAA;AAID,eAAO,MAAM,aAAa,wDAAyD,OAAO,KAAG,QAa5F,CAAA"}

package/dist/m3/ts-generation/type-def.js

@@ -1,5 +1,5 @@
 import { when } from "littoral-templates";
-import { indent } from "./textgen.js";
+import { indent } from "@lionweb/textgen-utils";
 export var TypeDefModifier;
 (function (TypeDefModifier) {
     TypeDefModifier[TypeDefModifier["none"] = 0] = "none";
@@ -14,11 +14,7 @@ export const tsFromTypeDef = ({ modifier, name, mixinNames, bodyComment, fields
         when(hasBody)([
             indent([
                 when(!!bodyComment)(`// ${bodyComment}`),
-                when(fields.length > 0)([
-                    `settings: {`,
-                    indent(fields.map(tsFromField)),
-                    `};`
-                ])
+                when(fields.length > 0)([`settings: {`, indent(fields.map(tsFromField)), `};`])
             ]),
             `};` // (`{` was already rendered as part of the header)
         ]),

package/dist/m3/ts-generation/type-def.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-def.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/type-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,IAAI,EAAC,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;AAGnC,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,qDAAI,CAAA;IACJ,6DAAQ,CAAA;IACR,+DAAS,CAAA;AACb,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAiBD,MAAM,WAAW,GAAG,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAQ,EAAY,EAAE,CAC5D,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,GAAG,CAAA;AAG7C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAU,EAAY,EAAE;IAClG,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;IAClD,OAAO;QACH,GAAG,QAAQ,KAAK,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,eAAe,CAAC,QAAQ,CAAC,MAAM,eAAe,IAAI,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE;QAC7J,IAAI,CAAC,OAAO,CAAC,CAAC;YACV,MAAM,CAAC;gBACH,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACpB,aAAa;oBACb,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBAC/B,IAAI;iBACP,CAAC;aACL,CAAC;YACF,IAAI,CAAI,mDAAmD;SAC9D,CAAC;QACF,EAAE;KACL,CAAA;AACL,CAAC,CAAA;AAGD,6HAA6H"}
+{"version":3,"file":"type-def.js","sourceRoot":"","sources":["../../../src/m3/ts-generation/type-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,qDAAI,CAAA;IACJ,6DAAQ,CAAA;IACR,+DAAS,CAAA;AACb,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAgBD,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAS,EAAY,EAAE,CAAC,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,GAAG,CAAA;AAE5G,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAW,EAAY,EAAE;IACpG,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;IAClD,OAAO;QACH,GAAG,QAAQ,KAAK,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,eAAe,CAAC,QAAQ,CAAC,MAAM,eAAe,IAAI,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE;QAC7J,IAAI,CAAC,OAAO,CAAC,CAAC;YACV,MAAM,CAAC;gBACH,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;aAClF,CAAC;YACF,IAAI,CAAC,mDAAmD;SAC3D,CAAC;QACF,EAAE;KACL,CAAA;AACL,CAAC,CAAA;AAED,6HAA6H"}

package/dist/serialization/annotation-remover.d.ts

@@ -1,14 +1,14 @@
-import { SerializationChunk, SerializedNode } from "@lionweb/core";
+import { LionWebJsonChunk, LionWebJsonNode } from "@lionweb/json";
 /**
- * Removes all annotations from the given {@link SerializationChunk}, i.e.:
+ * Removes all annotations from the given {@link LionWebJsonChunk}, i.e.:
  *  * all annotations on nodes in the form of the {@code annotations} property,
  *  * all nodes that can be identified as instances of an {@link Annotation} by being referred to from {@code annotations}.
  * It also removes all descendants of all annotations (insofar present in the given chunk).
- * @param serializationChunk - The {@link SerializationChunk}
+ * @param serializationChunk - The {@link LionWebJsonChunk}
  */
-export declare const withoutAnnotations: (serializationChunk: SerializationChunk) => {
+export declare const withoutAnnotations: (serializationChunk: LionWebJsonChunk) => {
     serializationFormatVersion: string;
-    languages: import("@lionweb/core").SerializedLanguageReference[];
-    nodes: SerializedNode[];
+    languages: import("@lionweb/json").LionWebJsonUsedLanguage[];
+    nodes: LionWebJsonNode[];
 };
 //# sourceMappingURL=annotation-remover.d.ts.map

package/dist/serialization/annotation-remover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-remover.d.ts","sourceRoot":"","sources":["../../src/serialization/annotation-remover.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,kBAAkB,EAClB,cAAc,EACjB,MAAM,eAAe,CAAA;AAEtB;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,uBAAwB,kBAAkB;;;;CA8BxE,CAAA"}
+{"version":3,"file":"annotation-remover.d.ts","sourceRoot":"","sources":["../../src/serialization/annotation-remover.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAG5E;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,uBAAwB,gBAAgB;;;;CA8BtE,CAAA"}

package/dist/serialization/annotation-remover.js

@@ -1,10 +1,10 @@
-import { byIdMap } from "@lionweb/core";
+import { byIdMap } from "@lionweb/ts-utils";
 /**
- * Removes all annotations from the given {@link SerializationChunk}, i.e.:
+ * Removes all annotations from the given {@link LionWebJsonChunk}, i.e.:
  *  * all annotations on nodes in the form of the {@code annotations} property,
  *  * all nodes that can be identified as instances of an {@link Annotation} by being referred to from {@code annotations}.
  * It also removes all descendants of all annotations (insofar present in the given chunk).
- * @param serializationChunk - The {@link SerializationChunk}
+ * @param serializationChunk - The {@link LionWebJsonChunk}
  */
 export const withoutAnnotations = (serializationChunk) => {
     const { serializationFormatVersion, languages, nodes } = serializationChunk;

package/dist/serialization/annotation-remover.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotation-remover.js","sourceRoot":"","sources":["../../src/serialization/annotation-remover.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,OAAO,EAIV,MAAM,eAAe,CAAA;AAEtB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,kBAAsC,EAAE,EAAE;IACzE,MAAM,EAAC,0BAA0B,EAAE,SAAS,EAAE,KAAK,EAAC,GAAG,kBAAkB,CAAA;IACzE,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,MAAM,QAAQ,GAAG,CAAC,EAAM,EAAE,EAAE,CACxB,CAAC,EAAE,IAAI,OAAO,CAAC;QACX,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;QACzE,CAAC,CAAC,EAAE,CAAA;IACZ,MAAM,aAAa,GAAG,CAAC,EAAM,EAAQ,EAAE,CACnC,CAAC,EAAE,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;IAChD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA,CAAC,iDAAiD;IACjH,MAAM,kBAAkB,GAAG;QACvB,GAAG,aAAa;QAChB,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;KAC/C,CAAA;IACD,MAAM,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAkB,EAAkB,EAAE,CAAC,CAAC;QAC9H,EAAE;QACF,UAAU;QACV,UAAU;QACV,YAAY;QACZ,UAAU;QACV,WAAW,EAAE,EAAE;QACf,MAAM;KACT,CAAC,CAAA;IACF,OAAO;QACH,0BAA0B;QAC1B,SAAS;QACT,KAAK,EAAE,KAAK;aACP,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,mCAAmC;aAC3F,GAAG,CAAC,kBAAkB,CAAC;KAC/B,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"annotation-remover.js","sourceRoot":"","sources":["../../src/serialization/annotation-remover.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,kBAAoC,EAAE,EAAE;IACvE,MAAM,EAAC,0BAA0B,EAAE,SAAS,EAAE,KAAK,EAAC,GAAG,kBAAkB,CAAA;IACzE,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,MAAM,QAAQ,GAAG,CAAC,EAAa,EAAE,EAAE,CAC/B,CAAC,EAAE,IAAI,OAAO,CAAC;QACX,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;QACzE,CAAC,CAAC,EAAE,CAAA;IACZ,MAAM,aAAa,GAAG,CAAC,EAAa,EAAe,EAAE,CACjD,CAAC,EAAE,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;IAChD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA,CAAC,iDAAiD;IACjH,MAAM,kBAAkB,GAAG;QACvB,GAAG,aAAa;QAChB,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;KAC/C,CAAA;IACD,MAAM,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAmB,EAAmB,EAAE,CAAC,CAAC;QAChI,EAAE;QACF,UAAU;QACV,UAAU;QACV,YAAY;QACZ,UAAU;QACV,WAAW,EAAE,EAAE;QACf,MAAM;KACT,CAAC,CAAA;IACF,OAAO;QACH,0BAA0B;QAC1B,SAAS;QACT,KAAK,EAAE,KAAK;aACP,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,mCAAmC;aAC3F,GAAG,CAAC,kBAAkB,CAAC;KAC/B,CAAA;AACL,CAAC,CAAA"}

package/dist/serialization/chunk.d.ts

@@ -1,10 +1,11 @@
-import { Language, SerializationChunk } from "@lionweb/core";
+import { Language } from "@lionweb/core";
+import { LionWebJsonChunk } from "@lionweb/json";
 /**
- * Reads the file at the given path as a {@link SerializationChunk serialization chunk}.
+ * Reads the file at the given path as a {@link LionWebJsonChunk serialization chunk}.
  * **Note** that it's only checked that the file exists and can be parsed as JSON,
  * _not_ whether it satisfies the specified serialization chunk format!
  */
-export declare const readSerializationChunk: (path: string) => Promise<SerializationChunk>;
+export declare const readSerializationChunk: (path: string) => Promise<LionWebJsonChunk>;
 /**
  * @return whether the given JSON looks like the serialization of languages.
  */
@@ -16,9 +17,9 @@ export declare const looksLikeSerializedLanguages: (json: unknown) => boolean;
  */
 export declare const tryReadAsLanguages: (path: string) => Promise<Language[]>;
 /**
- * @return the combination of the given {@link SerializationChunk serialization chunks} into one.
+ * @return the combination of the given {@link LionWebJsonChunk serialization chunks} into one.
  */
-export declare const combinationOf: (serializationChunks: SerializationChunk[]) => SerializationChunk;
+export declare const combinationOf: (serializationChunks: LionWebJsonChunk[]) => LionWebJsonChunk;
 /**
  * Tries to read all the given paths as JSON serialization chunks that are serializations of languages,
  * and attempts to combine those chunks into one chunk, and deserializes that.

package/dist/serialization/chunk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk.d.ts","sourceRoot":"","sources":["../../src/serialization/chunk.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,QAAQ,EAER,kBAAkB,EAErB,MAAM,eAAe,CAAA;AAKtB;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,SAAgB,MAAM,gCAOxD,CAAA;AAOD;;GAEG;AACH,eAAO,MAAM,4BAA4B,SAAU,OAAO,KAAG,OAKqC,CAAA;AAGlG;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,QAAQ,QAAQ,EAAE,CAazE,CAAA;AAiBD;;GAEG;AACH,eAAO,MAAM,aAAa,wBAAyB,kBAAkB,EAAE,KAAG,kBAKpE,CAAA;AAGN;;;GAGG;AACH,eAAO,MAAM,qBAAqB,UAAiB,MAAM,EAAE,KAAG,QAAQ,QAAQ,EAAE,CAkB/E,CAAA"}
+{"version":3,"file":"chunk.d.ts","sourceRoot":"","sources":["../../src/serialization/chunk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,QAAQ,EAAe,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAqC,gBAAgB,EAA2B,MAAM,eAAe,CAAA;AAI5G;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,SAAgB,MAAM,8BAOxD,CAAA;AAOD;;GAEG;AACH,eAAO,MAAM,4BAA4B,SAAU,OAAO,KAAG,OAKqC,CAAA;AAGlG;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,QAAQ,QAAQ,EAAE,CAazE,CAAA;AAiBD;;GAEG;AACH,eAAO,MAAM,aAAa,wBAAyB,gBAAgB,EAAE,KAAG,gBAKlE,CAAA;AAGN;;;GAGG;AACH,eAAO,MAAM,qBAAqB,UAAiB,MAAM,EAAE,KAAG,QAAQ,QAAQ,EAAE,CAkB/E,CAAA"}

package/dist/serialization/chunk.js

@@ -1,8 +1,8 @@
-import { currentSerializationFormatVersion, deserializeLanguages, lioncoreKey } from "@lionweb/core";
+import { deserializeLanguages, lioncoreKey } from "@lionweb/core";
+import { currentSerializationFormatVersion } from "@lionweb/json";
 import { readFileAsJson } from "../utils/json.js";
-import { picker } from "../utils/object.js";
 /**
- * Reads the file at the given path as a {@link SerializationChunk serialization chunk}.
+ * Reads the file at the given path as a {@link LionWebJsonChunk serialization chunk}.
  * **Note** that it's only checked that the file exists and can be parsed as JSON,
  * _not_ whether it satisfies the specified serialization chunk format!
  */
@@ -51,12 +51,12 @@ const flatMapDistinct = (tss, equalFunc) => tss.reduce((acc, ts) => [
 ], []);
 const areEqual = (left, right) => left.key === right.key && left.version === right.version;
 /**
- * @return the combination of the given {@link SerializationChunk serialization chunks} into one.
+ * @return the combination of the given {@link LionWebJsonChunk serialization chunks} into one.
  */
 export const combinationOf = (serializationChunks) => ({
     serializationFormatVersion: currentSerializationFormatVersion,
-    languages: flatMapDistinct(serializationChunks.map(picker("languages")), areEqual),
-    nodes: serializationChunks.flatMap(picker("nodes"))
+    languages: flatMapDistinct(serializationChunks.map(({ languages }) => languages), areEqual),
+    nodes: serializationChunks.flatMap(({ nodes }) => nodes)
 });
 /**
  * Tries to read all the given paths as JSON serialization chunks that are serializations of languages,

package/dist/serialization/chunk.js.map

@@ -1 +1 @@
-{"version":3,"file":"chunk.js","sourceRoot":"","sources":["../../src/serialization/chunk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chunk.js","sourceRoot":"","sources":["../../src/serialization/chunk.ts"],"names":[],"mappings":"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"}

package/dist/serialization/measurer.d.ts

@@ -1,10 +1,15 @@
-import { Language, SerializationChunk } from "@lionweb/core";
+import { Language } from "@lionweb/core";
+import { LionWebJsonChunk } from "@lionweb/json";
 import { Metrics } from "./metric-types.js";
 /**
- * Computes {@link Metrics metrics} on the given {@link SerializationChunk serialization chunk}.
+ * Sum the given array of numbers.
+ */
+export declare const sumNumbers: (nums: number[]) => number;
+/**
+ * Computes {@link Metrics metrics} on the given {@link LionWebJsonChunk serialization chunk}.
  * Passing it {@link Language languages} make this language-aware:
  *  * language and classifier names are looked up,
  *  * unused instantiable classifiers and languages without instantiations are computed as well.
  */
-export declare const measure: (serializationChunk: SerializationChunk, languages: Language[]) => Metrics;
+export declare const measure: (serializationChunk: LionWebJsonChunk, languages: Language[]) => Metrics;
 //# sourceMappingURL=measurer.d.ts.map

package/dist/serialization/measurer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measurer.d.ts","sourceRoot":"","sources":["../../src/serialization/measurer.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,QAAQ,EAIR,kBAAkB,EAGrB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAsB,OAAO,EAAC,MAAM,mBAAmB,CAAA;AAU9D;;;;;GAKG;AACH,eAAO,MAAM,OAAO,uBAAwB,kBAAkB,aAAa,QAAQ,EAAE,KAAG,OAkGvF,CAAA"}
+{"version":3,"file":"measurer.d.ts","sourceRoot":"","sources":["../../src/serialization/measurer.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6D,QAAQ,EAAwC,MAAM,eAAe,CAAA;AACzI,OAAO,EAAE,gBAAgB,EAAoE,MAAM,eAAe,CAAA;AAElH,OAAO,EAAuB,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAShE;;GAEG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,EAAE,KAAG,MACD,CAAA;AAG3C;;;;;GAKG;AACH,eAAO,MAAM,OAAO,uBAAwB,gBAAgB,aAAa,QAAQ,EAAE,KAAG,OAyFrF,CAAA"}

package/dist/serialization/measurer.js

@@ -1,8 +1,11 @@
 import { Annotation, Concept, instantiableClassifiersOf, Interface, MemoisingSymbolTable } from "@lionweb/core";
-import { sumNumbers } from "../utils/array.js";
-import { nested3Grouper, nested3Mapper, nestedFlatMap2, nestedFlatMap3 } from "../utils/nested-map.js";
+import { nested3Grouper, nested3Mapper, nestedFlatMap2, nestedFlatMap3 } from "@lionweb/ts-utils";
 /**
- * Computes {@link Metrics metrics} on the given {@link SerializationChunk serialization chunk}.
+ * Sum the given array of numbers.
+ */
+export const sumNumbers = (nums) => nums.reduce((acc, cur) => acc + cur, 0);
+/**
+ * Computes {@link Metrics metrics} on the given {@link LionWebJsonChunk serialization chunk}.
  * Passing it {@link Language languages} make this language-aware:
  *  * language and classifier names are looked up,
  *  * unused instantiable classifiers and languages without instantiations are computed as well.
@@ -10,12 +13,15 @@ import { nested3Grouper, nested3Mapper, nestedFlatMap2, nestedFlatMap3 } from ".
 export const measure = (serializationChunk, languages) => {
     const symbolTable = new MemoisingSymbolTable(languages);
     // group nodes by language key, version, and classifier key, mapped to the classifier meta-pointer and #instantiations:
-    const languageKey2version2classifierKey2info = nested3Mapper((nodes) => ({ classifier: nodes[0].classifier, instantiations: nodes.length }))(nested3Grouper(({ classifier }) => classifier.language, ({ classifier }) => classifier.version, ({ classifier }) => classifier.key)(serializationChunk.nodes));
+    const languageKey2version2classifierKey2info = nested3Mapper(nodes => ({
+        classifier: nodes[0].classifier,
+        instantiations: nodes.length
+    }))(nested3Grouper(({ classifier }) => classifier.language, ({ classifier }) => classifier.version, ({ classifier }) => classifier.key)(serializationChunk.nodes));
     const languagesWithInstantiations = nestedFlatMap2(languageKey2version2classifierKey2info, (classifierKey2info, languageKey, version) => ({
         key: languageKey,
         version,
         name: symbolTable.languageMatching(languageKey, version)?.name,
-        instantiations: sumNumbers(Object.values(classifierKey2info).map((info) => info.instantiations))
+        instantiations: sumNumbers(Object.values(classifierKey2info).map(info => info.instantiations))
     }));
     const metaTypeOf = (entity) => {
         if (entity instanceof Annotation) {
@@ -32,7 +38,7 @@ export const measure = (serializationChunk, languages) => {
     // map grouped nodes to info including #instantiations:
     const instantiatedClassifiers = nestedFlatMap3(languageKey2version2classifierKey2info, (info, languageKey, version, classifierKey) => {
         const classifier = symbolTable.entityMatching(info.classifier);
-        return ({
+        return {
             language: {
                 key: languageKey,
                 version,
@@ -42,23 +48,23 @@ export const measure = (serializationChunk, languages) => {
             name: classifier?.name,
             metaType: metaTypeOf(classifier),
             instantiations: info.instantiations
-        });
+        };
     });
-    const doesLanguageHaveInstantiations = (language) => language.key in languageKey2version2classifierKey2info
-        && language.version in languageKey2version2classifierKey2info[language.key];
+    const doesLanguageHaveInstantiations = (language) => language.key in languageKey2version2classifierKey2info && language.version in languageKey2version2classifierKey2info[language.key];
     const languagesWithoutInstantiations = serializationChunk.languages
-        .filter((language) => !doesLanguageHaveInstantiations(language))
-        .map((language) => ({
+        .filter(language => !doesLanguageHaveInstantiations(language))
+        .map(language => ({
         ...language,
         name: symbolTable.languageMatching(language.key, language.version)?.name
     }));
-    const isClassifierUsed = (metaPointer) => metaPointer.language in languageKey2version2classifierKey2info
-        && metaPointer.version in languageKey2version2classifierKey2info[metaPointer.language]
-        && metaPointer.key in languageKey2version2classifierKey2info[metaPointer.language][metaPointer.version];
-    const uninstantiatedInstantiableClassifiers = languages.flatMap(instantiableClassifiersOf)
-        .map((classifier) => classifier.metaPointer())
-        .filter((metaPointer) => !isClassifierUsed(metaPointer))
-        .map((metaPointer) => ({
+    const isClassifierUsed = (metaPointer) => metaPointer.language in languageKey2version2classifierKey2info &&
+        metaPointer.version in languageKey2version2classifierKey2info[metaPointer.language] &&
+        metaPointer.key in languageKey2version2classifierKey2info[metaPointer.language][metaPointer.version];
+    const uninstantiatedInstantiableClassifiers = languages
+        .flatMap(instantiableClassifiersOf)
+        .map(classifier => classifier.metaPointer())
+        .filter(metaPointer => !isClassifierUsed(metaPointer))
+        .map(metaPointer => ({
         language: {
             key: metaPointer.language,
             version: metaPointer.version,

package/dist/serialization/measurer.js.map

@@ -1 +1 @@
-{"version":3,"file":"measurer.js","sourceRoot":"","sources":["../../src/serialization/measurer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"measurer.js","sourceRoot":"","sources":["../../src/serialization/measurer.ts"],"names":[],"mappings":"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"}

package/dist/serialization/metric-types.d.ts

@@ -1,13 +1,14 @@
+import { LionWebKey } from "@lionweb/json";
 type OptionallyNamed = {
     name?: string;
 };
 type LanguagePointer = {
-    key: string;
+    key: LionWebKey;
     version: string;
 } & OptionallyNamed;
 type ClassifierMetric = {
     language: LanguagePointer;
-    key: string;
+    key: LionWebKey;
 } & OptionallyNamed;
 type ClassifierMetaTypes = "annotation" | "concept" | "interface";
 type ClassifierInstantiationMetric = {

package/dist/serialization/metric-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metric-types.d.ts","sourceRoot":"","sources":["../../src/serialization/metric-types.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,eAAe,GAAG;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAClB,GAAG,eAAe,CAAA;AAEJ,KAAK,gBAAgB,GAAG;IACnC,QAAQ,EAAE,eAAe,CAAA;IACzB,GAAG,EAAE,MAAM,CAAA;CACd,GAAG,eAAe,CAAA;AAEnB,KAAK,mBAAmB,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,CAAA;AAEjE,KAAK,6BAA6B,GAAG;IACjC,QAAQ,CAAC,EAAE,mBAAmB,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAA;CACzB,GAAG,gBAAgB,CAAA;AAEpB,KAAK,cAAc,GAAG;IAClB,cAAc,EAAE,MAAM,CAAA;CACzB,GAAG,eAAe,CAAA;AAGnB,KAAK,OAAO,GAAG;IACX,2BAA2B,EAAE,cAAc,EAAE,CAAA;IAC7C,uBAAuB,EAAE,6BAA6B,EAAE,CAAA;IACxD,qCAAqC,EAAE,gBAAgB,EAAE,CAAA;IACzD,8BAA8B,EAAE,eAAe,EAAE,CAAA;CACpD,CAAA;AAGD,YAAY,EACR,6BAA6B,EAC7B,mBAAmB,EACnB,eAAe,EACf,OAAO,EACV,CAAA"}
+{"version":3,"file":"metric-types.d.ts","sourceRoot":"","sources":["../../src/serialization/metric-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,KAAK,eAAe,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,eAAe,GAAG;IACnB,GAAG,EAAE,UAAU,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAClB,GAAG,eAAe,CAAA;AAEJ,KAAK,gBAAgB,GAAG;IACnC,QAAQ,EAAE,eAAe,CAAA;IACzB,GAAG,EAAE,UAAU,CAAA;CAClB,GAAG,eAAe,CAAA;AAEnB,KAAK,mBAAmB,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,CAAA;AAEjE,KAAK,6BAA6B,GAAG;IACjC,QAAQ,CAAC,EAAE,mBAAmB,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAA;CACzB,GAAG,gBAAgB,CAAA;AAEpB,KAAK,cAAc,GAAG;IAClB,cAAc,EAAE,MAAM,CAAA;CACzB,GAAG,eAAe,CAAA;AAGnB,KAAK,OAAO,GAAG;IACX,2BAA2B,EAAE,cAAc,EAAE,CAAA;IAC7C,uBAAuB,EAAE,6BAA6B,EAAE,CAAA;IACxD,qCAAqC,EAAE,gBAAgB,EAAE,CAAA;IACzD,8BAA8B,EAAE,eAAe,EAAE,CAAA;CACpD,CAAA;AAGD,YAAY,EACR,6BAA6B,EAC7B,mBAAmB,EACnB,eAAe,EACf,OAAO,EACV,CAAA"}

package/dist/serialization/ordering.d.ts

@@ -1,8 +1,8 @@
-import { MetaPointer, SerializationChunk, SerializedLanguageReference, SerializedProperty, SerializedReferenceTarget } from "@lionweb/core";
-declare const orderedMetaPointer: ({ language, version, key }: MetaPointer) => MetaPointer;
-declare const orderedSerializedLanguageReference: ({ key, version }: SerializedLanguageReference) => SerializedLanguageReference;
-declare const orderedSerializedReferenceTarget: ({ reference, resolveInfo }: SerializedReferenceTarget) => SerializedReferenceTarget;
-declare const orderedSerializedProperty: ({ property, value }: SerializedProperty) => SerializedProperty;
-declare const orderedSerializationChunk: ({ serializationFormatVersion, languages, nodes }: SerializationChunk) => SerializationChunk;
+import { LionWebJsonChunk, LionWebJsonMetaPointer, LionWebJsonProperty, LionWebJsonReferenceTarget, LionWebJsonUsedLanguage } from "@lionweb/json";
+declare const orderedMetaPointer: ({ language, version, key }: LionWebJsonMetaPointer) => LionWebJsonMetaPointer;
+declare const orderedSerializedLanguageReference: ({ key, version }: LionWebJsonUsedLanguage) => LionWebJsonUsedLanguage;
+declare const orderedSerializedReferenceTarget: ({ reference, resolveInfo }: LionWebJsonReferenceTarget) => LionWebJsonReferenceTarget;
+declare const orderedSerializedProperty: ({ property, value }: LionWebJsonProperty) => LionWebJsonProperty;
+declare const orderedSerializationChunk: ({ serializationFormatVersion, languages, nodes }: LionWebJsonChunk) => LionWebJsonChunk;
 export { orderedMetaPointer, orderedSerializationChunk, orderedSerializedLanguageReference, orderedSerializedProperty, orderedSerializedReferenceTarget };
 //# sourceMappingURL=ordering.d.ts.map

package/dist/serialization/ordering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ordering.d.ts","sourceRoot":"","sources":["../../src/serialization/ordering.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,kBAAkB,EAElB,2BAA2B,EAE3B,kBAAkB,EAElB,yBAAyB,EAC5B,MAAM,eAAe,CAAA;AAGtB,QAAA,MAAM,kBAAkB,+BAA8B,WAAW,KAAG,WAK9D,CAAA;AAEN,QAAA,MAAM,kCAAkC,qBAAoB,2BAA2B,KAAG,2BAIpF,CAAA;AAEN,QAAA,MAAM,gCAAgC,+BAA8B,yBAAyB,KAAG,yBAI1F,CAAA;AAEN,QAAA,MAAM,yBAAyB,wBAAuB,kBAAkB,KAAG,kBAIrE,CAAA;AA0BN,QAAA,MAAM,yBAAyB,qDAAoD,kBAAkB,KAAG,kBAKlG,CAAA;AAGN,OAAO,EACH,kBAAkB,EAClB,yBAAyB,EACzB,kCAAkC,EAClC,yBAAyB,EACzB,gCAAgC,EACnC,CAAA"}
+{"version":3,"file":"ordering.d.ts","sourceRoot":"","sources":["../../src/serialization/ordering.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAEhB,sBAAsB,EAEtB,mBAAmB,EAEnB,0BAA0B,EAC1B,uBAAuB,EAC1B,MAAM,eAAe,CAAA;AAEtB,QAAA,MAAM,kBAAkB,+BAAgC,sBAAsB,KAAG,sBAI/E,CAAA;AAEF,QAAA,MAAM,kCAAkC,qBAAsB,uBAAuB,KAAG,uBAGtF,CAAA;AAEF,QAAA,MAAM,gCAAgC,+BAAgC,0BAA0B,KAAG,0BAGjG,CAAA;AAEF,QAAA,MAAM,yBAAyB,wBAAyB,mBAAmB,KAAG,mBAG5E,CAAA;AA8BF,QAAA,MAAM,yBAAyB,qDAAsD,gBAAgB,KAAG,gBAItG,CAAA;AAEF,OAAO,EACH,kBAAkB,EAClB,yBAAyB,EACzB,kCAAkC,EAClC,yBAAyB,EACzB,gCAAgC,EACnC,CAAA"}

package/dist/serialization/ordering.js

@@ -17,11 +17,11 @@ const orderedSerializedProperty = ({ property, value }) => ({
 });
 const orderedSerializedContainment = ({ containment, children }) => ({
     containment: orderedMetaPointer(containment),
-    children
+    children // TODO  ensure [] if empty
 });
 const orderedSerializedReference = ({ reference, targets }) => ({
     reference: orderedMetaPointer(reference),
-    targets: targets.map(orderedSerializedReferenceTarget)
+    targets: targets.map(orderedSerializedReferenceTarget) // TODO  ensure [] if empty
 });
 const orderedSerializedNode = ({ id, classifier, properties, containments, references, annotations, parent }) => ({
     id,
@@ -29,7 +29,7 @@ const orderedSerializedNode = ({ id, classifier, properties, containments, refer
     properties: properties.map(orderedSerializedProperty),
     containments: containments.map(orderedSerializedContainment),
     references: references.map(orderedSerializedReference),
-    annotations,
+    annotations, // TODO  ensure [] if empty
     parent
 });
 const orderedSerializationChunk = ({ serializationFormatVersion, languages, nodes }) => ({

package/dist/serialization/ordering.js.map

@@ -1 +1 @@
-{"version":3,"file":"ordering.js","sourceRoot":"","sources":["../../src/serialization/ordering.ts"],"names":[],"mappings":"AAYA,MAAM,kBAAkB,GAAG,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAc,EAAe,EAAE,CAC9E,CAAC;IACG,QAAQ;IACR,OAAO;IACP,GAAG;CACN,CAAC,CAAA;AAEN,MAAM,kCAAkC,GAAG,CAAC,EAAC,GAAG,EAAE,OAAO,EAA8B,EAA+B,EAAE,CACpH,CAAC;IACG,GAAG;IACH,OAAO;CACV,CAAC,CAAA;AAEN,MAAM,gCAAgC,GAAG,CAAC,EAAC,SAAS,EAAE,WAAW,EAA4B,EAA6B,EAAE,CACxH,CAAC;IACG,WAAW;IACX,SAAS;CACZ,CAAC,CAAA;AAEN,MAAM,yBAAyB,GAAG,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAqB,EAAsB,EAAE,CAC5F,CAAC;IACG,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IACtC,KAAK;CACR,CAAC,CAAA;AAEN,MAAM,4BAA4B,GAAG,CAAC,EAAC,WAAW,EAAE,QAAQ,EAAwB,EAAyB,EAAE,CAC3G,CAAC;IACG,WAAW,EAAE,kBAAkB,CAAC,WAAW,CAAC;IAC5C,QAAQ;CACX,CAAC,CAAA;AAEN,MAAM,0BAA0B,GAAG,CAAC,EAAC,SAAS,EAAE,OAAO,EAAsB,EAAuB,EAAE,CAClG,CAAC;IACG,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC;CACzD,CAAC,CAAA;AAEN,MAAM,qBAAqB,GAAG,CAAC,EAAC,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAiB,EAAkB,EAAE,CAC1I,CAAC;IACG,EAAE;IACF,UAAU,EAAE,kBAAkB,CAAC,UAAU,CAAC;IAC1C,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,yBAAyB,CAAC;IACrD,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,4BAA4B,CAAC;IAC5D,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,0BAA0B,CAAC;IACtD,WAAW;IACX,MAAM;CACT,CAAC,CAAA;AAGN,MAAM,yBAAyB,GAAG,CAAC,EAAC,0BAA0B,EAAE,SAAS,EAAE,KAAK,EAAqB,EAAsB,EAAE,CACzH,CAAC;IACG,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,kCAAkC,CAAC;IAC5D,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC;CAC1C,CAAC,CAAA;AAGN,OAAO,EACH,kBAAkB,EAClB,yBAAyB,EACzB,kCAAkC,EAClC,yBAAyB,EACzB,gCAAgC,EACnC,CAAA"}
+{"version":3,"file":"ordering.js","sourceRoot":"","sources":["../../src/serialization/ordering.ts"],"names":[],"mappings":"AAWA,MAAM,kBAAkB,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAA0B,EAA0B,EAAE,CAAC,CAAC;IACxG,QAAQ;IACR,OAAO;IACP,GAAG;CACN,CAAC,CAAA;AAEF,MAAM,kCAAkC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,EAA2B,EAA2B,EAAE,CAAC,CAAC;IAChH,GAAG;IACH,OAAO;CACV,CAAC,CAAA;AAEF,MAAM,gCAAgC,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,EAA8B,EAA8B,EAAE,CAAC,CAAC;IAC9H,WAAW;IACX,SAAS;CACZ,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAuB,EAAuB,EAAE,CAAC,CAAC;IAClG,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IACtC,KAAK;CACR,CAAC,CAAA;AAEF,MAAM,4BAA4B,GAAG,CAAC,EAAE,WAAW,EAAE,QAAQ,EAA0B,EAA0B,EAAE,CAAC,CAAC;IACjH,WAAW,EAAE,kBAAkB,CAAC,WAAW,CAAC;IAC5C,QAAQ,CAAI,2BAA2B;CAC1C,CAAC,CAAA;AAEF,MAAM,0BAA0B,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,EAAwB,EAAwB,EAAE,CAAC,CAAC;IACxG,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAI,2BAA2B;CACxF,CAAC,CAAA;AAEF,MAAM,qBAAqB,GAAG,CAAC,EAC3B,EAAE,EACF,UAAU,EACV,UAAU,EACV,YAAY,EACZ,UAAU,EACV,WAAW,EACX,MAAM,EACQ,EAAmB,EAAE,CAAC,CAAC;IACrC,EAAE;IACF,UAAU,EAAE,kBAAkB,CAAC,UAAU,CAAC;IAC1C,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,yBAAyB,CAAC;IACrD,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,4BAA4B,CAAC;IAC5D,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,0BAA0B,CAAC;IACtD,WAAW,EAAK,2BAA2B;IAC3C,MAAM;CACT,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,CAAC,EAAE,0BAA0B,EAAE,SAAS,EAAE,KAAK,EAAoB,EAAoB,EAAE,CAAC,CAAC;IACzH,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,kCAAkC,CAAC;IAC5D,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC;CAC1C,CAAC,CAAA;AAEF,OAAO,EACH,kBAAkB,EAClB,yBAAyB,EACzB,kCAAkC,EAClC,yBAAyB,EACzB,gCAAgC,EACnC,CAAA"}

package/dist/serialization/sorting.d.ts

@@ -1,7 +1,7 @@
-import { SerializationChunk } from "@lionweb/core";
+import { LionWebJsonChunk } from "@lionweb/json";
 /**
  * @return A sorted version of a {@link SerializedModel JSON serialization}, which should make it easier to inspect.
  *  Note that the sorted version destroy the order of links, which might effectively alter semantics.
  */
-export declare const sortedSerializationChunk: ({ serializationFormatVersion, languages, nodes }: SerializationChunk) => SerializationChunk;
+export declare const sortedSerializationChunk: ({ serializationFormatVersion, languages, nodes }: LionWebJsonChunk) => LionWebJsonChunk;
 //# sourceMappingURL=sorting.d.ts.map

package/dist/serialization/sorting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sorting.d.ts","sourceRoot":"","sources":["../../src/serialization/sorting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAkB,MAAM,eAAe,CAAA;AAUjE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,qDAAoD,kBAAkB,KAAG,kBAsBxG,CAAA"}
+{"version":3,"file":"sorting.d.ts","sourceRoot":"","sources":["../../src/serialization/sorting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAKhD;;;GAGG;AACH,eAAO,MAAM,wBAAwB,qDAAoD,gBAAgB,KAAG,gBAsBtG,CAAA"}