fix(resolve): resolve namespace for decorators on primitives

Signed-off-by: Dan Selman <[email protected]>
accordproject · Sep 24, 2024 · d3ad372 · d3ad372
1 parent 2ef8348
commit d3ad372
Show file tree

Hide file tree

Showing 8 changed files with 366 additions and 30 deletions.
diff --git a/categories.json b/categories.json
@@ -0,0 +1,24 @@
+{
+  "$class": "[email protected]",
+  "decorators": [],
+  "namespace": "[email protected]",
+  "imports": [],
+  "declarations": [
+    {
+      "$class": "[email protected]",
+      "name": "Category",
+      "isAbstract": true,
+      "properties": []
+    },
+    {
+      "$class": "[email protected]",
+      "name": "Engineering",
+      "isAbstract": false,
+      "properties": [],
+      "superType": {
+        "$class": "[email protected]",
+        "name": "Category"
+      }
+    }
+  ]
+}
diff --git a/decorators.json b/decorators.json
@@ -0,0 +1,79 @@
+{
+  "$class": "[email protected]",
+  "decorators": [],
+  "namespace": "[email protected]",
+  "imports": [
+    {
+      "$class": "[email protected]",
+      "namespace": "[email protected]",
+      "types": [
+        "Engineering"
+      ]
+    }
+  ],
+  "declarations": [
+    {
+      "$class": "[email protected]",
+      "name": "Car",
+      "isAbstract": false,
+      "properties": [
+        {
+          "$class": "[email protected]",
+          "name": "part",
+          "type": {
+            "$class": "[email protected]",
+            "name": "Part"
+          },
+          "isArray": false,
+          "isOptional": false
+        }
+      ]
+    },
+    {
+      "$class": "[email protected]",
+      "name": "Part",
+      "isAbstract": true,
+      "properties": [
+        {
+          "$class": "[email protected]",
+          "name": "name",
+          "isArray": false,
+          "isOptional": false,
+          "decorators": [
+            {
+              "$class": "[email protected]",
+              "name": "category",
+              "arguments": [
+                {
+                  "$class": "[email protected]",
+                  "type": {
+                    "$class": "[email protected]",
+                    "name": "Engineering"
+                  },
+                  "isArray": false
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "$class": "[email protected]",
+      "name": "Wheel",
+      "isAbstract": false,
+      "properties": [
+        {
+          "$class": "[email protected]",
+          "name": "diameter",
+          "isArray": false,
+          "isOptional": false
+        }
+      ],
+      "superType": {
+        "$class": "[email protected]",
+        "name": "Part"
+      }
+    }
+  ]
+}
diff --git a/lib/metamodelutil.js b/lib/metamodelutil.js
@@ -126,6 +126,11 @@ function resolveName(name, table) {
  * @return {object} the metamodel with fully qualified names
  */
 function resolveTypeNames(metaModel, table) {
+    // any element can have a decorator (including primitive fields) , so lets resolve those first
+    (metaModel.decorators || []).forEach((decorator) => {
+        resolveTypeNames(decorator, table);
+    });
+
     switch (metaModel.$class) {
     case `${MetaModelNamespace}.Model`: {
         (metaModel.declarations || []).forEach((decl) => {
@@ -145,49 +150,26 @@ function resolveTypeNames(metaModel, table) {
         (metaModel.properties || []).forEach((property) => {
             resolveTypeNames(property, table);
         });
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
-    }
-        break;
-    case `${MetaModelNamespace}.EnumDeclaration`: {
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
     }
         break;
     case `${MetaModelNamespace}.MapDeclaration`: {
         resolveTypeNames(metaModel.key, table);
         resolveTypeNames(metaModel.value, table);
     }
         break;
-    case `${MetaModelNamespace}.EnumProperty`:
-    case `${MetaModelNamespace}.ObjectProperty`:
-    case `${MetaModelNamespace}.RelationshipProperty`: {
-        const name = metaModel.type.name;
-        metaModel.type.namespace = resolveName(name, table);
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
-    }
-        break;
     case `${MetaModelNamespace}.Decorator`: {
         (metaModel.arguments || []).forEach((argument) => {
             resolveTypeNames(argument, table);
         });
     }
         break;
-    case `${MetaModelNamespace}.DecoratorTypeReference`: {
-        const name = metaModel.type.name;
-        metaModel.type.namespace = resolveName(name, table);
-    }
-        break;
+    case `${MetaModelNamespace}.EnumProperty`:
+    case `${MetaModelNamespace}.ObjectProperty`:
+    case `${MetaModelNamespace}.RelationshipProperty`:
+    case `${MetaModelNamespace}.DecoratorTypeReference`:
     case `${MetaModelNamespace}.ObjectMapKeyType`:
     case `${MetaModelNamespace}.ObjectMapValueType`: {
         metaModel.type.namespace = resolveName(metaModel.type.name, table);
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
     }
         break;
     case `${MetaModelNamespace}.StringScalar`:
@@ -197,9 +179,6 @@ function resolveTypeNames(metaModel, table) {
     case `${MetaModelNamespace}.LongScalar`:
     case `${MetaModelNamespace}.IntegerScalar`: {
         metaModel.namespace = resolveName(metaModel.name, table);
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
     }
         break;
     }

diff --git a/test/cto/categories.cto b/test/cto/categories.cto
@@ -0,0 +1,4 @@
+namespace [email protected]
+
+abstract concept Category {}
+concept Engineering extends Category {}
diff --git a/test/cto/decorators.cto b/test/cto/decorators.cto
@@ -0,0 +1,16 @@
+namespace [email protected]
+
+import [email protected].{Engineering}
+
+concept Car {
+  o Part part
+}
+
+abstract concept Part {
+  @category(Engineering)
+  o String name 
+}
+
+concept Wheel extends Part {
+  o Double diameter
+}
diff --git a/test/cto/decorators.json b/test/cto/decorators.json
@@ -0,0 +1,108 @@
+{
+  "$class": "[email protected]",
+  "models": [
+    {
+      "$class": "[email protected]",
+      "decorators": [],
+      "namespace": "[email protected]",
+      "imports": [],
+      "declarations": [
+        {
+          "$class": "[email protected]",
+          "name": "Category",
+          "isAbstract": true,
+          "properties": []
+        },
+        {
+          "$class": "[email protected]",
+          "name": "Engineering",
+          "isAbstract": false,
+          "properties": [],
+          "superType": {
+            "$class": "[email protected]",
+            "name": "Category"
+          }
+        }
+      ]
+    },
+    {
+      "$class": "[email protected]",
+      "decorators": [],
+      "namespace": "[email protected]",
+      "imports": [
+        {
+          "$class": "[email protected]",
+          "namespace": "[email protected]",
+          "types": [
+            "Engineering"
+          ]
+        }
+      ],
+      "declarations": [
+        {
+          "$class": "[email protected]",
+          "name": "Car",
+          "isAbstract": false,
+          "properties": [
+            {
+              "$class": "[email protected]",
+              "name": "part",
+              "type": {
+                "$class": "[email protected]",
+                "name": "Part"
+              },
+              "isArray": false,
+              "isOptional": false
+            }
+          ]
+        },
+        {
+          "$class": "[email protected]",
+          "name": "Part",
+          "isAbstract": true,
+          "properties": [
+            {
+              "$class": "[email protected]",
+              "name": "name",
+              "isArray": false,
+              "isOptional": false,
+              "decorators": [
+                {
+                  "$class": "[email protected]",
+                  "name": "category",
+                  "arguments": [
+                    {
+                      "$class": "[email protected]",
+                      "type": {
+                        "$class": "[email protected]",
+                        "name": "Engineering"
+                      },
+                      "isArray": false
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "$class": "[email protected]",
+          "name": "Wheel",
+          "isAbstract": false,
+          "properties": [
+            {
+              "$class": "[email protected]",
+              "name": "diameter",
+              "isArray": false,
+              "isOptional": false
+            }
+          ],
+          "superType": {
+            "$class": "[email protected]",
+            "name": "Part"
+          }
+        }
+      ]
+    }
+  ]
+}