fix(ts-model-api): INodeJS argument types are more restrictive now

BREAKING CHANGE: methods of INodeJS don't allow strings for roles anymore

Author: abstraktor

model-api-gen-gradle-test/typescript-generation/package-lock.json

@@ -1,9 +1,10 @@
 import { useFakeNode } from "./test-helpers";
+import { toRoleJS } from "@modelix/ts-model-api";
 
 test("typed nodes can be removed", () => {
   const { typedNode, rootNode } = useFakeNode();
-  expect(rootNode.getChildren("children1")).toHaveLength(1);
+  expect(rootNode.getChildren(toRoleJS("children1"))).toHaveLength(1);
 
   typedNode.remove();
-  expect(rootNode.getChildren("children1")).toHaveLength(0);
+  expect(rootNode.getChildren(toRoleJS("children1"))).toHaveLength(0);
 });

model-api-gen-gradle-test/typescript-generation/src/node.test.ts

@@ -1,5 +1,5 @@
 import { org } from "@modelix/model-client";
-import type { ITypedNode} from "@modelix/ts-model-api";
+import { type ITypedNode, toRoleJS } from "@modelix/ts-model-api";
 import { LanguageRegistry } from "@modelix/ts-model-api";
 import { registerLanguages } from "../build/typescript_src";
 
@@ -27,7 +27,7 @@ export function useFakeRootNode(nodeData: object = DEFAULT_NODE_DATA) {
   );
 
   function getUntypedNode(role: string = "children1") {
-    return rootNode.getChildren(role)[0];
+    return rootNode.getChildren(toRoleJS(role))[0];
   }
 
   function getTypedNode<T extends ITypedNode>(role?: string) {

model-api-gen-gradle-test/typescript-generation/src/test-helpers.ts

@@ -1,4 +1,5 @@
 import { useModelsFromJson } from "@modelix/vue-model-api";
+import { toRoleJS } from "@modelix/ts-model-api";
 import { computed } from "vue";
 import { registerLanguages } from "typescript-generation";
 import type { BaseConcept } from "typescript-generation/dist/L_jetbrains_mps_lang_core";
@@ -36,7 +37,9 @@ test("change to property is reactivly updated", () => {
     },
   };
 
-  const untypedNode = useRootNode(nodeData).getChildren("children1")[0];
+  const untypedNode = useRootNode(nodeData).getChildren(
+    toRoleJS("children1"),
+  )[0];
   const typedNode = LanguageRegistry.INSTANCE.wrapNode(untypedNode);
   if (!isOfConcept_INamedConcept(typedNode)) {
     fail(`${typedNode} should be a ${C_INamedConcept}`);
@@ -78,7 +81,9 @@ test("change to children is reactivly updated", () => {
       ],
     },
   };
-  const untypedNode = useRootNode(nodeData).getChildren("children1")[0];
+  const untypedNode = useRootNode(nodeData).getChildren(
+    toRoleJS("children1"),
+  )[0];
   const baseConcept = LanguageRegistry.INSTANCE.wrapNode(
     untypedNode,
   ) as BaseConcept;
@@ -119,10 +124,10 @@ test("change to reference is reactivly updated", () => {
   };
   const rootNode = useRootNode(nodeData);
   const staticFieldReference = LanguageRegistry.INSTANCE.wrapNode(
-    rootNode.getChildren("staticFieldReferences")[0],
+    rootNode.getChildren(toRoleJS("staticFieldReferences"))[0],
   ) as StaticFieldReference;
   const classifier = LanguageRegistry.INSTANCE.wrapNode(
-    rootNode.getChildren("classifiers")[0],
+    rootNode.getChildren(toRoleJS("classifiers"))[0],
   ) as Classifier;
 
   const computedClassifierName = computed(

model-api-gen-gradle-test/vue-integration/src/intergration.test.ts renamed to model-api-gen-gradle-test/vue-integration/src/integration.test.ts

@@ -93,6 +93,7 @@ class TypescriptMMGenerator(val outputDir: Path, val nameConfig: NameConfig = Na
                 GeneratedLanguage,
                 IConceptJS,
                 INodeJS,
+                toRoleJS,
                 ITypedNode,
                 SingleChildAccessor,
                 TypedNode,
@@ -132,10 +133,10 @@ class TypescriptMMGenerator(val outputDir: Path, val nameConfig: NameConfig = Na
                         IPropertyReference.fromIdAndName(feature.uid, feature.originalName).stringForLegacyApi()
                     val rawPropertyText = """
                         public set $rawValueName(value: string | undefined) {
-                            this._node.setPropertyValue("$stringForLegacyApi", value)
+                            this._node.setPropertyValue(toRoleJS("$stringForLegacyApi"), value)
                         }
                         public get $rawValueName(): string | undefined {
-                            return this._node.getPropertyValue("$stringForLegacyApi")
+                            return this._node.getPropertyValue(toRoleJS("$stringForLegacyApi"))
                         }
                     """
                     val typedPropertyText = if (feature.type is PrimitivePropertyType) {
@@ -190,10 +191,10 @@ class TypescriptMMGenerator(val outputDir: Path, val nameConfig: NameConfig = Na
                         IReferenceLinkReference.fromIdAndName(feature.uid, feature.originalName).stringForLegacyApi()
                     """
                     public set ${feature.generatedName}(value: $entityType | undefined) {
-                        this._node.setReferenceTargetNode("$stringForLegacyApi", value?.unwrap());
+                        this._node.setReferenceTargetNode(toRoleJS("$stringForLegacyApi"), value?.unwrap());
                     }
                     public get ${feature.generatedName}(): $entityType | undefined {
-                        let target = this._node.getReferenceTargetNode("$stringForLegacyApi");
+                        let target = this._node.getReferenceTargetNode(toRoleJS("$stringForLegacyApi"));
                         return target ? LanguageRegistry.INSTANCE.wrapNode(target) as $entityType : undefined;
                     }
                     """
@@ -205,7 +206,7 @@ class TypescriptMMGenerator(val outputDir: Path, val nameConfig: NameConfig = Na
                     val stringForLegacyApi =
                         IChildLinkReference.fromIdAndName(feature.uid, feature.originalName).stringForLegacyApi()
                     """
-                        public ${feature.generatedName}: $accessorClassName<$languagePrefix${typeRef.nodeWrapperInterfaceName()}> = new $accessorClassName(this._node, "$stringForLegacyApi")
+                        public ${feature.generatedName}: $accessorClassName<$languagePrefix${typeRef.nodeWrapperInterfaceName()}> = new $accessorClassName(this._node, toRoleJS("$stringForLegacyApi"))
                     """
                 }
                 else -> ""