Merge branch 'main' into jonathan/codegen_map_golang

accordproject · Nov 7, 2023 · 47f2d18 · 47f2d18
2 parents f71bcbd + e3111a0
commit 47f2d18
Show file tree

Hide file tree

Showing 21 changed files with 2,253 additions and 3,204 deletions.
diff --git a/lib/codegen/fromcto/csharp/csharpvisitor.js b/lib/codegen/fromcto/csharp/csharpvisitor.js
@@ -314,8 +314,8 @@ class CSharpVisitor {
     writeField(field, parameters, externalFieldType, isOptional = false) {
 
         // write Map field
-        if ( Object.keys(field).length > 0 && ModelUtil.isMap?.(field)) {
-            const decl = field.getModelFile().getAllDeclarations().find(d => d.name === field.ast.type.name);
+        if (Object.keys(field).length > 0 && ModelUtil.isMap?.(field)) {
+            const decl = field.getModelFile().getType(field.getType());
             parameters.fileWriter.writeLine(1, `public Dictionary<string, ${this.toCSharpType(decl.getValue().getType())}> ${field.getName()} { get; set; }`);
             return null;
         }

diff --git a/lib/codegen/fromcto/graphql/graphqlvisitor.js b/lib/codegen/fromcto/graphql/graphqlvisitor.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const util = require('util');
+const { ModelUtil } = require('@accordproject/concerto-core');
 
 /**
 * Convert the contents of a ModelManager to GraphQL types, based on
@@ -52,7 +53,7 @@ class GraphQLVisitor {
         } else if (thing.isField?.()) {
             return this.visitField(thing, parameters);
         } else if (thing.isMapDeclaration?.()) {
-            return;
+            return this.visitMapDeclaration(thing, parameters);
         } else if (thing.isRelationship?.()) {
             return this.visitRelationship(thing, parameters);
         } else if (thing.isEnumValue?.()) {
@@ -171,6 +172,28 @@ class GraphQLVisitor {
         return null;
     }
 
+    /**
+    * Visitor design pattern
+    * @param {MapDeclaration} mapDeclaration - the object being visited
+    * @param {Object} parameters  - the parameter
+    * @return {Object} the result of visiting or null
+    * @private
+    */
+    visitMapDeclaration(mapDeclaration, parameters) {
+        const keyType = mapDeclaration.getKey().getType();
+        const valueType = mapDeclaration.getValue().getType();
+
+        let key = ModelUtil.isPrimitiveType(keyType) ? this.toGraphQLType(keyType) : keyType;
+        let value = ModelUtil.isPrimitiveType(valueType) ? this.toGraphQLType(valueType) : valueType;
+
+        parameters.fileWriter.writeLine(0, `type ${mapDeclaration.getName()} {`);
+        parameters.fileWriter.writeLine(1, `key: ${key}`);
+        parameters.fileWriter.writeLine(1, `value: ${value}`);
+        parameters.fileWriter.writeLine(0, '}');
+
+        return null;
+    }
+
     /**
     * Visitor design pattern
     * @param {Relationship} relationship - the object being visited

diff --git a/lib/codegen/fromcto/java/javavisitor.js b/lib/codegen/fromcto/java/javavisitor.js
@@ -169,6 +169,15 @@ class JavaVisitor {
             parameters.fileWriter.writeLine(0, `import ${namespace}.${typeName};` );
         });
 
+        let hasImportedJavaMap = false;
+        classDeclaration.getOwnProperties().forEach(p => {
+            if(ModelUtil.isMap(p) && !hasImportedJavaMap) {
+                parameters.fileWriter.writeLine(0, 'import java.util.HashMap;');
+                parameters.fileWriter.writeLine(0, 'import java.util.Map;');
+                hasImportedJavaMap = true;
+            }
+        });
+
         parameters.fileWriter.writeLine(0, 'import com.fasterxml.jackson.annotation.*;');
         parameters.fileWriter.writeLine(0, '');
 
@@ -278,7 +287,12 @@ class JavaVisitor {
                 parameters.fileWriter.writeLine(1, '}');
                 break;
             default:
-                parameters.fileWriter.writeLine(1, 'private ' + fieldType + ' ' + fieldName + ';' );
+                if (ModelUtil.isMap(field)) {
+                    const decl = field.getModelFile().getType(field.ast.type.name);
+                    parameters.fileWriter.writeLine(1, `private Map<${this.toJavaType(decl.getKey().getType())}, ${this.toJavaType(decl.getValue().getType())}> ${field.getName()} = new HashMap<>();`);
+                } else {
+                    parameters.fileWriter.writeLine(1, 'private ' + fieldType + ' ' + fieldName + ';' );
+                }
             }
         } else {
             parameters.fileWriter.writeLine(1, 'private ' + fieldType + ' ' + fieldName + ';' );