diff --git a/e2e/package.json b/e2e/package.json index 27e29085..d0b09c46 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -1,6 +1,6 @@ { "name": "markdown-transform-e2e", - "version": "1.0.0", + "version": "1.1.0", "private": true, "description": "End-to-end tests that load the UMD browser bundles into a real headless Chromium and exercise the public API.", "scripts": { diff --git a/package-lock.json b/package-lock.json index 6bea4973..dd0baacb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "markdown-transform", - "version": "1.0.0", + "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "markdown-transform", - "version": "1.0.0", + "version": "1.1.0", "hasInstallScript": true, "license": "Apache-2.0", "workspaces": [ @@ -33,7 +33,7 @@ }, "e2e": { "name": "markdown-transform-e2e", - "version": "1.0.0", + "version": "1.1.0", "devDependencies": { "@playwright/test": "^1.49.0" } @@ -197,7 +197,6 @@ "version": "7.29.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -698,7 +697,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" }, @@ -719,7 +717,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" } @@ -1677,7 +1674,6 @@ "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", @@ -2055,7 +2051,6 @@ "version": "8.16.0", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -2105,7 +2100,6 @@ "version": "8.18.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -2577,7 +2571,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -3606,7 +3599,6 @@ "version": "8.57.1", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -5249,7 +5241,6 @@ "version": "29.7.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -7183,7 +7174,6 @@ "version": "6.14.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -8622,7 +8612,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8781,7 +8770,6 @@ "version": "5.104.1", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -8829,7 +8817,6 @@ "version": "5.1.4", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", "@webpack-cli/configtest": "^2.1.1", @@ -9277,11 +9264,11 @@ }, "packages/markdown-cicero": { "name": "@accordproject/markdown-cicero", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/markdown-common": "*", - "@accordproject/markdown-it-cicero": "*", + "@accordproject/markdown-common": "1.1.0", + "@accordproject/markdown-it-cicero": "1.1.0", "markdown-it": "^14.1.0", "semver": "7.6.3", "winston": "3.17.0" @@ -9392,11 +9379,11 @@ }, "packages/markdown-cli": { "name": "@accordproject/markdown-cli", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { "@accordproject/concerto-util": "^5.0.0", - "@accordproject/markdown-transform": "*", + "@accordproject/markdown-transform": "1.1.0", "yargs": "17.7.2" }, "bin": { @@ -9503,7 +9490,7 @@ }, "packages/markdown-common": { "name": "@accordproject/markdown-common", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { "@xmldom/xmldom": "^0.9.10", @@ -9615,11 +9602,11 @@ }, "packages/markdown-html": { "name": "@accordproject/markdown-html", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/markdown-cicero": "*", - "@accordproject/markdown-common": "*", + "@accordproject/markdown-cicero": "1.1.0", + "@accordproject/markdown-common": "1.1.0", "jsdom": "^25.0.1", "process": "^0.11.10", "type-of": "^2.0.1" @@ -9736,7 +9723,7 @@ }, "packages/markdown-it-cicero": { "name": "@accordproject/markdown-it-cicero", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { "markdown-it": "^14.1.0" @@ -9842,7 +9829,7 @@ }, "packages/markdown-it-template": { "name": "@accordproject/markdown-it-template", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { "markdown-it": "^14.1.0" @@ -9948,12 +9935,12 @@ }, "packages/markdown-template": { "name": "@accordproject/markdown-template", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/markdown-cicero": "*", - "@accordproject/markdown-common": "*", - "@accordproject/markdown-it-template": "*", + "@accordproject/markdown-cicero": "1.1.0", + "@accordproject/markdown-common": "1.1.0", + "@accordproject/markdown-it-template": "1.1.0", "dayjs": "1.11.13", "markdown-it": "^14.1.0", "process": "^0.11.10" @@ -10070,13 +10057,13 @@ }, "packages/markdown-transform": { "name": "@accordproject/markdown-transform", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@accordproject/markdown-cicero": "*", - "@accordproject/markdown-common": "*", - "@accordproject/markdown-html": "*", - "@accordproject/markdown-template": "*", + "@accordproject/markdown-cicero": "1.1.0", + "@accordproject/markdown-common": "1.1.0", + "@accordproject/markdown-html": "1.1.0", + "@accordproject/markdown-template": "1.1.0", "dijkstrajs": "^1.0.3", "jszip": "^3.10.1", "process": "^0.11.10" diff --git a/package.json b/package.json index ea3c1f8d..0c3a2d42 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ ], "name": "markdown-transform", "description": "A framework for transforming markdown", - "version": "1.0.0", + "version": "1.1.0", "private": true, "scripts": { "build": "npm run build -w @accordproject/markdown-common && npm run build -w @accordproject/markdown-it-template -w @accordproject/markdown-it-cicero && npm run build -w @accordproject/markdown-cicero && npm run build -w @accordproject/markdown-html -w @accordproject/markdown-template && npm run build -w @accordproject/markdown-transform && npm run build -w @accordproject/markdown-cli", diff --git a/packages/markdown-cicero/package.json b/packages/markdown-cicero/package.json index 872026ad..c46d3cfc 100644 --- a/packages/markdown-cicero/package.json +++ b/packages/markdown-cicero/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-cicero", - "version": "1.0.0", + "version": "1.1.0", "description": "A framework for transforming markdown", "engines": { "node": ">=22", @@ -63,8 +63,8 @@ "@accordproject/concerto-core": "^5.0.0" }, "dependencies": { - "@accordproject/markdown-common": "*", - "@accordproject/markdown-it-cicero": "*", + "@accordproject/markdown-common": "1.1.0", + "@accordproject/markdown-it-cicero": "1.1.0", "markdown-it": "^14.1.0", "semver": "7.6.3", "winston": "3.17.0" diff --git a/packages/markdown-cli/package.json b/packages/markdown-cli/package.json index dd896ca3..1ab86952 100644 --- a/packages/markdown-cli/package.json +++ b/packages/markdown-cli/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-cli", - "version": "1.0.0", + "version": "1.1.0", "description": "A framework for transforming markdown", "engines": { "node": ">=22", @@ -60,7 +60,7 @@ }, "dependencies": { "@accordproject/concerto-util": "^5.0.0", - "@accordproject/markdown-transform": "*", + "@accordproject/markdown-transform": "1.1.0", "yargs": "17.7.2" }, "license-check-and-add-config": { diff --git a/packages/markdown-common/package.json b/packages/markdown-common/package.json index 110a727b..429b9e8e 100644 --- a/packages/markdown-common/package.json +++ b/packages/markdown-common/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-common", - "version": "1.0.0", + "version": "1.1.0", "description": "A framework for transforming markdown", "engines": { "node": ">=22", diff --git a/packages/markdown-common/src/externalModels/ConcertoMetaModel.ts b/packages/markdown-common/src/externalModels/ConcertoMetaModel.ts index 8fb2a9b0..ce92445d 100644 --- a/packages/markdown-common/src/externalModels/ConcertoMetaModel.ts +++ b/packages/markdown-common/src/externalModels/ConcertoMetaModel.ts @@ -48,6 +48,7 @@ concept Range { concept TypeIdentifier { o String name o String namespace optional + o String resolvedName optional } abstract concept DecoratorLiteral { @@ -160,10 +161,16 @@ abstract concept Property { o String name regex=/^(\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4})(?:\\p{Lu}|\\p{Ll}|\\p{Lt}|\\p{Lm}|\\p{Lo}|\\p{Nl}|\\$|_|\\\\u[0-9A-Fa-f]{4}|\\p{Mn}|\\p{Mc}|\\p{Nd}|\\p{Pc}|\\u200C|\\u200D)*$/u o Boolean isArray default=false o Boolean isOptional default=false + o CollectionSizeValidator sizeValidator optional o Decorator[] decorators optional o Range location optional } +concept CollectionSizeValidator { + o Integer minSize optional + o Integer maxSize optional +} + concept RelationshipProperty extends Property { o TypeIdentifier type } @@ -261,6 +268,7 @@ concept Models { } abstract concept ScalarDeclaration extends Declaration { + o String namespace optional } concept BooleanScalar extends ScalarDeclaration { diff --git a/packages/markdown-html/package.json b/packages/markdown-html/package.json index fa503821..7ee5c2d2 100644 --- a/packages/markdown-html/package.json +++ b/packages/markdown-html/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-html", - "version": "1.0.0", + "version": "1.1.0", "description": "Transform CiceroDOM to HTML", "engines": { "node": ">=22", @@ -74,8 +74,8 @@ "webpack-cli": "5.1.4" }, "dependencies": { - "@accordproject/markdown-cicero": "*", - "@accordproject/markdown-common": "*", + "@accordproject/markdown-cicero": "1.1.0", + "@accordproject/markdown-common": "1.1.0", "jsdom": "^25.0.1", "process": "^0.11.10", "type-of": "^2.0.1" diff --git a/packages/markdown-it-cicero/package.json b/packages/markdown-it-cicero/package.json index 2c6a216a..60552225 100644 --- a/packages/markdown-it-cicero/package.json +++ b/packages/markdown-it-cicero/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-it-cicero", - "version": "1.0.0", + "version": "1.1.0", "description": "Plugin to introduce cicero blocks and inlines for the markdown-it markdown parser", "engines": { "node": ">=22", diff --git a/packages/markdown-it-template/package.json b/packages/markdown-it-template/package.json index 0d016d21..69f98101 100644 --- a/packages/markdown-it-template/package.json +++ b/packages/markdown-it-template/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-it-template", - "version": "1.0.0", + "version": "1.1.0", "description": "Plugin to introduce template blocks and inlines for the markdown-it markdown parser", "engines": { "node": ">=22", diff --git a/packages/markdown-template/package.json b/packages/markdown-template/package.json index 0ef7617a..718c65fa 100644 --- a/packages/markdown-template/package.json +++ b/packages/markdown-template/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-template", - "version": "1.0.0", + "version": "1.1.0", "description": "A framework for transforming markdown", "engines": { "node": ">=22", @@ -73,9 +73,9 @@ "@accordproject/concerto-cto": "^5.0.0" }, "dependencies": { - "@accordproject/markdown-cicero": "*", - "@accordproject/markdown-common": "*", - "@accordproject/markdown-it-template": "*", + "@accordproject/markdown-cicero": "1.1.0", + "@accordproject/markdown-common": "1.1.0", + "@accordproject/markdown-it-template": "1.1.0", "dayjs": "1.11.13", "markdown-it": "^14.1.0", "process": "^0.11.10" diff --git a/packages/markdown-transform/package.json b/packages/markdown-transform/package.json index e83a197a..51574b26 100644 --- a/packages/markdown-transform/package.json +++ b/packages/markdown-transform/package.json @@ -1,6 +1,6 @@ { "name": "@accordproject/markdown-transform", - "version": "1.0.0", + "version": "1.1.0", "description": "API for transforming markdown data", "engines": { "node": ">=22", @@ -72,10 +72,10 @@ "@accordproject/concerto-core": "^5.0.0" }, "dependencies": { - "@accordproject/markdown-cicero": "*", - "@accordproject/markdown-common": "*", - "@accordproject/markdown-html": "*", - "@accordproject/markdown-template": "*", + "@accordproject/markdown-cicero": "1.1.0", + "@accordproject/markdown-common": "1.1.0", + "@accordproject/markdown-html": "1.1.0", + "@accordproject/markdown-template": "1.1.0", "dijkstrajs": "^1.0.3", "jszip": "^3.10.1", "process": "^0.11.10"