From 4ce3e55bbd159a9170e1e7a291714fa01f0ad942 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Wed, 6 Jan 2021 18:10:18 +0100 Subject: [PATCH] fix(yaml): fix YAML parsing in browsing environemnt Closes #232 --- apidom/package-lock.json | 24 +++++++++---------- apidom/package.json | 6 ++--- .../src/transformers/tree-sitter-yaml.ts | 6 ++--- .../package.json | 4 ++-- .../package.json | 4 ++-- .../apidom-parser-adapter-json/package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- .../package.json | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/apidom/package-lock.json b/apidom/package-lock.json index 184e80979f..c86236b6fc 100644 --- a/apidom/package-lock.json +++ b/apidom/package-lock.json @@ -3702,7 +3702,7 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-json": "=0.16.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" } }, "apidom-parser-adapter-asyncapi-yaml-2-0": { @@ -3720,7 +3720,7 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-yaml": "=0.3.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" } }, "apidom-parser-adapter-json": { @@ -3736,7 +3736,7 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-json": "=0.16.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" } }, "apidom-parser-adapter-openapi-json-3-1": { @@ -3754,7 +3754,7 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-json": "=0.16.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" } }, "apidom-parser-adapter-openapi-yaml-3-1": { @@ -3772,7 +3772,7 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-yaml": "=0.3.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" } }, "apidom-parser-adapter-yaml-1-2": { @@ -3788,7 +3788,7 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-yaml": "=0.3.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" } }, "apidom-reference": { @@ -13971,9 +13971,9 @@ } }, "tree-sitter-cli": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.17.0.tgz", - "integrity": "sha512-0osmcEvAsbp1cKx+rC0Ew8TzfqSCZgn7wvzRdgUcvF1k2Bk7vu/on3SHy1XG6El5HODwLZLAWfuRGay1DqBV5w==", + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.17.3.tgz", + "integrity": "sha512-AsQhjwRwWK5wtymwVc2H5E8/Q7yzMebSj7CQyeSg50k4h7m8HHwao1i/eKlh8aGTJ3IWbGjSwBAUZTSbzcSW6Q==", "dev": true }, "tree-sitter-json": { @@ -14538,9 +14538,9 @@ } }, "web-tree-sitter": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.0.tgz", - "integrity": "sha512-rTg3Zp0IXg137y3azIZnYQXyKI7uYiT6fi6AqbaJ4NbVhOUQkm8VMrJ3H/kza2PyJ5eNitbS5I4T9ivbTXd1iQ==" + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.1.tgz", + "integrity": "sha512-QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA==" }, "webidl-conversions": { "version": "4.0.2", diff --git a/apidom/package.json b/apidom/package.json index bbef81345f..cad6cc6e50 100644 --- a/apidom/package.json +++ b/apidom/package.json @@ -80,11 +80,11 @@ "rimraf": "=3.0.2", "sinon": "=9.2.1", "terser-webpack-plugin": "=3.0.2", - "tree-sitter-cli": "=0.17.0", + "tree-sitter-cli": "=0.17.3", + "ts-node": "^9.0.0", "typescript": "=3.9.3", "webpack": "=4.43.0", - "webpack-cli": "=3.3.11", - "ts-node": "^9.0.0" + "webpack-cli": "=3.3.11" }, "dependencies": { "apidom": "file:packages/apidom", diff --git a/apidom/packages/apidom-ast/src/transformers/tree-sitter-yaml.ts b/apidom/packages/apidom-ast/src/transformers/tree-sitter-yaml.ts index ca5d5b0f3b..840545a8ed 100644 --- a/apidom/packages/apidom-ast/src/transformers/tree-sitter-yaml.ts +++ b/apidom/packages/apidom-ast/src/transformers/tree-sitter-yaml.ts @@ -114,12 +114,12 @@ const Visitor = stampit({ } // key value was not explicitly provided; tag and anchor are missing too // @ts-ignore - if (node.valueNode === null) { + if (node.childCount === 2) { return true; } // key value was not explicitly provided; tag or anchor are provided though // @ts-ignore - return !node.valueNode.children.some(anyPass([isScalar, isSequence, isMapping])); + return !node.children[2].children.some(anyPass([isScalar, isSequence, isMapping])); }; const createKeyValuePairSurrogateValue = (node: SyntaxNode) => { @@ -128,7 +128,7 @@ const Visitor = stampit({ column: node.endPosition.column, char: node.endIndex, }); - const children = pathOr([], ['valueNode', 'children'], node); + const children = pathOr([], [2, 'children'], node); const tagNode: any | undefined = find(isKind('tag'), children); const anchorNode: any | undefined = find(isKind('anchor'), children); let tag = null; diff --git a/apidom/packages/apidom-parser-adapter-asyncapi-json-2-0/package.json b/apidom/packages/apidom-parser-adapter-asyncapi-json-2-0/package.json index 9f0d84474f..b067002490 100644 --- a/apidom/packages/apidom-parser-adapter-asyncapi-json-2-0/package.json +++ b/apidom/packages/apidom-parser-adapter-asyncapi-json-2-0/package.json @@ -33,9 +33,9 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-json": "=0.16.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" }, "devDependencies": { - "tree-sitter-cli": "=0.17.0" + "tree-sitter-cli": "=0.17.3" } } diff --git a/apidom/packages/apidom-parser-adapter-asyncapi-yaml-2-0/package.json b/apidom/packages/apidom-parser-adapter-asyncapi-yaml-2-0/package.json index 19257bda56..203a2b4434 100644 --- a/apidom/packages/apidom-parser-adapter-asyncapi-yaml-2-0/package.json +++ b/apidom/packages/apidom-parser-adapter-asyncapi-yaml-2-0/package.json @@ -33,9 +33,9 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-yaml": "=0.3.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" }, "devDependencies": { - "tree-sitter-cli": "=0.17.0" + "tree-sitter-cli": "=0.17.3" } } diff --git a/apidom/packages/apidom-parser-adapter-json/package.json b/apidom/packages/apidom-parser-adapter-json/package.json index dbd006be2e..3aac3dab88 100644 --- a/apidom/packages/apidom-parser-adapter-json/package.json +++ b/apidom/packages/apidom-parser-adapter-json/package.json @@ -31,9 +31,9 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-json": "=0.16.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" }, "devDependencies": { - "tree-sitter-cli": "=0.17.0" + "tree-sitter-cli": "=0.17.3" } } diff --git a/apidom/packages/apidom-parser-adapter-openapi-json-3-1/package.json b/apidom/packages/apidom-parser-adapter-openapi-json-3-1/package.json index 4a9a14f97b..9302083c12 100644 --- a/apidom/packages/apidom-parser-adapter-openapi-json-3-1/package.json +++ b/apidom/packages/apidom-parser-adapter-openapi-json-3-1/package.json @@ -33,9 +33,9 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-json": "=0.16.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" }, "devDependencies": { - "tree-sitter-cli": "=0.17.0" + "tree-sitter-cli": "=0.17.3" } } diff --git a/apidom/packages/apidom-parser-adapter-openapi-yaml-3-1/package.json b/apidom/packages/apidom-parser-adapter-openapi-yaml-3-1/package.json index 2c3d78bec5..68e5464ba9 100644 --- a/apidom/packages/apidom-parser-adapter-openapi-yaml-3-1/package.json +++ b/apidom/packages/apidom-parser-adapter-openapi-yaml-3-1/package.json @@ -33,9 +33,9 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-yaml": "=0.3.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" }, "devDependencies": { - "tree-sitter-cli": "=0.17.0" + "tree-sitter-cli": "=0.17.3" } } diff --git a/apidom/packages/apidom-parser-adapter-yaml-1-2/package.json b/apidom/packages/apidom-parser-adapter-yaml-1-2/package.json index 98f610b02c..fd6b0ea59a 100644 --- a/apidom/packages/apidom-parser-adapter-yaml-1-2/package.json +++ b/apidom/packages/apidom-parser-adapter-yaml-1-2/package.json @@ -31,9 +31,9 @@ "stampit": "=4.3.1", "tree-sitter": "=0.17.0", "tree-sitter-yaml": "=0.3.0", - "web-tree-sitter": "=0.17.0" + "web-tree-sitter": "=0.17.1" }, "devDependencies": { - "tree-sitter-cli": "=0.17.0" + "tree-sitter-cli": "=0.17.3" } }