diff --git a/package-lock.json b/package-lock.json index 0cc32049..00d25a7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,13 +13,14 @@ "ajv": "8.18.0", "ajv-formats": "3.0.1", "camelcase": "6.3.0", + "dayjs": "1.11.0", "debug": "4.3.4", "get-value": "3.0.1", "json-schema-migrate": "2.0.0", "pluralize": "8.0.0" }, "devDependencies": { - "@accordproject/concerto-cto": "4.0.2", + "@accordproject/concerto-cto": "4.0.3", "@babel/preset-env": "7.16.11", "@types/webgl-ext": "0.0.37", "babel-loader": "8.2.3", @@ -53,21 +54,21 @@ "npm": ">=6" }, "peerDependencies": { - "@accordproject/concerto-core": "^4.0.2", - "@accordproject/concerto-util": "^4.0.2", - "@accordproject/concerto-vocabulary": "^4.0.2" + "@accordproject/concerto-core": "^4.0.3", + "@accordproject/concerto-util": "^4.0.3", + "@accordproject/concerto-vocabulary": "^4.0.3" } }, "node_modules/@accordproject/concerto-core": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-core/-/concerto-core-4.0.2.tgz", - "integrity": "sha512-lf4CBmzrtCRFui3Kn/msv6MXAb3D2PoZl5kkRtve0U5hAhhxO6ZZYZgARvBIWkMy0wJM6tiqbHu1uZbOEgWCMQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-core/-/concerto-core-4.0.3.tgz", + "integrity": "sha512-calMeeCG/sRzMqGmGj4tUaUovoLUuR3akJaKLzZ85crGRko8VKE02py1Yfho6zdZgcfo5fIJ+CpzwEdoMCWSMQ==", "license": "Apache-2.0", "peer": true, "dependencies": { - "@accordproject/concerto-cto": "4.0.2", - "@accordproject/concerto-metamodel": "^4.0.0-alpha.0", - "@accordproject/concerto-util": "4.0.2", + "@accordproject/concerto-cto": "4.0.3", + "@accordproject/concerto-metamodel": "^3.13.0", + "@accordproject/concerto-util": "4.0.3", "debug": "4.3.7", "lorem-ipsum": "2.0.8", "randexp": "0.5.3", @@ -108,13 +109,13 @@ "peer": true }, "node_modules/@accordproject/concerto-cto": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-4.0.2.tgz", - "integrity": "sha512-eti55jb8z8dv5X5ZQH4CYJhdMMUYFyRGIcRDVPwIO6KxnquZ0bEor47d4B6nB2GkE0IhLkfel/AOPQfhdD+0mQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-4.0.3.tgz", + "integrity": "sha512-i7DB9tuMuP8m6F4mSAYbAT8Qh7qMQEpSiZwMQRb0nWESQtmKITIgfxgeG/EXekgaAieucJMG3TiDPTYih7fXpA==", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-metamodel": "^4.0.0-alpha.0", - "@accordproject/concerto-util": "4.0.2", + "@accordproject/concerto-metamodel": "^3.13.0", + "@accordproject/concerto-util": "4.0.3", "acorn": "^8.15.0", "path-browserify": "^1.0.1", "schema-utils": "^4.3.3" @@ -161,119 +162,19 @@ } }, "node_modules/@accordproject/concerto-metamodel": { - "version": "4.0.0-alpha.0", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-4.0.0-alpha.0.tgz", - "integrity": "sha512-JYSBk4NA6P41MjJCVe4WrA1QW1iTJ2Bfkd1f8EcfnhfuCtH+rmQItoTV8X1pb/+ql+3gVMfitaE1klKiUMMJGw==", - "license": "Apache-2.0", - "dependencies": { - "@accordproject/concerto-core": "3.24.0", - "@accordproject/concerto-util": "3.24.0" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-core": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-core/-/concerto-core-3.24.0.tgz", - "integrity": "sha512-JrrBw3JMwtogiYPjBaRV6CZCKi2hXIdOVzyFslshfBMe3dkm94iloW8ASr3tsnWMfjuDUinsTksX/wfHJ9DXgA==", - "license": "Apache-2.0", - "dependencies": { - "@accordproject/concerto-cto": "3.24.0", - "@accordproject/concerto-metamodel": "^3.12.4", - "@accordproject/concerto-util": "3.24.0", - "dayjs": "1.11.13", - "debug": "4.3.7", - "lorem-ipsum": "2.0.8", - "randexp": "0.5.3", - "rfdc": "1.4.1", - "semver": "7.6.3", - "urijs": "1.19.11", - "uuid": "11.0.3", - "yaml": "^2.8.0" - }, - "engines": { - "node": ">=18", - "npm": ">=10" - } - }, - "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-cto": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-3.24.0.tgz", - "integrity": "sha512-DCTdUE3qExe3CCkg3PO1yBhj0/CGqY5al+kLkQuZ3p/MfFRZWkWMNdox6g7S9VtednRb5NPhkrLwlNRpJbkcmA==", - "license": "Apache-2.0", - "dependencies": { - "@accordproject/concerto-metamodel": "3.12.4", - "@accordproject/concerto-util": "3.24.0" - }, - "engines": { - "node": ">=18", - "npm": ">=10" - } - }, - "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-cto/node_modules/@accordproject/concerto-metamodel": { - "version": "3.12.4", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.12.4.tgz", - "integrity": "sha512-7EmrdRc+ocX1Km5TMfNWfNzAvE901BV6NYmCEPf+H8MjHgnJWz6LFbQ3D5ppF3ar8325FM40mMKiDUuSTFXvTQ==", - "license": "Apache-2.0", - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-metamodel": { - "version": "3.12.9", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.12.9.tgz", - "integrity": "sha512-VKkJIcl2d7Fvkp6F9XDMy3oKvLxFJMYpTOKYaYXl+C7DSjnBl+T74DC0Vr9EOzCs/UQ2JNRqJJ20b9pN48patg==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.13.0.tgz", + "integrity": "sha512-BkWJLYvWkDAG1lPgEr0T/4IqhjqEqzMVxAfFdJzDH3lxfEJsZ+bVJZzdcsHZUubuO0SsoahuHSs4j2Cv7DQ+Lw==", "license": "Apache-2.0", "engines": { "node": ">=14", "npm": ">=6" } }, - "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-util": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.24.0.tgz", - "integrity": "sha512-zY33oFYTpgKqEfunx5WhcaqbXzYmJrywD4+XicyMiS3hCgi1+92hUd303lC9qywvCUybkiGXrizrldOtcqnXWw==", - "license": "Apache-2.0", - "dependencies": { - "@supercharge/promise-pool": "1.7.0", - "debug": "4.3.7", - "slash": "3.0.0" - }, - "engines": { - "node": ">=18", - "npm": ">=10" - } - }, - "node_modules/@accordproject/concerto-metamodel/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@accordproject/concerto-metamodel/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, "node_modules/@accordproject/concerto-util": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-4.0.2.tgz", - "integrity": "sha512-VVItQqEL0dh/URfZYDPCJz+wCQxhHZydS1wVcujsW9rNM7Fe+b3MaZK5kXuz3u7aj75mUxxOV1lPDV55UWeqjw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-4.0.3.tgz", + "integrity": "sha512-LGSTyHuF9jKrZmJzyjvhNPhpN2GiE8x/4LCRqCwVaQltqgOQYNM4BOmgsuLPejgQIhl6GsmbKIZxPrhy6h7DhA==", "license": "Apache-2.0", "dependencies": { "@supercharge/promise-pool": "1.7.0", @@ -287,13 +188,13 @@ } }, "node_modules/@accordproject/concerto-vocabulary": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@accordproject/concerto-vocabulary/-/concerto-vocabulary-4.0.2.tgz", - "integrity": "sha512-E8MhUPPVmPBIPlvwFE/kGpBXVcms8RRtcnCQwF5HGMSksC2W19HBfx4YCgNTn4xhkx0tuNL84dcTFrfTysiDGQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-vocabulary/-/concerto-vocabulary-4.0.3.tgz", + "integrity": "sha512-mpkVdSyrn6mCo2KgcVA71ByqZUhzDpYRI242mVamCS9n6J4UmsSGSULPZFexQz7EWbfreKitXqTXX2BEIxNNgA==", "license": "Apache-2.0", "peer": true, "dependencies": { - "@accordproject/concerto-metamodel": "^4.0.0-alpha.0", + "@accordproject/concerto-metamodel": "^3.13.0", "yaml": "2.8.3" }, "engines": { @@ -4491,6 +4392,7 @@ "version": "9.5.0", "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", + "peer": true, "engines": { "node": "^12.20.0 || >=14" } @@ -4686,9 +4588,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz", + "integrity": "sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==", "license": "MIT" }, "node_modules/debug": { @@ -4865,6 +4767,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/drange/-/drange-1.1.1.tgz", "integrity": "sha512-pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA==", + "peer": true, "engines": { "node": ">=4" } @@ -7178,6 +7081,7 @@ "version": "2.0.8", "resolved": "https://registry.npmjs.org/lorem-ipsum/-/lorem-ipsum-2.0.8.tgz", "integrity": "sha512-5RIwHuCb979RASgCJH0VKERn9cQo/+NcAi2BMe9ddj+gp7hujl6BI+qdOG4nVsLDpwWEJwTVYXNKP6BGgbcoGA==", + "peer": true, "dependencies": { "commander": "^9.3.0" }, @@ -8844,6 +8748,7 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.5.3.tgz", "integrity": "sha512-U+5l2KrcMNOUPYvazA3h5ekF80FHTUG+87SEAmHZmolh1M+i/WyTCxVzmi+tidIa1tM4BSe8g2Y/D3loWDjj+w==", + "peer": true, "dependencies": { "drange": "^1.0.2", "ret": "^0.2.0" @@ -9084,6 +8989,7 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz", "integrity": "sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==", + "peer": true, "engines": { "node": ">=4" } @@ -9101,7 +9007,8 @@ "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", - "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==" + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "peer": true }, "node_modules/rimraf": { "version": "3.0.2", @@ -10477,7 +10384,8 @@ "node_modules/urijs": { "version": "1.19.11", "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz", - "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==" + "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==", + "peer": true }, "node_modules/url": { "version": "0.11.4", @@ -10530,6 +10438,7 @@ "https://github.com/sponsors/ctavan" ], "license": "MIT", + "peer": true, "bin": { "uuid": "dist/esm/bin/uuid" } @@ -10925,6 +10834,7 @@ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz", "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==", "license": "ISC", + "peer": true, "bin": { "yaml": "bin.mjs" }, diff --git a/package.json b/package.json index e69147fc..bc227f90 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "author": "accordproject.org", "license": "Apache-2.0", "devDependencies": { - "@accordproject/concerto-cto": "4.0.2", + "@accordproject/concerto-cto": "4.0.3", "@babel/preset-env": "7.16.11", "@types/webgl-ext": "0.0.37", "babel-loader": "8.2.3", @@ -82,15 +82,16 @@ "ajv": "8.18.0", "ajv-formats": "3.0.1", "camelcase": "6.3.0", + "dayjs": "1.11.0", "debug": "4.3.4", "get-value": "3.0.1", "json-schema-migrate": "2.0.0", "pluralize": "8.0.0" }, "peerDependencies": { - "@accordproject/concerto-core": "^4.0.2", - "@accordproject/concerto-util": "^4.0.2", - "@accordproject/concerto-vocabulary": "^4.0.2" + "@accordproject/concerto-core": "^4.0.3", + "@accordproject/concerto-util": "^4.0.3", + "@accordproject/concerto-vocabulary": "^4.0.3" }, "license-check-and-add-config": { "folder": "./lib", diff --git a/types/lib/common/graph.d.ts b/types/lib/common/graph.d.ts index dbb753a5..60a16ca4 100644 --- a/types/lib/common/graph.d.ts +++ b/types/lib/common/graph.d.ts @@ -86,8 +86,9 @@ export class DirectedGraph { * * @param {Writer} writer - Buffer for text to be written */ - print(writer: any): void; + print(writer: Writer): void; } import BaseVisitor = require("./basevisitor"); import { ClassDeclaration } from "@accordproject/concerto-core"; import { MapDeclaration } from "@accordproject/concerto-core"; +import { Writer } from "@accordproject/concerto-util";