diff --git a/lerna.json b/lerna.json index 2aa0624a5b..ce4a0f2bf0 100644 --- a/lerna.json +++ b/lerna.json @@ -2,6 +2,6 @@ "packages": [ "packages/*" ], - "version": "3.4.0", + "version": "3.5.0", "hoist": true } diff --git a/package-lock.json b/package-lock.json index a149a79e8c..2ddda13ccb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "concerto", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "concerto", - "version": "3.4.0", + "version": "3.5.0", "hasInstallScript": true, "devDependencies": { "colors": "1.4.0", diff --git a/package.json b/package.json index 08c3b64ca7..3d52ef751f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "name": "concerto", "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.", - "version": "3.4.0", + "version": "3.5.0", "private": true, "scripts": { "coverage": "node ./scripts/coverage.js \"packages/concerto-*\" && nyc report -t coverage --cwd . --report-dir coverage --reporter=lcov && cat ./coverage/lcov.info", diff --git a/packages/concerto-analysis/package.json b/packages/concerto-analysis/package.json index 1da6c2e3be..80e816cf7a 100644 --- a/packages/concerto-analysis/package.json +++ b/packages/concerto-analysis/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-analysis", - "version": "3.4.0", + "version": "3.5.0", "description": "Analysis of Concerto model files", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -32,11 +32,11 @@ "author": "accordproject.org", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-core": "3.4.0", + "@accordproject/concerto-core": "3.5.0", "semver": "7.3.5" }, "devDependencies": { - "@accordproject/concerto-cto": "3.4.0", + "@accordproject/concerto-cto": "3.5.0", "@types/jest": "28.1.1", "@types/semver": "7.3.10", "@typescript-eslint/eslint-plugin": "5.27.1", diff --git a/packages/concerto-cli/package-lock.json b/packages/concerto-cli/package-lock.json index 6e699d76d4..2cf74b8344 100644 --- a/packages/concerto-cli/package-lock.json +++ b/packages/concerto-cli/package-lock.json @@ -1,20 +1,20 @@ { "name": "@accordproject/concerto-cli", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@accordproject/concerto-cli", - "version": "3.4.0", + "version": "3.5.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-analysis": "3.4.0", - "@accordproject/concerto-core": "3.4.0", - "@accordproject/concerto-cto": "3.4.0", - "@accordproject/concerto-metamodel": "3.4.0", - "@accordproject/concerto-tools": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-analysis": "3.5.0", + "@accordproject/concerto-core": "3.5.0", + "@accordproject/concerto-cto": "3.5.0", + "@accordproject/concerto-metamodel": "3.5.0", + "@accordproject/concerto-tools": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "@openapi-contrib/openapi-schema-to-json-schema": "^3.2.0", "ansi-colors": "4.1.3", "glob": "^7.2.0", diff --git a/packages/concerto-cli/package.json b/packages/concerto-cli/package.json index 983197ca65..8c98f15648 100644 --- a/packages/concerto-cli/package.json +++ b/packages/concerto-cli/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-cli", - "version": "3.4.0", + "version": "3.5.0", "description": "Command-line utility for working with Concerto model files", "homepage": "https://github.com/accordproject/concerto", "license": "Apache-2.0", @@ -43,12 +43,12 @@ "tmp-promise": "3.0.2" }, "dependencies": { - "@accordproject/concerto-analysis": "3.4.0", - "@accordproject/concerto-core": "3.4.0", - "@accordproject/concerto-cto": "3.4.0", - "@accordproject/concerto-metamodel": "3.4.0", - "@accordproject/concerto-tools": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-analysis": "3.5.0", + "@accordproject/concerto-core": "3.5.0", + "@accordproject/concerto-cto": "3.5.0", + "@accordproject/concerto-metamodel": "3.5.0", + "@accordproject/concerto-tools": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "@openapi-contrib/openapi-schema-to-json-schema": "^3.2.0", "ansi-colors": "4.1.3", "glob": "^7.2.0", diff --git a/packages/concerto-core/package-lock.json b/packages/concerto-core/package-lock.json index ff32c0f275..05504519af 100644 --- a/packages/concerto-core/package-lock.json +++ b/packages/concerto-core/package-lock.json @@ -1,17 +1,17 @@ { "name": "@accordproject/concerto-core", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@accordproject/concerto-core", - "version": "3.4.0", + "version": "3.5.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-cto": "3.4.0", - "@accordproject/concerto-metamodel": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-cto": "3.5.0", + "@accordproject/concerto-metamodel": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "dayjs": "1.10.8", "debug": "4.3.1", "lorem-ipsum": "2.0.3", diff --git a/packages/concerto-core/package.json b/packages/concerto-core/package.json index d52e267647..8867c5094b 100644 --- a/packages/concerto-core/package.json +++ b/packages/concerto-core/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-core", - "version": "3.4.0", + "version": "3.5.0", "description": "Core Implementation for the Concerto Modeling Language", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -71,9 +71,9 @@ "yargs": "17.3.1" }, "dependencies": { - "@accordproject/concerto-cto": "3.4.0", - "@accordproject/concerto-metamodel": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-cto": "3.5.0", + "@accordproject/concerto-metamodel": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "dayjs": "1.10.8", "debug": "4.3.1", "lorem-ipsum": "2.0.3", diff --git a/packages/concerto-cto/package-lock.json b/packages/concerto-cto/package-lock.json index 2738828429..553bd74753 100644 --- a/packages/concerto-cto/package-lock.json +++ b/packages/concerto-cto/package-lock.json @@ -1,12 +1,12 @@ { "name": "@accordproject/concerto-cto", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@accordproject/concerto-cto", - "version": "3.4.0", + "version": "3.5.0", "license": "Apache-2.0", "devDependencies": { "mocha": "10.0.0" diff --git a/packages/concerto-cto/package.json b/packages/concerto-cto/package.json index 6576a21aa0..944b31e81d 100644 --- a/packages/concerto-cto/package.json +++ b/packages/concerto-cto/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-cto", - "version": "3.4.0", + "version": "3.5.0", "description": "Parser for Concerto CTO files", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -56,8 +56,8 @@ "typescript": "4.6.3" }, "dependencies": { - "@accordproject/concerto-metamodel": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-metamodel": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "path-browserify": "1.0.1" }, "browserslist": "> 0.25%, not dead", diff --git a/packages/concerto-metamodel/package.json b/packages/concerto-metamodel/package.json index 4496dd0f68..adf5212089 100644 --- a/packages/concerto-metamodel/package.json +++ b/packages/concerto-metamodel/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-metamodel", - "version": "3.4.0", + "version": "3.5.0", "description": "Concerto metamodel utilities", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -51,7 +51,7 @@ "typescript": "4.6.3" }, "dependencies": { - "@accordproject/concerto-util": "3.4.0" + "@accordproject/concerto-util": "3.5.0" }, "browserslist": "> 0.25%, not dead", "license-check-and-add-config": { diff --git a/packages/concerto-tools/package-lock.json b/packages/concerto-tools/package-lock.json index 605b37278d..985d81be85 100644 --- a/packages/concerto-tools/package-lock.json +++ b/packages/concerto-tools/package-lock.json @@ -1,16 +1,16 @@ { "name": "@accordproject/concerto-tools", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@accordproject/concerto-tools", - "version": "3.4.0", + "version": "3.5.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-core": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-core": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "ajv": "8.10.0", "ajv-formats": "2.1.1", "camelcase": "6.3.0", diff --git a/packages/concerto-tools/package.json b/packages/concerto-tools/package.json index 0175e9aec9..2de84676fc 100644 --- a/packages/concerto-tools/package.json +++ b/packages/concerto-tools/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-tools", - "version": "3.4.0", + "version": "3.5.0", "description": "Tools for the Concerto Modeling Language", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -67,8 +67,8 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/concerto-core": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-core": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "ajv": "8.10.0", "ajv-formats": "2.1.1", "camelcase": "6.3.0", diff --git a/packages/concerto-tools/types/lib/codegen/fromcto/csharp/csharpvisitor.d.ts b/packages/concerto-tools/types/lib/codegen/fromcto/csharp/csharpvisitor.d.ts index 9b22a11889..fbc4dba1a0 100644 --- a/packages/concerto-tools/types/lib/codegen/fromcto/csharp/csharpvisitor.d.ts +++ b/packages/concerto-tools/types/lib/codegen/fromcto/csharp/csharpvisitor.d.ts @@ -48,6 +48,14 @@ declare class CSharpVisitor { * @private */ private visitClassDeclaration; + /** + * Visitor design pattern + * @param {Field} field - the object being visited + * @param {Object} parameters - the parameter + * @return {Object} the result of visiting or null + * @private + */ + private visitScalarField; /** * Visitor design pattern * @param {Field} field - the object being visited @@ -56,6 +64,15 @@ declare class CSharpVisitor { * @private */ private visitField; + /** + * Write a field + * @param {Field} field - the object being visited + * @param {Object} parameters - the parameter + * @param {string} [externalFieldType] - the external field type like UUID (optional) + * @return {Object} the result of visiting or null + * @private + */ + private writeField; /** * Visitor design pattern * @param {EnumValueDeclaration} enumValueDeclaration - the object being visited diff --git a/packages/concerto-types/package.json b/packages/concerto-types/package.json index 5b7bb4c9b6..c8fa420192 100644 --- a/packages/concerto-types/package.json +++ b/packages/concerto-types/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-types", - "version": "3.4.0", + "version": "3.5.0", "description": "Types for the Concerto Modeling Language", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -32,10 +32,10 @@ "author": "accordproject.org", "license": "Apache-2.0", "devDependencies": { - "@accordproject/concerto-core": "3.4.0", - "@accordproject/concerto-metamodel": "3.4.0", - "@accordproject/concerto-tools": "3.4.0", - "@accordproject/concerto-util": "3.4.0", + "@accordproject/concerto-core": "3.5.0", + "@accordproject/concerto-metamodel": "3.5.0", + "@accordproject/concerto-tools": "3.5.0", + "@accordproject/concerto-util": "3.5.0", "eslint": "8.2.0", "license-check-and-add": "2.3.6", "npm-run-all": "4.1.5", diff --git a/packages/concerto-util/package-lock.json b/packages/concerto-util/package-lock.json index 25ab92a1c6..8579669a8a 100644 --- a/packages/concerto-util/package-lock.json +++ b/packages/concerto-util/package-lock.json @@ -1,12 +1,12 @@ { "name": "@accordproject/concerto-util", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@accordproject/concerto-util", - "version": "3.4.0", + "version": "3.5.0", "license": "Apache-2.0", "dependencies": { "@supercharge/promise-pool": "1.7.0", diff --git a/packages/concerto-util/package.json b/packages/concerto-util/package.json index 2b5d04dcbf..fd798a833d 100644 --- a/packages/concerto-util/package.json +++ b/packages/concerto-util/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-util", - "version": "3.4.0", + "version": "3.5.0", "description": "Utilities for Concerto Modeling Language", "homepage": "https://github.com/accordproject/concerto", "engines": { diff --git a/packages/concerto-vocabulary/package-lock.json b/packages/concerto-vocabulary/package-lock.json index 093486490c..339b6d1778 100644 --- a/packages/concerto-vocabulary/package-lock.json +++ b/packages/concerto-vocabulary/package-lock.json @@ -1,15 +1,15 @@ { "name": "@accordproject/concerto-vocabulary", - "version": "3.4.0", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@accordproject/concerto-vocabulary", - "version": "3.4.0", + "version": "3.5.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-metamodel": "3.4.0", + "@accordproject/concerto-metamodel": "3.5.0", "yaml": "2.0.0-9" }, "devDependencies": { diff --git a/packages/concerto-vocabulary/package.json b/packages/concerto-vocabulary/package.json index cbfa1b3f8d..3efd3a7263 100644 --- a/packages/concerto-vocabulary/package.json +++ b/packages/concerto-vocabulary/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/concerto-vocabulary", - "version": "3.4.0", + "version": "3.5.0", "description": "Associate human-readable text to model declarations", "homepage": "https://github.com/accordproject/concerto", "engines": { @@ -49,7 +49,7 @@ "typescript": "4.6.3" }, "dependencies": { - "@accordproject/concerto-metamodel": "3.4.0", + "@accordproject/concerto-metamodel": "3.5.0", "yaml": "2.0.0-9" }, "browserslist": "> 0.25%, not dead",