projen 0.92.3 → 0.92.5

package/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);

package/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';
 

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

@@ -37,6 +37,7 @@ function addPairToJSMap(ctx, map, { key, value }) {
 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) {

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

@@ -3,8 +3,8 @@ import { nullTag } from './common/null.js';
 import { seq } from './common/seq.js';
 import { string } from './common/string.js';
 import { boolTag } from './core/bool.js';
-import { float, floatExp, floatNaN } from './core/float.js';
-import { int, intHex, intOct } from './core/int.js';
+import { floatNaN, floatExp, float } from './core/float.js';
+import { intOct, intHex, int } from './core/int.js';
 import { schema } from './core/schema.js';
 import { schema as schema$1 } from './json/schema.js';
 import { binary } from './yaml-1.1/binary.js';
@@ -13,7 +13,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 { timestamp, floatTime, intTime } from './yaml-1.1/timestamp.js';
+import { timestamp, intTime, floatTime } from './yaml-1.1/timestamp.js';
 
 const schemas = new Map([
     ['core', schema],

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

@@ -41,8 +41,7 @@ const binary = {
         else {
             throw new Error('This environment does not support writing binary tags; either Buffer or btoa is required');
         }
-        if (!type)
-            type = Scalar.BLOCK_LITERAL;
+        type ?? (type = Scalar.BLOCK_LITERAL);
         if (type !== Scalar.QUOTE_DOUBLE) {
             const lineWidth = Math.max(ctx.options.lineWidth - ctx.indent.length, ctx.options.minContentWidth);
             const n = Math.ceil(str.length / lineWidth);

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

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

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

@@ -68,7 +68,7 @@ function getTagObject(tags, item) {
         tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
     }
     if (!tagObj) {
-        const name = obj?.constructor?.name ?? typeof obj;
+        const name = obj?.constructor?.name ?? (obj === null ? 'null' : typeof obj);
         throw new Error(`Tag not resolved for ${name} value`);
     }
     return tagObj;
@@ -83,7 +83,7 @@ function stringifyProps(node, tagObj, { anchors, doc }) {
         anchors.add(anchor);
         props.push(`&${anchor}`);
     }
-    const tag = node.tag ? node.tag : tagObj.default ? null : tagObj.tag;
+    const tag = node.tag ?? (tagObj.default ? null : tagObj.tag);
     if (tag)
         props.push(doc.directives.tagString(tag));
     return props.join(' ');
@@ -109,8 +109,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
     const node = isNode(item)
         ? item
         : ctx.doc.createNode(item, { onTagObj: o => (tagObj = o) });
-    if (!tagObj)
-        tagObj = getTagObject(ctx.doc.schema.tags, node);
+    tagObj ?? (tagObj = getTagObject(ctx.doc.schema.tags, node));
     const props = stringifyProps(node, tagObj, ctx);
     if (props.length > 0)
         ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;

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

@@ -1,5 +1,5 @@
 import { Scalar } from '../nodes/Scalar.js';
-import { foldFlowLines, FOLD_QUOTED, FOLD_FLOW, FOLD_BLOCK } from './foldFlowLines.js';
+import { foldFlowLines, FOLD_FLOW, FOLD_QUOTED, FOLD_BLOCK } from './foldFlowLines.js';
 
 const getFoldOptions = (ctx, isBlock) => ({
     indentAtStart: isBlock ? ctx.indent.length : ctx.indentAtStart,
@@ -253,10 +253,9 @@ function plainString(item, ctx, onComment, onChompKeep) {
         (inFlow && /[[\]{},]/.test(value))) {
         return quotedString(value, ctx);
     }
-    if (!value ||
-        /^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
+    if (/^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
         // not allowed:
-        // - empty string, '-' or '?'
+        // - '-' or '?'
         // - start with an indicator character (except [?:-]) or /[?-] /
         // - '\n ', ': ' or ' \n' anywhere
         // - '#' not preceded by a non-space char

package/node_modules/yaml/dist/cli.d.ts

@@ -1,4 +1,4 @@
-export declare const help = "yaml: A command-line YAML processor and inspector\n\nReads stdin and writes output to stdout and errors & warnings to stderr.\n\nUsage:\n  yaml          Process a YAML stream, outputting it as YAML\n  yaml cst      Parse the CST of a YAML stream\n  yaml lex      Parse the lexical tokens of a YAML stream\n  yaml valid    Validate a YAML stream, returning 0 on success\n\nOptions:\n  --help, -h    Show this message.\n  --json, -j    Output JSON.\n  --indent 2    Output pretty-printed data, indented by the given number of spaces.\n\nAdditional options for bare \"yaml\" command:\n  --doc, -d     Output pretty-printed JS Document objects.\n  --single, -1  Require the input to consist of a single YAML document.\n  --strict, -s  Stop on errors.\n  --visit, -v   Apply a visitor to each document (requires a path to import)\n  --yaml 1.1    Set the YAML version. (default: 1.2)";
+export declare const help = "yaml: A command-line YAML processor and inspector\n\nReads stdin and writes output to stdout and errors & warnings to stderr.\n\nUsage:\n  yaml          Process a YAML stream, outputting it as YAML\n  yaml cst      Parse the CST of a YAML stream\n  yaml lex      Parse the lexical tokens of a YAML stream\n  yaml valid    Validate a YAML stream, returning 0 on success\n\nOptions:\n  --help, -h    Show this message.\n  --json, -j    Output JSON.\n  --indent 2    Output pretty-printed data, indented by the given number of spaces.\n  --merge, -m   Enable support for \"<<\" merge keys.\n\nAdditional options for bare \"yaml\" command:\n  --doc, -d     Output pretty-printed JS Document objects.\n  --single, -1  Require the input to consist of a single YAML document.\n  --strict, -s  Stop on errors.\n  --visit, -v   Apply a visitor to each document (requires a path to import)\n  --yaml 1.1    Set the YAML version. (default: 1.2)";
 export declare class UserError extends Error {
     static ARGS: number;
     static SINGLE: number;

package/node_modules/yaml/dist/cli.mjs

@@ -1,5 +1,5 @@
-import { resolve } from 'node:path';
-import { parseArgs } from 'node:util';
+import { resolve } from 'path';
+import { parseArgs } from 'util';
 import { prettyToken } from './parse/cst.js';
 import { Lexer } from './parse/lexer.js';
 import { Parser } from './parse/parser.js';
@@ -23,6 +23,7 @@ Options:
   --help, -h    Show this message.
   --json, -j    Output JSON.
   --indent 2    Output pretty-printed data, indented by the given number of spaces.
+  --merge, -m   Enable support for "<<" merge keys.
 
 Additional options for bare "yaml" command:
   --doc, -d     Output pretty-printed JS Document objects.
@@ -48,6 +49,7 @@ async function cli(stdin, done, argv) {
                 doc: { type: 'boolean', short: 'd' },
                 help: { type: 'boolean', short: 'h' },
                 indent: { type: 'string', short: 'i' },
+                merge: { type: 'boolean', short: 'm' },
                 json: { type: 'boolean', short: 'j' },
                 single: { type: 'boolean', short: '1' },
                 strict: { type: 'boolean', short: 's' },
@@ -117,7 +119,7 @@ async function cli(stdin, done, argv) {
             const lineCounter = new LineCounter();
             const parser = new Parser(lineCounter.addNewLine);
             // @ts-expect-error Version is validated at runtime
-            const composer = new Composer({ version: opt.yaml });
+            const composer = new Composer({ version: opt.yaml, merge: opt.merge });
             const visitor = opt.visit
                 ? (await import(resolve(opt.visit))).default
                 : null;

package/node_modules/yaml/dist/compose/composer.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var node_process = require('node:process');
+var node_process = require('process');
 var directives = require('../doc/directives.js');
 var Document = require('../doc/Document.js');
 var errors = require('../errors.js');

package/node_modules/yaml/dist/compose/resolve-props.js

@@ -74,8 +74,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
                 if (token.source.endsWith(':'))
                     onError(token.offset + token.source.length - 1, 'BAD_ALIAS', 'Anchor ending in : is ambiguous', true);
                 anchor = token;
-                if (start === null)
-                    start = token.offset;
+                start ?? (start = token.offset);
                 atNewline = false;
                 hasSpace = false;
                 reqSpace = true;
@@ -84,8 +83,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
                 if (tag)
                     onError(token, 'MULTIPLE_TAGS', 'A node can have at most one tag');
                 tag = token;
-                if (start === null)
-                    start = token.offset;
+                start ?? (start = token.offset);
                 atNewline = false;
                 hasSpace = false;
                 reqSpace = true;

package/node_modules/yaml/dist/compose/util-empty-scalar-position.js

@@ -2,8 +2,7 @@
 
 function emptyScalarPosition(offset, before, pos) {
     if (before) {
-        if (pos === null)
-            pos = before.length;
+        pos ?? (pos = before.length);
         for (let i = pos - 1; i >= 0; --i) {
             let st = before[i];
             switch (st.type) {

package/node_modules/yaml/dist/doc/anchors.js

@@ -41,8 +41,7 @@ function createNodeAnchors(doc, prefix) {
     return {
         onAnchor: (source) => {
             aliasObjects.push(source);
-            if (!prevAnchors)
-                prevAnchors = anchorNames(doc);
+            prevAnchors ?? (prevAnchors = anchorNames(doc));
             const anchor = findNewAnchor(prefix, prevAnchors);
             prevAnchors.add(anchor);
             return anchor;

package/node_modules/yaml/dist/doc/createNode.js

@@ -40,8 +40,7 @@ function createNode(value, tagName, ctx) {
     if (aliasDuplicateObjects && value && typeof value === 'object') {
         ref = sourceObjects.get(value);
         if (ref) {
-            if (!ref.anchor)
-                ref.anchor = onAnchor(value);
+            ref.anchor ?? (ref.anchor = onAnchor(value));
             return new Alias.Alias(ref.anchor);
         }
         else {

package/node_modules/yaml/dist/log.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var node_process = require('node:process');
+var node_process = require('process');
 
 function debug(logLevel, ...messages) {
     if (logLevel === 'debug')

package/node_modules/yaml/dist/nodes/Alias.d.ts

@@ -23,7 +23,7 @@ export declare 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: Document): Scalar | YAMLMap | YAMLSeq | undefined;
+    resolve(doc: Document, ctx?: ToJSContext): Scalar | YAMLMap | YAMLSeq | undefined;
     toJSON(_arg?: unknown, ctx?: ToJSContext): unknown;
     toString(ctx?: StringifyContext, _onComment?: () => void, _onChompKeep?: () => void): string;
 }

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

@@ -20,23 +20,36 @@ class Alias extends Node.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.visit(doc, {
+                Node: (_key, node) => {
+                    if (identity.isAlias(node) || identity.hasAnchor(node))
+                        nodes.push(node);
+                }
+            });
+            if (ctx)
+                ctx.aliasResolveCache = nodes;
+        }
         let found = undefined;
-        visit.visit(doc, {
-            Node: (_key, node) => {
-                if (node === this)
-                    return visit.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);

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

@@ -39,6 +39,7 @@ function addPairToJSMap(ctx, map, { key, value }) {
 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 (identity.isNode(key) && ctx?.doc) {

package/node_modules/yaml/dist/nodes/toJS.d.ts

@@ -7,6 +7,8 @@ export interface AnchorData {
 }
 export interface ToJSContext {
     anchors: Map<Node, AnchorData>;
+    /** Cached anchor and alias nodes in the order they occur in the document */
+    aliasResolveCache?: Node[];
     doc: Document<Node, boolean>;
     keep: boolean;
     mapAsMap: boolean;

package/node_modules/yaml/dist/parse/parser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var node_process = require('node:process');
+var node_process = require('process');
 var cst = require('./cst.js');
 var lexer = require('./lexer.js');
 

package/node_modules/yaml/dist/schema/yaml-1.1/binary.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var node_buffer = require('node:buffer');
+var node_buffer = require('buffer');
 var Scalar = require('../../nodes/Scalar.js');
 var stringifyString = require('../../stringify/stringifyString.js');
 
@@ -53,8 +53,7 @@ const binary = {
         else {
             throw new Error('This environment does not support writing binary tags; either Buffer or btoa is required');
         }
-        if (!type)
-            type = Scalar.Scalar.BLOCK_LITERAL;
+        type ?? (type = Scalar.Scalar.BLOCK_LITERAL);
         if (type !== Scalar.Scalar.QUOTE_DOUBLE) {
             const lineWidth = Math.max(ctx.options.lineWidth - ctx.indent.length, ctx.options.minContentWidth);
             const n = Math.ceil(str.length / lineWidth);

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

@@ -70,7 +70,7 @@ function getTagObject(tags, item) {
         tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
     }
     if (!tagObj) {
-        const name = obj?.constructor?.name ?? typeof obj;
+        const name = obj?.constructor?.name ?? (obj === null ? 'null' : typeof obj);
         throw new Error(`Tag not resolved for ${name} value`);
     }
     return tagObj;
@@ -85,7 +85,7 @@ function stringifyProps(node, tagObj, { anchors: anchors$1, doc }) {
         anchors$1.add(anchor);
         props.push(`&${anchor}`);
     }
-    const tag = node.tag ? node.tag : tagObj.default ? null : tagObj.tag;
+    const tag = node.tag ?? (tagObj.default ? null : tagObj.tag);
     if (tag)
         props.push(doc.directives.tagString(tag));
     return props.join(' ');
@@ -111,8 +111,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
     const node = identity.isNode(item)
         ? item
         : ctx.doc.createNode(item, { onTagObj: o => (tagObj = o) });
-    if (!tagObj)
-        tagObj = getTagObject(ctx.doc.schema.tags, node);
+    tagObj ?? (tagObj = getTagObject(ctx.doc.schema.tags, node));
     const props = stringifyProps(node, tagObj, ctx);
     if (props.length > 0)
         ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;

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

@@ -255,10 +255,9 @@ function plainString(item, ctx, onComment, onChompKeep) {
         (inFlow && /[[\]{},]/.test(value))) {
         return quotedString(value, ctx);
     }
-    if (!value ||
-        /^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
+    if (/^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
         // not allowed:
-        // - empty string, '-' or '?'
+        // - '-' or '?'
         // - start with an indicator character (except [?:-]) or /[?-] /
         // - '\n ', ': ' or ' \n' anywhere
         // - '#' not preceded by a non-space char

package/node_modules/yaml/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -91,6 +91,6 @@
     "typescript-eslint": "^8.4.0"
   },
   "engines": {
-    "node": ">= 14"
+    "node": ">= 14.6"
   }
 }

package/package.json

@@ -95,7 +95,7 @@
     "glob": "^8",
     "ini": "^2.0.0",
     "parse-conflict-json": "^4.0.0",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "shx": "^0.4.0",
     "xmlbuilder2": "^3.1.1",
     "yaml": "^2.2.2",
@@ -133,7 +133,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.92.3",
+  "version": "0.92.5",
   "jest": {
     "coverageProvider": "v8",
     "coverageReporters": [