feat(csharp,java): support aliasing imports (#115)

* feat(i114): updated the property type-resolution Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(csharp-alias-import): minor bug fixed - Earlier non-imported types gave error. Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(i114): test cases added and minor bug fixed Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(i114): Java visitor updated for aliased import Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(alias-import):updating changes Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(alias-import): Test cases for java-visitor added Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(import-alias): concerto-core version updated and minor changes Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(alias-import):Minor bug fixed Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> * feat(alias-import): Pr suggestions Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> --------- Signed-off-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local> Signed-off-by: Jaskeerat Singh Saluja <58400083+salujajaskeerat@users.noreply.github.com> Co-authored-by: Jaskeerat Singh Saluja <salujajaskeerat@Jaskeerats-MacBook-Pro.local>
accordproject · Sep 4, 2024 · e4968a6 · e4968a6
1 parent 15afc18
commit e4968a6
Show file tree

Hide file tree

Showing 7 changed files with 139 additions and 11 deletions.
diff --git a/lib/codegen/fromcto/csharp/csharpvisitor.js b/lib/codegen/fromcto/csharp/csharpvisitor.js
@@ -383,6 +383,10 @@ class CSharpVisitor {
             }
         } else if (!field.isPrimitive()) {
             let fqn = this.getDotNetNamespaceOfType(field.getFullyQualifiedTypeName(), field.getParent(), parameters);
+            const modelFile = field.getModelFile();
+            if (modelFile?.isImportedType(fieldType)) {
+                fieldType = modelFile.getImportedType(fieldType);
+            }
             fieldType = `${fqn}${fieldType}`;
         }
 

