serwist 10.0.0-preview.1 → 10.0.0-preview.3

package/src/{controllers → lib/controllers}/PrecacheController/PrecacheController.ts

@@ -1,17 +1,17 @@
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { createCacheKey } from "#utils/createCacheKey.js";
+import { logger } from "#utils/logger.js";
+import { printCleanupDetails } from "#utils/printCleanupDetails.js";
+import { printInstallDetails } from "#utils/printInstallDetails.js";
 import { parallel } from "@serwist/utils";
-import type { Strategy } from "../../lib/strategies/Strategy.js";
-import type { Controller, RouteHandlerCallback, UrlManipulation } from "../../types.js";
-import { assert } from "../../utils/assert.js";
-import { createCacheKey } from "../../utils/createCacheKey.js";
-import { logger } from "../../utils/logger.js";
+import { NavigationRoute } from "../../../NavigationRoute.js";
+import type { Serwist } from "../../../Serwist.js";
+import type { Controller, RouteHandlerCallback, UrlManipulation } from "../../../types.js";
+import type { Strategy } from "../../strategies/Strategy.js";
 import { PrecacheInstallReportPlugin } from "./PrecacheInstallReportPlugin.js";
-import { SerwistError } from "../../utils/SerwistError.js";
-import { printInstallDetails } from "../../utils/printInstallDetails.js";
-import { printCleanupDetails } from "../../utils/printCleanupDetails.js";
-import { PrecacheStrategy } from "./PrecacheStrategy.js";
 import { PrecacheRoute } from "./PrecacheRoute.js";
-import type { Serwist } from "../../Serwist.js";
-import { NavigationRoute } from "../../NavigationRoute.js";
+import { PrecacheStrategy } from "./PrecacheStrategy.js";
 import type { PrecacheStrategyOptions } from "./PrecacheStrategy.js";
 import { parsePrecacheOptions } from "./parsePrecacheOptions.js";
 
