@google/gemini-cli 0.3.2 → 0.4.0-preview

package/dist/src/ui/utils/highlight.test.js

@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { parseInputForHighlighting } from './highlight.js';
+describe('parseInputForHighlighting', () => {
+    it('should handle an empty string', () => {
+        expect(parseInputForHighlighting('')).toEqual([
+            { text: '', type: 'default' },
+        ]);
+    });
+    it('should handle text with no commands or files', () => {
+        const text = 'this is a normal sentence';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text, type: 'default' },
+        ]);
+    });
+    it('should highlight a single command at the beginning', () => {
+        const text = '/help me';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: '/help', type: 'command' },
+            { text: ' me', type: 'default' },
+        ]);
+    });
+    it('should highlight a single file path at the beginning', () => {
+        const text = '@path/to/file.txt please';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: '@path/to/file.txt', type: 'file' },
+            { text: ' please', type: 'default' },
+        ]);
+    });
+    it('should highlight a command in the middle', () => {
+        const text = 'I need /help with this';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: 'I need ', type: 'default' },
+            { text: '/help', type: 'command' },
+            { text: ' with this', type: 'default' },
+        ]);
+    });
+    it('should highlight a file path in the middle', () => {
+        const text = 'Please check @path/to/file.txt for details';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: 'Please check ', type: 'default' },
+            { text: '@path/to/file.txt', type: 'file' },
+            { text: ' for details', type: 'default' },
+        ]);
+    });
+    it('should highlight multiple commands and files', () => {
+        const text = 'Use /run with @file.js and also /format @another/file.ts';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: 'Use ', type: 'default' },
+            { text: '/run', type: 'command' },
+            { text: ' with ', type: 'default' },
+            { text: '@file.js', type: 'file' },
+            { text: ' and also ', type: 'default' },
+            { text: '/format', type: 'command' },
+            { text: ' ', type: 'default' },
+            { text: '@another/file.ts', type: 'file' },
+        ]);
+    });
+    it('should handle adjacent highlights', () => {
+        const text = '/run@file.js';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: '/run', type: 'command' },
+            { text: '@file.js', type: 'file' },
+        ]);
+    });
+    it('should handle highlights at the end of the string', () => {
+        const text = 'Get help with /help';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: 'Get help with ', type: 'default' },
+            { text: '/help', type: 'command' },
+        ]);
+    });
+    it('should handle file paths with dots and dashes', () => {
+        const text = 'Check @./path-to/file-name.v2.txt';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: 'Check ', type: 'default' },
+            { text: '@./path-to/file-name.v2.txt', type: 'file' },
+        ]);
+    });
+    it('should handle commands with dashes and numbers', () => {
+        const text = 'Run /command-123 now';
+        expect(parseInputForHighlighting(text)).toEqual([
+            { text: 'Run ', type: 'default' },
+            { text: '/command-123', type: 'command' },
+            { text: ' now', type: 'default' },
+        ]);
+    });
+});
+//# sourceMappingURL=highlight.test.js.map

package/dist/src/ui/utils/highlight.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlight.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/highlight.test.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/utils/platformConstants.d.ts

@@ -21,6 +21,29 @@ export declare const KITTY_KEYCODE_ENTER = 13;
 export declare const KITTY_KEYCODE_NUMPAD_ENTER = 57414;
 export declare const KITTY_KEYCODE_TAB = 9;
 export declare const KITTY_KEYCODE_BACKSPACE = 127;
+/**
+ * Kitty modifier decoding constants
+ *
+ * In Kitty/Ghostty, the modifier parameter is encoded as (1 + bitmask).
+ * Some terminals also set bit 7 (i.e., add 128) when reporting event types.
+ */
+export declare const KITTY_MODIFIER_BASE = 1;
+export declare const KITTY_MODIFIER_EVENT_TYPES_OFFSET = 128;
+/**
+ * Modifier bit flags for Kitty/Xterm-style parameters.
+ *
+ * Per spec, the modifiers parameter encodes (1 + bitmask) where:
+ * - 1: no modifiers
+ * - bit 0 (1): Shift
+ * - bit 1 (2): Alt/Option (reported as "alt" in spec; we map to meta)
+ * - bit 2 (4): Ctrl
+ *
+ * Some terminals add 128 to the entire modifiers field when reporting event types.
+ * See: https://sw.kovidgoyal.net/kitty/keyboard-protocol/#modifiers
+ */
+export declare const MODIFIER_SHIFT_BIT = 1;
+export declare const MODIFIER_ALT_BIT = 2;
+export declare const MODIFIER_CTRL_BIT = 4;
 /**
  * Timing constants for terminal interactions
  */
