@swoff/cli 0.3.13 → 0.3.15

package/dist/lib/generators/file-generators/sw-generator-build.js

@@ -3,21 +3,20 @@ export function generateSwGeneratorBuild(ctx) {
     const code = `#!/usr/bin/env node
 /**
  * Swoff SW Generator Build Script
- * Reads swoff/sw/template.js and generates versioned SW output.
+ * Reads swoff/sw/template.js and generates the final SW output.
  *
  * Add to package.json:
  *   "build": "your-build && node swoff/sw/generator.js"
  */
 
 import { readFileSync, writeFileSync, existsSync, mkdirSync, readdirSync } from 'fs';
-import { join, dirname, relative } from 'path';
-import { createHash } from 'crypto';
+import { join, dirname, relative, extname } from 'path';
 import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const projectRoot = process.cwd();
 
-const pkgPath = join(projectRoot, 'package.json');
 const templatePath = join(__dirname, 'template.js');
 const configPath = join(projectRoot, 'swoff.config.json');
 
@@ -32,18 +31,46 @@ if (!existsSync(templatePath)) {
   process.exit(1);
 }
 
-const pkg = existsSync(pkgPath) ? JSON.parse(readFileSync(pkgPath, 'utf8')) : { version: '1.0.0' };
 const config = JSON.parse(readFileSync(configPath, 'utf8'));
-const template = readFileSync(templatePath, 'utf8');
+let template = readFileSync(templatePath, 'utf8');
+
+const swoffDir = join(projectRoot, 'swoff');
+
+// Prepend isAuthFailureResponse from user's auth/check, or use default fallback
+const authCheckTsPath = join(swoffDir, 'auth', 'check.ts');
+const authCheckJsPath = join(swoffDir, 'auth', 'check.js');
+const authCheckPath = existsSync(authCheckTsPath) ? authCheckTsPath : authCheckJsPath;
+let authFailureFn = 'async function isAuthFailureResponse(response) {\\n  return response.status === 401;\\n}';
+if (existsSync(authCheckPath)) {
+  const authContent = readFileSync(authCheckPath, 'utf8');
+  const fnMatch = authContent.match(/export\\s+async\\s+function\\s+isAuthFailureResponse[\\s\\S]*?\\n\\}/);
+  if (fnMatch) {
+    authFailureFn = fnMatch[0].replace(/^export\\s+/, '');
+  }
+}
+template = authFailureFn + '\\n\\n' + template;
+
+// Resolve API_BASE for server push endpoint
+if (config.features?.serverPush?.enabled) {
+  let apiBase = '';
+  const configJsPath = join(swoffDir, 'config.js');
+  if (existsSync(configJsPath)) {
+    try {
+      const _require = createRequire(import.meta.url);
+      const configMod = _require(configJsPath);
+      apiBase = configMod.API_BASE || '';
+    } catch {}
+  } else {
+    const configTsPath = join(swoffDir, 'config.ts');
+    if (existsSync(configTsPath)) {
+      const content = readFileSync(configTsPath, 'utf8');
+      const match = content.match(/export\\s+const\\s+API_BASE\\s*=\\s*"([^"]+)"/);
+      apiBase = match ? match[1] : '';
+    }
+  }
+  template = template.replace(/SWOFF_API_BASE/g, apiBase);
+}
 
-const swConfig = config.features?.serviceWorker || {};
-const versionField = swConfig.version;
-const versionEnabled = versionField !== "hash";
-const version = versionField === "package"
-  ? (pkg.version || '1.0.0')
-  : versionField === "hash"
-    ? "0.0.0"
-    : versionField || (pkg.version || '1.0.0');
 const outputDir = config.build?.outputDir || 'dist';
 const swFilename = config.build?.swFilename || 'sw';
 
@@ -52,56 +79,86 @@ if (!existsSync(outDir)) {
   mkdirSync(outDir, { recursive: true });
 }
 
-function collectAssets(dir) {
+function collectAssets(dir, baseDir) {
+  if (!existsSync(dir)) return [];
   const entries = readdirSync(dir, { withFileTypes: true });
   const assets = [];
   for (const entry of entries) {
     const fullPath = join(dir, entry.name);
     if (entry.isDirectory()) {
-      assets.push(...collectAssets(fullPath));
+      assets.push(...collectAssets(fullPath, baseDir));
     } else {
-      assets.push('/' + relative(outDir, fullPath));
+      assets.push('/' + relative(baseDir, fullPath));
     }
   }
   return assets;
 }
 
-function generateCacheNameHash(swContent) {
-  return 'sw-cache-' + createHash('sha256').update(swContent).digest('hex').slice(0, 12);
+const dirsRaw = config.build?.precacheDirs || {};
+const dirs = dirsRaw;
+const allAssets = [];
+  for (const [dir, raw] of Object.entries(dirs)) {
+    const dirPath = join(projectRoot, dir);
+    if (existsSync(dirPath)) {
+      const cfg = raw;
+      const normPrefix = cfg.prefix.replace(/\\/+$/, '');
+      const matchExtensions = cfg.matchExtensions;
+      const stripExtensions = cfg.stripExtensions;
+      const stripSuffixes = cfg.stripSuffixes;
+      for (const a of collectAssets(dirPath, dirPath)) {
+        if (matchExtensions?.length && !matchExtensions.includes(extname(a))) continue;
+        let url = normPrefix + '/' + a.slice(1);
+        if (stripExtensions?.includes(extname(a))) url = url.replace(/\\.[^/.]+$/, '');
+        if (stripSuffixes) {
+        for (const suffix of stripSuffixes) {
+          if (url.endsWith('/' + suffix)) {
+            url = url.slice(0, -suffix.length - 1) + '/';
+          }
+        }
+      }
+      if (url !== '/' && url.endsWith('/')) {
+        url = url.slice(0, -1);
+      }
+      allAssets.push(url);
+    }
+  }
 }
-
-const allAssets = collectAssets(outDir);
-const swFile = versionEnabled ? \`\${swFilename}-v\${version}.js\` : \`\${swFilename}.js\`;
-const filtered = allAssets.filter(a => !a.endsWith(swFile) && a !== '/version.json');
-const fallback = ['/index.html'];
+const swFile = \`\${swFilename}.js\`;
+const filtered = allAssets.filter(a => a !== \`/\${swFile}\`);
+const nav = config.features?.serviceWorker?.navigation || {};
+const fallback = [];
+if (nav.fallback) fallback.push(nav.fallback);
 if (config.features?.pwa?.enabled) fallback.push('/manifest.json');
-const combined = [...new Set([...fallback, ...filtered])];
-const assetsToCache = combined.map(url => ({ url, options: {} }));
+if (nav.precacheRoutes) {
+  for (const route of nav.precacheRoutes) {
+    if (!fallback.includes(route)) fallback.push(route);
+  }
+}
+if (nav.rules) {
+  for (const rule of nav.rules) {
+    if (rule.fallback && !fallback.includes(rule.fallback)) fallback.push(rule.fallback);
+  }
+}
+const assetsToCache = [...new Set([...fallback, ...filtered])];
+
+const swConfig = config.features?.serviceWorker || {};
+const concurrency = swConfig.precache?.concurrency ?? 1;
+const delayMs = swConfig.precache?.delayMs ?? 0;
 
 let sw = template;
-if (versionEnabled) {
-  sw = sw.replace('// [[CACHE_NAME]]', \`CACHE_NAME = 'sw-v\${version}'\`);
-} else {
-  const sentinel = 'SW_CACHE_SENTINEL';
-  sw = sw.replace('// [[CACHE_NAME]]', \`CACHE_NAME = '\${sentinel}'\`);
-}
-sw = sw.replace('// [[ASSETS_LIST]]', \`ASSETS_TO_CACHE = \${JSON.stringify(assetsToCache, null, 2)}\`);
-sw = sw.replace('// [[AUTO_SKIP_WAITING]]', \`const AUTO_SKIP_WAITING = \${config.features?.serviceWorker?.autoActivate || false};\`);
-
-if (!versionEnabled) {
-  const cacheName = generateCacheNameHash(sw);
-  sw = sw.replace(sentinel, cacheName);
-  writeFileSync(join(outDir, swFile), sw);
-  console.log(\`Service worker built: \${outputDir}/\${swFile}\`);
-} else {
-  writeFileSync(join(outDir, swFile), sw);
-  writeFileSync(join(outDir, 'version.json'), JSON.stringify({
-    version,
-    minSupportedVersion: swConfig.minSupportedVersion || '0.0.0',
-    generatedAt: new Date().toISOString(),
-  }, null, 2));
-  console.log(\`Service worker built: \${outputDir}/\${swFile}\`);
+sw = sw.replace(/let ASSETS_TO_CACHE = \\[\\];?/, () => \`let ASSETS_TO_CACHE = \${JSON.stringify(assetsToCache, null, 2)};\`);
+sw = sw.replace(/let PRECACHE_FALLBACKS = \\[\\];?/, () => \`let PRECACHE_FALLBACKS = \${JSON.stringify(fallback)};\`);
+sw = sw.replace(/let PRECACHE_CONCURRENCY = \\d+;?/, () => \`let PRECACHE_CONCURRENCY = \${concurrency};\`);
+sw = sw.replace(/let PRECACHE_DELAY_MS = \\d+;?/, () => \`let PRECACHE_DELAY_MS = \${delayMs};\`);
+sw = sw.replace(/let AUTO_SKIP_WAITING = (?:true|false);?/, () => \`let AUTO_SKIP_WAITING = \${swConfig.autoActivate || false};\`);
+sw = sw.replace(/let CACHE_NAME = "";?/, \`const CACHE_NAME = "\${Date.now()}";\`);
+
+writeFileSync(join(outDir, swFile), sw);
+const hasPrecache = Object.keys(config.build?.precacheDirs || {}).length > 0;
+if (!hasPrecache) {
+  console.warn('Warning: No precacheDirs configured. Only explicit fallback routes will be precached.');
 }
+console.log(\`Service worker built: \${outputDir}/\${swFile}\`);
 `;
     writeFile(ctx, "sw/generator.js", code);
 }

