@swoff/cli 0.3.13 → 0.3.14

package/dist/lib/commands/init.js

@@ -4,10 +4,181 @@
 import { writeFileSync, existsSync } from "fs";
 import { join } from "path";
 import { log } from "../cli/logger.js";
-import { defaultInitConfig } from "../shared/config-types.js";
-import { detectFramework } from "../utils/detect-framework.js";
+import { defaultInitConfig, deepMerge, } from "../shared/config-types.js";
+import { detectFramework, } from "../utils/detect-framework.js";
+const FRAMEWORK_PRESETS = {
+    nextjs: {
+        build: {
+            outputDir: "public",
+        },
+        features: {
+            serviceWorker: {
+                strategy: {
+                    default: "network-first",
+                    patterns: {
+                        "/_next/static/*": "cache-first",
+                    },
+                    ignoreQueryParams: ["_rsc"],
+                },
+                navigation: {
+                    mode: "ssr",
+                },
+            },
+        },
+    },
+    remix: {
+        features: {
+            serviceWorker: {
+                strategy: {
+                    default: "network-first",
+                    ignoreQueryParams: ["_data"],
+                },
+                navigation: {
+                    mode: "ssr",
+                },
+            },
+        },
+    },
+    astro: {
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "ssr",
+                },
+            },
+        },
+    },
+    nuxt: {
+        features: {
+            serviceWorker: {
+                strategy: {
+                    default: "network-first",
+                },
+                navigation: {
+                    mode: "ssr",
+                },
+            },
+        },
+    },
+    sveltekit: {
+        features: {
+            serviceWorker: {
+                strategy: {
+                    default: "network-first",
+                },
+                navigation: {
+                    mode: "ssr",
+                },
+            },
+        },
+    },
+    "react-spa": {
+        build: {
+            outputDir: "dist",
+        },
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "spa",
+                },
+            },
+        },
+    },
+    "tanstack-start-react": {
+        build: {
+            outputDir: ".output/public",
+        },
+        features: {
+            serviceWorker: {
+                strategy: {
+                    default: "network-first",
+                    patterns: {
+                        "/_serverFn/*": "network-only",
+                    },
+                },
+                navigation: {
+                    mode: "ssr",
+                },
+            },
+        },
+    },
+    laravel: {
+        build: {
+            outputDir: "public",
+        },
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "ssr",
+                },
+                strategy: {
+                    default: "network-first",
+                },
+            },
+        },
+    },
+    django: {
+        build: {
+            outputDir: "static",
+        },
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "ssr",
+                },
+                strategy: {
+                    default: "network-first",
+                },
+            },
+        },
+    },
+    flask: {
+        build: {
+            outputDir: "static",
+        },
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "ssr",
+                },
+                strategy: {
+                    default: "network-first",
+                },
+            },
+        },
+    },
+    rails: {
+        build: {
+            outputDir: "public",
+        },
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "ssr",
+                },
+                strategy: {
+                    default: "network-first",
+                },
+            },
+        },
+    },
+    go: {
+        build: {
+            outputDir: "static",
+        },
+        features: {
+            serviceWorker: {
+                navigation: {
+                    mode: "ssr",
+                },
+                strategy: {
+                    default: "network-first",
+                },
+            },
+        },
+    },
+};
 export async function initCommand(projectRoot, framework) {
-    // log.header("Initializing Swoff");
     const configFiles = ["swoff.config.json", "swoff.config.js"];
     const existingConfig = configFiles.find((f) => existsSync(join(projectRoot, f)));
     if (existingConfig) {
@@ -15,15 +186,21 @@ export async function initCommand(projectRoot, framework) {
         log.info("To reinitialize, delete the config file first.");
         return;
     }
-    const detected = framework || detectFramework(projectRoot);
-    const config = {
-        $schema: defaultInitConfig.$schema,
-        configVersion: defaultInitConfig.configVersion,
-        enabled: defaultInitConfig.enabled,
+    const detected = (framework || detectFramework(projectRoot));
+    const preset = FRAMEWORK_PRESETS[detected] || {};
+    // Start with default config, deep-merge the preset
+    const config = deepMerge({
+        ...defaultInitConfig,
         framework: detected,
-        build: defaultInitConfig.build,
-        features: defaultInitConfig.features,
-    };
+    }, preset);
+    // Validate and adjust build output — ensure all build fields are present
+    if (!config.build)
+        config.build = defaultInitConfig.build;
+    // Auto-populate precacheDirs from outputDir so users get directory precaching out of the box
+    const cfgBuild = config.build;
+    if (!cfgBuild.precacheDirs || Object.keys(cfgBuild.precacheDirs).length === 0) {
+        cfgBuild.precacheDirs = { [cfgBuild.outputDir]: { prefix: "/" } };
+    }
     const configPath = join(projectRoot, "swoff.config.json");
     writeFileSync(configPath, JSON.stringify(config, null, 2));
     log.info("Created swoff.config.json");

package/dist/lib/commands/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/lib/commands/init.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,WAAmB,EAAE,SAAkB;IACvE,oCAAoC;IAEpC,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5C,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CACjC,CAAC;IAEF,IAAI,cAAc,EAAE,CAAC;QACnB,GAAG,CAAC,IAAI,CAAC,kBAAkB,cAAc,kBAAkB,CAAC,CAAC;QAC7D,GAAG,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC3D,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,SAAS,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG;QACb,OAAO,EAAE,iBAAiB,CAAC,OAAO;QAClC,aAAa,EAAE,iBAAiB,CAAC,aAAa;QAC9C,OAAO,EAAE,iBAAiB,CAAC,OAAO;QAClC,SAAS,EAAE,QAAoC;QAC/C,KAAK,EAAE,iBAAiB,CAAC,KAAK;QAC9B,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;KACrC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAC1D,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAEtC,GAAG,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC5B,GAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;IAChE,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC5C,GAAG,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/lib/commands/init.ts"],"names":[],"mappings":"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"}

package/dist/lib/commands/validate.js

@@ -20,17 +20,15 @@ export async function validateCommand(projectRoot) {
     }
     log.success("Configuration is valid!");
     log.info("\nConfig summary:");
-    log.help(`Version: ${config.features.serviceWorker.version}`);
-    log.help(`Min supported version: ${config.features.serviceWorker.minSupportedVersion}`);
     log.help(`Default strategy: ${config.features.serviceWorker.strategy.default}`);
-    log.help(`Auto update: ${config.features.serviceWorker.autoUpdate}`);
+    log.help(`Auto activate: ${config.features.serviceWorker.autoActivate}`);
     log.help(`Features enabled: ${Object.entries(config.features)
         .filter(([k, v]) => {
         if (k === "serviceWorker")
             return false;
         if (typeof v === "object" && v !== null)
             return v.enabled === true;
-        return v === true;
+        return typeof v === "boolean" && v === true;
     })
         .map(([k]) => k)
         .join(", ")}`);

package/dist/lib/commands/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/lib/commands/validate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAmB;IACvD,gDAAgD;IAEhD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GACxC,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;IAErC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QAChE,OAAO;IACT,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,cAAc,UAAU,KAAK,CAAC,CAAC;IAExC,MAAM,MAAM,GAAG,cAAc,CAAC,MAA4C,CAAC,CAAC;IAE5E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,MAAM,YAAY,CAAC,CAAC;QAC/D,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5C,OAAO;IACT,CAAC;IAED,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACvC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9B,GAAG,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9D,GAAG,CAAC,IAAI,CACN,0BAA0B,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAC9E,CAAC;IACF,GAAG,CAAC,IAAI,CACN,qBAAqB,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,CACtE,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;IACrE,GAAG,CAAC,IAAI,CACN,qBAAqB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;SACjD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,IAAI,CAAC,KAAK,eAAe;YAAE,OAAO,KAAK,CAAC;QACxC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI;YACrC,OAAQ,CAA6B,CAAC,OAAO,KAAK,IAAI,CAAC;QACzD,OAAO,CAAC,KAAK,IAAI,CAAC;IACpB,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/lib/commands/validate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAmB;IACvD,gDAAgD;IAEhD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GACxC,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;IAErC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QAChE,OAAO;IACT,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,cAAc,UAAU,KAAK,CAAC,CAAC;IAExC,MAAM,MAAM,GAAG,cAAc,CAAC,MAA4C,CAAC,CAAC;IAE5E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,MAAM,YAAY,CAAC,CAAC;QAC/D,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5C,OAAO;IACT,CAAC;IAED,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACvC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9B,GAAG,CAAC,IAAI,CACN,qBAAqB,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,CACtE,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,CAAC;IACzE,GAAG,CAAC,IAAI,CACN,qBAAqB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;SACjD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,IAAI,CAAC,KAAK,eAAe;YAAE,OAAO,KAAK,CAAC;QACxC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI;YACrC,OAAQ,CAA6B,CAAC,OAAO,KAAK,IAAI,CAAC;QACzD,OAAO,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;IAC9C,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;AACJ,CAAC"}

package/dist/lib/config/loader.js

@@ -4,17 +4,9 @@
  */
 import { readFileSync, existsSync } from "fs";
 import { join } from "path";
-import { defaultConfig, mergeConfigs, CONFIG_VERSION } from "../shared/config-types.js";
-function checkConfigVersion(config) {
-    if (config.configVersion === undefined) {
-        console.warn("[swoff] Config is missing configVersion — the format may have changed since it was created.\n" +
-            "  Add \"configVersion\": 1 to your swoff.config.json to suppress this warning.");
-    }
-    else if (config.configVersion > CONFIG_VERSION) {
-        console.warn(`[swoff] Config has configVersion ${config.configVersion}, but this CLI version supports up to ${CONFIG_VERSION}.\n` +
-            "  Some settings may not be recognized. Upgrade @swoff/cli for full compatibility.");
-    }
-}
+import { pathToFileURL } from "url";
+import { defaultConfig, mergeConfigs } from "../shared/config-types.js";
+import { log } from "../cli/logger.js";
 /**
  * Load config from project root. Tries JSON first, then JS.
  * Falls back to defaults if no config found or parse fails.
@@ -27,11 +19,10 @@ export function loadConfig(projectRoot, explicitPath) {
             try {
                 const raw = JSON.parse(readFileSync(explicitPath, "utf8"));
                 const config = mergeConfigs(defaultConfig, raw);
-                checkConfigVersion(config);
                 return { config, configPath: explicitPath, configSource: "JSON" };
             }
             catch {
-                console.warn(`[swoff] Warning: Failed to parse explicit config "${explicitPath}" — falling back to defaults`);
+                log.warn(`Failed to parse explicit config "${explicitPath}" — falling back to defaults`);
                 return { config: defaultConfig, configPath: null, configSource: "defaults" };
             }
         }
@@ -45,17 +36,12 @@ export function loadConfig(projectRoot, explicitPath) {
             try {
                 const raw = JSON.parse(readFileSync(path, "utf8"));
                 const config = mergeConfigs(defaultConfig, raw);
-                checkConfigVersion(config);
                 return { config, configPath: path, configSource: "JSON" };
             }
             catch {
-                console.warn(`[swoff] Warning: Failed to parse "${path}" — falling back to defaults`);
+                log.warn(`Failed to parse "${path}" — falling back to defaults`);
             }
         }
-        // JS configs require the async loader
-        if (file.endsWith(".js")) {
-            throw new Error(`JavaScript config files require the async loader. Use loadConfigAsync() instead of loadConfig() for "${path}".`);
-        }
     }
     return { config: defaultConfig, configPath: null, configSource: "defaults" };
 }
@@ -63,20 +49,43 @@ export function loadConfig(projectRoot, explicitPath) {
  * Async version that also tries to load .js configs via dynamic import.
  */
 export async function loadConfigAsync(projectRoot, explicitPath) {
-    const syncResult = loadConfig(projectRoot, explicitPath);
-    if (syncResult.configPath && syncResult.configPath.endsWith(".js")) {
+    // Handle explicit JS path directly
+    if (explicitPath && existsSync(explicitPath) && explicitPath.endsWith(".js")) {
         try {
-            const mod = await import(syncResult.configPath);
+            const fileUrl = pathToFileURL(explicitPath).href;
+            const mod = await import(fileUrl);
             const raw = (mod.default || mod);
             const config = mergeConfigs(defaultConfig, raw);
-            checkConfigVersion(config);
-            return { config, configPath: syncResult.configPath, configSource: "JavaScript" };
+            return { config, configPath: explicitPath, configSource: "JavaScript" };
         }
         catch {
-            console.warn(`[swoff] Warning: Failed to load JS config "${syncResult.configPath}" — falling back to defaults`);
+            log.warn(`Failed to load JS config "${explicitPath}" — falling back to defaults`);
             return { config: defaultConfig, configPath: null, configSource: "defaults" };
         }
     }
+    // Try JSON via sync loader (handles explicit JSON and default JSON paths)
+    const syncResult = loadConfig(projectRoot, explicitPath);
+    if (syncResult.configPath) {
+        return syncResult;
+    }
+    // If an explicit path was given and sync loader didn't find it, stop here
+    if (explicitPath) {
+        return syncResult;
+    }
+    // No config found yet — try swoff.config.js
+    const jsPath = join(projectRoot, "swoff.config.js");
+    if (existsSync(jsPath)) {
+        try {
+            const fileUrl = pathToFileURL(jsPath).href;
+            const mod = await import(fileUrl);
+            const raw = (mod.default || mod);
+            const config = mergeConfigs(defaultConfig, raw);
+            return { config, configPath: jsPath, configSource: "JavaScript" };
+        }
+        catch {
+            log.warn(`Failed to load JS config "${jsPath}" — falling back to defaults`);
+        }
+    }
     return syncResult;
 }
 //# sourceMappingURL=loader.js.map

package/dist/lib/config/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lib/config/loader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAoB,MAAM,2BAA2B,CAAC;AAQ1G,SAAS,kBAAkB,CAAC,MAAmB;IAC7C,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,IAAI,CACV,+FAA+F;YAC/F,gFAAgF,CACjF,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,aAAa,GAAG,cAAc,EAAE,CAAC;QACjD,OAAO,CAAC,IAAI,CACV,oCAAoC,MAAM,CAAC,aAAa,yCAAyC,cAAc,KAAK;YACpH,mFAAmF,CACpF,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,WAAmB,EAAE,YAAqB;IACnE,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;IAE7D,2CAA2C;IAC3C,IAAI,YAAY,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7C,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC3D,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;gBAChD,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC3B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;YACpE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,qDAAqD,YAAY,8BAA8B,CAAC,CAAC;gBAC9G,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;YAC/E,CAAC;QACH,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QAEhC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;gBACnD,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;gBAChD,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC3B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,qCAAqC,IAAI,8BAA8B,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;QAED,sCAAsC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,wGAAwG,IAAI,IAAI,CACjH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AAC/E,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAmB,EAAE,YAAqB;IAC9E,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAChD,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAyB,CAAC;YACzD,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;YAChD,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;QACnF,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,8CAA8C,UAAU,CAAC,UAAU,8BAA8B,CAAC,CAAC;YAChH,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lib/config/loader.ts"],"names":[],"mappings":"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"}