Lionweb: test with more current language and model

Author: alessiostalla

src/interop/lionweb.ts

@@ -14,7 +14,18 @@ import {
     Node as LWNodeInterface,
     SerializationChunk
 } from "@lionweb/core";
-import {NodeAdapter, Issue, Node, NodeDefinition, Position, Feature, Point, pos, TraceNode} from "..";
+import {
+    NodeAdapter,
+    Issue,
+    Node,
+    NodeDefinition,
+    Position,
+    Feature,
+    Point,
+    pos,
+    TraceNode,
+    getNodeDefinition
+} from "..";
 import {STARLASU_LANGUAGE} from "./lionweb-starlasu-language";
 export {STARLASU_LANGUAGE} from "./lionweb-starlasu-language";
 
@@ -64,6 +75,9 @@ export class LanguageMapping {
     readonly classifiers = new Map<Classifier, any>();
 
     register(nodeType: any, classifier: Classifier) {
+        if (!classifier) {
+            throw new Error(`Can't register ${getNodeDefinition(nodeType)?.name}: not a classifier: ${classifier}`);
+        }
         this.nodeTypes.set(nodeType, classifier);
         this.classifiers.set(classifier, nodeType);
     }
@@ -190,8 +204,8 @@ export function findClassifier(language: Language, id: string) {
     return language.entities.find(e => e.id == id) as Classifier;
 }
 
-export const AST_NODE_CLASSIFIER = findClassifier(STARLASU_LANGUAGE, "com_strumenta_starlasu_ASTNode");
-STARLASU_LANGUAGE_MAPPING.register(Node, AST_NODE_CLASSIFIER)
+export const AST_NODE_CLASSIFIER = findClassifier(STARLASU_LANGUAGE, "com-strumenta-StarLasu-ASTNode-id");
+STARLASU_LANGUAGE_MAPPING.register(Node, AST_NODE_CLASSIFIER);
 
 function allFeatures(classifier: Classifier) {
     const features = [...classifier.features];

src/model/model.ts

@@ -184,12 +184,12 @@ export abstract class Node extends Origin implements Destination {
         return props[name]?.child ? props[name] : undefined;
     }
 
-    setChild(name: string, child: Node): void {
+    setChild(name: string | symbol, child: Node): void {
         const containment = this.containment(name);
         if(!containment) {
-            throw new Error("Not a containment: " + name);
+            throw this.notAContainment(name);
         } else if (containment.multiple) {
-            throw new Error(name + " is a collection, use addChild");
+            throw new Error(name.toString() + " is a collection, use addChild");
         }
         if(child.parent && child.parent != this) {
             throw new Error("Child already has a different parent");
@@ -200,12 +200,12 @@ export abstract class Node extends Origin implements Destination {
         this[name] = child.withParent(this);
     }
 
-    addChild(name: string, child: Node): void {
+    addChild(name: string | symbol, child: Node): void {
         const containment = this.containment(name);
         if(!containment) {
-            throw new Error("Not a containment: " + name);
+            throw this.notAContainment(name);
         } else if (!containment.multiple) {
-            throw new Error(name + " is not a collection, use setChild");
+            throw new Error(name.toString() + " is not a collection, use setChild");
         }
         if(child.parent && child.parent != this) {
             throw new Error("Child already has a different parent");
@@ -216,10 +216,14 @@ export abstract class Node extends Origin implements Destination {
         this[name].push(child.withParent(this));
     }
 
+    private notAContainment(name: string | symbol) {
+        return new Error(`Not a containment: ${name.toString()} of ${this.nodeDefinition?.name || "<unknown>"}`);
+    }
+
     getChild(name: string | symbol, index?: number): Node | undefined {
         const containment = this.containment(name);
         if(!containment) {
-            throw new Error("Not a containment: " + name.toString());
+            throw this.notAContainment(name);
         }
         const raw = this.doGetChildOrChildren(name);
         if (containment.multiple) {
@@ -271,7 +275,7 @@ export abstract class Node extends Origin implements Destination {
     getChildrenWithRole(name: string | symbol) {
         const containment = this.containment(name);
         if (!containment) {
-            throw new Error("Not a containment: " + name.toString());
+            throw this.notAContainment(name);
         }
         const raw = this.doGetChildOrChildren(name);
         if (containment.multiple) {