@@ -42,7 +65,7 @@ export declare const BACKSLASH_ENTER_DETECTION_WINDOW_MS = 5;
  * Longest reasonable: \x1b[127;15~ = 11 chars (Del with all modifiers)
  * We use 12 to provide a small buffer.
  */
-export declare const MAX_KITTY_SEQUENCE_LENGTH = 12;
+export declare const MAX_KITTY_SEQUENCE_LENGTH = 32;
 /**
  * Character codes for common escape sequences
  */

package/dist/src/ui/utils/platformConstants.js

@@ -21,6 +21,29 @@ export const KITTY_KEYCODE_ENTER = 13;
 export const KITTY_KEYCODE_NUMPAD_ENTER = 57414;
 export const KITTY_KEYCODE_TAB = 9;
 export const KITTY_KEYCODE_BACKSPACE = 127;
+/**
+ * Kitty modifier decoding constants
+ *
+ * In Kitty/Ghostty, the modifier parameter is encoded as (1 + bitmask).
+ * Some terminals also set bit 7 (i.e., add 128) when reporting event types.
+ */
+export const KITTY_MODIFIER_BASE = 1; // Base value per spec before bitmask decode
+export const KITTY_MODIFIER_EVENT_TYPES_OFFSET = 128; // Added when event types are included
+/**
+ * Modifier bit flags for Kitty/Xterm-style parameters.
+ *
+ * Per spec, the modifiers parameter encodes (1 + bitmask) where:
+ * - 1: no modifiers
+ * - bit 0 (1): Shift
+ * - bit 1 (2): Alt/Option (reported as "alt" in spec; we map to meta)
+ * - bit 2 (4): Ctrl
+ *
+ * Some terminals add 128 to the entire modifiers field when reporting event types.
+ * See: https://sw.kovidgoyal.net/kitty/keyboard-protocol/#modifiers
+ */
+export const MODIFIER_SHIFT_BIT = 1;
+export const MODIFIER_ALT_BIT = 2;
+export const MODIFIER_CTRL_BIT = 4;
 /**
  * Timing constants for terminal interactions
  */
@@ -42,7 +65,9 @@ export const BACKSLASH_ENTER_DETECTION_WINDOW_MS = 5;
  * Longest reasonable: \x1b[127;15~ = 11 chars (Del with all modifiers)
  * We use 12 to provide a small buffer.
  */
-export const MAX_KITTY_SEQUENCE_LENGTH = 12;
+// Increased to accommodate parameterized forms and occasional colon subfields
+// while still being small enough to avoid pathological buffering.
+export const MAX_KITTY_SEQUENCE_LENGTH = 32;
 /**
  * Character codes for common escape sequences
  */

package/dist/src/ui/utils/platformConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"platformConstants.js","sourceRoot":"","sources":["../../../../src/ui/utils/platformConstants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC;AAErC;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AACtC,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAChD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAE3C;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAQ,CAAC;AAEpD;;;;GAIG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAE5C;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,EAAE,CAAC;AAChC,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AACzC,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC9B,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC"}
+{"version":3,"file":"platformConstants.js","sourceRoot":"","sources":["../../../../src/ui/utils/platformConstants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC;AAErC;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AACtC,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAChD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,CAAC,4CAA4C;AAClF,MAAM,CAAC,MAAM,iCAAiC,GAAG,GAAG,CAAC,CAAC,sCAAsC;AAE5F;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAClC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,QAAQ,CAAC;AAEpD;;;;GAIG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAAC,CAAC;AAErD;;;;;;GAMG;AACH,8EAA8E;AAC9E,kEAAkE;AAClE,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAE5C;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,EAAE,CAAC;AAChC,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AACzC,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC9B,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC"}

package/dist/src/utils/deepMerge.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { MergeStrategy } from '../config/settingsSchema.js';
+type Mergeable = string | number | boolean | null | undefined | object | Mergeable[];
+type MergeableObject = Record<string, Mergeable>;
+export declare function customDeepMerge(getMergeStrategyForPath: (path: string[]) => MergeStrategy | undefined, ...sources: MergeableObject[]): MergeableObject;
+export {};

package/dist/src/utils/deepMerge.js

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { MergeStrategy } from '../config/settingsSchema.js';
+function isPlainObject(item) {
+    return !!item && typeof item === 'object' && !Array.isArray(item);
+}
+function mergeRecursively(target, source, getMergeStrategyForPath, path = []) {
+    for (const key of Object.keys(source)) {
+        if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+            continue;
+        }
+        const newPath = [...path, key];
+        const srcValue = source[key];
+        const objValue = target[key];
+        const mergeStrategy = getMergeStrategyForPath(newPath);
+        if (mergeStrategy === MergeStrategy.SHALLOW_MERGE && objValue && srcValue) {
+            const obj1 = typeof objValue === 'object' && objValue !== null ? objValue : {};
+            const obj2 = typeof srcValue === 'object' && srcValue !== null ? srcValue : {};
+            target[key] = { ...obj1, ...obj2 };
+            continue;
+        }
+        if (Array.isArray(objValue)) {
+            const srcArray = Array.isArray(srcValue) ? srcValue : [srcValue];
+            if (mergeStrategy === MergeStrategy.CONCAT) {
+                target[key] = objValue.concat(srcArray);
+                continue;
+            }
+            if (mergeStrategy === MergeStrategy.UNION) {
+                target[key] = [...new Set(objValue.concat(srcArray))];
+                continue;
+            }
+        }
+        if (isPlainObject(objValue) && isPlainObject(srcValue)) {
+            mergeRecursively(objValue, srcValue, getMergeStrategyForPath, newPath);
+        }
+        else if (isPlainObject(srcValue)) {
+            target[key] = {};
+            mergeRecursively(target[key], srcValue, getMergeStrategyForPath, newPath);
+        }
+        else {
+            target[key] = srcValue;
+        }
+    }
+    return target;
+}
+export function customDeepMerge(getMergeStrategyForPath, ...sources) {
+    const result = {};
+    for (const source of sources) {
+        if (source) {
+            mergeRecursively(result, source, getMergeStrategyForPath);
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=deepMerge.js.map

package/dist/src/utils/deepMerge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deepMerge.js","sourceRoot":"","sources":["../../../src/utils/deepMerge.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAa5D,SAAS,aAAa,CAAC,IAAa;IAClC,OAAO,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAuB,EACvB,MAAuB,EACvB,uBAAsE,EACtE,OAAiB,EAAE;IAEnB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACxE,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,aAAa,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAEvD,IAAI,aAAa,KAAK,aAAa,CAAC,aAAa,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;YAC1E,MAAM,IAAI,GACR,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,GACR,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;YACnC,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACjE,IAAI,aAAa,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACxC,SAAS;YACX,CAAC;YACD,IAAI,aAAa,KAAK,aAAa,CAAC,KAAK,EAAE,CAAC;gBAC1C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACtD,SAAS;YACX,CAAC;QACH,CAAC;QAED,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvD,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;QACzE,CAAC;aAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACjB,gBAAgB,CACd,MAAM,CAAC,GAAG,CAAoB,EAC9B,QAAQ,EACR,uBAAuB,EACvB,OAAO,CACR,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,uBAAsE,EACtE,GAAG,OAA0B;IAE7B,MAAM,MAAM,GAAoB,EAAE,CAAC;IAEnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,EAAE,CAAC;YACX,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,uBAAuB,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/src/utils/deepMerge.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/deepMerge.test.js

@@ -0,0 +1,143 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { customDeepMerge } from './deepMerge.js';
+import { MergeStrategy } from '../config/settingsSchema.js';
+describe('customDeepMerge', () => {
+    it('should merge simple objects', () => {
+        const target = { a: 1, b: 2 };
+        const source = { b: 3, c: 4 };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: 1, b: 3, c: 4 });
+    });
+    it('should merge nested objects', () => {
+        const target = { a: { x: 1 }, b: 2 };
+        const source = { a: { y: 2 }, c: 3 };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: { x: 1, y: 2 }, b: 2, c: 3 });
+    });
+    it('should replace arrays by default', () => {
+        const target = { a: [1, 2] };
+        const source = { a: [3, 4] };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: [3, 4] });
+    });
+    it('should concatenate arrays with CONCAT strategy', () => {
+        const target = { a: [1, 2] };
+        const source = { a: [3, 4] };
+        const getMergeStrategy = (path) => path.join('.') === 'a' ? MergeStrategy.CONCAT : undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: [1, 2, 3, 4] });
+    });
+    it('should union arrays with UNION strategy', () => {
+        const target = { a: [1, 2, 3] };
+        const source = { a: [3, 4, 5] };
+        const getMergeStrategy = (path) => path.join('.') === 'a' ? MergeStrategy.UNION : undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: [1, 2, 3, 4, 5] });
+    });
+    it('should shallow merge objects with SHALLOW_MERGE strategy', () => {
+        const target = { a: { x: 1, y: 1 } };
+        const source = { a: { y: 2, z: 2 } };
+        const getMergeStrategy = (path) => path.join('.') === 'a' ? MergeStrategy.SHALLOW_MERGE : undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        // This is still a deep merge, but the properties of the object are merged.
+        expect(result).toEqual({ a: { x: 1, y: 2, z: 2 } });
+    });
+    it('should handle multiple source objects', () => {
+        const target = { a: 1 };
+        const source1 = { b: 2 };
+        const source2 = { c: 3 };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source1, source2);
+        expect(result).toEqual({ a: 1, b: 2, c: 3 });
+    });
+    it('should return an empty object if no sources are provided', () => {
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy);
+        expect(result).toEqual({});
+    });
+    it('should return a deep copy of the first source if only one is provided', () => {
+        const target = { a: { b: 1 } };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target);
+        expect(result).toEqual(target);
+        expect(result).not.toBe(target);
+    });
+    it('should not mutate the original source objects', () => {
+        const target = { a: { x: 1 }, b: [1, 2] };
+        const source = { a: { y: 2 }, b: [3, 4] };
+        const originalTarget = JSON.parse(JSON.stringify(target));
+        const originalSource = JSON.parse(JSON.stringify(source));
+        const getMergeStrategy = () => undefined;
+        customDeepMerge(getMergeStrategy, target, source);
+        expect(target).toEqual(originalTarget);
+        expect(source).toEqual(originalSource);
+    });
+    it('should not mutate sources when merging multiple levels deep', () => {
+        const s1 = { data: { common: { val: 'from s1' }, s1_only: true } };
+        const s2 = { data: { common: { val: 'from s2' }, s2_only: true } };
+        const s1_original = JSON.parse(JSON.stringify(s1));
+        const s2_original = JSON.parse(JSON.stringify(s2));
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, s1, s2);
+        expect(s1).toEqual(s1_original);
+        expect(s2).toEqual(s2_original);
+        expect(result).toEqual({
+            data: {
+                common: { val: 'from s2' },
+                s1_only: true,
+                s2_only: true,
+            },
+        });
+    });
+    it('should handle complex nested strategies', () => {
+        const target = {
+            level1: {
+                arr1: [1, 2],
+                arr2: [1, 2],
+                obj1: { a: 1 },
+            },
+        };
+        const source = {
+            level1: {
+                arr1: [3, 4],
+                arr2: [2, 3],
+                obj1: { b: 2 },
+            },
+        };
+        const getMergeStrategy = (path) => {
+            const p = path.join('.');
+            if (p === 'level1.arr1')
+                return MergeStrategy.CONCAT;
+            if (p === 'level1.arr2')
+                return MergeStrategy.UNION;
+            if (p === 'level1.obj1')
+                return MergeStrategy.SHALLOW_MERGE;
+            return undefined;
+        };
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({
+            level1: {
+                arr1: [1, 2, 3, 4],
+                arr2: [1, 2, 3],
+                obj1: { a: 1, b: 2 },
+            },
+        });
+    });
+    it('should not pollute the prototype', () => {
+        const maliciousSource = JSON.parse('{"__proto__": {"polluted": "true"}}');
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, {}, maliciousSource);
+        expect(result).toEqual({});
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        expect({}.polluted).toBeUndefined();
+    });
+});
+//# sourceMappingURL=deepMerge.test.js.map