package/dist/lib/generators/file-generators/sw-generator-build.js.map

@@ -1 +1 @@
-{"version":3,"file":"sw-generator-build.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/sw-generator-build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,UAAU,wBAAwB,CAAC,GAAqB;IAC5D,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsGd,CAAC;IAEA,SAAS,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"sw-generator-build.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/sw-generator-build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,UAAU,wBAAwB,CAAC,GAAqB;IAC5D,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Jd,CAAC;IAEA,SAAS,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC"}

package/dist/lib/generators/file-generators/sw-injector.js

@@ -4,14 +4,10 @@
 import { writeFile } from "./context.js";
 import { generateSwInjectorCode } from "../../../runtime/sw-injector.js";
 export function generateSwInjector(ctx) {
-    const v = ctx.config.features.serviceWorker.version;
-    const versionEnabled = v !== "hash";
     writeFile(ctx, `sw/injector.${ctx.ext}`, generateSwInjectorCode({
         ts: ctx.ext === "ts",
         ext: ctx.ext,
-        autoUpdate: ctx.config.features.serviceWorker.autoUpdate,
         autoActivate: ctx.config.features.serviceWorker.autoActivate,
-        versionEnabled,
         swFilename: ctx.config.build?.swFilename || "sw",
     }));
 }

package/dist/lib/generators/file-generators/sw-injector.js.map

@@ -1 +1 @@
-{"version":3,"file":"sw-injector.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/sw-injector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,MAAM,UAAU,kBAAkB,CAAC,GAAqB;IACtD,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC;IACpD,MAAM,cAAc,GAAG,CAAC,KAAK,MAAM,CAAC;IAEpC,SAAS,CACP,GAAG,EACH,eAAe,GAAG,CAAC,GAAG,EAAE,EACxB,sBAAsB,CAAC;QACrB,EAAE,EAAE,GAAG,CAAC,GAAG,KAAK,IAAI;QACpB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU;QACxD,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY;QAC5D,cAAc;QACd,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,IAAI,IAAI;KACjD,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"sw-injector.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/sw-injector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE,MAAM,UAAU,kBAAkB,CAAC,GAAqB;IACtD,SAAS,CACP,GAAG,EACH,eAAe,GAAG,CAAC,GAAG,EAAE,EACxB,sBAAsB,CAAC;QACrB,EAAE,EAAE,GAAG,CAAC,GAAG,KAAK,IAAI;QACpB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY;QAC5D,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,IAAI,IAAI;KACjD,CAAC,CACH,CAAC;AACJ,CAAC"}

package/dist/lib/generators/file-generators/sw-template.js

@@ -3,16 +3,15 @@
  * Placeholders are replaced during build by sw-generator.js.
  */
 import { writeFile } from "./context.js";
-import { assembleSW } from "../sw-sections/assemble-sw.js";
+import { getDefaultTemplate } from "../sw-sections/default-template.js";
+import { applySwSections, shouldIncludeBackgroundSync, generateBackgroundSyncCode } from "../sw-sections/shared.js";
 export function generateSwTemplate(ctx) {
-    const placeholderVersion = "0.0.0";
-    const full = assembleSW(ctx.config, placeholderVersion);
-    let code = full;
-    code = code.replace(`CACHE_NAME = 'sw-v${placeholderVersion}'`, "// [[CACHE_NAME]]");
-    code = code.replace(/^ASSETS_TO_CACHE = \[[\s\S]*?\]$/m, "// [[ASSETS_LIST]]");
-    code = code.replace(/^const AUTO_SKIP_WAITING = (true|false);?$/m, "// [[AUTO_SKIP_WAITING]]");
-    // Dev mode fallback — if placeholders weren't replaced, use a dev cache name
-    code += `\n// Dev mode fallback\nif (!CACHE_NAME) CACHE_NAME = "sw-dev-cache";\n`;
+    const { config, debug } = ctx;
+    let code = getDefaultTemplate();
+    code = applySwSections(code, config, true, debug);
+    if (shouldIncludeBackgroundSync(config)) {
+        code += generateBackgroundSyncCode(config);
+    }
     writeFile(ctx, "sw/template.js", code);
 }
 //# sourceMappingURL=sw-template.js.map

package/dist/lib/generators/file-generators/sw-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"sw-template.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/sw-template.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,MAAM,UAAU,kBAAkB,CAAC,GAAqB;IACtD,MAAM,kBAAkB,GAAG,OAAO,CAAC;IACnC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAExD,IAAI,IAAI,GAAG,IAAI,CAAC;IAEhB,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,qBAAqB,kBAAkB,GAAG,EAC1C,mBAAmB,CACpB,CAAC;IAEF,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,mCAAmC,EACnC,oBAAoB,CACrB,CAAC;IAEF,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,6CAA6C,EAC7C,0BAA0B,CAC3B,CAAC;IAEF,6EAA6E;IAC7E,IAAI,IAAI,yEAAyE,CAAC;IAElF,SAAS,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"sw-template.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/sw-template.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEpH,MAAM,UAAU,kBAAkB,CAAC,GAAqB;IACtD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;IAE9B,IAAI,IAAI,GAAG,kBAAkB,EAAE,CAAC;IAEhC,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAElD,IAAI,2BAA2B,CAAC,MAAM,CAAC,EAAE,CAAC;QACxC,IAAI,IAAI,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAGD,SAAS,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC"}

package/dist/lib/generators/file-generators/swoff-api-bundle.js

@@ -0,0 +1,51 @@
+/**
+ * Generates swoff-api.bundle.{js|ts} — a self-contained IIFE that exposes
+ * the full Swoff API on window.swoff for no-bundler users (vanilla, HTMX,
+ * Laravel, Django, Go, Rails).
+ *
+ * Requires client-injector.bundle.js to be loaded first for SW registration.
+ *
+ * Usage:
+ *   <script src="/swoff/client-injector.bundle.js"></script>
+ *   <script src="/swoff/swoff-api.bundle.js"></script>
+ *   <script>
+ *     swoff.fetchWithCache("/api/todos").then(r => r.json());
+ *     swoff.invalidateByTag("todos");
+ *   </script>
+ */
+import { writeFile } from "./context.js";
+import { generateSwoffApiBundleCode } from "../../../runtime/swoff-api-bundle.js";
+export function generateSwoffApiBundle(ctx) {
+    const ext = ctx.ext;
+    const sw = ctx.config.features.serviceWorker;
+    const mq = ctx.config.features.mutationQueue;
+    const ti = ctx.config.features.tagInvalidation;
+    const code = generateSwoffApiBundleCode({ ts: ext === "ts", ext }, {
+        authEnabled: ctx.config.features.auth.enabled,
+        authType: ctx.config.features.auth.type,
+        authRoutePaths: ctx.config.features.auth.routePaths,
+        mutationQueueEnabled: mq.enabled,
+        mutationQueueBatchSize: mq.batchSize,
+        mutationQueueBatchDelayMs: mq.batchDelayMs,
+        mutationQueueMaxRetries: mq.retry.maxRetries,
+        mutationQueueRetryBackoffMs: mq.retry.backoffMs,
+        mutationQueueRetryMaxBackoffMs: mq.retry.maxBackoffMs,
+        mutationQueueRetryJitterMs: mq.retry.jitterMs,
+        pwaEnabled: ctx.config.features.pwa.enabled,
+        pwaPreventDefaultInstall: ctx.config.features.pwa.preventDefaultInstall,
+        requestBatchWindowMs: ctx.config.features.requestBatchWindowMs,
+        tagInvalidationSkipPrefixes: ti.skipPrefixes ?? [],
+        tagInvalidationPatterns: ti.patterns ?? {},
+        tagInvalidationSingularization: ti.singularization ?? {},
+        tagInvalidationCascading: ti.cascading ?? {},
+        gqlEnabled: ctx.config.features.graphql.enabled,
+        gqlEndpoints: ctx.config.features.graphql.endpoints ?? [],
+        pushNotificationsEnabled: ctx.config.features.pushNotifications,
+        serverPushEnabled: ctx.config.features.serverPush.enabled,
+        serverPushType: ctx.config.features.serverPush.type,
+        serverPushEndpoint: ctx.config.features.serverPush.endpoint,
+        serverPushReconnectDelayMs: ctx.config.features.serverPush.reconnectDelayMs,
+    });
+    writeFile(ctx, `swoff-api.bundle.${ext}`, code);
+}
+//# sourceMappingURL=swoff-api-bundle.js.map

package/dist/lib/generators/file-generators/swoff-api-bundle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"swoff-api-bundle.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/swoff-api-bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,MAAM,UAAU,sBAAsB,CAAC,GAAqB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC7C,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC7C,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;IAE/C,MAAM,IAAI,GAAG,0BAA0B,CACrC,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,EAAE,GAAG,EAAE,EACzB;QACE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC7C,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI;QACvC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU;QACnD,oBAAoB,EAAE,EAAE,CAAC,OAAO;QAChC,sBAAsB,EAAE,EAAE,CAAC,SAAS;QACpC,yBAAyB,EAAE,EAAE,CAAC,YAAY;QAC1C,uBAAuB,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU;QAC5C,2BAA2B,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS;QAC/C,8BAA8B,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY;QACrD,0BAA0B,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ;QAC7C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO;QAC3C,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB;QACvE,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB;QAC9D,2BAA2B,EAAE,EAAE,CAAC,YAAY,IAAI,EAAE;QAClD,uBAAuB,EAAE,EAAE,CAAC,QAAQ,IAAI,EAAE;QAC1C,8BAA8B,EAAE,EAAE,CAAC,eAAe,IAAI,EAAE;QACxD,wBAAwB,EAAE,EAAE,CAAC,SAAS,IAAI,EAAE;QAC5C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO;QAC/C,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE;QACzD,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB;QAC/D,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO;QACzD,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI;QACnD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ;QAC3D,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB;KAC5E,CACF,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE,oBAAoB,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC"}

package/dist/lib/generators/sw-build-utils.js

@@ -0,0 +1,69 @@
+import { readdirSync, existsSync } from "fs";
+import { join, relative, extname } from "path";
+export function collectAssets(dir, baseDir) {
+    if (!existsSync(dir))
+        return [];
+    const entries = readdirSync(dir, { withFileTypes: true });
+    const assets = [];
+    for (const entry of entries) {
+        const fullPath = join(dir, entry.name);
+        if (entry.isDirectory()) {
+            assets.push(...collectAssets(fullPath, baseDir));
+        }
+        else {
+            assets.push("/" + relative(baseDir, fullPath));
+        }
+    }
+    return assets;
+}
+export function buildFallbackList(config) {
+    const fallback = [];
+    if (config.features.pwa.enabled)
+        fallback.push("/manifest.json");
+    const nav = config.features.serviceWorker.navigation;
+    if (nav.fallback && !fallback.includes(nav.fallback)) {
+        fallback.push(nav.fallback);
+    }
+    for (const route of nav.precacheRoutes || []) {
+        if (!fallback.includes(route))
+            fallback.push(route);
+    }
+    for (const rule of nav.rules || []) {
+        if (rule.fallback && !fallback.includes(rule.fallback)) {
+            fallback.push(rule.fallback);
+        }
+    }
+    return fallback;
+}
+export function scanPrecacheAssets(config, projectRoot, swFile) {
+    const dirsRaw = config.build.precacheDirs || {};
+    const dirs = dirsRaw;
+    const scanned = [];
+    for (const [dir, raw] of Object.entries(dirs)) {
+        const dirPath = join(projectRoot, dir);
+        const cfg = raw;
+        const normPrefix = cfg.prefix.replace(/\/+$/, "");
+        for (const a of collectAssets(dirPath, dirPath)) {
+            if (cfg.matchExtensions?.length && !cfg.matchExtensions.includes(extname(a)))
+                continue;
+            let urlPath = normPrefix + "/" + a.slice(1);
+            if (cfg.stripExtensions?.includes(extname(a))) {
+                urlPath = urlPath.replace(/\.[^/.]+$/, "");
+            }
+            if (cfg.stripSuffixes) {
+                for (const suffix of cfg.stripSuffixes) {
+                    if (urlPath.endsWith("/" + suffix)) {
+                        urlPath = urlPath.slice(0, -suffix.length - 1) + "/";
+                    }
+                }
+            }
+            if (urlPath !== "/" && urlPath.endsWith("/")) {
+                urlPath = urlPath.slice(0, -1);
+            }
+            if (urlPath !== `/${swFile}`)
+                scanned.push(urlPath);
+        }
+    }
+    return scanned;
+}
+//# sourceMappingURL=sw-build-utils.js.map

package/dist/lib/generators/sw-build-utils.js.map

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

package/dist/lib/generators/sw-generator.js

@@ -1,61 +1,50 @@
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
+import { writeFileSync, existsSync, mkdirSync } from "fs";
+import { readFile } from "fs/promises";
 import { join } from "path";
 import { fileURLToPath } from "url";
 import { loadConfigAsync } from "../config/loader.js";
 import { assembleSW } from "./sw-sections/assemble-sw.js";
-function resolveVersion(config, pkgVersion) {
-    const v = config.features.serviceWorker.version;
-    if (v === "hash")
-        return "0.0.0";
-    if (v === "package")
-        return pkgVersion || "1.0.0";
-    return v;
-}
+import { createRequire } from "module";
 export async function generateSW(options = {}) {
     const optProjectRoot = options.projectRoot || process.cwd();
     const optConfigPath = options.configPath;
-    const pkgPath = join(optProjectRoot, "package.json");
-    let pkg = { version: "1.0.0" };
-    if (existsSync(pkgPath)) {
+    const { config } = await loadConfigAsync(optProjectRoot, optConfigPath);
+    let sw = assembleSW(config, optProjectRoot);
+    let apiBase = "";
+    const configJsPath = join(optProjectRoot, "swoff", "config.js");
+    if (existsSync(configJsPath)) {
         try {
-            pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+            const _require = createRequire(import.meta.url);
+            const configMod = _require(configJsPath);
+            apiBase = configMod.API_BASE || "";
         }
-        catch {
-            console.log("Could not read package.json, using default version");
+        catch { }
+    }
+    else {
+        const configTsPath = join(optProjectRoot, "swoff", "config.ts");
+        if (existsSync(configTsPath)) {
+            const content = await readFile(configTsPath, "utf8");
+            const match = content.match(/export\s+const\s+API_BASE\s*=\s*"([^"]+)"/);
+            apiBase = match ? match[1] : "";
         }
     }
-    const { config, configSource } = await loadConfigAsync(optProjectRoot, optConfigPath);
-    if (!config.enabled) {
-        console.log("Swoff config generation disabled. Using custom code mode.");
-        return { version: "", outputFile: "" };
+    if (sw.includes("SWOFF_API_BASE")) {
+        sw = sw.replace(/SWOFF_API_BASE/g, apiBase);
     }
-    const v = config.features.serviceWorker.version;
-    const versionEnabled = v !== "hash";
-    const version = resolveVersion(config, pkg.version || "1.0.0");
-    const sw = assembleSW(config, version, optProjectRoot);
     const outputDir = join(optProjectRoot, config.build.outputDir);
     if (!existsSync(outputDir)) {
         mkdirSync(outputDir, { recursive: true });
     }
     const swFilename = config.build.swFilename;
-    const outputFile = versionEnabled ? `${swFilename}-v${version}.js` : `${swFilename}.js`;
+    const outputFile = `${swFilename}.js`;
     try {
         writeFileSync(join(outputDir, outputFile), sw);
-        if (versionEnabled) {
-            writeFileSync(join(outputDir, "version.json"), JSON.stringify({
-                version,
-                minSupportedVersion: config.features.serviceWorker.minSupportedVersion,
-                generatedAt: new Date().toISOString(),
-                configEnabled: config.enabled,
-                configSource,
-            }, null, 2));
-        }
         console.log(`${outputDir}/${outputFile}`);
     }
     catch (err) {
         console.log(`Error writing files: ${err instanceof Error ? err.message : String(err)}`);
     }
-    return { version, outputFile };
+    return { outputFile };
 }
 if (fileURLToPath(import.meta.url) === fileURLToPath(new URL(process.argv[1], "file:"))) {
     const args = process.argv.slice(2);

package/dist/lib/generators/sw-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"sw-generator.js","sourceRoot":"","sources":["../../../src/lib/generators/sw-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sw-generator.js","sourceRoot":"","sources":["../../../src/lib/generators/sw-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAOvC,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAA4B,EAAE;IAC7D,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC5D,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC;IAEzC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAExE,IAAI,EAAE,GAAG,UAAU,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAChE,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;YACzC,OAAO,GAAG,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC;QACrC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAChE,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACzE,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IACD,IAAI,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;IAC3C,MAAM,UAAU,GAAG,GAAG,UAAU,KAAK,CAAC;IAEtC,IAAI,CAAC;QACH,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,IAAI,UAAU,EAAE,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,CAAC;AACxB,CAAC;AAED,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,aAAa,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;IACxF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,MAAM,UAAU,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9E,CAAC,KAAK,IAAI,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAC5C,MAAM,UAAU,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,eAAe,EAAE,UAAU,EAAE,CAAC"}

package/dist/lib/generators/sw-sections/activate-handler.js

@@ -1,44 +1,98 @@
-export function generateActivateHandler(clearRuntimeOnUpdate, navigationPreload, maxRuntimeCacheAge) {
-    const cacheCleanup = clearRuntimeOnUpdate
-        ? `keys.filter((key) => key !== CACHE_NAME)`
-        : `keys.filter((key) => key !== CACHE_NAME && key !== CACHE_NAME_RUNTIME)`;
+export function generateActivateHandler(navigationPreload, maxRuntimeCacheAge) {
     const navPreloadCode = navigationPreload ? `
       if (self.registration.navigationPreload) {
         await self.registration.navigationPreload.enable();
       }` : "";
     const evictionCode = maxRuntimeCacheAge && maxRuntimeCacheAge > 0 ? `
       await evictStaleRuntimeCache();` : "";
-    const evictionHelper = maxRuntimeCacheAge && maxRuntimeCacheAge > 0 ? `
-const MAX_RUNTIME_CACHE_AGE = ${maxRuntimeCacheAge};
+    const evictionHelper = `
+const MAX_RUNTIME_CACHE_AGE = ${maxRuntimeCacheAge && maxRuntimeCacheAge > 0 ? maxRuntimeCacheAge : Infinity};
 
+${maxRuntimeCacheAge && maxRuntimeCacheAge > 0 ? `
 async function evictStaleRuntimeCache() {
-  const cache = await caches.open(CACHE_NAME_RUNTIME);
-  const keys = await cache.keys();
-  const cutoff = Date.now() - MAX_RUNTIME_CACHE_AGE * 1000;
-  const promises = [];
-  for (const request of keys) {
-    promises.push((async () => {
-      const response = await cache.match(request);
-      const cachedAt = response?.headers.get("X-SW-Cached-At");
-      if (cachedAt && Number(cachedAt) < cutoff) {
-        await cache.delete(request);
+  var cutoff = Date.now() - MAX_RUNTIME_CACHE_AGE * 1000;
+  for (const name of ["swoff-runtime", "swoff-runtime-html"]) {
+    const cache = await caches.open(name);
+    const keys = await cache.keys();
+    const promises = [];
+    for (const request of keys) {
+      promises.push((async () => {
+        const response = await cache.match(request);
+        const cachedAt = response?.headers.get("X-SW-Cached-At");
+        if (cachedAt && Number(cachedAt) < cutoff) {
+          await cache.delete(request);
+        }
+      })());
+    }
+    try {
+      await Promise.all(promises);
+    } catch {}
+  // Clean orphaned tag DB records
+    try {
+      const db = await openDB("swoff-cache-tags", 1, function(db) {
+        if (!db.objectStoreNames.contains("tags")) {
+          db.createObjectStore("tags", { keyPath: "url" });
+        }
+      });
+      try {
+        await pruneStaleStore(db, "tags", cutoff);
+      } finally {
+        db.close();
       }
-    })());
+    } catch {}
   }
-  await Promise.all(promises);
 }
-` : "";
+` : ""}`;
     return `${evictionHelper}
+async function checkCacheVersion() {
+  const current = CACHE_NAME;
+  let prev = null;
+  try {
+    const db = await openDB("swoff-meta", 1, function(db) {
+      if (!db.objectStoreNames.contains("meta"))
+        db.createObjectStore("meta", { keyPath: "key" });
+    });
+    const tx = db.transaction("meta", "readonly");
+    const store = tx.objectStore("meta");
+    const entry = await new Promise(function(resolve, reject) {
+      const req = store.get("cacheName");
+      req.onsuccess = function() { resolve(req.result); };
+      req.onerror = function() { reject(req.error); };
+    });
+    prev = entry ? entry.value : null;
+    db.close();
+  } catch {}
+
+  if (prev !== null && prev !== current) {
+    await Promise.all(
+      ["swoff-runtime", "swoff-runtime-html"].map(function(n) { return caches.delete(n); })
+    );
+  }
+
+  try {
+    const db = await openDB("swoff-meta", 1);
+    const tx = db.transaction("meta", "readwrite");
+    const store = tx.objectStore("meta");
+    store.put({ key: "cacheName", value: current });
+    await new Promise(function(resolve, reject) {
+      tx.oncomplete = function() { resolve(); };
+      tx.onerror = function() { reject(tx.error); };
+    });
+    db.close();
+  } catch {}
+}
+
 self.addEventListener("activate", (event) => {
   event.waitUntil(
     (async () => {
+      if (typeof clearAllReactive === "function") clearAllReactive();
+      await checkCacheVersion();
       await self.clients.claim();${navPreloadCode}${evictionCode}
-      const keys = await caches.keys();
-      await Promise.all(
-        ${cacheCleanup}.map((key) => caches.delete(key))
-      );
     })()
   );
+  startBackgroundPrecache().catch(function(err) {
+    console.error("Background precache error:", err);
+  });
 });`;
 }
 //# sourceMappingURL=activate-handler.js.map

package/dist/lib/generators/sw-sections/activate-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"activate-handler.js","sourceRoot":"","sources":["../../../../src/lib/generators/sw-sections/activate-handler.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,uBAAuB,CAAC,oBAA6B,EAAE,iBAA2B,EAAE,kBAA2B;IAC7H,MAAM,YAAY,GAAG,oBAAoB;QACvC,CAAC,CAAC,0CAA0C;QAC5C,CAAC,CAAC,wEAAwE,CAAC;IAE7E,MAAM,cAAc,GAAG,iBAAiB,CAAC,CAAC,CAAC;;;QAGrC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEZ,MAAM,YAAY,GAAG,kBAAkB,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC;sCAChC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE1C,MAAM,cAAc,GAAG,kBAAkB,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC;gCACxC,kBAAkB;;;;;;;;;;;;;;;;;;CAkBjD,CAAC,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,GAAG,cAAc;;;;mCAIS,cAAc,GAAG,YAAY;;;UAGtD,YAAY;;;;IAIlB,CAAC;AACL,CAAC"}
+{"version":3,"file":"activate-handler.js","sourceRoot":"","sources":["../../../../src/lib/generators/sw-sections/activate-handler.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,uBAAuB,CAAC,iBAA2B,EAAE,kBAA2B;IAC9F,MAAM,cAAc,GAAG,iBAAiB,CAAC,CAAC,CAAC;;;QAGrC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEZ,MAAM,YAAY,GAAG,kBAAkB,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC;sCAChC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE1C,MAAM,cAAc,GAAG;gCACO,kBAAkB,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ;;EAE1G,kBAAkB,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkChD,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAEP,OAAO,GAAG,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA4CS,cAAc,GAAG,YAAY;;;;;;IAM5D,CAAC;AACL,CAAC"}