serwist 9.1.1 → 10.0.0-preview.10

package/dist/utils/assert.d.ts

@@ -1,4 +1,4 @@
-import type { MapLikeObject } from "../types.js";
+import type { MapLikeObject } from "#lib/types.js";
 declare const finalAssertExports: {
     hasMethod: (object: MapLikeObject, expectedMethod: string, details: MapLikeObject) => void;
     isArray: (value: any[], details: MapLikeObject) => void;

package/dist/utils/assert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../src/utils/assert.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAmEjD,QAAA,MAAM,kBAAkB;wBApDG,aAAa,kBAAkB,MAAM,WAAW,aAAa;qBANhE,GAAG,EAAE,WAAW,aAAa;yBAsB3C,OAAO,iBAEA,QAAQ,WACd,aAAa;qBAQA,GAAG,eAAe,GAAG,EAAE,WAAW,aAAa;qBAnB/C,OAAO,gBAAgB,MAAM,WAAW,aAAa;4BA2BpE,GAAG,iBAEK,QAAQ,WACd,aAAa;QAwBjB,CAAC;AAER,OAAO,EAAE,kBAAkB,IAAI,MAAM,EAAE,CAAC"}
+{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../src/utils/assert.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAmEnD,QAAA,MAAM,kBAAkB;wBApDG,aAAa,kBAAkB,MAAM,WAAW,aAAa;qBANhE,GAAG,EAAE,WAAW,aAAa;yBAsB3C,OAAO,iBAEA,QAAQ,WACd,aAAa;qBAQA,GAAG,eAAe,GAAG,EAAE,WAAW,aAAa;qBAnB/C,OAAO,gBAAgB,MAAM,WAAW,aAAa;4BA2BpE,GAAG,iBAEK,QAAQ,WACd,aAAa;QAwBjB,CAAC;AAER,OAAO,EAAE,kBAAkB,IAAI,MAAM,EAAE,CAAC"}

package/dist/utils/createCacheKey.d.ts

@@ -1,4 +1,4 @@
-import type { PrecacheEntry } from "../types.js";
+import type { PrecacheEntry } from "#lib/types.js";
 interface CacheKey {
     cacheKey: string;
     url: string;

package/dist/utils/createCacheKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCacheKey.d.ts","sourceRoot":"","sources":["../../src/utils/createCacheKey.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,UAAU,QAAQ;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAKD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAAI,OAAO,aAAa,GAAG,MAAM,KAAG,QAuC9D,CAAC"}
+{"version":3,"file":"createCacheKey.d.ts","sourceRoot":"","sources":["../../src/utils/createCacheKey.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,UAAU,QAAQ;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAKD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GAAI,OAAO,aAAa,GAAG,MAAM,KAAG,QAuC9D,CAAC"}

package/dist/utils/generateURLVariations.d.ts

@@ -1,4 +1,4 @@
-import type { PrecacheRouteOptions } from "../types.js";
+import type { PrecacheRouteOptions } from "#lib/types.js";
 /**
  * Generator function that yields possible variations on the original URL to
  * check, one at a time.

package/dist/utils/generateURLVariations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateURLVariations.d.ts","sourceRoot":"","sources":["../../src/utils/generateURLVariations.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGxD;;;;;;;;GAQG;AACH,wBAAiB,qBAAqB,CACpC,GAAG,EAAE,MAAM,EACX,EACE,cAA6B,EAC7B,2BAAmD,EACnD,SAAgB,EAChB,eAAe,GAChB,GAAE,oBAAyB,GAC3B,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CA0BlC"}
+{"version":3,"file":"generateURLVariations.d.ts","sourceRoot":"","sources":["../../src/utils/generateURLVariations.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAG1D;;;;;;;;GAQG;AACH,wBAAiB,qBAAqB,CACpC,GAAG,EAAE,MAAM,EACX,EACE,cAA6B,EAC7B,2BAAmD,EACnD,SAAgB,EAChB,eAAe,GAChB,GAAE,oBAAyB,GAC3B,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CA0BlC"}

package/dist/utils/logger.d.ts

@@ -14,10 +14,10 @@ declare global {
  * before using it.
  */
 export declare const logger: {
-    error: (...args: any[]) => void;
     debug: (...args: any[]) => void;
     log: (...args: any[]) => void;
     warn: (...args: any[]) => void;
+    error: (...args: any[]) => void;
     groupCollapsed: (...args: any[]) => void;
     groupEnd: (...args: any[]) => void;
 };

package/dist/utils/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAQA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,iBAAiB;QACzB,qBAAqB,EAAE,OAAO,CAAC;KAChC;IAED,UAAU,MAAM;QACd,qBAAqB,EAAE,OAAO,CAAC;KAChC;CACF;AAED;;;;;;GAMG;AACH,eAAO,MAAM,MAAM;qBAmEoC,GAAG,EAAE,KAAK,IAAI;qBAAd,GAAG,EAAE,KAAK,IAAI;mBAAd,GAAG,EAAE,KAAK,IAAI;oBAAd,GAAG,EAAE,KAAK,IAAI;8BAAd,GAAG,EAAE,KAAK,IAAI;wBAAd,GAAG,EAAE,KAAK,IAAI;CAE3D,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAQA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,iBAAiB;QACzB,qBAAqB,EAAE,OAAO,CAAC;KAChC;IAED,UAAU,MAAM;QACd,qBAAqB,EAAE,OAAO,CAAC;KAChC;CACF;AAED;;;;;;GAMG;AACH,eAAO,MAAM,MAAM;qBAmEoC,GAAG,EAAE,KAAK,IAAI;mBAAd,GAAG,EAAE,KAAK,IAAI;oBAAd,GAAG,EAAE,KAAK,IAAI;qBAAd,GAAG,EAAE,KAAK,IAAI;8BAAd,GAAG,EAAE,KAAK,IAAI;wBAAd,GAAG,EAAE,KAAK,IAAI;CAE3D,CAAC"}

package/dist/utils/normalizeHandler.d.ts

@@ -1,4 +1,4 @@
-import type { RouteHandler, RouteHandlerObject } from "../types.js";
+import type { RouteHandler, RouteHandlerObject } from "#lib/types.js";
 /**
  * @param handler Either a function, or an object with a
  * 'handle' method.

package/dist/utils/normalizeHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeHandler.d.ts","sourceRoot":"","sources":["../../src/utils/normalizeHandler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGpE;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,YAAY,KAAG,kBAqBxD,CAAC"}
+{"version":3,"file":"normalizeHandler.d.ts","sourceRoot":"","sources":["../../src/utils/normalizeHandler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGtE;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,YAAY,KAAG,kBAqBxD,CAAC"}

package/dist/utils/parseRoute.d.ts

@@ -1,6 +1,6 @@
-import { Route } from "../Route.js";
-import type { HTTPMethod } from "../constants.js";
-import type { RouteHandler, RouteMatchCallback } from "../types.js";
+import type { HTTPMethod } from "#lib/constants.js";
+import { Route } from "#lib/route.js";
+import type { RouteHandler, RouteMatchCallback } from "#lib/types.js";
 /**
  * Parses a `RegExp`, string, or function with a caching strategy into a {@linkcode Route}. This is for
  * when you want to create a {@linkcode Route}, but you don't want to register it just yet: sometimes

package/dist/utils/parseRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseRoute.d.ts","sourceRoot":"","sources":["../../src/utils/parseRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIpE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,GAAG,MAAM,GAAG,kBAAkB,GAAG,KAAK,EAAE,UAAU,YAAY,EAAE,SAAS,UAAU,KAAG,KAyD/H,CAAC"}
+{"version":3,"file":"parseRoute.d.ts","sourceRoot":"","sources":["../../src/utils/parseRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAe,KAAK,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAItE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,GAAG,MAAM,GAAG,kBAAkB,GAAG,KAAK,EAAE,UAAU,YAAY,EAAE,SAAS,UAAU,KAAG,KAyD/H,CAAC"}

package/dist/utils/pluginUtils.d.ts

@@ -1,5 +1,5 @@
-import type { SerwistPlugin } from "../types.js";
+import type { StrategyPlugin } from "#lib/types.js";
 export declare const pluginUtils: {
-    filter: (plugins: SerwistPlugin[], callbackName: string) => SerwistPlugin[];
+    filter: (plugins: StrategyPlugin[], callbackName: string) => StrategyPlugin[];
 };
 //# sourceMappingURL=pluginUtils.d.ts.map

package/dist/utils/pluginUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginUtils.d.ts","sourceRoot":"","sources":["../../src/utils/pluginUtils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,eAAO,MAAM,WAAW;sBACJ,aAAa,EAAE,gBAAgB,MAAM,KAAG,aAAa,EAAE;CAG1E,CAAC"}
+{"version":3,"file":"pluginUtils.d.ts","sourceRoot":"","sources":["../../src/utils/pluginUtils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,eAAO,MAAM,WAAW;sBACJ,cAAc,EAAE,gBAAgB,MAAM,KAAG,cAAc,EAAE;CAG5E,CAAC"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "serwist",
-  "version": "9.1.1",
+  "version": "10.0.0-preview.10",
   "type": "module",
+  "sideEffects": false,
   "description": "A Swiss Army knife for service workers.",
   "files": [
     "src",
@@ -25,23 +26,38 @@
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
-      "legacy": [
-        "./dist/index.legacy.d.ts"
-      ],
       "internal": [
         "./dist/index.internal.d.ts"
       ]
     }
   },
+  "imports": {
+    "#lib/*.js": {
+      "local": "./src/lib/*.ts",
+      "types": "./dist/lib/*.d.ts"
+    },
+    "#index": {
+      "local": "./src/index.ts",
+      "types": "./dist/index.d.ts"
+    },
+    "#index.internal": {
+      "local": "./src/index.internal.ts",
+      "types": "./dist/index.internal.d.ts"
+    },
+    "#models/*.js": {
+      "local": "./src/models/*.ts",
+      "types": "./dist/models/*.d.ts"
+    },
+    "#utils/*.js": {
+      "local": "./src/utils/*.ts",
+      "types": "./dist/utils/*.d.ts"
+    }
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./legacy": {
-      "types": "./dist/index.legacy.d.ts",
-      "default": "./dist/index.legacy.js"
-    },
     "./internal": {
       "types": "./dist/index.internal.d.ts",
       "default": "./dist/index.internal.js"
@@ -49,13 +65,13 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "idb": "8.0.3"
+    "idb": "8.0.3",
+    "@serwist/utils": "10.0.0-preview.10"
   },
   "devDependencies": {
     "rollup": "4.45.1",
     "typescript": "5.8.3",
-    "@serwist/configs": "9.1.1",
-    "@serwist/utils": "9.1.1"
+    "@serwist/configs": "10.0.0-preview.10"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0"
@@ -69,6 +85,7 @@
     "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",
     "dev": "rollup --config rollup.config.js --watch",
     "lint": "biome lint ./src",
+    "qcheck": "biome check ./src",
     "typecheck": "tsc"
   }
 }

package/src/index.internal.ts

@@ -1,19 +1,19 @@
-import { Deferred } from "./utils/Deferred.js";
-import { SerwistError } from "./utils/SerwistError.js";
-import { assert } from "./utils/assert.js";
-import { cacheMatchIgnoreParams } from "./utils/cacheMatchIgnoreParams.js";
-import { cacheNames as privateCacheNames } from "./utils/cacheNames.js";
-import { canConstructReadableStream } from "./utils/canConstructReadableStream.js";
-import { canConstructResponseFromBodyStream } from "./utils/canConstructResponseFromBodyStream.js";
-import { cleanupOutdatedCaches } from "./utils/cleanupOutdatedCaches.js";
-import { clientsClaim } from "./utils/clientsClaim.js";
-import { dontWaitFor } from "./utils/dontWaitFor.js";
-import { executeQuotaErrorCallbacks } from "./utils/executeQuotaErrorCallbacks.js";
-import { getFriendlyURL } from "./utils/getFriendlyURL.js";
-import { logger } from "./utils/logger.js";
-import { resultingClientExists } from "./utils/resultingClientExists.js";
-import { timeout } from "./utils/timeout.js";
-import { waitUntil } from "./utils/waitUntil.js";
+import { assert } from "#utils/assert.js";
+import { cacheMatchIgnoreParams } from "#utils/cacheMatchIgnoreParams.js";
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
+import { canConstructReadableStream } from "#utils/canConstructReadableStream.js";
+import { canConstructResponseFromBodyStream } from "#utils/canConstructResponseFromBodyStream.js";
+import { cleanupOutdatedCaches } from "#utils/cleanupOutdatedCaches.js";
+import { clientsClaim } from "#utils/clientsClaim.js";
+import { Deferred } from "#utils/Deferred.js";
+import { dontWaitFor } from "#utils/dontWaitFor.js";
+import { executeQuotaErrorCallbacks } from "#utils/executeQuotaErrorCallbacks.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { resultingClientExists } from "#utils/resultingClientExists.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { timeout } from "#utils/timeout.js";
+import { waitUntil } from "#utils/waitUntil.js";
 
 // Serwist's internal functions, classes, variables, and more. Feel free to use them,
 // but they are not documented. Note: they do follow semver.

package/src/index.ts

@@ -1,125 +1,118 @@
-import type { NavigationRouteMatchOptions } from "./NavigationRoute.js";
-import { NavigationRoute } from "./NavigationRoute.js";
-import { PrecacheRoute } from "./PrecacheRoute.js";
-import { RegExpRoute } from "./RegExpRoute.js";
-import { Route } from "./Route.js";
-import { Serwist, type SerwistOptions } from "./Serwist.js";
-import { cacheNames } from "./cacheNames.js";
-import type { HTTPMethod } from "./constants.js";
-import { copyResponse } from "./copyResponse.js";
-import { disableDevLogs } from "./disableDevLogs.js";
-import { BackgroundSyncPlugin } from "./lib/backgroundSync/BackgroundSyncPlugin.js";
-import type { BackgroundSyncQueueEntry, BackgroundSyncQueueOptions } from "./lib/backgroundSync/BackgroundSyncQueue.js";
-import { BackgroundSyncQueue } from "./lib/backgroundSync/BackgroundSyncQueue.js";
-import { BackgroundSyncQueueStore } from "./lib/backgroundSync/BackgroundSyncQueueStore.js";
-import { StorableRequest } from "./lib/backgroundSync/StorableRequest.js";
-import { BroadcastCacheUpdate } from "./lib/broadcastUpdate/BroadcastCacheUpdate.js";
-import { BroadcastUpdatePlugin } from "./lib/broadcastUpdate/BroadcastUpdatePlugin.js";
-import { BROADCAST_UPDATE_DEFAULT_HEADERS } from "./lib/broadcastUpdate/constants.js";
-import { responsesAreSame } from "./lib/broadcastUpdate/responsesAreSame.js";
-import type { BroadcastCacheUpdateOptions, BroadcastMessage, BroadcastPayload, BroadcastPayloadGenerator } from "./lib/broadcastUpdate/types.js";
-import { CacheableResponse } from "./lib/cacheableResponse/CacheableResponse.js";
-import type { CacheableResponseOptions } from "./lib/cacheableResponse/CacheableResponse.js";
-import { CacheableResponsePlugin } from "./lib/cacheableResponse/CacheableResponsePlugin.js";
-import { CacheExpiration } from "./lib/expiration/CacheExpiration.js";
-import type { ExpirationPluginOptions } from "./lib/expiration/ExpirationPlugin.js";
-import { ExpirationPlugin } from "./lib/expiration/ExpirationPlugin.js";
-import { initializeGoogleAnalytics } from "./lib/googleAnalytics/initializeGoogleAnalytics.js";
-import type { GoogleAnalyticsInitializeOptions } from "./lib/googleAnalytics/initializeGoogleAnalytics.js";
-import type { PrecacheFallbackEntry, PrecacheFallbackPluginOptions } from "./lib/precaching/PrecacheFallbackPlugin.js";
-import { PrecacheFallbackPlugin } from "./lib/precaching/PrecacheFallbackPlugin.js";
-import { RangeRequestsPlugin } from "./lib/rangeRequests/RangeRequestsPlugin.js";
-import { createPartialResponse } from "./lib/rangeRequests/createPartialResponse.js";
-import { CacheFirst } from "./lib/strategies/CacheFirst.js";
-import { CacheOnly } from "./lib/strategies/CacheOnly.js";
-import type { NetworkFirstOptions } from "./lib/strategies/NetworkFirst.js";
-import { NetworkFirst } from "./lib/strategies/NetworkFirst.js";
-import type { NetworkOnlyOptions } from "./lib/strategies/NetworkOnly.js";
-import { NetworkOnly } from "./lib/strategies/NetworkOnly.js";
-import { PrecacheStrategy } from "./lib/strategies/PrecacheStrategy.js";
-import { StaleWhileRevalidate } from "./lib/strategies/StaleWhileRevalidate.js";
-import type { StrategyOptions } from "./lib/strategies/Strategy.js";
-import { Strategy } from "./lib/strategies/Strategy.js";
-import { StrategyHandler } from "./lib/strategies/StrategyHandler.js";
-import { disableNavigationPreload, enableNavigationPreload, isNavigationPreloadSupported } from "./navigationPreload.js";
-import { registerQuotaErrorCallback } from "./registerQuotaErrorCallback.js";
-import { setCacheNameDetails } from "./setCacheNameDetails.js";
+import { cacheNames } from "#lib/cache-name.js";
+import type { HTTPMethod } from "#lib/constants.js";
+import { disableNavigationPreload, enableNavigationPreload, isNavigationPreloadSupported } from "#lib/navigation-preload.js";
+import type { NavigationRouteMatchOptions } from "#lib/route.js";
+import { NavigationRoute, RegExpRoute, Route } from "#lib/route.js";
+import { Serwist, type SerwistOptions } from "#lib/serwist.js";
+import { copyResponse, disableDevLogs, registerQuotaErrorCallback, setCacheNameDetails } from "#lib/utils.js";
 
+// Background synchronizing
 export {
-  // Core
-  Serwist,
-  cacheNames,
-  copyResponse,
-  disableDevLogs,
-  disableNavigationPreload,
-  enableNavigationPreload,
-  isNavigationPreloadSupported,
-  registerQuotaErrorCallback,
-  setCacheNameDetails,
-  // Caching strategies
-  CacheFirst,
-  CacheOnly,
-  NetworkFirst,
-  NetworkOnly,
-  PrecacheStrategy,
-  StaleWhileRevalidate,
-  Strategy,
-  StrategyHandler,
-  // Routing
-  NavigationRoute,
-  PrecacheRoute,
-  RegExpRoute,
-  Route,
-  // Background synchronizing
   BackgroundSyncPlugin,
   BackgroundSyncQueue,
+  type BackgroundSyncQueueEntry,
+  type BackgroundSyncQueueOptions,
   BackgroundSyncQueueStore,
   StorableRequest,
-  // Broadcasting updates
+} from "#lib/background-sync/index.js";
+
+// Broadcasting updates
+export {
+  BROADCAST_UPDATE_DEFAULT_HEADERS,
   BroadcastCacheUpdate,
+  type BroadcastCacheUpdateOptions,
+  type BroadcastMessage,
+  type BroadcastPayload,
+  type BroadcastPayloadGenerator,
   BroadcastUpdatePlugin,
-  BROADCAST_UPDATE_DEFAULT_HEADERS,
   responsesAreSame,
-  // Setting cacheability criteria
+} from "#lib/broadcast-update/index.js";
+
+// Setting cacheability criteria
+export {
   CacheableResponse,
+  type CacheableResponseOptions,
   CacheableResponsePlugin,
-  // Expiring outdated responses
+} from "#lib/cacheable-response/index.js";
+
+// Controllers
+
+// Expiring outdated responses
+export {
   CacheExpiration,
   ExpirationPlugin,
-  // Precaching
-  PrecacheFallbackPlugin,
-  // Google Analytics
+  type ExpirationPluginOptions,
+} from "#lib/expiration/index.js";
+
+// Extensions
+export {
+  GoogleAnalytics,
+  type GoogleAnalyticsInitializeOptions,
+  type GoogleAnalyticsOptions,
   initializeGoogleAnalytics,
-  // Handling range requests
+  type PrecacheFallbackEntry,
+  PrecacheFallbackPlugin,
+  type PrecacheFallbackPluginOptions,
+  PrecacheRoute,
+  PrecacheStrategy,
+  RuntimeCache,
+  type RuntimeCacheOptions,
+} from "#lib/extensions/index.js";
+
+// Handling range requests
+export {
   createPartialResponse,
   RangeRequestsPlugin,
-};
-export type {
-  // Core
-  HTTPMethod,
-  SerwistOptions,
-  // Caching strategies
-  NetworkFirstOptions,
-  NetworkOnlyOptions,
-  StrategyOptions,
+} from "#lib/range-requests/index.js";
+
+// Built-in caching strategies
+export {
+  CacheFirst,
+  CacheOnly,
+  NetworkFirst,
+  type NetworkFirstOptions,
+  NetworkOnly,
+  type NetworkOnlyOptions,
+  StaleWhileRevalidate,
+  Strategy,
+  StrategyHandler,
+  type StrategyOptions,
+} from "#lib/strategies/index.js";
+
+// Core
+export {
+  Serwist,
+  cacheNames,
+  copyResponse,
+  disableDevLogs,
+  disableNavigationPreload,
+  enableNavigationPreload,
+  isNavigationPreloadSupported,
+  registerQuotaErrorCallback,
+  setCacheNameDetails,
   // Routing
-  NavigationRouteMatchOptions,
-  // Background synchronizing
-  BackgroundSyncQueueOptions,
-  BackgroundSyncQueueEntry,
-  // Broadcasting updates
-  BroadcastCacheUpdateOptions,
-  BroadcastPayload,
-  BroadcastPayloadGenerator,
-  BroadcastMessage,
-  // Setting cacheability criteria
-  CacheableResponseOptions,
-  // Expiring outdated responses
-  ExpirationPluginOptions,
-  // Precaching
-  PrecacheFallbackEntry,
-  PrecacheFallbackPluginOptions,
-  // Google Analytics
-  GoogleAnalyticsInitializeOptions,
+  NavigationRoute,
+  RegExpRoute,
+  Route,
 };
-export type * from "./types.js";
+
+// Core (modern)
+// TODO(v11): rename once we remove legacy `Serwist` and `SerwistOptions`
+export type { Serwist as SerwistState, SerwistOptions as CreateSerwistOptions } from "#lib/core.js";
+export { createSerwist } from "#lib/core.js";
+// Extension
+export type * from "#lib/extension.js";
+export {
+  addEventListeners,
+  createActivateHandler,
+  createCacheHandler,
+  createFetchHandler,
+  createInstallHandler,
+  iterateExtensions,
+  setCatchHandler,
+  setDefaultHandler,
+} from "#lib/functions/handlers.js";
+export { findMatchingRoute, handleRequest, registerCapture, registerRoute, unregisterRoute } from "#lib/functions/router.js";
+
+export type { HTTPMethod, SerwistOptions, NavigationRouteMatchOptions };
+export type * from "#lib/types.js";

package/src/lib/{backgroundSync → background-sync}/BackgroundSyncPlugin.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { FetchDidFailCallbackParam, SerwistPlugin } from "../../types.js";
+import type { FetchDidFailCallbackParam, StrategyPlugin } from "#lib/types.js";
 import type { BackgroundSyncQueueOptions } from "./BackgroundSyncQueue.js";
 import { BackgroundSyncQueue } from "./BackgroundSyncQueue.js";
 
@@ -14,7 +14,7 @@ import { BackgroundSyncQueue } from "./BackgroundSyncQueue.js";
  * A class implementing the `fetchDidFail` lifecycle callback. This makes it
  * easier to add failed requests to a {@linkcode BackgroundSyncQueue}.
  */
-export class BackgroundSyncPlugin implements SerwistPlugin {
+export class BackgroundSyncPlugin implements StrategyPlugin {
   private readonly _queue: BackgroundSyncQueue;
 
   /**

package/src/lib/{backgroundSync → background-sync}/BackgroundSyncQueue.ts

@@ -1,4 +1,3 @@
-import { SerwistError } from "../../utils/SerwistError.js";
 /*
   Copyright 2018 Google LLC
 
@@ -6,9 +5,10 @@ import { SerwistError } from "../../utils/SerwistError.js";
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-import { assert } from "../../utils/assert.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
+import { assert } from "#utils/assert.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
 import type { BackgroundSyncQueueStoreEntry, UnidentifiedQueueStoreEntry } from "./BackgroundSyncQueueDb.js";
 import { BackgroundSyncQueueStore } from "./BackgroundSyncQueueStore.js";
 import { StorableRequest } from "./StorableRequest.js";

package/src/lib/{backgroundSync → background-sync}/BackgroundSyncQueueStore.ts

@@ -5,7 +5,7 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-import { assert } from "../../utils/assert.js";
+import { assert } from "#utils/assert.js";
 import type { BackgroundSyncQueueStoreEntry, UnidentifiedQueueStoreEntry } from "./BackgroundSyncQueueDb.js";
 import { BackgroundSyncQueueDb } from "./BackgroundSyncQueueDb.js";
 

package/src/lib/{backgroundSync → background-sync}/StorableRequest.ts

@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { MapLikeObject } from "../../types.js";
-import { assert } from "../../utils/assert.js";
+import type { MapLikeObject } from "#lib/types.js";
+import { assert } from "#utils/assert.js";
 
 type SerializableProperties = "method" | "referrer" | "referrerPolicy" | "mode" | "credentials" | "cache" | "redirect" | "integrity" | "keepalive";
 

package/src/lib/background-sync/index.ts

@@ -0,0 +1,5 @@
+export { BackgroundSyncPlugin } from "./BackgroundSyncPlugin.js";
+export type { BackgroundSyncQueueEntry, BackgroundSyncQueueOptions } from "./BackgroundSyncQueue.js";
+export { BackgroundSyncQueue } from "./BackgroundSyncQueue.js";
+export { BackgroundSyncQueueStore } from "./BackgroundSyncQueueStore.js";
+export { StorableRequest } from "./StorableRequest.js";

package/src/lib/{broadcastUpdate → broadcast-update}/BroadcastCacheUpdate.ts

@@ -6,11 +6,11 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { CacheDidUpdateCallbackParam } from "../../types.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
-import { resultingClientExists } from "../../utils/resultingClientExists.js";
-import { timeout } from "../../utils/timeout.js";
+import type { CacheDidUpdateCallbackParam } from "#lib/types.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
+import { resultingClientExists } from "#utils/resultingClientExists.js";
+import { timeout } from "#utils/timeout.js";
 import {
   BROADCAST_UPDATE_DEFAULT_HEADERS,
   BROADCAST_UPDATE_DEFAULT_NOTIFY,

package/src/lib/{broadcastUpdate → broadcast-update}/BroadcastUpdatePlugin.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { CacheDidUpdateCallbackParam, SerwistPlugin } from "../../types.js";
+import type { CacheDidUpdateCallbackParam, StrategyPlugin } from "#lib/types.js";
 import { BroadcastCacheUpdate } from "./BroadcastCacheUpdate.js";
 import type { BroadcastCacheUpdateOptions } from "./types.js";
 
@@ -14,7 +14,7 @@ import type { BroadcastCacheUpdateOptions } from "./types.js";
  * A class implementing the `cacheDidUpdate` lifecycle callback. It will automatically
  * broadcast a message whenever a cached response is updated.
  */
-export class BroadcastUpdatePlugin implements SerwistPlugin {
+export class BroadcastUpdatePlugin implements StrategyPlugin {
   private readonly _broadcastUpdate: BroadcastCacheUpdate;
 
   /**

package/src/lib/broadcast-update/index.ts

@@ -0,0 +1,5 @@
+export { BroadcastCacheUpdate } from "./BroadcastCacheUpdate.js";
+export { BroadcastUpdatePlugin } from "./BroadcastUpdatePlugin.js";
+export { BROADCAST_UPDATE_DEFAULT_HEADERS } from "./constants.js";
+export { responsesAreSame } from "./responsesAreSame.js";
+export type { BroadcastCacheUpdateOptions, BroadcastMessage, BroadcastPayload, BroadcastPayloadGenerator } from "./types.js";

package/src/lib/{broadcastUpdate → broadcast-update}/responsesAreSame.ts

@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { logger } from "../../utils/logger.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
 
 /**
  * Given two responses, compares several header values to see if they are

package/src/lib/{broadcastUpdate → broadcast-update}/types.ts

@@ -1,4 +1,4 @@
-import type { CacheDidUpdateCallbackParam } from "../../types.js";
+import type { CacheDidUpdateCallbackParam } from "#lib/types.js";
 import type { BROADCAST_UPDATE_MESSAGE_META, BROADCAST_UPDATE_MESSAGE_TYPE } from "./constants.js";
 
 export interface BroadcastCacheUpdateOptions {

package/src/{cacheNames.ts → lib/cache-name.ts}

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { cacheNames as privateCacheNames } from "./utils/cacheNames.js";
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
 
 /**
  * Get the current cache names and prefix/suffix used by Serwist.

package/src/lib/{cacheableResponse → cacheable-response}/CacheableResponse.ts

@@ -6,10 +6,10 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
+import { assert } from "#utils/assert.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
 
 export interface CacheableResponseOptions {
   /**

package/src/lib/{cacheableResponse → cacheable-response}/CacheableResponsePlugin.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { SerwistPlugin } from "../../types.js";
+import type { StrategyPlugin } from "#lib/types.js";
 import type { CacheableResponseOptions } from "./CacheableResponse.js";
 import { CacheableResponse } from "./CacheableResponse.js";
 
@@ -15,7 +15,7 @@ import { CacheableResponse } from "./CacheableResponse.js";
  * easier to add in cacheability checks to requests made via Serwist's built-in
  * strategies.
  */
-export class CacheableResponsePlugin implements SerwistPlugin {
+export class CacheableResponsePlugin implements StrategyPlugin {
   private readonly _cacheableResponse: CacheableResponse;
 
   /**
@@ -36,7 +36,7 @@ export class CacheableResponsePlugin implements SerwistPlugin {
    * @returns
    * @private
    */
-  cacheWillUpdate: SerwistPlugin["cacheWillUpdate"] = async ({ response }) => {
+  cacheWillUpdate: StrategyPlugin["cacheWillUpdate"] = async ({ response }) => {
     if (this._cacheableResponse.isResponseCacheable(response)) {
       return response;
     }

package/src/lib/cacheable-response/index.ts

@@ -0,0 +1,3 @@
+export type { CacheableResponseOptions } from "./CacheableResponse.js";
+export { CacheableResponse } from "./CacheableResponse.js";
+export { CacheableResponsePlugin } from "./CacheableResponsePlugin.js";