projen 0.88.2 → 0.88.3

package/node_modules/yaml/dist/compose/util-map-includes.js

@@ -8,11 +8,7 @@ function mapIncludes(ctx, items, search) {
         return false;
     const isEqual = typeof uniqueKeys === 'function'
         ? uniqueKeys
-        : (a, b) => a === b ||
-            (identity.isScalar(a) &&
-                identity.isScalar(b) &&
-                a.value === b.value &&
-                !(a.value === '<<' && ctx.schema.merge));
+        : (a, b) => a === b || (identity.isScalar(a) && identity.isScalar(b) && a.value === b.value);
     return items.some(pair => isEqual(pair.key, search));
 }
 

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

@@ -37,6 +37,7 @@ class Document {
             logLevel: 'warn',
             prettyErrors: true,
             strict: true,
+            stringKeys: false,
             uniqueKeys: true,
             version: '1.2'
         }, options);
@@ -260,7 +261,7 @@ class Document {
                     this.directives.yaml.version = '1.1';
                 else
                     this.directives = new directives.Directives({ version: '1.1' });
-                opt = { merge: true, resolveKnownTags: false, schema: 'yaml-1.1' };
+                opt = { resolveKnownTags: false, schema: 'yaml-1.1' };
                 break;
             case '1.2':
             case 'next':
@@ -268,7 +269,7 @@ class Document {
                     this.directives.yaml.version = version;
                 else
                     this.directives = new directives.Directives({ version });
-                opt = { merge: false, resolveKnownTags: true, schema: 'core' };
+                opt = { resolveKnownTags: true, schema: 'core' };
                 break;
             case null:
                 if (this.directives)

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

@@ -1,5 +1,5 @@
 import type { LineCounter } from './parse/line-counter';
-export type ErrorCode = 'ALIAS_PROPS' | 'BAD_ALIAS' | 'BAD_DIRECTIVE' | 'BAD_DQ_ESCAPE' | 'BAD_INDENT' | 'BAD_PROP_ORDER' | 'BAD_SCALAR_START' | 'BLOCK_AS_IMPLICIT_KEY' | 'BLOCK_IN_FLOW' | 'DUPLICATE_KEY' | 'IMPOSSIBLE' | 'KEY_OVER_1024_CHARS' | 'MISSING_CHAR' | 'MULTILINE_IMPLICIT_KEY' | 'MULTIPLE_ANCHORS' | 'MULTIPLE_DOCS' | 'MULTIPLE_TAGS' | 'TAB_AS_INDENT' | 'TAG_RESOLVE_FAILED' | 'UNEXPECTED_TOKEN' | 'BAD_COLLECTION_TYPE';
+export type ErrorCode = 'ALIAS_PROPS' | 'BAD_ALIAS' | 'BAD_DIRECTIVE' | 'BAD_DQ_ESCAPE' | 'BAD_INDENT' | 'BAD_PROP_ORDER' | 'BAD_SCALAR_START' | 'BLOCK_AS_IMPLICIT_KEY' | 'BLOCK_IN_FLOW' | 'DUPLICATE_KEY' | 'IMPOSSIBLE' | 'KEY_OVER_1024_CHARS' | 'MISSING_CHAR' | 'MULTILINE_IMPLICIT_KEY' | 'MULTIPLE_ANCHORS' | 'MULTIPLE_DOCS' | 'MULTIPLE_TAGS' | 'NON_STRING_KEY' | 'TAB_AS_INDENT' | 'TAG_RESOLVE_FAILED' | 'UNEXPECTED_TOKEN' | 'BAD_COLLECTION_TYPE';
 export type LinePos = {
     line: number;
     col: number;

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

@@ -5,7 +5,8 @@ import type { StringifyContext } from '../stringify/stringify.js';
 import type { Alias } from './Alias.js';
 import { NODE_TYPE } from './identity.js';
 import type { Scalar } from './Scalar.js';
-import type { YAMLMap } from './YAMLMap.js';
+import { ToJSContext } from './toJS.js';
+import type { MapLike, YAMLMap } from './YAMLMap.js';
 import type { YAMLSeq } from './YAMLSeq.js';
 export type Node<T = unknown> = Alias | Scalar<T> | YAMLMap<unknown, T> | YAMLSeq<T>;
 /** Utility type mapper */
@@ -36,6 +37,11 @@ export declare abstract class NodeBase {
     srcToken?: Token;
     /** A fully qualified tag, if required */
     tag?: string;
+    /**
+     * Customize the way that a key-value pair is resolved.
+     * Used for YAML 1.1 !!merge << handling.
+     */
+    addToJSMap?: (ctx: ToJSContext | undefined, map: MapLike, value: unknown) => void;
     /** A plain JS representation of this node */
     abstract toJSON(): any;
     abstract toString(ctx?: StringifyContext, onComment?: () => void, onChompKeep?: () => void): string;

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

@@ -1,24 +1,17 @@
 'use strict';
 
 var log = require('../log.js');
+var merge = require('../schema/yaml-1.1/merge.js');
 var stringify = require('../stringify/stringify.js');
 var identity = require('./identity.js');
-var Scalar = require('./Scalar.js');
 var toJS = require('./toJS.js');
 
-const MERGE_KEY = '<<';
 function addPairToJSMap(ctx, map, { key, value }) {
-    if (ctx?.doc.schema.merge && isMergeKey(key)) {
-        value = identity.isAlias(value) ? value.resolve(ctx.doc) : value;
-        if (identity.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 (identity.isNode(key) && key.addToJSMap)
+        key.addToJSMap(ctx, map, value);
+    // TODO: Should drop this special case for bare << handling
+    else if (merge.isMergeKey(ctx, key))
+        merge.addMergeToJSMap(ctx, map, value);
     else {
         const jsKey = toJS.toJS(key, '', ctx);
         if (map instanceof Map) {
@@ -43,41 +36,6 @@ function addPairToJSMap(ctx, map, { key, value }) {
     }
     return map;
 }
-const isMergeKey = (key) => key === MERGE_KEY ||
-    (identity.isScalar(key) &&
-        key.value === MERGE_KEY &&
-        (!key.type || key.type === Scalar.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 && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
-    if (!identity.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 '';

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

@@ -42,6 +42,12 @@ export type ParseOptions = {
      * Default: `true`
      */
     strict?: boolean;
+    /**
+     * Parse all mapping keys as strings. Treat all non-scalar keys as errors.
+     *
+     * Default: `false`
+     */
+    stringKeys?: boolean;
     /**
      * YAML requires map keys to be unique. By default, this is checked by
      * comparing scalar values with `===`; deep equality is not checked for

package/node_modules/yaml/dist/parse/lexer.d.ts

@@ -59,7 +59,7 @@ export declare class Lexer {
      *
      * @returns A generator of lexical tokens
      */
-    lex(source: string, incomplete?: boolean): Generator<string, void, unknown>;
+    lex(source: string, incomplete?: boolean): Generator<string, void, any>;
     private atLineEnd;
     private charAt;
     private continueScalar;

package/node_modules/yaml/dist/parse/parser.d.ts

@@ -57,14 +57,14 @@ export declare class Parser {
      *
      * @returns A generator of tokens representing each directive, document, and other structure.
      */
-    parse(source: string, incomplete?: boolean): Generator<Token, void, unknown>;
+    parse(source: string, incomplete?: boolean): Generator<Token, void, any>;
     /**
      * Advance the parser by the `source` of one lexical token.
      */
-    next(source: string): Generator<Token, void, unknown>;
+    next(source: string): Generator<Token, void, any>;
     private lexer;
     /** Call at end of input to push out any remaining constructions */
-    end(): Generator<Token, void, unknown>;
+    end(): Generator<Token, void, any>;
     private get sourceToken();
     private step;
     private peek;

package/node_modules/yaml/dist/public-api.js

@@ -4,6 +4,7 @@ var composer = require('./compose/composer.js');
 var Document = require('./doc/Document.js');
 var errors = require('./errors.js');
 var log = require('./log.js');
+var identity = require('./nodes/identity.js');
 var lineCounter = require('./parse/line-counter.js');
 var parser = require('./parse/parser.js');
 
@@ -95,6 +96,8 @@ function stringify(value, replacer, options) {
         if (!keepUndefined)
             return undefined;
     }
+    if (identity.isDocument(value) && !_replacer)
+        return value.toString(options);
     return new Document.Document(value, _replacer, options).toString(options);
 }
 

package/node_modules/yaml/dist/schema/Schema.d.ts

@@ -5,7 +5,6 @@ import type { CollectionTag, ScalarTag } from './types.js';
 export declare class Schema {
     compat: Array<CollectionTag | ScalarTag> | null;
     knownTags: Record<string, CollectionTag | ScalarTag>;
-    merge: boolean;
     name: string;
     sortMapEntries: ((a: Pair, b: Pair) => number) | null;
     tags: Array<CollectionTag | ScalarTag>;

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

@@ -14,10 +14,9 @@ class Schema {
             : compat
                 ? tags.getTags(null, compat)
                 : null;
-        this.merge = !!merge;
         this.name = (typeof schema === 'string' && schema) || 'core';
         this.knownTags = resolveKnownTags ? tags.coreKnownTags : {};
-        this.tags = tags.getTags(customTags, this.name);
+        this.tags = tags.getTags(customTags, this.name, merge);
         this.toStringOptions = toStringDefaults ?? null;
         Object.defineProperty(this, identity.MAP, { value: map.map });
         Object.defineProperty(this, identity.SCALAR, { value: string.string });

package/node_modules/yaml/dist/schema/tags.d.ts

@@ -14,6 +14,10 @@ declare const tagsByName: {
     intOct: ScalarTag;
     intTime: ScalarTag;
     map: CollectionTag;
+    merge: ScalarTag & {
+        identify(value: unknown): boolean;
+        test: RegExp;
+    };
     null: ScalarTag & {
         test: RegExp;
     };
@@ -29,6 +33,10 @@ export type TagId = keyof typeof tagsByName;
 export type Tags = Array<ScalarTag | CollectionTag | TagId>;
 export declare const coreKnownTags: {
     'tag:yaml.org,2002:binary': ScalarTag;
+    'tag:yaml.org,2002:merge': ScalarTag & {
+        identify(value: unknown): boolean;
+        test: RegExp;
+    };
     'tag:yaml.org,2002:omap': CollectionTag;
     'tag:yaml.org,2002:pairs': CollectionTag;
     'tag:yaml.org,2002:set': CollectionTag;
@@ -36,5 +44,5 @@ export declare const coreKnownTags: {
         test: RegExp;
     };
 };
-export declare function getTags(customTags: SchemaOptions['customTags'] | undefined, schemaName: string): (CollectionTag | ScalarTag)[];
+export declare function getTags(customTags: SchemaOptions['customTags'] | undefined, schemaName: string, addMergeTag?: boolean): (CollectionTag | ScalarTag)[];
 export {};

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

@@ -10,6 +10,7 @@ var int = require('./core/int.js');
 var schema = require('./core/schema.js');
 var schema$1 = require('./json/schema.js');
 var binary = require('./yaml-1.1/binary.js');
+var merge = require('./yaml-1.1/merge.js');
 var omap = require('./yaml-1.1/omap.js');
 var pairs = require('./yaml-1.1/pairs.js');
 var schema$2 = require('./yaml-1.1/schema.js');
@@ -35,6 +36,7 @@ const tagsByName = {
     intOct: int.intOct,
     intTime: timestamp.intTime,
     map: map.map,
+    merge: merge.merge,
     null: _null.nullTag,
     omap: omap.omap,
     pairs: pairs.pairs,
@@ -44,13 +46,20 @@ const tagsByName = {
 };
 const coreKnownTags = {
     'tag:yaml.org,2002:binary': binary.binary,
+    'tag:yaml.org,2002:merge': merge.merge,
     'tag:yaml.org,2002:omap': omap.omap,
     'tag:yaml.org,2002:pairs': pairs.pairs,
     'tag:yaml.org,2002:set': set.set,
     'tag:yaml.org,2002:timestamp': 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.merge)
+            ? schemaTags.concat(merge.merge)
+            : schemaTags.slice();
+    }
+    let tags = schemaTags;
     if (!tags) {
         if (Array.isArray(customTags))
             tags = [];
@@ -69,17 +78,21 @@ 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.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;
+    }, []);
 }
 
 exports.coreKnownTags = coreKnownTags;

package/node_modules/yaml/dist/schema/types.d.ts

@@ -12,11 +12,13 @@ interface TagBase {
      */
     createNode?: (schema: Schema, value: unknown, ctx: CreateNodeContext) => Node;
     /**
-     * If `true`, together with `test` allows for values to be stringified without
-     * an explicit tag. For most cases, it's unlikely that you'll actually want to
-     * use this, even if you first think you do.
+     * If `true`, allows for values to be stringified without
+     * an explicit tag together with `test`.
+     * If `'key'`, this only applies if the value is used as a mapping key.
+     * For most cases, it's unlikely that you'll actually want to use this,
+     * even if you first think you do.
      */
-    default?: boolean;
+    default?: boolean | 'key';
     /**
      * If a tag has multiple forms that should be parsed and/or stringified
      * differently, use `format` to identify them.

package/node_modules/yaml/dist/schema/yaml-1.1/merge.d.ts

@@ -0,0 +1,9 @@
+import type { ToJSContext } from '../../nodes/toJS.js';
+import type { MapLike } from '../../nodes/YAMLMap.js';
+import type { ScalarTag } from '../types.js';
+export declare const merge: ScalarTag & {
+    identify(value: unknown): boolean;
+    test: RegExp;
+};
+export declare const isMergeKey: (ctx: ToJSContext | undefined, key: unknown) => boolean | undefined;
+export declare function addMergeToJSMap(ctx: ToJSContext | undefined, map: MapLike, value: unknown): void;

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

@@ -0,0 +1,68 @@
+'use strict';
+
+var identity = require('../../nodes/identity.js');
+var Scalar = require('../../nodes/Scalar.js');
+
+// 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.Scalar(Symbol(MERGE_KEY)), {
+        addToJSMap: addMergeToJSMap
+    }),
+    stringify: () => MERGE_KEY
+};
+const isMergeKey = (ctx, key) => (merge.identify(key) ||
+    (identity.isScalar(key) &&
+        (!key.type || key.type === Scalar.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 && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
+    if (identity.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 && identity.isAlias(value) ? value.resolve(ctx.doc) : value;
+    if (!identity.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;
+}
+
+exports.addMergeToJSMap = addMergeToJSMap;
+exports.isMergeKey = isMergeKey;
+exports.merge = merge;

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

@@ -8,6 +8,7 @@ var binary = require('./binary.js');
 var bool = require('./bool.js');
 var float = require('./float.js');
 var int = require('./int.js');
+var merge = require('./merge.js');
 var omap = require('./omap.js');
 var pairs = require('./pairs.js');
 var set = require('./set.js');
@@ -28,6 +29,7 @@ const schema = [
     float.floatExp,
     float.float,
     binary.binary,
+    merge.merge,
     omap.omap,
     pairs.pairs,
     set.set,

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

@@ -56,7 +56,12 @@ function getTagObject(tags, item) {
     let obj;
     if (identity.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);
     }

package/node_modules/yaml/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",

package/package.json

@@ -69,9 +69,9 @@
     "jest": "^29",
     "jest-junit": "^15",
     "jsii": "5.5.x",
-    "jsii-diff": "^1.103.1",
+    "jsii-diff": "^1.104.0",
     "jsii-docgen": "^10.5.0",
-    "jsii-pacmak": "^1.103.1",
+    "jsii-pacmak": "^1.104.0",
     "jsii-rosetta": "5.5.x",
     "license-checker": "^25.0.1",
     "markmac": "^0.1.146",
@@ -130,7 +130,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.88.2",
+  "version": "0.88.3",
   "jest": {
     "coverageProvider": "v8",
     "coverageReporters": [