yaml 1.3.2 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -6
- package/browser/dist/Anchors.js +12 -10
- package/browser/dist/Document.js +170 -75
- package/browser/dist/constants.js +34 -0
- package/browser/dist/cst/Alias.js +1 -3
- package/browser/dist/cst/BlankLine.js +5 -7
- package/browser/dist/cst/BlockValue.js +4 -4
- package/browser/dist/cst/Collection.js +8 -8
- package/browser/dist/cst/CollectionItem.js +6 -8
- package/browser/dist/cst/Comment.js +5 -7
- package/browser/dist/cst/Directive.js +5 -7
- package/browser/dist/cst/Document.js +17 -11
- package/browser/dist/cst/FlowCollection.js +14 -8
- package/browser/dist/cst/Node.js +12 -40
- package/browser/dist/cst/ParseContext.js +32 -34
- package/browser/dist/cst/PlainValue.js +1 -3
- package/browser/dist/cst/QuoteDouble.js +1 -3
- package/browser/dist/cst/QuoteSingle.js +1 -3
- package/browser/dist/cst/Range.js +1 -3
- package/browser/dist/cst/getLinePos.js +1 -4
- package/browser/dist/cst/parse.js +1 -4
- package/browser/dist/deprecation.js +34 -0
- package/browser/dist/errors.js +50 -59
- package/browser/dist/index.js +37 -7
- package/browser/dist/listTagNames.js +1 -3
- package/browser/dist/schema/Alias.js +90 -10
- package/browser/dist/schema/Collection.js +3 -3
- package/browser/dist/schema/Map.js +22 -105
- package/browser/dist/schema/Merge.js +74 -1
- package/browser/dist/schema/Node.js +1 -3
- package/browser/dist/schema/Pair.js +37 -23
- package/browser/dist/schema/Scalar.js +3 -5
- package/browser/dist/schema/Seq.js +30 -7
- package/browser/dist/schema/index.js +158 -82
- package/browser/dist/schema/parseMap.js +18 -21
- package/browser/dist/schema/parseSeq.js +9 -12
- package/browser/dist/{schema/_string.js → stringify.js} +65 -73
- package/browser/dist/tags/core.js +132 -0
- package/browser/dist/tags/failsafe/index.js +17 -0
- package/browser/dist/tags/failsafe/map.js +65 -0
- package/browser/dist/tags/failsafe/seq.js +54 -0
- package/browser/dist/tags/failsafe/string.js +40 -0
- package/browser/dist/tags/index.js +50 -0
- package/browser/dist/tags/json.js +103 -0
- package/browser/dist/tags/options.js +35 -0
- package/browser/dist/{schema/_binary.js → tags/yaml-1.1/binary.js} +20 -20
- package/browser/dist/tags/yaml-1.1/index.js +177 -0
- package/browser/dist/{schema/_omap.js → tags/yaml-1.1/omap.js} +25 -25
- package/browser/dist/{schema/_pairs.js → tags/yaml-1.1/pairs.js} +9 -13
- package/browser/dist/tags/yaml-1.1/set.js +140 -0
- package/browser/dist/{schema/_timestamp.js → tags/yaml-1.1/timestamp.js} +13 -10
- package/browser/dist/test-events.js +1 -4
- package/browser/dist/toJSON.js +20 -8
- package/browser/index.js +1 -0
- package/browser/map.js +2 -1
- package/browser/pair.js +2 -1
- package/browser/parse-cst.js +1 -1
- package/browser/scalar.js +2 -1
- package/browser/schema.js +7 -3
- package/browser/seq.js +2 -1
- package/browser/types/binary.js +7 -1
- package/browser/types/omap.js +2 -1
- package/browser/types/pairs.js +2 -1
- package/browser/types/set.js +2 -1
- package/browser/types/timestamp.js +10 -1
- package/browser/types.js +11 -0
- package/browser/util.js +15 -0
- package/dist/Anchors.js +9 -8
- package/dist/Document.js +89 -45
- package/dist/constants.js +34 -0
- package/dist/cst/Alias.js +1 -3
- package/dist/cst/BlankLine.js +5 -7
- package/dist/cst/BlockValue.js +4 -4
- package/dist/cst/Collection.js +8 -8
- package/dist/cst/CollectionItem.js +6 -8
- package/dist/cst/Comment.js +5 -7
- package/dist/cst/Directive.js +5 -7
- package/dist/cst/Document.js +17 -11
- package/dist/cst/FlowCollection.js +14 -8
- package/dist/cst/Node.js +12 -40
- package/dist/cst/ParseContext.js +32 -34
- package/dist/cst/PlainValue.js +1 -3
- package/dist/cst/QuoteDouble.js +1 -3
- package/dist/cst/QuoteSingle.js +1 -3
- package/dist/cst/Range.js +1 -3
- package/dist/cst/getLinePos.js +1 -4
- package/dist/cst/parse.js +1 -4
- package/dist/deprecation.js +34 -0
- package/dist/errors.js +29 -35
- package/dist/index.js +18 -5
- package/dist/listTagNames.js +1 -3
- package/dist/schema/Alias.js +67 -12
- package/dist/schema/Map.js +10 -74
- package/dist/schema/Merge.js +31 -0
- package/dist/schema/Node.js +1 -3
- package/dist/schema/Pair.js +30 -16
- package/dist/schema/Scalar.js +3 -5
- package/dist/schema/Seq.js +9 -5
- package/dist/schema/index.js +109 -74
- package/dist/schema/parseMap.js +18 -21
- package/dist/schema/parseSeq.js +9 -12
- package/dist/{schema/_string.js → stringify.js} +56 -65
- package/dist/tags/core.js +96 -0
- package/dist/tags/failsafe/index.js +17 -0
- package/dist/tags/failsafe/map.js +33 -0
- package/dist/tags/failsafe/seq.js +34 -0
- package/dist/tags/failsafe/string.js +40 -0
- package/dist/tags/index.js +50 -0
- package/dist/tags/json.js +67 -0
- package/dist/tags/options.js +35 -0
- package/dist/{schema/_binary.js → tags/yaml-1.1/binary.js} +18 -20
- package/dist/tags/yaml-1.1/index.js +131 -0
- package/dist/{schema/_omap.js → tags/yaml-1.1/omap.js} +16 -16
- package/dist/{schema/_pairs.js → tags/yaml-1.1/pairs.js} +9 -11
- package/dist/{schema/_set.js → tags/yaml-1.1/set.js} +12 -44
- package/dist/{schema/_timestamp.js → tags/yaml-1.1/timestamp.js} +7 -10
- package/dist/test-events.js +1 -4
- package/dist/toJSON.js +15 -5
- package/index.js +1 -0
- package/map.js +2 -1
- package/package.json +23 -17
- package/pair.js +2 -1
- package/parse-cst.js +1 -1
- package/scalar.js +2 -1
- package/schema.js +7 -3
- package/seq.js +2 -1
- package/types/binary.js +7 -1
- package/types/omap.js +2 -1
- package/types/pairs.js +2 -1
- package/types/set.js +2 -1
- package/types/timestamp.js +10 -1
- package/types.js +11 -0
- package/util.js +15 -0
- package/browser/dist/polyfill.js +0 -251
- package/browser/dist/schema/_set.js +0 -212
- package/browser/dist/schema/core.js +0 -98
- package/browser/dist/schema/failsafe.js +0 -125
- package/browser/dist/schema/json.js +0 -66
- package/browser/dist/schema/yaml-1.1.js +0 -140
- package/dist/polyfill.js +0 -27
- package/dist/schema/core.js +0 -79
- package/dist/schema/failsafe.js +0 -74
- package/dist/schema/json.js +0 -56
- package/dist/schema/yaml-1.1.js +0 -115
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -22,13 +20,15 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
22
20
|
|
|
23
21
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
24
22
|
|
|
23
|
+
var _constants = require("../constants");
|
|
24
|
+
|
|
25
25
|
var _BlankLine = _interopRequireDefault(require("./BlankLine"));
|
|
26
26
|
|
|
27
27
|
var _CollectionItem = _interopRequireDefault(require("./CollectionItem"));
|
|
28
28
|
|
|
29
29
|
var _Comment = _interopRequireDefault(require("./Comment"));
|
|
30
30
|
|
|
31
|
-
var _Node2 =
|
|
31
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
32
32
|
|
|
33
33
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
34
34
|
|
|
@@ -46,14 +46,14 @@ function grabCollectionEndComments(node) {
|
|
|
46
46
|
for (var i = len - 1; i >= 0; --i) {
|
|
47
47
|
var n = cnode.items[i];
|
|
48
48
|
|
|
49
|
-
if (n.type ===
|
|
49
|
+
if (n.type === _constants.Type.COMMENT) {
|
|
50
50
|
// Keep sufficiently indented comments with preceding node
|
|
51
51
|
var _n$context = n.context,
|
|
52
52
|
indent = _n$context.indent,
|
|
53
53
|
lineStart = _n$context.lineStart;
|
|
54
54
|
if (indent > 0 && n.range.start >= lineStart + indent) break;
|
|
55
55
|
ci = i;
|
|
56
|
-
} else if (n.type ===
|
|
56
|
+
} else if (n.type === _constants.Type.BLANK_LINE) ci = i;else break;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
if (ci === -1) return null;
|
|
@@ -82,7 +82,7 @@ function (_Node) {
|
|
|
82
82
|
var ch = src[offset];
|
|
83
83
|
if (!ch) return false;
|
|
84
84
|
if (offset >= lineStart + indent) return true;
|
|
85
|
-
if (ch !== '#') return false;
|
|
85
|
+
if (ch !== '#' && ch !== '\n') return false;
|
|
86
86
|
return Collection.nextContentHasIndent(src, offset, indent);
|
|
87
87
|
}
|
|
88
88
|
}]);
|
|
@@ -91,7 +91,7 @@ function (_Node) {
|
|
|
91
91
|
var _this;
|
|
92
92
|
|
|
93
93
|
(0, _classCallCheck2.default)(this, Collection);
|
|
94
|
-
_this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Collection).call(this, firstItem.type ===
|
|
94
|
+
_this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Collection).call(this, firstItem.type === _constants.Type.SEQ_ITEM ? _constants.Type.SEQ : _constants.Type.MAP));
|
|
95
95
|
|
|
96
96
|
for (var i = firstItem.props.length - 1; i >= 0; --i) {
|
|
97
97
|
if (firstItem.props[i].start < firstItem.context.lineStart) {
|
|
@@ -200,7 +200,7 @@ function (_Node) {
|
|
|
200
200
|
break;
|
|
201
201
|
}
|
|
202
202
|
|
|
203
|
-
if (firstItem.type ===
|
|
203
|
+
if (firstItem.type === _constants.Type.SEQ_ITEM !== (ch === '-')) {
|
|
204
204
|
var typeswitch = true;
|
|
205
205
|
|
|
206
206
|
if (ch === '-') {
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -21,11 +19,13 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
|
21
19
|
|
|
22
20
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
23
21
|
|
|
22
|
+
var _constants = require("../constants");
|
|
23
|
+
|
|
24
24
|
var _errors = require("../errors");
|
|
25
25
|
|
|
26
26
|
var _BlankLine = _interopRequireDefault(require("./BlankLine"));
|
|
27
27
|
|
|
28
|
-
var _Node2 =
|
|
28
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
29
29
|
|
|
30
30
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
31
31
|
|
|
@@ -57,7 +57,7 @@ function (_Node) {
|
|
|
57
57
|
src = context.src;
|
|
58
58
|
var atLineStart = context.atLineStart,
|
|
59
59
|
lineStart = context.lineStart;
|
|
60
|
-
if (!atLineStart && this.type ===
|
|
60
|
+
if (!atLineStart && this.type === _constants.Type.SEQ_ITEM) this.error = new _errors.YAMLSemanticError(this, 'Sequence items must not have preceding content on the same line');
|
|
61
61
|
var indent = atLineStart ? start - lineStart : context.indent;
|
|
62
62
|
|
|
63
63
|
var offset = _Node2.default.endOfWhiteSpace(src, start + 1);
|
|
@@ -91,7 +91,7 @@ function (_Node) {
|
|
|
91
91
|
ch = src[offset];
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
-
if (_Node2.default.nextNodeIsIndented(ch, offset - (lineStart + indent), this.type !==
|
|
94
|
+
if (_Node2.default.nextNodeIsIndented(ch, offset - (lineStart + indent), this.type !== _constants.Type.SEQ_ITEM)) {
|
|
95
95
|
this.node = parseNode({
|
|
96
96
|
atLineStart: atLineStart,
|
|
97
97
|
inCollection: false,
|
|
@@ -134,6 +134,4 @@ function (_Node) {
|
|
|
134
134
|
return CollectionItem;
|
|
135
135
|
}(_Node2.default);
|
|
136
136
|
|
|
137
|
-
exports.default = CollectionItem;
|
|
138
|
-
module.exports = exports.default;
|
|
139
|
-
module.exports.default = exports.default;
|
|
137
|
+
exports.default = CollectionItem;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -19,7 +17,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
19
17
|
|
|
20
18
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
21
19
|
|
|
22
|
-
var
|
|
20
|
+
var _constants = require("../constants");
|
|
21
|
+
|
|
22
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
23
23
|
|
|
24
24
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
25
25
|
|
|
@@ -30,7 +30,7 @@ function (_Node) {
|
|
|
30
30
|
|
|
31
31
|
function Comment() {
|
|
32
32
|
(0, _classCallCheck2.default)(this, Comment);
|
|
33
|
-
return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Comment).call(this,
|
|
33
|
+
return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Comment).call(this, _constants.Type.COMMENT));
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
36
36
|
* Parses a comment line from the source
|
|
@@ -53,6 +53,4 @@ function (_Node) {
|
|
|
53
53
|
return Comment;
|
|
54
54
|
}(_Node2.default);
|
|
55
55
|
|
|
56
|
-
exports.default = Comment;
|
|
57
|
-
module.exports = exports.default;
|
|
58
|
-
module.exports.default = exports.default;
|
|
56
|
+
exports.default = Comment;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -19,7 +17,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
19
17
|
|
|
20
18
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
21
19
|
|
|
22
|
-
var
|
|
20
|
+
var _constants = require("../constants");
|
|
21
|
+
|
|
22
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
23
23
|
|
|
24
24
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
25
25
|
|
|
@@ -52,7 +52,7 @@ function (_Node) {
|
|
|
52
52
|
var _this;
|
|
53
53
|
|
|
54
54
|
(0, _classCallCheck2.default)(this, Directive);
|
|
55
|
-
_this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Directive).call(this,
|
|
55
|
+
_this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Directive).call(this, _constants.Type.DIRECTIVE));
|
|
56
56
|
_this.name = null;
|
|
57
57
|
return _this;
|
|
58
58
|
}
|
|
@@ -105,6 +105,4 @@ function (_Node) {
|
|
|
105
105
|
return Directive;
|
|
106
106
|
}(_Node2.default);
|
|
107
107
|
|
|
108
|
-
exports.default = Directive;
|
|
109
|
-
module.exports = exports.default;
|
|
110
|
-
module.exports.default = exports.default;
|
|
108
|
+
exports.default = Directive;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -21,6 +19,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
21
19
|
|
|
22
20
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
23
21
|
|
|
22
|
+
var _constants = require("../constants");
|
|
23
|
+
|
|
24
24
|
var _errors = require("../errors");
|
|
25
25
|
|
|
26
26
|
var _BlankLine = _interopRequireDefault(require("./BlankLine"));
|
|
@@ -31,7 +31,7 @@ var _Comment = _interopRequireDefault(require("./Comment"));
|
|
|
31
31
|
|
|
32
32
|
var _Directive = _interopRequireDefault(require("./Directive"));
|
|
33
33
|
|
|
34
|
-
var _Node2 =
|
|
34
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
35
35
|
|
|
36
36
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
37
37
|
|
|
@@ -53,9 +53,11 @@ function (_Node) {
|
|
|
53
53
|
var _this;
|
|
54
54
|
|
|
55
55
|
(0, _classCallCheck2.default)(this, Document);
|
|
56
|
-
_this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Document).call(this,
|
|
56
|
+
_this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Document).call(this, _constants.Type.DOCUMENT));
|
|
57
57
|
_this.directives = null;
|
|
58
58
|
_this.contents = null;
|
|
59
|
+
_this.directivesEndMarker = null;
|
|
60
|
+
_this.documentEndMarker = null;
|
|
59
61
|
return _this;
|
|
60
62
|
}
|
|
61
63
|
|
|
@@ -68,7 +70,7 @@ function (_Node) {
|
|
|
68
70
|
var hasDirectives = false;
|
|
69
71
|
var offset = start;
|
|
70
72
|
|
|
71
|
-
while (!_Node2.default.atDocumentBoundary(src, offset,
|
|
73
|
+
while (!_Node2.default.atDocumentBoundary(src, offset, _constants.Char.DIRECTIVES_END)) {
|
|
72
74
|
offset = Document.startCommentOrEndBlankLine(src, offset);
|
|
73
75
|
|
|
74
76
|
switch (src[offset]) {
|
|
@@ -125,7 +127,10 @@ function (_Node) {
|
|
|
125
127
|
}
|
|
126
128
|
}
|
|
127
129
|
|
|
128
|
-
if (src[offset])
|
|
130
|
+
if (src[offset]) {
|
|
131
|
+
this.directivesEndMarker = new _Range.default(offset, offset + 3);
|
|
132
|
+
return offset + 3;
|
|
133
|
+
}
|
|
129
134
|
|
|
130
135
|
if (hasDirectives) {
|
|
131
136
|
this.error = new _errors.YAMLSemanticError(this, 'Missing directives-end indicator line');
|
|
@@ -154,7 +159,7 @@ function (_Node) {
|
|
|
154
159
|
var atLineStart = lineStart === start;
|
|
155
160
|
this.valueRange = new _Range.default(offset);
|
|
156
161
|
|
|
157
|
-
while (!_Node2.default.atDocumentBoundary(src, offset,
|
|
162
|
+
while (!_Node2.default.atDocumentBoundary(src, offset, _constants.Char.DOCUMENT_END)) {
|
|
158
163
|
switch (src[offset]) {
|
|
159
164
|
case '\n':
|
|
160
165
|
if (atLineStart) {
|
|
@@ -214,6 +219,7 @@ function (_Node) {
|
|
|
214
219
|
this.valueRange.end = offset;
|
|
215
220
|
|
|
216
221
|
if (src[offset]) {
|
|
222
|
+
this.documentEndMarker = new _Range.default(offset, offset + 3);
|
|
217
223
|
offset += 3;
|
|
218
224
|
|
|
219
225
|
if (src[offset]) {
|
|
@@ -269,9 +275,11 @@ function (_Node) {
|
|
|
269
275
|
this.directives.forEach(function (node) {
|
|
270
276
|
offset = node.setOrigRanges(cr, offset);
|
|
271
277
|
});
|
|
278
|
+
if (this.directivesEndMarker) offset = this.directivesEndMarker.setOrigRange(cr, offset);
|
|
272
279
|
this.contents.forEach(function (node) {
|
|
273
280
|
offset = node.setOrigRanges(cr, offset);
|
|
274
281
|
});
|
|
282
|
+
if (this.documentEndMarker) offset = this.documentEndMarker.setOrigRange(cr, offset);
|
|
275
283
|
return offset;
|
|
276
284
|
}
|
|
277
285
|
}, {
|
|
@@ -284,7 +292,7 @@ function (_Node) {
|
|
|
284
292
|
var str = directives.join('');
|
|
285
293
|
|
|
286
294
|
if (contents.length > 0) {
|
|
287
|
-
if (directives.length > 0 || contents[0].type ===
|
|
295
|
+
if (directives.length > 0 || contents[0].type === _constants.Type.COMMENT) str += '---\n';
|
|
288
296
|
str += contents.join('');
|
|
289
297
|
}
|
|
290
298
|
|
|
@@ -295,6 +303,4 @@ function (_Node) {
|
|
|
295
303
|
return Document;
|
|
296
304
|
}(_Node2.default);
|
|
297
305
|
|
|
298
|
-
exports.default = Document;
|
|
299
|
-
module.exports = exports.default;
|
|
300
|
-
module.exports.default = exports.default;
|
|
306
|
+
exports.default = Document;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -21,13 +19,15 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
|
21
19
|
|
|
22
20
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
23
21
|
|
|
22
|
+
var _constants = require("../constants");
|
|
23
|
+
|
|
24
24
|
var _errors = require("../errors");
|
|
25
25
|
|
|
26
26
|
var _BlankLine = _interopRequireDefault(require("./BlankLine"));
|
|
27
27
|
|
|
28
28
|
var _Comment = _interopRequireDefault(require("./Comment"));
|
|
29
29
|
|
|
30
|
-
var _Node2 =
|
|
30
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
31
31
|
|
|
32
32
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
33
33
|
|
|
@@ -50,7 +50,7 @@ function (_Node) {
|
|
|
50
50
|
value: function prevNodeIsJsonLike() {
|
|
51
51
|
var idx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.items.length;
|
|
52
52
|
var node = this.items[idx - 1];
|
|
53
|
-
return !!node && (node.jsonLike || node.type ===
|
|
53
|
+
return !!node && (node.jsonLike || node.type === _constants.Type.COMMENT && this.nodeIsJsonLike(idx - 1));
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
56
56
|
* @param {ParseContext} context
|
|
@@ -94,7 +94,15 @@ function (_Node) {
|
|
|
94
94
|
}
|
|
95
95
|
|
|
96
96
|
offset = _Node2.default.endOfIndent(src, lineStart);
|
|
97
|
-
|
|
97
|
+
|
|
98
|
+
if (offset <= lineStart + indent) {
|
|
99
|
+
char = src[offset];
|
|
100
|
+
|
|
101
|
+
if (offset < lineStart + indent || char !== ']' && char !== '}') {
|
|
102
|
+
var msg = 'Insufficient indentation in flow collection';
|
|
103
|
+
this.error = new _errors.YAMLSemanticError(this, msg);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
98
106
|
}
|
|
99
107
|
break;
|
|
100
108
|
|
|
@@ -228,6 +236,4 @@ function (_Node) {
|
|
|
228
236
|
return FlowCollection;
|
|
229
237
|
}(_Node2.default);
|
|
230
238
|
|
|
231
|
-
exports.default = FlowCollection;
|
|
232
|
-
module.exports = exports.default;
|
|
233
|
-
module.exports.default = exports.default;
|
|
239
|
+
exports.default = FlowCollection;
|
package/browser/dist/cst/Node.js
CHANGED
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.default =
|
|
8
|
+
exports.default = void 0;
|
|
9
9
|
|
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
11
|
|
|
@@ -13,41 +13,13 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
13
13
|
|
|
14
14
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
15
|
|
|
16
|
+
var _constants = require("../constants");
|
|
17
|
+
|
|
16
18
|
var _getLinePos = _interopRequireDefault(require("./getLinePos"));
|
|
17
19
|
|
|
18
20
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
19
21
|
|
|
20
|
-
|
|
21
|
-
ALIAS: 'ALIAS',
|
|
22
|
-
BLANK_LINE: 'BLANK_LINE',
|
|
23
|
-
BLOCK_FOLDED: 'BLOCK_FOLDED',
|
|
24
|
-
BLOCK_LITERAL: 'BLOCK_LITERAL',
|
|
25
|
-
COMMENT: 'COMMENT',
|
|
26
|
-
DIRECTIVE: 'DIRECTIVE',
|
|
27
|
-
DOCUMENT: 'DOCUMENT',
|
|
28
|
-
FLOW_MAP: 'FLOW_MAP',
|
|
29
|
-
FLOW_SEQ: 'FLOW_SEQ',
|
|
30
|
-
MAP: 'MAP',
|
|
31
|
-
MAP_KEY: 'MAP_KEY',
|
|
32
|
-
MAP_VALUE: 'MAP_VALUE',
|
|
33
|
-
PLAIN: 'PLAIN',
|
|
34
|
-
QUOTE_DOUBLE: 'QUOTE_DOUBLE',
|
|
35
|
-
QUOTE_SINGLE: 'QUOTE_SINGLE',
|
|
36
|
-
SEQ: 'SEQ',
|
|
37
|
-
SEQ_ITEM: 'SEQ_ITEM'
|
|
38
|
-
};
|
|
39
|
-
exports.Type = Type;
|
|
40
|
-
var Char = {
|
|
41
|
-
ANCHOR: '&',
|
|
42
|
-
COMMENT: '#',
|
|
43
|
-
TAG: '!',
|
|
44
|
-
DIRECTIVES_END: '-',
|
|
45
|
-
DOCUMENT_END: '.'
|
|
46
|
-
/** Root class of all nodes */
|
|
47
|
-
|
|
48
|
-
};
|
|
49
|
-
exports.Char = Char;
|
|
50
|
-
|
|
22
|
+
/** Root class of all nodes */
|
|
51
23
|
var Node =
|
|
52
24
|
/*#__PURE__*/
|
|
53
25
|
function () {
|
|
@@ -70,7 +42,7 @@ function () {
|
|
|
70
42
|
if (sep) {
|
|
71
43
|
if (ch0 !== sep) return false;
|
|
72
44
|
} else {
|
|
73
|
-
if (ch0 !== Char.DIRECTIVES_END && ch0 !== Char.DOCUMENT_END) return false;
|
|
45
|
+
if (ch0 !== _constants.Char.DIRECTIVES_END && ch0 !== _constants.Char.DOCUMENT_END) return false;
|
|
74
46
|
}
|
|
75
47
|
|
|
76
48
|
var ch1 = src[offset + 1];
|
|
@@ -264,7 +236,7 @@ function () {
|
|
|
264
236
|
value: function parseComment(start) {
|
|
265
237
|
var src = this.context.src;
|
|
266
238
|
|
|
267
|
-
if (src[start] === Char.COMMENT) {
|
|
239
|
+
if (src[start] === _constants.Char.COMMENT) {
|
|
268
240
|
var end = Node.endOfLine(src, start + 1);
|
|
269
241
|
var commentRange = new _Range.default(start, end);
|
|
270
242
|
this.props.push(commentRange);
|
|
@@ -306,7 +278,7 @@ function () {
|
|
|
306
278
|
key: "anchor",
|
|
307
279
|
get: function get() {
|
|
308
280
|
for (var i = 0; i < this.props.length; ++i) {
|
|
309
|
-
var anchor = this.getPropValue(i, Char.ANCHOR, true);
|
|
281
|
+
var anchor = this.getPropValue(i, _constants.Char.ANCHOR, true);
|
|
310
282
|
if (anchor != null) return anchor;
|
|
311
283
|
}
|
|
312
284
|
|
|
@@ -318,7 +290,7 @@ function () {
|
|
|
318
290
|
var comments = [];
|
|
319
291
|
|
|
320
292
|
for (var i = 0; i < this.props.length; ++i) {
|
|
321
|
-
var comment = this.getPropValue(i, Char.COMMENT, true);
|
|
293
|
+
var comment = this.getPropValue(i, _constants.Char.COMMENT, true);
|
|
322
294
|
if (comment != null) comments.push(comment);
|
|
323
295
|
}
|
|
324
296
|
|
|
@@ -331,7 +303,7 @@ function () {
|
|
|
331
303
|
var src = this.context.src;
|
|
332
304
|
|
|
333
305
|
for (var i = 0; i < this.props.length; ++i) {
|
|
334
|
-
if (src[this.props[i].start] === Char.COMMENT) return true;
|
|
306
|
+
if (src[this.props[i].start] === _constants.Char.COMMENT) return true;
|
|
335
307
|
}
|
|
336
308
|
}
|
|
337
309
|
|
|
@@ -344,7 +316,7 @@ function () {
|
|
|
344
316
|
var src = this.context.src;
|
|
345
317
|
|
|
346
318
|
for (var i = 0; i < this.props.length; ++i) {
|
|
347
|
-
if (src[this.props[i].start] !== Char.COMMENT) return true;
|
|
319
|
+
if (src[this.props[i].start] !== _constants.Char.COMMENT) return true;
|
|
348
320
|
}
|
|
349
321
|
}
|
|
350
322
|
|
|
@@ -358,7 +330,7 @@ function () {
|
|
|
358
330
|
}, {
|
|
359
331
|
key: "jsonLike",
|
|
360
332
|
get: function get() {
|
|
361
|
-
var jsonLikeTypes = [Type.FLOW_MAP, Type.FLOW_SEQ, Type.QUOTE_DOUBLE, Type.QUOTE_SINGLE];
|
|
333
|
+
var jsonLikeTypes = [_constants.Type.FLOW_MAP, _constants.Type.FLOW_SEQ, _constants.Type.QUOTE_DOUBLE, _constants.Type.QUOTE_SINGLE];
|
|
362
334
|
return jsonLikeTypes.indexOf(this.type) !== -1;
|
|
363
335
|
}
|
|
364
336
|
}, {
|
|
@@ -386,7 +358,7 @@ function () {
|
|
|
386
358
|
key: "tag",
|
|
387
359
|
get: function get() {
|
|
388
360
|
for (var i = 0; i < this.props.length; ++i) {
|
|
389
|
-
var tag = this.getPropValue(i, Char.TAG, false);
|
|
361
|
+
var tag = this.getPropValue(i, _constants.Char.TAG, false);
|
|
390
362
|
|
|
391
363
|
if (tag != null) {
|
|
392
364
|
if (tag[1] === '<') {
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
@@ -15,6 +13,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
|
|
|
15
13
|
|
|
16
14
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
17
15
|
|
|
16
|
+
var _constants = require("../constants");
|
|
17
|
+
|
|
18
18
|
var _errors = require("../errors");
|
|
19
19
|
|
|
20
20
|
var _Alias = _interopRequireDefault(require("./Alias"));
|
|
@@ -27,7 +27,7 @@ var _CollectionItem = _interopRequireDefault(require("./CollectionItem"));
|
|
|
27
27
|
|
|
28
28
|
var _FlowCollection = _interopRequireDefault(require("./FlowCollection"));
|
|
29
29
|
|
|
30
|
-
var _Node =
|
|
30
|
+
var _Node = _interopRequireDefault(require("./Node"));
|
|
31
31
|
|
|
32
32
|
var _PlainValue = _interopRequireDefault(require("./PlainValue"));
|
|
33
33
|
|
|
@@ -54,37 +54,37 @@ function () {
|
|
|
54
54
|
value: function parseType(src, offset, inFlow) {
|
|
55
55
|
switch (src[offset]) {
|
|
56
56
|
case '*':
|
|
57
|
-
return
|
|
57
|
+
return _constants.Type.ALIAS;
|
|
58
58
|
|
|
59
59
|
case '>':
|
|
60
|
-
return
|
|
60
|
+
return _constants.Type.BLOCK_FOLDED;
|
|
61
61
|
|
|
62
62
|
case '|':
|
|
63
|
-
return
|
|
63
|
+
return _constants.Type.BLOCK_LITERAL;
|
|
64
64
|
|
|
65
65
|
case '{':
|
|
66
|
-
return
|
|
66
|
+
return _constants.Type.FLOW_MAP;
|
|
67
67
|
|
|
68
68
|
case '[':
|
|
69
|
-
return
|
|
69
|
+
return _constants.Type.FLOW_SEQ;
|
|
70
70
|
|
|
71
71
|
case '?':
|
|
72
|
-
return !inFlow && _Node.default.atBlank(src, offset + 1, true) ?
|
|
72
|
+
return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.MAP_KEY : _constants.Type.PLAIN;
|
|
73
73
|
|
|
74
74
|
case ':':
|
|
75
|
-
return !inFlow && _Node.default.atBlank(src, offset + 1, true) ?
|
|
75
|
+
return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.MAP_VALUE : _constants.Type.PLAIN;
|
|
76
76
|
|
|
77
77
|
case '-':
|
|
78
|
-
return !inFlow && _Node.default.atBlank(src, offset + 1, true) ?
|
|
78
|
+
return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.SEQ_ITEM : _constants.Type.PLAIN;
|
|
79
79
|
|
|
80
80
|
case '"':
|
|
81
|
-
return
|
|
81
|
+
return _constants.Type.QUOTE_DOUBLE;
|
|
82
82
|
|
|
83
83
|
case "'":
|
|
84
|
-
return
|
|
84
|
+
return _constants.Type.QUOTE_SINGLE;
|
|
85
85
|
|
|
86
86
|
default:
|
|
87
|
-
return
|
|
87
|
+
return _constants.Type.PLAIN;
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
}]);
|
|
@@ -115,36 +115,36 @@ function () {
|
|
|
115
115
|
var node;
|
|
116
116
|
|
|
117
117
|
switch (type) {
|
|
118
|
-
case
|
|
118
|
+
case _constants.Type.ALIAS:
|
|
119
119
|
node = new _Alias.default(type, props);
|
|
120
120
|
break;
|
|
121
121
|
|
|
122
|
-
case
|
|
123
|
-
case
|
|
122
|
+
case _constants.Type.BLOCK_FOLDED:
|
|
123
|
+
case _constants.Type.BLOCK_LITERAL:
|
|
124
124
|
node = new _BlockValue.default(type, props);
|
|
125
125
|
break;
|
|
126
126
|
|
|
127
|
-
case
|
|
128
|
-
case
|
|
127
|
+
case _constants.Type.FLOW_MAP:
|
|
128
|
+
case _constants.Type.FLOW_SEQ:
|
|
129
129
|
node = new _FlowCollection.default(type, props);
|
|
130
130
|
break;
|
|
131
131
|
|
|
132
|
-
case
|
|
133
|
-
case
|
|
134
|
-
case
|
|
132
|
+
case _constants.Type.MAP_KEY:
|
|
133
|
+
case _constants.Type.MAP_VALUE:
|
|
134
|
+
case _constants.Type.SEQ_ITEM:
|
|
135
135
|
node = new _CollectionItem.default(type, props);
|
|
136
136
|
break;
|
|
137
137
|
|
|
138
|
-
case
|
|
139
|
-
case
|
|
138
|
+
case _constants.Type.COMMENT:
|
|
139
|
+
case _constants.Type.PLAIN:
|
|
140
140
|
node = new _PlainValue.default(type, props);
|
|
141
141
|
break;
|
|
142
142
|
|
|
143
|
-
case
|
|
143
|
+
case _constants.Type.QUOTE_DOUBLE:
|
|
144
144
|
node = new _QuoteDouble.default(type, props);
|
|
145
145
|
break;
|
|
146
146
|
|
|
147
|
-
case
|
|
147
|
+
case _constants.Type.QUOTE_SINGLE:
|
|
148
148
|
node = new _QuoteSingle.default(type, props);
|
|
149
149
|
break;
|
|
150
150
|
|
|
@@ -165,7 +165,7 @@ function () {
|
|
|
165
165
|
}
|
|
166
166
|
|
|
167
167
|
if (context.nodeStartsCollection(node)) {
|
|
168
|
-
if (!node.error && !context.atLineStart && context.parent.type ===
|
|
168
|
+
if (!node.error && !context.atLineStart && context.parent.type === _constants.Type.DOCUMENT) {
|
|
169
169
|
node.error = new _errors.YAMLSyntaxError(node, 'Block collection must not have preceding content here (e.g. directives-end indicator)');
|
|
170
170
|
}
|
|
171
171
|
|
|
@@ -215,20 +215,20 @@ function () {
|
|
|
215
215
|
offset = _Node.default.endOfWhiteSpace(src, offset);
|
|
216
216
|
var ch = src[offset];
|
|
217
217
|
|
|
218
|
-
while (ch ===
|
|
218
|
+
while (ch === _constants.Char.ANCHOR || ch === _constants.Char.COMMENT || ch === _constants.Char.TAG || ch === '\n') {
|
|
219
219
|
if (ch === '\n') {
|
|
220
220
|
var lineStart = offset + 1;
|
|
221
221
|
|
|
222
222
|
var inEnd = _Node.default.endOfIndent(src, lineStart);
|
|
223
223
|
|
|
224
224
|
var indentDiff = inEnd - (lineStart + this.indent);
|
|
225
|
-
var noIndicatorAsIndent = parent.type ===
|
|
225
|
+
var noIndicatorAsIndent = parent.type === _constants.Type.SEQ_ITEM && parent.context.atLineStart;
|
|
226
226
|
if (!_Node.default.nextNodeIsIndented(src[inEnd], indentDiff, !noIndicatorAsIndent)) break;
|
|
227
227
|
this.atLineStart = true;
|
|
228
228
|
this.lineStart = lineStart;
|
|
229
229
|
lineHasProps = false;
|
|
230
230
|
offset = inEnd;
|
|
231
|
-
} else if (ch ===
|
|
231
|
+
} else if (ch === _constants.Char.COMMENT) {
|
|
232
232
|
var end = _Node.default.endOfLine(src, offset + 1);
|
|
233
233
|
|
|
234
234
|
props.push(new _Range.default(offset, end));
|
|
@@ -236,7 +236,7 @@ function () {
|
|
|
236
236
|
} else {
|
|
237
237
|
var _end = _Node.default.endOfIdentifier(src, offset + 1);
|
|
238
238
|
|
|
239
|
-
if (ch ===
|
|
239
|
+
if (ch === _constants.Char.TAG && src[_end] === ',' && /^[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+,\d\d\d\d(-\d\d){0,2}\/\S/.test(src.slice(offset + 1, _end + 13))) {
|
|
240
240
|
// Let's presume we're dealing with a YAML 1.0 domain tag here, rather
|
|
241
241
|
// than an empty but 'foo.bar' private-tagged node in a flow collection
|
|
242
242
|
// followed without whitespace by a plain string starting with a year
|
|
@@ -285,6 +285,4 @@ function () {
|
|
|
285
285
|
return ParseContext;
|
|
286
286
|
}();
|
|
287
287
|
|
|
288
|
-
exports.default = ParseContext;
|
|
289
|
-
module.exports = exports.default;
|
|
290
|
-
module.exports.default = exports.default;
|
|
288
|
+
exports.default = ParseContext;
|