Skip to content

Commit 8168986

Browse files
committed
fix(yaml): fix YAML parsing in browsing environemnt
Closes #232
1 parent 941aac3 commit 8168986

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

apidom/package-lock.json

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apidom/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
"rimraf": "=3.0.2",
8181
"sinon": "=9.2.1",
8282
"terser-webpack-plugin": "=3.0.2",
83-
"tree-sitter-cli": "=0.17.0",
83+
"tree-sitter-cli": "=0.17.3",
84+
"ts-node": "^9.0.0",
8485
"typescript": "=3.9.3",
8586
"webpack": "=4.43.0",
86-
"webpack-cli": "=3.3.11",
87-
"ts-node": "^9.0.0"
87+
"webpack-cli": "=3.3.11"
8888
},
8989
"dependencies": {
9090
"apidom": "file:packages/apidom",

apidom/packages/apidom-ast/src/transformers/tree-sitter-yaml.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ const Visitor = stampit({
114114
}
115115
// key value was not explicitly provided; tag and anchor are missing too
116116
// @ts-ignore
117-
if (node.valueNode === null) {
117+
if (node.childCount === 2) {
118118
return true;
119119
}
120120
// key value was not explicitly provided; tag or anchor are provided though
121121
// @ts-ignore
122-
return !node.valueNode.children.some(anyPass([isScalar, isSequence, isMapping]));
122+
return !node.children[2].children.some(anyPass([isScalar, isSequence, isMapping]));
123123
};
124124

125125
const createKeyValuePairSurrogateValue = (node: SyntaxNode) => {
@@ -128,7 +128,7 @@ const Visitor = stampit({
128128
column: node.endPosition.column,
129129
char: node.endIndex,
130130
});
131-
const children = pathOr([], ['valueNode', 'children'], node);
131+
const children = pathOr([], [2, 'children'], node);
132132
const tagNode: any | undefined = find(isKind('tag'), children);
133133
const anchorNode: any | undefined = find(isKind('anchor'), children);
134134
let tag = null;

apidom/packages/apidom-parser-adapter-asyncapi-json-2-0/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"stampit": "=4.3.1",
3434
"tree-sitter": "=0.17.0",
3535
"tree-sitter-json": "=0.16.0",
36-
"web-tree-sitter": "=0.17.0"
36+
"web-tree-sitter": "=0.17.1"
3737
},
3838
"devDependencies": {
39-
"tree-sitter-cli": "=0.17.0"
39+
"tree-sitter-cli": "=0.17.3"
4040
}
4141
}

apidom/packages/apidom-parser-adapter-asyncapi-yaml-2-0/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"stampit": "=4.3.1",
3434
"tree-sitter": "=0.17.0",
3535
"tree-sitter-yaml": "=0.3.0",
36-
"web-tree-sitter": "=0.17.0"
36+
"web-tree-sitter": "=0.17.1"
3737
},
3838
"devDependencies": {
39-
"tree-sitter-cli": "=0.17.0"
39+
"tree-sitter-cli": "=0.17.3"
4040
}
4141
}

apidom/packages/apidom-parser-adapter-json/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"stampit": "=4.3.1",
3232
"tree-sitter": "=0.17.0",
3333
"tree-sitter-json": "=0.16.0",
34-
"web-tree-sitter": "=0.17.0"
34+
"web-tree-sitter": "=0.17.1"
3535
},
3636
"devDependencies": {
37-
"tree-sitter-cli": "=0.17.0"
37+
"tree-sitter-cli": "=0.17.3"
3838
}
3939
}

apidom/packages/apidom-parser-adapter-openapi-json-3-1/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"stampit": "=4.3.1",
3434
"tree-sitter": "=0.17.0",
3535
"tree-sitter-json": "=0.16.0",
36-
"web-tree-sitter": "=0.17.0"
36+
"web-tree-sitter": "=0.17.1"
3737
},
3838
"devDependencies": {
39-
"tree-sitter-cli": "=0.17.0"
39+
"tree-sitter-cli": "=0.17.3"
4040
}
4141
}

apidom/packages/apidom-parser-adapter-openapi-yaml-3-1/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"stampit": "=4.3.1",
3434
"tree-sitter": "=0.17.0",
3535
"tree-sitter-yaml": "=0.3.0",
36-
"web-tree-sitter": "=0.17.0"
36+
"web-tree-sitter": "=0.17.1"
3737
},
3838
"devDependencies": {
39-
"tree-sitter-cli": "=0.17.0"
39+
"tree-sitter-cli": "=0.17.3"
4040
}
4141
}

apidom/packages/apidom-parser-adapter-yaml-1-2/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"stampit": "=4.3.1",
3232
"tree-sitter": "=0.17.0",
3333
"tree-sitter-yaml": "=0.3.0",
34-
"web-tree-sitter": "=0.17.0"
34+
"web-tree-sitter": "=0.17.1"
3535
},
3636
"devDependencies": {
37-
"tree-sitter-cli": "=0.17.0"
37+
"tree-sitter-cli": "=0.17.3"
3838
}
3939
}

0 commit comments

Comments
 (0)