From a6287737554ce2aa54f168e209b0e4a4185539b5 Mon Sep 17 00:00:00 2001 From: Ertugrul Karademir Date: Tue, 23 Jul 2024 15:26:24 +0100 Subject: [PATCH] chore(deps): update concerto dependencies (#110) * chore(dep): update concerto dependencies Signed-off-by: Ertugrul Karademir * fix: lint warnings Signed-off-by: Ertugrul Karademir --------- Signed-off-by: Ertugrul Karademir --- .../fromJsonSchema/cto/jsonSchemaVisitor.js | 3 + package-lock.json | 230 +++--------------- package.json | 8 +- scripts/coverage.js | 4 +- scripts/tag.js | 2 + scripts/timestamp.js | 4 +- 6 files changed, 49 insertions(+), 202 deletions(-) diff --git a/lib/codegen/fromJsonSchema/cto/jsonSchemaVisitor.js b/lib/codegen/fromJsonSchema/cto/jsonSchemaVisitor.js index cab40910..318b0b86 100644 --- a/lib/codegen/fromJsonSchema/cto/jsonSchemaVisitor.js +++ b/lib/codegen/fromJsonSchema/cto/jsonSchemaVisitor.js @@ -561,6 +561,7 @@ class JsonSchemaVisitor { arrayProperty.path.length - 1 ]; if (this.isFixedElementsArrayProperty(arrayProperty)) { + // eslint-disable-next-line no-console console.warn( `"${propertyName}" in an array containing a set of fixed elements. Converting to a Concerto concept containing the fixed array elements as fields.` ); @@ -575,6 +576,7 @@ class JsonSchemaVisitor { // we'd like to convert the property to a freeform JSON stringified // one. This stems from Concerto not being to describe an array // with a number of fixed elements and addtitional unknown ones. + // eslint-disable-next-line no-console console.warn( `"${propertyName}" is an array containing a mix of predefined and unknown elements. Converting to a stringified JSON string.` ); @@ -718,6 +720,7 @@ class JsonSchemaVisitor { // Handle a union type. if (Array.isArray(property.body.type)) { + // eslint-disable-next-line no-console console.warn( `"${propertyName}" is union type property. This feature is not supported by Concerto. Defaulting to a "string" type.` ); diff --git a/package-lock.json b/package-lock.json index bf6c6be1..db1ab64f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "3.23.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-core": "3.16.10", - "@accordproject/concerto-util": "3.16.10", - "@accordproject/concerto-vocabulary": "3.16.10", + "@accordproject/concerto-core": "3.17.1", + "@accordproject/concerto-util": "3.17.1", + "@accordproject/concerto-vocabulary": "3.17.1", "@openapi-contrib/openapi-schema-to-json-schema": "5.1.0", "ajv": "8.13.0", "ajv-formats": "3.0.1", @@ -22,7 +22,7 @@ "pluralize": "8.0.0" }, "devDependencies": { - "@accordproject/concerto-cto": "3.16.8", + "@accordproject/concerto-cto": "3.17.1", "@babel/preset-env": "7.16.11", "babel-loader": "8.2.3", "chai": "4.3.6", @@ -61,14 +61,13 @@ } }, "node_modules/@accordproject/concerto-core": { - "version": "3.16.10", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-core/-/concerto-core-3.16.10.tgz", - "integrity": "sha512-PvoCRCRJL8fdw42pAwPHHZbJGt2rRUAuYu5hpKgktL50KxqebrDN+GR8U+cbC3FBKSDDPejeeADOo0WsRbD04Q==", - "license": "Apache-2.0", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-core/-/concerto-core-3.17.1.tgz", + "integrity": "sha512-pXyEruz0apLqXFBIv+0VFpFJitThW4pfVAM5VPvNrC87oQhsI7RyWar4MZ9b2QAJAdHugTTDbhEk5csj30iBqQ==", "dependencies": { - "@accordproject/concerto-cto": "3.16.10", - "@accordproject/concerto-metamodel": "3.9.2", - "@accordproject/concerto-util": "3.16.10", + "@accordproject/concerto-cto": "3.17.1", + "@accordproject/concerto-metamodel": "3.10.0", + "@accordproject/concerto-util": "3.17.1", "dayjs": "1.11.10", "debug": "4.3.4", "lorem-ipsum": "2.0.8", @@ -83,72 +82,13 @@ "npm": ">=8" } }, - "node_modules/@accordproject/concerto-core/node_modules/@accordproject/concerto-cto": { - "version": "3.16.10", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-3.16.10.tgz", - "integrity": "sha512-ewX7B40X9rbdOd0IybRIZZ/2pVHAwFqiDNpktytpXnD9Rg6d9SvRRbrfoEe/rVksl6ohDaBKP9XVQWB2kJbtfQ==", - "license": "Apache-2.0", - "dependencies": { - "@accordproject/concerto-metamodel": "3.9.2", - "@accordproject/concerto-util": "3.16.10", - "path-browserify": "1.0.1" - }, - "engines": { - "node": ">=16", - "npm": ">=8" - } - }, - "node_modules/@accordproject/concerto-core/node_modules/@accordproject/concerto-metamodel": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.9.2.tgz", - "integrity": "sha512-hSxgRBxFGhBjT4n4QJl3X1iAtiTy+aRkmi6/qHK1mkvsmJwKkC011JdU4N/tUWv4HreE1L/HmddzBx1hGg7awA==", - "license": "Apache-2.0", - "dependencies": { - "@accordproject/concerto-util": "3.16.1", - "@types/node": "20.7.0" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/concerto-core/node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-util": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.16.1.tgz", - "integrity": "sha512-O/KVcepU2z4GHjS73uWT2BE1ED9OZK1H5iD37gHqzJ6Lq55t5vekyMtqTdoadihgPeKYuamOUYBFes1rdUS3vQ==", - "license": "Apache-2.0", - "dependencies": { - "@supercharge/promise-pool": "1.7.0", - "axios": "1.6.0", - "colors": "1.4.0", - "debug": "4.3.4", - "json-colorizer": "2.2.2", - "slash": "3.0.0" - }, - "engines": { - "node": ">=16", - "npm": ">=8" - } - }, - "node_modules/@accordproject/concerto-core/node_modules/axios": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@accordproject/concerto-cto": { - "version": "3.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-3.16.8.tgz", - "integrity": "sha512-zQev/T0UmoSiwvNboNUhy5Xt1uIVo4F8Hz/lrtAQLz+8RjAXcmM5Bbn1tmGDOCJxgcAYl6J+rqd372IjUZinBg==", - "dev": true, + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-3.17.1.tgz", + "integrity": "sha512-S3BqD3qFBEbiI0P6i1FI8Lp6OfZ1Y5V94mYvHQxv6lMi+jpBkMetznyWHeAbeARmaBudxAoYG/6lHKsspnowMA==", "dependencies": { - "@accordproject/concerto-metamodel": "3.9.1", - "@accordproject/concerto-util": "3.16.8", + "@accordproject/concerto-metamodel": "3.10.0", + "@accordproject/concerto-util": "3.17.1", "path-browserify": "1.0.1" }, "engines": { @@ -156,44 +96,12 @@ "npm": ">=8" } }, - "node_modules/@accordproject/concerto-cto/node_modules/@accordproject/concerto-util": { - "version": "3.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.16.8.tgz", - "integrity": "sha512-PmBY2xo1p4sVwTexfHbXJpb5Dyr0VenIBzUGHqy4ZNDTqjAzO/y+ME0T0Id+3HEZ80LdJQ6zWiG+q+s9CLG1Ug==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@supercharge/promise-pool": "1.7.0", - "axios": "1.6.0", - "colors": "1.4.0", - "debug": "4.3.4", - "json-colorizer": "2.2.2", - "slash": "3.0.0" - }, - "engines": { - "node": ">=16", - "npm": ">=8" - } - }, - "node_modules/@accordproject/concerto-cto/node_modules/axios": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@accordproject/concerto-metamodel": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.9.1.tgz", - "integrity": "sha512-5fIZlkdTG7c+WiVwEYnyWOKaozi8blJNTHMdATyCHAPaM+UqVeIayA/ScUM70SJie1ngtCYg5S+kepUpl7pT8Q==", - "dev": true, + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.10.0.tgz", + "integrity": "sha512-xgBLwQGAHYeswIK3DlpvquT1NpTii9ETGQLqG4wpN3Ez/m8ymZXpTMFwS+pPu+pKDlX+T4+cZacewX60IecHmw==", "dependencies": { - "@accordproject/concerto-util": "3.16.1", + "@accordproject/concerto-util": "3.16.9", "@types/node": "20.7.0" }, "engines": { @@ -202,13 +110,12 @@ } }, "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-util": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.16.1.tgz", - "integrity": "sha512-O/KVcepU2z4GHjS73uWT2BE1ED9OZK1H5iD37gHqzJ6Lq55t5vekyMtqTdoadihgPeKYuamOUYBFes1rdUS3vQ==", - "dev": true, + "version": "3.16.9", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.16.9.tgz", + "integrity": "sha512-Q62s7a0zMCZMbOIybe20mnauB5+oqkwEeKlsrvg2QrkK0q3o7XvWkr3Zot2AncSwkQC3U6+rfuGiBvdyJNJ7Hw==", "dependencies": { "@supercharge/promise-pool": "1.7.0", - "axios": "1.6.0", + "axios": "1.6.8", "colors": "1.4.0", "debug": "4.3.4", "json-colorizer": "2.2.2", @@ -219,22 +126,10 @@ "npm": ">=8" } }, - "node_modules/@accordproject/concerto-metamodel/node_modules/axios": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@accordproject/concerto-util": { - "version": "3.16.10", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.16.10.tgz", - "integrity": "sha512-gzM88Ri6uquiwAG6LJLdenYkBoOUy/LmpmUvIfya16lZ9Ng+VLjfkY8aq2jol7LzFQepZWpihXbOTRPKkTQwQQ==", - "license": "Apache-2.0", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.17.1.tgz", + "integrity": "sha512-T2zpfosS4S5j1D7Cf8realZC5qTA6gUHgQ8F+/5kjTrHILrUltLM+zxNtkuurTJZBUua5svBM3MRLFhhQCKPgA==", "dependencies": { "@supercharge/promise-pool": "1.7.0", "axios": "1.6.8", @@ -248,24 +143,12 @@ "npm": ">=8" } }, - "node_modules/@accordproject/concerto-util/node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@accordproject/concerto-vocabulary": { - "version": "3.16.10", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-vocabulary/-/concerto-vocabulary-3.16.10.tgz", - "integrity": "sha512-JJYsCWkCs2BDDsNX4ch5KPQQcPLikIhGflqQYo30rD2FKT6lMKX+vnv/V/iD76rncOBkR0lpVLRzuj48DhpjTg==", - "license": "Apache-2.0", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-vocabulary/-/concerto-vocabulary-3.17.1.tgz", + "integrity": "sha512-OdBO1+gczZq4LM5VyLfHb2AROhNmoEaOdzw+nsqF5kqy3+qpnrwbaG5F+l82ESO15ZCA4m7HggfY3SI5/hwHrQ==", "dependencies": { - "@accordproject/concerto-metamodel": "3.9.2", + "@accordproject/concerto-metamodel": "3.10.0", "yaml": "2.2.2" }, "engines": { @@ -273,49 +156,6 @@ "npm": ">=8" } }, - "node_modules/@accordproject/concerto-vocabulary/node_modules/@accordproject/concerto-metamodel": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.9.2.tgz", - "integrity": "sha512-hSxgRBxFGhBjT4n4QJl3X1iAtiTy+aRkmi6/qHK1mkvsmJwKkC011JdU4N/tUWv4HreE1L/HmddzBx1hGg7awA==", - "license": "Apache-2.0", - "dependencies": { - "@accordproject/concerto-util": "3.16.1", - "@types/node": "20.7.0" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/concerto-vocabulary/node_modules/@accordproject/concerto-util": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.16.1.tgz", - "integrity": "sha512-O/KVcepU2z4GHjS73uWT2BE1ED9OZK1H5iD37gHqzJ6Lq55t5vekyMtqTdoadihgPeKYuamOUYBFes1rdUS3vQ==", - "license": "Apache-2.0", - "dependencies": { - "@supercharge/promise-pool": "1.7.0", - "axios": "1.6.0", - "colors": "1.4.0", - "debug": "4.3.4", - "json-colorizer": "2.2.2", - "slash": "3.0.0" - }, - "engines": { - "node": ">=16", - "npm": ">=8" - } - }, - "node_modules/@accordproject/concerto-vocabulary/node_modules/axios": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@ampproject/remapping": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", @@ -3203,13 +3043,11 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", - "dev": true, - "peer": true, + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } diff --git a/package.json b/package.json index 99156308..4ec2c48b 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "author": "accordproject.org", "license": "Apache-2.0", "devDependencies": { - "@accordproject/concerto-cto": "3.16.8", + "@accordproject/concerto-cto": "3.17.1", "@babel/preset-env": "7.16.11", "babel-loader": "8.2.3", "chai": "4.3.6", @@ -70,9 +70,9 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/concerto-core": "3.16.10", - "@accordproject/concerto-util": "3.16.10", - "@accordproject/concerto-vocabulary": "3.16.10", + "@accordproject/concerto-core": "3.17.1", + "@accordproject/concerto-util": "3.17.1", + "@accordproject/concerto-vocabulary": "3.17.1", "@openapi-contrib/openapi-schema-to-json-schema": "5.1.0", "ajv": "8.13.0", "ajv-formats": "3.0.1", diff --git a/scripts/coverage.js b/scripts/coverage.js index 10cd64b1..1e7bec9d 100755 --- a/scripts/coverage.js +++ b/scripts/coverage.js @@ -44,7 +44,9 @@ const lcovs = glob.sync(globPattern).map((dir) => { // usage copyFiles(lcovs, 'coverage').then(() => { + // eslint-disable-next-line no-console console.log('done'); }).catch(err => { + // eslint-disable-next-line no-console console.log(err); -}); \ No newline at end of file +}); diff --git a/scripts/tag.js b/scripts/tag.js index 01fc4d1e..f173dd3a 100755 --- a/scripts/tag.js +++ b/scripts/tag.js @@ -19,6 +19,7 @@ const semver = require('semver'); const targetVersion = process.argv[2]; if (!semver.valid(targetVersion)) { + // eslint-disable-next-line no-console console.error(`Error: the version "${targetVersion}" is invalid!`); process.exit(1); } @@ -26,4 +27,5 @@ if (!semver.valid(targetVersion)) { const prerelease = semver.prerelease(targetVersion); const tag = prerelease ? 'unstable' : 'latest'; +// eslint-disable-next-line no-console console.log(`::set-output name=tag::--tag=${tag}`); diff --git a/scripts/timestamp.js b/scripts/timestamp.js index 3f38386e..5e60ec4f 100755 --- a/scripts/timestamp.js +++ b/scripts/timestamp.js @@ -29,4 +29,6 @@ const packageJson = path.resolve(rootDir, 'package.json'); const meta = require(packageJson); meta.version.replace(/-.*/, ''); const targetVersion = semver.inc(meta.version, 'patch') + '-' + timestamp; -console.log(`::set-output name=stamp::${targetVersion}`); \ No newline at end of file + +// eslint-disable-next-line no-console +console.log(`::set-output name=stamp::${targetVersion}`);