package/dist/src/utils/deepMerge.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deepMerge.test.js","sourceRoot":"","sources":["../../../src/utils/deepMerge.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAE,EAAE,CAC1C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5D,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAChC,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAE,EAAE,CAC1C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAE,EAAE,CAC1C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,2EAA2E;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3E,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QAEzC,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAElD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;QACnE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;QACnE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAEzD,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE;gBACJ,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE;gBAC1B,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG;YACb,MAAM,EAAE;gBACN,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACZ,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACZ,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;aACf;SACF,CAAC;QACF,MAAM,MAAM,GAAG;YACb,MAAM,EAAE;gBACN,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACZ,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;gBACZ,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;aACf;SACF,CAAC;QACF,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAE,EAAE;YAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,aAAa;gBAAE,OAAO,aAAa,CAAC,MAAM,CAAC;YACrD,IAAI,CAAC,KAAK,aAAa;gBAAE,OAAO,aAAa,CAAC,KAAK,CAAC;YACpD,IAAI,CAAC,KAAK,aAAa;gBAAE,OAAO,aAAa,CAAC,aAAa,CAAC;YAC5D,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,MAAM,EAAE;gBACN,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAClB,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACf,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;aACrB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC1E,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,gBAAgB,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;QAEtE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3B,8DAA8D;QAC9D,MAAM,CAAE,EAAU,CAAC,QAAQ,CAAC,CAAC,aAAa,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/utils/envVarResolver.d.ts

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Resolves environment variables in a string.
+ * Replaces $VAR_NAME and ${VAR_NAME} with their corresponding environment variable values.
+ * If the environment variable is not defined, the original placeholder is preserved.
+ *
+ * @param value - The string that may contain environment variable placeholders
+ * @returns The string with environment variables resolved
+ *
+ * @example
+ * resolveEnvVarsInString("Token: $API_KEY") // Returns "Token: secret-123"
+ * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
+ * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
+ */
+export declare function resolveEnvVarsInString(value: string): string;
+/**
+ * Recursively resolves environment variables in an object of any type.
+ * Handles strings, arrays, nested objects, and preserves other primitive types.
+ * Protected against circular references using a WeakSet to track visited objects.
+ *
+ * @param obj - The object to process for environment variable resolution
+ * @returns A new object with environment variables resolved
+ *
+ * @example
+ * const config = {
+ *   server: {
+ *     host: "$HOST",
+ *     port: "${PORT}",
+ *     enabled: true,
+ *     tags: ["$ENV", "api"]
+ *   }
+ * };
+ * const resolved = resolveEnvVarsInObject(config);
+ */
+export declare function resolveEnvVarsInObject<T>(obj: T): T;

