@catladder/cli 0.0.0-main-03ba8cbf → 0.0.0-main-4188853e

package/dist/bundles/catenv/index.js

@@ -3002,7 +3002,7 @@ exports.getBuildInfoVariables = getBuildInfoVariables;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getEnvConfig = void 0;
-const utils_1 = __nccwpck_require__(2497);
+const lodash_1 = __nccwpck_require__(3255);
 const getEnvConfig = (config, componentName, env) => {
     var _a, _b;
     const defaultConfig = config.components[componentName];
@@ -3014,7 +3014,19 @@ const getEnvConfig = (config, componentName, env) => {
         // env is disabled, still return the default config
         return defaultConfig;
     }
-    return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+    /**
+     *   env config is merged with default. Arrays are not merged.
+     * you can customize this by providing a function that takes the default value as argument
+     */
+    return (0, lodash_1.mergeWith)({}, defaultConfig, envCustomizations, (defaultValue, customValue) => {
+        // check if custom value is a function (and default is not),
+        // we currently don't have config options that are functions, but we might in the future
+        if (typeof customValue === "function" &&
+            typeof defaultValue !== "function") {
+            return customValue(defaultValue);
+        }
+        return undefined;
+    });
 };
 exports.getEnvConfig = getEnvConfig;
 //# sourceMappingURL=getEnvConfig.js.map

package/dist/bundles/cli/index.js

@@ -5934,7 +5934,7 @@ exports.getBuildInfoVariables = getBuildInfoVariables;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getEnvConfig = void 0;
-const utils_1 = __nccwpck_require__(32497);
+const lodash_1 = __nccwpck_require__(23255);
 const getEnvConfig = (config, componentName, env) => {
     var _a, _b;
     const defaultConfig = config.components[componentName];
@@ -5946,7 +5946,19 @@ const getEnvConfig = (config, componentName, env) => {
         // env is disabled, still return the default config
         return defaultConfig;
     }
-    return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+    /**
+     *   env config is merged with default. Arrays are not merged.
+     * you can customize this by providing a function that takes the default value as argument
+     */
+    return (0, lodash_1.mergeWith)({}, defaultConfig, envCustomizations, (defaultValue, customValue) => {
+        // check if custom value is a function (and default is not),
+        // we currently don't have config options that are functions, but we might in the future
+        if (typeof customValue === "function" &&
+            typeof defaultValue !== "function") {
+            return customValue(defaultValue);
+        }
+        return undefined;
+    });
 };
 exports.getEnvConfig = getEnvConfig;
 //# sourceMappingURL=getEnvConfig.js.map

package/dist/pipeline/src/context/getEnvConfig.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEnvConfig = void 0;
-const utils_1 = require("../utils");
+const lodash_1 = require("lodash");
 const getEnvConfig = (config, componentName, env) => {
     var _a, _b;
     const defaultConfig = config.components[componentName];
@@ -13,7 +13,19 @@ const getEnvConfig = (config, componentName, env) => {
         // env is disabled, still return the default config
         return defaultConfig;
     }
-    return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+    /**
+     *   env config is merged with default. Arrays are not merged.
+     * you can customize this by providing a function that takes the default value as argument
+     */
+    return (0, lodash_1.mergeWith)({}, defaultConfig, envCustomizations, (defaultValue, customValue) => {
+        // check if custom value is a function (and default is not),
+        // we currently don't have config options that are functions, but we might in the future
+        if (typeof customValue === "function" &&
+            typeof defaultValue !== "function") {
+            return customValue(defaultValue);
+        }
+        return undefined;
+    });
 };
 exports.getEnvConfig = getEnvConfig;
 //# sourceMappingURL=getEnvConfig.js.map

package/dist/pipeline/src/context/getEnvConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEnvConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvConfig.ts"],"names":[],"mappings":";;;AAEA,oCAAkD;AAE3C,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,aAAqB,EACrB,GAAW,EACa,EAAE;;IAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAA,MAAA,aAAa,CAAC,GAAG,0CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;IACzD,IAAI,iBAAiB,KAAK,KAAK,EAAE,CAAC;QAChC,mDAAmD;QACnD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,IAAA,8BAAsB,EAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;AAClE,CAAC,CAAC;AAhBW,QAAA,YAAY,gBAgBvB"}
+{"version":3,"file":"getEnvConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvConfig.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAG5B,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,aAAqB,EACrB,GAAW,EACa,EAAE;;IAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAA,MAAA,aAAa,CAAC,GAAG,0CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;IACzD,IAAI,iBAAiB,KAAK,KAAK,EAAE,CAAC;QAChC,mDAAmD;QACnD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD;;;OAGG;IACH,OAAO,IAAA,kBAAS,EACd,EAAE,EACF,aAAa,EACb,iBAAiB,EACjB,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE;QAC5B,4DAA4D;QAC5D,wFAAwF;QACxF,IACE,OAAO,WAAW,KAAK,UAAU;YACjC,OAAO,YAAY,KAAK,UAAU,EAClC,CAAC;YACD,OAAO,WAAW,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}

package/dist/pipeline/src/types/config.d.ts

@@ -73,6 +73,10 @@ export type DevLocalEnvConfig = {
     vars?: EnvVars;
     port?: number;
 };
+type AddOverrideFunction<T> = {
+    [K in keyof T]: T[K] | ((defaultValue: T[K]) => T[K]) | (T[K] extends Record<string, unknown> | undefined ? AddOverrideFunction<T[K]> : never);
+};
+type EnvConfigWithOverride<E extends EnvType = EnvType> = AddOverrideFunction<EnvConfig<E>>;
 export type EnvConfig<E extends EnvType = EnvType> = {
     /**
      * type of the env (stage, prod, review, dev)
@@ -84,18 +88,18 @@ export type EnvConfig<E extends EnvType = EnvType> = {
     host?: string;
 } & PartialDeep<DefaultEnvConfig>;
 export type EnvConfigWithComponent = EnvConfig<EnvType> & ComponentConfig;
-export type CustomEnv = EnvConfig & {
+export type CustomEnv = EnvConfigWithOverride & {
     type: EnvType;
 };
 export type Env<C extends ConfigProps = never> = {
     /**
      * local is a special env that is only used in local development
      */
-    local?: DevLocalEnvConfig;
-    dev?: EnvConfig<"dev"> | false;
-    stage?: EnvConfig<"stage"> | false;
-    review?: EnvConfig<"review"> | false;
-    prod?: EnvConfig<"prod"> | false;
+    local?: AddOverrideFunction<DevLocalEnvConfig>;
+    dev?: EnvConfigWithOverride<"dev"> | false;
+    stage?: EnvConfigWithOverride<"stage"> | false;
+    review?: EnvConfigWithOverride<"review"> | false;
+    prod?: EnvConfigWithOverride<"prod"> | false;
 } & Record<C["CustomEnvs"], CustomEnv> & Record<string, any>;
 export type ComponentConfig<C extends ConfigProps = never> = {
     /**
@@ -178,3 +182,4 @@ export type Config<C extends ConfigProps = never> = {
      */
     runnerVariables?: Record<string, string>;
 };
+export {};