yaml 1.8.2 → 1.9.2

package/dist/Document.js

@@ -1,37 +1,28 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.Document = void 0;
 
-var _addComment = _interopRequireDefault(require("./addComment"));
+var _addComment = require("./addComment");
 
-var _Anchors = _interopRequireDefault(require("./Anchors"));
+var _Anchors = require("./Anchors");
 
 var _constants = require("./constants");
 
 var _errors = require("./errors");
 
-var _listTagNames = _interopRequireDefault(require("./listTagNames"));
+var _listTagNames = require("./listTagNames");
 
-var _schema = _interopRequireDefault(require("./schema"));
+var _schema = require("./schema");
 
-var _Alias = _interopRequireDefault(require("./schema/Alias"));
+var _Alias = require("./schema/Alias");
 
-var _Collection = _interopRequireWildcard(require("./schema/Collection"));
+var _Collection = require("./schema/Collection");
 
-var _Node = _interopRequireDefault(require("./schema/Node"));
+var _Node = require("./schema/Node");
 
-var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
+var _Scalar = require("./schema/Scalar");
 
-var _toJSON = _interopRequireDefault(require("./toJSON"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _toJSON = require("./toJSON");
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -39,7 +30,7 @@ const isCollectionItem = node => node && [_constants.Type.MAP_KEY, _constants.Ty
 
 class Document {
   constructor(options) {
-    this.anchors = new _Anchors.default(options.anchorPrefix);
+    this.anchors = new _Anchors.Anchors(options.anchorPrefix);
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
@@ -53,7 +44,7 @@ class Document {
   }
 
   assertCollectionContents() {
-    if (this.contents instanceof _Collection.default) return true;
+    if (this.contents instanceof _Collection.Collection) return true;
     throw new Error('Expected a YAML collection as document contents');
   }
 
@@ -88,21 +79,21 @@ class Document {
   }
 
   get(key, keepScalar) {
-    return this.contents instanceof _Collection.default ? this.contents.get(key, keepScalar) : undefined;
+    return this.contents instanceof _Collection.Collection ? this.contents.get(key, keepScalar) : undefined;
   }
 
   getIn(path, keepScalar) {
-    if ((0, _Collection.isEmptyPath)(path)) return !keepScalar && this.contents instanceof _Scalar.default ? this.contents.value : this.contents;
-    return this.contents instanceof _Collection.default ? this.contents.getIn(path, keepScalar) : undefined;
+    if ((0, _Collection.isEmptyPath)(path)) return !keepScalar && this.contents instanceof _Scalar.Scalar ? this.contents.value : this.contents;
+    return this.contents instanceof _Collection.Collection ? this.contents.getIn(path, keepScalar) : undefined;
   }
 
   has(key) {
-    return this.contents instanceof _Collection.default ? this.contents.has(key) : false;
+    return this.contents instanceof _Collection.Collection ? this.contents.has(key) : false;
   }
 
   hasIn(path) {
     if ((0, _Collection.isEmptyPath)(path)) return this.contents !== undefined;
-    return this.contents instanceof _Collection.default ? this.contents.hasIn(path) : false;
+    return this.contents instanceof _Collection.Collection ? this.contents.hasIn(path) : false;
   }
 
   set(key, value) {
@@ -130,7 +121,7 @@ class Document {
 
     if (Array.isArray(customTags)) this.options.customTags = customTags;
     const opt = Object.assign({}, this.getDefaults(), this.options);
-    this.schema = new _schema.default(opt);
+    this.schema = new _schema.Schema(opt);
   }
 
   parse(node, prevDoc) {
@@ -263,7 +254,7 @@ class Document {
           const cb = comments.before.join('\n') || null;
 
           if (cb) {
-            const cbNode = this.contents instanceof _Collection.default && this.contents.items[0] ? this.contents.items[0] : this.contents;
+            const cbNode = this.contents instanceof _Collection.Collection && this.contents.items[0] ? this.contents.items[0] : this.contents;
             cbNode.commentBefore = cbNode.commentBefore ? `${cb}\n${cbNode.commentBefore}` : cb;
           }
         } else {
@@ -384,18 +375,18 @@ class Document {
       case _constants.Type.BLOCK_LITERAL:
       case _constants.Type.QUOTE_DOUBLE:
       case _constants.Type.QUOTE_SINGLE:
-        return _schema.default.defaultTags.STR;
+        return _schema.Schema.defaultTags.STR;
 
       case _constants.Type.FLOW_MAP:
       case _constants.Type.MAP:
-        return _schema.default.defaultTags.MAP;
+        return _schema.Schema.defaultTags.MAP;
 
       case _constants.Type.FLOW_SEQ:
       case _constants.Type.SEQ:
-        return _schema.default.defaultTags.SEQ;
+        return _schema.Schema.defaultTags.SEQ;
 
       case _constants.Type.PLAIN:
-        return nonSpecific ? _schema.default.defaultTags.STR : null;
+        return nonSpecific ? _schema.Schema.defaultTags.STR : null;
 
       default:
         return null;
@@ -493,7 +484,7 @@ class Document {
       } // Lazy resolution for circular references
 
 
-      res = new _Alias.default(src);
+      res = new _Alias.Alias(src);
 
       anchors._cstAliases.push(res);
     } else {
@@ -536,7 +527,7 @@ class Document {
   }
 
   listNonDefaultTags() {
-    return (0, _listTagNames.default)(this.contents).filter(t => t.indexOf(_schema.default.defaultPrefix) !== 0);
+    return (0, _listTagNames.listTagNames)(this.contents).filter(t => t.indexOf(_schema.Schema.defaultPrefix) !== 0);
   }
 
   setTagPrefix(handle, prefix) {
@@ -580,31 +571,43 @@ class Document {
     }
   }
 
-  toJSON(arg) {
+  toJSON(arg, onAnchor) {
     const {
       keepBlobsInJSON,
       mapAsMap,
       maxAliasCount
     } = this.options;
-    const keep = keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof _Scalar.default));
+    const keep = keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof _Scalar.Scalar));
     const ctx = {
       doc: this,
+      indentStep: '  ',
       keep,
       mapAsMap: keep && !!mapAsMap,
       maxAliasCount
     };
     const anchorNames = Object.keys(this.anchors.map);
-    if (anchorNames.length > 0) ctx.anchors = anchorNames.map(name => ({
+    if (anchorNames.length > 0) ctx.anchors = new Map(anchorNames.map(name => [this.anchors.map[name], {
       alias: [],
       aliasCount: 0,
-      count: 1,
-      node: this.anchors.map[name]
-    }));
-    return (0, _toJSON.default)(this.contents, arg, ctx);
+      count: 1
+    }]));
+    const res = (0, _toJSON.toJSON)(this.contents, arg, ctx);
+    if (typeof onAnchor === 'function' && ctx.anchors) for (const {
+      count,
+      res
+    } of ctx.anchors.values()) onAnchor(res, count);
+    return res;
   }
 
   toString() {
     if (this.errors.length > 0) throw new Error('Document with errors cannot be stringified');
+    const indentSize = this.options.indent;
+
+    if (!Number.isInteger(indentSize) || indentSize <= 0) {
+      const s = JSON.stringify(indentSize);
+      throw new Error(`"indent" option must be a positive integer, not ${s}`);
+    }
+
     this.setSchema();
     const lines = [];
     let hasDirectives = false;
@@ -640,13 +643,14 @@ class Document {
     const ctx = {
       anchors: {},
       doc: this,
-      indent: ''
+      indent: '',
+      indentStep: ' '.repeat(indentSize)
     };
     let chompKeep = false;
     let contentComment = null;
 
     if (this.contents) {
-      if (this.contents instanceof _Node.default) {
+      if (this.contents instanceof _Node.Node) {
         if (this.contents.spaceBefore && (hasDirectives || this.directivesEndMarker)) lines.push('');
         if (this.contents.commentBefore) lines.push(this.contents.commentBefore.replace(/^/gm, '#')); // top-level block scalars need to be indented if followed by a comment
 
@@ -656,7 +660,7 @@ class Document {
 
       const onChompKeep = contentComment ? null : () => chompKeep = true;
       const body = this.schema.stringify(this.contents, ctx, () => contentComment = null, onChompKeep);
-      lines.push((0, _addComment.default)(body, '', contentComment));
+      lines.push((0, _addComment.addComment)(body, '', contentComment));
     } else if (this.contents !== undefined) {
       lines.push(this.schema.stringify(this.contents, ctx));
     }
@@ -671,7 +675,7 @@ class Document {
 
 }
 
-exports.default = Document;
+exports.Document = Document;
 
 _defineProperty(Document, "defaults", {
   '1.0': {
@@ -679,7 +683,7 @@ _defineProperty(Document, "defaults", {
     merge: true,
     tagPrefixes: [{
       handle: '!',
-      prefix: _schema.default.defaultPrefix
+      prefix: _schema.Schema.defaultPrefix
     }, {
       handle: '!!',
       prefix: 'tag:private.yaml.org,2002:'
@@ -693,7 +697,7 @@ _defineProperty(Document, "defaults", {
       prefix: '!'
     }, {
       handle: '!!',
-      prefix: _schema.default.defaultPrefix
+      prefix: _schema.Schema.defaultPrefix
     }]
   },
   '1.2': {
@@ -704,7 +708,7 @@ _defineProperty(Document, "defaults", {
       prefix: '!'
     }, {
       handle: '!!',
-      prefix: _schema.default.defaultPrefix
+      prefix: _schema.Schema.defaultPrefix
     }]
   }
 });

package/dist/addComment.js

@@ -1,10 +1,7 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 exports.addCommentBefore = addCommentBefore;
-exports.default = addComment;
+exports.addComment = addComment;
 
 function addCommentBefore(str, indent, comment) {
   if (!comment) return str;

package/dist/constants.js

@@ -1,8 +1,5 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 exports.Type = exports.Char = void 0;
 const Char = {
   ANCHOR: '&',

package/dist/cst/Alias.js

@@ -1,17 +1,12 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.Alias = void 0;
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _Node = require("./Node");
 
-var _Range = _interopRequireDefault(require("./Range"));
+var _Range = require("./Range");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class Alias extends _Node.default {
+class Alias extends _Node.Node {
   /**
    * Parses an *alias from the source
    *
@@ -25,14 +20,14 @@ class Alias extends _Node.default {
       src
     } = context;
 
-    let offset = _Node.default.endOfIdentifier(src, start + 1);
+    let offset = _Node.Node.endOfIdentifier(src, start + 1);
 
-    this.valueRange = new _Range.default(start + 1, offset);
-    offset = _Node.default.endOfWhiteSpace(src, offset);
+    this.valueRange = new _Range.Range(start + 1, offset);
+    offset = _Node.Node.endOfWhiteSpace(src, offset);
     offset = this.parseComment(offset);
     return offset;
   }
 
 }
 
-exports.default = Alias;
+exports.Alias = Alias;

package/dist/cst/BlankLine.js

@@ -1,19 +1,14 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.BlankLine = void 0;
 
 var _constants = require("../constants");
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _Node = require("./Node");
 
-var _Range = _interopRequireDefault(require("./Range"));
+var _Range = require("./Range");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class BlankLine extends _Node.default {
+class BlankLine extends _Node.Node {
   constructor() {
     super(_constants.Type.BLANK_LINE);
   }
@@ -26,7 +21,7 @@ class BlankLine extends _Node.default {
     return true;
   }
   /**
-   * Parses blank lines from the source
+   * Parses a blank line from the source
    *
    * @param {ParseContext} context
    * @param {number} start - Index of first \n character
@@ -36,21 +31,10 @@ class BlankLine extends _Node.default {
 
   parse(context, start) {
     this.context = context;
-    const {
-      src
-    } = context;
-    let offset = start + 1;
-
-    while (_Node.default.atBlank(src, offset)) {
-      const lineEnd = _Node.default.endOfWhiteSpace(src, offset);
-
-      if (lineEnd === '\n') offset = lineEnd + 1;else break;
-    }
-
-    this.range = new _Range.default(start, offset);
-    return offset;
+    this.range = new _Range.Range(start, start + 1);
+    return start + 1;
   }
 
 }
 
-exports.default = BlankLine;
+exports.BlankLine = BlankLine;

package/dist/cst/BlockValue.js

@@ -1,17 +1,12 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.Chomp = void 0;
+exports.BlockValue = exports.Chomp = void 0;
 
 var _constants = require("../constants");
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _Node = require("./Node");
 
-var _Range = _interopRequireDefault(require("./Range"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Range = require("./Range");
 
 const Chomp = {
   CLIP: 'CLIP',
@@ -20,7 +15,7 @@ const Chomp = {
 };
 exports.Chomp = Chomp;
 
-class BlockValue extends _Node.default {
+class BlockValue extends _Node.Node {
   constructor(type, props) {
     super(type, props);
     this.blockIndent = null;
@@ -86,7 +81,7 @@ class BlockValue extends _Node.default {
       if (ch === '\n') {
         if (sep === '\n') str += '\n';else sep = '\n';
       } else {
-        const lineEnd = _Node.default.endOfLine(src, i);
+        const lineEnd = _Node.Node.endOfLine(src, i);
 
         const line = src.slice(i, lineEnd);
         i = lineEnd;
@@ -144,7 +139,7 @@ class BlockValue extends _Node.default {
 
         default:
           this.blockIndent = Number(bi) || null;
-          this.header = new _Range.default(start, offset);
+          this.header = new _Range.Range(start, offset);
           return offset;
       }
 
@@ -164,9 +159,9 @@ class BlockValue extends _Node.default {
 
     for (let ch = src[offset]; ch === '\n'; ch = src[offset]) {
       offset += 1;
-      if (_Node.default.atDocumentBoundary(src, offset)) break;
+      if (_Node.Node.atDocumentBoundary(src, offset)) break;
 
-      const end = _Node.default.endOfBlockIndent(src, bi, offset); // should not include tab?
+      const end = _Node.Node.endOfBlockIndent(src, bi, offset); // should not include tab?
 
 
       if (end === null) break;
@@ -193,7 +188,7 @@ class BlockValue extends _Node.default {
       if (src[end] === '\n') {
         offset = end;
       } else {
-        offset = valueEnd = _Node.default.endOfLine(src, end);
+        offset = valueEnd = _Node.Node.endOfLine(src, end);
       }
     }
 
@@ -201,7 +196,7 @@ class BlockValue extends _Node.default {
       offset = src[valueEnd] ? valueEnd + 1 : valueEnd;
     }
 
-    this.valueRange = new _Range.default(start + 1, offset);
+    this.valueRange = new _Range.Range(start + 1, offset);
     return offset;
   }
   /**
@@ -232,7 +227,7 @@ class BlockValue extends _Node.default {
       src
     } = context;
     let offset = this.parseBlockHeader(start);
-    offset = _Node.default.endOfWhiteSpace(src, offset);
+    offset = _Node.Node.endOfWhiteSpace(src, offset);
     offset = this.parseComment(offset);
     offset = this.parseBlockValue(offset);
     return offset;
@@ -245,4 +240,4 @@ class BlockValue extends _Node.default {
 
 }
 
-exports.default = BlockValue;
+exports.BlockValue = BlockValue;

package/dist/cst/Collection.js

@@ -1,29 +1,24 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 exports.grabCollectionEndComments = grabCollectionEndComments;
-exports.default = void 0;
+exports.Collection = void 0;
 
 var _constants = require("../constants");
 
-var _BlankLine = _interopRequireDefault(require("./BlankLine"));
+var _BlankLine = require("./BlankLine");
 
-var _CollectionItem = _interopRequireDefault(require("./CollectionItem"));
+var _CollectionItem = require("./CollectionItem");
 
-var _Comment = _interopRequireDefault(require("./Comment"));
+var _Comment = require("./Comment");
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _Node = require("./Node");
 
-var _Range = _interopRequireDefault(require("./Range"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Range = require("./Range");
 
 function grabCollectionEndComments(node) {
   let cnode = node;
 
-  while (cnode instanceof _CollectionItem.default) cnode = cnode.node;
+  while (cnode instanceof _CollectionItem.CollectionItem) cnode = cnode.node;
 
   if (!(cnode instanceof Collection)) return null;
   const len = cnode.items.length;
@@ -57,10 +52,10 @@ function grabCollectionEndComments(node) {
   return ca;
 }
 
-class Collection extends _Node.default {
+class Collection extends _Node.Node {
   static nextContentHasIndent(src, offset, indent) {
-    const lineStart = _Node.default.endOfLine(src, offset) + 1;
-    offset = _Node.default.endOfWhiteSpace(src, lineStart);
+    const lineStart = _Node.Node.endOfLine(src, offset) + 1;
+    offset = _Node.Node.endOfWhiteSpace(src, lineStart);
     const ch = src[offset];
     if (!ch) return false;
     if (offset >= lineStart + indent) return true;
@@ -105,24 +100,24 @@ class Collection extends _Node.default {
     } = context; // It's easier to recalculate lineStart here rather than tracking down the
     // last context from which to read it -- eemeli/yaml#2
 
-    let lineStart = _Node.default.startOfLine(src, start);
+    let lineStart = _Node.Node.startOfLine(src, start);
 
     const firstItem = this.items[0]; // First-item context needs to be correct for later comment handling
     // -- eemeli/yaml#17
 
     firstItem.context.parent = this;
-    this.valueRange = _Range.default.copy(firstItem.valueRange);
+    this.valueRange = _Range.Range.copy(firstItem.valueRange);
     const indent = firstItem.range.start - firstItem.context.lineStart;
     let offset = start;
-    offset = _Node.default.normalizeOffset(src, offset);
+    offset = _Node.Node.normalizeOffset(src, offset);
     let ch = src[offset];
-    let atLineStart = _Node.default.endOfWhiteSpace(src, lineStart) === offset;
+    let atLineStart = _Node.Node.endOfWhiteSpace(src, lineStart) === offset;
     let prevIncludesTrailingLines = false;
 
     while (ch) {
       while (ch === '\n' || ch === '#') {
         if (atLineStart && ch === '\n' && !prevIncludesTrailingLines) {
-          const blankLine = new _BlankLine.default();
+          const blankLine = new _BlankLine.BlankLine();
           offset = blankLine.parse({
             src
           }, offset);
@@ -140,7 +135,7 @@ class Collection extends _Node.default {
             return offset;
           }
 
-          const comment = new _Comment.default();
+          const comment = new _Comment.Comment();
           offset = comment.parse({
             indent,
             lineStart,
@@ -156,10 +151,10 @@ class Collection extends _Node.default {
         }
 
         lineStart = offset + 1;
-        offset = _Node.default.endOfIndent(src, lineStart);
+        offset = _Node.Node.endOfIndent(src, lineStart);
 
-        if (_Node.default.atBlank(src, offset)) {
-          const wsEnd = _Node.default.endOfWhiteSpace(src, offset);
+        if (_Node.Node.atBlank(src, offset)) {
+          const wsEnd = _Node.Node.endOfWhiteSpace(src, offset);
 
           const next = src[wsEnd];
 
@@ -207,7 +202,7 @@ class Collection extends _Node.default {
 
       this.items.push(node);
       this.valueRange.end = node.valueRange.end;
-      offset = _Node.default.normalizeOffset(src, node.range.end);
+      offset = _Node.Node.normalizeOffset(src, node.range.end);
       ch = src[offset];
       atLineStart = false;
       prevIncludesTrailingLines = node.includesTrailingLines; // Need to reset lineStart and atLineStart here if preceding node's range
@@ -263,9 +258,9 @@ class Collection extends _Node.default {
       str += String(item);
     }
 
-    return _Node.default.addStringTerminator(src, range.end, str);
+    return _Node.Node.addStringTerminator(src, range.end, str);
   }
 
 }
 
-exports.default = Collection;
+exports.Collection = Collection;