yaml 1.4.0 → 1.5.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 +3 -5
- package/browser/dist/Anchors.js +1 -3
- package/browser/dist/Document.js +94 -37
- 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 +7 -7
- 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 +8 -10
- package/browser/dist/cst/FlowCollection.js +5 -7
- 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 +5 -4
- package/browser/dist/listTagNames.js +1 -3
- package/browser/dist/schema/Alias.js +85 -10
- package/browser/dist/schema/Map.js +14 -121
- package/browser/dist/schema/Merge.js +74 -1
- package/browser/dist/schema/Node.js +1 -3
- package/browser/dist/schema/Pair.js +36 -22
- package/browser/dist/schema/Scalar.js +1 -3
- package/browser/dist/schema/Seq.js +1 -3
- package/browser/dist/schema/index.js +61 -45
- package/browser/dist/schema/parseMap.js +18 -21
- package/browser/dist/schema/parseSeq.js +9 -12
- package/browser/dist/stringify.js +54 -39
- package/browser/dist/{schema → tags}/core.js +32 -20
- 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/{schema/_string.js → tags/failsafe/string.js} +11 -11
- package/browser/dist/tags/index.js +50 -0
- package/browser/dist/{schema → tags}/json.js +8 -8
- package/browser/dist/tags/options.js +35 -0
- package/browser/dist/{schema/_binary.js → tags/yaml-1.1/binary.js} +16 -22
- package/browser/dist/{schema/yaml-1.1.js → tags/yaml-1.1/index.js} +43 -29
- package/browser/dist/{schema/_omap.js → tags/yaml-1.1/omap.js} +8 -11
- package/browser/dist/{schema/_pairs.js → tags/yaml-1.1/pairs.js} +8 -12
- package/browser/dist/tags/yaml-1.1/set.js +140 -0
- package/browser/dist/{schema/_timestamp.js → tags/yaml-1.1/timestamp.js} +4 -7
- package/browser/dist/test-events.js +1 -4
- package/browser/dist/toJSON.js +1 -4
- 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 -4
- 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 +1 -3
- package/dist/Document.js +38 -25
- 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 +7 -7
- 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 +8 -10
- package/dist/cst/FlowCollection.js +5 -7
- 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 +5 -4
- package/dist/listTagNames.js +1 -3
- package/dist/schema/Alias.js +66 -12
- package/dist/schema/Map.js +9 -77
- package/dist/schema/Merge.js +31 -0
- package/dist/schema/Node.js +1 -3
- package/dist/schema/Pair.js +29 -15
- package/dist/schema/Scalar.js +1 -3
- package/dist/schema/Seq.js +1 -3
- package/dist/schema/index.js +55 -45
- package/dist/schema/parseMap.js +18 -21
- package/dist/schema/parseSeq.js +9 -12
- package/dist/stringify.js +46 -32
- package/dist/{schema → tags}/core.js +32 -19
- 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/{schema → tags}/json.js +8 -8
- package/dist/tags/options.js +35 -0
- package/dist/{schema/_binary.js → tags/yaml-1.1/binary.js} +15 -21
- package/dist/{schema/yaml-1.1.js → tags/yaml-1.1/index.js} +43 -30
- package/dist/{schema/_omap.js → tags/yaml-1.1/omap.js} +8 -9
- package/dist/{schema/_pairs.js → tags/yaml-1.1/pairs.js} +8 -10
- package/dist/{schema/_set.js → tags/yaml-1.1/set.js} +9 -42
- package/dist/{schema/_timestamp.js → tags/yaml-1.1/timestamp.js} +4 -7
- package/dist/test-events.js +1 -4
- package/dist/toJSON.js +1 -4
- package/index.js +1 -0
- package/map.js +2 -1
- package/package.json +17 -15
- package/pair.js +2 -1
- package/parse-cst.js +1 -1
- package/scalar.js +2 -1
- package/schema.js +7 -4
- 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/schema/_set.js +0 -215
- package/browser/dist/schema/failsafe.js +0 -125
- package/dist/schema/_string.js +0 -40
- package/dist/schema/failsafe.js +0 -74
package/README.md
CHANGED
|
@@ -45,14 +45,12 @@ const YAML = require('yaml')
|
|
|
45
45
|
- [`YAML.parseDocument(str, options): YAML.Document`](https://eemeli.org/yaml/#parsing-documents)
|
|
46
46
|
|
|
47
47
|
```js
|
|
48
|
-
import
|
|
49
|
-
import Pair from 'yaml/pair'
|
|
50
|
-
import Seq from 'yaml/seq'
|
|
48
|
+
import { Pair, YAMLMap, YAMLSeq } from 'yaml/types'
|
|
51
49
|
```
|
|
52
50
|
|
|
53
|
-
- [`new Map()`](https://eemeli.org/yaml/#creating-nodes)
|
|
54
51
|
- [`new Pair(key, value)`](https://eemeli.org/yaml/#creating-nodes)
|
|
55
|
-
- [`new
|
|
52
|
+
- [`new YAMLMap()`](https://eemeli.org/yaml/#creating-nodes)
|
|
53
|
+
- [`new YAMLSeq()`](https://eemeli.org/yaml/#creating-nodes)
|
|
56
54
|
|
|
57
55
|
### CST Parser
|
|
58
56
|
|
package/browser/dist/Anchors.js
CHANGED
package/browser/dist/Document.js
CHANGED
|
@@ -21,7 +21,7 @@ var _addComment = _interopRequireDefault(require("./addComment"));
|
|
|
21
21
|
|
|
22
22
|
var _Anchors = _interopRequireDefault(require("./Anchors"));
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _constants = require("./constants");
|
|
25
25
|
|
|
26
26
|
var _errors = require("./errors");
|
|
27
27
|
|
|
@@ -33,14 +33,14 @@ var _Alias = _interopRequireDefault(require("./schema/Alias"));
|
|
|
33
33
|
|
|
34
34
|
var _Collection = _interopRequireWildcard(require("./schema/Collection"));
|
|
35
35
|
|
|
36
|
-
var
|
|
36
|
+
var _Node = _interopRequireDefault(require("./schema/Node"));
|
|
37
37
|
|
|
38
38
|
var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
|
|
39
39
|
|
|
40
40
|
var _toJSON2 = _interopRequireDefault(require("./toJSON"));
|
|
41
41
|
|
|
42
42
|
var isCollectionItem = function isCollectionItem(node) {
|
|
43
|
-
return node && [
|
|
43
|
+
return node && [_constants.Type.MAP_KEY, _constants.Type.MAP_VALUE, _constants.Type.SEQ_ITEM].includes(node.type);
|
|
44
44
|
};
|
|
45
45
|
|
|
46
46
|
var Document =
|
|
@@ -218,7 +218,7 @@ function () {
|
|
|
218
218
|
} else if (node.comment !== null) {
|
|
219
219
|
var cc = contentNodes.length === 0 ? comments.before : comments.after;
|
|
220
220
|
cc.push(node.comment);
|
|
221
|
-
} else if (node.type ===
|
|
221
|
+
} else if (node.type === _constants.Type.BLANK_LINE) {
|
|
222
222
|
spaceBefore = true;
|
|
223
223
|
|
|
224
224
|
if (contentNodes.length === 0 && comments.before.length > 0 && !_this.commentBefore) {
|
|
@@ -264,6 +264,57 @@ function () {
|
|
|
264
264
|
|
|
265
265
|
this.comment = comments.after.join('\n') || null;
|
|
266
266
|
this.anchors.resolveNodes();
|
|
267
|
+
|
|
268
|
+
if (this.options.prettyErrors) {
|
|
269
|
+
var _iteratorNormalCompletion = true;
|
|
270
|
+
var _didIteratorError = false;
|
|
271
|
+
var _iteratorError = undefined;
|
|
272
|
+
|
|
273
|
+
try {
|
|
274
|
+
for (var _iterator = this.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
|
|
275
|
+
var _error = _step.value;
|
|
276
|
+
if (_error instanceof _errors.YAMLError) _error.makePretty();
|
|
277
|
+
}
|
|
278
|
+
} catch (err) {
|
|
279
|
+
_didIteratorError = true;
|
|
280
|
+
_iteratorError = err;
|
|
281
|
+
} finally {
|
|
282
|
+
try {
|
|
283
|
+
if (!_iteratorNormalCompletion && _iterator.return != null) {
|
|
284
|
+
_iterator.return();
|
|
285
|
+
}
|
|
286
|
+
} finally {
|
|
287
|
+
if (_didIteratorError) {
|
|
288
|
+
throw _iteratorError;
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
var _iteratorNormalCompletion2 = true;
|
|
294
|
+
var _didIteratorError2 = false;
|
|
295
|
+
var _iteratorError2 = undefined;
|
|
296
|
+
|
|
297
|
+
try {
|
|
298
|
+
for (var _iterator2 = this.warnings[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
|
|
299
|
+
var warn = _step2.value;
|
|
300
|
+
if (warn instanceof _errors.YAMLError) warn.makePretty();
|
|
301
|
+
}
|
|
302
|
+
} catch (err) {
|
|
303
|
+
_didIteratorError2 = true;
|
|
304
|
+
_iteratorError2 = err;
|
|
305
|
+
} finally {
|
|
306
|
+
try {
|
|
307
|
+
if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
|
|
308
|
+
_iterator2.return();
|
|
309
|
+
}
|
|
310
|
+
} finally {
|
|
311
|
+
if (_didIteratorError2) {
|
|
312
|
+
throw _iteratorError2;
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
|
|
267
318
|
return this;
|
|
268
319
|
}
|
|
269
320
|
}, {
|
|
@@ -373,21 +424,21 @@ function () {
|
|
|
373
424
|
}
|
|
374
425
|
|
|
375
426
|
switch (type) {
|
|
376
|
-
case
|
|
377
|
-
case
|
|
378
|
-
case
|
|
379
|
-
case
|
|
427
|
+
case _constants.Type.BLOCK_FOLDED:
|
|
428
|
+
case _constants.Type.BLOCK_LITERAL:
|
|
429
|
+
case _constants.Type.QUOTE_DOUBLE:
|
|
430
|
+
case _constants.Type.QUOTE_SINGLE:
|
|
380
431
|
return _schema.default.defaultTags.STR;
|
|
381
432
|
|
|
382
|
-
case
|
|
383
|
-
case
|
|
433
|
+
case _constants.Type.FLOW_MAP:
|
|
434
|
+
case _constants.Type.MAP:
|
|
384
435
|
return _schema.default.defaultTags.MAP;
|
|
385
436
|
|
|
386
|
-
case
|
|
387
|
-
case
|
|
437
|
+
case _constants.Type.FLOW_SEQ:
|
|
438
|
+
case _constants.Type.SEQ:
|
|
388
439
|
return _schema.default.defaultTags.SEQ;
|
|
389
440
|
|
|
390
|
-
case
|
|
441
|
+
case _constants.Type.PLAIN:
|
|
391
442
|
return nonSpecific ? _schema.default.defaultTags.STR : null;
|
|
392
443
|
|
|
393
444
|
default:
|
|
@@ -408,18 +459,18 @@ function () {
|
|
|
408
459
|
after: []
|
|
409
460
|
};
|
|
410
461
|
var props = isCollectionItem(node.context.parent) ? node.context.parent.props.concat(node.props) : node.props;
|
|
411
|
-
var
|
|
412
|
-
var
|
|
413
|
-
var
|
|
462
|
+
var _iteratorNormalCompletion3 = true;
|
|
463
|
+
var _didIteratorError3 = false;
|
|
464
|
+
var _iteratorError3 = undefined;
|
|
414
465
|
|
|
415
466
|
try {
|
|
416
|
-
for (var
|
|
417
|
-
var
|
|
418
|
-
start =
|
|
419
|
-
end =
|
|
467
|
+
for (var _iterator3 = props[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
|
|
468
|
+
var _step3$value = _step3.value,
|
|
469
|
+
start = _step3$value.start,
|
|
470
|
+
end = _step3$value.end;
|
|
420
471
|
|
|
421
472
|
switch (node.context.src[start]) {
|
|
422
|
-
case
|
|
473
|
+
case _constants.Char.COMMENT:
|
|
423
474
|
{
|
|
424
475
|
if (!node.commentHasRequiredWhitespace(start)) {
|
|
425
476
|
var _msg7 = 'Comments must be separated from other tokens by white space characters';
|
|
@@ -438,7 +489,7 @@ function () {
|
|
|
438
489
|
}
|
|
439
490
|
break;
|
|
440
491
|
|
|
441
|
-
case
|
|
492
|
+
case _constants.Char.ANCHOR:
|
|
442
493
|
if (hasAnchor) {
|
|
443
494
|
var _msg8 = 'A node can have at most one anchor';
|
|
444
495
|
errors.push(new _errors.YAMLSemanticError(node, _msg8));
|
|
@@ -447,7 +498,7 @@ function () {
|
|
|
447
498
|
hasAnchor = true;
|
|
448
499
|
break;
|
|
449
500
|
|
|
450
|
-
case
|
|
501
|
+
case _constants.Char.TAG:
|
|
451
502
|
if (hasTag) {
|
|
452
503
|
var _msg9 = 'A node can have at most one tag';
|
|
453
504
|
errors.push(new _errors.YAMLSemanticError(node, _msg9));
|
|
@@ -458,16 +509,16 @@ function () {
|
|
|
458
509
|
}
|
|
459
510
|
}
|
|
460
511
|
} catch (err) {
|
|
461
|
-
|
|
462
|
-
|
|
512
|
+
_didIteratorError3 = true;
|
|
513
|
+
_iteratorError3 = err;
|
|
463
514
|
} finally {
|
|
464
515
|
try {
|
|
465
|
-
if (!
|
|
466
|
-
|
|
516
|
+
if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
|
|
517
|
+
_iterator3.return();
|
|
467
518
|
}
|
|
468
519
|
} finally {
|
|
469
|
-
if (
|
|
470
|
-
throw
|
|
520
|
+
if (_didIteratorError3) {
|
|
521
|
+
throw _iteratorError3;
|
|
471
522
|
}
|
|
472
523
|
}
|
|
473
524
|
}
|
|
@@ -486,7 +537,7 @@ function () {
|
|
|
486
537
|
|
|
487
538
|
var res;
|
|
488
539
|
|
|
489
|
-
if (node.type ===
|
|
540
|
+
if (node.type === _constants.Type.ALIAS) {
|
|
490
541
|
if (hasAnchor || hasTag) {
|
|
491
542
|
var msg = 'An alias node must not specify any properties';
|
|
492
543
|
errors.push(new _errors.YAMLSemanticError(node, msg));
|
|
@@ -512,7 +563,7 @@ function () {
|
|
|
512
563
|
if (tagName) {
|
|
513
564
|
res = schema.resolveNodeWithFallback(this, node, tagName);
|
|
514
565
|
} else {
|
|
515
|
-
if (node.type !==
|
|
566
|
+
if (node.type !== _constants.Type.PLAIN) {
|
|
516
567
|
var _msg6 = "Failed to resolve ".concat(node.type, " node here");
|
|
517
568
|
|
|
518
569
|
errors.push(new _errors.YAMLSyntaxError(node, _msg6));
|
|
@@ -610,15 +661,23 @@ function () {
|
|
|
610
661
|
value: function toJSON(arg) {
|
|
611
662
|
var _this2 = this;
|
|
612
663
|
|
|
613
|
-
var
|
|
664
|
+
var _this$options = this.options,
|
|
665
|
+
keepBlobsInJSON = _this$options.keepBlobsInJSON,
|
|
666
|
+
mapAsMap = _this$options.mapAsMap,
|
|
667
|
+
maxAliasCount = _this$options.maxAliasCount;
|
|
668
|
+
var keep = keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof _Scalar.default));
|
|
614
669
|
var ctx = {
|
|
670
|
+
doc: this,
|
|
615
671
|
keep: keep,
|
|
616
|
-
mapAsMap: keep && !!
|
|
672
|
+
mapAsMap: keep && !!mapAsMap,
|
|
673
|
+
maxAliasCount: maxAliasCount
|
|
617
674
|
};
|
|
618
675
|
var anchorNames = Object.keys(this.anchors.map);
|
|
619
676
|
if (anchorNames.length > 0) ctx.anchors = anchorNames.map(function (name) {
|
|
620
677
|
return {
|
|
621
678
|
alias: [],
|
|
679
|
+
aliasCount: 0,
|
|
680
|
+
count: 1,
|
|
622
681
|
node: _this2.anchors.map[name]
|
|
623
682
|
};
|
|
624
683
|
});
|
|
@@ -666,7 +725,7 @@ function () {
|
|
|
666
725
|
var contentComment = null;
|
|
667
726
|
|
|
668
727
|
if (this.contents) {
|
|
669
|
-
if (this.contents instanceof
|
|
728
|
+
if (this.contents instanceof _Node.default) {
|
|
670
729
|
if (this.contents.spaceBefore && hasDirectives) lines.push('');
|
|
671
730
|
if (this.contents.commentBefore) lines.push(this.contents.commentBefore.replace(/^/gm, '#')); // top-level block scalars need to be indented if followed by a comment
|
|
672
731
|
|
|
@@ -731,6 +790,4 @@ exports.default = Document;
|
|
|
731
790
|
prefix: _schema.default.defaultPrefix
|
|
732
791
|
}]
|
|
733
792
|
}
|
|
734
|
-
});
|
|
735
|
-
module.exports = exports.default;
|
|
736
|
-
module.exports.default = exports.default;
|
|
793
|
+
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.Type = exports.Char = void 0;
|
|
7
|
+
var Char = {
|
|
8
|
+
ANCHOR: '&',
|
|
9
|
+
COMMENT: '#',
|
|
10
|
+
TAG: '!',
|
|
11
|
+
DIRECTIVES_END: '-',
|
|
12
|
+
DOCUMENT_END: '.'
|
|
13
|
+
};
|
|
14
|
+
exports.Char = Char;
|
|
15
|
+
var Type = {
|
|
16
|
+
ALIAS: 'ALIAS',
|
|
17
|
+
BLANK_LINE: 'BLANK_LINE',
|
|
18
|
+
BLOCK_FOLDED: 'BLOCK_FOLDED',
|
|
19
|
+
BLOCK_LITERAL: 'BLOCK_LITERAL',
|
|
20
|
+
COMMENT: 'COMMENT',
|
|
21
|
+
DIRECTIVE: 'DIRECTIVE',
|
|
22
|
+
DOCUMENT: 'DOCUMENT',
|
|
23
|
+
FLOW_MAP: 'FLOW_MAP',
|
|
24
|
+
FLOW_SEQ: 'FLOW_SEQ',
|
|
25
|
+
MAP: 'MAP',
|
|
26
|
+
MAP_KEY: 'MAP_KEY',
|
|
27
|
+
MAP_VALUE: 'MAP_VALUE',
|
|
28
|
+
PLAIN: 'PLAIN',
|
|
29
|
+
QUOTE_DOUBLE: 'QUOTE_DOUBLE',
|
|
30
|
+
QUOTE_SINGLE: 'QUOTE_SINGLE',
|
|
31
|
+
SEQ: 'SEQ',
|
|
32
|
+
SEQ_ITEM: 'SEQ_ITEM'
|
|
33
|
+
};
|
|
34
|
+
exports.Type = Type;
|
|
@@ -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 BlankLine() {
|
|
32
32
|
(0, _classCallCheck2.default)(this, BlankLine);
|
|
33
|
-
return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(BlankLine).call(this,
|
|
33
|
+
return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(BlankLine).call(this, _constants.Type.BLANK_LINE));
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
(0, _createClass2.default)(BlankLine, [{
|
|
@@ -66,6 +66,4 @@ function (_Node) {
|
|
|
66
66
|
return BlankLine;
|
|
67
67
|
}(_Node2.default);
|
|
68
68
|
|
|
69
|
-
exports.default = BlankLine;
|
|
70
|
-
module.exports = exports.default;
|
|
71
|
-
module.exports.default = exports.default;
|
|
69
|
+
exports.default = BlankLine;
|
|
@@ -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,7 +19,9 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
|
21
19
|
|
|
22
20
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
23
21
|
|
|
24
|
-
var
|
|
22
|
+
var _constants = require("../constants");
|
|
23
|
+
|
|
24
|
+
var _Node2 = _interopRequireDefault(require("./Node"));
|
|
25
25
|
|
|
26
26
|
var _Range = _interopRequireDefault(require("./Range"));
|
|
27
27
|
|
|
@@ -222,7 +222,7 @@ function (_Node) {
|
|
|
222
222
|
}
|
|
223
223
|
|
|
224
224
|
var bi = indent + this.blockIndent;
|
|
225
|
-
var folded = this.type ===
|
|
225
|
+
var folded = this.type === _constants.Type.BLOCK_FOLDED;
|
|
226
226
|
var atStart = true;
|
|
227
227
|
var str = '';
|
|
228
228
|
var sep = '';
|
|
@@ -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;
|
|
@@ -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,7 +53,7 @@ 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
59
|
return _this;
|
|
@@ -68,7 +68,7 @@ function (_Node) {
|
|
|
68
68
|
var hasDirectives = false;
|
|
69
69
|
var offset = start;
|
|
70
70
|
|
|
71
|
-
while (!_Node2.default.atDocumentBoundary(src, offset,
|
|
71
|
+
while (!_Node2.default.atDocumentBoundary(src, offset, _constants.Char.DIRECTIVES_END)) {
|
|
72
72
|
offset = Document.startCommentOrEndBlankLine(src, offset);
|
|
73
73
|
|
|
74
74
|
switch (src[offset]) {
|
|
@@ -154,7 +154,7 @@ function (_Node) {
|
|
|
154
154
|
var atLineStart = lineStart === start;
|
|
155
155
|
this.valueRange = new _Range.default(offset);
|
|
156
156
|
|
|
157
|
-
while (!_Node2.default.atDocumentBoundary(src, offset,
|
|
157
|
+
while (!_Node2.default.atDocumentBoundary(src, offset, _constants.Char.DOCUMENT_END)) {
|
|
158
158
|
switch (src[offset]) {
|
|
159
159
|
case '\n':
|
|
160
160
|
if (atLineStart) {
|
|
@@ -284,7 +284,7 @@ function (_Node) {
|
|
|
284
284
|
var str = directives.join('');
|
|
285
285
|
|
|
286
286
|
if (contents.length > 0) {
|
|
287
|
-
if (directives.length > 0 || contents[0].type ===
|
|
287
|
+
if (directives.length > 0 || contents[0].type === _constants.Type.COMMENT) str += '---\n';
|
|
288
288
|
str += contents.join('');
|
|
289
289
|
}
|
|
290
290
|
|
|
@@ -295,6 +295,4 @@ function (_Node) {
|
|
|
295
295
|
return Document;
|
|
296
296
|
}(_Node2.default);
|
|
297
297
|
|
|
298
|
-
exports.default = Document;
|
|
299
|
-
module.exports = exports.default;
|
|
300
|
-
module.exports.default = exports.default;
|
|
298
|
+
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
|
|
@@ -228,6 +228,4 @@ function (_Node) {
|
|
|
228
228
|
return FlowCollection;
|
|
229
229
|
}(_Node2.default);
|
|
230
230
|
|
|
231
|
-
exports.default = FlowCollection;
|
|
232
|
-
module.exports = exports.default;
|
|
233
|
-
module.exports.default = exports.default;
|
|
231
|
+
exports.default = FlowCollection;
|