yaml 2.1.2 → 2.2.0

package/browser/dist/compose/resolve-block-map.js

@@ -11,6 +11,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
     if (ctx.atRoot)
         ctx.atRoot = false;
     let offset = bm.offset;
+    let commentEnd = null;
     for (const collItem of bm.items) {
         const { start, key, sep, value } = collItem;
         // key properties
@@ -30,7 +31,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
                     onError(offset, 'BAD_INDENT', startColMsg);
             }
             if (!keyProps.anchor && !keyProps.tag && !sep) {
-                // TODO: assert being at last item?
+                commentEnd = keyProps.end;
                 if (keyProps.comment) {
                     if (map.comment)
                         map.comment += '\n' + keyProps.comment;
@@ -100,7 +101,9 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
             map.items.push(pair);
         }
     }
-    map.range = [bm.offset, offset, offset];
+    if (commentEnd && commentEnd < offset)
+        onError(commentEnd, 'IMPOSSIBLE', 'Map comment with trailing content');
+    map.range = [bm.offset, offset, commentEnd ?? offset];
     return map;
 }
 

package/browser/dist/compose/resolve-block-seq.js

@@ -7,6 +7,7 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError) {
     if (ctx.atRoot)
         ctx.atRoot = false;
     let offset = bs.offset;
+    let commentEnd = null;
     for (const { start, value } of bs.items) {
         const props = resolveProps(start, {
             indicator: 'seq-item-ind',
@@ -15,16 +16,15 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError) {
             onError,
             startOnNewline: true
         });
-        offset = props.end;
         if (!props.found) {
             if (props.anchor || props.tag || value) {
                 if (value && value.type === 'block-seq')
-                    onError(offset, 'BAD_INDENT', 'All sequence items must start at the same column');
+                    onError(props.end, 'BAD_INDENT', 'All sequence items must start at the same column');
                 else
                     onError(offset, 'MISSING_CHAR', 'Sequence item without - indicator');
             }
             else {
-                // TODO: assert being at last item?
+                commentEnd = props.end;
                 if (props.comment)
                     seq.comment = props.comment;
                 continue;
@@ -32,13 +32,13 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError) {
         }
         const node = value
             ? composeNode(ctx, value, props, onError)
-            : composeEmptyNode(ctx, offset, start, null, props, onError);
+            : composeEmptyNode(ctx, props.end, start, null, props, onError);
         if (ctx.schema.compat)
             flowIndentCheck(bs.indent, value, onError);
         offset = node.range[2];
         seq.items.push(node);
     }
-    seq.range = [bs.offset, offset, offset];
+    seq.range = [bs.offset, offset, commentEnd ?? offset];
     return seq;
 }
 

package/browser/dist/nodes/YAMLMap.js

@@ -18,13 +18,13 @@ function findPair(items, key) {
     return undefined;
 }
 class YAMLMap extends Collection {
+    static get tagName() {
+        return 'tag:yaml.org,2002:map';
+    }
     constructor(schema) {
         super(MAP, schema);
         this.items = [];
     }
-    static get tagName() {
-        return 'tag:yaml.org,2002:map';
-    }
     /**
      * Adds a value to the collection.
      *

package/browser/dist/nodes/YAMLSeq.js

@@ -5,13 +5,13 @@ import { isScalarValue } from './Scalar.js';
 import { toJS } from './toJS.js';
 
 class YAMLSeq extends Collection {
+    static get tagName() {
+        return 'tag:yaml.org,2002:seq';
+    }
     constructor(schema) {
         super(SEQ, schema);
         this.items = [];
     }
-    static get tagName() {
-        return 'tag:yaml.org,2002:seq';
-    }
     add(value) {
         this.items.push(value);
     }

package/browser/dist/stringify/stringify.js

@@ -13,6 +13,7 @@ function createStringifyContext(doc, options) {
         doubleQuotedAsJSON: false,
         doubleQuotedMinMultiLineLength: 40,
         falseStr: 'false',
+        flowCollectionPadding: true,
         indentSeq: true,
         lineWidth: 80,
         minContentWidth: 20,
@@ -36,6 +37,7 @@ function createStringifyContext(doc, options) {
     return {
         anchors: new Set(),
         doc,
+        flowCollectionPadding: opt.flowCollectionPadding ? ' ' : '',
         indent: '',
         indentStep: typeof opt.indent === 'number' ? ' '.repeat(opt.indent) : '  ',
         inFlow,

package/browser/dist/stringify/stringifyCollection.js

@@ -60,7 +60,7 @@ function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, fl
     return str;
 }
 function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemIndent, onComment }) {
-    const { indent, indentStep, options: { commentString } } = ctx;
+    const { indent, indentStep, flowCollectionPadding: fcPadding, options: { commentString } } = ctx;
     itemIndent += indentStep;
     const itemCtx = Object.assign({}, ctx, {
         indent: itemIndent,
@@ -129,7 +129,7 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
             str += `\n${indent}${end}`;
         }
         else {
-            str = `${start} ${lines.join(' ')} ${end}`;
+            str = `${start}${fcPadding}${lines.join(' ')}${fcPadding}${end}`;
         }
     }
     if (comment) {

package/browser/dist/stringify/stringifyPair.js

@@ -63,19 +63,18 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
         if (keyComment)
             str += lineComment(str, ctx.indent, commentString(keyComment));
     }
-    let vcb = '';
-    let valueComment = null;
+    let vsb, vcb, valueComment;
     if (isNode(value)) {
-        if (value.spaceBefore)
-            vcb = '\n';
-        if (value.commentBefore) {
-            const cs = commentString(value.commentBefore);
-            vcb += `\n${indentComment(cs, ctx.indent)}`;
-        }
+        vsb = !!value.spaceBefore;
+        vcb = value.commentBefore;
         valueComment = value.comment;
     }
-    else if (value && typeof value === 'object') {
-        value = doc.createNode(value);
+    else {
+        vsb = false;
+        vcb = null;
+        valueComment = null;
+        if (value && typeof value === 'object')
+            value = doc.createNode(value);
     }
     ctx.implicitKey = false;
     if (!explicitKey && !keyComment && isScalar(value))
@@ -90,24 +89,50 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
         !value.tag &&
         !value.anchor) {
         // If indentSeq === false, consider '- ' as part of indentation where possible
-        ctx.indent = ctx.indent.substr(2);
+        ctx.indent = ctx.indent.substring(2);
     }
     let valueCommentDone = false;
     const valueStr = stringify(value, ctx, () => (valueCommentDone = true), () => (chompKeep = true));
     let ws = ' ';
-    if (vcb || keyComment) {
-        if (valueStr === '' && !ctx.inFlow)
-            ws = vcb === '\n' ? '\n\n' : vcb;
-        else
-            ws = `${vcb}\n${ctx.indent}`;
+    if (keyComment || vsb || vcb) {
+        ws = vsb ? '\n' : '';
+        if (vcb) {
+            const cs = commentString(vcb);
+            ws += `\n${indentComment(cs, ctx.indent)}`;
+        }
+        if (valueStr === '' && !ctx.inFlow) {
+            if (ws === '\n')
+                ws = '\n\n';
+        }
+        else {
+            ws += `\n${ctx.indent}`;
+        }
     }
     else if (!explicitKey && isCollection(value)) {
-        const flow = valueStr[0] === '[' || valueStr[0] === '{';
-        if (!flow || valueStr.includes('\n'))
-            ws = `\n${ctx.indent}`;
+        const vs0 = valueStr[0];
+        const nl0 = valueStr.indexOf('\n');
+        const hasNewline = nl0 !== -1;
+        const flow = ctx.inFlow ?? value.flow ?? value.items.length === 0;
+        if (hasNewline || !flow) {
+            let hasPropsLine = false;
+            if (hasNewline && (vs0 === '&' || vs0 === '!')) {
+                let sp0 = valueStr.indexOf(' ');
+                if (vs0 === '&' &&
+                    sp0 !== -1 &&
+                    sp0 < nl0 &&
+                    valueStr[sp0 + 1] === '!') {
+                    sp0 = valueStr.indexOf(' ', sp0 + 1);
+                }
+                if (sp0 === -1 || nl0 < sp0)
+                    hasPropsLine = true;
+            }
+            if (!hasPropsLine)
+                ws = `\n${ctx.indent}`;
+        }
     }
-    else if (valueStr === '' || valueStr[0] === '\n')
+    else if (valueStr === '' || valueStr[0] === '\n') {
         ws = '';
+    }
     str += ws + valueStr;
     if (ctx.inFlow) {
         if (valueCommentDone && onComment)

package/dist/compose/compose-node.d.ts

@@ -21,7 +21,7 @@ declare const CN: {
     composeNode: typeof composeNode;
     composeEmptyNode: typeof composeEmptyNode;
 };
-export declare type ComposeNode = typeof CN;
+export type ComposeNode = typeof CN;
 export declare function composeNode(ctx: ComposeContext, token: Token, props: Props, onError: ComposeErrorHandler): ParsedNode;
 export declare function composeEmptyNode(ctx: ComposeContext, offset: number, before: Token[] | undefined, pos: number | null, { spaceBefore, comment, anchor, tag, end }: Props, onError: ComposeErrorHandler): import("../index.js").Scalar.Parsed;
 export {};

package/dist/compose/composer.d.ts

@@ -4,11 +4,11 @@ import { ErrorCode, YAMLParseError, YAMLWarning } from '../errors.js';
 import { Range } from '../nodes/Node.js';
 import type { DocumentOptions, ParseOptions, SchemaOptions } from '../options.js';
 import type { Token } from '../parse/cst.js';
-declare type ErrorSource = number | [number, number] | Range | {
+type ErrorSource = number | [number, number] | Range | {
     offset: number;
     source?: string;
 };
-export declare type ComposeErrorHandler = (source: ErrorSource, code: ErrorCode, message: string, warning?: boolean) => void;
+export type ComposeErrorHandler = (source: ErrorSource, code: ErrorCode, message: string, warning?: boolean) => void;
 /**
  * Compose a stream of CST nodes into a stream of YAML Documents.
  *

package/dist/compose/resolve-block-map.js

@@ -13,6 +13,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
     if (ctx.atRoot)
         ctx.atRoot = false;
     let offset = bm.offset;
+    let commentEnd = null;
     for (const collItem of bm.items) {
         const { start, key, sep, value } = collItem;
         // key properties
@@ -32,7 +33,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
                     onError(offset, 'BAD_INDENT', startColMsg);
             }
             if (!keyProps.anchor && !keyProps.tag && !sep) {
-                // TODO: assert being at last item?
+                commentEnd = keyProps.end;
                 if (keyProps.comment) {
                     if (map.comment)
                         map.comment += '\n' + keyProps.comment;
@@ -102,7 +103,9 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
             map.items.push(pair);
         }
     }
-    map.range = [bm.offset, offset, offset];
+    if (commentEnd && commentEnd < offset)
+        onError(commentEnd, 'IMPOSSIBLE', 'Map comment with trailing content');
+    map.range = [bm.offset, offset, commentEnd ?? offset];
     return map;
 }
 

package/dist/compose/resolve-block-seq.js

@@ -9,6 +9,7 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError) {
     if (ctx.atRoot)
         ctx.atRoot = false;
     let offset = bs.offset;
+    let commentEnd = null;
     for (const { start, value } of bs.items) {
         const props = resolveProps.resolveProps(start, {
             indicator: 'seq-item-ind',
@@ -17,16 +18,15 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError) {
             onError,
             startOnNewline: true
         });
-        offset = props.end;
         if (!props.found) {
             if (props.anchor || props.tag || value) {
                 if (value && value.type === 'block-seq')
-                    onError(offset, 'BAD_INDENT', 'All sequence items must start at the same column');
+                    onError(props.end, 'BAD_INDENT', 'All sequence items must start at the same column');
                 else
                     onError(offset, 'MISSING_CHAR', 'Sequence item without - indicator');
             }
             else {
-                // TODO: assert being at last item?
+                commentEnd = props.end;
                 if (props.comment)
                     seq.comment = props.comment;
                 continue;
@@ -34,13 +34,13 @@ function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError) {
         }
         const node = value
             ? composeNode(ctx, value, props, onError)
-            : composeEmptyNode(ctx, offset, start, null, props, onError);
+            : composeEmptyNode(ctx, props.end, start, null, props, onError);
         if (ctx.schema.compat)
             utilFlowIndentCheck.flowIndentCheck(bs.indent, value, onError);
         offset = node.range[2];
         seq.items.push(node);
     }
-    seq.range = [bs.offset, offset, offset];
+    seq.range = [bs.offset, offset, commentEnd ?? offset];
     return seq;
 }
 

package/dist/doc/Document.d.ts

@@ -8,7 +8,7 @@ import type { YAMLSeq } from '../nodes/YAMLSeq.js';
 import type { CreateNodeOptions, DocumentOptions, ParseOptions, SchemaOptions, ToJSOptions, ToStringOptions } from '../options.js';
 import { Schema } from '../schema/Schema.js';
 import { Directives } from './directives.js';
-export declare type Replacer = any[] | ((key: any, value: any) => unknown);
+export type Replacer = any[] | ((key: any, value: any) => unknown);
 export declare namespace Document {
     interface Parsed<T extends ParsedNode = ParsedNode> extends Document<T> {
         directives: Directives;

package/dist/doc/applyReviver.d.ts

@@ -1,4 +1,4 @@
-export declare type Reviver = (key: unknown, value: unknown) => unknown;
+export type Reviver = (key: unknown, value: unknown) => unknown;
 /**
  * Applies the JSON.parse reviver algorithm as defined in the ECMA-262 spec,
  * in section 24.5.1.1 "Runtime Semantics: InternalizeJSONProperty" of the

package/dist/errors.d.ts

@@ -1,6 +1,6 @@
 import type { LineCounter } from './parse/line-counter';
-export declare type ErrorCode = 'ALIAS_PROPS' | 'BAD_ALIAS' | 'BAD_DIRECTIVE' | 'BAD_DQ_ESCAPE' | 'BAD_INDENT' | 'BAD_PROP_ORDER' | 'BAD_SCALAR_START' | 'BLOCK_AS_IMPLICIT_KEY' | 'BLOCK_IN_FLOW' | 'DUPLICATE_KEY' | 'IMPOSSIBLE' | 'KEY_OVER_1024_CHARS' | 'MISSING_CHAR' | 'MULTILINE_IMPLICIT_KEY' | 'MULTIPLE_ANCHORS' | 'MULTIPLE_DOCS' | 'MULTIPLE_TAGS' | 'TAB_AS_INDENT' | 'TAG_RESOLVE_FAILED' | 'UNEXPECTED_TOKEN';
-export declare type LinePos = {
+export type ErrorCode = 'ALIAS_PROPS' | 'BAD_ALIAS' | 'BAD_DIRECTIVE' | 'BAD_DQ_ESCAPE' | 'BAD_INDENT' | 'BAD_PROP_ORDER' | 'BAD_SCALAR_START' | 'BLOCK_AS_IMPLICIT_KEY' | 'BLOCK_IN_FLOW' | 'DUPLICATE_KEY' | 'IMPOSSIBLE' | 'KEY_OVER_1024_CHARS' | 'MISSING_CHAR' | 'MULTILINE_IMPLICIT_KEY' | 'MULTIPLE_ANCHORS' | 'MULTIPLE_DOCS' | 'MULTIPLE_TAGS' | 'TAB_AS_INDENT' | 'TAG_RESOLVE_FAILED' | 'UNEXPECTED_TOKEN';
+export type LinePos = {
     line: number;
     col: number;
 };

package/dist/log.d.ts

@@ -1,3 +1,3 @@
-export declare type LogLevelId = 'silent' | 'error' | 'warn' | 'debug';
+export type LogLevelId = 'silent' | 'error' | 'warn' | 'debug';
 export declare function debug(logLevel: LogLevelId, ...messages: any[]): void;
 export declare function warn(logLevel: LogLevelId, warning: string | Error): void;

package/dist/nodes/Node.d.ts

@@ -6,15 +6,15 @@ import type { Pair } from './Pair.js';
 import type { Scalar } from './Scalar.js';
 import type { YAMLMap } from './YAMLMap.js';
 import type { YAMLSeq } from './YAMLSeq.js';
-export declare type Node<T = unknown> = Alias | Scalar<T> | YAMLMap<unknown, T> | YAMLSeq<T>;
+export type Node<T = unknown> = Alias | Scalar<T> | YAMLMap<unknown, T> | YAMLSeq<T>;
 /** Utility type mapper */
-export declare type NodeType<T> = T extends string | number | bigint | boolean | null ? Scalar<T> : T extends Array<any> ? YAMLSeq<NodeType<T[number]>> : T extends {
+export type NodeType<T> = T extends string | number | bigint | boolean | null ? Scalar<T> : T extends Array<any> ? YAMLSeq<NodeType<T[number]>> : T extends {
     [key: string]: any;
 } ? YAMLMap<NodeType<keyof T>, NodeType<T[keyof T]>> : T extends {
     [key: number]: any;
 } ? YAMLMap<NodeType<keyof T>, NodeType<T[keyof T]>> : Node;
-export declare type ParsedNode = Alias.Parsed | Scalar.Parsed | YAMLMap.Parsed | YAMLSeq.Parsed;
-export declare type Range = [number, number, number];
+export type ParsedNode = Alias.Parsed | Scalar.Parsed | YAMLMap.Parsed | YAMLSeq.Parsed;
+export type Range = [number, number, number];
 export declare const ALIAS: unique symbol;
 export declare const DOC: unique symbol;
 export declare const MAP: unique symbol;

package/dist/nodes/YAMLMap.d.ts

@@ -6,7 +6,7 @@ import { ParsedNode, Range } from './Node.js';
 import { Pair } from './Pair.js';
 import { Scalar } from './Scalar.js';
 import type { ToJSContext } from './toJS.js';
-export declare type MapLike = Map<unknown, unknown> | Set<unknown> | Record<string | number | symbol, unknown>;
+export type MapLike = Map<unknown, unknown> | Set<unknown> | Record<string | number | symbol, unknown>;
 export declare function findPair<K = unknown, V = unknown>(items: Iterable<Pair<K, V>>, key: unknown): Pair<K, V> | undefined;
 export declare namespace YAMLMap {
     interface Parsed<K extends ParsedNode = ParsedNode, V extends ParsedNode | null = ParsedNode | null> extends YAMLMap<K, V> {

package/dist/nodes/YAMLMap.js

@@ -20,13 +20,13 @@ function findPair(items, key) {
     return undefined;
 }
 class YAMLMap extends Collection.Collection {
+    static get tagName() {
+        return 'tag:yaml.org,2002:map';
+    }
     constructor(schema) {
         super(Node.MAP, schema);
         this.items = [];
     }
-    static get tagName() {
-        return 'tag:yaml.org,2002:map';
-    }
     /**
      * Adds a value to the collection.
      *

package/dist/nodes/YAMLSeq.js

@@ -7,13 +7,13 @@ var Scalar = require('./Scalar.js');
 var toJS = require('./toJS.js');
 
 class YAMLSeq extends Collection.Collection {
+    static get tagName() {
+        return 'tag:yaml.org,2002:seq';
+    }
     constructor(schema) {
         super(Node.SEQ, schema);
         this.items = [];
     }
-    static get tagName() {
-        return 'tag:yaml.org,2002:seq';
-    }
     add(value) {
         this.items.push(value);
     }

package/dist/options.d.ts

@@ -8,7 +8,7 @@ import type { LineCounter } from './parse/line-counter.js';
 import type { Schema } from './schema/Schema.js';
 import type { Tags } from './schema/tags.js';
 import type { CollectionTag, ScalarTag } from './schema/types.js';
-export declare type ParseOptions = {
+export type ParseOptions = {
     /**
      * Whether integers should be parsed into BigInt rather than number values.
      *
@@ -56,7 +56,7 @@ export declare type ParseOptions = {
      */
     uniqueKeys?: boolean | ((a: ParsedNode, b: ParsedNode) => boolean);
 };
-export declare type DocumentOptions = {
+export type DocumentOptions = {
     /**
      * @internal
      * Used internally by Composer. If set and includes an explicit version,
@@ -76,7 +76,7 @@ export declare type DocumentOptions = {
      */
     version?: '1.1' | '1.2' | 'next';
 };
-export declare type SchemaOptions = {
+export type SchemaOptions = {
     /**
      * When parsing, warn about compatibility issues with the given schema.
      * When stringifying, use scalar styles that are parsed correctly
@@ -133,7 +133,7 @@ export declare type SchemaOptions = {
      */
     toStringDefaults?: ToStringOptions;
 };
-export declare type CreateNodeOptions = {
+export type CreateNodeOptions = {
     /**
      * During node construction, use anchors and aliases to keep strictly equal
      * non-null objects as equivalent in YAML.
@@ -163,7 +163,7 @@ export declare type CreateNodeOptions = {
      */
     tag?: string;
 };
-export declare type ToJSOptions = {
+export type ToJSOptions = {
     /**
      * Use Map rather than Object to represent mappings.
      *
@@ -189,7 +189,7 @@ export declare type ToJSOptions = {
      */
     reviver?: Reviver;
 };
-export declare type ToStringOptions = {
+export type ToStringOptions = {
     /**
      * Use block quote styles for scalar values where applicable.
      * Set to `false` to disable block quotes completely.
@@ -264,6 +264,13 @@ export declare type ToStringOptions = {
      * Default: `'false'`
      */
     falseStr?: string;
+    /**
+     * When true, a single space of padding will be added inside the delimiters
+     * of non-empty single-line flow collections.
+     *
+     * Default: `true`
+     */
+    flowCollectionPadding?: boolean;
     /**
      * The number of spaces to use when indenting code.
      *

package/dist/parse/cst-visit.d.ts

@@ -1,6 +1,6 @@
 import type { CollectionItem, Document } from './cst.js';
-export declare type VisitPath = readonly ['key' | 'value', number][];
-export declare type Visitor = (item: CollectionItem, path: VisitPath) => number | symbol | Visitor | void;
+export type VisitPath = readonly ['key' | 'value', number][];
+export type Visitor = (item: CollectionItem, path: VisitPath) => number | symbol | Visitor | void;
 /**
  * Apply a visitor to a CST document or item.
  *

package/dist/parse/cst.d.ts

@@ -72,7 +72,7 @@ export interface BlockSequence {
         value?: Token;
     }>;
 }
-export declare type CollectionItem = {
+export type CollectionItem = {
     start: SourceToken[];
     key?: Token | null;
     sep?: SourceToken[];
@@ -86,8 +86,8 @@ export interface FlowCollection {
     items: CollectionItem[];
     end: SourceToken[];
 }
-export declare type Token = SourceToken | ErrorToken | Directive | Document | DocumentEnd | FlowScalar | BlockScalar | BlockMap | BlockSequence | FlowCollection;
-export declare type TokenType = SourceToken['type'] | DocumentEnd['type'] | FlowScalar['type'];
+export type Token = SourceToken | ErrorToken | Directive | Document | DocumentEnd | FlowScalar | BlockScalar | BlockMap | BlockSequence | FlowCollection;
+export type TokenType = SourceToken['type'] | DocumentEnd['type'] | FlowScalar['type'];
 /** The byte order mark */
 export declare const BOM = "\uFEFF";
 /** Start of doc-mode */

package/dist/schema/json-schema.d.ts

@@ -1,5 +1,5 @@
-declare type JsonSchema = boolean | ArraySchema | ObjectSchema | NumberSchema | StringSchema;
-declare type JsonType = 'array' | 'object' | 'string' | 'number' | 'integer' | 'boolean' | 'null';
+type JsonSchema = boolean | ArraySchema | ObjectSchema | NumberSchema | StringSchema;
+type JsonType = 'array' | 'object' | 'string' | 'number' | 'integer' | 'boolean' | 'null';
 interface CommonSchema {
     type?: JsonType | JsonType[];
     const?: unknown;

package/dist/schema/tags.d.ts

@@ -25,8 +25,8 @@ declare const tagsByName: {
         test: RegExp;
     };
 };
-export declare type TagId = keyof typeof tagsByName;
-export declare type Tags = Array<ScalarTag | CollectionTag | TagId>;
+export type TagId = keyof typeof tagsByName;
+export type Tags = Array<ScalarTag | CollectionTag | TagId>;
 export declare const coreKnownTags: {
     'tag:yaml.org,2002:binary': ScalarTag;
     'tag:yaml.org,2002:omap': CollectionTag;

package/dist/schema/types.d.ts

@@ -16,7 +16,7 @@ interface TagBase {
      * an explicit tag. For most cases, it's unlikely that you'll actually want to
      * use this, even if you first think you do.
      */
-    default: boolean;
+    default?: boolean;
     /**
      * If a tag has multiple forms that should be parsed and/or stringified
      * differently, use `format` to identify them.

package/dist/stringify/foldFlowLines.d.ts

@@ -5,7 +5,7 @@ export declare const FOLD_QUOTED = "quoted";
  * `'block'` prevents more-indented lines from being folded;
  * `'quoted'` allows for `\` escapes, including escaped newlines
  */
-export declare type FoldMode = 'flow' | 'block' | 'quoted';
+export type FoldMode = 'flow' | 'block' | 'quoted';
 export interface FoldOptions {
     /**
      * Accounts for leading contents on the first line, defaulting to

package/dist/stringify/stringify.d.ts

@@ -1,7 +1,7 @@
 import type { Document } from '../doc/Document.js';
 import type { Alias } from '../nodes/Alias.js';
 import type { ToStringOptions } from '../options.js';
-export declare type StringifyContext = {
+export type StringifyContext = {
     actualString?: boolean;
     allNullValues?: boolean;
     anchors: Set<string>;
@@ -13,6 +13,7 @@ export declare type StringifyContext = {
     indentAtStart?: number;
     inFlow: boolean | null;
     inStringifyKey?: boolean;
+    flowCollectionPadding: string;
     options: Readonly<Required<Omit<ToStringOptions, 'collectionStyle' | 'indent'>>>;
     resolvedAliases?: Set<Alias>;
 };

package/dist/stringify/stringify.js

@@ -15,6 +15,7 @@ function createStringifyContext(doc, options) {
         doubleQuotedAsJSON: false,
         doubleQuotedMinMultiLineLength: 40,
         falseStr: 'false',
+        flowCollectionPadding: true,
         indentSeq: true,
         lineWidth: 80,
         minContentWidth: 20,
@@ -38,6 +39,7 @@ function createStringifyContext(doc, options) {
     return {
         anchors: new Set(),
         doc,
+        flowCollectionPadding: opt.flowCollectionPadding ? ' ' : '',
         indent: '',
         indentStep: typeof opt.indent === 'number' ? ' '.repeat(opt.indent) : '  ',
         inFlow,

package/dist/stringify/stringifyCollection.js

@@ -62,7 +62,7 @@ function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, fl
     return str;
 }
 function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemIndent, onComment }) {
-    const { indent, indentStep, options: { commentString } } = ctx;
+    const { indent, indentStep, flowCollectionPadding: fcPadding, options: { commentString } } = ctx;
     itemIndent += indentStep;
     const itemCtx = Object.assign({}, ctx, {
         indent: itemIndent,
@@ -131,7 +131,7 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
             str += `\n${indent}${end}`;
         }
         else {
-            str = `${start} ${lines.join(' ')} ${end}`;
+            str = `${start}${fcPadding}${lines.join(' ')}${fcPadding}${end}`;
         }
     }
     if (comment) {

package/dist/stringify/stringifyPair.js

@@ -65,19 +65,18 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
         if (keyComment)
             str += stringifyComment.lineComment(str, ctx.indent, commentString(keyComment));
     }
-    let vcb = '';
-    let valueComment = null;
+    let vsb, vcb, valueComment;
     if (Node.isNode(value)) {
-        if (value.spaceBefore)
-            vcb = '\n';
-        if (value.commentBefore) {
-            const cs = commentString(value.commentBefore);
-            vcb += `\n${stringifyComment.indentComment(cs, ctx.indent)}`;
-        }
+        vsb = !!value.spaceBefore;
+        vcb = value.commentBefore;
         valueComment = value.comment;
     }
-    else if (value && typeof value === 'object') {
-        value = doc.createNode(value);
+    else {
+        vsb = false;
+        vcb = null;
+        valueComment = null;
+        if (value && typeof value === 'object')
+            value = doc.createNode(value);
     }
     ctx.implicitKey = false;
     if (!explicitKey && !keyComment && Node.isScalar(value))
@@ -92,24 +91,50 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
         !value.tag &&
         !value.anchor) {
         // If indentSeq === false, consider '- ' as part of indentation where possible
-        ctx.indent = ctx.indent.substr(2);
+        ctx.indent = ctx.indent.substring(2);
     }
     let valueCommentDone = false;
     const valueStr = stringify.stringify(value, ctx, () => (valueCommentDone = true), () => (chompKeep = true));
     let ws = ' ';
-    if (vcb || keyComment) {
-        if (valueStr === '' && !ctx.inFlow)
-            ws = vcb === '\n' ? '\n\n' : vcb;
-        else
-            ws = `${vcb}\n${ctx.indent}`;
+    if (keyComment || vsb || vcb) {
+        ws = vsb ? '\n' : '';
+        if (vcb) {
+            const cs = commentString(vcb);
+            ws += `\n${stringifyComment.indentComment(cs, ctx.indent)}`;
+        }
+        if (valueStr === '' && !ctx.inFlow) {
+            if (ws === '\n')
+                ws = '\n\n';
+        }
+        else {
+            ws += `\n${ctx.indent}`;
+        }
     }
     else if (!explicitKey && Node.isCollection(value)) {
-        const flow = valueStr[0] === '[' || valueStr[0] === '{';
-        if (!flow || valueStr.includes('\n'))
-            ws = `\n${ctx.indent}`;
+        const vs0 = valueStr[0];
+        const nl0 = valueStr.indexOf('\n');
+        const hasNewline = nl0 !== -1;
+        const flow = ctx.inFlow ?? value.flow ?? value.items.length === 0;
+        if (hasNewline || !flow) {
+            let hasPropsLine = false;
+            if (hasNewline && (vs0 === '&' || vs0 === '!')) {
+                let sp0 = valueStr.indexOf(' ');
+                if (vs0 === '&' &&
+                    sp0 !== -1 &&
+                    sp0 < nl0 &&
+                    valueStr[sp0 + 1] === '!') {
+                    sp0 = valueStr.indexOf(' ', sp0 + 1);
+                }
+                if (sp0 === -1 || nl0 < sp0)
+                    hasPropsLine = true;
+            }
+            if (!hasPropsLine)
+                ws = `\n${ctx.indent}`;
+        }
     }
-    else if (valueStr === '' || valueStr[0] === '\n')
+    else if (valueStr === '' || valueStr[0] === '\n') {
         ws = '';
+    }
     str += ws + valueStr;
     if (ctx.inFlow) {
         if (valueCommentDone && onComment)

package/dist/stringify/stringifyString.d.ts

@@ -1,3 +1,9 @@
 import { Scalar } from '../nodes/Scalar.js';
 import type { StringifyContext } from './stringify.js';
-export declare function stringifyString(item: Scalar, ctx: StringifyContext, onComment?: () => void, onChompKeep?: () => void): string;
+interface StringifyScalar {
+    value: string;
+    comment?: string | null;
+    type?: string;
+}
+export declare function stringifyString(item: Scalar | StringifyScalar, ctx: StringifyContext, onComment?: () => void, onChompKeep?: () => void): string;
+export {};

package/dist/visit.d.ts

@@ -5,8 +5,8 @@ import type { Pair } from './nodes/Pair.js';
 import type { Scalar } from './nodes/Scalar.js';
 import type { YAMLMap } from './nodes/YAMLMap.js';
 import type { YAMLSeq } from './nodes/YAMLSeq.js';
-export declare type visitorFn<T> = (key: number | 'key' | 'value' | null, node: T, path: readonly (Document | Node | Pair)[]) => void | symbol | number | Node | Pair;
-export declare type visitor = visitorFn<unknown> | {
+export type visitorFn<T> = (key: number | 'key' | 'value' | null, node: T, path: readonly (Document | Node | Pair)[]) => void | symbol | number | Node | Pair;
+export type visitor = visitorFn<unknown> | {
     Alias?: visitorFn<Alias>;
     Collection?: visitorFn<YAMLMap | YAMLSeq>;
     Map?: visitorFn<YAMLMap>;
@@ -16,8 +16,8 @@ export declare type visitor = visitorFn<unknown> | {
     Seq?: visitorFn<YAMLSeq>;
     Value?: visitorFn<Scalar | YAMLMap | YAMLSeq>;
 };
-export declare type asyncVisitorFn<T> = (key: number | 'key' | 'value' | null, node: T, path: readonly (Document | Node | Pair)[]) => void | symbol | number | Node | Pair | Promise<void | symbol | number | Node | Pair>;
-export declare type asyncVisitor = asyncVisitorFn<unknown> | {
+export type asyncVisitorFn<T> = (key: number | 'key' | 'value' | null, node: T, path: readonly (Document | Node | Pair)[]) => void | symbol | number | Node | Pair | Promise<void | symbol | number | Node | Pair>;
+export type asyncVisitor = asyncVisitorFn<unknown> | {
     Alias?: asyncVisitorFn<Alias>;
     Collection?: asyncVisitorFn<YAMLMap | YAMLSeq>;
     Map?: asyncVisitorFn<YAMLMap>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -37,8 +37,8 @@
   },
   "scripts": {
     "build": "npm run build:node && npm run build:browser",
-    "build:browser": "rollup -c config/rollup.browser-config.js",
-    "build:node": "rollup -c config/rollup.node-config.js",
+    "build:browser": "rollup -c config/rollup.browser-config.mjs",
+    "build:node": "rollup -c config/rollup.node-config.mjs",
     "clean": "git clean -fdxe node_modules",
     "lint": "eslint src/",
     "prettier": "prettier --write .",
@@ -69,11 +69,11 @@
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
     "@babel/plugin-transform-typescript": "^7.12.17",
     "@babel/preset-env": "^7.12.11",
-    "@rollup/plugin-babel": "^5.2.3",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.1.1",
-    "@types/jest": "^28.1.8",
-    "@types/node": "^12.20.47",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-replace": "^5.0.2",
+    "@rollup/plugin-typescript": "^10.0.1",
+    "@types/jest": "^29.2.4",
+    "@types/node": "^14.18.35",
     "@typescript-eslint/eslint-plugin": "^5.3.1",
     "@typescript-eslint/parser": "^5.3.1",
     "babel-jest": "^29.0.1",
@@ -84,7 +84,7 @@
     "jest": "^29.0.1",
     "jest-ts-webcompat-resolver": "^1.0.0",
     "prettier": "^2.2.1",
-    "rollup": "^2.38.2",
+    "rollup": "^3.7.5",
     "tslib": "^2.1.0",
     "typescript": "^4.3.5"
   },