@swoff/cli 0.3.5 → 0.3.6

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

@@ -0,0 +1,113 @@
+/**
+ * Generates client-injector.{js|ts} - orchestrator that wires feature modules together.
+ */
+import { writeFile } from "./context.js";
+export function generateClientInjector(ctx) {
+    const ext = ctx.ext;
+    const ts = ext === "ts";
+    const pwaEnabled = ctx.config.features.pwa.enabled;
+    const mutationQueueEnabled = ctx.config.features.mutationQueue;
+    const crossTabSync = ctx.config.features.crossTabSync;
+    const clientRegistration = ctx.config.features.clientRegistration;
+    const pwaImport = pwaEnabled
+        ? `import { setupPwaInstall } from "./pwa/install.${ext}";
+`
+        : "";
+    const pwaCall = pwaEnabled ? `setupPwaInstall();\n` : "";
+    const mutationImport = mutationQueueEnabled
+        ? `import { processMutationQueue } from "./mutation-queue.${ext}";
+`
+        : "";
+    const mutationOnlineListener = mutationQueueEnabled
+        ? `
+// --- Mutation Queue Online Listener ---
+window.addEventListener("online", processMutationQueue);
+`
+        : "";
+    const crossTabHandler = crossTabSync
+        ? `
+    if (event.data.type === "TAG_INVALIDATED" && event.data.tag) {
+      window.dispatchEvent(
+        new CustomEvent("cache-invalidated", {
+          detail: { tags: [event.data.tag] },
+        })
+      );
+    }
+`
+        : "";
+    const swImport = clientRegistration
+        ? `import {
+  initServiceWorker as swInit,
+  handleUpdateApproved,
+  skipWaiting,
+} from "./sw/injector.${ext}";
+`
+        : "";
+    const swExports = clientRegistration
+        ? `
+export { handleUpdateApproved, skipWaiting };
+`
+        : "";
+    const code = `/**
+ * Swoff Client Injector
+ * Orchestrates SW registration, PWA install, and cross-tab sync.
+ * Single entry point for all Swoff client-side features.
+ *
+ * Usage:
+ *   import { initServiceWorker } from './swoff/client-injector.${ext}';
+ *   initServiceWorker();
+ *
+ * Window events (dispatched by this module):
+ *   sw-progress           - Download progress (detail: { percent, downloaded, total })
+ *   sw-ready              - SW active and controlling page
+ *   sw-error              - SW registration failed
+ *   cache-invalidated     - Cache entries cleared (detail: { tags })
+ *   mutation-sync-complete - Queued mutations synced (detail: { succeeded, failed })
+ *   mutation-queue-changed - Queue modified
+ *
+ * Window events (dispatched by feature modules):
+ *   pwa-installable       - PWA can be installed (detail: { isInstallable: true })
+ *   pwa-installed         - User accepted install (detail: { outcome: 'accepted' })
+ *   sw-auth-unauthorized  - 401 response received
+ *   sw-auth-state-change  - Login or logout (detail: { authenticated: boolean })
+ *   mutation-rollback     - Mutation exhausted retries
+ *   sw-update-available   - New version ready (detail: { version })
+ *   sw-version-detected   - Version info available
+ */
+${pwaImport}${mutationImport}${swImport}
+${pwaCall}${mutationOnlineListener}
+// --- SW Message Listener ---
+if (typeof window !== "undefined" && "serviceWorker" in navigator) {
+  navigator.serviceWorker.addEventListener("message", (event) => {
+    if (event.data.type === "SW_PROGRESS") {
+      const { percent, downloaded, total } = event.data;
+      window.dispatchEvent(
+        new CustomEvent("sw-progress", {
+          detail: { percent, downloaded, total },
+        })
+      );
+    }
+    if (event.data.type === "BACKGROUND_SYNC_COMPLETE") {
+      const { succeeded, failed, tags } = event.data.detail;
+      window.dispatchEvent(
+        new CustomEvent("mutation-sync-complete", {
+          detail: { succeeded, failed },
+        })
+      );
+      if (tags && tags.length > 0) {
+        window.dispatchEvent(
+          new CustomEvent("cache-invalidated", { detail: { tags } })
+        );
+      }
+      window.dispatchEvent(new CustomEvent("mutation-queue-changed"));
+    }${crossTabHandler}  });
+}
+
+/** Initialize SW registration and all client-side features (PWA install, mutation queue, cross-tab sync). Call once at app startup. */
+export async function initServiceWorker()${ts ? ": Promise<void>" : " "}{
+${clientRegistration ? "  await swInit();" : "  // No SW registration configured"}
+}${swExports}
+`;
+    writeFile(ctx, `client-injector.${ext}`, code);
+}
+//# sourceMappingURL=client-injector.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"client-injector.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/client-injector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,UAAU,sBAAsB,CAAC,GAAqB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,EAAE,GAAG,GAAG,KAAK,IAAI,CAAC;IACxB,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;IACnD,MAAM,oBAAoB,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/D,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC;IACtD,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC;IAElE,MAAM,SAAS,GAAG,UAAU;QAC1B,CAAC,CAAC,kDAAkD,GAAG;CAC1D;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzD,MAAM,cAAc,GAAG,oBAAoB;QACzC,CAAC,CAAC,0DAA0D,GAAG;CAClE;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,sBAAsB,GAAG,oBAAoB;QACjD,CAAC,CAAC;;;CAGL;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,eAAe,GAAG,YAAY;QAClC,CAAC,CAAC;;;;;;;;CAQL;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,kBAAkB;QACjC,CAAC,CAAC;;;;wBAIkB,GAAG;CAC1B;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,SAAS,GAAG,kBAAkB;QAClC,CAAC,CAAC;;CAEL;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,IAAI,GAAG;;;;;;kEAMmD,GAAG;;;;;;;;;;;;;;;;;;;;EAoBnE,SAAS,GAAG,cAAc,GAAG,QAAQ;EACrC,OAAO,GAAG,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;OAyB3B,eAAe;;;;2CAIqB,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG;EACrE,kBAAkB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oCAAoC;GAC9E,SAAS;CACX,CAAC;IAEA,SAAS,CAAC,GAAG,EAAE,mBAAmB,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC"}

