projen 0.71.67 → 0.71.69

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

@@ -1,6 +1,8 @@
 import { anchorIsValid } from '../doc/anchors.js';
 import { visit } from '../visit.js';
-import { NodeBase, ALIAS, isAlias, isCollection, isPair } from './Node.js';
+import { ALIAS, isAlias, isCollection, isPair } from './identity.js';
+import { NodeBase } from './Node.js';
+import { toJS } from './toJS.js';
 
 class Alias extends NodeBase {
     constructor(source) {
@@ -37,7 +39,12 @@ class Alias extends NodeBase {
             const msg = `Unresolved alias (the anchor must be set before the alias): ${this.source}`;
             throw new ReferenceError(msg);
         }
-        const data = anchors.get(source);
+        let data = anchors.get(source);
+        if (!data) {
+            // Resolve anchors for Node.prototype.toJS()
+            toJS(source, null, ctx);
+            data = anchors.get(source);
+        }
         /* istanbul ignore if */
         if (!data || data.res === undefined) {
             const msg = 'This should not happen: Alias anchor was not resolved?';

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

@@ -1,5 +1,6 @@
 import { createNode } from '../doc/createNode.js';
-import { NodeBase, isNode, isPair, isCollection, isScalar } from './Node.js';
+import { isNode, isPair, isCollection, isScalar } from './identity.js';
+import { NodeBase } from './Node.js';
 
 function collectionFromPath(schema, path, value) {
     let v = value;

package/node_modules/yaml/browser/dist/nodes/Node.js

@@ -1,37 +1,7 @@
-const ALIAS = Symbol.for('yaml.alias');
-const DOC = Symbol.for('yaml.document');
-const MAP = Symbol.for('yaml.map');
-const PAIR = Symbol.for('yaml.pair');
-const SCALAR = Symbol.for('yaml.scalar');
-const SEQ = Symbol.for('yaml.seq');
-const NODE_TYPE = Symbol.for('yaml.node.type');
-const isAlias = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === ALIAS;
-const isDocument = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === DOC;
-const isMap = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === MAP;
-const isPair = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === PAIR;
-const isScalar = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === SCALAR;
-const isSeq = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === SEQ;
-function isCollection(node) {
-    if (node && typeof node === 'object')
-        switch (node[NODE_TYPE]) {
-            case MAP:
-            case SEQ:
-                return true;
-        }
-    return false;
-}
-function isNode(node) {
-    if (node && typeof node === 'object')
-        switch (node[NODE_TYPE]) {
-            case ALIAS:
-            case MAP:
-            case SCALAR:
-            case SEQ:
-                return true;
-        }
-    return false;
-}
-const hasAnchor = (node) => (isScalar(node) || isCollection(node)) && !!node.anchor;
+import { applyReviver } from '../doc/applyReviver.js';
+import { NODE_TYPE, isDocument } from './identity.js';
+import { toJS } from './toJS.js';
+
 class NodeBase {
     constructor(type) {
         Object.defineProperty(this, NODE_TYPE, { value: type });
@@ -43,6 +13,26 @@ class NodeBase {
             copy.range = this.range.slice();
         return copy;
     }
+    /** A plain JavaScript representation of this node. */
+    toJS(doc, { mapAsMap, maxAliasCount, onAnchor, reviver } = {}) {
+        if (!isDocument(doc))
+            throw new TypeError('A document argument is required');
+        const ctx = {
+            anchors: new Map(),
+            doc,
+            keep: true,
+            mapAsMap: mapAsMap === true,
+            mapKeyWarned: false,
+            maxAliasCount: typeof maxAliasCount === 'number' ? maxAliasCount : 100
+        };
+        const res = toJS(this, '', ctx);
+        if (typeof onAnchor === 'function')
+            for (const { count, res } of ctx.anchors.values())
+                onAnchor(res, count);
+        return typeof reviver === 'function'
+            ? applyReviver(reviver, { '': res }, '', res)
+            : res;
+    }
 }
 
-export { ALIAS, DOC, MAP, NODE_TYPE, NodeBase, PAIR, SCALAR, SEQ, hasAnchor, isAlias, isCollection, isDocument, isMap, isNode, isPair, isScalar, isSeq };
+export { NodeBase };

package/node_modules/yaml/browser/dist/nodes/Pair.js

@@ -1,7 +1,7 @@
 import { createNode } from '../doc/createNode.js';
 import { stringifyPair } from '../stringify/stringifyPair.js';
 import { addPairToJSMap } from './addPairToJSMap.js';
-import { NODE_TYPE, PAIR, isNode } from './Node.js';
+import { NODE_TYPE, PAIR, isNode } from './identity.js';
 
 function createPair(key, value, ctx) {
     const k = createNode(key, undefined, ctx);

package/node_modules/yaml/browser/dist/nodes/Scalar.js

@@ -1,4 +1,5 @@
-import { NodeBase, SCALAR } from './Node.js';
+import { SCALAR } from './identity.js';
+import { NodeBase } from './Node.js';
 import { toJS } from './toJS.js';
 
 const isScalarValue = (value) => !value || (typeof value !== 'function' && typeof value !== 'object');

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

@@ -1,8 +1,8 @@
 import { stringifyCollection } from '../stringify/stringifyCollection.js';
 import { addPairToJSMap } from './addPairToJSMap.js';
 import { Collection } from './Collection.js';
-import { isPair, isScalar, MAP } from './Node.js';
-import { Pair } from './Pair.js';
+import { isPair, isScalar, MAP } from './identity.js';
+import { Pair, createPair } from './Pair.js';
 import { isScalarValue } from './Scalar.js';
 
 function findPair(items, key) {
@@ -25,6 +25,34 @@ class YAMLMap extends Collection {
         super(MAP, schema);
         this.items = [];
     }
+    /**
+     * A generic collection parsing method that can be extended
+     * to other node classes that inherit from YAMLMap
+     */
+    static from(schema, obj, ctx) {
+        const { keepUndefined, replacer } = ctx;
+        const map = new this(schema);
+        const add = (key, value) => {
+            if (typeof replacer === 'function')
+                value = replacer.call(obj, key, value);
+            else if (Array.isArray(replacer) && !replacer.includes(key))
+                return;
+            if (value !== undefined || keepUndefined)
+                map.items.push(createPair(key, value, ctx));
+        };
+        if (obj instanceof Map) {
+            for (const [key, value] of obj)
+                add(key, value);
+        }
+        else if (obj && typeof obj === 'object') {
+            for (const key of Object.keys(obj))
+                add(key, obj[key]);
+        }
+        if (typeof schema.sortMapEntries === 'function') {
+            map.items.sort(schema.sortMapEntries);
+        }
+        return map;
+    }
     /**
      * Adds a value to the collection.
      *

package/node_modules/yaml/browser/dist/nodes/YAMLSeq.js

@@ -1,6 +1,7 @@
+import { createNode } from '../doc/createNode.js';
 import { stringifyCollection } from '../stringify/stringifyCollection.js';
 import { Collection } from './Collection.js';
-import { SEQ, isScalar } from './Node.js';
+import { SEQ, isScalar } from './identity.js';
 import { isScalarValue } from './Scalar.js';
 import { toJS } from './toJS.js';
 
@@ -84,6 +85,21 @@ class YAMLSeq extends Collection {
             onComment
         });
     }
+    static from(schema, obj, ctx) {
+        const { replacer } = ctx;
+        const seq = new this(schema);
+        if (obj && Symbol.iterator in Object(obj)) {
+            let i = 0;
+            for (let it of obj) {
+                if (typeof replacer === 'function') {
+                    const key = obj instanceof Set ? it : String(i++);
+                    it = replacer.call(obj, key, it);
+                }
+                seq.items.push(createNode(it, undefined, ctx));
+            }
+        }
+        return seq;
+    }
 }
 function asItemIndex(key) {
     let idx = isScalar(key) ? key.value : key;

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

@@ -1,6 +1,6 @@
 import { warn } from '../log.js';
 import { createStringifyContext } from '../stringify/stringify.js';
-import { isAlias, isSeq, isScalar, isMap, isNode } from './Node.js';
+import { isAlias, isSeq, isScalar, isMap, isNode } from './identity.js';
 import { Scalar } from './Scalar.js';
 import { toJS } from './toJS.js';
 

package/node_modules/yaml/browser/dist/nodes/identity.js

@@ -0,0 +1,36 @@
+const ALIAS = Symbol.for('yaml.alias');
+const DOC = Symbol.for('yaml.document');
+const MAP = Symbol.for('yaml.map');
+const PAIR = Symbol.for('yaml.pair');
+const SCALAR = Symbol.for('yaml.scalar');
+const SEQ = Symbol.for('yaml.seq');
+const NODE_TYPE = Symbol.for('yaml.node.type');
+const isAlias = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === ALIAS;
+const isDocument = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === DOC;
+const isMap = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === MAP;
+const isPair = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === PAIR;
+const isScalar = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === SCALAR;
+const isSeq = (node) => !!node && typeof node === 'object' && node[NODE_TYPE] === SEQ;
+function isCollection(node) {
+    if (node && typeof node === 'object')
+        switch (node[NODE_TYPE]) {
+            case MAP:
+            case SEQ:
+                return true;
+        }
+    return false;
+}
+function isNode(node) {
+    if (node && typeof node === 'object')
+        switch (node[NODE_TYPE]) {
+            case ALIAS:
+            case MAP:
+            case SCALAR:
+            case SEQ:
+                return true;
+        }
+    return false;
+}
+const hasAnchor = (node) => (isScalar(node) || isCollection(node)) && !!node.anchor;
+
+export { ALIAS, DOC, MAP, NODE_TYPE, PAIR, SCALAR, SEQ, hasAnchor, isAlias, isCollection, isDocument, isMap, isNode, isPair, isScalar, isSeq };

package/node_modules/yaml/browser/dist/nodes/toJS.js

@@ -1,4 +1,4 @@
-import { hasAnchor } from './Node.js';
+import { hasAnchor } from './identity.js';
 
 /**
  * Recursively convert any node or its contents to native JavaScript

package/node_modules/yaml/browser/dist/schema/Schema.js

@@ -1,4 +1,4 @@
-import { MAP, SCALAR, SEQ } from '../nodes/Node.js';
+import { MAP, SCALAR, SEQ } from '../nodes/identity.js';
 import { map } from './common/map.js';
 import { seq } from './common/seq.js';
 import { string } from './common/string.js';

package/node_modules/yaml/browser/dist/schema/common/map.js

@@ -1,34 +1,8 @@
-import { isMap } from '../../nodes/Node.js';
-import { createPair } from '../../nodes/Pair.js';
+import { isMap } from '../../nodes/identity.js';
 import { YAMLMap } from '../../nodes/YAMLMap.js';
 
-function createMap(schema, obj, ctx) {
-    const { keepUndefined, replacer } = ctx;
-    const map = new YAMLMap(schema);
-    const add = (key, value) => {
-        if (typeof replacer === 'function')
-            value = replacer.call(obj, key, value);
-        else if (Array.isArray(replacer) && !replacer.includes(key))
-            return;
-        if (value !== undefined || keepUndefined)
-            map.items.push(createPair(key, value, ctx));
-    };
-    if (obj instanceof Map) {
-        for (const [key, value] of obj)
-            add(key, value);
-    }
-    else if (obj && typeof obj === 'object') {
-        for (const key of Object.keys(obj))
-            add(key, obj[key]);
-    }
-    if (typeof schema.sortMapEntries === 'function') {
-        map.items.sort(schema.sortMapEntries);
-    }
-    return map;
-}
 const map = {
     collection: 'map',
-    createNode: createMap,
     default: true,
     nodeClass: YAMLMap,
     tag: 'tag:yaml.org,2002:map',
@@ -36,7 +10,8 @@ const map = {
         if (!isMap(map))
             onError('Expected a mapping for this tag');
         return map;
-    }
+    },
+    createNode: (schema, obj, ctx) => YAMLMap.from(schema, obj, ctx)
 };
 
 export { map };

package/node_modules/yaml/browser/dist/schema/common/seq.js

@@ -1,25 +1,8 @@
-import { createNode } from '../../doc/createNode.js';
-import { isSeq } from '../../nodes/Node.js';
+import { isSeq } from '../../nodes/identity.js';
 import { YAMLSeq } from '../../nodes/YAMLSeq.js';
 
-function createSeq(schema, obj, ctx) {
-    const { replacer } = ctx;
-    const seq = new YAMLSeq(schema);
-    if (obj && Symbol.iterator in Object(obj)) {
-        let i = 0;
-        for (let it of obj) {
-            if (typeof replacer === 'function') {
-                const key = obj instanceof Set ? it : String(i++);
-                it = replacer.call(obj, key, it);
-            }
-            seq.items.push(createNode(it, undefined, ctx));
-        }
-    }
-    return seq;
-}
 const seq = {
     collection: 'seq',
-    createNode: createSeq,
     default: true,
     nodeClass: YAMLSeq,
     tag: 'tag:yaml.org,2002:seq',
@@ -27,7 +10,8 @@ const seq = {
         if (!isSeq(seq))
             onError('Expected a sequence for this tag');
         return seq;
-    }
+    },
+    createNode: (schema, obj, ctx) => YAMLSeq.from(schema, obj, ctx)
 };
 
 export { seq };

package/node_modules/yaml/browser/dist/schema/tags.js

@@ -12,7 +12,7 @@ import { omap } from './yaml-1.1/omap.js';
 import { pairs } from './yaml-1.1/pairs.js';
 import { schema as schema$2 } from './yaml-1.1/schema.js';
 import { set } from './yaml-1.1/set.js';
-import { floatTime, intTime, timestamp } from './yaml-1.1/timestamp.js';
+import { timestamp, floatTime, intTime } from './yaml-1.1/timestamp.js';
 
 const schemas = new Map([
     ['core', schema],

package/node_modules/yaml/browser/dist/schema/yaml-1.1/omap.js

@@ -1,7 +1,7 @@
-import { YAMLSeq } from '../../nodes/YAMLSeq.js';
+import { isScalar, isPair } from '../../nodes/identity.js';
 import { toJS } from '../../nodes/toJS.js';
-import { isScalar, isPair } from '../../nodes/Node.js';
 import { YAMLMap } from '../../nodes/YAMLMap.js';
+import { YAMLSeq } from '../../nodes/YAMLSeq.js';
 import { resolvePairs, createPairs } from './pairs.js';
 
 class YAMLOMap extends YAMLSeq {
@@ -39,6 +39,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 = {
@@ -62,12 +68,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/node_modules/yaml/browser/dist/schema/yaml-1.1/pairs.js

@@ -1,4 +1,4 @@
-import { isSeq, isPair, isMap } from '../../nodes/Node.js';
+import { isSeq, isPair, isMap } from '../../nodes/identity.js';
 import { Pair, createPair } from '../../nodes/Pair.js';
 import { Scalar } from '../../nodes/Scalar.js';
 import { YAMLSeq } from '../../nodes/YAMLSeq.js';

package/node_modules/yaml/browser/dist/schema/yaml-1.1/set.js

@@ -1,5 +1,5 @@
-import { isMap, isPair, isScalar } from '../../nodes/Node.js';
-import { createPair, Pair } from '../../nodes/Pair.js';
+import { isMap, isPair, isScalar } from '../../nodes/identity.js';
+import { Pair, createPair } from '../../nodes/Pair.js';
 import { YAMLMap, findPair } from '../../nodes/YAMLMap.js';
 
 class YAMLSet extends YAMLMap {
@@ -57,6 +57,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 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 = {
@@ -65,6 +76,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))
@@ -75,17 +87,6 @@ const set = {
         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/node_modules/yaml/browser/dist/schema/yaml-1.1/timestamp.js

@@ -43,7 +43,7 @@ function stringifySexagesimal(node) {
     }
     return (sign +
         parts
-            .map(n => (n < 10 ? '0' + String(n) : String(n)))
+            .map(n => String(n).padStart(2, '0'))
             .join(':')
             .replace(/000000\d*$/, '') // % 60 may introduce error
     );

package/node_modules/yaml/browser/dist/stringify/stringify.js

@@ -1,5 +1,5 @@
 import { anchorIsValid } from '../doc/anchors.js';
-import { isPair, isAlias, isNode, isScalar, isCollection } from '../nodes/Node.js';
+import { isPair, isAlias, isNode, isScalar, isCollection } from '../nodes/identity.js';
 import { stringifyComment } from './stringifyComment.js';
 import { stringifyString } from './stringifyString.js';
 

package/node_modules/yaml/browser/dist/stringify/stringifyCollection.js

@@ -1,5 +1,5 @@
 import { Collection } from '../nodes/Collection.js';
-import { isNode, isPair } from '../nodes/Node.js';
+import { isNode, isPair } from '../nodes/identity.js';
 import { stringify } from './stringify.js';
 import { lineComment, indentComment } from './stringifyComment.js';
 

package/node_modules/yaml/browser/dist/stringify/stringifyDocument.js

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

package/node_modules/yaml/browser/dist/stringify/stringifyPair.js

@@ -1,4 +1,4 @@
-import { isCollection, isNode, isScalar, isSeq } from '../nodes/Node.js';
+import { isCollection, isNode, isScalar, isSeq } from '../nodes/identity.js';
 import { Scalar } from '../nodes/Scalar.js';
 import { stringify } from './stringify.js';
 import { lineComment, indentComment } from './stringifyComment.js';

package/node_modules/yaml/browser/dist/stringify/stringifyString.js

@@ -146,6 +146,15 @@ function quotedString(value, ctx) {
     }
     return qs(value, ctx);
 }
+// The negative lookbehind avoids a polynomial search,
+// but isn't supported yet on Safari: https://caniuse.com/js-regexp-lookbehind
+let blockEndNewlines;
+try {
+    blockEndNewlines = new RegExp('(^|(?<!\n))\n+(?!\n|$)', 'g');
+}
+catch {
+    blockEndNewlines = /\n+(?!\n|$)/g;
+}
 function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
     const { blockQuote, commentString, lineWidth } = ctx.options;
     // 1. Block can't end in whitespace unless the last line is non-empty.
@@ -189,7 +198,7 @@ function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
         value = value.slice(0, -end.length);
         if (end[end.length - 1] === '\n')
             end = end.slice(0, -1);
-        end = end.replace(/\n+(?!\n|$)/g, `$&${indent}`);
+        end = end.replace(blockEndNewlines, `$&${indent}`);
     }
     // determine indent indicator from whitespace at value start
     let startWithSpace = false;

package/node_modules/yaml/browser/dist/util.js

@@ -1,4 +1,6 @@
+export { createNode } from './doc/createNode.js';
 export { debug, warn } from './log.js';
+export { createPair } from './nodes/Pair.js';
 export { findPair } from './nodes/YAMLMap.js';
 export { toJS } from './nodes/toJS.js';
 export { map as mapTag } from './schema/common/map.js';

package/node_modules/yaml/browser/dist/visit.js

@@ -1,4 +1,4 @@
-import { isDocument, isNode, isPair, isCollection, isMap, isSeq, isScalar, isAlias } from './nodes/Node.js';
+import { isDocument, isNode, isPair, isCollection, isMap, isSeq, isScalar, isAlias } from './nodes/identity.js';
 
 const BREAK = Symbol('break visit');
 const SKIP = Symbol('skip children');

package/node_modules/yaml/dist/compose/compose-collection.d.ts

@@ -1,4 +1,4 @@
-import { ParsedNode } from '../nodes/Node.js';
+import type { ParsedNode } from '../nodes/Node.js';
 import type { BlockMap, BlockSequence, FlowCollection, SourceToken } from '../parse/cst.js';
 import type { ComposeContext, ComposeNode } from './compose-node.js';
 import type { ComposeErrorHandler } from './composer.js';

package/node_modules/yaml/dist/compose/compose-collection.js

@@ -1,40 +1,52 @@
 'use strict';
 
-var Node = require('../nodes/Node.js');
+var identity = require('../nodes/identity.js');
 var Scalar = require('../nodes/Scalar.js');
+var YAMLMap = require('../nodes/YAMLMap.js');
+var YAMLSeq = require('../nodes/YAMLSeq.js');
 var resolveBlockMap = require('./resolve-block-map.js');
 var resolveBlockSeq = require('./resolve-block-seq.js');
 var resolveFlowCollection = require('./resolve-flow-collection.js');
 
-function composeCollection(CN, ctx, token, tagToken, onError) {
-    let coll;
-    switch (token.type) {
-        case 'block-map': {
-            coll = resolveBlockMap.resolveBlockMap(CN, ctx, token, onError);
-            break;
-        }
-        case 'block-seq': {
-            coll = resolveBlockSeq.resolveBlockSeq(CN, ctx, token, onError);
-            break;
-        }
-        case 'flow-collection': {
-            coll = resolveFlowCollection.resolveFlowCollection(CN, ctx, token, onError);
-            break;
-        }
-    }
-    if (!tagToken)
-        return coll;
-    const tagName = ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg));
-    if (!tagName)
-        return coll;
-    // Cast needed due to: https://github.com/Microsoft/TypeScript/issues/3841
+function resolveCollection(CN, ctx, token, onError, tagName, tag) {
+    const coll = token.type === 'block-map'
+        ? resolveBlockMap.resolveBlockMap(CN, ctx, token, onError, tag)
+        : token.type === 'block-seq'
+            ? resolveBlockSeq.resolveBlockSeq(CN, ctx, token, onError, tag)
+            : resolveFlowCollection.resolveFlowCollection(CN, ctx, token, onError, tag);
     const Coll = coll.constructor;
+    // If we got a tagName matching the class, or the tag name is '!',
+    // then use the tagName from the node class used to create it.
     if (tagName === '!' || tagName === Coll.tagName) {
         coll.tag = Coll.tagName;
         return coll;
     }
-    const expType = Node.isMap(coll) ? 'map' : 'seq';
-    let tag = ctx.schema.tags.find(t => t.collection === expType && t.tag === tagName);
+    if (tagName)
+        coll.tag = tagName;
+    return coll;
+}
+function composeCollection(CN, ctx, token, tagToken, onError) {
+    const tagName = !tagToken
+        ? null
+        : ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg));
+    const expType = token.type === 'block-map'
+        ? 'map'
+        : token.type === 'block-seq'
+            ? 'seq'
+            : token.start.source === '{'
+                ? 'map'
+                : 'seq';
+    // shortcut: check if it's a generic YAMLMap or YAMLSeq
+    // before jumping into the custom tag logic.
+    if (!tagToken ||
+        !tagName ||
+        tagName === '!' ||
+        (tagName === YAMLMap.YAMLMap.tagName && expType === 'map') ||
+        (tagName === YAMLSeq.YAMLSeq.tagName && expType === 'seq') ||
+        !expType) {
+        return resolveCollection(CN, ctx, token, onError, tagName);
+    }
+    let tag = ctx.schema.tags.find(t => t.tag === tagName && t.collection === expType);
     if (!tag) {
         const kt = ctx.schema.knownTags[tagName];
         if (kt && kt.collection === expType) {
@@ -42,13 +54,18 @@ function composeCollection(CN, ctx, token, tagToken, onError) {
             tag = kt;
         }
         else {
-            onError(tagToken, 'TAG_RESOLVE_FAILED', `Unresolved tag: ${tagName}`, true);
-            coll.tag = tagName;
-            return coll;
+            if (kt?.collection) {
+                onError(tagToken, 'BAD_COLLECTION_TYPE', `${kt.tag} used for ${expType} collection, but expects ${kt.collection}`, true);
+            }
+            else {
+                onError(tagToken, 'TAG_RESOLVE_FAILED', `Unresolved tag: ${tagName}`, true);
+            }
+            return resolveCollection(CN, ctx, token, onError, tagName);
         }
     }
-    const res = tag.resolve(coll, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg), ctx.options);
-    const node = Node.isNode(res)
+    const coll = resolveCollection(CN, ctx, token, onError, tagName, tag);
+    const res = tag.resolve?.(coll, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg), ctx.options) ?? coll;
+    const node = identity.isNode(res)
         ? res
         : new Scalar.Scalar(res);
     node.range = coll.range;

package/node_modules/yaml/dist/compose/compose-doc.d.ts

@@ -1,6 +1,7 @@
 import type { Directives } from '../doc/directives.js';
 import { Document } from '../doc/Document.js';
+import type { ParsedNode } from '../nodes/Node.js';
 import type { DocumentOptions, ParseOptions, SchemaOptions } from '../options.js';
 import type * as CST from '../parse/cst.js';
 import type { ComposeErrorHandler } from './composer.js';
-export declare function composeDoc(options: ParseOptions & DocumentOptions & SchemaOptions, directives: Directives, { offset, start, value, end }: CST.Document, onError: ComposeErrorHandler): Document.Parsed<import("../index.js").ParsedNode>;
+export declare function composeDoc<Contents extends ParsedNode = ParsedNode, Strict extends boolean = true>(options: ParseOptions & DocumentOptions & SchemaOptions, directives: Directives, { offset, start, value, end }: CST.Document, onError: ComposeErrorHandler): Document.Parsed<Contents, Strict>;