package/dist/src/utils/envVarResolver.js

@@ -0,0 +1,97 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Resolves environment variables in a string.
+ * Replaces $VAR_NAME and ${VAR_NAME} with their corresponding environment variable values.
+ * If the environment variable is not defined, the original placeholder is preserved.
+ *
+ * @param value - The string that may contain environment variable placeholders
+ * @returns The string with environment variables resolved
+ *
+ * @example
+ * resolveEnvVarsInString("Token: $API_KEY") // Returns "Token: secret-123"
+ * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
+ * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
+ */
+export function resolveEnvVarsInString(value) {
+    const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
+    return value.replace(envVarRegex, (match, varName1, varName2) => {
+        const varName = varName1 || varName2;
+        if (process && process.env && typeof process.env[varName] === 'string') {
+            return process.env[varName];
+        }
+        return match;
+    });
+}
+/**
+ * Recursively resolves environment variables in an object of any type.
+ * Handles strings, arrays, nested objects, and preserves other primitive types.
+ * Protected against circular references using a WeakSet to track visited objects.
+ *
+ * @param obj - The object to process for environment variable resolution
+ * @returns A new object with environment variables resolved
+ *
+ * @example
+ * const config = {
+ *   server: {
+ *     host: "$HOST",
+ *     port: "${PORT}",
+ *     enabled: true,
+ *     tags: ["$ENV", "api"]
+ *   }
+ * };
+ * const resolved = resolveEnvVarsInObject(config);
+ */
+export function resolveEnvVarsInObject(obj) {
+    return resolveEnvVarsInObjectInternal(obj, new WeakSet());
+}
+/**
+ * Internal implementation of resolveEnvVarsInObject with circular reference protection.
+ *
+ * @param obj - The object to process
+ * @param visited - WeakSet to track visited objects and prevent circular references
+ * @returns A new object with environment variables resolved
+ */
+function resolveEnvVarsInObjectInternal(obj, visited) {
+    if (obj === null ||
+        obj === undefined ||
+        typeof obj === 'boolean' ||
+        typeof obj === 'number') {
+        return obj;
+    }
+    if (typeof obj === 'string') {
+        return resolveEnvVarsInString(obj);
+    }
+    if (Array.isArray(obj)) {
+        // Check for circular reference
+        if (visited.has(obj)) {
+            // Return a shallow copy to break the cycle
+            return [...obj];
+        }
+        visited.add(obj);
+        const result = obj.map((item) => resolveEnvVarsInObjectInternal(item, visited));
+        visited.delete(obj);
+        return result;
+    }
+    if (typeof obj === 'object') {
+        // Check for circular reference
+        if (visited.has(obj)) {
+            // Return a shallow copy to break the cycle
+            return { ...obj };
+        }
+        visited.add(obj);
+        const newObj = { ...obj };
+        for (const key in newObj) {
+            if (Object.prototype.hasOwnProperty.call(newObj, key)) {
+                newObj[key] = resolveEnvVarsInObjectInternal(newObj[key], visited);
+            }
+        }
+        visited.delete(obj);
+        return newObj;
+    }
+    return obj;
+}
+//# sourceMappingURL=envVarResolver.js.map