package/dist/lib/generators/file-generators/context.js

@@ -3,14 +3,15 @@
  * Contains config, paths, and the generated files tracker.
  */
 import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { join } from "path";
-export function ensureSwoffDir(ctx) {
-    if (!existsSync(ctx.swoffDir))
-        mkdirSync(ctx.swoffDir, { recursive: true });
+import { join, dirname } from "path";
+export function ensureDir(dir) {
+    if (!existsSync(dir))
+        mkdirSync(dir, { recursive: true });
 }
 export function writeFile(ctx, filename, code) {
-    ensureSwoffDir(ctx);
-    writeFileSync(join(ctx.swoffDir, filename), code);
+    const fullPath = join(ctx.swoffDir, filename);
+    ensureDir(dirname(fullPath));
+    writeFileSync(fullPath, code);
     ctx.generatedFiles.push(`swoff/${filename}`);
 }
 //# sourceMappingURL=context.js.map

package/dist/lib/generators/file-generators/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAY5B,MAAM,UAAU,cAAc,CAAC,GAAqB;IAClD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAqB,EAAE,QAAgB,EAAE,IAAY;IAC7E,cAAc,CAAC,GAAG,CAAC,CAAC;IACpB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAYrC,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAqB,EAAE,QAAgB,EAAE,IAAY;IAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7B,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,CAAC;AAC/C,CAAC"}

package/dist/lib/generators/file-generators/fetch-wrapper.js

@@ -1,79 +1,209 @@
 /**
- * Generates fetch-wrapper.js - fetch with cache strategy headers and deduplication.
+ * Generates fetch-wrapper.ts/js — unified fetch with caching, auth, offline queue, and auto-invalidation.
  */
 import { writeFile } from "./context.js";
 export function generateFetchWrapper(ctx) {
     const ext = ctx.ext;
+    const ts = ext === "ts";
+    const T = (type) => (ts ? `: ${type}` : "");
+    const R = (type) => (ts ? `: ${type} ` : " ");
+    const G = (type) => (ts ? `<${type}>` : "");
+    const tagInvalidation = ctx.config.features.tagInvalidation;
+    const authEnabled = ctx.config.features.auth.enabled;
+    const mutationQueue = ctx.config.features.mutationQueue;
+    const importLines = [
+        tagInvalidation
+            ? `import { generateTags } from "./invalidation-tags.${ext}";`
+            : "",
+        tagInvalidation ? `import { invalidateByTags } from "./cache.${ext}";` : "",
+        authEnabled
+            ? `import { getAuth, clearAuth } from "./auth/store.${ext}";`
+            : "",
+        mutationQueue
+            ? `import { queueMutation } from "./mutation-queue.${ext}";`
+            : "",
+    ]
+        .filter(Boolean)
+        .join("\n");
+    const interfaceBlock = ts
+        ? `
+export interface FetchWithCacheResult {
+  response${T("Response")};
+  fromCache${T("boolean")};
+}
+`
+        : "";
+    const optionsType = ts ? `FetchWithCacheOptions` : `options`;
+    const optionsInterface = ts
+        ? `
+export interface FetchWithCacheOptions extends RequestInit {
+  tags?: string[];
+  staleWhileRevalidate?: boolean;
+  auth?: boolean;
+  queueOffline?: boolean;
+  invalidate?: 'auto' | string[] | false;
+}
+`
+        : "";
+    const authBlock = authEnabled
+        ? `
+  if (options.auth) {
+    const auth = await getAuth();
+    if (auth?.token) {
+      headers.set("Authorization", \`Bearer \${auth.token}\`);
+    }
+  }`
+        : "";
+    const authUrlsBlock = authEnabled
+        ? `
+  // Auth endpoints bypass SW cache
+  const authPaths = ["/login", "/logout", "/register"];
+  if (options.auth && authPaths.some((p) => url.includes(p)) && !headers.has("X-SW-Cache-Strategy")) {
+    headers.set("X-SW-Cache-Strategy", "mutation");
+  }`
+        : "";
+    const auth401Block = authEnabled
+        ? `
+  if (options.auth && response.status === 401) {
+    await clearAuth();
+    window.dispatchEvent(new CustomEvent("sw-auth-unauthorized"));
+  }`
+        : "";
+    const offlineReadBlock = `    if (isRead) {
+      const cached = await caches.match(input);
+      if (cached) return { response: cached, fromCache: true };
+      throw new Error("Offline: no cached data available");
+    }`;
+    const offlineWriteBlock = mutationQueue
+        ? `    // Write offline — auto-queue
+    if (options.queueOffline !== false) {
+      const headerObj: Record<string, string> = {};
+      headers.forEach((value, key) => {
+        headerObj[key] = value;
+      });
+      await queueMutation({
+        method,
+        url,
+        body: options.body,
+        headers: headerObj,
+        tags: options.tags || [],
+        timestamp: Date.now(),
+      });
+      return {
+        response: new Response(null, { status: 202, statusText: "Queued" }),
+        fromCache: false,
+      };
+    }
+    throw new Error("Offline: write operation failed");`
+        : `    throw new Error("Offline: write operation failed");`;
+    const autoInvalidateBlock = tagInvalidation
+        ? `
+  // Auto-invalidate after mutation success
+  if (!isRead && response.ok) {
+    const invalidateSetting = options.invalidate !== false ? (options.invalidate || 'auto') : false;
+    if (invalidateSetting !== false) {
+      const tagsToInvalidate${T("string[]")} = Array.isArray(invalidateSetting)
+        ? invalidateSetting
+        : (options.tags || generateTags(url));
+      if (tagsToInvalidate.length > 0) {
+        await invalidateByTags(tagsToInvalidate);
+      }
+    }
+  }`
+        : "";
+    const autoTagsBlock = tagInvalidation
+        ? `
+  // Auto-generate tags from URL if not provided
+  if (!options.tags && isRead) {
+    const urlTags = generateTags(url);
+    if (urlTags.length > 0) {
+      headers.set("X-SW-Cache-Tags", urlTags.join(","));
+    }
+  }`
+        : "";
     const code = `/**
  * Swoff Fetch Wrapper
- * Framework-agnostic fetch with cache strategy, tags, and query deduplication.
+ * Unified fetch with caching, auth, offline queue, and auto-invalidation.
  *
  * Usage:
  *   import { fetchWithCache } from './swoff/fetch-wrapper.${ext}';
  *
- *   // GET - cached with tag
- *   const todos = await fetchWithCache("/api/todos", { tags: ["todos"] }).then(r => r.json());
+ *   // GET — cached with auto-generated tags
+ *   const { response } = await fetchWithCache("/api/todos");
+ *   const data = await response.json();
  *
- *   // POST - mutation (passes through to server)
+ *   // POST — mutation with auto-invalidation
  *   await fetchWithCache("/api/todos", {
  *     method: "POST",
  *     body: JSON.stringify({ title: "New task" }),
  *   });
  *
- *   // Stale-while-revalidate
- *   const data = await fetchWithCache("/api/data", {
+ *   // Authenticated request
+ *   const { response: userRes } = await fetchWithCache("/api/me", { auth: true });
+ *
+ *   // Custom tags + stale-while-revalidate
+ *   const { response: staleRes, fromCache } = await fetchWithCache("/api/data", {
  *     tags: ["data"],
  *     staleWhileRevalidate: true,
- *   }).then(r => r.json());
+ *   });
+ *
+ *   // Offline: auto-queues writes (disable with queueOffline: false)
+ *   await fetchWithCache("/api/todos", {
+ *     method: "POST",
+ *     body: JSON.stringify({ title: "Offline task" }),
+ *   });
+ *   // When back online, processMutationQueue() replays them
  */
 
-const inFlightRequests = new Map();
+${importLines}
+${interfaceBlock}${optionsInterface}
+const inFlightRequests = new Map${G("string, Promise<Response>")}();
+
+/** Fetch with caching, auth, offline queue, and auto-invalidation. Returns { response, fromCache }. */
+export async function fetchWithCache(input${T("RequestInfo")}, options${T("RequestInit & { tags?: string[]; staleWhileRevalidate?: boolean; auth?: boolean; queueOffline?: boolean; invalidate?: 'auto' | string[] | false }")} = {})${R("Promise<FetchWithCacheResult>")}{
+  const method = (options.method || "GET").toUpperCase();
+  const isRead = method === "GET" || method === "HEAD";
+  const url = typeof input === "string" ? input : input.url;
 
-export async function fetchWithCache(input, options = {}) {
   const headers = new Headers(options.headers);
-  const method = options.method || "GET";
 
+  // Set cache strategy
   if (!headers.has("X-SW-Cache-Strategy")) {
-    headers.set(
-      "X-SW-Cache-Strategy",
-      method === "GET" || method === "HEAD" ? "read" : "mutation"
-    );
+    headers.set("X-SW-Cache-Strategy", isRead ? "read" : "mutation");
+  }
+${autoTagsBlock}
+  // Custom tags override auto-generated
+  if (options.tags && options.tags.length > 0) {
+    headers.set("X-SW-Cache-Tags", options.tags.join(","));
   }
 
   if (options.staleWhileRevalidate) {
     headers.set("X-SW-Stale", "true");
   }
+${authBlock}${authUrlsBlock}
+  const fetchOptions${T("RequestInit")} = { ...options, headers };
 
-  if (options.tags && options.tags.length > 0) {
-    headers.set("X-SW-Cache-Tags", options.tags.join(","));
+  // Offline handling
+  if (!navigator.onLine) {
+${offlineReadBlock}
+${offlineWriteBlock}
   }
 
-  if (method === "GET" || method === "HEAD") {
-    const url = typeof input === "string" ? input : input.url;
-    if (inFlightRequests.has(url)) {
-      return inFlightRequests.get(url).then((r) => r.clone());
+  // Deduplicate in-flight GET requests
+  let responsePromise${T("Promise<Response>")};
+  if (isRead && inFlightRequests.has(url)) {
+    responsePromise = inFlightRequests.get(url)!.then((r) => r.clone());
+  } else {
+    responsePromise = fetch(input, fetchOptions);
+    if (isRead) {
+      inFlightRequests.set(url, responsePromise.finally(() => inFlightRequests.delete(url)));
     }
-    const promise = fetch(input, { ...options, headers }).finally(() => {
-      inFlightRequests.delete(url);
-    });
-    inFlightRequests.set(url, promise);
-    return promise;
   }
 
-  return fetch(input, { ...options, headers });
-}
-
-export async function fetchWithCacheOrQueue(input, options = {}) {
-  if (!navigator.onLine) {
-    if (options.method === "GET" || options.method === "HEAD") {
-      const cached = await caches.match(input);
-      if (cached) return cached;
-      throw new Error("Offline: no cached data");
-    } else {
-      throw new Error("Offline: mutation queued");
-    }
-  }
-  return fetchWithCache(input, options);
+  const response = await responsePromise;
+${autoInvalidateBlock}${auth401Block}
+  const fromCache = response.headers.get("X-SW-From-Cache") === "true";
+  return { response, fromCache };
 }
 `;
     writeFile(ctx, `fetch-wrapper.${ext}`, code);

package/dist/lib/generators/file-generators/fetch-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-wrapper.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/fetch-wrapper.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,UAAU,oBAAoB,CAAC,GAAqB;IACxD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,IAAI,GAAG;;;;;6DAK8C,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkE/D,CAAC;IAEA,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"fetch-wrapper.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/fetch-wrapper.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAoB,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,UAAU,oBAAoB,CAAC,GAAqB;IACxD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,EAAE,GAAG,GAAG,KAAK,IAAI,CAAC;IACxB,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;IAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;IACrD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;IAExD,MAAM,WAAW,GAAG;QAClB,eAAe;YACb,CAAC,CAAC,qDAAqD,GAAG,IAAI;YAC9D,CAAC,CAAC,EAAE;QACN,eAAe,CAAC,CAAC,CAAC,6CAA6C,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QAC3E,WAAW;YACT,CAAC,CAAC,oDAAoD,GAAG,IAAI;YAC7D,CAAC,CAAC,EAAE;QACN,aAAa;YACX,CAAC,CAAC,mDAAmD,GAAG,IAAI;YAC5D,CAAC,CAAC,EAAE;KACP;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,cAAc,GAAG,EAAE;QACvB,CAAC,CAAC;;YAEM,CAAC,CAAC,UAAU,CAAC;aACZ,CAAC,CAAC,SAAS,CAAC;;CAExB;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,WAAW,GAAG,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7D,MAAM,gBAAgB,GAAG,EAAE;QACzB,CAAC,CAAC;;;;;;;;CAQL;QACG,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,SAAS,GAAG,WAAW;QAC3B,CAAC,CAAC;;;;;;IAMF;QACA,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,WAAW;QAC/B,CAAC,CAAC;;;;;IAKF;QACA,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,YAAY,GAAG,WAAW;QAC9B,CAAC,CAAC;;;;IAIF;QACA,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,gBAAgB,GAAG;;;;MAIrB,CAAC;IAEL,MAAM,iBAAiB,GAAG,aAAa;QACrC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;wDAmBkD;QACpD,CAAC,CAAC,yDAAyD,CAAC;IAE9D,MAAM,mBAAmB,GAAG,eAAe;QACzC,CAAC,CAAC;;;;;8BAKwB,CAAC,CAAC,UAAU,CAAC;;;;;;;IAOvC;QACA,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC;;;;;;;IAOF;QACA,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,IAAI,GAAG;;;;;6DAK8C,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6B9D,WAAW;EACX,cAAc,GAAG,gBAAgB;kCACD,CAAC,CAAC,2BAA2B,CAAC;;;4CAGpB,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,mJAAmJ,CAAC,SAAS,CAAC,CAAC,+BAA+B,CAAC;;;;;;;;;;;EAWvQ,aAAa;;;;;;;;;EASb,SAAS,GAAG,aAAa;sBACL,CAAC,CAAC,aAAa,CAAC;;;;EAIpC,gBAAgB;EAChB,iBAAiB;;;;uBAII,CAAC,CAAC,mBAAmB,CAAC;;;;;;;;;;;EAW3C,mBAAmB,GAAG,YAAY;;;;CAInC,CAAC;IAEA,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}

package/dist/lib/generators/file-generators/generate-hooks.js

@@ -17,9 +17,11 @@ export function generateHooks(ctx) {
     if (config.features.mutationQueue) {
         writeMutationQueueHook(hooksDir, ext);
     }
+    writeCachedFetchHook(hooksDir, ext, config.features.tagInvalidation);
 }
 function writePWAHooks(dir, ext) {
     writeFileSync(join(dir, `usePWAUpdate.${ext}x`), `import { useState, useEffect, useCallback } from "react";
+import { handleUpdateApproved } from "../client-injector.${ext}";
 
 export function usePWAUpdate() {
   const [state, setState] = useState({
@@ -62,7 +64,6 @@ export function usePWAUpdate() {
 
   const acceptUpdate = useCallback(async () => {
     if (!state.availableVersion) return;
-    const { handleUpdateApproved } = await import("../sw-injector.${ext}");
     await handleUpdateApproved(state.availableVersion);
   }, [state.availableVersion]);
 
@@ -102,7 +103,7 @@ export function useSWProgress() {
 }
 function writeAuthHook(dir, ext) {
     writeFileSync(join(dir, `useAuth.${ext}x`), `import { useState, useEffect } from "react";
-import { getAuthState } from "../auth-state.${ext}";
+import { getAuthState } from "../auth/state.${ext}";
 
 export function useAuth() {
   const [state, setState] = useState({
@@ -133,6 +134,63 @@ export function useAuth() {
 }
 `);
 }
+function writeCachedFetchHook(dir, ext, tagInvalidation) {
+    const ts = ext === "ts";
+    const extraEffect = tagInvalidation
+        ? `
+  useEffect(() => {
+    const onInvalidated${ts ? ": EventListener" : ""} = (e${ts ? ": Event" : ""}) => {
+      const detail = (e as CustomEvent).detail;
+      const tags = detail?.tags;
+      if (!tags || !Array.isArray(tags)) return;
+      const urlTags = generateTags(url);
+      if (tags.some((t) => urlTags.includes(t))) {
+        setRefetchCount((c) => c + 1);
+      }
+    };
+    window.addEventListener("cache-invalidated", onInvalidated);
+    return () => window.removeEventListener("cache-invalidated", onInvalidated);
+  }, [url]);`
+        : "";
+    const importTags = tagInvalidation
+        ? `import { generateTags } from "../invalidation-tags.${ext}";\n`
+        : "";
+    const stringType = ts ? ": string" : "";
+    const respType = ts ? "<Response | null>" : "";
+    writeFileSync(join(dir, `useCachedFetch.${ext}x`), `import { useState, useEffect, useCallback } from "react";
+import { fetchWithCache } from "../fetch-wrapper.${ext}";
+${importTags}
+export function useCachedFetch(url${stringType}, options = {}) {
+  const [data, setData] = useState${respType}(null);
+  const [error, setError] = useState(null);
+  const [loading, setLoading] = useState(true);
+  const [refetchCount, setRefetchCount] = useState(0);
+
+  const refetch = useCallback(() => setRefetchCount((c) => c + 1), []);
+
+  useEffect(() => {
+    let cancelled = false;
+    setLoading(true);
+    fetchWithCache(url, options)
+      .then(({ response }) => {
+        if (cancelled) return;
+        setData(response);
+        setError(null);
+      })
+      .catch((err) => {
+        if (cancelled) return;
+        setError(err);
+      })
+      .finally(() => {
+        if (!cancelled) setLoading(false);
+      });
+    return () => { cancelled = true; };
+  }, [url, refetchCount]);
+${extraEffect}
+  return { data, error, loading, refetch };
+}
+`);
+}
 function writeMutationQueueHook(dir, ext) {
     writeFileSync(join(dir, `useMutationQueue.${ext}x`), `import { useState, useEffect } from "react";
 import { getPendingCount } from "../mutation-queue.${ext}";
@@ -150,7 +208,7 @@ export function useMutationQueue() {
       pending: 0,
       lastSync: { succeeded: e.detail.succeeded, failed: e.detail.failed },
     });
-    const onChange = async () => setState((s) => ({ ...s, pending: await getPendingCount() }));
+    const onChange = async () => { const count = await getPendingCount(); setState((s) => ({ ...s, pending: count })); };
 
     window.addEventListener("mutation-sync-complete", onSync as EventListener);
     window.addEventListener("mutation-queue-changed", onChange);

package/dist/lib/generators/file-generators/generate-hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-hooks.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/generate-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,MAAM,UAAU,aAAa,CAAC,GAAqB;IACjD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC;IACrD,IAAI,aAAa,KAAK,OAAO;QAAE,OAAO;IAEtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAChC,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;QAClC,sBAAsB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,GAAW;IAC7C,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,GAAG,CAAC,EACjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oEA2CgE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCtE,CACE,CAAC;IAEF,6CAA6C;AAC/C,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,GAAW;IAC7C,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,WAAW,GAAG,GAAG,CAAC,EAC5B;8CAC0C,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BhD,CACE,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAW,EAAE,GAAW;IACtD,aAAa,CACX,IAAI,CAAC,GAAG,EAAE,oBAAoB,GAAG,GAAG,CAAC,EACrC;qDACiD,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BvD,CACE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"generate-hooks.js","sourceRoot":"","sources":["../../../../src/lib/generators/file-generators/generate-hooks.ts"],"names":[],"mappings":"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"}