yaml 1.8.2 → 1.9.2

package/dist/schema/Alias.js

@@ -1,31 +1,26 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.Alias = void 0;
 
 var _constants = require("../constants");
 
 var _errors = require("../errors");
 
-var _toJSON = _interopRequireDefault(require("../toJSON"));
+var _toJSON = require("../toJSON");
 
-var _Collection = _interopRequireDefault(require("./Collection"));
+var _Collection = require("./Collection");
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _Node = require("./Node");
 
-var _Pair = _interopRequireDefault(require("./Pair"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Pair = require("./Pair");
 
 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; }
 
 const getAliasCount = (node, anchors) => {
   if (node instanceof Alias) {
-    const anchor = anchors.find(a => a.node === node.source);
+    const anchor = anchors.get(node.source);
     return anchor.count * anchor.aliasCount;
-  } else if (node instanceof _Collection.default) {
+  } else if (node instanceof _Collection.Collection) {
     let count = 0;
 
     for (const item of node.items) {
@@ -34,7 +29,7 @@ const getAliasCount = (node, anchors) => {
     }
 
     return count;
-  } else if (node instanceof _Pair.default) {
+  } else if (node instanceof _Pair.Pair) {
     const kc = getAliasCount(node.key, anchors);
     const vc = getAliasCount(node.value, anchors);
     return Math.max(kc, vc);
@@ -43,7 +38,7 @@ const getAliasCount = (node, anchors) => {
   return 1;
 };
 
-class Alias extends _Node.default {
+class Alias extends _Node.Node {
   static stringify({
     range,
     source
@@ -71,12 +66,12 @@ class Alias extends _Node.default {
   }
 
   toJSON(arg, ctx) {
-    if (!ctx) return (0, _toJSON.default)(this.source, arg, ctx);
+    if (!ctx) return (0, _toJSON.toJSON)(this.source, arg, ctx);
     const {
       anchors,
       maxAliasCount
     } = ctx;
-    const anchor = anchors.find(a => a.node === this.source);
+    const anchor = anchors.get(this.source);
     /* istanbul ignore if */
 
     if (!anchor || anchor.res === undefined) {
@@ -105,6 +100,6 @@ class Alias extends _Node.default {
 
 }
 
-exports.default = Alias;
+exports.Alias = Alias;
 
 _defineProperty(Alias, "default", true);

package/dist/schema/Collection.js

@@ -1,19 +1,14 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.isEmptyPath = void 0;
+exports.Collection = exports.isEmptyPath = void 0;
 
-var _addComment = _interopRequireDefault(require("../addComment"));
+var _addComment = require("../addComment");
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _constants = require("../constants");
 
-var _Pair = _interopRequireDefault(require("./Pair"));
+var _Node = require("./Node");
 
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Scalar = require("./Scalar");
 
 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; }
 
@@ -35,7 +30,7 @@ const isEmptyPath = path => path == null || typeof path === 'object' && path[Sym
 
 exports.isEmptyPath = isEmptyPath;
 
-class Collection extends _Node.default {
+class Collection extends _Node.Node {
   constructor(schema) {
     super();
 
@@ -60,14 +55,14 @@ class Collection extends _Node.default {
 
   getIn([key, ...rest], keepScalar) {
     const node = this.get(key, true);
-    if (rest.length === 0) return !keepScalar && node instanceof _Scalar.default ? node.value : node;else return node instanceof Collection ? node.getIn(rest, keepScalar) : undefined;
+    if (rest.length === 0) return !keepScalar && node instanceof _Scalar.Scalar ? node.value : node;else return node instanceof Collection ? node.getIn(rest, keepScalar) : undefined;
   }
 
   hasAllNullValues() {
     return this.items.every(node => {
-      if (!(node instanceof _Pair.default)) return false;
+      if (!node || node.type !== 'PAIR') return false;
       const n = node.value;
-      return n == null || n instanceof _Scalar.default && n.value == null && !n.commentBefore && !n.comment && !n.tag;
+      return n == null || n instanceof _Scalar.Scalar && n.value == null && !n.commentBefore && !n.comment && !n.tag;
     });
   }
 
@@ -101,10 +96,11 @@ class Collection extends _Node.default {
   }, onComment, onChompKeep) {
     const {
       doc,
-      indent
+      indent,
+      indentStep
     } = ctx;
-    const inFlow = this.type && this.type.substr(0, 4) === 'FLOW' || ctx.inFlow;
-    if (inFlow) itemIndent += '  ';
+    const inFlow = this.type === _constants.Type.FLOW_MAP || this.type === _constants.Type.FLOW_SEQ || ctx.inFlow;
+    if (inFlow) itemIndent += indentStep;
     const allNullValues = isMap && this.hasAllNullValues();
     ctx = Object.assign({}, ctx, {
       allNullValues,
@@ -136,7 +132,7 @@ class Collection extends _Node.default {
       let str = doc.schema.stringify(item, ctx, () => comment = null, () => chompKeep = true);
       if (inFlow && !hasItemWithNewLine && str.includes('\n')) hasItemWithNewLine = true;
       if (inFlow && i < this.items.length - 1) str += ',';
-      str = (0, _addComment.default)(str, itemIndent, comment);
+      str = (0, _addComment.addComment)(str, itemIndent, comment);
       if (chompKeep && (comment || inFlow)) chompKeep = false;
       nodes.push({
         type: 'item',
@@ -159,7 +155,7 @@ class Collection extends _Node.default {
         str = start;
 
         for (const s of strings) {
-          str += s ? `\n  ${indent}${s}` : '\n';
+          str += s ? `\n${indentStep}${indent}${s}` : '\n';
         }
 
         str += `\n${indent}${end}`;
@@ -183,6 +179,6 @@ class Collection extends _Node.default {
 
 }
 
-exports.default = Collection;
+exports.Collection = Collection;
 
 _defineProperty(Collection, "maxFlowStringSingleLineLength", 60);

package/dist/schema/Map.js

@@ -1,24 +1,19 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 exports.findPair = findPair;
-exports.default = void 0;
+exports.YAMLMap = void 0;
 
-var _Collection = _interopRequireDefault(require("./Collection"));
+var _Collection = require("./Collection");
 
-var _Pair = _interopRequireDefault(require("./Pair"));
+var _Pair = require("./Pair");
 
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Scalar = require("./Scalar");
 
 function findPair(items, key) {
-  const k = key instanceof _Scalar.default ? key.value : key;
+  const k = key instanceof _Scalar.Scalar ? key.value : key;
 
   for (const it of items) {
-    if (it instanceof _Pair.default) {
+    if (it instanceof _Pair.Pair) {
       if (it.key === key || it.key === k) return it;
       if (it.key && it.key.value === k) return it;
     }
@@ -27,9 +22,9 @@ function findPair(items, key) {
   return undefined;
 }
 
-class YAMLMap extends _Collection.default {
+class YAMLMap extends _Collection.Collection {
   add(pair, overwrite) {
-    if (!pair) pair = new _Pair.default(pair);else if (!(pair instanceof _Pair.default)) pair = new _Pair.default(pair.key || pair, pair.value);
+    if (!pair) pair = new _Pair.Pair(pair);else if (!(pair instanceof _Pair.Pair)) pair = new _Pair.Pair(pair.key || pair, pair.value);
     const prev = findPair(this.items, pair.key);
     const sortEntries = this.schema && this.schema.sortMapEntries;
 
@@ -53,7 +48,7 @@ class YAMLMap extends _Collection.default {
   get(key, keepScalar) {
     const it = findPair(this.items, key);
     const node = it && it.value;
-    return !keepScalar && node instanceof _Scalar.default ? node.value : node;
+    return !keepScalar && node instanceof _Scalar.Scalar ? node.value : node;
   }
 
   has(key) {
@@ -61,7 +56,7 @@ class YAMLMap extends _Collection.default {
   }
 
   set(key, value) {
-    this.add(new _Pair.default(key, value), true);
+    this.add(new _Pair.Pair(key, value), true);
   }
   /**
    * @param {*} arg ignored
@@ -84,7 +79,7 @@ class YAMLMap extends _Collection.default {
     if (!ctx) return JSON.stringify(this);
 
     for (const item of this.items) {
-      if (!(item instanceof _Pair.default)) throw new Error(`Map items must all be pairs; found ${JSON.stringify(item)} instead`);
+      if (!(item instanceof _Pair.Pair)) throw new Error(`Map items must all be pairs; found ${JSON.stringify(item)} instead`);
     }
 
     return super.toString(ctx, {
@@ -100,4 +95,4 @@ class YAMLMap extends _Collection.default {
 
 }
 
-exports.default = YAMLMap;
+exports.YAMLMap = YAMLMap;

package/dist/schema/Merge.js

@@ -1,30 +1,25 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.MERGE_KEY = void 0;
+exports.Merge = exports.MERGE_KEY = void 0;
 
-var _Map = _interopRequireDefault(require("./Map"));
+var _Map = require("./Map");
 
-var _Pair = _interopRequireDefault(require("./Pair"));
+var _Pair = require("./Pair");
 
-var _Scalar = _interopRequireDefault(require("./Scalar"));
+var _Scalar = require("./Scalar");
 
-var _Seq = _interopRequireDefault(require("./Seq"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Seq = require("./Seq");
 
 const MERGE_KEY = '<<';
 exports.MERGE_KEY = MERGE_KEY;
 
-class Merge extends _Pair.default {
+class Merge extends _Pair.Pair {
   constructor(pair) {
-    if (pair instanceof _Pair.default) {
+    if (pair instanceof _Pair.Pair) {
       let seq = pair.value;
 
-      if (!(seq instanceof _Seq.default)) {
-        seq = new _Seq.default();
+      if (!(seq instanceof _Seq.YAMLSeq)) {
+        seq = new _Seq.YAMLSeq();
         seq.items.push(pair.value);
         seq.range = pair.value.range;
       }
@@ -32,10 +27,10 @@ class Merge extends _Pair.default {
       super(pair.key, seq);
       this.range = pair.range;
     } else {
-      super(new _Scalar.default(MERGE_KEY), new _Seq.default());
+      super(new _Scalar.Scalar(MERGE_KEY), new _Seq.YAMLSeq());
     }
 
-    this.type = 'MERGE_PAIR';
+    this.type = _Pair.Pair.Type.MERGE_PAIR;
   } // If the value associated with a merge key is a single mapping node, each of
   // its key/value pairs is inserted into the current mapping, unless the key
   // already exists in it. If the value associated with the merge key is a
@@ -49,7 +44,7 @@ class Merge extends _Pair.default {
     for (const {
       source
     } of this.value.items) {
-      if (!(source instanceof _Map.default)) throw new Error('Merge sources must be maps');
+      if (!(source instanceof _Map.YAMLMap)) throw new Error('Merge sources must be maps');
       const srcMap = source.toJSON(null, ctx, Map);
 
       for (const [key, value] of srcMap) {
@@ -77,4 +72,4 @@ class Merge extends _Pair.default {
 
 }
 
-exports.default = Merge;
+exports.Merge = Merge;

package/dist/schema/Node.js

@@ -1,10 +1,7 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.Node = void 0;
 
 class Node {}
 
-exports.default = Node;
+exports.Node = Node;

package/dist/schema/Pair.js

@@ -1,44 +1,43 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.Pair = void 0;
 
-var _addComment = _interopRequireDefault(require("../addComment"));
+var _addComment = require("../addComment");
 
 var _constants = require("../constants");
 
-var _toJSON = _interopRequireDefault(require("../toJSON"));
+var _toJSON = require("../toJSON");
 
-var _Collection = _interopRequireDefault(require("./Collection"));
+var _Collection = require("./Collection");
 
-var _Node = _interopRequireDefault(require("./Node"));
+var _Node = require("./Node");
 
-var _Scalar = _interopRequireDefault(require("./Scalar"));
+var _Scalar = require("./Scalar");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Seq = require("./Seq");
+
+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; }
 
-// Published as 'yaml/pair'
 const stringifyKey = (key, jsKey, ctx) => {
   if (jsKey === null) return '';
   if (typeof jsKey !== 'object') return String(jsKey);
-  if (key instanceof _Node.default && ctx && ctx.doc) return key.toString({
+  if (key instanceof _Node.Node && ctx && ctx.doc) return key.toString({
     anchors: {},
     doc: ctx.doc,
     indent: '',
+    indentStep: ctx.indentStep,
     inFlow: true,
     inStringifyKey: true
   });
   return JSON.stringify(jsKey);
 };
 
-class Pair extends _Node.default {
+class Pair extends _Node.Node {
   constructor(key, value = null) {
     super();
     this.key = key;
     this.value = value;
-    this.type = 'PAIR';
+    this.type = Pair.Type.PAIR;
   }
 
   get commentBefore() {
@@ -46,21 +45,21 @@ class Pair extends _Node.default {
   }
 
   set commentBefore(cb) {
-    if (this.key == null) this.key = new _Scalar.default(null);
+    if (this.key == null) this.key = new _Scalar.Scalar(null);
     this.key.commentBefore = cb;
   }
 
   addToJSMap(ctx, map) {
-    const key = (0, _toJSON.default)(this.key, '', ctx);
+    const key = (0, _toJSON.toJSON)(this.key, '', ctx);
 
     if (map instanceof Map) {
-      const value = (0, _toJSON.default)(this.value, key, ctx);
+      const value = (0, _toJSON.toJSON)(this.value, key, ctx);
       map.set(key, value);
     } else if (map instanceof Set) {
       map.add(key);
     } else {
       const stringKey = stringifyKey(this.key, key, ctx);
-      map[stringKey] = (0, _toJSON.default)(this.value, stringKey, ctx);
+      map[stringKey] = (0, _toJSON.toJSON)(this.value, stringKey, ctx);
     }
 
     return map;
@@ -74,41 +73,44 @@ class Pair extends _Node.default {
   toString(ctx, onComment, onChompKeep) {
     if (!ctx || !ctx.doc) return JSON.stringify(this);
     const {
+      indent: indentSize,
+      indentSeq,
       simpleKeys
     } = ctx.doc.options;
     let {
       key,
       value
     } = this;
-    let keyComment = key instanceof _Node.default && key.comment;
+    let keyComment = key instanceof _Node.Node && key.comment;
 
     if (simpleKeys) {
       if (keyComment) {
         throw new Error('With simple keys, key nodes cannot have comments');
       }
 
-      if (key instanceof _Collection.default) {
+      if (key instanceof _Collection.Collection) {
         const msg = 'With simple keys, collection cannot be used as a key value';
         throw new Error(msg);
       }
     }
 
-    const explicitKey = !simpleKeys && (!key || keyComment || key instanceof _Collection.default || key.type === _constants.Type.BLOCK_FOLDED || key.type === _constants.Type.BLOCK_LITERAL);
+    const explicitKey = !simpleKeys && (!key || keyComment || key instanceof _Collection.Collection || key.type === _constants.Type.BLOCK_FOLDED || key.type === _constants.Type.BLOCK_LITERAL);
     const {
       doc,
-      indent
+      indent,
+      indentStep
     } = ctx;
     ctx = Object.assign({}, ctx, {
       implicitKey: !explicitKey,
-      indent: indent + '  '
+      indent: indent + indentStep
     });
     let chompKeep = false;
     let str = doc.schema.stringify(key, ctx, () => keyComment = null, () => chompKeep = true);
-    str = (0, _addComment.default)(str, ctx.indent, keyComment);
+    str = (0, _addComment.addComment)(str, ctx.indent, keyComment);
 
     if (ctx.allNullValues && !simpleKeys) {
       if (this.comment) {
-        str = (0, _addComment.default)(str, ctx.indent, this.comment);
+        str = (0, _addComment.addComment)(str, ctx.indent, this.comment);
         if (onComment) onComment();
       } else if (chompKeep && !keyComment && onChompKeep) onChompKeep();
 
@@ -119,14 +121,14 @@ class Pair extends _Node.default {
 
     if (this.comment) {
       // expected (but not strictly required) to be a single-line comment
-      str = (0, _addComment.default)(str, ctx.indent, this.comment);
+      str = (0, _addComment.addComment)(str, ctx.indent, this.comment);
       if (onComment) onComment();
     }
 
     let vcb = '';
     let valueComment = null;
 
-    if (value instanceof _Node.default) {
+    if (value instanceof _Node.Node) {
       if (value.spaceBefore) vcb = '\n';
 
       if (value.commentBefore) {
@@ -140,22 +142,33 @@ class Pair extends _Node.default {
     }
 
     ctx.implicitKey = false;
-    if (!explicitKey && !this.comment && value instanceof _Scalar.default) ctx.indentAtStart = str.length + 1;
+    if (!explicitKey && !this.comment && value instanceof _Scalar.Scalar) ctx.indentAtStart = str.length + 1;
     chompKeep = false;
+
+    if (!indentSeq && indentSize >= 2 && !ctx.inFlow && !explicitKey && value instanceof _Seq.YAMLSeq && value.type !== _constants.Type.FLOW_SEQ && !value.tag && !doc.anchors.getName(value)) {
+      // If indentSeq === false, consider '- ' as part of indentation where possible
+      ctx.indent = ctx.indent.substr(2);
+    }
+
     const valueStr = doc.schema.stringify(value, ctx, () => valueComment = null, () => chompKeep = true);
     let ws = ' ';
 
     if (vcb || this.comment) {
       ws = `${vcb}\n${ctx.indent}`;
-    } else if (!explicitKey && value instanceof _Collection.default) {
+    } else if (!explicitKey && value instanceof _Collection.Collection) {
       const flow = valueStr[0] === '[' || valueStr[0] === '{';
       if (!flow || valueStr.includes('\n')) ws = `\n${ctx.indent}`;
     }
 
     if (chompKeep && !valueComment && onChompKeep) onChompKeep();
-    return (0, _addComment.default)(str + ws + valueStr, ctx.indent, valueComment);
+    return (0, _addComment.addComment)(str + ws + valueStr, ctx.indent, valueComment);
   }
 
 }
 
-exports.default = Pair;
+exports.Pair = Pair;
+
+_defineProperty(Pair, "Type", {
+  PAIR: 'PAIR',
+  MERGE_PAIR: 'MERGE_PAIR'
+});

package/dist/schema/Scalar.js

@@ -1,25 +1,20 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.Scalar = void 0;
 
-var _toJSON = _interopRequireDefault(require("../toJSON"));
+var _toJSON = require("../toJSON");
 
-var _Node = _interopRequireDefault(require("./Node"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Node = require("./Node");
 
 // Published as 'yaml/scalar'
-class Scalar extends _Node.default {
+class Scalar extends _Node.Node {
   constructor(value) {
     super();
     this.value = value;
   }
 
   toJSON(arg, ctx) {
-    return ctx && ctx.keep ? this.value : (0, _toJSON.default)(this.value, arg, ctx);
+    return ctx && ctx.keep ? this.value : (0, _toJSON.toJSON)(this.value, arg, ctx);
   }
 
   toString() {
@@ -28,4 +23,4 @@ class Scalar extends _Node.default {
 
 }
 
-exports.default = Scalar;
+exports.Scalar = Scalar;

package/dist/schema/Seq.js

@@ -1,26 +1,21 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
+exports.YAMLSeq = void 0;
 
-var _toJSON = _interopRequireDefault(require("../toJSON"));
+var _toJSON = require("../toJSON");
 
-var _Collection = _interopRequireDefault(require("./Collection"));
+var _Collection = require("./Collection");
 
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Scalar = require("./Scalar");
 
 // Published as 'yaml/seq'
 function asItemIndex(key) {
-  let idx = key instanceof _Scalar.default ? key.value : key;
+  let idx = key instanceof _Scalar.Scalar ? key.value : key;
   if (idx && typeof idx === 'string') idx = Number(idx);
   return Number.isInteger(idx) && idx >= 0 ? idx : null;
 }
 
-class YAMLSeq extends _Collection.default {
+class YAMLSeq extends _Collection.Collection {
   add(value) {
     this.items.push(value);
   }
@@ -36,7 +31,7 @@ class YAMLSeq extends _Collection.default {
     const idx = asItemIndex(key);
     if (typeof idx !== 'number') return undefined;
     const it = this.items[idx];
-    return !keepScalar && it instanceof _Scalar.default ? it.value : it;
+    return !keepScalar && it instanceof _Scalar.Scalar ? it.value : it;
   }
 
   has(key) {
@@ -55,7 +50,7 @@ class YAMLSeq extends _Collection.default {
     if (ctx && ctx.onCreate) ctx.onCreate(seq);
     let i = 0;
 
-    for (const item of this.items) seq.push((0, _toJSON.default)(item, String(i++), ctx));
+    for (const item of this.items) seq.push((0, _toJSON.toJSON)(item, String(i++), ctx));
 
     return seq;
   }
@@ -75,4 +70,4 @@ class YAMLSeq extends _Collection.default {
 
 }
 
-exports.default = YAMLSeq;
+exports.YAMLSeq = YAMLSeq;