package/dist/src/utils/envVarResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"envVarResolver.js","sourceRoot":"","sources":["../../../src/utils/envVarResolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,MAAM,WAAW,GAAG,wBAAwB,CAAC,CAAC,gCAAgC;IAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAC9D,MAAM,OAAO,GAAG,QAAQ,IAAI,QAAQ,CAAC;QACrC,IAAI,OAAO,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;QAC/B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,sBAAsB,CAAI,GAAM;IAC9C,OAAO,8BAA8B,CAAC,GAAG,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;GAMG;AACH,SAAS,8BAA8B,CACrC,GAAM,EACN,OAAwB;IAExB,IACE,GAAG,KAAK,IAAI;QACZ,GAAG,KAAK,SAAS;QACjB,OAAO,GAAG,KAAK,SAAS;QACxB,OAAO,GAAG,KAAK,QAAQ,EACvB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC,GAAG,CAAiB,CAAC;IACrD,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,2CAA2C;YAC3C,OAAO,CAAC,GAAG,GAAG,CAAiB,CAAC;QAClC,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9B,8BAA8B,CAAC,IAAI,EAAE,OAAO,CAAC,CAC9B,CAAC;QAClB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,EAAE,CAAC;YAC/B,2CAA2C;YAC3C,OAAO,EAAE,GAAG,GAAG,EAAO,CAAC;QACzB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAO,CAAC;QAC/B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;gBACtD,MAAM,CAAC,GAAG,CAAC,GAAG,8BAA8B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAa,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/src/utils/envVarResolver.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};