@lionweb/class-core 0.8.0-beta.6 → 0.8.0-beta.8

package/src/deltas/serialization/types.g.ts

@@ -249,7 +249,7 @@ export type ReferenceAddedSerializedDelta = {
     parent: LionWebId
     reference: LionWebJsonMetaPointer
     index: number
-    newTarget: IdOrNull
+    newReference: IdOrNull
 }
 
 export type ReferenceDeletedSerializedDelta = {
@@ -257,7 +257,7 @@ export type ReferenceDeletedSerializedDelta = {
     parent: LionWebId
     reference: LionWebJsonMetaPointer
     index: number
-    deletedTarget: IdOrNull
+    deletedReference: IdOrNull
 }
 
 export type ReferenceChangedSerializedDelta = {
@@ -265,8 +265,8 @@ export type ReferenceChangedSerializedDelta = {
     parent: LionWebId
     reference: LionWebJsonMetaPointer
     index: number
-    newTarget: IdOrNull
-    oldTarget: IdOrNull
+    newReference: IdOrNull
+    oldReference: IdOrNull
 }
 
 export type CompositeSerializedDelta = {

package/src/deltas/types.g.ts

@@ -20,6 +20,7 @@
 
 import {
     Containment,
+    Node,
     Property,
     Reference,
     SingleRef
@@ -254,7 +255,7 @@ export class ReferenceAddedDelta implements IDelta {
         public readonly parent: INodeBase,
         public readonly reference: Reference,
         public readonly index: number,
-        public readonly newTarget: SingleRef<INodeBase>
+        public readonly newReference: SingleRef<Node>
     ) {
     }
 }
@@ -264,7 +265,7 @@ export class ReferenceDeletedDelta implements IDelta {
         public readonly parent: INodeBase,
         public readonly reference: Reference,
         public readonly index: number,
-        public readonly deletedTarget: SingleRef<INodeBase>
+        public readonly deletedReference: SingleRef<Node>
     ) {
     }
 }
@@ -274,8 +275,8 @@ export class ReferenceChangedDelta implements IDelta {
         public readonly parent: INodeBase,
         public readonly reference: Reference,
         public readonly index: number,
-        public readonly newTarget: SingleRef<INodeBase>,
-        public readonly oldTarget: SingleRef<INodeBase>
+        public readonly newReference: SingleRef<Node>,
+        public readonly oldReference: SingleRef<Node>
     ) {
     }
 }

package/src/deserializer.ts

@@ -19,8 +19,8 @@ import {
     Classifier,
     consoleProblemReporter,
     Containment,
-    defaultLionWebVersion,
     Enumeration,
+    LionWebVersions,
     MemoisingSymbolTable,
     PrimitiveType,
     ProblemReporter,
@@ -61,7 +61,7 @@ export type RootsWithIdMapping = { roots: INodeBase[], idMapping: IdMapping };
  */
 export type DeserializerConfiguration = {
     // FIXME  parametrize (optionally) in LionWebVersion
-    /** Default: {@code lioncoreBuiltinsFacade.propertyValueDeserializer}. */
+    /** Default: `lioncoreBuiltinsFacade.propertyValueDeserializer`. */
     propertyValueDeserializer?: PropertyValueDeserializer,
     /** Default: {@link consoleProblemReporter}. */
     problemReporter?: ProblemReporter
@@ -83,8 +83,8 @@ function nodeBaseDeserializerWithIdMapping(languageBases: ILanguageBase[], recei
 function nodeBaseDeserializerWithIdMapping(configuration: FactoryConfiguration & DeserializerConfiguration): Deserializer<RootsWithIdMapping>;
 function nodeBaseDeserializerWithIdMapping(languageBasesOrConfiguration: ILanguageBase[] | (FactoryConfiguration & DeserializerConfiguration), mayBeReceiveDelta?: DeltaReceiver): Deserializer<RootsWithIdMapping> {
     const [languageBases, receiveDelta, propertyValueDeserializer, problemReporter] = Array.isArray(languageBasesOrConfiguration)
-        ? [languageBasesOrConfiguration, mayBeReceiveDelta, defaultLionWebVersion.builtinsFacade.propertyValueDeserializer, consoleProblemReporter]
-        : [languageBasesOrConfiguration.languageBases, languageBasesOrConfiguration.receiveDelta, languageBasesOrConfiguration.propertyValueDeserializer ?? defaultLionWebVersion.builtinsFacade.propertyValueDeserializer, languageBasesOrConfiguration.problemReporter ?? languageBasesOrConfiguration.problemsHandler ?? consoleProblemReporter];
+        ? [languageBasesOrConfiguration, mayBeReceiveDelta, LionWebVersions.v2023_1.builtinsFacade.propertyValueDeserializer, consoleProblemReporter]
+        : [languageBasesOrConfiguration.languageBases, languageBasesOrConfiguration.receiveDelta, languageBasesOrConfiguration.propertyValueDeserializer ?? LionWebVersions.v2023_1.builtinsFacade.propertyValueDeserializer, languageBasesOrConfiguration.problemReporter ?? languageBasesOrConfiguration.problemsHandler ?? consoleProblemReporter];
 
     const symbolTable = new MemoisingSymbolTable(languageBases.map(({language}) => language));
     const languageBaseFor = combinedLanguageBaseLookupFor(languageBases);

package/src/id-mapping.ts

@@ -15,17 +15,17 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { referenceToSet, SingleRef } from "@lionweb/core"
+import { Node, referenceToSet, SingleRef } from "@lionweb/core"
 import { LionWebId } from "@lionweb/json"
 
-import { INodeBase } from "./base-types.js"
+import { INodeBase, NodeBase } from "./base-types.js"
 import { IdOrNull } from "./references.js"
 
 
 /**
- * Type def. for a (hash-)map {@link LionWebId ID} → {@link INodeBase}.
+ * Type def. for a (hash-)map {@link LionWebId ID} → {@link Node}.
  */
-type NodesById = { [id: LionWebId]: INodeBase }
+type NodesById = { [id: LionWebId]: Node }
 
 
 /**
@@ -39,13 +39,13 @@ export class IdMapping {
     constructor(nodesById: NodesById) {
         this.nodesById = {...nodesById};
     }
-    // TODO  consider using an instance of Map<Id, INodeBase> instead
+    // TODO  consider using an instance of Map<Id, Node> instead
 
     /**
-     * @return the {@link INodeBase node} with the given {@link LionWebId `id`}, or
+     * @return the {@link Node node} with the given {@link LionWebId `id`}, or
      * @throws an Error if no node with the given ID was registered.
      */
-    fromId = (id: LionWebId): INodeBase => {
+    fromId = (id: LionWebId): Node => {
         if (!(id in this.nodesById)) {
             throw new Error(`node with id=${id} not in ID mapping`);
         }
@@ -53,17 +53,30 @@ export class IdMapping {
     }
 
     /**
-     * @return the {@link INodeBase node} with the given {@link LionWebId `id`},
+     * @return the {@link INodeBase node} with the given {@link LionWebId `id`}, or
+     * @throws an Error if no node with the given ID was registered, or
+     * if the node is not a {@link INodeBase}.
+     */
+    nodeBaseFromId = (id: LionWebId): INodeBase => {
+        const node = this.fromId(id);
+        if (node instanceof NodeBase) {
+            return node;
+        }
+        throw new Error(`node with id=${id} is not a[n I]NodeBase`)
+    }
+
+    /**
+     * @return the {@link Node node} with the given {@link LionWebId `id`},
      * or `undefined` if no node with the given ID was registered.
      */
-    tryFromId = (id: LionWebId): (INodeBase | undefined) =>
+    tryFromId = (id: LionWebId): (Node | undefined) =>
         this.nodesById[id];
 
     /**
-     * @return the {@link INodeBase node} referenced from the given {@link LionWebId ID},
+     * @return the {@link Node node} referenced from the given {@link LionWebId ID},
      * or `unresolved` if `unresolved` was passed in or no node with the given ID was registered.
      */
-    fromRefId = (idOrNull: IdOrNull): SingleRef<INodeBase> =>
+    fromRefId = (idOrNull: IdOrNull): SingleRef<Node> =>
         idOrNull === null
             ? referenceToSet()
             : (this.nodesById[idOrNull] ?? referenceToSet());
@@ -71,10 +84,12 @@ export class IdMapping {
     /**
      * Updates this {@link IdMapping} with the given `node` *and all its descendants* (recursively).
      */
-    updateWith = (node: INodeBase) => {
+    updateWith = (node: Node) => {
         this.nodesById[node.id] = node;
-        node.children   // recurse into all children
-            .forEach((child) => this.updateWith(child));
+        if (node instanceof NodeBase) {
+            node.children   // recurse into all children
+                .forEach((child) => this.updateWith(child));
+        }
         // TODO  figure out when it's really necessary to call this, as it's potentially *very* expensive
     }
 

package/src/references.ts

@@ -15,11 +15,9 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { isUnresolvedReference, SingleRef } from "@lionweb/core"
+import { isUnresolvedReference, Node, SingleRef } from "@lionweb/core"
 import { LionWebId } from "@lionweb/json"
 
-import { INodeBase } from "./base-types.js"
-
 
 /**
  * A type that expresses a value is either an {@link LionWebId} or a value to indicate that resolution to a node previously failed.
@@ -28,8 +26,8 @@ export type IdOrNull = LionWebId | null
 
 
 /**
- * @return the ID of a given reference to a {@link INodeBase}, or `null` if that reference was previously unresolved.
+ * @return the ID of a given reference to a {@link Node}, or `null` if that reference was previously unresolved.
  */
-export const idFrom = (ref: SingleRef<INodeBase>): IdOrNull =>
+export const idFrom = (ref: SingleRef<Node>): IdOrNull =>
     isUnresolvedReference(ref) ? null : ref.id
 

package/src/serializer.ts

@@ -16,12 +16,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {
+    allLionWebVersions,
     allSuperTypesOf,
     Containment,
-    defaultLionWebVersion,
     Enumeration,
     Feature,
     isUnresolvedReference,
+    LionWebVersions,
+    Node,
     PrimitiveType,
     Property,
     PropertyValueSerializer,
@@ -31,7 +33,7 @@ import {
     serializerWith
 } from "@lionweb/core"
 
-import { INodeBase, LionCore_builtinsBase } from "./index.js"
+import { INodeBase, LionCore_builtinsBase, NodeBase } from "./index.js"
 
 
 /**
@@ -55,7 +57,7 @@ export const getFeatureValue = (node: INodeBase, feature: Feature) => {
  * A {@link ResolveInfoDeducer} that works on {@link INodeBase}s.
  * *Note*: the {@link Reference} passed is not taken into account (yet).
  */
-const nodeBaseResolveInfoDeducer: ResolveInfoDeducer<INodeBase> = (node, _reference) => {
+const nodeBaseResolveInfoDeducer: ResolveInfoDeducer<Node> = (node, _reference) => {
     // TODO  put innards in separate function
     if ("name" in node) {
         // evaluating `node.name` might cause an error through FeatureValueManager.throwOnReadOfUnset:
@@ -66,12 +68,16 @@ const nodeBaseResolveInfoDeducer: ResolveInfoDeducer<INodeBase> = (node, _refere
             return undefined;
         }
     }
-    const allSupertypes = allSuperTypesOf(node.classifier);
-    if (allSupertypes.indexOf(defaultLionWebVersion.builtinsFacade.classifiers.inamed) > -1) {
-        return node.getPropertyValueManager(defaultLionWebVersion.builtinsFacade.features.inamed_name).getDirectly() as (string | undefined);
-    }
-    if (allSupertypes.indexOf(LionCore_builtinsBase.INSTANCE.INamed) > -1) {
-        return node.getPropertyValueManager(LionCore_builtinsBase.INSTANCE.INamed_name).getDirectly() as (string | undefined);
+    if (node instanceof NodeBase) {
+        const allSupertypes = allSuperTypesOf(node.classifier);
+        allLionWebVersions.forEach((lionWebVersion) => {
+            if (allSupertypes.indexOf(lionWebVersion.builtinsFacade.classifiers.inamed) > -1) {
+                return node.getPropertyValueManager(lionWebVersion.builtinsFacade.features.inamed_name).getDirectly() as (string | undefined);
+            }
+        })
+        if (allSupertypes.indexOf(LionCore_builtinsBase.INSTANCE.INamed) > -1) {
+            return node.getPropertyValueManager(LionCore_builtinsBase.INSTANCE.INamed_name).getDirectly() as (string | undefined);
+        }
     }
     return undefined;
 };
@@ -80,7 +86,7 @@ const nodeBaseResolveInfoDeducer: ResolveInfoDeducer<INodeBase> = (node, _refere
  * A {@link Reader} that works on/for {@link INodeBase}s specifically.
  * **Note** that this function is for internal use only!
  */
-export const nodeBaseReader: Reader<INodeBase> = {
+export const nodeBaseReader: Reader<INodeBase, Node> = {
     classifierOf: (node) => node.classifier,
     getFeatureValue,
     enumerationLiteralFrom: (encoding, enumeration) => {
@@ -109,7 +115,7 @@ type PropertyValueSerializerConfiguration = Partial<{
  * Unrecoverable issues are passed to the optional `reportIssue` argument, and
  */
 export const propertyValueSerializerWith = (configuration?: PropertyValueSerializerConfiguration) => {
-    const primitiveValueSerializer = configuration?.primitiveValueSerializer ?? defaultLionWebVersion.builtinsFacade.propertyValueSerializer
+    const primitiveValueSerializer = configuration?.primitiveValueSerializer ?? LionWebVersions.v2023_1.builtinsFacade.propertyValueSerializer
     const reportIssue = configuration?.reportIssue ?? ((message) => { throw new Error(message) })
     return {
         serializeValue: (value: unknown, property: Property) => {

package/src/textualizer.ts

@@ -21,6 +21,7 @@ import {
     Feature,
     isUnresolvedReference,
     Link,
+    Node,
     Property,
     Reference,
     UnresolvedReference
@@ -53,12 +54,29 @@ const asINodeBases = (value: INodeBaseOrNotThere | INodeBaseOrNotThere[]): INode
     return []
 }
 
+type NodeOrNotThere = Node | UnresolvedReference | undefined
+
+const asNodes = (value: NodeOrNotThere | NodeOrNotThere[]): Node[] => {
+    const isNode = (value: NodeOrNotThere): value is Node =>
+        !(value === undefined || isUnresolvedReference(value))
+
+    if (Array.isArray(value)) {
+        return value
+            .filter((subValue) => isNode(subValue))
+            .map((subValue) => subValue as Node)
+    }
+    if (isNode(value)) {
+        return [value]
+    }
+    return []
+}
+
 
 /**
  * @return a function that renders the roots of a given forest of {@link INodeBase nodes} in a textual tree-representation.
  * @param identificationFor a function that renders an identification for the given {@link INodeBase node} — typically its name or its ID.
  */
-export const asTreeTextWith = (identificationFor: (node: INodeBase) => string): ((nodes: INodeBase[]) => string) => {
+export const asTreeTextWith = (identificationFor: (node: Node) => string): ((nodes: INodeBase[]) => string) => {
 
     const asText = (node: INodeBase): Template => {
         const featureValueAsText = (feature: Feature) => {
@@ -87,7 +105,7 @@ export const asTreeTextWith = (identificationFor: (node: INodeBase) => string):
             }
             if (feature instanceof Reference) {
                 const valueManager= node.getReferenceValueManager(feature)
-                const references = asINodeBases(valueManager.getDirectly())
+                const references = asNodes(valueManager.getDirectly())
                 return [
                     `${feature.name} -> ${references.length === 0 ? nothing : references.map(identificationFor).join(", ")}`
                 ]

package/src/value-managers/references.ts

@@ -15,7 +15,7 @@
 // SPDX-FileCopyrightText: 2025 TRUMPF Laser SE and other contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { MultiRef, Reference, SingleRef } from "@lionweb/core"
+import { MultiRef, Node, Reference, SingleRef } from "@lionweb/core"
 import { action, observable } from "mobx"
 
 import { INodeBase } from "../base-types.js"
@@ -26,7 +26,7 @@ import { checkIndex, FeatureValueManager } from "./base.js"
 /**
  * An instance manages the value of a particular reference feature on a particular instance of a classifier.
  */
-export abstract class ReferenceValueManager<T extends INodeBase> extends FeatureValueManager<Reference> {
+export abstract class ReferenceValueManager<T extends Node> extends FeatureValueManager<Reference> {
 
     get reference(): Reference {
         return this.feature;
@@ -44,7 +44,7 @@ export abstract class ReferenceValueManager<T extends INodeBase> extends Feature
 }
 
 
-export abstract class SingleReferenceValueManager<T extends INodeBase> extends ReferenceValueManager<T> {
+export abstract class SingleReferenceValueManager<T extends Node> extends ReferenceValueManager<T> {
 
     protected constructor(reference: Reference, container: INodeBase) {
         super(reference, container);
@@ -72,7 +72,7 @@ export abstract class SingleReferenceValueManager<T extends INodeBase> extends R
 }
 
 
-export class OptionalSingleReferenceValueManager<T extends INodeBase> extends SingleReferenceValueManager<T> {
+export class OptionalSingleReferenceValueManager<T extends Node> extends SingleReferenceValueManager<T> {
 
     constructor(reference: Reference, container: INodeBase) {
         super(reference, container);
@@ -109,7 +109,7 @@ export class OptionalSingleReferenceValueManager<T extends INodeBase> extends Si
 }
 
 
-export class RequiredSingleReferenceValueManager<T extends INodeBase> extends SingleReferenceValueManager<T> {
+export class RequiredSingleReferenceValueManager<T extends Node> extends SingleReferenceValueManager<T> {
 
     constructor(reference: Reference, container: INodeBase) {
         super(reference, container);
@@ -145,7 +145,7 @@ export class RequiredSingleReferenceValueManager<T extends INodeBase> extends Si
 }
 
 
-export abstract class MultiReferenceValueManager<T extends INodeBase> extends ReferenceValueManager<T> {
+export abstract class MultiReferenceValueManager<T extends Node> extends ReferenceValueManager<T> {
 
     protected constructor(reference: Reference, container: INodeBase) {
         super(reference, container);
@@ -233,7 +233,7 @@ export abstract class MultiReferenceValueManager<T extends INodeBase> extends Re
 }
 
 
-export class OptionalMultiReferenceValueManager<T extends INodeBase> extends MultiReferenceValueManager<T> {
+export class OptionalMultiReferenceValueManager<T extends Node> extends MultiReferenceValueManager<T> {
 
     constructor(reference: Reference, container: INodeBase) {
         super(reference, container);
@@ -250,7 +250,7 @@ export class OptionalMultiReferenceValueManager<T extends INodeBase> extends Mul
 }
 
 
-export class RequiredMultiReferenceValueManager<T extends INodeBase> extends MultiReferenceValueManager<T> {
+export class RequiredMultiReferenceValueManager<T extends Node> extends MultiReferenceValueManager<T> {
 
     constructor(reference: Reference, container: INodeBase) {
         super(reference, container);