@lionweb/class-core-generator 0.6.13-beta.7 → 0.7.0-alpha.10

package/dist/{api/language-file.templates.js → language-file.templates.js}

@@ -14,20 +14,14 @@
 //
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
-import { Concept, groupBy } from "@lionweb/core";
+import { Concept } from "@lionweb/core";
+import { indent } from "@lionweb/textgen-utils";
+import { dependencyOrderOf, sortedStringsByUppercase } from "@lionweb/ts-utils";
 import { asString, commaSeparated, when, withNewlineAppended } from "littoral-templates";
 import { typeForLanguageEntity } from "./entity-types.templates.js";
-import { reflectiveClassFor } from "./reflective-layer.templates.js";
-import { indent } from "../utils/textgen.js";
-import { sortedStringsByUppercase } from "../utils/string-sorting.js";
-import { dependencyOrderOf } from "../utils/toposort.js";
 import { Imports } from "./helpers/index.js";
-const importStatement = (dep, items) => when(items.length > 0)([
-    `import {`,
-    indent(commaSeparated(sortedStringsByUppercase(items))),
-    `} from "${dep}";`,
-    ``
-]);
+import { reflectiveClassFor } from "./reflective-layer.templates.js";
+const importStatement = (dep, items) => when(items.length > 0)([`import {`, indent(commaSeparated(sortedStringsByUppercase(items))), `} from "${dep}";`, ``]);
 export const languageFileFor = (language, options) => {
     const { name, version, key, id, entities } = language;
     const imports = new Imports(language);
@@ -35,7 +29,6 @@ export const languageFileFor = (language, options) => {
     if (typeof orderedEntities === "boolean") {
         throw new Error(`language ${name} has a cycle among the graph of entities with edges formed by the inheritance dependency`);
     }
-    const mpsAnnotationsPerId = groupBy(options.mpsAnnotations, ({ annotatedNodeId }) => annotatedNodeId);
     const postImportsPart = [
         ``,
         reflectiveClassFor(imports)(language),
@@ -43,7 +36,7 @@ export const languageFileFor = (language, options) => {
         ``,
         orderedEntities
             .filter((entity) => entity.language === language)
-            .map(withNewlineAppended(typeForLanguageEntity(imports, mpsAnnotationsPerId)))
+            .map(withNewlineAppended(typeForLanguageEntity(imports)))
     ];
     return asString([
         options?.header ?? [],
@@ -57,6 +50,7 @@ export const languageFileFor = (language, options) => {
         ``,
         ``,
         importStatement(`@lionweb/core`, imports.coreImports),
+        importStatement(`@lionweb/json`, imports.jsonImports),
         importStatement(options.genericImportLocation, imports.genericImports),
         importStatement(`./index.g.js`, imports.languageImports),
         postImportsPart

package/dist/language-file.templates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"language-file.templates.js","sourceRoot":"","sources":["../src/language-file.templates.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,EAAE;AACF,iEAAiE;AACjE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,EAAE;AACF,sEAAsE;AACtE,sCAAsC;AAEtC,OAAO,EAAE,OAAO,EAAY,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAA;AAC/E,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAExF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAEpE,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,KAAe,EAAE,EAAE,CACrD,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;AAGzH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAkB,EAAE,OAAyB,EAAE,EAAE;IAE7E,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAC,GAAG,QAAQ,CAAA;IAEnD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAA;IAErC,MAAM,eAAe,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,YAAY,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACxI,IAAI,OAAO,eAAe,KAAK,SAAS,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,0FAA0F,CAAC,CAAA;IAC/H,CAAC;IAED,MAAM,eAAe,GAAG;QACpB,EAAE;QACF,kBAAkB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;QACrC,EAAE;QACF,EAAE;QACF,eAAe;aACV,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC;aAChD,GAAG,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;KAChE,CAAA;IAED,OAAO,QAAQ,CAAC;QACZ,OAAO,EAAE,MAAM,IAAI,EAAE;QACrB;;kBAEU,IAAI;kBACJ,OAAO;kBACP,GAAG;kBACH,EAAE;IAChB;QACI,EAAE;QACF,EAAE;QACF,eAAe,CAAC,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC;QACrD,eAAe,CAAC,eAAe,EAAE,OAAO,CAAC,WAAW,CAAC;QACrD,eAAe,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAAC;QACtE,eAAe,CAAC,cAAc,EAAE,OAAO,CAAC,eAAe,CAAC;QACxD,eAAe;KAClB,CAAC,CAAA;AACN,CAAC,CAAA"}

package/dist/mega-factory.templates.d.ts

@@ -0,0 +1,3 @@
+import { Language } from "@lionweb/core";
+export declare const megaFactoryFor: (megaFactoryName: string, languages: Language[], header?: string) => string;
+//# sourceMappingURL=mega-factory.templates.d.ts.map

package/dist/mega-factory.templates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mega-factory.templates.d.ts","sourceRoot":"","sources":["../src/mega-factory.templates.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAc,QAAQ,EAAkB,MAAM,eAAe,CAAA;AAKpE,eAAO,MAAM,cAAc,oBAAqB,MAAM,aAAa,QAAQ,EAAE,WAAW,MAAM,WAgD7F,CAAA"}

package/dist/{api/mega-factory.templates.js → mega-factory.templates.js}

@@ -15,22 +15,21 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 import { isConcrete } from "@lionweb/core";
+import { Deprecated, ioLionWebMpsSpecificAnnotationsFrom } from "@lionweb/io-lionweb-mps-specific";
+import { asJSIdentifier, indent } from "@lionweb/textgen-utils";
 import { asString, commaSeparated } from "littoral-templates";
-import { asJSIdentifier, indent } from "../utils/textgen.js";
-import { Deprecated } from "./helpers/index.js";
-export const megaFactoryFor = (megaFactoryName, languages, mpsAnnotations = [], header) => {
-    const isNotDeprecated = (entity) => !mpsAnnotations.some((mpsAnnotation) => mpsAnnotation.annotatedNodeId === entity.id && mpsAnnotation instanceof Deprecated);
+export const megaFactoryFor = (megaFactoryName, languages, header) => {
+    const isNotDeprecated = (entity) => !ioLionWebMpsSpecificAnnotationsFrom(entity).some((annotation) => annotation instanceof Deprecated);
     const requiresFactoryMethod = (entity) => isConcrete(entity) && isNotDeprecated(entity);
     const factoryFor = (language) => [
         `${asJSIdentifier(language.name)}Factory = {`,
         indent(commaSeparated(language.entities
             .filter(requiresFactoryMethod)
-            .map((classifier) => `create${classifier.name}: () => ${asJSIdentifier(language.name)}.${classifier.name}.create(newId(), this.handleDelta)`))),
+            .map(classifier => `create${classifier.name}: () => ${asJSIdentifier(language.name)}.${classifier.name}.create(newId(), this.handleDelta)`))),
         `}`,
         ``
     ];
-    const languagesWithFactoryMethods = languages
-        .filter((language) => language.entities.some(requiresFactoryMethod));
+    const languagesWithFactoryMethods = languages.filter(language => language.entities.some(requiresFactoryMethod));
     return asString([
         header ?? [],
         `import {DeltaHandler} from "@lionweb/class-core";`,
@@ -46,9 +45,7 @@ export const megaFactoryFor = (megaFactoryName, languages, mpsAnnotations = [],
         indent([
             ``,
             `constructor(`,
-            indent([
-                `public readonly handleDelta?: DeltaHandler`
-            ]),
+            indent([`public readonly handleDelta?: DeltaHandler`]),
             `) {`,
             `}`,
             ``,

package/dist/mega-factory.templates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mega-factory.templates.js","sourceRoot":"","sources":["../src/mega-factory.templates.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,EAAE;AACF,iEAAiE;AACjE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,EAAE;AACF,sEAAsE;AACtE,sCAAsC;AAEtC,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,UAAU,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAA;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAE7D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,eAAuB,EAAE,SAAqB,EAAE,MAAe,EAAE,EAAE;IAC9F,MAAM,eAAe,GAAG,CAAC,MAAsB,EAAE,EAAE,CAC/C,CAAC,mCAAmC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,YAAY,UAAU,CAAC,CAAA;IAEvG,MAAM,qBAAqB,GAAG,CAAC,MAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,CAAA;IAEvG,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC;QACvC,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa;QAC7C,MAAM,CACF,cAAc,CACV,QAAQ,CAAC,QAAQ;aACZ,MAAM,CAAC,qBAAqB,CAAC;aAC7B,GAAG,CACA,UAAU,CAAC,EAAE,CACT,SAAS,UAAU,CAAC,IAAI,WAAW,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,oCAAoC,CAC9H,CACR,CACJ;QACD,GAAG;QACH,EAAE;KACL,CAAA;IAED,MAAM,2BAA2B,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAA;IAE/G,OAAO,QAAQ,CAAC;QACZ,MAAM,IAAI,EAAE;QACZ,mDAAmD;QACnD,EAAE;QACF,UAAU;QACV,MAAM,CAAC,cAAc,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3F,wBAAwB;QACxB,EAAE;QACF,oCAAoC;QACpC,EAAE;QACF,EAAE;QACF,gBAAgB,eAAe,IAAI;QACnC,MAAM,CAAC;YACH,EAAE;YACF,cAAc;YACd,MAAM,CAAC,CAAC,4CAA4C,CAAC,CAAC;YACtD,KAAK;YACL,GAAG;YACH,EAAE;YACF,2BAA2B,CAAC,GAAG,CAAC,UAAU,CAAC;SAC9C,CAAC;QACF,GAAG;QACH,EAAE;KACL,CAAC,CAAA;AACN,CAAC,CAAA"}

package/dist/reflective-layer.templates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reflective-layer.templates.d.ts","sourceRoot":"","sources":["../src/reflective-layer.templates.ts"],"names":[],"mappings":"AAiBA,OAAO,EAaH,QAAQ,EAOX,MAAM,eAAe,CAAA;AAKtB,OAAO,EAA+B,OAAO,EAA8B,MAAM,oBAAoB,CAAA;AAErG,eAAO,MAAM,kBAAkB,YAAa,OAAO,gBAwI7B,QAAQ,0BAyE7B,CAAA"}

package/dist/{api/reflective-layer.templates.js → reflective-layer.templates.js}

@@ -14,9 +14,10 @@
 //
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
-import { Annotation, asArray, Classifier, Concept, Enumeration, featureMetaType, Interface, isConcrete, isEnumeration, isMultiple, Link, nameOf, PrimitiveType, Property } from "@lionweb/core";
+import { Annotation, Classifier, Concept, Enumeration, featureMetaType, Interface, isConcrete, isEnumeration, isMultiple, isPartition, Link, nameOf, PrimitiveType, Property } from "@lionweb/core";
+import { indent, switchOrIf } from "@lionweb/textgen-utils";
+import { asArray } from "@lionweb/ts-utils";
 import { when, withNewlineAppended } from "littoral-templates";
-import { indent, switchOrIf } from "../utils/textgen.js";
 import { entityMetaType, extendsFrom, nameOfBaseClassForLanguage } from "./helpers/index.js";
 export const reflectiveClassFor = (imports) => {
     // classifier:
@@ -28,10 +29,7 @@ export const reflectiveClassFor = (imports) => {
             `private readonly _${qName} = new ${imports.core(metaType)}(this._${classifier.name}, "${name}", "${key}", "${id}")${optional ? ".isOptional()" : ""}${isMultiple(feature) ? ".isMultiple()" : ""};`,
             //               | core (2nd x) |
             `get ${qName}(): ${metaType} {`,
-            indent([
-                `this.ensureWiredUp();`,
-                `return this._${qName};`
-            ]),
+            indent([`this.ensureWiredUp();`, `return this._${qName};`]),
             `}`
         ];
     };
@@ -39,13 +37,10 @@ export const reflectiveClassFor = (imports) => {
         const { name, key, id, features } = classifier;
         const metaType = entityMetaType(classifier);
         return [
-            `public readonly _${name} = new ${imports.core(metaType)}(this._language, "${name}", "${key}", "${id}"${classifier instanceof Concept ? (", " + classifier.abstract) : ""});`,
+            `public readonly _${name} = new ${imports.core(metaType)}(this._language, "${name}", "${key}", "${id}"${classifier instanceof Concept ? ", " + classifier.abstract : ""})${isPartition(classifier) ? ".isPartition()" : ""};`,
             //              | core (2nd x) |
             `get ${name}(): ${metaType} {`,
-            indent([
-                `this.ensureWiredUp();`,
-                `return this._${name};`
-            ]),
+            indent([`this.ensureWiredUp();`, `return this._${name};`]),
             `}`,
             features.map(reflectiveMembersForFeature)
         ];
@@ -57,10 +52,7 @@ export const reflectiveClassFor = (imports) => {
             `private readonly _${qName} = new ${imports.core("EnumerationLiteral")}(this._${enumeration.name}, "${name}", "${key}", "${id}");`,
             //               |  core (2nd x)  |
             `get ${qName}(): EnumerationLiteral {`,
-            indent([
-                `this.ensureWiredUp();`,
-                `return this._${qName};`
-            ]),
+            indent([`this.ensureWiredUp();`, `return this._${qName};`]),
             `}`
         ];
     };
@@ -68,10 +60,7 @@ export const reflectiveClassFor = (imports) => {
         `public readonly _${name} = new ${imports.core("Enumeration")}(this._language, "${name}", "${key}", "${id}");`,
         //              | core (2nd x) |
         `get ${name}(): Enumeration {`,
-        indent([
-            `this.ensureWiredUp();`,
-            `return this._${name};`
-        ]),
+        indent([`this.ensureWiredUp();`, `return this._${name};`]),
         `}`,
         literals.map(reflectiveMemberForEnumerationLiteral)
     ];
@@ -79,10 +68,7 @@ export const reflectiveClassFor = (imports) => {
         `public readonly _${name} = new ${imports.core("PrimitiveType")}(this._language, "${name}", "${key}", "${id}");`,
         //              | core (2nd x) |
         `get ${name}(): PrimitiveType {`,
-        indent([
-            `this.ensureWiredUp();`,
-            `return this._${name};`
-        ]),
+        indent([`this.ensureWiredUp();`, `return this._${name};`]),
         `}`
     ];
     const reflectiveMembersForEntity = (entity) => {
@@ -130,11 +116,11 @@ export const reflectiveClassFor = (imports) => {
         if (entity instanceof Classifier) {
             const extends_ = extendsFrom(entity);
             return [
-                extends_ instanceof Classifier
-                    ? `this._${name}.extends = ${refForType(extends_)};`
-                    : [],
-                when(entity instanceof Interface && entity.extends.length > 0)(() => `this._${name}.extending(${entity.extends.map((interface_) => refForType(interface_)).join(", ")});`),
-                when(isConcreteClassifier(entity) && entity.implements.length > 0)(() => `this._${name}.implementing(${asArray(entity.implements).map((interface_) => refForType(interface_)).join(", ")});`),
+                extends_ instanceof Classifier ? `this._${name}.extends = ${refForType(extends_)};` : [],
+                when(entity instanceof Interface && entity.extends.length > 0)(() => `this._${name}.extending(${entity.extends.map(interface_ => refForType(interface_)).join(", ")});`),
+                when(isConcreteClassifier(entity) && entity.implements.length > 0)(() => `this._${name}.implementing(${asArray(entity.implements)
+                    .map(interface_ => refForType(interface_))
+                    .join(", ")});`),
                 when(entity.features.length > 0)(`this._${name}.havingFeatures(${entity.features.map(nameOf).map(thisLocalName).join(", ")});`),
                 entity.features.map(wireUpStatementsForFeature)
             ];
@@ -161,10 +147,7 @@ export const reflectiveClassFor = (imports) => {
                 `private readonly _language: ${imports.core("Language")} = new Language("${imports.thisLanguageNameAsJsIdentifier}", "${version}", "${id}", "${key}");`,
                 //               | core | (3rd x)
                 `get language(): Language {`,
-                indent([
-                    `this.ensureWiredUp();`,
-                    `return this._language;`
-                ]),
+                indent([`this.ensureWiredUp();`, `return this._language;`]),
                 `}`,
                 ``,
                 entities.map(withNewlineAppended(reflectiveMembersForEntity)),
@@ -182,8 +165,14 @@ export const reflectiveClassFor = (imports) => {
                 ``,
                 `factory(${parameterPrefix}handleDelta?: ${imports.generic("DeltaHandler")}): ${imports.generic("NodeBaseFactory")} {`,
                 indent([
-                    `return (classifier: ${imports.core("Classifier")}, ${parameterPrefix}id: ${imports.core("Id")}) => {`,
-                    indent(switchOrIf("classifier.key", concreteClassifiers.map(nameOf).map((name) => [`this._${name}.key`, `${name}.create(id, ${parameterPrefix}handleDelta)`]), [
+                    `return (classifier: ${imports.core("Classifier")}, ${parameterPrefix}id: ${imports.json("LionWebId")}) => {`,
+                    indent(switchOrIf("classifier.key", concreteClassifiers
+                        .map((classifier) => [
+                        // case's key:
+                        `this._${classifier.name}.key`,
+                        // return value:
+                        `${classifier.name}.create(id, ${parameterPrefix}handleDelta)`
+                    ]), [
                         `const {language} = classifier;`,
                         `throw new Error(\`can't instantiate \${classifier.name} (key=\${classifier.key}): classifier is not known in language \${language.name} (key=\${language.key}, version=\${language.version})\`);`
                     ])),
@@ -195,7 +184,7 @@ export const reflectiveClassFor = (imports) => {
                 // (Why can this work?! EnumType is an unsatisfied generic parameter!)
                 indent([
                     `const {enumeration} = enumerationLiteral;`,
-                    switchOrIf("enumeration.key", enumerations.map(nameOf).map((name) => [`this._${name}.key`, "enumerationLiteral.key as EnumType"]), [
+                    switchOrIf("enumeration.key", enumerations.map(nameOf).map(name => [`this._${name}.key`, "enumerationLiteral.key as EnumType"]), [
                         `const {language} = enumeration;`,
                         `throw new Error(\`enumeration with key \${enumeration.key} is not known in language \${language.name} (key=\${language.key}, version=\${language.version})\`);`
                     ])

package/dist/reflective-layer.templates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reflective-layer.templates.js","sourceRoot":"","sources":["../src/reflective-layer.templates.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,EAAE;AACF,iEAAiE;AACjE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AACjC,EAAE;AACF,sEAAsE;AACtE,sCAAsC;AAEtC,OAAO,EACH,UAAU,EACV,UAAU,EACV,OAAO,EACP,WAAW,EAGX,eAAe,EACf,SAAS,EACT,UAAU,EACV,aAAa,EACb,UAAU,EACV,WAAW,EAGX,IAAI,EACJ,MAAM,EACN,aAAa,EACb,QAAQ,EAEX,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAE9D,OAAO,EAAE,cAAc,EAAE,WAAW,EAAW,0BAA0B,EAAE,MAAM,oBAAoB,CAAA;AAErG,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACnD,cAAc;IAEd,MAAM,2BAA2B,GAAG,CAAC,OAAgB,EAAE,EAAE;QACrD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE,CAAA;QAC1C,OAAO;YACH,qBAAqB,KAAK,UAAU,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,UAAU,CAAC,IAAI,MAAM,IAAI,OAAO,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG;YACpM,iCAAiC;YACjC,OAAO,KAAK,OAAO,QAAQ,IAAI;YAC/B,MAAM,CAAC,CAAC,uBAAuB,EAAE,gBAAgB,KAAK,GAAG,CAAC,CAAC;YAC3D,GAAG;SACN,CAAA;IACL,CAAC,CAAA;IAED,MAAM,8BAA8B,GAAG,CAAC,UAAsB,EAAE,EAAE;QAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAA;QAC9C,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;QAC3C,OAAO;YACH,oBAAoB,IAAI,UAAU,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,IAAI,OAAO,GAAG,OAAO,EAAE,IAAI,UAAU,YAAY,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG;YAC7N,gCAAgC;YAChC,OAAO,IAAI,OAAO,QAAQ,IAAI;YAC9B,MAAM,CAAC,CAAC,uBAAuB,EAAE,gBAAgB,IAAI,GAAG,CAAC,CAAC;YAC1D,GAAG;YACH,QAAQ,CAAC,GAAG,CAAC,2BAA2B,CAAC;SAC5C,CAAA;IACL,CAAC,CAAA;IAED,eAAe;IAEf,MAAM,qCAAqC,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAsB,EAAE,EAAE;QACjG,MAAM,KAAK,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAA;QAC3C,OAAO;YACH,qBAAqB,KAAK,UAAU,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,WAAW,CAAC,IAAI,MAAM,IAAI,OAAO,GAAG,OAAO,EAAE,KAAK;YAClI,mCAAmC;YACnC,OAAO,KAAK,0BAA0B;YACtC,MAAM,CAAC,CAAC,uBAAuB,EAAE,gBAAgB,KAAK,GAAG,CAAC,CAAC;YAC3D,GAAG;SACN,CAAA;IACL,CAAC,CAAA;IAED,MAAM,+BAA+B,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAe,EAAE,EAAE,CAAC;QAClF,oBAAoB,IAAI,UAAU,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,qBAAqB,IAAI,OAAO,GAAG,OAAO,EAAE,KAAK;QAC9G,gCAAgC;QAChC,OAAO,IAAI,mBAAmB;QAC9B,MAAM,CAAC,CAAC,uBAAuB,EAAE,gBAAgB,IAAI,GAAG,CAAC,CAAC;QAC1D,GAAG;QACH,QAAQ,CAAC,GAAG,CAAC,qCAAqC,CAAC;KACtD,CAAA;IAED,MAAM,iCAAiC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAiB,EAAE,EAAE,CAAC;QAC5E,oBAAoB,IAAI,UAAU,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,IAAI,OAAO,GAAG,OAAO,EAAE,KAAK;QAChH,gCAAgC;QAChC,OAAO,IAAI,qBAAqB;QAChC,MAAM,CAAC,CAAC,uBAAuB,EAAE,gBAAgB,IAAI,GAAG,CAAC,CAAC;QAC1D,GAAG;KACN,CAAA;IAED,MAAM,0BAA0B,GAAG,CAAC,MAAsB,EAAE,EAAE;QAC1D,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;YAC/B,OAAO,8BAA8B,CAAC,MAAM,CAAC,CAAA;QACjD,CAAC;QACD,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;YAChC,OAAO,+BAA+B,CAAC,MAAM,CAAC,CAAA;QAClD,CAAC;QACD,IAAI,MAAM,YAAY,aAAa,EAAE,CAAC;YAClC,OAAO,iCAAiC,CAAC,MAAM,CAAC,CAAA;QACpD,CAAC;QACD,OAAO,iCAAiC,cAAc,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAA;IACrF,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,IAA+B,EAAE,EAAE;QACnD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;YACzC,OAAO,SAAS,IAAI,CAAC,IAAI,EAAE,CAAA;QAC/B,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE,CAAA;IACtE,CAAC,CAAA;IAED,MAAM,2BAA2B,GAAG,CAAC,QAAkB,EAAE,EAAE;QACvD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;QACrD,OAAO,SAAS,UAAU,CAAC,IAAI,IAAI,IAAI,WAAW,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,CAAA;IAC5G,CAAC,CAAA;IAED,MAAM,uBAAuB,GAAG,CAAC,IAAU,EAAE,EAAE;QAC3C,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;QACvC,OAAO,SAAS,UAAU,CAAC,IAAI,IAAI,IAAI,WAAW,UAAU,CAAC,IAAI,CAAC,IAAI,CAAA;IAC1E,CAAC,CAAA;IAED,MAAM,0BAA0B,GAAG,CAAC,OAAgB,EAAE,EAAE;QACpD,IAAI,OAAO,YAAY,QAAQ,EAAE,CAAC;YAC9B,OAAO,2BAA2B,CAAC,OAAO,CAAC,CAAA;QAC/C,CAAC;QACD,IAAI,OAAO,YAAY,IAAI,EAAE,CAAC;YAC1B,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAA;QAC3C,CAAC;QACD,OAAO,yBAAyB,eAAe,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,IAAI,GAAG,CAAA;IAChF,CAAC,CAAA;IAED,MAAM,oBAAoB,GAAG,CAAC,UAAsB,EAAsC,EAAE,CACxF,UAAU,YAAY,UAAU,IAAI,UAAU,YAAY,OAAO,CAAA;IAErE,MAAM,yBAAyB,GAAG,CAAC,MAAsB,EAAE,EAAE;QACzD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;QACvB,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS,IAAI,IAAI,SAAS,EAAE,CAAA;QACzE,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;YACpC,OAAO;gBACH,QAAQ,YAAY,UAAU,CAAC,CAAC,CAAC,SAAS,IAAI,cAAc,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACxF,IAAI,CAAC,MAAM,YAAY,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAC1D,GAAG,EAAE,CAAC,SAAS,IAAI,cAAe,MAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC1H;gBACD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAC9D,GAAG,EAAE,CACD,SAAS,IAAI,iBAAiB,OAAO,CAAE,MAA+B,CAAC,UAAU,CAAC;qBAC7E,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;qBACzC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC1B;gBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAC5B,SAAS,IAAI,mBAAmB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAChG;gBACD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC;aAClD,CAAA;QACL,CAAC;QACD,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;YAChC,OAAO,SAAS,IAAI,mBAAmB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;QACxG,CAAC;QACD,IAAI,MAAM,YAAY,aAAa,EAAE,CAAC;YAClC,OAAO,EAAE,CAAA,CAAC,kBAAkB;QAChC,CAAC;QACD,OAAO,iCAAiC,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI,GAAG,CAAA;IAC9E,CAAC,CAAA;IAED,OAAO,CAAC,QAAkB,EAAE,EAAE;QAC1B,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QACnD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACvD,MAAM,eAAe,GAAG,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;QACnE,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS,SAAS,EAAE,CAAA;QACjE,OAAO;YACH,gBAAgB,OAAO,CAAC,iBAAiB,eAAe,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI;YAC5F,EAAE;YACF,MAAM,CAAC;gBACH,+EAA+E;gBAC/E,+BAA+B,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,oBAAoB,OAAO,CAAC,8BAA8B,OAAO,OAAO,OAAO,EAAE,OAAO,GAAG,KAAK;gBACvJ,iCAAiC;gBACjC,4BAA4B;gBAC5B,MAAM,CAAC,CAAC,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;gBAC3D,GAAG;gBACH,EAAE;gBACF,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,0BAA0B,CAAC,CAAC;gBAC7D,oCAAoC;gBACpC,2BAA2B;gBAC3B,MAAM,CAAC;oBACH,sBAAsB;oBACtB,MAAM,CAAC,SAAS,CAAC;oBACjB,GAAG;oBACH,iCAAiC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;oBACvF,QAAQ,CAAC,GAAG,CAAC,yBAAyB,CAAC;oBACvC,uBAAuB;iBAC1B,CAAC;gBACF,GAAG;gBACH,EAAE;gBACF,WAAW,eAAe,iBAAiB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI;gBACtH,MAAM,CAAC;oBACH,uBAAuB,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,eAAe,OAAO,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ;oBAC7G,MAAM,CACF,UAAU,CACN,gBAAgB,EAChB,mBAAmB;yBACd,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC;wBACjB,cAAc;wBACd,SAAS,UAAU,CAAC,IAAI,MAAM;wBAC9B,gBAAgB;wBAChB,GAAG,UAAU,CAAC,IAAI,eAAe,eAAe,cAAc;qBACjE,CAAC,EACN;wBACI,gCAAgC;wBAChC,kMAAkM;qBACrM,CACJ,CACJ;oBACD,GAAG;iBACN,CAAC;gBACF,GAAG;gBACH,EAAE;gBACF,iDAAiD,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe;gBAClG,sEAAsE;gBACtE,MAAM,CAAC;oBACH,2CAA2C;oBAC3C,UAAU,CACN,iBAAiB,EACjB,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,MAAM,EAAE,oCAAoC,CAAC,CAAC,EACjG;wBACI,iCAAiC;wBACjC,gKAAgK;qBACnK,CACJ;iBACJ,CAAC;gBACF,GAAG;gBACH,EAAE;gBACF,yCAAyC,0BAA0B,CAAC,QAAQ,CAAC,KAAK;aACrF,CAAC;YACF,GAAG;SACN,CAAA;IACL,CAAC,CAAA;AACL,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lionweb/class-core-generator",
-  "version": "0.6.13-beta.7",
+  "version": "0.7.0-alpha.10",
   "description": "Generator for implementations of languages based on the class-core package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,20 +15,26 @@
     "url": "https://github.com/LionWeb-io/lionweb-typescript/issues"
   },
   "scripts": {
-    "clean": "rm -rf dist/ node_modules/ lionweb-class-core-generator-*.tgz",
+    "clean": "npx rimraf dist node_modules -g lionweb-class-core-generator-*.tgz",
     "build": "tsc",
     "lint": "eslint src",
-    "pre-release-either": "npm run clean && npm install && npm run build",
-    "prerelease": "npm run pre-release-either",
-    "release": "npm publish",
-    "prerelease-beta": "npm run pre-release-either",
-    "release-beta": "npm publish --tag beta"
+    "prep:pre-release": "npm run clean && npm install && npm run build",
+    "prerelease-alpha": "npm run prep:pre-release",
+    "release-alpha": "npm publish --tag alpha",
+    "prerelease-beta": "npm run prep:pre-release",
+    "release-beta": "npm publish --tag beta",
+    "prerelease": "npm run prep:pre-release",
+    "release": "npm publish"
   },
   "devDependencies": {
-    "@lionweb/core": "0.6.13-beta.7",
-    "@lionweb/utilities": "0.6.13-beta.7",
-    "@types/node": "20.17.30",
-    "littoral-templates": "0.3.0",
+    "@lionweb/core": "0.7.0-alpha.10",
+    "@lionweb/io-lionweb-mps-specific": "0.7.0-alpha.10",
+    "@lionweb/json": "0.7.0-alpha.10",
+    "@lionweb/textgen-utils": "0.7.0-alpha.10",
+    "@lionweb/ts-utils": "0.7.0-alpha.10",
+    "@lionweb/utilities": "0.7.0-alpha.10",
+    "@types/node": "22.15.21",
+    "littoral-templates": "0.5.0",
     "typescript": "5.3.3"
   }
 }

package/src/{api/entity-types.templates.ts → entity-types.templates.ts}

@@ -21,41 +21,46 @@ import {
     Enumeration,
     Feature,
     featureMetaType,
-    Id,
     Interface,
     isContainment,
     isProperty,
     isReference,
     LanguageEntity,
     Link,
+    M3Concept,
     nameSorted,
+    Node,
     PrimitiveType,
     Property,
     Reference,
     SingleRef
 } from "@lionweb/core"
-import {commaSeparated, when, withNewlineAppended} from "littoral-templates"
-
-import {indent, switchOrIf, withFirstUpper, wrapInIf} from "../utils/textgen.js"
 import {
     ConceptDescription,
     Deprecated,
+    ioLionWebMpsSpecificAnnotationsFrom,
+    KeyedDescription,
+    ShortDescription,
+    VirtualPackage
+} from "@lionweb/io-lionweb-mps-specific"
+import { indent, switchOrIf, withFirstUpper, wrapInIf } from "@lionweb/textgen-utils"
+import { commaSeparated, when, withNewlineAppended } from "littoral-templates"
+
+import {
     entityMetaType,
     extendsFrom,
     featuresToConcretelyImplementOf,
     implementsFrom,
     Imports,
     isAbstract,
-    MpsAnnotation,
     optionalityPostfix,
     tsFieldTypeForFeature,
     tsTypeForClassifier,
-    tsTypeForDatatype,
+    tsTypeForDataType,
     tsTypeForPrimitiveType,
     tsTypeForValueManager
 } from "./helpers/index.js"
 
-
 const cardinalityPrefix = (feature: Feature) => {
     if (feature instanceof Property) {
         return feature.optional ? "Optional" : "Required"
@@ -68,7 +73,7 @@ const cardinalityPrefix = (feature: Feature) => {
 const valueManagerFor = (feature: Feature) =>
     `${cardinalityPrefix(feature)}${featureMetaType(feature)}ValueManager`
 
-export const typeForLanguageEntity = (imports: Imports, mpsAnnotationsPerId: Record<Id, MpsAnnotation[]>) => {
+export const typeForLanguageEntity = (imports: Imports) => {
 
     const sortedSuperTypesCond = <T extends Classifier>(ts: T[], prefix: string): string =>
         ts.length === 0 ? `` : `${prefix}${nameSorted(ts).map((t) => imports.entity(t)).join(", ")}`
@@ -79,11 +84,12 @@ export const typeForLanguageEntity = (imports: Imports, mpsAnnotationsPerId: Rec
     const classMembersForProperty = (property: Property) => {
         const {name, type} = property
         return [
-            `private readonly _${name}: ${imports.generic(valueManagerFor(property))}<${tsTypeForDatatype(type, imports)}>;`,
-            `get ${name}(): ${tsTypeForDatatype(type, imports)}${optionalityPostfix(property)} {`,
+            `private readonly _${name}: ${imports.generic(valueManagerFor(property))}<${tsTypeForDataType(type, imports)}>;`,
+            jsDocFor(property),
+            `get ${name}(): ${tsTypeForDataType(type, imports)}${optionalityPostfix(property)} {`,
             indent(`return this._${name}.get();`),
             `}`,
-            `set ${name}(newValue: ${tsTypeForDatatype(type, imports)}${optionalityPostfix(property)}) {`,
+            `set ${name}(newValue: ${tsTypeForDataType(type, imports)}${optionalityPostfix(property)}) {`,
             indent(`this._${name}.set(newValue);`),
             `}`
         ]
@@ -97,6 +103,7 @@ export const typeForLanguageEntity = (imports: Imports, mpsAnnotationsPerId: Rec
         const {name, type, multiple} = link
         return [
             `private readonly _${name}: ${imports.generic(valueManagerFor(link))}<${tsTypeForClassifier(type, imports)}>;`,
+            jsDocFor(link),
             `get ${name}(): ${tsTypeForLink(link)} {`,
             indent(`return this._${name}.get();`),
             `}`,
@@ -163,7 +170,7 @@ export const typeForLanguageEntity = (imports: Imports, mpsAnnotationsPerId: Rec
                 when(!isAbstract(classifier))(
                     () =>
                         [
-                            `static create(id: Id, handleDelta?: ${imports.generic("DeltaHandler")}, parentInfo?: ${imports.generic("Parentage")}): ${classifier.name} {`,
+                            `static create(id: ${imports.json("LionWebId")}, handleDelta?: ${imports.generic("DeltaHandler")}, parentInfo?: ${imports.generic("Parentage")}): ${classifier.name} {`,
                             indent([
                                 `return new ${classifier.name}(${imports.language(classifier.language)}.INSTANCE.${classifier.name}, id, handleDelta, parentInfo);`
                             ]),
@@ -175,7 +182,7 @@ export const typeForLanguageEntity = (imports: Imports, mpsAnnotationsPerId: Rec
                         [
                             ``,
                             features.map(withNewlineAppended(classMembersForFeature)),
-                            `public constructor(classifier: ${imports.core("Classifier")}, id: ${imports.core("Id")}, handleDelta?: ${imports.generic("DeltaHandler")}, parentInfo?: ${imports.generic("Parentage")}) {`,
+                            `${isAbstract(classifier) ? "protected" : "public"} constructor(classifier: ${imports.core("Classifier")}, id: ${imports.json("LionWebId")}, handleDelta?: ${imports.generic("DeltaHandler")}, parentInfo?: ${imports.generic("Parentage")}) {`,
                             indent([
                                 `super(classifier, id, handleDelta, parentInfo);`,
                                 features.map((feature) => `this._${feature.name} = new ${imports.generic(valueManagerFor(feature))}<${tsTypeForValueManager(feature, imports)}>(${imports.language(feature.classifier.language)}.INSTANCE.${feature.classifier.name}_${feature.name}, this);`)
@@ -216,18 +223,46 @@ export const typeForLanguageEntity = (imports: Imports, mpsAnnotationsPerId: Rec
     const typeForPrimitiveType = (primitiveType: PrimitiveType) =>
         `export type ${primitiveType.name} = ${tsTypeForPrimitiveType(primitiveType)};`
 
-    const jsDocFor = (entity: LanguageEntity) => {
-        const mpsAnnotationsForEntity = mpsAnnotationsPerId[entity.id] ?? []
-        const conceptDescription = mpsAnnotationsForEntity.find((mpsAnnotation) => mpsAnnotation instanceof ConceptDescription) as ConceptDescription
-        const hasShortConceptDescription = !!(conceptDescription?.shortDescription)
-        const deprecated = mpsAnnotationsForEntity.find((mpsAnnotation) => mpsAnnotation instanceof Deprecated) as Deprecated
-        return when(hasShortConceptDescription || deprecated !== undefined)([
+    const jsDocFor = (entity: M3Concept) => {
+        const annotations = ioLionWebMpsSpecificAnnotationsFrom(entity)
+        const conceptDescription = annotations.find((annotation) => annotation instanceof ConceptDescription) as ConceptDescription
+        const deprecated = annotations.find((annotation) => annotation instanceof Deprecated) as Deprecated
+        const keyedDescription = annotations.find((annotation) => annotation instanceof KeyedDescription) as KeyedDescription
+        const shortDescription = annotations.find((annotation) => annotation instanceof ShortDescription) as ShortDescription
+        const virtualPackage = annotations.find((annotation) => annotation instanceof VirtualPackage) as VirtualPackage
+        const requiresJsDoc =
+               !!(conceptDescription?.conceptShortDescription)
+            || !!(conceptDescription?.helpUrl)
+            || !!(shortDescription?.description)
+            || keyedDescription !== undefined
+            || deprecated !== undefined
+            || !!(virtualPackage?.name)
+        const linkName = (node: Node) =>
+            node instanceof LanguageEntity
+                ? node.name
+                : "??? (not a language's entity)"
+        return when(requiresJsDoc)([
             `/**`,
-            when(hasShortConceptDescription)(
-                () => ` * ${conceptDescription.shortDescription}`
+            when(!!(conceptDescription?.conceptShortDescription))(
+                () => ` * ${conceptDescription.conceptShortDescription}`
+            ),
+            when(!!(conceptDescription?.helpUrl))(
+                () => ` * {@see} ${conceptDescription.helpUrl}`
+            ),
+            when(!!(shortDescription?.description))(
+                () => ` * ${shortDescription.description}`
+            ),
+            when(keyedDescription !== undefined)(
+                () => [
+                    when(keyedDescription.documentation !== undefined)(` * ${keyedDescription.documentation}`),
+                    keyedDescription.seeAlso.map((seeAlso) => ` * {@see} {@link ${linkName(seeAlso)}}`)
+                ]
             ),
             when(deprecated !== undefined)(
-                () => ` * @deprecated ${deprecated.comment ?? ""}${deprecated.build === null ? "" : ` (build: ${deprecated.build})`}`
+                () => ` * @deprecated ${deprecated.comment ?? ""}${deprecated.build === undefined ? "" : ` (build: ${deprecated.build})`}`
+            ),
+            when(!!(virtualPackage?.name))(
+                () => `(virtual package: ${virtualPackage.name})`
             ),
             ` */`
         ])

package/src/{api/generation-headers.ts → generation-headers.ts}

@@ -1,15 +1,21 @@
-// SPDX-FileCopyrightText: 2025 TRUMPF Laser SE
+// Copyright 2025 TRUMPF Laser SE and other contributors
 //
-// SPDX-License-Identifier: LicenseRef-TRUMPF
-
-import {asString} from "littoral-templates"
+// Licensed under the Apache License, Version 2.0 (the "License")
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
+// SPDX-License-Identifier: Apache-2.0
 
-/**
- * @return the given string, reversed — "abc" -> "cba"
- * Note: only used to hack around the REUSE compliance checker!
- */
-const reverseString = (str: string) =>
-    str.split("").reverse().join("")
+import { asString } from "littoral-templates"
 
 /**
  * The license header (as //-styled comments) for code originating from Trumpf Laser SE, licensed under Apache-2.0.
@@ -28,20 +34,18 @@ const trumpfOriginatingApache2_0LicenseHeaderComments = `// Copyright 2025 TRUMP
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// ${reverseString("txeTthgirypoCeliF-XDPS")}: 2025 TRUMPF Laser SE and other contributors
-// ${reverseString("reifitnedI-esneciL-XDPS")}: Apache-2.0
-`
+// SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
+// SPDX-License-Identifier: Apache-2.0`
 
 /**
  * Generic (//-styled) comments warning about code being generated.
  */
 export const generatedCodeWarningComments = `// Warning: this file is generated!
-// Modifying it by hand is useless at best, and sabotage at worst.
-`
+// Modifying it by hand is useless at best, and sabotage at worst.`
 
 /**
  * The empty line-separation concatenation of the Trumpf-flavored Apache-2.0 license header and the generation warning.
  */
 export const defaultTrumpfOriginatingApache2_0LicensedHeader =
-    asString([trumpfOriginatingApache2_0LicenseHeaderComments, ``, generatedCodeWarningComments, ``])
+    asString([trumpfOriginatingApache2_0LicenseHeaderComments, ``, generatedCodeWarningComments])
 

package/src/{api/generator.ts → generator.ts}

@@ -15,29 +15,26 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import {deserializeLanguages, Language, lioncore, SerializationChunk} from "@lionweb/core"
-import {readFileAsJson} from "@lionweb/utilities"
-import {writeFileSync} from "fs"
-import {join} from "path"
-import {cwd} from "process"
-
-import {indexTsFor} from "./index-ts.js"
-import {languageFileFor} from "./language-file.templates.js"
-import {MpsAnnotation} from "./helpers/index.js"
+import { deserializeLanguages, Language, lioncore } from "@lionweb/core"
+import { LionWebJsonChunk } from "@lionweb/json"
+import { readFileAsJson } from "@lionweb/utilities"
+import { writeFileSync } from "fs"
+import { join } from "path"
+import { cwd } from "process"
 
+import { indexTsFor } from "./index-ts.js"
+import { languageFileFor } from "./language-file.templates.js"
 
 const properGenericImportLocation = "@lionweb/class-core"
 
 
 export type GeneratorOptions = {
-    mpsAnnotations: MpsAnnotation[]
     genericImportLocation: string
     header?: string
 }
 
 
 const withDefaults = (options?: Partial<GeneratorOptions>): GeneratorOptions => ({
-    mpsAnnotations: options?.mpsAnnotations ?? [],
     genericImportLocation: options?.genericImportLocation ?? properGenericImportLocation,
     header: options?.header
 })
@@ -56,7 +53,7 @@ export const generateApiFromLanguagesJson = (languagesJsonPath: string, generati
     console.log(`   Path to languages: ${languagesJsonPath}`)
     console.log(`   Generation path:   ${generationPath}`)
 
-    const languagesJson = readFileAsJson(languagesJsonPath) as SerializationChunk
+    const languagesJson = readFileAsJson(languagesJsonPath) as LionWebJsonChunk
     const languages = deserializeLanguages(languagesJson, lioncore)
     generateApiFromLanguages(languages, generationPath, options)
 }

package/src/{api/helpers → helpers}/classifiers.ts

@@ -15,22 +15,10 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-    allFeaturesOf,
-    allSuperTypesOf,
-    Annotation,
-    Classifier,
-    Concept,
-    Feature,
-    Interface,
-    MultiRef,
-    SingleRef
-} from "@lionweb/core"
-import {uniquesAmong} from "@lionweb/utilities/dist/utils/array.js"
+import { allFeaturesOf, allSuperTypesOf, Annotation, Classifier, Concept, Feature, Interface, MultiRef, SingleRef } from "@lionweb/core"
+import { uniquesAmong } from "@lionweb/ts-utils"
 
-
-export const isAbstract = (classifier: Classifier): boolean =>
-    classifier instanceof Concept && classifier.abstract
+export const isAbstract = (classifier: Classifier): boolean => classifier instanceof Concept && classifier.abstract
 /*
  * The logical inverse is: classifier instanceof Annotation || (classifier instanceof Concept && !classifier.abstract)
  */

package/src/{api/helpers → helpers}/entities.ts

@@ -15,15 +15,9 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import {Annotation, Concept, Interface, LanguageEntity, PrimitiveType} from "@lionweb/core"
+import { Annotation, Concept, Interface, LanguageEntity, PrimitiveType } from "@lionweb/core"
 
-
-type EntityMetaType =
-    | "Annotation"
-    | "Concept"
-    | "Enumeration"
-    | "Interface"
-    | "PrimitiveType"
+type EntityMetaType = "Annotation" | "Concept" | "Enumeration" | "Interface" | "PrimitiveType"
 
 export const entityMetaType = (entity: LanguageEntity): EntityMetaType => {
     if (entity instanceof Annotation) {