@quilted/create 0.2.44 → 0.2.45

package/build/esm/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/core/float.mjs

@@ -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/esm/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/json/schema.mjs

@@ -26,7 +26,7 @@ const jsonScalars = [{
   identify: value => typeof value === 'boolean',
   default: true,
   tag: 'tag:yaml.org,2002:bool',
-  test: /^true|false$/,
+  test: /^true$|^false$/,
   resolve: str => str === 'true',
   stringify: stringifyJSON
 }, {

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

@@ -8,6 +8,7 @@ import { intOct, intHex, int } from './core/int.mjs';
 import { schema } from './core/schema.mjs';
 import { schema as schema$1 } from './json/schema.mjs';
 import { binary } from './yaml-1.1/binary.mjs';
+import { merge } from './yaml-1.1/merge.mjs';
 import { omap } from './yaml-1.1/omap.mjs';
 import { pairs } from './yaml-1.1/pairs.mjs';
 import { schema as schema$2 } from './yaml-1.1/schema.mjs';
@@ -27,6 +28,7 @@ const tagsByName = {
   intOct,
   intTime,
   map,
+  merge,
   null: nullTag,
   omap,
   pairs,
@@ -36,13 +38,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 = [];else {
       const keys = Array.from(schemas.keys()).filter(key => key !== 'yaml11').map(key => JSON.stringify(key)).join(', ');
@@ -54,13 +61,17 @@ 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((tags, 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 (!tags.includes(tagObj)) tags.push(tagObj);
+    return tags;
+  }, []);
 }
 
 export { coreKnownTags, getTags };

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

@@ -3,6 +3,7 @@ import { stringifyString } from '../../stringify/stringifyString.mjs';
 
 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') {
       // On IE 11, atob() can't handle newlines
       const str = atob(src.replace(/[\n\r]/g, ''));
       const buffer = new Uint8Array(str.length);
@@ -34,9 +33,7 @@ const binary = {
   }, ctx, onComment, onChompKeep) {
     const buf = value; // checked earlier by binary.identify()
     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]);
       str = btoa(s);

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

@@ -20,7 +20,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/esm/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/float.mjs

@@ -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/esm/node_modules/.pnpm/yaml@2.7.0/node_modules/yaml/browser/dist/schema/yaml-1.1/merge.mjs

@@ -0,0 +1,48 @@
+import { isScalar, isAlias, isSeq, isMap } from '../../nodes/identity.mjs';
+import { Scalar } from '../../nodes/Scalar.mjs';
+
+// If the value associated with a merge key is a single mapping node, each of
+// its key/value pairs is inserted into the current mapping, unless the key
+// already exists in it. If the value associated with the merge key is a
+// sequence, then this sequence is expected to contain mapping nodes and each
+// of these nodes is merged in turn according to its order in the sequence.
+// Keys in mapping nodes earlier in the sequence override keys specified in
+// later mapping nodes. -- http://yaml.org/type/merge.html
+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, value] of srcMap) {
+    if (map instanceof Map) {
+      if (!map.has(key)) map.set(key, value);
+    } else if (map instanceof Set) {
+      map.add(key);
+    } else if (!Object.prototype.hasOwnProperty.call(map, key)) {
+      Object.defineProperty(map, key, {
+        value,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
+    }
+  }
+  return map;
+}
+
+export { addMergeToJSMap, isMergeKey, merge };

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

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

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

@@ -1,4 +1,4 @@
-import { isSeq, isPair, isMap } from '../../nodes/Node.mjs';
+import { isSeq, isPair, isMap } from '../../nodes/identity.mjs';
 import { createPair, Pair } from '../../nodes/Pair.mjs';
 import { Scalar } from '../../nodes/Scalar.mjs';
 import { YAMLSeq } from '../../nodes/YAMLSeq.mjs';
@@ -42,7 +42,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/esm/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/schema/yaml-1.1/schema.mjs

@@ -6,11 +6,12 @@ import { binary } from './binary.mjs';
 import { trueTag, falseTag } from './bool.mjs';
 import { floatNaN, floatExp, float } from './float.mjs';
 import { intBin, intOct, int, intHex } from './int.mjs';
+import { merge } from './merge.mjs';
 import { omap } from './omap.mjs';
 import { pairs } from './pairs.mjs';
 import { set } from './set.mjs';
 import { intTime, floatTime, timestamp } from './timestamp.mjs';
 
-const schema = [map, seq, string, nullTag, trueTag, falseTag, intBin, intOct, int, intHex, floatNaN, floatExp, float, binary, omap, pairs, set, intTime, floatTime, timestamp];
+const schema = [map, seq, string, nullTag, trueTag, falseTag, intBin, intOct, int, intHex, floatNaN, floatExp, float, binary, merge, omap, pairs, set, intTime, floatTime, timestamp];
 
 export { schema };

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

@@ -1,5 +1,5 @@
-import { isMap, isPair, isScalar } from '../../nodes/Node.mjs';
-import { createPair, Pair } from '../../nodes/Pair.mjs';
+import { isMap, isPair, isScalar } from '../../nodes/identity.mjs';
+import { Pair, createPair } from '../../nodes/Pair.mjs';
 import { YAMLMap, findPair } from '../../nodes/YAMLMap.mjs';
 
 class YAMLSet extends YAMLMap {
@@ -9,7 +9,7 @@ class YAMLSet extends YAMLMap {
   }
   add(key) {
     let pair;
-    if (isPair(key)) pair = key;else if (typeof key === 'object' && 'key' in key && 'value' in key && key.value === null) pair = new Pair(key.key, null);else pair = new Pair(key, null);
+    if (isPair(key)) pair = key;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);
     const prev = findPair(this.items, pair.key);
     if (!prev) this.items.push(pair);
   }
@@ -39,6 +39,17 @@ class YAMLSet extends YAMLMap {
       allNullValues: true
     }), onComment, onChompKeep);else throw new Error('Set items must all have null values');
   }
