cdk8s 2.69.7 → 2.69.9

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

@@ -46,7 +46,7 @@
     "organization": false
   },
   "devDependencies": {
-    "@cdk8s/projen-common": "^0.0.549",
+    "@cdk8s/projen-common": "^0.0.551",
     "@types/follow-redirects": "^1.14.4",
     "@types/jest": "^27",
     "@types/node": "16.18.78",
@@ -61,12 +61,12 @@
     "jest": "^27",
     "jest-junit": "^15",
     "jsii": "^5",
-    "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",
     "json-schema-to-typescript": "^10.1.5",
-    "projen": "^0.88.1",
+    "projen": "^0.88.3",
     "ts-jest": "^27",
     "typescript": "~5.6.3"
   },
@@ -76,7 +76,7 @@
   "dependencies": {
     "fast-json-patch": "^3.1.1",
     "follow-redirects": "^1.15.9",
-    "yaml": "2.5.1"
+    "yaml": "2.6.0"
   },
   "bundledDependencies": [
     "fast-json-patch",
@@ -105,7 +105,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.69.7",
+  "version": "2.69.9",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [