Skip to content

Commit

Permalink
(feat) upgrade to Concerto v2 (#499)
Browse files Browse the repository at this point in the history 
Signed-off-by: Dan Selman <[email protected]>
  • Loading branch information
@dselman
dselman authored Apr 27, 2022
1 parent a86cf61 commit c03b222
Show file tree
Hide file tree
Showing 17 changed files with 18,900 additions and 139 deletions.
18,935 changes: 18,848 additions & 87 deletions package-lock.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@accordproject/concerto-core": "2.0.0-alpha.2",
"@accordproject/concerto-core": "2.0.0",
"colors": "1.4.0",
"coveralls": "3.0.4",
"dayjs": "1.10.8",
Expand All @@ -22,7 +22,7 @@
},
"name": "markdown-transform",
"description": "A framework for transforming markdown",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"private": true,
"scripts": {
"dingus": "lerna exec --scope dingus -- npm run dingus",
Expand Down
14 changes: 7 additions & 7 deletions packages/dingus/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dingus",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Markdown Transform Dingus",
"keywords": [
"accord-project",
Expand All @@ -19,12 +19,12 @@
},
"files": [],
"devDependencies": {
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-it-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-it-template": "0.15.0-alpha.2",
"@accordproject/markdown-pdf": "0.15.0-alpha.2",
"@accordproject/markdown-template": "0.15.0-alpha.2",
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"@accordproject/markdown-it-cicero": "0.15.0",
"@accordproject/markdown-it-template": "0.15.0",
"@accordproject/markdown-pdf": "0.15.0",
"@accordproject/markdown-template": "0.15.0",
"@babel/core": "7.17.5",
"@babel/plugin-transform-runtime": "7.17.0",
"@babel/preset-env": "7.16.11",
Expand Down
8 changes: 4 additions & 4 deletions packages/markdown-cicero/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-cicero",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "A framework for transforming markdown",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -51,9 +51,9 @@
"nyc": "15.1.0"
},
"dependencies": {
"@accordproject/concerto-core": "2.0.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-it-cicero": "0.15.0-alpha.2",
"@accordproject/concerto-core": "2.0.0",
"@accordproject/markdown-common": "0.15.0",
"@accordproject/markdown-it-cicero": "0.15.0",
"markdown-it": "^12.3.2",
"winston": "3.2.1"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/markdown-cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-cli",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "A framework for transforming markdown",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -54,8 +54,8 @@
"tsd-jsdoc": "^2.3.0"
},
"dependencies": {
"@accordproject/concerto-util": "2.0.0-alpha.2",
"@accordproject/markdown-transform": "0.15.0-alpha.2",
"@accordproject/concerto-util": "2.0.0",
"@accordproject/markdown-transform": "0.15.0",
"jsome": "2.5.0",
"winston": "3.2.1",
"yargs": "17.3.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-common/lib/ToMarkdownVisitor.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('ToMarkdownVisitor', () => {

it('#toMarkdown (wrong commonmark)', () => {
const toMarkdownVisitor = new ToMarkdownVisitor();
expect(() => toMarkdownVisitor.toMarkdown(serializer.fromJSON(commonmarkErr))).toThrow('Type FOO is not defined in namespace org.accordproject.commonmark');
expect(() => toMarkdownVisitor.toMarkdown(serializer.fromJSON(commonmarkErr))).toThrow('Type "FOO" is not defined in namespace "org.accordproject.commonmark".');
});

it('#toMarkdown (missing rule)', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/markdown-common/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-common",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "A framework for transforming markdown",
"engines": {
"node": ">=15",
Expand Down Expand Up @@ -51,7 +51,7 @@
"nyc": "15.1.0"
},
"dependencies": {
"@accordproject/concerto-core": "2.0.0-alpha.2",
"@accordproject/concerto-core": "2.0.0",
"@xmldom/xmldom": "^0.8.1",
"markdown-it": "^12.3.2",
"winston": "3.2.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/markdown-docx/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-docx",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Transform DOCX to CiceroMark DOM",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -81,8 +81,8 @@
"webpack-cli": "4.9.1"
},
"dependencies": {
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"mammoth": "^1.4.19"
},
"license-check-and-add-config": {
Expand Down
6 changes: 3 additions & 3 deletions packages/markdown-html/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-html",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Transform CiceroDOM to HTML",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -84,8 +84,8 @@
"webpack-cli": "4.9.1"
},
"dependencies": {
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"jsdom": "^16.7.0",
"type-of": "^2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-it-cicero/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-it-cicero",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Plugin to introduce cicero blocks and inlines for the markdown-it markdown parser",
"engines": {
"node": ">=14",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown-it-template/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-it-template",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Plugin to introduce template blocks and inlines for the markdown-it markdown parser",
"engines": {
"node": ">=14",
Expand Down
8 changes: 4 additions & 4 deletions packages/markdown-pdf/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-pdf",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Transform PDF to/from CiceroMark DOM",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -81,9 +81,9 @@
"webpack-cli": "4.9.1"
},
"dependencies": {
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-template": "0.15.0-alpha.2",
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"@accordproject/markdown-template": "0.15.0",
"axios": "0.23.0",
"pdfjs-dist": "2.13.216",
"pdfmake": "^0.2.4",
Expand Down
8 changes: 4 additions & 4 deletions packages/markdown-slate/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-slate",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "Transform markdown to/from CommonMark AST",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -51,9 +51,9 @@
"nyc": "15.1.0"
},
"dependencies": {
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-template": "0.15.0-alpha.2"
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"@accordproject/markdown-template": "0.15.0"
},
"license-check-and-add-config": {
"folder": "./lib",
Expand Down
12 changes: 6 additions & 6 deletions packages/markdown-template/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-template",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "A framework for transforming markdown",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -56,11 +56,11 @@
"nyc": "15.1.0"
},
"dependencies": {
"@accordproject/concerto-core": "2.0.0-alpha.2",
"@accordproject/concerto-cto": "2.0.0-alpha.2",
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-it-template": "0.15.0-alpha.2",
"@accordproject/concerto-core": "2.0.0",
"@accordproject/concerto-cto": "2.0.0",
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"@accordproject/markdown-it-template": "0.15.0",
"dayjs": "1.10.8",
"markdown-it": "^12.3.2",
"parsimmon": "1.16.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/markdown-template/test/ToParserVisitor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,13 @@ describe('#invalidparsers', () => {

describe('#templateErr1', () => {
it('should throw for wrong $class', async () => {
(() => parserVisitor.toParser(parserManager,templateErr1,parsingTable)).should.throw('Namespace is not defined for type foo');
(() => parserVisitor.toParser(parserManager,templateErr1,parsingTable)).should.throw('Namespace is not defined for type "foo"');
});
});

describe('#templateErr2', () => {
it('should throw for wrong variable type', async () => {
(() => parserVisitor.toParser(parserManager,templateErr2,parsingTable)).should.throw('Namespace is not defined for type FOO');
(() => parserVisitor.toParser(parserManager,templateErr2,parsingTable)).should.throw('Namespace is not defined for type "FOO"');
});
});
});
18 changes: 9 additions & 9 deletions packages/markdown-transform/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/markdown-transform",
"version": "0.15.0-alpha.2",
"version": "0.15.0",
"description": "API for transforming markdown data",
"engines": {
"node": ">=14",
Expand Down Expand Up @@ -55,14 +55,14 @@
"tsd-jsdoc": "^2.3.0"
},
"dependencies": {
"@accordproject/concerto-core": "2.0.0-alpha.2",
"@accordproject/markdown-cicero": "0.15.0-alpha.2",
"@accordproject/markdown-common": "0.15.0-alpha.2",
"@accordproject/markdown-docx": "0.15.0-alpha.2",
"@accordproject/markdown-html": "0.15.0-alpha.2",
"@accordproject/markdown-pdf": "0.15.0-alpha.2",
"@accordproject/markdown-slate": "0.15.0-alpha.2",
"@accordproject/markdown-template": "0.15.0-alpha.2",
"@accordproject/concerto-core": "2.0.0",
"@accordproject/markdown-cicero": "0.15.0",
"@accordproject/markdown-common": "0.15.0",
"@accordproject/markdown-docx": "0.15.0",
"@accordproject/markdown-html": "0.15.0",
"@accordproject/markdown-pdf": "0.15.0",
"@accordproject/markdown-slate": "0.15.0",
"@accordproject/markdown-template": "0.15.0",
"dijkstrajs": "^1.0.2"
},
"license-check-and-add-config": {
Expand Down
Binary file modified packages/markdown-transform/transformations.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c03b222

Please sign in to comment.