feat(aliasing): getImportedType() in model Flle in aliasing (#890)

* feat(i889): added the api

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>

* feat(i889): added unit test-cases

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>

* feat(i889): api.txt and changelog updated

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>

* feat(i889): converage updated

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>

* feat(alias import): function renamed

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>

* feat(api):changelog updated

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>

---------

Signed-off-by: Jaskeerat Singh Saluja <[email protected]>
Co-authored-by: Jaskeerat Singh Saluja <[email protected]>

Author: salujajaskeerat

packages/concerto-core/api.txt

@@ -214,6 +214,7 @@ class ModelFile extends Decorated {
    + ModelManager getModelManager() 
    + string[] getImports() 
    ~ void validate() throws IllegalModelException
+   + string getImportedType(string) 
    + boolean isDefined(string) 
    + ClassDeclaration getLocalType(string) 
    + AssetDeclaration getAssetDeclaration(string) 

packages/concerto-core/changelog.txt

@@ -24,6 +24,9 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
+Version 3.17.4 {8cb49c7092c48b568da3b0a3eeab2777} 2024-08-01
+- Added api getImportedType() in modeFile
+
 Version 3.17.3 {1c15de121dd80375cf531bc2244efdd0} 2024-07-26
 - Added new methods to extract vocab or non-vocab decorators from model
 - Fixed some minor bugs related to vocabulary parsing

packages/concerto-core/lib/introspect/modelfile.js

@@ -389,6 +389,16 @@ class ModelFile extends Decorated {
         }),this);
     }
 
+    /**
+     * Returns the actual imported name from another namespace
+     * @param {string} type - the short name of the type
+     * @returns {string} - the actual imported name. If not aliased then returns the same string
+     */
+    getImportedType(type) {
+        let fqn = this.resolveImport(type);
+        return fqn.split('.').pop();
+    }
+
     /**
      * Returns true if the type is defined in the model file
      * @param {string} type the name of the type

packages/concerto-core/test/introspect/modelfile.js

@@ -680,7 +680,7 @@ describe('ModelFile', () => {
             const model2 = `
             namespace org.acme
             import org.saluja.{Student as stud}
-            
+
             map StudMap{
             o DateTime
             o stud
@@ -695,17 +695,17 @@ describe('ModelFile', () => {
         it('should not throw if declaration is extended on a aliased type declaration', () => {
             const model1 = `
             namespace org.saluja
-            
+
             scalar nickname extends String
             asset Vehicle identified by serialno {
                 o String serialno
             }`;
             const model2 = `
             namespace org.acme
             import org.saluja.{Vehicle as V,nickname as nk}
-            
+
             asset Car extends V{
-                o String company 
+                o String company
                 o nk shortname
             }`;
             modelManager.enableMapType = true;
@@ -714,6 +714,30 @@ describe('ModelFile', () => {
             let modelFile2 = ParserUtil.newModelFile(modelManager, model2);
             (() => modelFile2.validate()).should.not.throw();
         });
+
+        it('should return the actual type name of the imported type', () => {
+            const model1 = `
+            namespace org.example1
+
+            scalar nickname extends String
+            asset Vehicle identified by serialno {
+                o String serialno
+            }`;
+            const model2 = `
+            namespace org.example2
+            import org.example1.{Vehicle as V,nickname}
+
+            asset Car extends V{
+                o String company
+                o nickname shortname
+            }`;
+            modelManager.enableMapType = true;
+            let modelFile1 = ParserUtil.newModelFile(modelManager, model1);
+            modelManager.addModelFile(modelFile1);
+            let modelFile2 = ParserUtil.newModelFile(modelManager, model2);
+            modelFile2.getImportedType('V').should.equal('Vehicle');
+            modelFile2.getImportedType('nickname').should.equal('nickname');
+        });
     });
 
 

packages/concerto-core/types/lib/introspect/modelfile.d.ts

@@ -120,6 +120,12 @@ declare class ModelFile extends Decorated {
      * @private
      */
     private resolveImport;
+    /**
+     * Returns the actual imported name from another namespace
+     * @param {string} type - the short name of the type
+     * @returns {string} - the actual imported name. If not aliased then returns the same string
+     */
+    getImportedType(type: string): string;
     /**
      * Returns true if the type is defined in the model file
      * @param {string} type the name of the type