+  static from(schema, iterable, ctx) {
+    const {
+      replacer
+    } = ctx;
+    const set = 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);
+      set.items.push(createPair(value, null, ctx));
+    }
+    return set;
+  }
 }
 YAMLSet.tag = 'tag:yaml.org,2002:set';
 const set = {
@@ -47,22 +58,12 @@ 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)) return Object.assign(new YAMLSet(), map);else onError('Set items must all have null values');
     } else onError('Expected a mapping for this tag');
     return map;
-  },
-  createNode(schema, iterable, ctx) {
-    const {
-      replacer
-    } = ctx;
-    const set = 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);
-      set.items.push(createPair(value, null, ctx));
-    }
-    return set;
   }
 };
 

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

@@ -36,11 +36,9 @@ function stringifySexagesimal(node) {
       parts.unshift(value); // hours
     }
   }
-
-  return sign + parts.map(n => n < 10 ? '0' + String(n) : String(n)).join(':').replace(/000000\d*$/, '') // % 60 may introduce error
+  return sign + parts.map(n => String(n).padStart(2, '0')).join(':').replace(/000000\d*$/, '') // % 60 may introduce error
   ;
 }
-
 const intTime = {
   identify: value => typeof value === 'bigint' || Number.isInteger(value),
   default: true,
@@ -95,7 +93,7 @@ const timestamp = {
   },
   stringify: ({
     value
-  }) => value.toISOString().replace(/((T00:00)?:00)?\.000Z$/, '')
+  }) => value.toISOString().replace(/(T00:00:00)?\.000Z$/, '')
 };
 
 export { floatTime, intTime, timestamp };

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

