@quilted/create 0.2.44 → 0.2.45

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/tags.esnext

@@ -8,6 +8,7 @@ import { intOct, intHex, int } from './core/int.esnext';
 import { schema } from './core/schema.esnext';
 import { schema as schema$1 } from './json/schema.esnext';
 import { binary } from './yaml-1.1/binary.esnext';
+import { merge } from './yaml-1.1/merge.esnext';
 import { omap } from './yaml-1.1/omap.esnext';
 import { pairs } from './yaml-1.1/pairs.esnext';
 import { schema as schema$2 } from './yaml-1.1/schema.esnext';
@@ -33,6 +34,7 @@ const tagsByName = {
   intOct,
   intTime,
   map,
+  merge,
   null: nullTag,
   omap,
   pairs,
@@ -42,13 +44,18 @@ const tagsByName = {
 };
 const coreKnownTags = {
   "tag:yaml.org,2002:binary": binary,
+  "tag:yaml.org,2002:merge": merge,
   "tag:yaml.org,2002:omap": omap,
   "tag:yaml.org,2002:pairs": pairs,
   "tag:yaml.org,2002:set": set,
   "tag:yaml.org,2002:timestamp": timestamp
 };
-function getTags(customTags, schemaName) {
-  let tags = schemas.get(schemaName);
+function getTags(customTags, schemaName, addMergeTag) {
+  const schemaTags = schemas.get(schemaName);
+  if (schemaTags && !customTags) {
+    return addMergeTag && !schemaTags.includes(merge) ? schemaTags.concat(merge) : schemaTags.slice();
+  }
+  let tags = schemaTags;
   if (!tags) {
     if (Array.isArray(customTags))
       tags = [];
@@ -63,15 +70,19 @@ function getTags(customTags, schemaName) {
   } else if (typeof customTags === "function") {
     tags = customTags(tags.slice());
   }
-  return tags.map((tag) => {
-    if (typeof tag !== "string")
-      return tag;
-    const tagObj = tagsByName[tag];
-    if (tagObj)
-      return tagObj;
-    const keys = Object.keys(tagsByName).map((key) => JSON.stringify(key)).join(", ");
-    throw new Error(`Unknown custom tag "${tag}"; use one of ${keys}`);
-  });
+  if (addMergeTag)
+    tags = tags.concat(merge);
+  return tags.reduce((tags2, tag) => {
+    const tagObj = typeof tag === "string" ? tagsByName[tag] : tag;
+    if (!tagObj) {
+      const tagName = JSON.stringify(tag);
+      const keys = Object.keys(tagsByName).map((key) => JSON.stringify(key)).join(", ");
+      throw new Error(`Unknown custom tag ${tagName}; use one of ${keys}`);
+    }
+    if (!tags2.includes(tagObj))
+      tags2.push(tagObj);
+    return tags2;
+  }, []);
 }
 
 export { coreKnownTags, getTags };

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/binary.esnext

@@ -3,6 +3,7 @@ import { stringifyString } from '../../stringify/stringifyString.esnext';
 
 const binary = {
   identify: (value) => value instanceof Uint8Array,
+  // Buffer inherits from Uint8Array
   default: false,
   tag: "tag:yaml.org,2002:binary",
   /**
@@ -14,9 +15,7 @@ const binary = {
    *   document.querySelector('#photo').src = URL.createObjectURL(blob)
    */
   resolve(src, onError) {
-    if (typeof Buffer === "function") {
-      return Buffer.from(src, "base64");
-    } else if (typeof atob === "function") {
+    if (typeof atob === "function") {
       const str = atob(src.replace(/[\n\r]/g, ""));
       const buffer = new Uint8Array(str.length);
       for (let i = 0; i < str.length; ++i)
@@ -30,9 +29,7 @@ const binary = {
   stringify({ comment, type, value }, ctx, onComment, onChompKeep) {
     const buf = value;
     let str;
-    if (typeof Buffer === "function") {
-      str = buf instanceof Buffer ? buf.toString("base64") : Buffer.from(buf.buffer).toString("base64");
-    } else if (typeof btoa === "function") {
+    if (typeof btoa === "function") {
       let s = "";
       for (let i = 0; i < buf.length; ++i)
         s += String.fromCharCode(buf[i]);

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/bool.esnext

@@ -18,7 +18,7 @@ const falseTag = {
   identify: (value) => value === false,
   default: true,
   tag: "tag:yaml.org,2002:bool",
-  test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/i,
+  test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/,
   resolve: () => new Scalar(false),
   stringify: boolStringify
 };

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/float.esnext

@@ -5,7 +5,7 @@ const floatNaN = {
   identify: (value) => typeof value === "number",
   default: true,
   tag: "tag:yaml.org,2002:float",
-  test: /^[-+]?\.(?:inf|Inf|INF|nan|NaN|NAN)$/,
+  test: /^(?:[-+]?\.(?:inf|Inf|INF)|\.nan|\.NaN|\.NAN)$/,
   resolve: (str) => str.slice(-3).toLowerCase() === "nan" ? NaN : str[0] === "-" ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY,
   stringify: stringifyNumber
 };

package/build/esnext/node_modules/.pnpm/yaml@2.7.0/node_modules/yaml/browser/dist/schema/yaml-1.1/merge.esnext

@@ -0,0 +1,50 @@
+import { isScalar, isAlias, isSeq, isMap } from '../../nodes/identity.esnext';
+import { Scalar } from '../../nodes/Scalar.esnext';
+
+const MERGE_KEY = "<<";
+const merge = {
+  identify: (value) => value === MERGE_KEY || typeof value === "symbol" && value.description === MERGE_KEY,
+  default: "key",
+  tag: "tag:yaml.org,2002:merge",
+  test: /^<<$/,
+  resolve: () => Object.assign(new Scalar(Symbol(MERGE_KEY)), {
+    addToJSMap: addMergeToJSMap
+  }),
+  stringify: () => MERGE_KEY
+};
+const isMergeKey = (ctx, key) => (merge.identify(key) || isScalar(key) && (!key.type || key.type === Scalar.PLAIN) && merge.identify(key.value)) && ctx?.doc.schema.tags.some((tag) => tag.tag === merge.tag && tag.default);
+function addMergeToJSMap(ctx, map, value) {
+  value = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
+  if (isSeq(value))
+    for (const it of value.items)
+      mergeValue(ctx, map, it);
+  else if (Array.isArray(value))
+    for (const it of value)
+      mergeValue(ctx, map, it);
+  else
+    mergeValue(ctx, map, value);
+}
+function mergeValue(ctx, map, value) {
+  const source = ctx && isAlias(value) ? value.resolve(ctx.doc) : value;
+  if (!isMap(source))
+    throw new Error("Merge sources must be maps or map aliases");
+  const srcMap = source.toJSON(null, ctx, Map);
+  for (const [key, value2] of srcMap) {
+    if (map instanceof Map) {
+      if (!map.has(key))
+        map.set(key, value2);
+    } else if (map instanceof Set) {
+      map.add(key);
+    } else if (!Object.prototype.hasOwnProperty.call(map, key)) {
+      Object.defineProperty(map, key, {
+        value: value2,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
+    }
+  }
+  return map;
+}
+
+export { addMergeToJSMap, isMergeKey, merge };

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/omap.esnext

@@ -1,8 +1,8 @@
-import { YAMLSeq } from '../../nodes/YAMLSeq.esnext';
+import { isScalar, isPair } from '../../nodes/identity.esnext';
 import { toJS } from '../../nodes/toJS.esnext';
-import { isScalar, isPair } from '../../nodes/Node.esnext';
 import { YAMLMap } from '../../nodes/YAMLMap.esnext';
-import { createPairs, resolvePairs } from './pairs.esnext';
+import { YAMLSeq } from '../../nodes/YAMLSeq.esnext';
+import { resolvePairs, createPairs } from './pairs.esnext';
 
 class YAMLOMap extends YAMLSeq {
   constructor() {
@@ -38,6 +38,12 @@ class YAMLOMap extends YAMLSeq {
     }
     return map;
   }
+  static from(schema, iterable, ctx) {
+    const pairs = createPairs(schema, iterable, ctx);
+    const omap2 = new this();
+    omap2.items = pairs.items;
+    return omap2;
+  }
 }
 YAMLOMap.tag = "tag:yaml.org,2002:omap";
 const omap = {
@@ -60,12 +66,7 @@ const omap = {
     }
     return Object.assign(new YAMLOMap(), pairs);
   },
-  createNode(schema, iterable, ctx) {
-    const pairs = createPairs(schema, iterable, ctx);
-    const omap2 = new YAMLOMap();
-    omap2.items = pairs.items;
-    return omap2;
-  }
+  createNode: (schema, iterable, ctx) => YAMLOMap.from(schema, iterable, ctx)
 };
 
 export { YAMLOMap, omap };

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/pairs.esnext

@@ -1,4 +1,4 @@
-import { isSeq, isPair, isMap } from '../../nodes/Node.esnext';
+import { isSeq, isPair, isMap } from '../../nodes/identity.esnext';
 import { createPair, Pair } from '../../nodes/Pair.esnext';
 import { Scalar } from '../../nodes/Scalar.esnext';
 import { YAMLSeq } from '../../nodes/YAMLSeq.esnext';
@@ -50,8 +50,9 @@ function createPairs(schema, iterable, ctx) {
         if (keys.length === 1) {
           key = keys[0];
           value = it[key];
-        } else
-          throw new TypeError(`Expected { key: value } tuple: ${it}`);
+        } else {
+          throw new TypeError(`Expected tuple with one key, not ${keys.length} keys`);
+        }
       } else {
         key = it;
       }

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/schema.esnext

@@ -6,6 +6,7 @@ import { binary } from './binary.esnext';
 import { trueTag, falseTag } from './bool.esnext';
 import { floatNaN, floatExp, float } from './float.esnext';
 import { intBin, intOct, int, intHex } from './int.esnext';
+import { merge } from './merge.esnext';
 import { omap } from './omap.esnext';
 import { pairs } from './pairs.esnext';
 import { set } from './set.esnext';
@@ -26,6 +27,7 @@ const schema = [
   floatExp,
   float,
   binary,
+  merge,
   omap,
   pairs,
   set,

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/set.esnext

@@ -1,5 +1,5 @@
-import { isMap, isPair, isScalar } from '../../nodes/Node.esnext';
-import { createPair, Pair } from '../../nodes/Pair.esnext';
+import { isMap, isPair, isScalar } from '../../nodes/identity.esnext';
+import { Pair, createPair } from '../../nodes/Pair.esnext';
 import { YAMLMap, findPair } from '../../nodes/YAMLMap.esnext';
 
 class YAMLSet extends YAMLMap {
@@ -11,7 +11,7 @@ class YAMLSet extends YAMLMap {
     let pair;
     if (isPair(key))
       pair = key;
-    else if (typeof key === "object" && "key" in key && "value" in key && key.value === null)
+    else if (key && typeof key === "object" && "key" in key && "value" in key && key.value === null)
       pair = new Pair(key.key, null);
     else
       pair = new Pair(key, null);
@@ -48,6 +48,17 @@ class YAMLSet extends YAMLMap {
     else
       throw new Error("Set items must all have null values");
   }
+  static from(schema, iterable, ctx) {
+    const { replacer } = ctx;
+    const set2 = new this(schema);
+    if (iterable && Symbol.iterator in Object(iterable))
+      for (let value of iterable) {
+        if (typeof replacer === "function")
+          value = replacer.call(iterable, value, value);
+        set2.items.push(createPair(value, null, ctx));
+      }
+    return set2;
+  }
 }
 YAMLSet.tag = "tag:yaml.org,2002:set";
 const set = {
@@ -56,6 +67,7 @@ const set = {
   nodeClass: YAMLSet,
   default: false,
   tag: "tag:yaml.org,2002:set",
+  createNode: (schema, iterable, ctx) => YAMLSet.from(schema, iterable, ctx),
   resolve(map, onError) {
     if (isMap(map)) {
       if (map.hasAllNullValues(true))
@@ -65,17 +77,6 @@ const set = {
     } else
       onError("Expected a mapping for this tag");
     return map;
-  },
-  createNode(schema, iterable, ctx) {
-    const { replacer } = ctx;
-    const set2 = new YAMLSet(schema);
-    if (iterable && Symbol.iterator in Object(iterable))
-      for (let value of iterable) {
-        if (typeof replacer === "function")
-          value = replacer.call(iterable, value, value);
-        set2.items.push(createPair(value, null, ctx));
-      }
-    return set2;
   }
 };
 

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/timestamp.esnext

@@ -31,7 +31,7 @@ function stringifySexagesimal(node) {
       parts.unshift(value);
     }
   }
-  return sign + parts.map((n) => n < 10 ? "0" + String(n) : String(n)).join(":").replace(/000000\d*$/, "");
+  return sign + parts.map((n) => String(n).padStart(2, "0")).join(":").replace(/000000\d*$/, "");
 }
 const intTime = {
   identify: (value) => typeof value === "bigint" || Number.isInteger(value),
@@ -75,7 +75,7 @@ const timestamp = {
     }
     return new Date(date);
   },
-  stringify: ({ value }) => value.toISOString().replace(/((T00:00)?:00)?\.000Z$/, "")
+  stringify: ({ value }) => value.toISOString().replace(/(T00:00:00)?\.000Z$/, "")
 };
 
 export { floatTime, intTime, timestamp };

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/foldFlowLines.esnext

@@ -4,6 +4,8 @@ const FOLD_QUOTED = "quoted";
 function foldFlowLines(text, indent, mode = "flow", { indentAtStart, lineWidth = 80, minContentWidth = 20, onFold, onOverflow } = {}) {
   if (!lineWidth || lineWidth < 0)
     return text;
+  if (lineWidth < minContentWidth)
+    minContentWidth = 0;
   const endStep = Math.max(1 + minContentWidth, 1 + lineWidth - indent.length);
   if (text.length <= endStep)
     return text;
@@ -23,7 +25,7 @@ function foldFlowLines(text, indent, mode = "flow", { indentAtStart, lineWidth =
   let escStart = -1;
   let escEnd = -1;
   if (mode === FOLD_BLOCK) {
-    i = consumeMoreIndentedLines(text, i);
+    i = consumeMoreIndentedLines(text, i, indent.length);
     if (i !== -1)
       end = i + endStep;
   }
@@ -47,8 +49,8 @@ function foldFlowLines(text, indent, mode = "flow", { indentAtStart, lineWidth =
     }
     if (ch === "\n") {
       if (mode === FOLD_BLOCK)
-        i = consumeMoreIndentedLines(text, i);
-      end = i + endStep;
+        i = consumeMoreIndentedLines(text, i, indent.length);
+      end = i + indent.length + endStep;
       split = void 0;
     } else {
       if (ch === " " && prev && prev !== " " && prev !== "\n" && prev !== "	") {
@@ -103,15 +105,23 @@ ${indent}${text.slice(fold + 1, end2)}`;
   }
   return res;
 }
-function consumeMoreIndentedLines(text, i) {
-  let ch = text[i + 1];
+function consumeMoreIndentedLines(text, i, indent) {
+  let end = i;
+  let start = i + 1;
+  let ch = text[start];
   while (ch === " " || ch === "	") {
-    do {
-      ch = text[i += 1];
-    } while (ch && ch !== "\n");
-    ch = text[i + 1];
+    if (i < start + indent) {
+      ch = text[++i];
+    } else {
+      do {
+        ch = text[++i];
+      } while (ch && ch !== "\n");
+      end = i;
+      start = i + 1;
+      ch = text[start];
+    }
   }
-  return i;
+  return end;
 }
 
 export { FOLD_BLOCK, FOLD_FLOW, FOLD_QUOTED, foldFlowLines };

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/stringify.esnext

@@ -1,5 +1,5 @@
 import { anchorIsValid } from '../doc/anchors.esnext';
-import { isPair, isAlias, isNode, isScalar, isCollection } from '../nodes/Node.esnext';
+import { isPair, isAlias, isNode, isScalar, isCollection } from '../nodes/identity.esnext';
 import { stringifyComment } from './stringifyComment.esnext';
 import { stringifyString } from './stringifyString.esnext';
 
@@ -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: /* @__PURE__ */ new Set(),
     doc,
+    flowCollectionPadding: opt.flowCollectionPadding ? " " : "",
     indent: "",
     indentStep: typeof opt.indent === "number" ? " ".repeat(opt.indent) : "  ",
     inFlow,
@@ -52,7 +54,12 @@ function getTagObject(tags, item) {
   let obj;
   if (isScalar(item)) {
     obj = item.value;
-    const match = tags.filter((t) => t.identify?.(obj));
+    let match = tags.filter((t) => t.identify?.(obj));
+    if (match.length > 1) {
+      const testMatch = match.filter((t) => t.test);
+      if (testMatch.length > 0)
+        match = testMatch;
+    }
     tagObj = match.find((t) => t.format === item.format) ?? match.find((t) => !t.format);
   } else {
     obj = item;

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/stringifyCollection.esnext

@@ -1,5 +1,4 @@
-import { Collection } from '../nodes/Collection.esnext';
-import { isNode, isPair } from '../nodes/Node.esnext';
+import { isNode, isPair } from '../nodes/identity.esnext';
 import { stringify } from './stringify.esnext';
 import { lineComment, indentComment } from './stringifyComment.esnext';
 
@@ -57,8 +56,8 @@ ${indent}${line}` : "\n";
     onChompKeep();
   return str;
 }
-function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemIndent, onComment }) {
-  const { indent, indentStep, options: { commentString } } = ctx;
+function stringifyFlowCollection({ items }, ctx, { flowChars, itemIndent }) {
+  const { indent, indentStep, flowCollectionPadding: fcPadding, options: { commentString } } = ctx;
   itemIndent += indentStep;
   const itemCtx = Object.assign({}, ctx, {
     indent: itemIndent,
@@ -70,13 +69,13 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
   const lines = [];
   for (let i = 0; i < items.length; ++i) {
     const item = items[i];
-    let comment2 = null;
+    let comment = null;
     if (isNode(item)) {
       if (item.spaceBefore)
         lines.push("");
       addCommentBefore(ctx, lines, item.commentBefore, false);
       if (item.comment)
-        comment2 = item.comment;
+        comment = item.comment;
     } else if (isPair(item)) {
       const ik = isNode(item.key) ? item.key : null;
       if (ik) {
@@ -89,51 +88,44 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
       const iv = isNode(item.value) ? item.value : null;
       if (iv) {
         if (iv.comment)
-          comment2 = iv.comment;
+          comment = iv.comment;
         if (iv.commentBefore)
           reqNewline = true;
-      } else if (item.value == null && ik && ik.comment) {
-        comment2 = ik.comment;
+      } else if (item.value == null && ik?.comment) {
+        comment = ik.comment;
       }
     }
-    if (comment2)
+    if (comment)
       reqNewline = true;
-    let str2 = stringify(item, itemCtx, () => comment2 = null);
+    let str = stringify(item, itemCtx, () => comment = null);
     if (i < items.length - 1)
-      str2 += ",";
-    if (comment2)
-      str2 += lineComment(str2, itemIndent, commentString(comment2));
-    if (!reqNewline && (lines.length > linesAtValue || str2.includes("\n")))
+      str += ",";
+    if (comment)
+      str += lineComment(str, itemIndent, commentString(comment));
+    if (!reqNewline && (lines.length > linesAtValue || str.includes("\n")))
       reqNewline = true;
-    lines.push(str2);
+    lines.push(str);
     linesAtValue = lines.length;
   }
-  let str;
   const { start, end } = flowChars;
   if (lines.length === 0) {
-    str = start + end;
+    return start + end;
   } else {
     if (!reqNewline) {
       const len = lines.reduce((sum, line) => sum + line.length + 2, 2);
-      reqNewline = len > Collection.maxFlowStringSingleLineLength;
+      reqNewline = ctx.options.lineWidth > 0 && len > ctx.options.lineWidth;
     }
     if (reqNewline) {
-      str = start;
+      let str = start;
       for (const line of lines)
         str += line ? `
 ${indentStep}${indent}${line}` : "\n";
-      str += `
+      return `${str}
 ${indent}${end}`;
     } else {
-      str = `${start} ${lines.join(" ")} ${end}`;
+      return `${start}${fcPadding}${lines.join(" ")}${fcPadding}${end}`;
     }
   }
-  if (comment) {
-    str += lineComment(str, commentString(comment), indent);
-    if (onComment)
-      onComment();
-  }
-  return str;
 }
 function addCommentBefore({ indent, options: { commentString } }, lines, comment, chompKeep) {
   if (comment && chompKeep)

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/stringifyDocument.esnext

@@ -1,4 +1,4 @@
-import { isNode } from '../nodes/Node.esnext';
+import { isNode } from '../nodes/identity.esnext';
 import { createStringifyContext, stringify } from './stringify.esnext';
 import { indentComment, lineComment } from './stringifyComment.esnext';
 

package/build/esnext/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/stringifyPair.esnext

@@ -1,4 +1,4 @@
-import { isNode, isCollection, isScalar, isSeq } from '../nodes/Node.esnext';
+import { isNode, isCollection, isScalar, isSeq } from '../nodes/identity.esnext';
 import { Scalar } from '../nodes/Scalar.esnext';
 import { stringify } from './stringify.esnext';
 import { lineComment, indentComment } from './stringifyComment.esnext';
@@ -10,7 +10,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
     if (keyComment) {
       throw new Error("With simple keys, key nodes cannot have comments");
     }
-    if (isCollection(key)) {
+    if (isCollection(key) || !isNode(key) && typeof key === "object") {
       const msg = "With simple keys, collection cannot be used as a key value";
       throw new Error(msg);
     }
@@ -55,43 +55,64 @@ ${indent}:`;
     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 += `
-${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))
     ctx.indentAtStart = str.length + 1;
   chompKeep = false;
   if (!indentSeq && indentStep.length >= 2 && !ctx.inFlow && !explicitKey && isSeq(value) && !value.flow && !value.tag && !value.anchor) {
-    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}
+  if (keyComment || vsb || vcb) {
+    ws = vsb ? "\n" : "";
+    if (vcb) {
+      const cs = commentString(vcb);
+      ws += `
+${indentComment(cs, ctx.indent)}`;
+    }
+    if (valueStr === "" && !ctx.inFlow) {
+      if (ws === "\n")
+        ws = "\n\n";
+    } else {
+      ws += `
 ${ctx.indent}`;
+    }
   } else if (!explicitKey && isCollection(value)) {
-    const flow = valueStr[0] === "[" || valueStr[0] === "{";
-    if (!flow || valueStr.includes("\n"))
-      ws = `
+    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 = `
 ${ctx.indent}`;
-  } else if (valueStr === "" || valueStr[0] === "\n")
+    }
+  } else if (valueStr === "" || valueStr[0] === "\n") {
     ws = "";
+  }
   str += ws + valueStr;
   if (ctx.inFlow) {
     if (valueCommentDone && onComment)