fix(aliasing): added new resolvedName property to typeIdentifier obje…

…ct for import aliased declrations (#36) * fix(aliasing): added new resolvedName property to typeIdentifier object for import aliased declrations Signed-off-by: sanketshevkar <[email protected]> * fix(aliasing): added new resolvedName property to typeIdentifier object for import aliased declrations Signed-off-by: sanketshevkar <[email protected]> --------- Signed-off-by: sanketshevkar <[email protected]>
accordproject · Jan 16, 2025 · 9a02b5b · 9a02b5b
1 parent 826a20c
commit 9a02b5b
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 71 deletions.
diff --git a/lib/metamodel.js b/lib/metamodel.js
diff --git a/lib/metamodel.json b/lib/metamodel.json
@@ -84,6 +84,12 @@
           "isArray": false,
           "isOptional": false
         },
+        {
+          "$class": "[email protected]",
+          "name": "resolvedName",
+          "isArray": false,
+          "isOptional": true
+        },
         {
           "$class": "[email protected]",
           "name": "namespace",
@@ -998,10 +1004,10 @@
       ]
     },
     {
-      "$class":"[email protected]",
-      "name":"AliasedType",
-      "isAbstract":false,
-      "properties":[
+      "$class": "[email protected]",
+      "name": "AliasedType",
+      "isAbstract": false,
+      "properties": [
         {
           "$class": "[email protected]",
           "name": "name",
@@ -1089,7 +1095,6 @@
         "name": "Import"
       }
     },
-
     {
       "$class": "[email protected]",
       "name": "Model",

diff --git a/lib/metamodelutil.js b/lib/metamodelutil.js
@@ -63,7 +63,7 @@ function createNameTable(priorModels, metaModel) {
         'Asset': {namespace: concertoNs, name: 'Asset'},
         'Participant': {namespace: concertoNs, name: 'Participant'},
         'Transaction': {namespace: concertoNs, name: 'Transaction'},
-        'Event': {namespace: concertoNs, name: 'Event'}
+        'Event': {namespace: concertoNs, name: 'Event'},
     };
 
     // First list the imported names in order (overriding as we go along)
@@ -89,7 +89,7 @@ function createNameTable(priorModels, metaModel) {
                 if (!findDeclaration(modelFile, type)) {
                     throw new Error(`Declaration ${type} in namespace ${namespace} not found`);
                 }
-                table[localName] = {namespace, name: type};
+                table[localName] = localName !== type ? {namespace, name: localName, resolvedName: type} : {namespace, name: type};
             });
         } else {
             (modelFile.declarations || []).forEach((decl) => {
@@ -147,6 +147,9 @@ function resolveTypeNames(metaModel, table) {
             const name = metaModel.superType.name;
             metaModel.superType.namespace = resolveName(name, table);
             metaModel.superType.name = table[name].name;
+            if (table[name]?.resolvedName) {
+                metaModel.superType.resolvedName = table[name].resolvedName;
+            }
         }
         (metaModel.properties || []).forEach((property) => {
             resolveTypeNames(property, table);
@@ -172,6 +175,9 @@ function resolveTypeNames(metaModel, table) {
     case `${MetaModelNamespace}.ObjectMapValueType`: {
         metaModel.type.namespace = resolveName(metaModel.type.name, table);
         metaModel.type.name = table[metaModel.type.name].name;
+        if (table[metaModel.type.name]?.resolvedName) {
+            metaModel.type.resolvedName = table[metaModel.type.name].resolvedName;
+        }
     }
         break;
     case `${MetaModelNamespace}.StringScalar`:
@@ -273,4 +279,4 @@ module.exports = {
     resolveLocalNamesForAll,
     importFullyQualifiedNames,
     getExternalImports,
-};
+};