diff --git a/lib/codegen/fromcto/java/javavisitor.js b/lib/codegen/fromcto/java/javavisitor.js
@@ -267,9 +267,14 @@ class JavaVisitor {
         if(field.isArray()) {
             array = '[]';
         }
-
-        const fieldType = this.toJavaType(field.getType()) + array;
-
+        let fieldType = field.getType();
+        if (!ModelUtil.isPrimitiveType(fieldType)) {
+            const modelFile = field.getModelFile();
+            if (modelFile?.isImportedType(fieldType)) {
+                fieldType = modelFile.getImportedType(fieldType);
+            }
+        }
+        fieldType = this.toJavaType(fieldType) + array;
         const fieldName = field.getName();
         const getterName = 'get' + this.capitalizeFirstLetter(fieldName);
         const setterName = 'set' + this.capitalizeFirstLetter(fieldName);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,8 @@
         "webpack-cli": "4.9.1"
     },
     "dependencies": {
-        "@accordproject/concerto-core": "3.18.1",
+
+        "@accordproject/concerto-core": "3.19.0",
         "@accordproject/concerto-util": "3.18.1",
         "@accordproject/concerto-vocabulary": "3.18.1",
         "@openapi-contrib/openapi-schema-to-json-schema": "5.1.0",

diff --git a/test/codegen/codegen.js b/test/codegen/codegen.js
@@ -31,6 +31,7 @@ describe('codegen', function () {
 
     before(function() {
         process.env.ENABLE_MAP_TYPE = 'true'; // TODO Remove on release of MapType
+        process.env.IMPORT_ALIASING = 'true';
     });
 
     beforeEach(function() {

diff --git a/test/codegen/fromcto/csharp/csharpvisitor.js b/test/codegen/fromcto/csharp/csharpvisitor.js
@@ -785,6 +785,65 @@ public class SampleModel : Concept {
             file1.should.match(/public System.Guid otherThingId/);
             file1.should.match(/public string someOtherThingId/);
         });
+
+        it('should handle imported field which is aliased in a concept', () => {
+            const modelManager = new ModelManager({ importAliasing: true });
+            modelManager.addCTOModel(`
+            namespace org.example.basic
+            concept file{
+                o String name
+            }
+            `);
+            modelManager.addCTOModel(`
+            namespace org.example.complex
+            import org.example.basic.{file as f}
+
+            concept folder {
+                o String name
+                o f[] files
+            }
+            `);
+            csharpVisitor.visit(modelManager, { fileWriter });
+            const files = fileWriter.getFilesInMemory();
+            const file1 = files.get('org.example.basic.cs');
+            file1.should.match(/namespace org.example.basic;/);
+            file1.should.match(/class file : Concept/);
+            file1.should.match(/public string name { get; set; }/);
+
+            const file2 = files.get('org.example.complex.cs');
+            file2.should.match(/namespace org.example.complex;/);
+            file2.should.match(/using org.example.basic;/);
+            file2.should.match(/class folder : Concept/);
+            file2.should.match(/org.example.basic.file\[\] files/);
+        });
+
+        it('should handle imported field which extended in concept', () => {
+            const modelManager = new ModelManager({ importAliasing: true });
+            modelManager.addCTOModel(`
+            namespace org.example.basic
+            concept file{
+                o String name
+            }
+            `);
+            modelManager.addCTOModel(`
+            namespace org.example.complex
+            import org.example.basic.{file as f}
+
+            concept bigFile extends f{
+            }
+            `);
+            csharpVisitor.visit(modelManager, { fileWriter });
+            const files = fileWriter.getFilesInMemory();
+            const file1 = files.get('org.example.basic.cs');
+            file1.should.match(/namespace org.example.basic;/);
+            file1.should.match(/class file : Concept/);
+            file1.should.match(/public string name { get; set; }/);
+
+            const file2 = files.get('org.example.complex.cs');
+            file2.should.match(/namespace org.example.complex;/);
+            file2.should.match(/using org.example.basic;/);
+            file2.should.match(/public class bigFile : org.example.basic.file/);
+        });
     });
 
     describe('visit', () => {

diff --git a/test/codegen/fromcto/java/javavisitor.js b/test/codegen/fromcto/java/javavisitor.js
@@ -467,9 +467,10 @@ describe('JavaVisitor', function () {
 
             const mockField             = sinon.createStubInstance(Field);
             const getType               = sinon.stub();
+            const isImportedType        = sinon.stub();
 
             mockField.ast = { type: { name: 'Dummy Value'} };
-            mockField.getModelFile.returns({ getType: getType });
+            mockField.getModelFile.returns({ getType: getType, isImportedType: isImportedType });
 
             const mockMapDeclaration    = sinon.createStubInstance(MapDeclaration);
             const getKeyType            = sinon.stub();
@@ -481,6 +482,7 @@ describe('JavaVisitor', function () {
             getType.returns(mockMapDeclaration);
             getKeyType.returns('String');
             getValueType.returns('String');
+            isImportedType.returns(false);
             mockField.getName.returns('Map1');
             mockMapDeclaration.getName.returns('Map1');
             mockMapDeclaration.isMapDeclaration.returns(true);
@@ -582,6 +584,26 @@ describe('JavaVisitor', function () {
             param.fileWriter.writeLine.getCall(1).args.should.deep.equal([2, 'return this.Bob;']);
             param.fileWriter.writeLine.getCall(2).args.should.deep.equal([1, '}']);
         });
+
+        it('should write a line getting a field of type aliased import', () => {
+            // Document aliased as Doc
+            let mockField = sinon.createStubInstance(Field);
+            let mockModelFile = sinon.createStubInstance(ModelFile);
+
+            mockField.isField.returns(true);
+            mockField.isArray.returns(false);
+            mockField.getName.returns('Bob');
+            mockField.getType.returns('Doc');
+            mockField.getModelFile.returns(mockModelFile);
+            mockModelFile.isImportedType.returns(true);
+            mockModelFile.getImportedType.returns('Document');
+
+            javaVisit.visitField(mockField, Object.assign({}, param, { mode: 'getter' }));
+            param.fileWriter.writeLine.callCount.should.deep.equal(3);
+            param.fileWriter.writeLine.getCall(0).args.should.deep.equal([1, 'public Document getBob() {']);
+            param.fileWriter.writeLine.getCall(1).args.should.deep.equal([2, 'return this.Bob;']);
+            param.fileWriter.writeLine.getCall(2).args.should.deep.equal([1, '}']);
+        });
     });
 
     describe('visitEnumValueDeclaration', () => {