From 87af578f7f02e9e409b2fb93d1636c47a9921f55 Mon Sep 17 00:00:00 2001 From: Dan Selman Date: Tue, 4 Jul 2023 15:07:35 +0100 Subject: [PATCH] feat(templatemark) : bump to templatemark v0.5.0 (#547) Signed-off-by: Dan Selman --- package-lock.json | 214 +++--------------- package.json | 2 +- packages/dingus/package.json | 10 +- packages/markdown-cicero/package.json | 2 +- .../test/data/decorators/boolean.json | 2 +- .../test/data/decorators/identifier.json | 2 +- .../data/decorators/invalid-arg-name.json | 2 +- .../test/data/decorators/invalid-odd.json | 2 +- .../test/data/decorators/multi.json | 2 +- .../test/data/decorators/number.json | 2 +- .../test/data/decorators/string.json | 2 +- packages/markdown-cli/package.json | 2 +- .../test/data/acceptance/grammar.json | 32 +-- packages/markdown-common/package.json | 2 +- packages/markdown-docx/package.json | 4 +- packages/markdown-html/package.json | 4 +- packages/markdown-pdf/package.json | 6 +- .../SlateTransformer.test.js.snap | 124 +++++----- packages/markdown-slate/package.json | 6 +- .../templatemark/acceptance_templatemark.json | 30 +-- .../latedelivery_templatemark.json | 20 +- .../data/templatemark/test1_templatemark.json | 12 +- packages/markdown-template/package.json | 8 +- packages/markdown-transform/package.json | 2 +- .../test/data/acceptance/grammar.json | 32 +-- 25 files changed, 191 insertions(+), 335 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8607701f..ee8d13b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,8 @@ "version": "0.16.11", "license": "Apache-2.0", "dependencies": { - "@accordproject/concerto-cto": "3.7.0", + "@accordproject/concerto-cto": "3.8.2", "@accordproject/concerto-util": "3.0.0", - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-it-cicero": "0.16.8", - "@accordproject/markdown-pdf": "0.16.8", - "@accordproject/markdown-template": "0.16.8", - "@accordproject/markdown-transform": "0.16.8", "@babel/cli": "7.17.6", "@babel/core": "7.17.5", "@babel/plugin-transform-runtime": "7.17.0", @@ -68,7 +62,7 @@ "yargs": "17.3.1" }, "devDependencies": { - "@accordproject/concerto-core": "3.7.0", + "@accordproject/concerto-core": "3.8.2", "colors": "1.4.0", "coveralls": "3.0.4", "dayjs": "1.10.8", @@ -91,12 +85,14 @@ } }, "node_modules/@accordproject/concerto-core": { - "version": "3.7.0", - "license": "Apache-2.0", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-core/-/concerto-core-3.8.2.tgz", + "integrity": "sha512-4kLlnQIdKYpzPIceyzcRy43AyhC/FkEs5VCrrfjO8Zyn3tuHGozdCF5IXI2AYujei0jH4cYHWOIBGS4Pmh/ZgA==", + "dev": true, "dependencies": { - "@accordproject/concerto-cto": "3.7.0", - "@accordproject/concerto-metamodel": "3.7.0", - "@accordproject/concerto-util": "3.7.0", + "@accordproject/concerto-cto": "3.8.2", + "@accordproject/concerto-metamodel": "3.8.0", + "@accordproject/concerto-util": "3.8.2", "dayjs": "1.10.8", "debug": "4.3.1", "lorem-ipsum": "2.0.3", @@ -112,8 +108,10 @@ } }, "node_modules/@accordproject/concerto-core/node_modules/@accordproject/concerto-util": { - "version": "3.7.0", - "license": "Apache-2.0", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.8.2.tgz", + "integrity": "sha512-mu9AgL2zOu0b84Bqa2J6+mHb2b/ySB+n4MXcRFp44aGuHHwes3/3Zu8ys9rYMX0QVVpVNUEOCvaUVQdNygYwPg==", + "dev": true, "dependencies": { "@supercharge/promise-pool": "1.7.0", "axios": "0.23.0", @@ -128,11 +126,12 @@ } }, "node_modules/@accordproject/concerto-cto": { - "version": "3.7.0", - "license": "Apache-2.0", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-cto/-/concerto-cto-3.8.2.tgz", + "integrity": "sha512-rHSmFssEVCihIN+H70iCv57Nv9ehvFB/qL4v8rY0MnKxnftAQz8YSvMmMeE2eiQvIKSkv232hBMcenBtG+wd3A==", "dependencies": { - "@accordproject/concerto-metamodel": "3.7.0", - "@accordproject/concerto-util": "3.7.0", + "@accordproject/concerto-metamodel": "3.8.0", + "@accordproject/concerto-util": "3.8.2", "path-browserify": "1.0.1" }, "engines": { @@ -141,8 +140,9 @@ } }, "node_modules/@accordproject/concerto-cto/node_modules/@accordproject/concerto-util": { - "version": "3.7.0", - "license": "Apache-2.0", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.8.2.tgz", + "integrity": "sha512-mu9AgL2zOu0b84Bqa2J6+mHb2b/ySB+n4MXcRFp44aGuHHwes3/3Zu8ys9rYMX0QVVpVNUEOCvaUVQdNygYwPg==", "dependencies": { "@supercharge/promise-pool": "1.7.0", "axios": "0.23.0", @@ -157,8 +157,9 @@ } }, "node_modules/@accordproject/concerto-metamodel": { - "version": "3.7.0", - "license": "Apache-2.0", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-metamodel/-/concerto-metamodel-3.8.0.tgz", + "integrity": "sha512-oqJP+6xKlnvR4SrDU3U+iMhFeErdn9uKRdMqlOj6lW5Geyi4DTTURkf1Vf+x8LeI6CwuOErSNNxVVKFd3LoVjQ==", "dependencies": { "@accordproject/concerto-util": "3.7.0" }, @@ -169,7 +170,8 @@ }, "node_modules/@accordproject/concerto-metamodel/node_modules/@accordproject/concerto-util": { "version": "3.7.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@accordproject/concerto-util/-/concerto-util-3.7.0.tgz", + "integrity": "sha512-3qGVb/pv12hy5g44JvSH4ZZtFQ/9KNd9lWvVdh7AGfgtUdhPwlAssZTrmfY96uNP0eVE786HedC1DH6YstNK8g==", "dependencies": { "@supercharge/promise-pool": "1.7.0", "axios": "0.23.0", @@ -200,161 +202,6 @@ "npm": ">=6" } }, - "node_modules/@accordproject/markdown-cicero": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-cicero/-/markdown-cicero-0.16.8.tgz", - "integrity": "sha512-+4T0clcmMFkQwEwob52tcO/sCxrM/7N24nS64QJx8BGvgn91MPcGD3B9YGXbftPZLTqdhm6kFCZVMMRNNGpilQ==", - "dependencies": { - "@accordproject/concerto-core": "3.7.0", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-it-cicero": "0.16.8", - "markdown-it": "^13.0.1", - "winston": "3.2.1" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-common": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-common/-/markdown-common-0.16.8.tgz", - "integrity": "sha512-3AMnbCR1la/GlZrbVVnATlaG5JhVlaaL9SxE6vic/JVGU7hqfSSNVFC7r2kLwCzmVDguDukAyJtab6CxONWwlg==", - "dependencies": { - "@accordproject/concerto-core": "3.7.0", - "@xmldom/xmldom": "^0.8.1", - "markdown-it": "^13.0.1", - "winston": "3.2.1" - }, - "engines": { - "node": ">=15", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-docx": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-docx/-/markdown-docx-0.16.8.tgz", - "integrity": "sha512-6RAeq7UVT4ulV78olHsuB2i0kWALqlCWEh77TinD6D6cLu97KBnON6uOx+AKaFQzrQmca9oXD4xSR01vksRC/w==", - "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "mammoth": "^1.4.19" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-html": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-html/-/markdown-html-0.16.8.tgz", - "integrity": "sha512-0bRsmsPh4/aUyBYdYUaFpiw81LGaRu1d/TR8qDIkFPnhYx/QwB5uq5NxiIHjY2fR0W3jq/AKdAmC/GmyROyqUQ==", - "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "jsdom": "^16.7.0", - "type-of": "^2.0.1" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-it-cicero": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-it-cicero/-/markdown-it-cicero-0.16.8.tgz", - "integrity": "sha512-umtUh6X8JC47nZIQdqyAl847aJQ2FpUI7nYq8Z3FeqQWOdUArf8cWf3uoyd9Wu3Z+On4PqUUhoBlbJrehVQDag==", - "dependencies": { - "markdown-it": "^13.0.1" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-it-template": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-it-template/-/markdown-it-template-0.16.8.tgz", - "integrity": "sha512-DPjTANRBi6tktLK810JJDGrub3l2GKGSQtOgE/aHS1oRExVhdXlp1Maidu4zYtoW9+WwAmWf++gfK54HEf7xRA==", - "dependencies": { - "markdown-it": "^13.0.1" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-pdf": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-pdf/-/markdown-pdf-0.16.8.tgz", - "integrity": "sha512-4pE/PIKBk7b7o2UyfLIZoeZM9yUY03iEW4kMa2jn51Dec9Xn7hVipE0UOFw0auDSWoSAgq2ElMyruJofHumPTw==", - "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-template": "0.16.8", - "axios": "0.23.0", - "pdfjs-dist": "2.13.216", - "pdfmake": "^0.2.4", - "type-of": "^2.0.1" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-slate": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-slate/-/markdown-slate-0.16.8.tgz", - "integrity": "sha512-f5i4q1SN16YXpsQA8G9MtVjb24ucaxCYkIf75WcKeTvIrCYIJx9mIetFi67m8YZ/AoWDZKYSrB0NVj0ploslxA==", - "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-template": "0.16.8" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-template": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-template/-/markdown-template-0.16.8.tgz", - "integrity": "sha512-rzr5lwno9DsxZFkKGMkMn+u2sy8eqLdgtbevy0fpXzDpj+BvM5e86Xg/hhYK5653icDRUi64UZNKE6fE9p5HhA==", - "dependencies": { - "@accordproject/concerto-core": "3.7.0", - "@accordproject/concerto-cto": "3.7.0", - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-it-template": "0.16.8", - "dayjs": "1.10.8", - "markdown-it": "^13.0.1", - "uuid": "8.3.2" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, - "node_modules/@accordproject/markdown-transform": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@accordproject/markdown-transform/-/markdown-transform-0.16.8.tgz", - "integrity": "sha512-4816JqzgUdOhnIm5jcfmyj1YI5tMKsgl5PAROef5EHTVwZiq1kpqKlESC0S+nKrkUpfomfMQM6WGoxzshmn76Q==", - "dependencies": { - "@accordproject/concerto-core": "3.7.0", - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-docx": "0.16.8", - "@accordproject/markdown-html": "0.16.8", - "@accordproject/markdown-pdf": "0.16.8", - "@accordproject/markdown-slate": "0.16.8", - "@accordproject/markdown-template": "0.16.8", - "dijkstrajs": "^1.0.2" - }, - "engines": { - "node": ">=14", - "npm": ">=6" - } - }, "node_modules/@ampproject/remapping": { "version": "2.1.2", "license": "Apache-2.0", @@ -6731,6 +6578,7 @@ }, "node_modules/dayjs": { "version": "1.10.8", + "dev": true, "license": "MIT" }, "node_modules/debug": { @@ -7123,6 +6971,7 @@ }, "node_modules/drange": { "version": "1.1.1", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -11489,6 +11338,7 @@ }, "node_modules/lorem-ipsum": { "version": "2.0.3", + "dev": true, "license": "ISC", "dependencies": { "commander": "^2.17.1" @@ -11511,6 +11361,7 @@ }, "node_modules/lru-cache": { "version": "6.0.0", + "dev": true, "license": "ISC", "dependencies": { "yallist": "^4.0.0" @@ -14641,6 +14492,7 @@ }, "node_modules/randexp": { "version": "0.5.3", + "dev": true, "license": "MIT", "dependencies": { "drange": "^1.0.2", @@ -15324,6 +15176,7 @@ }, "node_modules/ret": { "version": "0.2.2", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -15498,6 +15351,7 @@ }, "node_modules/semver": { "version": "7.3.5", + "dev": true, "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" @@ -17155,6 +17009,7 @@ }, "node_modules/urijs": { "version": "1.19.11", + "dev": true, "license": "MIT" }, "node_modules/urix": { @@ -17913,6 +17768,7 @@ }, "node_modules/yallist": { "version": "4.0.0", + "dev": true, "license": "ISC" }, "node_modules/yaml": { diff --git a/package.json b/package.json index c98526c7..a8f89c2f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "@accordproject/concerto-core": "3.7.0", + "@accordproject/concerto-core": "3.8.2", "colors": "1.4.0", "coveralls": "3.0.4", "dayjs": "1.10.8", diff --git a/packages/dingus/package.json b/packages/dingus/package.json index 07ef2a72..3a4039f7 100644 --- a/packages/dingus/package.json +++ b/packages/dingus/package.json @@ -19,12 +19,12 @@ }, "files": [], "devDependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-it-cicero": "0.16.8", + "@accordproject/markdown-cicero": "0.16.11", + "@accordproject/markdown-common": "0.16.11", + "@accordproject/markdown-it-cicero": "0.16.11", "@accordproject/markdown-it-template": "0.16.11", - "@accordproject/markdown-pdf": "0.16.8", - "@accordproject/markdown-template": "0.16.8", + "@accordproject/markdown-pdf": "0.16.11", + "@accordproject/markdown-template": "0.16.11", "@babel/core": "7.17.5", "@babel/plugin-transform-runtime": "7.17.0", "@babel/preset-env": "7.16.11", diff --git a/packages/markdown-cicero/package.json b/packages/markdown-cicero/package.json index 42705bfe..b8cbcc3f 100644 --- a/packages/markdown-cicero/package.json +++ b/packages/markdown-cicero/package.json @@ -51,7 +51,7 @@ "nyc": "15.1.0" }, "dependencies": { - "@accordproject/concerto-core": "3.7.0", + "@accordproject/concerto-core": "3.8.2", "@accordproject/markdown-common": "0.16.11", "@accordproject/markdown-it-cicero": "0.16.11", "markdown-it": "^13.0.1", diff --git a/packages/markdown-cicero/test/data/decorators/boolean.json b/packages/markdown-cicero/test/data/decorators/boolean.json index 3ea8a281..a38c75c7 100644 --- a/packages/markdown-cicero/test/data/decorators/boolean.json +++ b/packages/markdown-cicero/test/data/decorators/boolean.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cicero/test/data/decorators/identifier.json b/packages/markdown-cicero/test/data/decorators/identifier.json index 6c11a006..61192ae3 100644 --- a/packages/markdown-cicero/test/data/decorators/identifier.json +++ b/packages/markdown-cicero/test/data/decorators/identifier.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cicero/test/data/decorators/invalid-arg-name.json b/packages/markdown-cicero/test/data/decorators/invalid-arg-name.json index 66d35a8a..424317e2 100644 --- a/packages/markdown-cicero/test/data/decorators/invalid-arg-name.json +++ b/packages/markdown-cicero/test/data/decorators/invalid-arg-name.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cicero/test/data/decorators/invalid-odd.json b/packages/markdown-cicero/test/data/decorators/invalid-odd.json index 1115cc8d..a70d4211 100644 --- a/packages/markdown-cicero/test/data/decorators/invalid-odd.json +++ b/packages/markdown-cicero/test/data/decorators/invalid-odd.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cicero/test/data/decorators/multi.json b/packages/markdown-cicero/test/data/decorators/multi.json index cef1d019..18e861a1 100644 --- a/packages/markdown-cicero/test/data/decorators/multi.json +++ b/packages/markdown-cicero/test/data/decorators/multi.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cicero/test/data/decorators/number.json b/packages/markdown-cicero/test/data/decorators/number.json index 725c1219..b5f0e415 100644 --- a/packages/markdown-cicero/test/data/decorators/number.json +++ b/packages/markdown-cicero/test/data/decorators/number.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cicero/test/data/decorators/string.json b/packages/markdown-cicero/test/data/decorators/string.json index 5fb5bf2e..7ca27fb9 100644 --- a/packages/markdown-cicero/test/data/decorators/string.json +++ b/packages/markdown-cicero/test/data/decorators/string.json @@ -1,5 +1,5 @@ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "decorators": [ { "$class": "concerto.metamodel@1.0.0.Decorator", diff --git a/packages/markdown-cli/package.json b/packages/markdown-cli/package.json index 7f2cc719..e49947ea 100644 --- a/packages/markdown-cli/package.json +++ b/packages/markdown-cli/package.json @@ -55,7 +55,7 @@ }, "dependencies": { "@accordproject/concerto-util": "3.0.0", - "@accordproject/markdown-transform": "0.16.8", + "@accordproject/markdown-transform": "0.16.11", "jsome": "2.5.0", "winston": "3.2.1", "yargs": "17.3.1" diff --git a/packages/markdown-cli/test/data/acceptance/grammar.json b/packages/markdown-cli/test/data/acceptance/grammar.json index 22974aab..25159066 100644 --- a/packages/markdown-cli/test/data/acceptance/grammar.json +++ b/packages/markdown-cli/test/data/acceptance/grammar.json @@ -3,7 +3,7 @@ "xmlns": "http://commonmark.org/xml/1.0", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.ContractDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ContractDefinition", "name": "top", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.Contract", "nodes": [ @@ -40,7 +40,7 @@ ] }, { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "name": "deliveryClause", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.AcceptanceOfDeliveryClause", "nodes": [ @@ -58,7 +58,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -75,7 +75,7 @@ "text": "if in " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -85,7 +85,7 @@ "text": "'s opinion, the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -101,7 +101,7 @@ "text": "Acceptance Criteria, and " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -111,7 +111,7 @@ "text": " notifies " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -128,7 +128,7 @@ "text": "that it is accepting the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -152,7 +152,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -162,7 +162,7 @@ "text": " will have " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "businessDays", "elementType": "Long" }, @@ -178,7 +178,7 @@ "text": "evaluate the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -190,7 +190,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -203,7 +203,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -231,7 +231,7 @@ "text": "The \"Acceptance Criteria\" are the specifications the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -243,7 +243,7 @@ "text": "must meet for the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -260,7 +260,7 @@ "text": "obligations under this agreement, detailed in " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "attachment", "elementType": "String" }, diff --git a/packages/markdown-common/package.json b/packages/markdown-common/package.json index e836c5fb..065123c2 100644 --- a/packages/markdown-common/package.json +++ b/packages/markdown-common/package.json @@ -51,7 +51,7 @@ "nyc": "15.1.0" }, "dependencies": { - "@accordproject/concerto-core": "3.7.0", + "@accordproject/concerto-core": "3.8.2", "@xmldom/xmldom": "^0.8.1", "markdown-it": "^13.0.1", "winston": "3.2.1" diff --git a/packages/markdown-docx/package.json b/packages/markdown-docx/package.json index bda1aacd..672224e1 100644 --- a/packages/markdown-docx/package.json +++ b/packages/markdown-docx/package.json @@ -81,8 +81,8 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", + "@accordproject/markdown-cicero": "0.16.11", + "@accordproject/markdown-common": "0.16.11", "mammoth": "^1.4.19" }, "license-check-and-add-config": { diff --git a/packages/markdown-html/package.json b/packages/markdown-html/package.json index 844c2b78..37d5e719 100644 --- a/packages/markdown-html/package.json +++ b/packages/markdown-html/package.json @@ -84,8 +84,8 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", + "@accordproject/markdown-cicero": "0.16.11", + "@accordproject/markdown-common": "0.16.11", "jsdom": "^16.7.0", "type-of": "^2.0.1" }, diff --git a/packages/markdown-pdf/package.json b/packages/markdown-pdf/package.json index 189cccea..9d6e4c6a 100644 --- a/packages/markdown-pdf/package.json +++ b/packages/markdown-pdf/package.json @@ -81,9 +81,9 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-template": "0.16.8", + "@accordproject/markdown-cicero": "0.16.11", + "@accordproject/markdown-common": "0.16.11", + "@accordproject/markdown-template": "0.16.11", "axios": "0.23.0", "pdfjs-dist": "2.13.216", "pdfmake": "^0.2.4", diff --git a/packages/markdown-slate/lib/__snapshots__/SlateTransformer.test.js.snap b/packages/markdown-slate/lib/__snapshots__/SlateTransformer.test.js.snap index 04d4272d..250be854 100644 --- a/packages/markdown-slate/lib/__snapshots__/SlateTransformer.test.js.snap +++ b/packages/markdown-slate/lib/__snapshots__/SlateTransformer.test.js.snap @@ -11450,7 +11450,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Document", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.AcceptanceOfDeliveryClause", "name": "top", "nodes": Array [ @@ -11468,7 +11468,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11485,7 +11485,7 @@ Object { "text": "if in ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "receiver", @@ -11495,7 +11495,7 @@ Object { "text": "'s opinion, the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11511,7 +11511,7 @@ Object { "text": "Acceptance Criteria, and ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "receiver", @@ -11521,7 +11521,7 @@ Object { "text": " notifies ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11538,7 +11538,7 @@ Object { "text": "that it is accepting the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11562,7 +11562,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "receiver", @@ -11572,7 +11572,7 @@ Object { "text": " will have ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Long", "name": "businessDays", }, @@ -11588,7 +11588,7 @@ Object { "text": "evaluate the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11600,7 +11600,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Softbreak", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11613,7 +11613,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Softbreak", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11641,7 +11641,7 @@ Object { "text": "The \\"Acceptance Criteria\\" are the specifications the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11653,7 +11653,7 @@ Object { "text": "must meet for the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11670,7 +11670,7 @@ Object { "text": "obligations under this agreement, detailed in ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "attachment", }, @@ -11699,7 +11699,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Document", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.AcceptanceOfDeliveryClause", "name": "top", "nodes": Array [ @@ -11717,7 +11717,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11734,7 +11734,7 @@ Object { "text": "if in ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "receiver", @@ -11744,7 +11744,7 @@ Object { "text": "'s opinion, the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11760,7 +11760,7 @@ Object { "text": "Acceptance Criteria, and ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "receiver", @@ -11770,7 +11770,7 @@ Object { "text": " notifies ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11787,7 +11787,7 @@ Object { "text": "that it is accepting the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11811,7 +11811,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "receiver", @@ -11821,7 +11821,7 @@ Object { "text": " will have ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Long", "name": "businessDays", }, @@ -11837,7 +11837,7 @@ Object { "text": "evaluate the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11849,7 +11849,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Softbreak", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11862,7 +11862,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Softbreak", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11890,7 +11890,7 @@ Object { "text": "The \\"Acceptance Criteria\\" are the specifications the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "deliverable", }, @@ -11902,7 +11902,7 @@ Object { "text": "must meet for the ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.organization@0.2.0.Organization", "identifiedBy": "identifier", "name": "shipper", @@ -11919,7 +11919,7 @@ Object { "text": "obligations under this agreement, detailed in ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "attachment", }, @@ -12429,7 +12429,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Document", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.ContractDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ContractDefinition", "elementType": "org.accordproject.latedeliveryandpenalty.LateDeliveryAndPenaltyContract", "name": "top", "nodes": Array [ @@ -12451,7 +12451,7 @@ Object { "text": "In case of delayed delivery", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.ConditionalDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ConditionalDefinition", "name": "forceMajeure", "whenFalse": Array [], "whenTrue": Array [ @@ -12465,7 +12465,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Softbreak", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.cicero.contract.AccordParty", "name": "seller", }, @@ -12474,7 +12474,7 @@ Object { "text": " (the Seller) shall pay to ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.cicero.contract.AccordParty", "name": "buyer", }, @@ -12483,7 +12483,7 @@ Object { "text": " (the Buyer) for every ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.time.Duration", "name": "penaltyDuration", }, @@ -12495,7 +12495,7 @@ Object { "text": "of delay penalty amounting to ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Double", "name": "penaltyPercentage", }, @@ -12511,7 +12511,7 @@ Object { "text": "whose delivery has been delayed. Any fractional part of a ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "elementType": "org.accordproject.time.TemporalUnit", "enumValues": Array [ "seconds", @@ -12534,7 +12534,7 @@ Object { "text": "considered a full ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "elementType": "org.accordproject.time.TemporalUnit", "enumValues": Array [ "seconds", @@ -12557,7 +12557,7 @@ Object { "text": "exceed ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Double", "name": "capPercentage", }, @@ -12573,7 +12573,7 @@ Object { "text": "If the delay is more than ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.time.Duration", "name": "termination", }, @@ -12595,7 +12595,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Document", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.ContractDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ContractDefinition", "elementType": "org.accordproject.latedeliveryandpenalty.LateDeliveryAndPenaltyContract", "name": "top", "nodes": Array [ @@ -12617,7 +12617,7 @@ Object { "text": "In case of delayed delivery", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.ConditionalDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ConditionalDefinition", "name": "forceMajeure", "whenFalse": Array [], "whenTrue": Array [ @@ -12631,7 +12631,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Softbreak", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.cicero.contract.AccordParty", "name": "seller", }, @@ -12640,7 +12640,7 @@ Object { "text": " (the Seller) shall pay to ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.cicero.contract.AccordParty", "name": "buyer", }, @@ -12649,7 +12649,7 @@ Object { "text": " (the Buyer) for every ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.time.Duration", "name": "penaltyDuration", }, @@ -12661,7 +12661,7 @@ Object { "text": "of delay penalty amounting to ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Double", "name": "penaltyPercentage", }, @@ -12677,7 +12677,7 @@ Object { "text": "whose delivery has been delayed. Any fractional part of a ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "elementType": "org.accordproject.time.TemporalUnit", "enumValues": Array [ "seconds", @@ -12700,7 +12700,7 @@ Object { "text": "considered a full ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "elementType": "org.accordproject.time.TemporalUnit", "enumValues": Array [ "seconds", @@ -12723,7 +12723,7 @@ Object { "text": "exceed ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Double", "name": "capPercentage", }, @@ -12739,7 +12739,7 @@ Object { "text": "If the delay is more than ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "org.accordproject.time.Duration", "name": "termination", }, @@ -13077,7 +13077,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Document", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "elementType": "org.test.MyClause", "name": "top", "nodes": Array [ @@ -13089,7 +13089,7 @@ Object { "text": "This is a contract between ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "seller", }, @@ -13098,7 +13098,7 @@ Object { "text": " and ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "buyer", }, @@ -13107,7 +13107,7 @@ Object { "text": " for the amount of ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Double", "name": "amount", }, @@ -13116,7 +13116,7 @@ Object { "text": " ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "elementType": "org.accordproject.money.CurrencyCode", "enumValues": Array [ "AED", @@ -13301,7 +13301,7 @@ Object { "name": "currency", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.ConditionalDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ConditionalDefinition", "name": "forceMajeure", "whenFalse": Array [], "whenTrue": Array [ @@ -13329,7 +13329,7 @@ Object { "$class": "org.accordproject.commonmark@0.5.0.Document", "nodes": Array [ Object { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "elementType": "org.test.MyClause", "name": "top", "nodes": Array [ @@ -13341,7 +13341,7 @@ Object { "text": "This is a contract between ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "seller", }, @@ -13350,7 +13350,7 @@ Object { "text": " and ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "String", "name": "buyer", }, @@ -13359,7 +13359,7 @@ Object { "text": " for the amount of ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "elementType": "Double", "name": "amount", }, @@ -13368,7 +13368,7 @@ Object { "text": " ", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "elementType": "org.accordproject.money.CurrencyCode", "enumValues": Array [ "AED", @@ -13553,7 +13553,7 @@ Object { "name": "currency", }, Object { - "$class": "org.accordproject.templatemark@0.4.0.ConditionalDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ConditionalDefinition", "name": "forceMajeure", "whenFalse": Array [], "whenTrue": Array [ diff --git a/packages/markdown-slate/package.json b/packages/markdown-slate/package.json index 4571ac14..a89af479 100644 --- a/packages/markdown-slate/package.json +++ b/packages/markdown-slate/package.json @@ -51,9 +51,9 @@ "nyc": "15.1.0" }, "dependencies": { - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", - "@accordproject/markdown-template": "0.16.8" + "@accordproject/markdown-cicero": "0.16.11", + "@accordproject/markdown-common": "0.16.11", + "@accordproject/markdown-template": "0.16.11" }, "license-check-and-add-config": { "folder": "./lib", diff --git a/packages/markdown-slate/test/data/templatemark/acceptance_templatemark.json b/packages/markdown-slate/test/data/templatemark/acceptance_templatemark.json index e76000dd..2c8e46f5 100644 --- a/packages/markdown-slate/test/data/templatemark/acceptance_templatemark.json +++ b/packages/markdown-slate/test/data/templatemark/acceptance_templatemark.json @@ -3,7 +3,7 @@ "xmlns": "http://commonmark.org/xml/1.0", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "name": "top", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.AcceptanceOfDeliveryClause", "nodes": [ @@ -21,7 +21,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -38,7 +38,7 @@ "text": "if in " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -48,7 +48,7 @@ "text": "'s opinion, the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -64,7 +64,7 @@ "text": "Acceptance Criteria, and " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -74,7 +74,7 @@ "text": " notifies " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -91,7 +91,7 @@ "text": "that it is accepting the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -115,7 +115,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -125,7 +125,7 @@ "text": " will have " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "businessDays", "elementType": "Long" }, @@ -141,7 +141,7 @@ "text": "evaluate the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -153,7 +153,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -166,7 +166,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -194,7 +194,7 @@ "text": "The \"Acceptance Criteria\" are the specifications the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -206,7 +206,7 @@ "text": "must meet for the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -223,7 +223,7 @@ "text": "obligations under this agreement, detailed in " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "attachment", "elementType": "String" }, diff --git a/packages/markdown-slate/test/data/templatemark/latedelivery_templatemark.json b/packages/markdown-slate/test/data/templatemark/latedelivery_templatemark.json index e029061d..1961cd55 100644 --- a/packages/markdown-slate/test/data/templatemark/latedelivery_templatemark.json +++ b/packages/markdown-slate/test/data/templatemark/latedelivery_templatemark.json @@ -3,7 +3,7 @@ "xmlns": "http://commonmark.org/xml/1.0", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.ContractDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ContractDefinition", "name": "top", "elementType": "org.accordproject.latedeliveryandpenalty.LateDeliveryAndPenaltyContract", "nodes": [ @@ -25,7 +25,7 @@ "text": "In case of delayed delivery" }, { - "$class": "org.accordproject.templatemark@0.4.0.ConditionalDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ConditionalDefinition", "whenTrue": [ { "$class": "org.accordproject.commonmark@0.5.0.Text", @@ -39,7 +39,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "seller", "elementType": "org.accordproject.cicero.contract.AccordParty" }, @@ -48,7 +48,7 @@ "text": " (the Seller) shall pay to " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "buyer", "elementType": "org.accordproject.cicero.contract.AccordParty" }, @@ -57,7 +57,7 @@ "text": " (the Buyer) for every " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "penaltyDuration", "elementType": "org.accordproject.time.Duration" }, @@ -69,7 +69,7 @@ "text": "of delay penalty amounting to " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "penaltyPercentage", "elementType": "Double" }, @@ -85,7 +85,7 @@ "text": "whose delivery has been delayed. Any fractional part of a " }, { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "enumValues": [ "seconds", "minutes", @@ -108,7 +108,7 @@ "text": "considered a full " }, { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "enumValues": [ "seconds", "minutes", @@ -131,7 +131,7 @@ "text": "exceed " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "capPercentage", "elementType": "Double" }, @@ -147,7 +147,7 @@ "text": "If the delay is more than " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "termination", "elementType": "org.accordproject.time.Duration" }, diff --git a/packages/markdown-slate/test/data/templatemark/test1_templatemark.json b/packages/markdown-slate/test/data/templatemark/test1_templatemark.json index ebdc5220..ba62f469 100644 --- a/packages/markdown-slate/test/data/templatemark/test1_templatemark.json +++ b/packages/markdown-slate/test/data/templatemark/test1_templatemark.json @@ -3,7 +3,7 @@ "xmlns": "http://commonmark.org/xml/1.0", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "name": "top", "nodes": [ { @@ -14,7 +14,7 @@ "text": "This is a contract between " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "seller", "elementType": "String" }, @@ -23,7 +23,7 @@ "text": " and " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "buyer", "elementType": "String" }, @@ -32,7 +32,7 @@ "text": " for the amount of " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "amount", "elementType": "Double" }, @@ -41,7 +41,7 @@ "text": " " }, { - "$class": "org.accordproject.templatemark@0.4.0.EnumVariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.EnumVariableDefinition", "name": "currency", "enumValues": [ "AED", @@ -226,7 +226,7 @@ "elementType": "org.accordproject.money.CurrencyCode" }, { - "$class": "org.accordproject.templatemark@0.4.0.ConditionalDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ConditionalDefinition", "name": "forceMajeure", "whenTrue": [ { diff --git a/packages/markdown-template/package.json b/packages/markdown-template/package.json index 2377030c..25b51c7f 100644 --- a/packages/markdown-template/package.json +++ b/packages/markdown-template/package.json @@ -84,10 +84,10 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/concerto-core": "3.7.0", - "@accordproject/concerto-cto": "3.7.0", - "@accordproject/markdown-cicero": "0.16.8", - "@accordproject/markdown-common": "0.16.8", + "@accordproject/concerto-core": "3.8.2", + "@accordproject/concerto-cto": "3.8.2", + "@accordproject/markdown-cicero": "0.16.11", + "@accordproject/markdown-common": "0.16.11", "@accordproject/markdown-it-template": "0.16.11", "dayjs": "1.10.8", "markdown-it": "^13.0.1", diff --git a/packages/markdown-transform/package.json b/packages/markdown-transform/package.json index 4e1fd7b1..3c2f36b3 100644 --- a/packages/markdown-transform/package.json +++ b/packages/markdown-transform/package.json @@ -87,7 +87,7 @@ "webpack-cli": "4.9.1" }, "dependencies": { - "@accordproject/concerto-core": "3.7.0", + "@accordproject/concerto-core": "3.8.2", "@accordproject/markdown-cicero": "0.16.11", "@accordproject/markdown-common": "0.16.11", "@accordproject/markdown-docx": "0.16.11", diff --git a/packages/markdown-transform/test/data/acceptance/grammar.json b/packages/markdown-transform/test/data/acceptance/grammar.json index 22974aab..25159066 100644 --- a/packages/markdown-transform/test/data/acceptance/grammar.json +++ b/packages/markdown-transform/test/data/acceptance/grammar.json @@ -3,7 +3,7 @@ "xmlns": "http://commonmark.org/xml/1.0", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.ContractDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ContractDefinition", "name": "top", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.Contract", "nodes": [ @@ -40,7 +40,7 @@ ] }, { - "$class": "org.accordproject.templatemark@0.4.0.ClauseDefinition", + "$class": "org.accordproject.templatemark@0.5.0.ClauseDefinition", "name": "deliveryClause", "elementType": "org.accordproject.acceptanceofdelivery@1.0.0.AcceptanceOfDeliveryClause", "nodes": [ @@ -58,7 +58,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -75,7 +75,7 @@ "text": "if in " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -85,7 +85,7 @@ "text": "'s opinion, the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -101,7 +101,7 @@ "text": "Acceptance Criteria, and " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -111,7 +111,7 @@ "text": " notifies " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -128,7 +128,7 @@ "text": "that it is accepting the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -152,7 +152,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Paragraph", "nodes": [ { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "receiver", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -162,7 +162,7 @@ "text": " will have " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "businessDays", "elementType": "Long" }, @@ -178,7 +178,7 @@ "text": "evaluate the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -190,7 +190,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -203,7 +203,7 @@ "$class": "org.accordproject.commonmark@0.5.0.Softbreak" }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -231,7 +231,7 @@ "text": "The \"Acceptance Criteria\" are the specifications the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "deliverable", "elementType": "String" }, @@ -243,7 +243,7 @@ "text": "must meet for the " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "identifiedBy": "identifier", "name": "shipper", "elementType": "org.accordproject.organization@0.2.0.Organization" @@ -260,7 +260,7 @@ "text": "obligations under this agreement, detailed in " }, { - "$class": "org.accordproject.templatemark@0.4.0.VariableDefinition", + "$class": "org.accordproject.templatemark@0.5.0.VariableDefinition", "name": "attachment", "elementType": "String" },