test(codegen) update HR model to use multiple namespaces (#68)

Signed-off-by: Dan Selman <[email protected]>
accordproject · Nov 6, 2023 · 5e4707d · 5e4707d
1 parent d93a3e0
commit 5e4707d
Show file tree

Hide file tree

Showing 13 changed files with 1,799 additions and 961 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/typescript/typescriptvisitor.js b/lib/codegen/fromcto/typescript/typescriptvisitor.js
@@ -288,9 +288,7 @@ class TypescriptVisitor {
         const isPrimitive = ModelUtil.isPrimitiveType(mapDeclaration.getValue().getType());
 
         if (isScalar) {
-            const scalar = mapDeclaration.getModelFile()
-                .getAllDeclarations()
-                .find(decl => decl.name === mapDeclaration.getValue().getType());
+            const scalar = mapDeclaration.getModelFile(mapDeclaration.getValue().getType());
             const scalarType = scalar.getType();
             valueType = this.toTsType(scalarType, false, false);
         } else if (isPrimitive) {

diff --git a/lib/common/graph.js b/lib/common/graph.js
@@ -203,15 +203,15 @@ class ConcertoGraphVisitor extends DiagramVisitor {
         let valueEdge   = mapDeclaration.getValue().getType();
 
         if(!ModelUtil.isPrimitiveType(keyEdge)) {
-            keyEdge = modelFile.getAllDeclarations().find(d => d.name === mapDeclaration.getKey().getType()).getFullyQualifiedName();
+            keyEdge = modelFile.getType(mapDeclaration.getKey().getType()).getFullyQualifiedName();
         }
 
         if(!ModelUtil.isPrimitiveType(valueEdge)) {
             // handle imported types
             if (!modelFile.isLocalType(mapDeclaration.getValue().getType())) {
                 valueEdge = modelFile.resolveImport(mapDeclaration.getValue().getType());
             } else {
-                valueEdge = modelFile.getAllDeclarations().find(d => d.name === mapDeclaration.getValue().getType()).getFullyQualifiedName();
+                valueEdge = modelFile.getType(mapDeclaration.getValue().getType()).getFullyQualifiedName();
             }
         }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "author": "accordproject.org",
     "license": "Apache-2.0",
     "devDependencies": {
-        "@accordproject/concerto-cto": "3.12.3",
+        "@accordproject/concerto-cto": "3.14.2",
         "@babel/preset-env": "7.16.11",
         "babel-loader": "8.2.3",
         "chai": "4.3.6",
@@ -69,9 +69,9 @@
         "webpack-cli": "4.9.1"
     },
     "dependencies": {
-        "@accordproject/concerto-core": "3.12.3",
-        "@accordproject/concerto-util": "3.12.3",
-        "@accordproject/concerto-vocabulary": "3.12.3",
+        "@accordproject/concerto-core": "3.14.2",
+        "@accordproject/concerto-util": "3.14.2",
+        "@accordproject/concerto-vocabulary": "3.14.2",
         "@openapi-contrib/openapi-schema-to-json-schema": "3.2.0",
         "ajv": "8.10.0",
         "ajv-formats": "2.1.1",