node_modules: upgrade

node_modules/yaml/browser/dist/nodes/Alias.js

@@ -1,6 +1,6 @@
 import { anchorIsValid } from '../doc/anchors.js';
 import { visit } from '../visit.js';
-import { ALIAS, isAlias, isCollection, isPair } from './identity.js';
+import { ALIAS, isAlias, isCollection, isPair, hasAnchor } from './identity.js';
 import { NodeBase } from './Node.js';
 import { toJS } from './toJS.js';
 
@@ -18,23 +18,36 @@ class Alias extends NodeBase {
      * Resolve the value of this alias within `doc`, finding the last
      * instance of the `source` anchor before this node.
      */
-    resolve(doc) {
+    resolve(doc, ctx) {
+        let nodes;
+        if (ctx?.aliasResolveCache) {
+            nodes = ctx.aliasResolveCache;
+        }
+        else {
+            nodes = [];
+            visit(doc, {
+                Node: (_key, node) => {
+                    if (isAlias(node) || hasAnchor(node))
+                        nodes.push(node);
+                }
+            });
+            if (ctx)
+                ctx.aliasResolveCache = nodes;
+        }
         let found = undefined;
-        visit(doc, {
-            Node: (_key, node) => {
-                if (node === this)
-                    return visit.BREAK;
-                if (node.anchor === this.source)
-                    found = node;
-            }
-        });
+        for (const node of nodes) {
+            if (node === this)
+                break;
+            if (node.anchor === this.source)
+                found = node;
+        }
         return found;
     }
     toJSON(_arg, ctx) {
         if (!ctx)
             return { source: this.source };
         const { anchors, doc, maxAliasCount } = ctx;
-        const source = this.resolve(doc);
+        const source = this.resolve(doc, ctx);
         if (!source) {
             const msg = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
             throw new ReferenceError(msg);

node_modules/yaml/browser/dist/nodes/Collection.js

@@ -143,6 +143,5 @@ class Collection extends NodeBase {
         }
     }
 }
-Collection.maxFlowStringSingleLineLength = 60;
 
 export { Collection, collectionFromPath, isEmptyPath };

node_modules/yaml/browser/dist/nodes/YAMLMap.js

@@ -1,7 +1,7 @@
 import { stringifyCollection } from '../stringify/stringifyCollection.js';
 import { addPairToJSMap } from './addPairToJSMap.js';
 import { Collection } from './Collection.js';
-import { isPair, isScalar, MAP } from './identity.js';
+import { MAP, isPair, isScalar } from './identity.js';
 import { Pair, createPair } from './Pair.js';
 import { isScalarValue } from './Scalar.js';
 

node_modules/yaml/browser/dist/nodes/addPairToJSMap.js

@@ -1,22 +1,15 @@
 import { warn } from '../log.js';
+import { isMergeKey, addMergeToJSMap } from '../schema/yaml-1.1/merge.js';
 import { createStringifyContext } from '../stringify/stringify.js';
-import { isAlias, isSeq, isScalar, isMap, isNode } from './identity.js';
-import { Scalar } from './Scalar.js';
+import { isNode } from './identity.js';
 import { toJS } from './toJS.js';
 
-const MERGE_KEY = '<<';
 function addPairToJSMap(ctx, map, { key, value }) {
-    if (ctx?.doc.schema.merge && isMergeKey(key)) {
-        value = isAlias(value) ? value.resolve(ctx.doc) : value;
-        if (isSeq(value))
-            for (const it of value.items)
-                mergeToJSMap(ctx, map, it);
-        else if (Array.isArray(value))
-            for (const it of value)
-                mergeToJSMap(ctx, map, it);
-        else
-            mergeToJSMap(ctx, map, value);
-    }
+    if (isNode(key) && key.addToJSMap)
+        key.addToJSMap(ctx, map, value);
+    // TODO: Should drop this special case for bare << handling
+    else if (isMergeKey(ctx, key))
+        addMergeToJSMap(ctx, map, value);
     else {
         const jsKey = toJS(key, '', ctx);
         if (map instanceof Map) {
@@ -41,44 +34,10 @@ function addPairToJSMap(ctx, map, { key, value }) {
     }
     return map;
 }
-const isMergeKey = (key) => key === MERGE_KEY ||
-    (isScalar(key) &&
-        key.value === MERGE_KEY &&
-        (!key.type || key.type === Scalar.PLAIN));
-// 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
-function mergeToJSMap(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;
-}
 function stringifyKey(key, jsKey, ctx) {
     if (jsKey === null)
         return '';
+    // eslint-disable-next-line @typescript-eslint/no-base-to-string
     if (typeof jsKey !== 'object')
         return String(jsKey);
     if (isNode(key) && ctx?.doc) {