@serwist/turbopack 9.5.6 → 9.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/turbopack",
-  "version": "9.5.6",
+  "version": "9.5.8",
   "type": "module",
   "sideEffects": false,
   "description": "A module that integrates Serwist into your Next.js / Turbopack application.",
@@ -31,64 +31,63 @@
   "repository": "https://github.com/serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
   "homepage": "https://serwist.pages.dev",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "typesVersions": {
     "*": {
       "react": [
-        "./dist/index.react.d.ts"
+        "./dist/index.react.d.mts"
       ],
       "worker": [
-        "./dist/index.worker.d.ts"
+        "./dist/index.worker.d.mts"
       ],
       "schema": [
-        "./dist/index.schema.d.ts"
+        "./dist/index.schema.d.mts"
       ]
     }
   },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "default": "./dist/index.mjs"
     },
     "./react": {
-      "types": "./dist/index.react.d.ts",
-      "default": "./dist/index.react.js"
+      "types": "./dist/index.react.d.mts",
+      "default": "./dist/index.react.mjs"
     },
     "./worker": {
-      "types": "./dist/index.worker.d.ts",
-      "default": "./dist/index.worker.js"
+      "types": "./dist/index.worker.d.mts",
+      "default": "./dist/index.worker.mjs"
     },
     "./schema": {
-      "types": "./dist/index.schema.d.ts",
-      "default": "./dist/index.schema.js"
+      "types": "./dist/index.schema.d.mts",
+      "default": "./dist/index.schema.mjs"
     },
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@swc/core": "1.15.11",
-    "browserslist": "4.28.1",
+    "@swc/core": "1.15.32",
+    "browserslist": "4.28.2",
     "kolorist": "1.8.0",
-    "semver": "7.7.3",
+    "semver": "7.7.4",
     "zod": "4.3.6",
-    "@serwist/build": "9.5.6",
-    "@serwist/utils": "9.5.6",
-    "serwist": "9.5.6",
-    "@serwist/window": "9.5.6"
+    "@serwist/build": "9.5.8",
+    "serwist": "9.5.8",
+    "@serwist/window": "9.5.8",
+    "@serwist/utils": "9.5.8"
   },
   "devDependencies": {
-    "@types/node": "25.1.0",
-    "@types/react": "19.2.10",
+    "@types/node": "25.6.0",
+    "@types/react": "19.2.14",
     "@types/semver": "7.7.1",
-    "esbuild": "0.27.2",
-    "esbuild-wasm": "0.27.2",
-    "next": "16.1.6",
-    "react": "19.2.4",
-    "react-dom": "19.2.4",
-    "rollup": "4.57.0",
-    "type-fest": "5.4.2",
-    "typescript": "5.9.3",
-    "@serwist/configs": "9.5.6"
+    "esbuild": "0.28.0",
+    "esbuild-wasm": "0.28.0",
+    "next": "16.2.4",
+    "react": "19.2.5",
+    "react-dom": "19.2.5",
+    "tsdown": "0.21.10",
+    "type-fest": "5.6.0",
+    "typescript": "6.0.3"
   },
   "peerDependencies": {
     "esbuild": ">=0.25.0 <1.0.0",
@@ -109,8 +108,8 @@
     }
   },
   "scripts": {
-    "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",
-    "dev": "rollup --config rollup.config.js --watch",
+    "build": "rimraf dist && NODE_ENV=production tsdown",
+    "dev": "tsdown --watch",
     "lint": "biome lint ./src",
     "qcheck": "biome check ./src",
     "typecheck": "tsc"

package/src/index.schema.ts

@@ -17,6 +17,7 @@ export const turboPartial = z.strictObject({
     })
     .optional(),
   useNativeEsbuild: z.boolean().prefault(process.platform === "win32"),
+  rebuildOnChange: z.boolean().prefault(true),
   esbuildOptions: z.partialRecord(z.literal(SUPPORTED_ESBUILD_OPTIONS), z.any()).prefault({}),
 });
 

package/src/index.ts

@@ -1,6 +1,8 @@
 // Workaround for Next.js + Turbopack, while plugins are still
 // not supported. This relies on Next.js Route Handlers and file
 // name determinism.
+import crypto from "node:crypto";
+import fs from "node:fs";
 import path from "node:path";
 import { type BuildResult, getFileManifestEntries, rebasePath } from "@serwist/build";
 import { SerwistConfigError, validationErrorMap } from "@serwist/build/schema";
@@ -93,6 +95,7 @@ export const createSerwistRoute = (options: InjectManifestOptions) => {
       ],
     };
   });