@@ -90,6 +90,7 @@ export class PrecacheController implements Controller {
   private readonly _strategy: Strategy;
   private _options: PrecacheControllerOptions;
   private _routeOptions: PrecacheRouteOptions;
+
   /**
    * Create a new PrecacheController.
    *
@@ -101,10 +102,8 @@ export class PrecacheController implements Controller {
     this._strategy = new PrecacheStrategy(strategyOptions);
     this._options = controllerOptions;
     this._routeOptions = routeOptions;
-    // Bind the install and activate methods to the instance.
-    this.install = this.install.bind(this);
-    this.activate = this.activate.bind(this);
   }
+
   /**
    * The strategy created by this controller and
    * used to cache assets and respond to `fetch` events.
@@ -112,6 +111,7 @@ export class PrecacheController implements Controller {
   get strategy(): Strategy {
     return this._strategy;
   }
+
   /**
    * Adds items to the cache list, removing duplicates and ensuring the information is valid.
    *
@@ -172,7 +172,8 @@ export class PrecacheController implements Controller {
       }
     }
   }
-  init(serwist: Serwist) {
+
+  init({ serwist }: { serwist: Serwist }): void {
     serwist.registerRoute(new PrecacheRoute(this, this._routeOptions));
 
     if (this._options.navigateFallback) {
@@ -184,7 +185,8 @@ export class PrecacheController implements Controller {
       );
     }
   }
-  async install(event: ExtendableEvent): Promise<void> {
+
+  async install({ event }: { event: ExtendableEvent }): Promise<void> {
     const installReportPlugin = new PrecacheInstallReportPlugin();
     this._strategy.plugins.push(installReportPlugin);
     await parallel(this._options.concurrency!, Array.from(this._urlsToCacheKeys.entries()), async ([url, cacheKey]): Promise<void> => {
@@ -213,6 +215,7 @@ export class PrecacheController implements Controller {
       printInstallDetails(updatedURLs, notUpdatedURLs);
     }
   }
+
   async activate(): Promise<void> {
     const cache = await self.caches.open(this._strategy.cacheName);
     const currentlyCachedRequests = await cache.keys();

package/src/{controllers → lib/controllers}/PrecacheController/PrecacheInstallReportPlugin.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { StrategyPlugin, StrategyPluginCallbackParam } from "../../types.js";
+import type { StrategyPlugin, StrategyPluginCallbackParam } from "../../../types.js";
 
 /**
  * A plugin designed to determine the number of assets that were updated (or not updated)

package/src/{controllers → lib/controllers}/PrecacheController/PrecacheRoute.ts

@@ -6,11 +6,11 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { Route } from "../../Route.js";
-import type { RouteMatchCallback, RouteMatchCallbackOptions } from "../../types.js";
-import { generateURLVariations } from "../../utils/generateURLVariations.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
+import { generateURLVariations } from "#utils/generateURLVariations.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { Route } from "../../../Route.js";
+import type { RouteMatchCallback, RouteMatchCallbackOptions } from "../../../types.js";
 import type { PrecacheController, PrecacheRouteOptions } from "./PrecacheController.js";
 
 /**

package/src/{controllers → lib/controllers}/PrecacheController/PrecacheStrategy.ts

@@ -6,16 +6,16 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { copyResponse } from "../../copyResponse.js";
-import type { StrategyPlugin } from "../../types.js";
-import { SerwistError } from "../../utils/SerwistError.js";
-import { cacheNames as privateCacheNames } from "../../utils/cacheNames.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
-import type { Serwist } from "../../Serwist.js";
-import type { StrategyOptions } from "../../lib/strategies/Strategy.js";
-import { Strategy } from "../../lib/strategies/Strategy.js";
-import type { StrategyHandler } from "../../lib/strategies/StrategyHandler.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import type { Serwist } from "../../../Serwist.js";
+import { copyResponse } from "../../../copyResponse.js";
+import type { StrategyPlugin } from "../../../types.js";
+import type { StrategyOptions } from "../../strategies/Strategy.js";
+import { Strategy } from "../../strategies/Strategy.js";
+import type { StrategyHandler } from "../../strategies/StrategyHandler.js";
 
 export interface PrecacheStrategyOptions extends StrategyOptions {
   /**

package/src/{controllers → lib/controllers}/PrecacheController/parsePrecacheOptions.ts

@@ -1,8 +1,8 @@
-import type { PrecacheStrategyOptions } from "./PrecacheStrategy.js";
-import type { PrecacheController, PrecacheControllerOptions, PrecacheOptions, PrecacheRouteOptions } from "./PrecacheController.js";
+import { privateCacheNames } from "#index.internal";
 import type { Require } from "@serwist/utils";
-import { privateCacheNames } from "../../index.internal.js";
 import { PrecacheCacheKeyPlugin } from "./PrecacheCacheKeyPlugin.js";
+import type { PrecacheController, PrecacheControllerOptions, PrecacheOptions, PrecacheRouteOptions } from "./PrecacheController.js";
+import type { PrecacheStrategyOptions } from "./PrecacheStrategy.js";
 
 export const parsePrecacheOptions = (
   controller: PrecacheController,

package/src/{controllers → lib/controllers}/RuntimeCacheController.ts

@@ -1,8 +1,8 @@
 import { parallel } from "@serwist/utils";
-import { PrecacheFallbackPlugin, type PrecacheFallbackEntry } from "../lib/precaching/PrecacheFallbackPlugin.js";
-import { Strategy } from "../lib/strategies/Strategy.js";
-import type { Serwist } from "../Serwist.js";
-import type { Controller, RuntimeCaching } from "../types.js";
+import type { Serwist } from "../../Serwist.js";
+import type { Controller, RuntimeCaching } from "../../types.js";
+import { type PrecacheFallbackEntry, PrecacheFallbackPlugin } from "../precaching/PrecacheFallbackPlugin.js";
+import { Strategy } from "../strategies/Strategy.js";
 
 export interface WarmRuntimeCacheEntry {
   integrity?: string;
@@ -51,7 +51,7 @@ export class RuntimeCacheController implements Controller {
     this.install = this.install.bind(this);
   }
 
-  init(serwist: Serwist): void {
+  init({ serwist }: { serwist: Serwist }): void {
     if (this._options.fallbacks !== undefined) {
       const fallbackPlugin = new PrecacheFallbackPlugin({
         fallbackUrls: this._options.fallbacks.entries,
@@ -73,7 +73,7 @@ export class RuntimeCacheController implements Controller {
     }
   }
 
-  async install(event: ExtendableEvent, serwist: Serwist) {
+  async install({ event, serwist }: { event: ExtendableEvent; serwist: Serwist }) {
     const concurrency = this._options.warmOptions?.concurrency ?? 10;
     if (this._options.warmEntries) {
       await parallel(concurrency, this._options.warmEntries, async (entry) => {

package/src/lib/controllers/index.ts

@@ -0,0 +1,3 @@
+export { PrecacheStrategy } from "./PrecacheController/PrecacheStrategy.js";
+export { PrecacheRoute } from "./PrecacheController/PrecacheRoute.js";
+export { RuntimeCacheController } from "./RuntimeCacheController.js";

package/src/lib/expiration/CacheExpiration.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import { CacheTimestampsModel } from "./models/CacheTimestampsModel.js";
 
 interface CacheExpirationConfig {

package/src/lib/expiration/ExpirationPlugin.ts

@@ -6,15 +6,15 @@
   https://opensource.org/licenses/MIT.
 */
 
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
 import { registerQuotaErrorCallback } from "../../registerQuotaErrorCallback.js";
 import type { CacheDidUpdateCallbackParam, CachedResponseWillBeUsedCallbackParam, StrategyPlugin } from "../../types.js";
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { cacheNames as privateCacheNames } from "../../utils/cacheNames.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
-import { CacheExpiration } from "./CacheExpiration.js";
 import type { Strategy } from "../strategies/Strategy.js";
+import { CacheExpiration } from "./CacheExpiration.js";
 
 export interface ExpirationPluginOptions {
   /**

package/src/lib/expiration/index.ts

@@ -0,0 +1,3 @@
+export { CacheExpiration } from "./CacheExpiration.js";
+export type { ExpirationPluginOptions } from "./ExpirationPlugin.js";
+export { ExpirationPlugin } from "./ExpirationPlugin.js";

package/src/lib/googleAnalytics/index.ts

@@ -0,0 +1,2 @@
+export { initializeGoogleAnalytics } from "./initializeGoogleAnalytics.js";
+export type { GoogleAnalyticsInitializeOptions } from "./initializeGoogleAnalytics.js";

package/src/lib/googleAnalytics/initializeGoogleAnalytics.ts

@@ -6,16 +6,16 @@
   https://opensource.org/licenses/MIT.
 */
 
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
 import { Route } from "../../Route.js";
 import type { Serwist } from "../../Serwist.js";
-import { NetworkFirst } from "../../lib/strategies/NetworkFirst.js";
-import { NetworkOnly } from "../../lib/strategies/NetworkOnly.js";
 import type { RouteMatchCallbackOptions } from "../../types.js";
-import { cacheNames as privateCacheNames } from "../../utils/cacheNames.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
 import { BackgroundSyncPlugin } from "../backgroundSync/BackgroundSyncPlugin.js";
 import type { BackgroundSyncQueue, BackgroundSyncQueueEntry } from "../backgroundSync/BackgroundSyncQueue.js";
+import { NetworkFirst } from "../strategies/NetworkFirst.js";
+import { NetworkOnly } from "../strategies/NetworkOnly.js";
 import {
   ANALYTICS_JS_PATH,
   COLLECT_PATHS_REGEX,

package/src/lib/precaching/PrecacheFallbackPlugin.ts

@@ -6,19 +6,20 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { PrecacheController } from "../../controllers/PrecacheController/PrecacheController.js";
+import type { PrecacheController } from "#lib/controllers/PrecacheController/PrecacheController.js";
+import type { Serwist } from "../../Serwist.js";
 import type { HandlerDidErrorCallbackParam, StrategyPlugin } from "../../types.js";
 
 export interface PrecacheFallbackEntry {
+  /**
+   * A precached URL to be used as a fallback.
+   */
+  url: string;
   /**
    * A function that checks whether the fallback entry can be used
    * for a request.
    */
   matcher: (param: HandlerDidErrorCallbackParam) => boolean;
-  /**
-   * A precached URL to be used as a fallback.
-   */
-  url: string;
 }
 
 export interface PrecacheFallbackPluginOptions {
@@ -31,6 +32,11 @@ export interface PrecacheFallbackPluginOptions {
    * A {@linkcode PrecacheController} instance.
    */
   precacheController: PrecacheController;
+  /**
+   * A {@linkcode Serwist} instance.
+   * @deprecated Use `precacheController` instead.
+   */
+  serwist?: Serwist;
 }
 
 /**
@@ -50,9 +56,14 @@ export class PrecacheFallbackPlugin implements StrategyPlugin {
    *
    * @param config
    */
-  constructor({ fallbackUrls, precacheController }: PrecacheFallbackPluginOptions) {
+  constructor({ fallbackUrls, precacheController, serwist }: PrecacheFallbackPluginOptions) {
     this._fallbackUrls = fallbackUrls;
-    this._precacheController = precacheController;
+    // TODO(ducanhgh): remove in v11.
+    if (!serwist) {
+      this._precacheController = precacheController;
+    } else {
+      this._precacheController = serwist.precache;
+    }
   }
 
   /**

package/src/lib/precaching/index.ts

@@ -0,0 +1,2 @@
+export type { PrecacheFallbackEntry, PrecacheFallbackPluginOptions } from "./PrecacheFallbackPlugin.js";
+export { PrecacheFallbackPlugin } from "./PrecacheFallbackPlugin.js";

package/src/lib/rangeRequests/createPartialResponse.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import { calculateEffectiveBoundaries } from "./utils/calculateEffectiveBoundaries.js";
 import { parseRangeHeader } from "./utils/parseRangeHeader.js";
 

package/src/lib/rangeRequests/index.ts

@@ -0,0 +1,2 @@
+export { RangeRequestsPlugin } from "./RangeRequestsPlugin.js";
+export { createPartialResponse } from "./createPartialResponse.js";

package/src/lib/rangeRequests/utils/calculateEffectiveBoundaries.ts

@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../../utils/SerwistError.js";
-import { assert } from "../../../utils/assert.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
 
 /**
  * @param blob A source blob.

package/src/lib/rangeRequests/utils/parseRangeHeader.ts

@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../../utils/SerwistError.js";
-import { assert } from "../../../utils/assert.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
 
 /**
  * @param rangeHeader A `Range` header value.

package/src/lib/strategies/CacheFirst.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";
 import { messages } from "./utils/messages.js";

package/src/lib/strategies/CacheOnly.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";
 import { messages } from "./utils/messages.js";

package/src/lib/strategies/NetworkFirst.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import type { StrategyOptions } from "./Strategy.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";

package/src/lib/strategies/NetworkOnly.ts

@@ -6,10 +6,10 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
-import { timeout } from "../../utils/timeout.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
+import { timeout } from "#utils/timeout.js";
 import type { StrategyOptions } from "./Strategy.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";

package/src/lib/strategies/StaleWhileRevalidate.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import type { StrategyOptions } from "./Strategy.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";

package/src/lib/strategies/Strategy.ts

@@ -6,11 +6,11 @@
   https://opensource.org/licenses/MIT.
 */
 
+import { SerwistError } from "#utils/SerwistError.js";
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
 import type { HandlerCallbackOptions, RouteHandlerObject, StrategyPlugin } from "../../types.js";
-import { SerwistError } from "../../utils/SerwistError.js";
-import { cacheNames as privateCacheNames } from "../../utils/cacheNames.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
 import { StrategyHandler } from "./StrategyHandler.js";
 
 export interface StrategyOptions {

package/src/lib/strategies/StrategyHandler.ts

@@ -6,17 +6,17 @@
   https://opensource.org/licenses/MIT.
 */
 
+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 { executeQuotaErrorCallbacks } from "#utils/executeQuotaErrorCallbacks.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { timeout } from "#utils/timeout.js";
+import type { Route } from "../../Route.js";
 import type { HandlerCallbackOptions, MapLikeObject, StrategyPlugin, StrategyPluginCallbackParam } from "../../types.js";
-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 { executeQuotaErrorCallbacks } from "../../utils/executeQuotaErrorCallbacks.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
-import { timeout } from "../../utils/timeout.js";
 import type { Strategy } from "./Strategy.js";
-import type { Route } from "../../Route.js";
 
 function toRequest(input: RequestInfo) {
   return typeof input === "string" ? new Request(input) : input;

package/src/lib/strategies/index.ts

@@ -0,0 +1,10 @@
+export { CacheFirst } from "./CacheFirst.js";
+export { CacheOnly } from "./CacheOnly.js";
+export type { NetworkFirstOptions } from "./NetworkFirst.js";
+export { NetworkFirst } from "./NetworkFirst.js";
+export type { NetworkOnlyOptions } from "./NetworkOnly.js";
+export { NetworkOnly } from "./NetworkOnly.js";
+export { StaleWhileRevalidate } from "./StaleWhileRevalidate.js";
+export type { StrategyOptions } from "./Strategy.js";
+export { Strategy } from "./Strategy.js";
+export { StrategyHandler } from "./StrategyHandler.js";

package/src/lib/strategies/utils/messages.ts

@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { getFriendlyURL } from "../../../utils/getFriendlyURL.js";
-import { logger } from "../../../utils/logger.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
 
 export const messages = {
   strategyStart: (strategyName: string, request: Request): string => `Using ${strategyName} to respond to '${getFriendlyURL(request.url)}'`,

package/src/models/messages/messages.ts

@@ -64,7 +64,7 @@ export const messages = {
   },
 
   "add-to-cache-list-unexpected-type": ({ entry }) => {
-    return `An unexpected entry was passed to 'serwist.Serwist.addToPrecacheList()' The entry '${JSON.stringify(
+    return `An unexpected entry was passed to 'serwist.Serwist.precache.addToCacheList()' The entry '${JSON.stringify(
       entry,
     )}' isn't supported. You must supply an array of strings with one or more characters, objects with a url property or Request objects.`;
   },
@@ -74,7 +74,7 @@ export const messages = {
       throw new Error("Unexpected input to " + `'add-to-cache-list-duplicate-entries' error.`);
     }
 
-    return `Two of the entries passed to 'serwist.Serwist.addToPrecacheList()' had the URL ${firstEntry} but different revision details. Serwist is unable to cache and version the asset correctly. Please remove one of the entries.`;
+    return `Two of the entries passed to 'serwist.Serwist.precache.addToCacheList()' had the URL ${firstEntry} but different revision details. Serwist is unable to cache and version the asset correctly. Please remove one of the entries.`;
   },
 
   "plugin-error-request-will-fetch": ({ thrownErrorMessage }) => {
@@ -210,7 +210,7 @@ export const messages = {
   },
 
   "add-to-cache-list-conflicting-integrities": ({ url }) => {
-    return `Two of the entries passed to 'serwist.Serwist.addToPrecacheList()' had the URL ${url} with different integrity values. Please remove one of them.`;
+    return `Two of the entries passed to 'serwist.Serwist.precache.addToCacheList()' had the URL ${url} with different integrity values. Please remove one of them.`;
   },
 
   "missing-precache-entry": ({ cacheName, url }) => {

package/src/navigationPreload.ts

@@ -1,4 +1,4 @@
-import { logger } from "./utils/logger.js";
+import { logger } from "#utils/logger.js";
 
 declare const self: ServiceWorkerGlobalScope;
 

package/src/registerQuotaErrorCallback.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
 import { quotaErrorCallbacks } from "./models/quotaErrorCallbacks.js";
-import { assert } from "./utils/assert.js";
-import { logger } from "./utils/logger.js";
 
 /**
  * Adds a function to the set of quotaErrorCallbacks that will be executed if

package/src/setCacheNameDetails.ts

@@ -6,10 +6,10 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "./utils/SerwistError.js";
-import { assert } from "./utils/assert.js";
-import type { PartialCacheNameDetails } from "./utils/cacheNames.js";
-import { cacheNames } from "./utils/cacheNames.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { assert } from "#utils/assert.js";
+import type { PartialCacheNameDetails } from "#utils/cacheNames.js";
+import { cacheNames } from "#utils/cacheNames.js";
 
 /**
  * Modifies the default cache names used by Serwist packages.

package/src/types.ts

@@ -1,8 +1,13 @@
+import type {
+  PrecacheControllerOptions,
+  PrecacheEntry,
+  PrecacheOptions,
+  PrecacheRouteOptions,
+} from "#lib/controllers/PrecacheController/PrecacheController.js";
 import type { Prettify } from "@serwist/utils";
-import type { HTTPMethod } from "./constants.js";
 import type { Route } from "./Route.js";
 import type { Serwist } from "./Serwist.js";
-import type { PrecacheControllerOptions, PrecacheEntry, PrecacheOptions, PrecacheRouteOptions } from "./controllers/PrecacheController/PrecacheController.js";
+import type { HTTPMethod } from "./constants.js";
 
 export type PromiseOrNot<T> = T | Promise<T>;
 
@@ -16,13 +21,39 @@ export interface MapLikeObject {
  */
 export type PluginState = MapLikeObject;
 
+export interface InitCallbackParam {
+  serwist: Serwist;
+}
+
+export type InitCallback = (param: InitCallbackParam) => PromiseOrNot<void>;
+
+export interface InstallCallbackParam {
+  event: ExtendableEvent;
+  serwist: Serwist;
+}
+
+export type InstallCallback = (param: InstallCallbackParam) => PromiseOrNot<void>;
+
+export interface ActivateCallbackParam {
+  event: ExtendableEvent;
+  serwist: Serwist;
+}
+
+export type ActivateCallback = (param: ActivateCallbackParam) => PromiseOrNot<void>;
+
 /**
  * An object with optional lifecycle callback properties for Serwist's operations.
  */
 export interface Controller {
-  init?(serwist: Serwist): void;
-  install?(event: ExtendableEvent, serwist: Serwist): Promise<void>;
-  activate?(event: ExtendableEvent, serwist: Serwist): Promise<void>;
+  init?: InitCallback;
+  install?: InstallCallback;
+  activate?: ActivateCallback;
+}
+
+export interface ControllerParam {
+  init: InitCallbackParam;
+  install: InstallCallbackParam;
+  activate: ActivateCallbackParam;
 }
 
 /**