@accordproject/concerto-metamodel - npm Package Compare versions

Comparing version 3.10.1-20240704182918 to 3.10.1-20240924182744

lib/metamodelutil.js

@@ -129,2 +129,7 @@ /*
 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) {
@@ -149,13 +154,4 @@ case `${MetaModelNamespace}.Model`: {
         });
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
     }
         break;
-    case `${MetaModelNamespace}.EnumDeclaration`: {
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
-    }
-        break;
     case `${MetaModelNamespace}.MapDeclaration`: {
@@ -166,12 +162,2 @@ resolveTypeNames(metaModel.key, 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`: {
@@ -183,13 +169,9 @@ (metaModel.arguments || []).forEach((argument) => {
         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);
-        });
     }
@@ -204,5 +186,2 @@ break;
         metaModel.namespace = resolveName(metaModel.name, table);
-        (metaModel.decorators || []).forEach((decorator) => {
-            resolveTypeNames(decorator, table);
-        });
     }
@@ -209,0 +188,0 @@ break;

package.json

 {
   "name": "@accordproject/concerto-metamodel",
-  "version": "3.10.1-20240704182918",
+  "version": "3.10.1-20240924182744",
   "description": "Concerto metamodel utilities",
@@ -5,0 +5,0 @@ "homepage": "https://github.com/accordproject/concerto",

No alert changes

Improved metrics

Total package byte prevSize

182384

increased by1.04%

Number of package files

34

increased by6.25%

Lines of code

1857

increased by4.44%

No dependency changes