+  let lastHash: string | null = null;
   let map: Map<string, string> | null = null;
   // NOTE: ALL FILES MUST HAVE DETERMINISTIC NAMES. THIS IS BECAUSE
   // THE FOLLOWING MAP IS LOADED SEPARATELY FOR `generateStaticParams`
@@ -157,10 +160,16 @@ export const createSerwistRoute = (options: InjectManifestOptions) => {
     return [...map.keys()].map((e) => ({ path: path.relative(config.cwd, e) }));
   };
   const GET = async (_: Request, { params }: { params: Promise<{ path: string }> }) => {
-    // TODO: obviously, files get stale in development when we pull this off.
     const { path: filePath } = await params;
     const config = await validation;
-    if (!map) map = await loadMap(filePath);
+    if (isDev && config.rebuildOnChange) {
+      const swContent = fs.readFileSync(config.swSrc, "utf-8");
+      const currentHash = crypto.createHash("sha256").update(swContent).digest("hex");
+      if (!map || lastHash !== currentHash) {
+        map = await loadMap(filePath);
+        lastHash = currentHash;
+      }
+    } else if (!map) map = await loadMap(filePath);
     return new NextResponse(map.get(path.join(config.cwd, filePath)), {
       headers: {
         "Content-Type": contentTypeMap[path.extname(filePath)] || "text/plain",

package/src/lib/utils.ts

@@ -6,9 +6,9 @@ export const loadNextConfig = async (cwd: string, isDev: boolean) => {
   // for loading `next/dist/server/config.js`.
   const nextConfig = await import(/* webpackIgnore: true */ "next/dist/server/config.js");
   // 1) what does `default.default` even mean
-  return nextConfig.default.default(nextPhase, cwd, {
-    silent: false,
-  });
+  const loadConfig =
+    typeof nextConfig.default === "function" ? (nextConfig.default as unknown as typeof nextConfig.default.default) : nextConfig.default.default;
+  return loadConfig(nextPhase, cwd, { silent: false });
 };
 
 export const generateGlobPatterns = (distDir: string) => [

package/src/types.ts

@@ -64,6 +64,13 @@ export interface TurboPartial {
    * to `false` if not on Windows, `true` otherwise.
    */
   useNativeEsbuild?: boolean;
+  /**
+   * Whether to automatically rebuild when source file changes
+   * while in development mode.
+   *
+   * @default true
+   */
+  rebuildOnChange?: boolean;
   /**
    * Options to configure the esbuild instance used to bundle
    * the service worker.
@@ -71,7 +78,7 @@ export interface TurboPartial {
   esbuildOptions?: EsbuildNativeOptions | EsbuildWasmOptions;
 }
 
-export interface TurboResolved extends Require<TurboPartial, "cwd" | "useNativeEsbuild" | "esbuildOptions"> {}
+export interface TurboResolved extends Require<TurboPartial, "cwd" | "useNativeEsbuild" | "rebuildOnChange" | "esbuildOptions"> {}
 
 export type InjectManifestOptions = Prettify<
   Omit<BasePartial & GlobPartial & InjectPartial & OptionalGlobDirectoryPartial & TurboPartial, "disablePrecacheManifest">

package/dist/chunks/index.schema.js

@@ -1,183 +0,0 @@
-import path from 'node:path';
-import { injectPartial, globPartial, basePartial, assertType } from '@serwist/build/schema';
-import semver from 'semver';
-import z from 'zod';
-import { createRequire } from 'node:module';
-import { green, bold, white, yellow, red } from 'kolorist';
-import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from 'next/constants.js';
-
-const SUPPORTED_ESBUILD_OPTIONS = [
-    "sourcemap",
-    "legalComments",
-    "sourceRoot",
-    "sourcesContent",
-    "format",
-    "globalName",
-    "target",
-    "supported",
-    "define",
-    "treeShaking",
-    "minify",
-    "mangleProps",
-    "reserveProps",
-    "mangleQuoted",
-    "mangleCache",
-    "drop",
-    "dropLabels",
-    "minifyWhitespace",
-    "minifyIdentifiers",
-    "minifySyntax",
-    "lineLimit",
-    "charset",
-    "ignoreAnnotations",
-    "jsx",
-    "jsxFactory",
-    "jsxFragment",
-    "jsxImportSource",
-    "jsxDev",
-    "jsxSideEffects",
-    "pure",
-    "keepNames",
-    "absPaths",
-    "color",
-    "logLevel",
-    "logLimit",
-    "logOverride",
-    "tsconfigRaw",
-    "bundle",
-    "splitting",
-    "preserveSymlinks",
-    "external",
-    "packages",
-    "alias",
-    "loader",
-    "resolveExtensions",
-    "mainFields",
-    "conditions",
-    "allowOverwrite",
-    "tsconfig",
-    "outExtension",
-    "publicPath",
-    "inject",
-    "banner",
-    "footer",
-    "plugins"
-];
-
-const require$1 = createRequire(import.meta.url);
-const NEXT_VERSION = require$1("next/package.json").version;
-const LOGGING_SPACE_PREFIX = semver.gte(NEXT_VERSION, "16.0.0") ? "" : " ";
-const prefixedLog = (prefixType, ...message)=>{
-    let prefix;
-    let consoleMethod;
-    switch(prefixType){
-        case "wait":
-            prefix = `${white(bold("○"))} (serwist)`;
-            consoleMethod = "log";
-            break;
-        case "error":
-            prefix = `${red(bold("X"))} (serwist)`;
-            consoleMethod = "error";
-            break;
-        case "warn":
-            prefix = `${yellow(bold("⚠"))} (serwist)`;
-            consoleMethod = "warn";
-            break;
-        case "info":
-            prefix = `${white(bold("○"))} (serwist)`;
-            consoleMethod = "log";
-            break;
-        case "event":
-            prefix = `${green(bold("✓"))} (serwist)`;
-            consoleMethod = "log";
-            break;
-    }
-    if ((message[0] === "" || message[0] === undefined) && message.length === 1) {
-        message.shift();
-    }
-    if (message.length === 0) {
-        console[consoleMethod]("");
-    } else {
-        console[consoleMethod](`${LOGGING_SPACE_PREFIX}${prefix}`, ...message);
-    }
-};
-const wait = (...message)=>prefixedLog("wait", ...message);
-const error = (...message)=>prefixedLog("error", ...message);
-const warn = (...message)=>prefixedLog("warn", ...message);
-const info = (...message)=>prefixedLog("info", ...message);
-const event = (...message)=>prefixedLog("event", ...message);
-
-var logger = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  NEXT_VERSION: NEXT_VERSION,
-  error: error,
-  event: event,
-  info: info,
-  wait: wait,
-  warn: warn
-});
-
-const loadNextConfig = async (cwd, isDev)=>{
-    const nextPhase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD;
-    // webpackIgnore is only supported by Next.js 15 and above, but it is necessary
-    const nextConfig = await import(/* webpackIgnore: true */ 'next/dist/server/config.js');
-    return nextConfig.default.default(nextPhase, cwd, {
-        silent: false
-    });
-};
-const generateGlobPatterns = (distDir)=>[
-        `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
-        "public/**/*"
-    ];
-
-const turboPartial = z.strictObject({
-    cwd: z.string().prefault(process.cwd()),
-    nextConfig: z.object({
-        assetPrefix: z.string().optional(),
-        basePath: z.string().optional(),
-        distDir: z.string().optional()
-    }).optional(),
-    useNativeEsbuild: z.boolean().prefault(process.platform === "win32"),
-    esbuildOptions: z.partialRecord(z.literal(SUPPORTED_ESBUILD_OPTIONS), z.any()).prefault({})
-});
-const injectManifestOptions = z.strictObject({
-    ...basePartial.shape,
-    ...globPartial.shape,
-    ...injectPartial.shape,
-    ...turboPartial.shape,
-    globPatterns: z.array(z.string()).optional(),
-    globDirectory: z.string().optional()
-}).omit({
-    disablePrecacheManifest: true
-}).transform(async (input)=>{
-    // webpackIgnore is only supported by Next.js 15 and above, but it is necessary
-    const nextConfig = semver.gte(NEXT_VERSION, "15.0.0") ? {
-        ...await loadNextConfig(input.cwd, process.env.NODE_ENV === "development"),
-        ...input.nextConfig
-    } : {
-        distDir: input.nextConfig?.distDir ?? ".next",
-        basePath: input.nextConfig?.basePath ?? "/",
-        assetPrefix: input.nextConfig?.assetPrefix ?? input.nextConfig?.basePath ?? ""
-    };
-    let distDir = nextConfig.distDir;
-    if (distDir[0] === "/") distDir = distDir.slice(1);
-    if (distDir[distDir.length - 1] !== "/") distDir += "/";
-    return {
-        ...input,
-        swSrc: path.isAbsolute(input.swSrc) ? input.swSrc : path.join(input.cwd, input.swSrc),
-        globPatterns: input.globPatterns ?? generateGlobPatterns(distDir),
-        globDirectory: input.globDirectory ?? input.cwd,
-        dontCacheBustURLsMatching: input.dontCacheBustURLsMatching ?? new RegExp(`^${distDir}static/`),
-        nextConfig: {
-            ...nextConfig,
-            distDir,
-            basePath: nextConfig.basePath || "/"
-        }
-    };
-});
-assertType();
-assertType();
-assertType();
-assertType();
-
-export { injectManifestOptions as i, logger as l, turboPartial as t };

package/dist/index.d.ts

@@ -1,22 +0,0 @@
-import type { NextConfig } from "next";
-import { NextResponse } from "next/server.js";
-import type { InjectManifestOptions } from "./types.js";
-/**
- * Creates a Route Handler for Serwist files.
- * @param options Options for {@linkcode getFileManifestEntries}.
- */
-export declare const createSerwistRoute: (options: InjectManifestOptions) => {
-    dynamic: "force-static";
-    dynamicParams: false;
-    revalidate: false;
-    generateStaticParams: () => Promise<{
-        path: string;
-    }[]>;
-    GET: (_: Request, { params }: {
-        params: Promise<{
-            path: string;
-        }>;
-    }) => Promise<NextResponse<unknown>>;
-};
-export declare const withSerwist: (nextConfig?: NextConfig) => NextConfig;
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK9C,OAAO,KAAK,EAAE,qBAAqB,EAAiC,MAAM,YAAY,CAAC;AAuCvF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,qBAAqB;;;;;;;aAmGzC,OAAO,cAAc;QAAE,MAAM,EAAE,OAAO,CAAC;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE;CAajF,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,aAAY,UAAe,KAAG,UAGxD,CAAC"}

package/dist/index.js

@@ -1,180 +0,0 @@
-import path from 'node:path';
-import { rebasePath, getFileManifestEntries } from '@serwist/build';
-import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
-import { browserslistToEsbuild } from '@serwist/utils';
-import browserslist from 'browserslist';
-import { cyan, dim, yellow } from 'kolorist';
-import { MODERN_BROWSERSLIST_TARGET } from 'next/constants.js';
-import { NextResponse } from 'next/server.js';
-import { z } from 'zod';
-import { i as injectManifestOptions, l as logger } from './chunks/index.schema.js';
-import 'semver';
-import 'node:module';
-
-let esbuildWasm = null;
-let esbuildNative = null;
-const logSerwistResult = (filePath, buildResult)=>{
-    const { count, size, warnings } = buildResult;
-    const hasWarnings = warnings && warnings.length > 0;
-    if (filePath === "sw.js" && (hasWarnings || count > 0)) {
-        logger[hasWarnings ? "warn" : "event"](`${cyan(count)} precache entries ${dim(`(${(size / 1024).toFixed(2)} KiB)`)}${hasWarnings ? `\n${yellow([
-            "⚠ warnings",
-            ...warnings.map((w)=>`  ${w}`),
-            ""
-        ].join("\n"))}` : ""}`);
-    }
-};
-const validateGetManifestOptions = async (input)=>{
-    const result = await injectManifestOptions.spa(input, {
-        error: validationErrorMap
-    });
-    if (!result.success) {
-        throw new SerwistConfigError({
-            moduleName: "@serwist/turbopack",
-            message: z.prettifyError(result.error)
-        });
-    }
-    return result.data;
-};
-const isDev = process.env.NODE_ENV === "development";
-const contentTypeMap = {
-    ".js": "application/javascript",
-    ".map": "application/json; charset=UTF-8"
-};
-const createSerwistRoute = (options)=>{
-    const dynamic = "force-static", dynamicParams = false, revalidate = false;
-    const validation = validateGetManifestOptions(options).then((config)=>{
-        return {
-            ...config,
-            disablePrecacheManifest: isDev,
-            additionalPrecacheEntries: isDev ? [] : config.additionalPrecacheEntries,
-            globIgnores: [
-                ...config.globIgnores,
-                rebasePath({
-                    file: config.swSrc,
-                    baseDirectory: config.globDirectory
-                })
-            ],
-            manifestTransforms: [
-                ...config.manifestTransforms ?? [],
-                async (manifestEntries)=>{
-                    const manifest = manifestEntries.map((m)=>{
-                        if (m.url.startsWith(config.nextConfig.distDir)) {
-                            m.url = `${config.nextConfig.assetPrefix}/_next/${m.url.slice(config.nextConfig.distDir.length)}`;
-                        }
-                        if (m.url.startsWith("public/")) {
-                            m.url = path.posix.join(config.nextConfig.basePath, m.url.slice(7));
-                        }
-                        return m;
-                    });
-                    return {
-                        manifest,
-                        warnings: []
-                    };
-                }
-            ]
-        };
-    });
-    let map = null;
-    const loadMap = async (filePath)=>{
-        const config = await validation;
-        const { count, size, manifestEntries, warnings } = await getFileManifestEntries(config);
-        const injectionPoint = config.injectionPoint || "";
-        const manifestString = manifestEntries === undefined ? "undefined" : JSON.stringify(manifestEntries, null, 2);
-        const log = (type, ...message)=>{
-            if (filePath === "sw.js") {
-                logger[type](...message);
-            }
-        };
-        let esbuild;
-        if (config.useNativeEsbuild) {
-            log("info", "Using esbuild to bundle the service worker.");
-            if (!esbuildNative) esbuildNative = import(/* webpackIgnore: true */ 'esbuild');
-            esbuild = await esbuildNative;
-        } else {
-            log("info", "Using esbuild-wasm to bundle the service worker.");
-            if (!esbuildWasm) esbuildWasm = import(/* webpackIgnore: true */ 'esbuild-wasm');
-            esbuild = await esbuildWasm;
-        }
-        logSerwistResult(filePath, {
-            count,
-            size,
-            warnings
-        });
-        const result = await esbuild.build({
-            sourcemap: true,
-            format: "esm",
-            treeShaking: true,
-            minify: !isDev,
-            bundle: true,
-            ...config.esbuildOptions,
-            target: config.esbuildOptions?.target ?? browserslistToEsbuild(browserslist, config.cwd, MODERN_BROWSERSLIST_TARGET),
-            platform: "browser",
-            define: {
-                ...config.esbuildOptions.define,
-                ...injectionPoint ? {
-                    [injectionPoint]: manifestString
-                } : {}
-            },
-            outdir: config.cwd,
-            write: false,
-            entryNames: "[name]",
-            assetNames: "[name]-[hash]",
-            chunkNames: "[name]-[hash]",
-            entryPoints: [
-                {
-                    in: config.swSrc,
-                    out: "sw"
-                }
-            ]
-        });
-        if (result.errors.length) {
-            console.error("Failed to build the service worker.", result.errors);
-            throw new Error();
-        }
-        if (result.warnings.length) {
-            console.warn(result.warnings);
-        }
-        return new Map(result.outputFiles.map((e)=>[
-                e.path,
-                e.text
-            ]));
-    };
-    const generateStaticParams = async ()=>{
-        const config = await validation;
-        if (!map) map = await loadMap("root");
-        return [
-            ...map.keys()
-        ].map((e)=>({
-                path: path.relative(config.cwd, e)
-            }));
-    };
-    const GET = async (_, { params })=>{
-        const { path: filePath } = await params;
-        const config = await validation;
-        if (!map) map = await loadMap(filePath);
-        return new NextResponse(map.get(path.join(config.cwd, filePath)), {
-            headers: {
-                "Content-Type": contentTypeMap[path.extname(filePath)] || "text/plain",
-                "Service-Worker-Allowed": "/"
-            }
-        });
-    };
-    return {
-        dynamic,
-        dynamicParams,
-        revalidate,
-        generateStaticParams,
-        GET
-    };
-};
-const withSerwist = (nextConfig = {})=>({
-        ...nextConfig,
-        serverExternalPackages: [
-            ...nextConfig.serverExternalPackages ?? [],
-            "esbuild",
-            "esbuild-wasm"
-        ]
-    });
-
-export { createSerwistRoute, withSerwist };

package/dist/index.react.d.ts

@@ -1,25 +0,0 @@
-import { Serwist } from "@serwist/window";
-import { type ReactNode } from "react";
-import { useSerwist } from "./lib/context.js";
-export interface SerwistProviderProps {
-    swUrl: string;
-    disable?: boolean;
-    register?: boolean;
-    cacheOnNavigation?: boolean;
-    reloadOnOnline?: boolean;
-    options?: RegistrationOptions;
-    children?: ReactNode;
-}
-declare global {
-    interface Window {
-        serwist: Serwist;
-    }
-}
-/**
- * `@serwist/window` provider for Next.js apps.
- * @param options
- * @returns
- */
-export declare function SerwistProvider({ swUrl, disable, register, cacheOnNavigation, reloadOnOnline, options, children, }: SerwistProviderProps): import("react").JSX.Element;
-export { useSerwist };
-//# sourceMappingURL=index.react.d.ts.map

package/dist/index.react.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.react.d.ts","sourceRoot":"","sources":["../src/index.react.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAkB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,EAAE,OAAO,CAAC;KAClB;CACF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,OAAe,EACf,QAAe,EACf,iBAAwB,EACxB,cAAqB,EACrB,OAAO,EACP,QAAQ,GACT,EAAE,oBAAoB,+BAuDtB;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}