yaml 2.0.0-5 → 2.0.0-9

package/dist/parse/parser.js

@@ -22,38 +22,6 @@ function includesNonEmpty(list) {
     }
     return false;
 }
-function atFirstEmptyLineAfterComments(start) {
-    let hasComment = false;
-    for (let i = 0; i < start.length; ++i) {
-        switch (start[i].type) {
-            case 'space':
-                break;
-            case 'comment':
-                hasComment = true;
-                break;
-            case 'newline':
-                if (!hasComment)
-                    return false;
-                break;
-            default:
-                return false;
-        }
-    }
-    if (hasComment) {
-        for (let i = start.length - 1; i >= 0; --i) {
-            switch (start[i].type) {
-                /* istanbul ignore next */
-                case 'space':
-                    break;
-                case 'newline':
-                    return true;
-                default:
-                    return false;
-            }
-        }
-    }
-    return false;
-}
 function isFlowToken(token) {
     switch (token === null || token === void 0 ? void 0 : token.type) {
         case 'alias':
@@ -506,24 +474,38 @@ class Parser {
         switch (this.type) {
             case 'newline':
                 this.onKeyLine = false;
-                if (!it.sep && atFirstEmptyLineAfterComments(it.start)) {
-                    const prev = map.items[map.items.length - 2];
-                    const end = (_a = prev === null || prev === void 0 ? void 0 : prev.value) === null || _a === void 0 ? void 0 : _a.end;
-                    if (Array.isArray(end)) {
-                        Array.prototype.push.apply(end, it.start);
-                        it.start = [this.sourceToken];
-                        return;
-                    }
+                if (it.value) {
+                    const end = 'end' in it.value ? it.value.end : undefined;
+                    const last = Array.isArray(end) ? end[end.length - 1] : undefined;
+                    if ((last === null || last === void 0 ? void 0 : last.type) === 'comment')
+                        end === null || end === void 0 ? void 0 : end.push(this.sourceToken);
+                    else
+                        map.items.push({ start: [this.sourceToken] });
                 }
-            // fallthrough
+                else if (it.sep)
+                    it.sep.push(this.sourceToken);
+                else
+                    it.start.push(this.sourceToken);
+                return;
             case 'space':
             case 'comment':
                 if (it.value)
                     map.items.push({ start: [this.sourceToken] });
                 else if (it.sep)
                     it.sep.push(this.sourceToken);
-                else
+                else {
+                    if (this.atIndentedComment(it.start, map.indent)) {
+                        const prev = map.items[map.items.length - 2];
+                        const end = (_a = prev === null || prev === void 0 ? void 0 : prev.value) === null || _a === void 0 ? void 0 : _a.end;
+                        if (Array.isArray(end)) {
+                            Array.prototype.push.apply(end, it.start);
+                            end.push(this.sourceToken);
+                            map.items.pop();
+                            return;
+                        }
+                    }
                     it.start.push(this.sourceToken);
+                }
                 return;
         }
         if (this.indent >= map.indent) {
@@ -628,22 +610,34 @@ class Parser {
         const it = seq.items[seq.items.length - 1];
         switch (this.type) {
             case 'newline':
-                if (!it.value && atFirstEmptyLineAfterComments(it.start)) {
-                    const prev = seq.items[seq.items.length - 2];
-                    const end = (_a = prev === null || prev === void 0 ? void 0 : prev.value) === null || _a === void 0 ? void 0 : _a.end;
-                    if (Array.isArray(end)) {
-                        Array.prototype.push.apply(end, it.start);
-                        it.start = [this.sourceToken];
-                        return;
-                    }
+                if (it.value) {
+                    const end = 'end' in it.value ? it.value.end : undefined;
+                    const last = Array.isArray(end) ? end[end.length - 1] : undefined;
+                    if ((last === null || last === void 0 ? void 0 : last.type) === 'comment')
+                        end === null || end === void 0 ? void 0 : end.push(this.sourceToken);
+                    else
+                        seq.items.push({ start: [this.sourceToken] });
                 }
-            // fallthrough
+                else
+                    it.start.push(this.sourceToken);
+                return;
             case 'space':
             case 'comment':
                 if (it.value)
                     seq.items.push({ start: [this.sourceToken] });
-                else
+                else {
+                    if (this.atIndentedComment(it.start, seq.indent)) {
+                        const prev = seq.items[seq.items.length - 2];
+                        const end = (_a = prev === null || prev === void 0 ? void 0 : prev.value) === null || _a === void 0 ? void 0 : _a.end;
+                        if (Array.isArray(end)) {
+                            Array.prototype.push.apply(end, it.start);
+                            end.push(this.sourceToken);
+                            seq.items.pop();
+                            return;
+                        }
+                    }
                     it.start.push(this.sourceToken);
+                }
                 return;
             case 'anchor':
             case 'tag':
@@ -838,6 +832,13 @@ class Parser {
         }
         return null;
     }
+    atIndentedComment(start, indent) {
+        if (this.type !== 'comment')
+            return false;
+        if (this.indent <= indent)
+            return false;
+        return start.every(st => st.type === 'newline' || st.type === 'space');
+    }
     *documentEnd(docEnd) {
         if (this.type !== 'doc-mode') {
             if (docEnd.end)

package/dist/schema/Schema.d.ts

@@ -13,4 +13,5 @@ export declare class Schema {
     [SCALAR]: ScalarTag;
     [SEQ]: CollectionTag;
     constructor({ customTags, merge, resolveKnownTags, schema, sortMapEntries }: SchemaOptions);
+    clone(): Schema;
 }

package/dist/schema/Schema.js

@@ -20,6 +20,11 @@ class Schema {
         this.sortMapEntries =
             sortMapEntries === true ? sortMapEntriesByKey : sortMapEntries || null;
     }
+    clone() {
+        const copy = Object.create(Schema.prototype, Object.getOwnPropertyDescriptors(this));
+        copy.tags = this.tags.slice();
+        return copy;
+    }
 }
 
 exports.Schema = Schema;

package/dist/schema/tags.js

@@ -52,11 +52,15 @@ const coreKnownTags = {
 function getTags(customTags, schemaName) {
     let tags = schemas[schemaName];
     if (!tags) {
-        const keys = Object.keys(schemas)
-            .filter(key => key !== 'yaml11')
-            .map(key => JSON.stringify(key))
-            .join(', ');
-        throw new Error(`Unknown schema "${schemaName}"; use one of ${keys}`);
+        if (Array.isArray(customTags))
+            tags = [];
+        else {
+            const keys = Object.keys(schemas)
+                .filter(key => key !== 'yaml11')
+                .map(key => JSON.stringify(key))
+                .join(', ');
+            throw new Error(`Unknown schema "${schemaName}"; use one of ${keys} or define customTags array`);
+        }
     }
     if (Array.isArray(customTags)) {
         for (const tag of customTags)

package/dist/stringify/stringify.js

@@ -10,6 +10,7 @@ const createStringifyContext = (doc, options) => ({
     indent: '',
     indentStep: typeof options.indent === 'number' ? ' '.repeat(options.indent) : '  ',
     options: Object.assign({
+        blockQuote: true,
         defaultKeyType: null,
         defaultStringType: 'PLAIN',
         directives: null,
@@ -21,7 +22,7 @@ const createStringifyContext = (doc, options) => ({
         minContentWidth: 20,
         nullStr: 'null',
         simpleKeys: false,
-        singleQuote: false,
+        singleQuote: null,
         trueStr: 'true',
         verifyAliasOrder: true
     }, options)

package/dist/stringify/stringifyCollection.d.ts

@@ -1,5 +1,5 @@
 import { Collection } from '../nodes/Collection.js';
-import { StringifyContext } from '../stringify/stringify.js';
+import { StringifyContext } from './stringify.js';
 declare type StringifyNode = {
     comment: boolean;
     str: string;

package/dist/stringify/stringifyCollection.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var Collection = require('../nodes/Collection.js');
-var addComment = require('./addComment.js');
-var stringify = require('./stringify.js');
 var Node = require('../nodes/Node.js');
+var stringify = require('./stringify.js');
+var stringifyComment = require('./stringifyComment.js');
 
 function stringifyCollection({ comment, flow, items }, ctx, { blockItem, flowChars, itemIndent, onChompKeep, onComment }) {
     const { indent, indentStep } = ctx;
@@ -18,10 +18,17 @@ function stringifyCollection({ comment, flow, items }, ctx, { blockItem, flowCha
         if (Node.isNode(item)) {
             if (!chompKeep && item.spaceBefore)
                 nodes.push({ comment: true, str: '' });
-            if (item.commentBefore) {
+            let cb = item.commentBefore;
+            if (cb && chompKeep)
+                cb = cb.replace(/^\n+/, '');
+            if (cb) {
+                if (/^\n+$/.test(cb))
+                    cb = cb.substring(1);
                 // This match will always succeed on a non-empty string
-                for (const line of item.commentBefore.match(/^.*$/gm))
-                    nodes.push({ comment: true, str: `#${line}` });
+                for (const line of cb.match(/^.*$/gm)) {
+                    const str = line === ' ' ? '#' : line ? `#${line}` : '';
+                    nodes.push({ comment: true, str });
+                }
             }
             if (item.comment) {
                 comment = item.comment;
@@ -33,10 +40,17 @@ function stringifyCollection({ comment, flow, items }, ctx, { blockItem, flowCha
             if (ik) {
                 if (!chompKeep && ik.spaceBefore)
                     nodes.push({ comment: true, str: '' });
-                if (ik.commentBefore) {
+                let cb = ik.commentBefore;
+                if (cb && chompKeep)
+                    cb = cb.replace(/^\n+/, '');
+                if (cb) {
+                    if (/^\n+$/.test(cb))
+                        cb = cb.substring(1);
                     // This match will always succeed on a non-empty string
-                    for (const line of ik.commentBefore.match(/^.*$/gm))
-                        nodes.push({ comment: true, str: `#${line}` });
+                    for (const line of cb.match(/^.*$/gm)) {
+                        const str = line === ' ' ? '#' : line ? `#${line}` : '';
+                        nodes.push({ comment: true, str });
+                    }
                 }
                 if (ik.comment)
                     singleLineOutput = false;
@@ -58,7 +72,7 @@ function stringifyCollection({ comment, flow, items }, ctx, { blockItem, flowCha
         let str = stringify.stringify(item, ctx, () => (comment = null), () => (chompKeep = true));
         if (inFlow && i < items.length - 1)
             str += ',';
-        str = addComment.addComment(str, itemIndent, comment);
+        str = stringifyComment.addComment(str, itemIndent, comment);
         if (chompKeep && (comment || inFlow))
             chompKeep = false;
         nodes.push({ comment: false, str });
@@ -98,7 +112,7 @@ function stringifyCollection({ comment, flow, items }, ctx, { blockItem, flowCha
             str += s ? `\n${indent}${s}` : '\n';
     }
     if (comment) {
-        str += '\n' + comment.replace(/^/gm, `${indent}#`);
+        str += '\n' + stringifyComment.stringifyComment(comment, indent);
         if (onComment)
             onComment();
     }

package/dist/stringify/stringifyComment.d.ts

@@ -0,0 +1,2 @@
+export declare const stringifyComment: (comment: string, indent: string) => string;
+export declare function addComment(str: string, indent: string, comment?: string | null): string;

package/dist/stringify/{addComment.js → stringifyComment.js}

@@ -1,13 +1,17 @@
 'use strict';
 
+const stringifyComment = (comment, indent) => /^\n+$/.test(comment)
+    ? comment.substring(1)
+    : comment.replace(/^(?!$)(?: $)?/gm, `${indent}#`);
 function addComment(str, indent, comment) {
     return !comment
         ? str
         : comment.includes('\n')
-            ? `${str}\n` + comment.replace(/^/gm, `${indent || ''}#`)
+            ? `${str}\n` + stringifyComment(comment, indent)
             : str.endsWith(' ')
                 ? `${str}#${comment}`
                 : `${str} #${comment}`;
 }
 
 exports.addComment = addComment;
+exports.stringifyComment = stringifyComment;

package/dist/stringify/stringifyDocument.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var Node = require('../nodes/Node.js');
-var addComment = require('./addComment.js');
 var stringify = require('./stringify.js');
+var stringifyComment = require('./stringifyComment.js');
 
 function stringifyDocument(doc, options) {
     const lines = [];
@@ -21,7 +21,7 @@ function stringifyDocument(doc, options) {
     if (doc.commentBefore) {
         if (lines.length !== 1)
             lines.unshift('');
-        lines.unshift(doc.commentBefore.replace(/^/gm, '#'));
+        lines.unshift(stringifyComment.stringifyComment(doc.commentBefore, ''));
     }
     const ctx = stringify.createStringifyContext(doc, options);
     let chompKeep = false;
@@ -31,7 +31,7 @@ function stringifyDocument(doc, options) {
             if (doc.contents.spaceBefore && hasDirectives)
                 lines.push('');
             if (doc.contents.commentBefore)
-                lines.push(doc.contents.commentBefore.replace(/^/gm, '#'));
+                lines.push(stringifyComment.stringifyComment(doc.contents.commentBefore, ''));
             // top-level block scalars need to be indented if followed by a comment
             ctx.forceBlockIndent = !!doc.comment;
             contentComment = doc.contents.comment;
@@ -39,7 +39,7 @@ function stringifyDocument(doc, options) {
         const onChompKeep = contentComment ? undefined : () => (chompKeep = true);
         let body = stringify.stringify(doc.contents, ctx, () => (contentComment = null), onChompKeep);
         if (contentComment)
-            body = addComment.addComment(body, '', contentComment);
+            body = stringifyComment.addComment(body, '', contentComment);
         if ((body[0] === '|' || body[0] === '>') &&
             lines[lines.length - 1] === '---') {
             // Top-level block scalars with a preceding doc marker ought to use the
@@ -52,10 +52,13 @@ function stringifyDocument(doc, options) {
     else {
         lines.push(stringify.stringify(doc.contents, ctx));
     }
-    if (doc.comment) {
+    let dc = doc.comment;
+    if (dc && chompKeep)
+        dc = dc.replace(/^\n+/, '');
+    if (dc) {
         if ((!chompKeep || contentComment) && lines[lines.length - 1] !== '')
             lines.push('');
-        lines.push(doc.comment.replace(/^/gm, '#'));
+        lines.push(stringifyComment.stringifyComment(dc, ''));
     }
     return lines.join('\n') + '\n';
 }

package/dist/stringify/stringifyPair.js

@@ -2,8 +2,8 @@
 
 var Node = require('../nodes/Node.js');
 var Scalar = require('../nodes/Scalar.js');
-var addComment = require('./addComment.js');
 var stringify = require('./stringify.js');
+var stringifyComment = require('./stringifyComment.js');
 
 function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
     const { allNullValues, doc, indent, indentStep, options: { indentSeq, simpleKeys } } = ctx;
@@ -49,22 +49,20 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             keyComment = null;
         if (chompKeep && !keyComment && onChompKeep)
             onChompKeep();
-        return addComment.addComment(`? ${str}`, ctx.indent, keyComment);
+        return stringifyComment.addComment(`? ${str}`, ctx.indent, keyComment);
     }
     if (keyCommentDone)
         keyComment = null;
     str = explicitKey
-        ? `? ${addComment.addComment(str, ctx.indent, keyComment)}\n${indent}:`
-        : addComment.addComment(`${str}:`, ctx.indent, keyComment);
+        ? `? ${stringifyComment.addComment(str, ctx.indent, keyComment)}\n${indent}:`
+        : stringifyComment.addComment(`${str}:`, ctx.indent, keyComment);
     let vcb = '';
     let valueComment = null;
     if (Node.isNode(value)) {
         if (value.spaceBefore)
             vcb = '\n';
-        if (value.commentBefore) {
-            const cs = value.commentBefore.replace(/^/gm, `${ctx.indent}#`);
-            vcb += `\n${cs}`;
-        }
+        if (value.commentBefore)
+            vcb += `\n${stringifyComment.stringifyComment(value.commentBefore, ctx.indent)}`;
         valueComment = value.comment;
     }
     else if (value && typeof value === 'object') {
@@ -89,14 +87,14 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
     const valueStr = stringify.stringify(value, ctx, () => (valueCommentDone = true), () => (chompKeep = true));
     let ws = ' ';
     if (vcb || keyComment) {
-        ws = `${vcb}\n${ctx.indent}`;
+        ws = valueStr === '' && !ctx.inFlow ? vcb : `${vcb}\n${ctx.indent}`;
     }
     else if (!explicitKey && Node.isCollection(value)) {
         const flow = valueStr[0] === '[' || valueStr[0] === '{';
         if (!flow || valueStr.includes('\n'))
             ws = `\n${ctx.indent}`;
     }
-    else if (valueStr[0] === '\n')
+    else if (valueStr === '' || valueStr[0] === '\n')
         ws = '';
     if (ctx.inFlow) {
         if (valueCommentDone && onComment)
@@ -108,7 +106,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
             valueComment = null;
         if (chompKeep && !valueComment && onChompKeep)
             onChompKeep();
-        return addComment.addComment(str + ws + valueStr, ctx.indent, valueComment);
+        return stringifyComment.addComment(str + ws + valueStr, ctx.indent, valueComment);
     }
 }
 

package/dist/stringify/stringifyString.js

@@ -120,34 +120,50 @@ function doubleQuotedString(value, ctx) {
         : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx));
 }
 function singleQuotedString(value, ctx) {
-    if (ctx.implicitKey) {
-        if (/\n/.test(value))
-            return doubleQuotedString(value, ctx);
-    }
-    else {
-        // single quoted string can't have leading or trailing whitespace around newline
-        if (/[ \t]\n|\n[ \t]/.test(value))
-            return doubleQuotedString(value, ctx);
-    }
+    if (ctx.options.singleQuote === false ||
+        (ctx.implicitKey && value.includes('\n')) ||
+        /[ \t]\n|\n[ \t]/.test(value) // single quoted string can't have leading or trailing whitespace around newline
+    )
+        return doubleQuotedString(value, ctx);
     const indent = ctx.indent || (containsDocumentMarker(value) ? '  ' : '');
     const res = "'" + value.replace(/'/g, "''").replace(/\n+/g, `$&\n${indent}`) + "'";
     return ctx.implicitKey
         ? res
         : foldFlowLines.foldFlowLines(res, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
 }
+function quotedString(value, ctx) {
+    const { singleQuote } = ctx.options;
+    let qs;
+    if (singleQuote === false)
+        qs = doubleQuotedString;
+    else {
+        const hasDouble = value.includes('"');
+        const hasSingle = value.includes("'");
+        if (hasDouble && !hasSingle)
+            qs = singleQuotedString;
+        else if (hasSingle && !hasDouble)
+            qs = doubleQuotedString;
+        else
+            qs = singleQuote ? singleQuotedString : doubleQuotedString;
+    }
+    return qs(value, ctx);
+}
 function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
+    const { lineWidth, blockQuote } = ctx.options;
     // 1. Block can't end in whitespace unless the last line is non-empty.
     // 2. Strings consisting of only whitespace are best rendered explicitly.
-    if (/\n[\t ]+$/.test(value) || /^\s*$/.test(value)) {
-        return doubleQuotedString(value, ctx);
+    if (!blockQuote || /\n[\t ]+$/.test(value) || /^\s*$/.test(value)) {
+        return quotedString(value, ctx);
     }
     const indent = ctx.indent ||
         (ctx.forceBlockIndent || containsDocumentMarker(value) ? '  ' : '');
-    const literal = type === Scalar.Scalar.BLOCK_FOLDED
-        ? false
-        : type === Scalar.Scalar.BLOCK_LITERAL
-            ? true
-            : !lineLengthOverLimit(value, ctx.options.lineWidth, indent.length);
+    const literal = blockQuote === 'literal'
+        ? true
+        : blockQuote === 'folded' || type === Scalar.Scalar.BLOCK_FOLDED
+            ? false
+            : type === Scalar.Scalar.BLOCK_LITERAL
+                ? true
+                : !lineLengthOverLimit(value, lineWidth, indent.length);
     if (!value)
         return literal ? '|\n' : '>\n';
     // determine chomping from whitespace at value end
@@ -220,25 +236,10 @@ function plainString(item, ctx, onComment, onChompKeep) {
     const { actualString, implicitKey, indent, inFlow } = ctx;
     if ((implicitKey && /[\n[\]{},]/.test(value)) ||
         (inFlow && /[[\]{},]/.test(value))) {
-        return doubleQuotedString(value, ctx);
+        return quotedString(value, ctx);
     }
     if (!value ||
         /^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
-        const hasDouble = value.indexOf('"') !== -1;
-        const hasSingle = value.indexOf("'") !== -1;
-        let quotedString;
-        if (hasDouble && !hasSingle) {
-            quotedString = singleQuotedString;
-        }
-        else if (hasSingle && !hasDouble) {
-            quotedString = doubleQuotedString;
-        }
-        else if (ctx.options.singleQuote) {
-            quotedString = singleQuotedString;
-        }
-        else {
-            quotedString = doubleQuotedString;
-        }
         // not allowed:
         // - empty string, '-' or '?'
         // - start with an indicator character (except [?:-]) or /[?-] /
@@ -269,7 +270,7 @@ function plainString(item, ctx, onComment, onChompKeep) {
             if (tag.default &&
                 tag.tag !== 'tag:yaml.org,2002:str' &&
                 ((_a = tag.test) === null || _a === void 0 ? void 0 : _a.test(str)))
-                return doubleQuotedString(value, ctx);
+                return quotedString(value, ctx);
         }
     }
     return implicitKey
@@ -292,7 +293,7 @@ function stringifyString(item, ctx, onComment, onChompKeep) {
             case Scalar.Scalar.BLOCK_FOLDED:
             case Scalar.Scalar.BLOCK_LITERAL:
                 return implicitKey || inFlow
-                    ? doubleQuotedString(ss.value, ctx) // blocks are not valid inside flow containers
+                    ? quotedString(ss.value, ctx) // blocks are not valid inside flow containers
                     : blockString(ss, ctx, onComment, onChompKeep);
             case Scalar.Scalar.QUOTE_DOUBLE:
                 return doubleQuotedString(ss.value, ctx);

package/dist/test-events.d.ts

@@ -1,4 +1,4 @@
 export declare function testEvents(src: string): {
     events: string[];
-    error: any;
+    error: unknown;
 };

package/dist/util.d.ts

@@ -1,6 +1,9 @@
 export { debug, LogLevelId, warn } from './log.js';
 export { findPair } from './nodes/YAMLMap.js';
 export { toJS, ToJSContext } from './nodes/toJS.js';
+export { map as mapTag } from './schema/common/map.js';
+export { seq as seqTag } from './schema/common/seq.js';
+export { string as stringTag } from './schema/common/string.js';
 export { foldFlowLines } from './stringify/foldFlowLines';
 export { stringifyNumber } from './stringify/stringifyNumber.js';
 export { stringifyString } from './stringify/stringifyString.js';

package/dist/util.js

@@ -3,6 +3,9 @@
 var log = require('./log.js');
 var YAMLMap = require('./nodes/YAMLMap.js');
 var toJS = require('./nodes/toJS.js');
+var map = require('./schema/common/map.js');
+var seq = require('./schema/common/seq.js');
+var string = require('./schema/common/string.js');
 var foldFlowLines = require('./stringify/foldFlowLines.js');
 var stringifyNumber = require('./stringify/stringifyNumber.js');
 var stringifyString = require('./stringify/stringifyString.js');
@@ -13,6 +16,9 @@ exports.debug = log.debug;
 exports.warn = log.warn;
 exports.findPair = YAMLMap.findPair;
 exports.toJS = toJS.toJS;
+exports.mapTag = map.map;
+exports.seqTag = seq.seq;
+exports.stringTag = string.string;
 exports.foldFlowLines = foldFlowLines.foldFlowLines;
 exports.stringifyNumber = stringifyNumber.stringifyNumber;
 exports.stringifyString = stringifyString.stringifyString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.0.0-5",
+  "version": "2.0.0-9",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -14,6 +14,7 @@
   "files": [
     "browser/",
     "dist/",
+    "util.d.ts",
     "util.js"
   ],
   "type": "commonjs",
@@ -68,25 +69,25 @@
     "@babel/plugin-transform-typescript": "^7.12.17",
     "@babel/preset-env": "^7.12.11",
     "@rollup/plugin-babel": "^5.2.3",
-    "@rollup/plugin-replace": "^2.3.4",
+    "@rollup/plugin-replace": "^3.0.0",
     "@rollup/plugin-typescript": "^8.1.1",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.37",
+    "@types/jest": "^27.0.1",
+    "@types/node": "^16.9.1",
     "@typescript-eslint/eslint-plugin": "^4.15.2",
     "@typescript-eslint/parser": "^4.15.2",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27.0.1",
     "cross-env": "^7.0.3",
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^8.1.0",
     "fast-check": "^2.12.0",
-    "jest": "^26.6.3",
+    "jest": "^27.0.1",
     "jest-ts-webcompat-resolver": "^1.0.0",
     "prettier": "^2.2.1",
     "rollup": "^2.38.2",
     "tslib": "^2.1.0",
-    "typescript": "^4.1.3"
+    "typescript": "^4.3.5"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 12"
   }
 }

package/util.d.ts

@@ -0,0 +1,3 @@
+// Workaround for incomplete exports support in TypeScript
+// https://github.com/microsoft/TypeScript/issues/33079
+export * from './dist/util.js'

package/browser/dist/stringify/addComment.js

@@ -1,11 +0,0 @@
-function addComment(str, indent, comment) {
-    return !comment
-        ? str
-        : comment.includes('\n')
-            ? `${str}\n` + comment.replace(/^/gm, `${indent || ''}#`)
-            : str.endsWith(' ')
-                ? `${str}#${comment}`
-                : `${str} #${comment}`;
-}
-
-export { addComment };

package/dist/stringify/addComment.d.ts

@@ -1,2 +0,0 @@
-export declare function addCommentBefore(str: string, indent: string, comment?: string | null): string;
-export declare function addComment(str: string, indent: string, comment?: string | null): string;