yaml 1.6.0 → 1.8.0

package/dist/schema/Pair.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _addComment = _interopRequireDefault(require("../addComment"));
 
+var _constants = require("../constants");
+
 var _toJSON = _interopRequireDefault(require("../toJSON"));
 
 var _Collection = _interopRequireDefault(require("./Collection"));
@@ -71,12 +73,27 @@ class Pair extends _Node.default {
 
   toString(ctx, onComment, onChompKeep) {
     if (!ctx || !ctx.doc) return JSON.stringify(this);
+    const {
+      simpleKeys
+    } = ctx.doc.options;
     let {
       key,
       value
     } = this;
     let keyComment = key instanceof _Node.default && key.comment;
-    const explicitKey = !key || keyComment || key instanceof _Collection.default;
+
+    if (simpleKeys) {
+      if (keyComment) {
+        throw new Error('With simple keys, key nodes cannot have comments');
+      }
+
+      if (key instanceof _Collection.default) {
+        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 {
       doc,
       indent
@@ -89,7 +106,7 @@ class Pair extends _Node.default {
     let str = doc.schema.stringify(key, ctx, () => keyComment = null, () => chompKeep = true);
     str = (0, _addComment.default)(str, ctx.indent, keyComment);
 
-    if (ctx.allNullValues) {
+    if (ctx.allNullValues && !simpleKeys) {
       if (this.comment) {
         str = (0, _addComment.default)(str, ctx.indent, this.comment);
         if (onComment) onComment();
@@ -123,6 +140,7 @@ class Pair extends _Node.default {
     }
 
     ctx.implicitKey = false;
+    if (!explicitKey && !this.comment && value instanceof _Scalar.default) ctx.indentAtStart = str.length + 1;
     chompKeep = false;
     const valueStr = doc.schema.stringify(value, ctx, () => valueComment = null, () => chompKeep = true);
     let ws = ' ';

package/dist/schema/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _deprecation = require("../deprecation");
+var _warnings = require("../warnings");
 
 var _constants = require("../constants");
 
@@ -44,10 +44,12 @@ class Schema {
     customTags,
     merge,
     schema,
+    sortMapEntries,
     tags: deprecatedCustomTags
   }) {
     this.merge = !!merge;
     this.name = schema;
+    this.sortMapEntries = sortMapEntries === true ? (a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : 0 : sortMapEntries || null;
     this.tags = _tags.schemas[schema.replace(/\W/g, '')]; // 'yaml-1.1' -> 'yaml11'
 
     if (!this.tags) {
@@ -57,7 +59,7 @@ class Schema {
 
     if (!customTags && deprecatedCustomTags) {
       customTags = deprecatedCustomTags;
-      (0, _deprecation.warnOptionDeprecation)('tags', 'customTags');
+      (0, _warnings.warnOptionDeprecation)('tags', 'customTags');
     }
 
     if (Array.isArray(customTags)) {
@@ -83,6 +85,7 @@ class Schema {
   }
 
   createNode(value, wrapScalars, tag, ctx) {
+    if (value instanceof _Node.default) return value;
     let tagObj;
 
     if (tag) {
@@ -113,7 +116,7 @@ class Schema {
     const obj = {};
 
     if (value && typeof value === 'object' && ctx.prevObjects) {
-      const prev = ctx.prevObjects.find(o => o.value === value);
+      const prev = ctx.prevObjects.get(value);
 
       if (prev) {
         const alias = new _Alias.default(prev); // leaves source dirty; must be cleaned by caller
@@ -123,10 +126,11 @@ class Schema {
       }
 
       obj.value = value;
-      ctx.prevObjects.push(obj);
+      ctx.prevObjects.set(value, obj);
     }
 
     obj.node = tagObj.createNode ? tagObj.createNode(this, value, ctx) : wrapScalars ? new _Scalar.default(value) : value;
+    if (tag && obj.node instanceof _Node.default) obj.node.tag = tag;
     return obj.node;
   }
 
@@ -186,6 +190,7 @@ class Schema {
         }
       }
     } catch (error) {
+      /* istanbul ignore if */
       if (!error.source) error.source = node;
       doc.errors.push(error);
       node.resolved = null;
@@ -198,8 +203,9 @@ class Schema {
 
   resolveNodeWithFallback(doc, node, tagName) {
     const res = this.resolveNode(doc, node, tagName);
-    if (node.hasOwnProperty('resolved')) return res;
+    if (Object.prototype.hasOwnProperty.call(node, 'resolved')) return res;
     const fallback = isMap(node) ? Schema.defaultTags.MAP : isSeq(node) ? Schema.defaultTags.SEQ : Schema.defaultTags.STR;
+    /* istanbul ignore else */
 
     if (fallback) {
       doc.warnings.push(new _errors.YAMLWarning(node, `The tag ${tagName} is unavailable, falling back to ${fallback}`));
@@ -208,9 +214,8 @@ class Schema {
       return res;
     } else {
       doc.errors.push(new _errors.YAMLReferenceError(node, `The tag ${tagName} is unavailable`));
+      return null;
     }
-
-    return null;
   }
 
   getTagObject(item) {
@@ -270,7 +275,7 @@ class Schema {
       const createCtx = {
         aliasNodes: [],
         onTagObj: o => tagObj = o,
-        prevObjects: []
+        prevObjects: new Map()
       };
       item = this.createNode(item, true, null, createCtx);
       const {
@@ -292,6 +297,7 @@ class Schema {
     if (item instanceof _Pair.default) return item.toString(ctx, onComment, onChompKeep);
     if (!tagObj) tagObj = this.getTagObject(item);
     const props = this.stringifyProps(item, tagObj, ctx);
+    if (props.length > 0) ctx.indentAtStart = (ctx.indentAtStart || 0) + props.length + 1;
     const str = typeof tagObj.stringify === 'function' ? tagObj.stringify(item, ctx, onComment, onChompKeep) : item instanceof _Collection.default ? item.toString(ctx, onComment, onChompKeep) : (0, _stringify.stringifyString)(item, ctx, onComment, onChompKeep);
     return props ? item instanceof _Collection.default && str[0] !== '{' && str[0] !== '[' ? `${props}\n${ctx.indent}${str}` : `${props} ${str}` : str;
   }

package/dist/schema/parseMap.js

@@ -21,7 +21,11 @@ var _parseUtils = require("./parseUtils");
 
 var _Alias = _interopRequireDefault(require("./Alias"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+var _Collection = _interopRequireDefault(require("./Collection"));
+
+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 }; }
 
@@ -39,11 +43,13 @@ function parseMap(doc, cst) {
   const map = new _Map.default();
   map.items = items;
   (0, _parseUtils.resolveComments)(map, comments);
+  let hasCollectionKey = false;
 
   for (let i = 0; i < items.length; ++i) {
     const {
       key: iKey
     } = items[i];
+    if (iKey instanceof _Collection.default) hasCollectionKey = true;
 
     if (doc.schema.merge && iKey && iKey.value === _Merge.MERGE_KEY) {
       items[i] = new _Merge.default(items[i]);
@@ -69,7 +75,7 @@ function parseMap(doc, cst) {
           key: jKey
         } = items[j];
 
-        if (iKey === jKey || iKey && jKey && iKey.hasOwnProperty('value') && iKey.value === jKey.value) {
+        if (iKey === jKey || iKey && jKey && Object.prototype.hasOwnProperty.call(iKey, 'value') && iKey.value === jKey.value) {
           const msg = `Map keys must be unique; "${iKey}" is repeated`;
           doc.errors.push(new _errors.YAMLSemanticError(cst, msg));
           break;
@@ -78,6 +84,11 @@ function parseMap(doc, cst) {
     }
   }
 
+  if (hasCollectionKey && !doc.options.mapAsMap) {
+    const warn = 'Keys with collection values will be stringified as YAML due to JS Object restrictions. Use mapAsMap: true to avoid this.';
+    doc.warnings.push(new _errors.YAMLWarning(cst, warn));
+  }
+
   cst.resolved = map;
   return map;
 }
@@ -254,7 +265,8 @@ function resolveFlowMapItems(doc, cst) {
 
     if (typeof item.char === 'string') {
       const {
-        char
+        char,
+        offset
       } = item;
 
       if (char === '?' && key === undefined && !explicitKey) {
@@ -295,7 +307,10 @@ function resolveFlowMapItems(doc, cst) {
         continue;
       }
 
-      doc.errors.push(new _errors.YAMLSyntaxError(cst, `Flow map contains an unexpected ${char}`));
+      const msg = `Flow map contains an unexpected ${char}`;
+      const err = new _errors.YAMLSyntaxError(cst, msg);
+      err.offset = offset;
+      doc.errors.push(err);
     } else if (item.type === _constants.Type.BLANK_LINE) {
       comments.push({
         afterKey: !!key,
@@ -319,7 +334,7 @@ function resolveFlowMapItems(doc, cst) {
     }
   }
 
-  if (cst.items[cst.items.length - 1].char !== '}') doc.errors.push(new _errors.YAMLSemanticError(cst, 'Expected flow map to end with }'));
+  (0, _parseUtils.checkFlowCollectionEnd)(doc.errors, cst);
   if (key !== undefined) items.push(new _Pair.default(key));
   return {
     comments,

package/dist/schema/parseSeq.js

@@ -15,6 +15,8 @@ var _parseUtils = require("./parseUtils");
 
 var _Seq = _interopRequireDefault(require("./Seq"));
 
+var _Collection = _interopRequireDefault(require("./Collection"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function parseSeq(doc, cst) {
@@ -31,6 +33,12 @@ function parseSeq(doc, cst) {
   const seq = new _Seq.default();
   seq.items = items;
   (0, _parseUtils.resolveComments)(seq, comments);
+
+  if (!doc.options.mapAsMap && items.some(it => it instanceof _Pair.default && it.key instanceof _Collection.default)) {
+    const warn = 'Keys with collection values will be stringified as YAML due to JS Object restrictions. Use mapAsMap: true to avoid this.';
+    doc.warnings.push(new _errors.YAMLWarning(cst, warn));
+  }
+
   cst.resolved = seq;
   return seq;
 }
@@ -92,7 +100,8 @@ function resolveFlowSeqItems(doc, cst) {
 
     if (typeof item.char === 'string') {
       const {
-        char
+        char,
+        offset
       } = item;
 
       if (char !== ':' && (explicitKey || key !== undefined)) {
@@ -112,8 +121,10 @@ function resolveFlowSeqItems(doc, cst) {
           key = items.pop();
 
           if (key instanceof _Pair.default) {
-            const msg = 'Chaining flow sequence pairs is invalid (e.g. [ a : b : c ])';
-            doc.errors.push(new _errors.YAMLSemanticError(char, msg));
+            const msg = 'Chaining flow sequence pairs is invalid';
+            const err = new _errors.YAMLSemanticError(cst, msg);
+            err.offset = offset;
+            doc.errors.push(err);
           }
 
           if (!explicitKey) (0, _parseUtils.checkKeyLength)(doc.errors, cst, i, key, keyStart);
@@ -127,7 +138,9 @@ function resolveFlowSeqItems(doc, cst) {
         next = null;
       } else if (next === '[' || char !== ']' || i < cst.items.length - 1) {
         const msg = `Flow sequence contains an unexpected ${char}`;
-        doc.errors.push(new _errors.YAMLSyntaxError(cst, msg));
+        const err = new _errors.YAMLSyntaxError(cst, msg);
+        err.offset = offset;
+        doc.errors.push(err);
       }
     } else if (item.type === _constants.Type.BLANK_LINE) {
       comments.push({
@@ -140,7 +153,7 @@ function resolveFlowSeqItems(doc, cst) {
       });
     } else {
       if (next) {
-        const msg = `Expected a ${next} here in flow sequence`;
+        const msg = `Expected a ${next} in flow sequence`;
         doc.errors.push(new _errors.YAMLSemanticError(item, msg));
       }
 
@@ -158,7 +171,7 @@ function resolveFlowSeqItems(doc, cst) {
     }
   }
 
-  if (cst.items[cst.items.length - 1].char !== ']') doc.errors.push(new _errors.YAMLSemanticError(cst, 'Expected flow sequence to end with ]'));
+  (0, _parseUtils.checkFlowCollectionEnd)(doc.errors, cst);
   if (key !== undefined) items.push(new _Pair.default(key));
   return {
     comments,

package/dist/schema/parseUtils.js

@@ -3,11 +3,60 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkFlowCollectionEnd = checkFlowCollectionEnd;
 exports.checkKeyLength = checkKeyLength;
 exports.resolveComments = resolveComments;
 
 var _errors = require("../errors");
 
+var _constants = require("../constants");
+
+function checkFlowCollectionEnd(errors, cst) {
+  let char, name;
+
+  switch (cst.type) {
+    case _constants.Type.FLOW_MAP:
+      char = '}';
+      name = 'flow map';
+      break;
+
+    case _constants.Type.FLOW_SEQ:
+      char = ']';
+      name = 'flow sequence';
+      break;
+
+    default:
+      errors.push(new _errors.YAMLSemanticError(cst, 'Not a flow collection!?'));
+      return;
+  }
+
+  let lastItem;
+
+  for (let i = cst.items.length - 1; i >= 0; --i) {
+    const item = cst.items[i];
+
+    if (!item || item.type !== _constants.Type.COMMENT) {
+      lastItem = item;
+      break;
+    }
+  }
+
+  if (lastItem && lastItem.char !== char) {
+    const msg = `Expected ${name} to end with ${char}`;
+    let err;
+
+    if (typeof lastItem.offset === 'number') {
+      err = new _errors.YAMLSemanticError(cst, msg);
+      err.offset = lastItem.offset + 1;
+    } else {
+      err = new _errors.YAMLSemanticError(lastItem, msg);
+      if (lastItem.range && lastItem.range.end) err.offset = lastItem.range.end - lastItem.range.start;
+    }
+
+    errors.push(err);
+  }
+}
+
 function checkKeyLength(errors, node, itemIdx, key, keyStart) {
   if (!key || typeof keyStart !== 'number') return;
   const item = node.items[itemIdx];
@@ -31,12 +80,11 @@ function checkKeyLength(errors, node, itemIdx, key, keyStart) {
 }
 
 function resolveComments(collection, comments) {
-  for (const _ref of comments) {
-    const {
-      afterKey,
-      before,
-      comment
-    } = _ref;
+  for (const {
+    afterKey,
+    before,
+    comment
+  } of comments) {
     let item = collection.items[before];
 
     if (!item) {

package/dist/stringify.js

@@ -14,7 +14,15 @@ var _foldFlowLines = _interopRequireWildcard(require("./foldFlowLines"));
 
 var _options = require("./tags/options");
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+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; }
+
+const getFoldOptions = ({
+  indentAtStart
+}) => indentAtStart ? Object.assign({
+  indentAtStart
+}, _options.strOptions.fold) : _options.strOptions.fold;
 
 function stringifyNumber({
   format,
@@ -56,10 +64,11 @@ function lineLengthOverLimit(str, limit) {
   return true;
 }
 
-function doubleQuotedString(value, {
-  implicitKey,
-  indent
-}) {
+function doubleQuotedString(value, ctx) {
+  const {
+    implicitKey,
+    indent
+  } = ctx;
   const {
     jsonEncoding,
     minMultiLineLength
@@ -153,7 +162,7 @@ function doubleQuotedString(value, {
   }
 
   str = start ? str + json.slice(start) : json;
-  return implicitKey ? str : (0, _foldFlowLines.default)(str, indent, _foldFlowLines.FOLD_QUOTED, _options.strOptions.fold);
+  return implicitKey ? str : (0, _foldFlowLines.default)(str, indent, _foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx));
 }
 
 function singleQuotedString(value, ctx) {
@@ -170,7 +179,7 @@ function singleQuotedString(value, ctx) {
   }
 
   const res = "'" + value.replace(/'/g, "''").replace(/\n+/g, `$&\n${indent}`) + "'";
-  return implicitKey ? res : (0, _foldFlowLines.default)(res, indent, _foldFlowLines.FOLD_FLOW, _options.strOptions.fold);
+  return implicitKey ? res : (0, _foldFlowLines.default)(res, indent, _foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
 }
 
 function blockString({
@@ -272,14 +281,15 @@ function plainString(item, ctx, onComment, onChompKeep) {
     return blockString(item, ctx, onComment, onChompKeep);
   }
 
-  const str = value.replace(/\n+/g, `$&\n${indent}`); // May need to verify that output will be parsed as a string, as plain numbers
-  // and booleans get parsed with those types, e.g. '42', 'true' & '0.9e-3'.
+  const str = value.replace(/\n+/g, `$&\n${indent}`); // Verify that output will be parsed as a string, as e.g. plain numbers and
+  // booleans get parsed with those types in v1.2 (e.g. '42', 'true' & '0.9e-3'),
+  // and others in v1.1.
 
-  if (actualString && /^[\w.+-]+$/.test(str) && typeof tags.resolveScalar(str).value !== 'string') {
+  if (actualString && typeof tags.resolveScalar(str).value !== 'string') {
     return doubleQuotedString(value, ctx);
   }
 
-  const body = implicitKey ? str : (0, _foldFlowLines.default)(str, indent, _foldFlowLines.FOLD_FLOW, _options.strOptions.fold);
+  const body = implicitKey ? str : (0, _foldFlowLines.default)(str, indent, _foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
 
   if (comment && !inFlow && (body.indexOf('\n') !== -1 || comment.indexOf('\n') !== -1)) {
     if (onComment) onComment();

package/dist/tags/core.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.floatObj = exports.expObj = exports.nanObj = exports.hexObj = exports.intObj = exports.octObj = exports.boolObj = exports.nullObj = void 0;
 
 var _Scalar = _interopRequireDefault(require("../schema/Scalar"));
 
@@ -15,7 +15,7 @@ var _options = require("./options");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = _failsafe.default.concat([{
+const nullObj = {
   identify: value => value == null,
   createNode: (schema, value, ctx) => ctx.wrapScalars ? new _Scalar.default(null) : null,
   default: true,
@@ -24,7 +24,9 @@ var _default = _failsafe.default.concat([{
   resolve: () => null,
   options: _options.nullOptions,
   stringify: () => _options.nullOptions.nullStr
-}, {
+};
+exports.nullObj = nullObj;
+const boolObj = {
   identify: value => typeof value === 'boolean',
   default: true,
   tag: 'tag:yaml.org,2002:bool',
@@ -34,7 +36,9 @@ var _default = _failsafe.default.concat([{
   stringify: ({
     value
   }) => value ? _options.boolOptions.trueStr : _options.boolOptions.falseStr
-}, {
+};
+exports.boolObj = boolObj;
+const octObj = {
   identify: value => typeof value === 'number',
   default: true,
   tag: 'tag:yaml.org,2002:int',
@@ -44,14 +48,18 @@ var _default = _failsafe.default.concat([{
   stringify: ({
     value
   }) => '0o' + value.toString(8)
-}, {
+};
+exports.octObj = octObj;
+const intObj = {
   identify: value => typeof value === 'number',
   default: true,
   tag: 'tag:yaml.org,2002:int',
   test: /^[-+]?[0-9]+$/,
   resolve: str => parseInt(str, 10),
   stringify: _stringify.stringifyNumber
-}, {
+};
+exports.intObj = intObj;
+const hexObj = {
   identify: value => typeof value === 'number',
   default: true,
   tag: 'tag:yaml.org,2002:int',
@@ -61,14 +69,18 @@ var _default = _failsafe.default.concat([{
   stringify: ({
     value
   }) => '0x' + value.toString(16)
-}, {
+};
+exports.hexObj = hexObj;
+const nanObj = {
   identify: value => typeof value === 'number',
   default: true,
   tag: 'tag:yaml.org,2002:float',
   test: /^(?:[-+]?\.inf|(\.nan))$/i,
   resolve: (str, nan) => nan ? NaN : str[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY,
   stringify: _stringify.stringifyNumber
-}, {
+};
+exports.nanObj = nanObj;
+const expObj = {
   identify: value => typeof value === 'number',
   default: true,
   tag: 'tag:yaml.org,2002:float',
@@ -78,7 +90,9 @@ var _default = _failsafe.default.concat([{
   stringify: ({
     value
   }) => Number(value).toExponential()
-}, {
+};
+exports.expObj = expObj;
+const floatObj = {
   identify: value => typeof value === 'number',
   default: true,
   tag: 'tag:yaml.org,2002:float',
@@ -91,6 +105,9 @@ var _default = _failsafe.default.concat([{
   },
 
   stringify: _stringify.stringifyNumber
-}]);
+};
+exports.floatObj = floatObj;
+
+var _default = _failsafe.default.concat([nullObj, boolObj, octObj, intObj, hexObj, nanObj, expObj, floatObj]);
 
 exports.default = _default;

package/dist/tags/failsafe/map.js

@@ -12,7 +12,7 @@ var _parseMap = _interopRequireDefault(require("../../schema/parseMap"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function createMap(schema, obj, ctx) {
-  const map = new _Map.default();
+  const map = new _Map.default(schema);
 
   if (obj instanceof Map) {
     for (const [key, value] of obj) map.items.push(schema.createPair(key, value, ctx));
@@ -20,6 +20,10 @@ function createMap(schema, obj, ctx) {
     for (const key of Object.keys(obj)) map.items.push(schema.createPair(key, obj[key], ctx));
   }
 
+  if (typeof schema.sortMapEntries === 'function') {
+    map.items.sort(schema.sortMapEntries);
+  }
+
   return map;
 }
 

package/dist/tags/failsafe/seq.js

@@ -12,7 +12,7 @@ var _Seq = _interopRequireDefault(require("../../schema/Seq"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function createSeq(schema, obj, ctx) {
-  const seq = new _Seq.default();
+  const seq = new _Seq.default(schema);
 
   if (obj && obj[Symbol.iterator]) {
     for (const it of obj) {

package/dist/tags/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.tags = exports.schemas = void 0;
 
-var _core = _interopRequireDefault(require("./core"));
+var _core = _interopRequireWildcard(require("./core"));
 
 var _failsafe = _interopRequireDefault(require("./failsafe"));
 
@@ -29,6 +29,10 @@ var _timestamp = require("./yaml-1.1/timestamp");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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; }
+
 const schemas = {
   core: _core.default,
   failsafe: _failsafe.default,
@@ -38,9 +42,17 @@ const schemas = {
 exports.schemas = schemas;
 const tags = {
   binary: _binary.default,
+  bool: _core.boolObj,
+  float: _core.floatObj,
+  floatExp: _core.expObj,
+  floatNaN: _core.nanObj,
   floatTime: _timestamp.floatTime,
+  int: _core.intObj,
+  intHex: _core.hexObj,
+  intOct: _core.octObj,
   intTime: _timestamp.intTime,
   map: _map.default,
+  null: _core.nullObj,
   omap: _omap.default,
   pairs: _pairs.default,
   seq: _seq.default,

package/dist/tags/json.js

@@ -33,15 +33,8 @@ const schema = [_map.default, _seq.default, {
   identify: value => typeof value === 'boolean',
   default: true,
   tag: 'tag:yaml.org,2002:bool',
-  test: /^true$/,
-  resolve: () => true,
-  stringify: value => JSON.stringify(value)
-}, {
-  identify: value => typeof value === 'boolean',
-  default: true,
-  tag: 'tag:yaml.org,2002:bool',
-  test: /^false$/,
-  resolve: () => false,
+  test: /^true|false$/,
+  resolve: str => str === 'true',
   stringify: value => JSON.stringify(value)
 }, {
   identify: value => typeof value === 'number',