@@ -14,6 +14,7 @@ function foldFlowLines(text, indent, mode = 'flow', {
   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;
   const folds = [];
@@ -29,7 +30,7 @@ function foldFlowLines(text, indent, mode = 'flow', {
   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;
   }
   for (let ch; ch = text[i += 1];) {
@@ -51,8 +52,8 @@ function foldFlowLines(text, indent, mode = 'flow', {
       escEnd = i;
     }
     if (ch === '\n') {
-      if (mode === FOLD_BLOCK) i = consumeMoreIndentedLines(text, i);
-      end = i + endStep;
+      if (mode === FOLD_BLOCK) i = consumeMoreIndentedLines(text, i, indent.length);
+      end = i + indent.length + endStep;
       split = undefined;
     } else {
       if (ch === ' ' && prev && prev !== ' ' && prev !== '\n' && prev !== '\t') {
@@ -105,15 +106,23 @@ function foldFlowLines(text, indent, mode = 'flow', {
  * Presumes `i + 1` is at the start of a line
  * @returns index of last newline in more-indented block
  */
-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 === '\t') {
-    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/esm/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/stringify.mjs

@@ -1,5 +1,5 @@
 import { anchorIsValid } from '../doc/anchors.mjs';
-import { isPair, isAlias, isNode, isScalar, isCollection } from '../nodes/Node.mjs';
+import { isPair, isAlias, isNode, isScalar, isCollection } from '../nodes/identity.mjs';
 import { stringifyComment } from './stringifyComment.mjs';
 import { stringifyString } from './stringifyString.mjs';
 
@@ -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,
@@ -51,7 +53,11 @@ 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/esm/node_modules/.pnpm/{yaml@2.1.1 → yaml@2.7.0}/node_modules/yaml/browser/dist/stringify/stringifyCollection.mjs

@@ -1,5 +1,4 @@
-import { Collection } from '../nodes/Collection.mjs';
-import { isNode, isPair } from '../nodes/Node.mjs';
+import { isNode, isPair } from '../nodes/identity.mjs';
 import { stringify } from './stringify.mjs';
 import { lineComment, indentComment } from './stringifyComment.mjs';
 
@@ -67,16 +66,15 @@ function stringifyBlockCollection({
   return str;
 }
 function stringifyFlowCollection({
-  comment,
   items
 }, ctx, {
   flowChars,
-  itemIndent,
-  onComment
+  itemIndent
 }) {
   const {
     indent,
     indentStep,
+    flowCollectionPadding: fcPadding,
     options: {
       commentString
     }
@@ -108,7 +106,7 @@ function stringifyFlowCollection({
       if (iv) {
         if (iv.comment) comment = iv.comment;
         if (iv.commentBefore) reqNewline = true;
-      } else if (item.value == null && ik && ik.comment) {
+      } else if (item.value == null && ik?.comment) {
         comment = ik.comment;
       }
     }
@@ -120,31 +118,25 @@ function stringifyFlowCollection({
     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 ? `\n${indentStep}${indent}${line}` : '\n';
-      str += `\n${indent}${end}`;
+      return `${str}\n${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,

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

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

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

@@ -1,4 +1,4 @@
-import { isNode, isCollection, isScalar, isSeq } from '../nodes/Node.mjs';
+import { isNode, isCollection, isScalar, isSeq } from '../nodes/identity.mjs';
 import { Scalar } from '../nodes/Scalar.mjs';
 import { stringify } from './stringify.mjs';
 import { lineComment, indentComment } from './stringifyComment.mjs';
@@ -23,7 +23,7 @@ function stringifyPair({
     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);
     }
@@ -61,34 +61,57 @@ function stringifyPair({
     str = `${str}:`;
     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)) ctx.indentAtStart = str.length + 1;
   chompKeep = false;
   if (!indentSeq && indentStep.length >= 2 && !ctx.inFlow && !explicitKey && isSeq(value) && !value.flow && !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}`;
-  } else if (valueStr === '' || valueStr[0] === '\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 = `\n${ctx.indent}`;
+    }
+  } else if (valueStr === '' || valueStr[0] === '\n') {
+    ws = '';
+  }
   str += ws + valueStr;
   if (ctx.inFlow) {
     if (valueCommentDone && onComment) onComment();