waku 1.0.0-beta.5 → 1.0.0-beta.7

package/README.md

@@ -13,7 +13,7 @@ visit [waku.gg](https://waku.gg) or `npm create waku@latest`
 
 ## Introduction
 
-**Waku** _(wah-ku)_ or **わく** is the minimal React framework. It’s lightweight and designed for a fun developer experience, yet supports all the latest React 19 features like server components and actions. Built for marketing sites, headless commerce, and web apps. For large enterprise applications, you may prefer a heavier framework.
+**Waku** _(wah-ku)_ or **わく** is the minimal React framework. It's lightweight and designed for a fun developer experience, yet supports all the latest React 19 features like server components and actions. Built for marketing sites, headless commerce, and full-stack web apps, small or large. Whether Waku fits is about the architecture you want, not the size of your project: Waku keeps its framework surface minimal and composes with ecosystem libraries, while heavier frameworks own more of those concerns for you.
 
 ## Getting started
 
@@ -31,19 +31,21 @@ npm create waku@latest
 
 **Node.js version requirement:** `^26.0.0` or `^24.0.0` or `^22.15.0`
 
+For a guided path, start with the [Quick Start](https://waku.gg/guides/quick-start) guide and continue with the Learn series on [waku.gg/guides](https://waku.gg/guides), which builds a small app step by step.
+
 ## Rendering
 
-While there’s a bit of a learning curve to modern React rendering, it introduces powerful new patterns of full-stack composability that are only possible with the advent of [server components](https://github.com/reactjs/rfcs/blob/main/text/0188-server-components.md).
+While there's a bit of a learning curve to modern React rendering, it introduces powerful new patterns of full-stack composability that are only possible with the advent of [server components](https://github.com/reactjs/rfcs/blob/main/text/0188-server-components.md).
 
-So please don’t be intimidated by the `'use client'` directive! Once you get the hang of it, you’ll appreciate how awesome it is to flexibly move server-client boundaries with a single line of code as your full-stack React codebase evolves over time. It’s way simpler than maintaining separate codebases for your backend and frontend.
+So please don't be intimidated by the `'use client'` directive! Once you get the hang of it, you'll appreciate how awesome it is to flexibly move server-client boundaries with a single line of code as your full-stack React codebase evolves over time. It's way simpler than maintaining separate codebases for your backend and frontend.
 
-And please don’t fret about client components! Even if you only lightly optimize towards server components, your client bundle size will be smaller than traditional React frameworks, which are always 100% client components.
+And please don't fret about client components! Even if you only lightly optimize towards server components, your client bundle size will be smaller than traditional React frameworks, which are always 100% client components.
 
 > Future versions of Waku may provide additional opt-in APIs to abstract some of the complexity away for an improved developer experience.
 
 #### Server components
 
-Server components can be made async and can securely perform server-side logic and data fetching. Feel free to access the local file-system and import heavy dependencies since they aren’t included in the client bundle. They have no state, interactivity, or access to browser APIs since they run _exclusively_ on the server.
+Server components can be made async and can securely perform server-side logic and data fetching. Feel free to access the local file-system and import heavy dependencies since they aren't included in the client bundle. They have no state, interactivity, or access to browser APIs since they run _exclusively_ on the server.
 
 ```tsx
 // server component
@@ -133,9 +135,9 @@ Waku provides static prerendering (SSG) and server-side rendering (SSR) options
 
 Each layout and page in Waku is composed of a React component hierarchy.
 
-It begins with a server component at the top of the tree. Then at points down the hierarchy, you’ll eventually import a component that needs client component APIs. Mark this file with a `'use client'` directive at the top. When imported into a server component, it will create a server-client boundary. Below this point, all imported components are hydrated and will run in the browser as well.
+It begins with a server component at the top of the tree. Then at points down the hierarchy, you'll eventually import a component that needs client component APIs. Mark this file with a `'use client'` directive at the top. When imported into a server component, it will create a server-client boundary. Below this point, all imported components are hydrated and will run in the browser as well.
 
-Server components can be rendered below this boundary, but only via composition (e.g., `children` props). Together they form [a new “React server” layer](https://github.com/reactwg/server-components/discussions/4) that runs _before_ the traditional “React client” layer with which you’re already familiar.
+Server components can be rendered below this boundary, but only via composition (e.g., `children` props). Together they form [a new "React server" layer](https://github.com/reactwg/server-components/discussions/4) that runs _before_ the traditional "React client" layer with which you're already familiar.
 
 Client components are still server-side rendered as SSR is separate from RSC. Please see the [linked diagrams](https://github.com/reactwg/server-components/discussions/4) for a helpful visual.
 
@@ -145,7 +147,7 @@ To learn more about the modern React architecture, we recommend [Making Sense of
 
 ## Routing
 
-Waku provides a minimal file-based “pages router” experience built for the server components era.
+Waku provides a minimal file-based "pages router" experience built for the server components era.
 
 Its underlying [low-level API](https://github.com/wakujs/waku/blob/main/docs/create-pages.mdx) is also available for those that prefer programmatic routing. This documentation covers file-based routing since many React developers prefer it, but please feel free to try both and see which you like more!
 
@@ -395,7 +397,7 @@ export const getConfig = async () => {
 
 #### Catch-all routes
 
-Catch-all or “wildcard” segment routes (e.g., `/app/[...catchAll]`) are marked with an ellipsis before the name and have indefinite segments.
+Catch-all or "wildcard" segment routes (e.g., `/app/[...catchAll]`) are marked with an ellipsis before the name and have indefinite segments.
 
 Wildcard routes receive a prop with segment values as an ordered array. For example, the `/app/profile/settings` route would receive a `catchAll` prop with the value `['profile', 'settings']`. These values can then be used to determine what to render in the component.
 
@@ -1250,7 +1252,7 @@ export const ContactForm = () => {
 
 #### Configuring API routes
 
-API routes are dynamic by default, but if you’re using them to create a static resource such as an XML document, you can export a `getConfig` function that returns a config object with the render property set to `'static'`.
+API routes are dynamic by default, but if you're using them to create a static resource such as an XML document, you can export a `getConfig` function that returns a config object with the render property set to `'static'`.
 
 ```ts
 // ./src/pages/_api/blog/rss.xml.ts
@@ -1413,17 +1415,17 @@ export const ContactForm = ({ author = 'guest' }) => {
 
 Server actions integrate with many other React APIs such as the [`useTransition`](https://react.dev/reference/react/useTransition) hook for handling pending states, the [`useActionState`](https://react.dev/reference/react/useActionState) hook for accessing returned values, and the [`useOptimistic`](https://react.dev/reference/react/useOptimistic) hook for performing optimistic UI updates.
 
-See the talk [What’s new in React 19?](https://www.youtube.com/watch?v=AJOGzVygGcY) to learn more.
+See the talk [What's new in React 19?](https://www.youtube.com/watch?v=AJOGzVygGcY) to learn more.
 
 ## State management
 
-We recommend [Jotai](https://jotai.org) for global React state management based on the atomic model’s performance and scalability, but Waku is compatible with all React state management libraries such as Zustand and Valtio.
+We recommend [Jotai](https://jotai.org) for global React state management based on the atomic model's performance and scalability, but Waku is compatible with all React state management libraries such as Zustand and Valtio.
 
-> We’re exploring a deeper integration of atomic state management into Waku to achieve the performance and developer experience of signals while preserving React’s declarative programming model.
+> We're exploring a deeper integration of atomic state management into Waku to achieve the performance and developer experience of signals while preserving React's declarative programming model.
 
 ## Environment variables
 
-It’s important to distinguish environment variables that must be kept secret from those that can be made public.
+It's important to distinguish environment variables that must be kept secret from those that can be made public.
 
 #### Private
 
@@ -1431,7 +1433,7 @@ By default all environment variables are considered private and are accessible o
 
 #### Public
 
-A special `WAKU_PUBLIC_` prefix is required to make an environment variable public and accessible in client components. They will be present as cleartext in the production JavaScript bundle sent to users’ browsers.
+A special `WAKU_PUBLIC_` prefix is required to make an environment variable public and accessible in client components. They will be present as cleartext in the production JavaScript bundle sent to users' browsers.
 
 ### Runtime agnostic (recommended)
 
@@ -1616,7 +1618,7 @@ Please join our friendly [GitHub discussions](https://github.com/wakujs/waku/dis
 
 ## Roadmap
 
-Waku is in active development and we’re seeking additional contributors. Check out our [roadmap](https://github.com/wakujs/waku/issues/24) for more information.
+Waku is in active development and we're seeking additional contributors. Check out our [roadmap](https://github.com/wakujs/waku/issues/24) for more information.
 
 ## Contributing
 

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 /**
- * Highly experimental, the name might change.
+ * Experimental, the name and the behavior might change.
  */
 export declare const unstable_allowServer: <T>(x: T) => T;
 /**

package/dist/client.js

@@ -1,6 +1,6 @@
 import { getErrorInfo } from './lib/utils/custom-errors.js';
 /**
- * Highly experimental, the name might change.
+ * Experimental, the name and the behavior might change.
  */ export const unstable_allowServer = (x)=>x;
 /**
  * Unsure if this is going to be a public API in the future.

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/client.ts"],"sourcesContent":["import { getErrorInfo } from './lib/utils/custom-errors.js';\n\n/**\n * Highly experimental, the name might change.\n */\nexport const unstable_allowServer = <T>(x: T) => x;\n\n/**\n * Unsure if this is going to be a public API in the future.\n */\nexport const unstable_defaultRootOptions = {\n  onCaughtError(error: unknown) {\n    if (getErrorInfo(error)) {\n      return;\n    }\n    console.error(error);\n  },\n};\n"],"names":["getErrorInfo","unstable_allowServer","x","unstable_defaultRootOptions","onCaughtError","error","console"],"mappings":"AAAA,SAASA,YAAY,QAAQ,+BAA+B;AAE5D;;CAEC,GACD,OAAO,MAAMC,uBAAuB,CAAIC,IAASA,EAAE;AAEnD;;CAEC,GACD,OAAO,MAAMC,8BAA8B;IACzCC,eAAcC,KAAc;QAC1B,IAAIL,aAAaK,QAAQ;YACvB;QACF;QACAC,QAAQD,KAAK,CAACA;IAChB;AACF,EAAE"}
+{"version":3,"sources":["../src/client.ts"],"sourcesContent":["import { getErrorInfo } from './lib/utils/custom-errors.js';\n\n/**\n * Experimental, the name and the behavior might change.\n */\nexport const unstable_allowServer = <T>(x: T) => x;\n\n/**\n * Unsure if this is going to be a public API in the future.\n */\nexport const unstable_defaultRootOptions = {\n  onCaughtError(error: unknown) {\n    if (getErrorInfo(error)) {\n      return;\n    }\n    console.error(error);\n  },\n};\n"],"names":["getErrorInfo","unstable_allowServer","x","unstable_defaultRootOptions","onCaughtError","error","console"],"mappings":"AAAA,SAASA,YAAY,QAAQ,+BAA+B;AAE5D;;CAEC,GACD,OAAO,MAAMC,uBAAuB,CAAIC,IAASA,EAAE;AAEnD;;CAEC,GACD,OAAO,MAAMC,8BAA8B;IACzCC,eAAcC,KAAc;QAC1B,IAAIL,aAAaK,QAAQ;YACvB;QACF;QACAC,QAAQD,KAAK,CAACA;IAChB;AACF,EAAE"}

package/dist/lib/global-types.d.ts

@@ -4,7 +4,6 @@ declare global {
     var __WAKU_REFETCH_ROUTE__: (() => void) | undefined;
     var __WAKU_START_PREVIEW_SERVER__: (() => Promise<import('./vite-rsc/preview.js').PreviewServer>) | undefined;
     var __WAKU_SERVER_ENV__: Readonly<Record<string, string>> | undefined;
-    var __WAKU_PREFETCHED__: import('./utils/prefetch-cache.js').PrefetchEntry[] | undefined;
     var __WAKU_INITIAL_RSC__: import('./utils/initial-rsc.js').InitialRscEntry | undefined;
     var __WAKU_DEBUG_CHANNELS__: Map<string, {
         readable: ReadableStream;

package/dist/lib/types.d.ts

@@ -1,8 +1,10 @@
 import type { ReactNode } from 'react';
 import type { Config } from '../config.js';
+import type { Etags } from './utils/etags.js';
 type Elements = Record<string, unknown>;
 export type Unstable_RenderRsc = (elements: Elements, options?: {
     value?: unknown;
+    etags?: Etags;
     unstable_clientModuleCallback?: (ids: string[]) => void;
 }) => Promise<ReadableStream>;
 export type Unstable_ParseRsc = (rscStream: ReadableStream) => Promise<Elements>;
@@ -30,6 +32,7 @@ export type Unstable_HandleRequest = (input: ({
 }) & {
     pathname: string;
     req: Request;
+    etags?: Etags;
 }, utils: {
     renderRsc: Unstable_RenderRsc;
     parseRsc: Unstable_ParseRsc;

package/dist/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/types.ts"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { Config } from '../config.js';\n\ntype Elements = Record<string, unknown>;\n\nexport type Unstable_RenderRsc = (\n  elements: Elements,\n  options?: {\n    value?: unknown;\n    unstable_clientModuleCallback?: (ids: string[]) => void;\n  },\n) => Promise<ReadableStream>;\n\nexport type Unstable_ParseRsc = (\n  rscStream: ReadableStream,\n) => Promise<Elements>;\n\nexport type Unstable_RenderHtml = (\n  elementsStream: ReadableStream,\n  html: ReactNode,\n  options: {\n    rscPath: string;\n    formState?: unknown;\n    status?: number;\n    nonce?: string;\n    unstable_extraScriptContent?: string;\n  },\n) => Promise<Response>;\n\nexport type Unstable_EmitFile = (\n  filePath: string,\n  body: ReadableStream,\n) => Promise<void>;\n\nexport type Unstable_HandleRequest = (\n  input: (\n    | { type: 'component'; rscPath: string; rscParams: unknown }\n    | {\n        type: 'function';\n        fn: (...args: unknown[]) => Promise<unknown>;\n        args: unknown[];\n      }\n    | {\n        type: 'action';\n        fn: () => Promise<unknown>;\n      }\n    | { type: 'custom' }\n  ) & {\n    pathname: string;\n    req: Request;\n  },\n  utils: {\n    renderRsc: Unstable_RenderRsc;\n    parseRsc: Unstable_ParseRsc;\n    renderHtml: Unstable_RenderHtml;\n    loadBuildMetadata: (key: string) => Promise<string | undefined>;\n  },\n) => Promise<ReadableStream | Response | 'fallback' | null | undefined>;\n\nexport type Unstable_HandleBuild = (utils: {\n  renderRsc: Unstable_RenderRsc;\n  parseRsc: Unstable_ParseRsc;\n  renderHtml: Unstable_RenderHtml;\n  rscPath2pathname: (rscPath: string) => string;\n  saveBuildMetadata: (key: string, value: string) => Promise<void>;\n  generateFile: (\n    fileName: string,\n    body: ReadableStream | string,\n  ) => Promise<void>;\n  generateDefaultHtml: (fileName: string) => Promise<void>;\n  unstable_registerPrunableFile: (srcPath: string) => void;\n}) => Promise<void>;\n\nexport type Unstable_Handlers = {\n  handleRequest: Unstable_HandleRequest;\n  handleBuild: Unstable_HandleBuild;\n  [someOtherProperty: string]: unknown;\n};\n\nexport type Unstable_ServerEntry = {\n  fetch: (req: Request, ...args: any[]) => Response | Promise<Response>;\n  build: (\n    utils: {\n      emitFile: Unstable_EmitFile;\n      unstable_registerPrunableFile: (srcPath: string) => void;\n    },\n    ...args: any[]\n  ) => Promise<void>;\n  buildOptions?: Record<string, unknown>;\n  buildEnhancers?: string[]; // enhancer module ids\n  defaultExport?: unknown;\n  [someOtherProperty: string]: unknown;\n};\n\nexport type Unstable_ProcessRequest = (\n  arg: Parameters<Unstable_ServerEntry['fetch']>[0],\n) => Promise<Response | null>;\n\nexport type Unstable_ProcessBuild = (\n  arg: Parameters<Unstable_ServerEntry['build']>[0],\n) => Promise<void>;\n\nexport type Unstable_CreateServerEntryAdapter = <Options>(\n  fn: (\n    args: {\n      handlers: Unstable_Handlers;\n      processRequest: Unstable_ProcessRequest;\n      processBuild: Unstable_ProcessBuild;\n      setAllEnv: (newEnv: Readonly<Record<string, unknown>>) => void;\n      config: Omit<Required<Config>, 'vite'>;\n      isBuild: boolean;\n      notFoundHtml: string;\n    },\n    options?: Options,\n  ) => Unstable_ServerEntry,\n) => (handlers: Unstable_Handlers, options?: Options) => Unstable_ServerEntry;\n"],"names":[],"mappings":"AAsGA,WAa8E"}
+{"version":3,"sources":["../../src/lib/types.ts"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { Config } from '../config.js';\nimport type { Etags } from './utils/etags.js';\n\ntype Elements = Record<string, unknown>;\n\nexport type Unstable_RenderRsc = (\n  elements: Elements,\n  options?: {\n    value?: unknown;\n    etags?: Etags;\n    unstable_clientModuleCallback?: (ids: string[]) => void;\n  },\n) => Promise<ReadableStream>;\n\nexport type Unstable_ParseRsc = (\n  rscStream: ReadableStream,\n) => Promise<Elements>;\n\nexport type Unstable_RenderHtml = (\n  elementsStream: ReadableStream,\n  html: ReactNode,\n  options: {\n    rscPath: string;\n    formState?: unknown;\n    status?: number;\n    nonce?: string;\n    unstable_extraScriptContent?: string;\n  },\n) => Promise<Response>;\n\nexport type Unstable_EmitFile = (\n  filePath: string,\n  body: ReadableStream,\n) => Promise<void>;\n\nexport type Unstable_HandleRequest = (\n  input: (\n    | { type: 'component'; rscPath: string; rscParams: unknown }\n    | {\n        type: 'function';\n        fn: (...args: unknown[]) => Promise<unknown>;\n        args: unknown[];\n      }\n    | {\n        type: 'action';\n        fn: () => Promise<unknown>;\n      }\n    | { type: 'custom' }\n  ) & {\n    pathname: string;\n    req: Request;\n    etags?: Etags;\n  },\n  utils: {\n    renderRsc: Unstable_RenderRsc;\n    parseRsc: Unstable_ParseRsc;\n    renderHtml: Unstable_RenderHtml;\n    loadBuildMetadata: (key: string) => Promise<string | undefined>;\n  },\n) => Promise<ReadableStream | Response | 'fallback' | null | undefined>;\n\nexport type Unstable_HandleBuild = (utils: {\n  renderRsc: Unstable_RenderRsc;\n  parseRsc: Unstable_ParseRsc;\n  renderHtml: Unstable_RenderHtml;\n  rscPath2pathname: (rscPath: string) => string;\n  saveBuildMetadata: (key: string, value: string) => Promise<void>;\n  generateFile: (\n    fileName: string,\n    body: ReadableStream | string,\n  ) => Promise<void>;\n  generateDefaultHtml: (fileName: string) => Promise<void>;\n  unstable_registerPrunableFile: (srcPath: string) => void;\n}) => Promise<void>;\n\nexport type Unstable_Handlers = {\n  handleRequest: Unstable_HandleRequest;\n  handleBuild: Unstable_HandleBuild;\n  [someOtherProperty: string]: unknown;\n};\n\nexport type Unstable_ServerEntry = {\n  fetch: (req: Request, ...args: any[]) => Response | Promise<Response>;\n  build: (\n    utils: {\n      emitFile: Unstable_EmitFile;\n      unstable_registerPrunableFile: (srcPath: string) => void;\n    },\n    ...args: any[]\n  ) => Promise<void>;\n  buildOptions?: Record<string, unknown>;\n  buildEnhancers?: string[]; // enhancer module ids\n  defaultExport?: unknown;\n  [someOtherProperty: string]: unknown;\n};\n\nexport type Unstable_ProcessRequest = (\n  arg: Parameters<Unstable_ServerEntry['fetch']>[0],\n) => Promise<Response | null>;\n\nexport type Unstable_ProcessBuild = (\n  arg: Parameters<Unstable_ServerEntry['build']>[0],\n) => Promise<void>;\n\nexport type Unstable_CreateServerEntryAdapter = <Options>(\n  fn: (\n    args: {\n      handlers: Unstable_Handlers;\n      processRequest: Unstable_ProcessRequest;\n      processBuild: Unstable_ProcessBuild;\n      setAllEnv: (newEnv: Readonly<Record<string, unknown>>) => void;\n      config: Omit<Required<Config>, 'vite'>;\n      isBuild: boolean;\n      notFoundHtml: string;\n    },\n    options?: Options,\n  ) => Unstable_ServerEntry,\n) => (handlers: Unstable_Handlers, options?: Options) => Unstable_ServerEntry;\n"],"names":[],"mappings":"AAyGA,WAa8E"}

package/dist/lib/utils/etags.d.ts

@@ -0,0 +1,8 @@
+export declare const ETAG_ID_PREFIX = "_etag:";
+export declare const ETAGS_HEADER = "X-Waku-Etags";
+export declare const IMMUTABLE_ETAG = 1;
+export type Etag = string | typeof IMMUTABLE_ETAG;
+export type Etags = Record<string, Etag>;
+export declare const isValidEtag: (value: unknown) => value is Etag;
+export declare const parseClientEtags: (serialized: string | null) => Etags;
+export declare const serializeClientEtags: (etags: Etags) => string;

package/dist/lib/utils/etags.js

@@ -0,0 +1,30 @@
+export const ETAG_ID_PREFIX = '_etag:';
+export const ETAGS_HEADER = 'X-Waku-Etags';
+// Non-string sentinel, so it cannot collide with a (string) content validator.
+export const IMMUTABLE_ETAG = 1;
+// '' clears a tag; only printable Latin-1 (no control chars) is header-safe
+export const isValidEtag = (value)=>value === IMMUTABLE_ETAG || typeof value === 'string' && value !== '' && /^[\x20-\x7e\xa0-\xff]+$/.test(value);
+export const parseClientEtags = (serialized)=>{
+    if (!serialized) {
+        return {};
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(serialized);
+    } catch  {
+        return {};
+    }
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+        return {};
+    }
+    const etags = {};
+    for (const [key, value] of Object.entries(parsed)){
+        if (isValidEtag(value)) {
+            etags[key] = value;
+        }
+    }
+    return etags;
+};
+export const serializeClientEtags = (etags)=>JSON.stringify(etags);
+
+//# sourceMappingURL=etags.js.map

package/dist/lib/utils/etags.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/utils/etags.ts"],"sourcesContent":["export const ETAG_ID_PREFIX = '_etag:';\nexport const ETAGS_HEADER = 'X-Waku-Etags';\n\n// Non-string sentinel, so it cannot collide with a (string) content validator.\nexport const IMMUTABLE_ETAG = 1;\n\nexport type Etag = string | typeof IMMUTABLE_ETAG;\nexport type Etags = Record<string, Etag>;\n\n// '' clears a tag; only printable Latin-1 (no control chars) is header-safe\nexport const isValidEtag = (value: unknown): value is Etag =>\n  value === IMMUTABLE_ETAG ||\n  (typeof value === 'string' &&\n    value !== '' &&\n    /^[\\x20-\\x7e\\xa0-\\xff]+$/.test(value));\n\nexport const parseClientEtags = (serialized: string | null): Etags => {\n  if (!serialized) {\n    return {};\n  }\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(serialized);\n  } catch {\n    return {};\n  }\n  if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {\n    return {};\n  }\n  const etags: Etags = {};\n  for (const [key, value] of Object.entries(parsed)) {\n    if (isValidEtag(value)) {\n      etags[key] = value;\n    }\n  }\n  return etags;\n};\n\nexport const serializeClientEtags = (etags: Etags): string =>\n  JSON.stringify(etags);\n"],"names":["ETAG_ID_PREFIX","ETAGS_HEADER","IMMUTABLE_ETAG","isValidEtag","value","test","parseClientEtags","serialized","parsed","JSON","parse","Array","isArray","etags","key","Object","entries","serializeClientEtags","stringify"],"mappings":"AAAA,OAAO,MAAMA,iBAAiB,SAAS;AACvC,OAAO,MAAMC,eAAe,eAAe;AAE3C,+EAA+E;AAC/E,OAAO,MAAMC,iBAAiB,EAAE;AAKhC,4EAA4E;AAC5E,OAAO,MAAMC,cAAc,CAACC,QAC1BA,UAAUF,kBACT,OAAOE,UAAU,YAChBA,UAAU,MACV,0BAA0BC,IAAI,CAACD,OAAQ;AAE3C,OAAO,MAAME,mBAAmB,CAACC;IAC/B,IAAI,CAACA,YAAY;QACf,OAAO,CAAC;IACV;IACA,IAAIC;IACJ,IAAI;QACFA,SAASC,KAAKC,KAAK,CAACH;IACtB,EAAE,OAAM;QACN,OAAO,CAAC;IACV;IACA,IAAI,OAAOC,WAAW,YAAYA,WAAW,QAAQG,MAAMC,OAAO,CAACJ,SAAS;QAC1E,OAAO,CAAC;IACV;IACA,MAAMK,QAAe,CAAC;IACtB,KAAK,MAAM,CAACC,KAAKV,MAAM,IAAIW,OAAOC,OAAO,CAACR,QAAS;QACjD,IAAIL,YAAYC,QAAQ;YACtBS,KAAK,CAACC,IAAI,GAAGV;QACf;IACF;IACA,OAAOS;AACT,EAAE;AAEF,OAAO,MAAMI,uBAAuB,CAACJ,QACnCJ,KAAKS,SAAS,CAACL,OAAO"}

package/dist/lib/utils/path.d.ts

@@ -4,46 +4,5 @@ export declare const filePathToFileURL: (filePath: string) => string;
 export declare const fileURLToFilePath: (fileURL: string) => string;
 export declare const joinPath: (...paths: string[]) => string;
 export declare const extname: (filePath: string) => string;
-export type PathSpecItem = {
-    type: 'literal';
-    name: string;
-} | {
-    type: 'group';
-    name?: string;
-    prefix?: string;
-    suffix?: string;
-} | {
-    type: 'wildcard';
-    name?: string;
-};
-export type PathSpec = readonly PathSpecItem[];
-export declare const parsePathWithSlug: (path: string) => PathSpec;
-export declare const parseExactPath: (path: string) => PathSpec;
-/**
- * Transform a path spec to a regular expression.
- */
-export declare const path2regexp: (path: PathSpec) => string;
-/** Convert a path spec to a string for the path */
-export declare const pathSpecAsString: (path: PathSpec) => string;
-/**
- * Helper function to get the path mapping from the path spec and the pathname.
- *
- * @param pathSpec
- * @param pathname - route as a string
- * @example
- * getPathMapping(
- *   [
- *     { type: 'literal', name: 'foo' },
- *     { type: 'group', name: 'a' },
- *   ],
- *   '/foo/bar',
- * );
- * // => { a: 'bar' }
- */
-export declare const getPathMapping: (pathSpec: PathSpec, pathname: string) => Record<string, string | string[]> | null;
 export declare function removeBase(url: string, base: string): string;
 export declare function addBase(url: string, base: string): string;
-export declare function countSlugsAndWildcards(pathSpec: PathSpec): {
-    numSlugs: number;
-    numWildcards: number;
-};

package/dist/lib/utils/path.js

@@ -59,168 +59,6 @@ export const extname = (filePath)=>{
     }
     return filePath.slice(index);
 };
-const SLUG_PATTERN = /^(.*?)\[([^\]]+)\](.*)$/;
-export const parsePathWithSlug = (path)=>path.split('/').filter(Boolean).map((name)=>{
-        const match = SLUG_PATTERN.exec(name);
-        if (!match) {
-            return {
-                type: 'literal',
-                name
-            };
-        }
-        const [, prefix, inner, suffix] = match;
-        if (inner.startsWith('...')) {
-            return {
-                type: 'wildcard',
-                name: inner.slice(3)
-            };
-        }
-        return {
-            type: 'group',
-            name: inner,
-            ...prefix ? {
-                prefix
-            } : {},
-            ...suffix ? {
-                suffix
-            } : {}
-        };
-    });
-export const parseExactPath = (path)=>path.split('/').filter(Boolean).map((name)=>({
-            type: 'literal',
-            name
-        }));
-const escapeRegExp = (s)=>s.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
-/**
- * Transform a path spec to a regular expression.
- */ export const path2regexp = (path)=>{
-    const parts = path.map((item)=>{
-        if (item.type === 'literal') {
-            return escapeRegExp(item.name);
-        } else if (item.type === 'group') {
-            const prefix = escapeRegExp(item.prefix ?? '');
-            const suffix = escapeRegExp(item.suffix ?? '');
-            return `${prefix}([^/]+)${suffix}`;
-        } else {
-            return `(.*)`;
-        }
-    });
-    return `^/${parts.join('/')}$`;
-};
-/** Convert a path spec to a string for the path */ export const pathSpecAsString = (path)=>{
-    return '/' + path.map((item)=>{
-        if (item.type === 'literal') {
-            return item.name;
-        } else if (item.type === 'group') {
-            const prefix = item.prefix ?? '';
-            const suffix = item.suffix ?? '';
-            return `${prefix}[${item.name}]${suffix}`;
-        } else {
-            return `[...${item.name}]`;
-        }
-    }).join('/');
-};
-const matchSpecSegment = (spec, segment, mapping)=>{
-    if (spec.type === 'literal') {
-        return spec.name === segment;
-    }
-    if (segment === undefined) {
-        return false;
-    }
-    const prefix = spec.prefix ?? '';
-    const suffix = spec.suffix ?? '';
-    if (prefix || suffix) {
-        if (!segment.startsWith(prefix) || !segment.endsWith(suffix)) {
-            return false;
-        }
-        const value = segment.slice(prefix.length, suffix ? -suffix.length : undefined);
-        if (!value) {
-            return false;
-        }
-        if (spec.name) {
-            mapping[spec.name] = value;
-        }
-    } else if (spec.name) {
-        mapping[spec.name] = segment;
-    }
-    return true;
-};
-/**
- * Helper function to get the path mapping from the path spec and the pathname.
- *
- * @param pathSpec
- * @param pathname - route as a string
- * @example
- * getPathMapping(
- *   [
- *     { type: 'literal', name: 'foo' },
- *     { type: 'group', name: 'a' },
- *   ],
- *   '/foo/bar',
- * );
- * // => { a: 'bar' }
- */ export const getPathMapping = (pathSpec, pathname)=>{
-    const actual = pathname.split('/').filter(Boolean);
-    if (pathSpec.length > actual.length) {
-        const wildcardIndex = pathSpec.findIndex((spec)=>spec.type === 'wildcard');
-        if (wildcardIndex === -1) {
-            return null;
-        }
-        const isTerminalWildcard = wildcardIndex === pathSpec.length - 1;
-        if (isTerminalWildcard) {
-            // Terminal wildcards only pass through with zero actual segments
-            // (handled by the root-wildcard special case below)
-            if (actual.length > 0) {
-                return null;
-            }
-        } else if (actual.length < pathSpec.length - 1) {
-            // Non-terminal wildcards can match zero segments; just need enough
-            // actual segments for every non-wildcard spec in the pathSpec
-            return null;
-        }
-    }
-    const mapping = {};
-    let wildcardStartIndex = -1;
-    for(let i = 0; i < pathSpec.length; i++){
-        const spec = pathSpec[i];
-        if (spec.type === 'wildcard') {
-            wildcardStartIndex = i;
-            break;
-        }
-        if (!matchSpecSegment(spec, actual[i], mapping)) {
-            return null;
-        }
-    }
-    if (wildcardStartIndex === -1) {
-        if (pathSpec.length !== actual.length) {
-            return null;
-        }
-        return mapping;
-    }
-    if (wildcardStartIndex === 0 && actual.length === 0) {
-        const wildcardName = pathSpec[wildcardStartIndex].name;
-        if (wildcardName) {
-            mapping[wildcardName] = [];
-        }
-        return mapping;
-    }
-    let wildcardEndIndex = -1;
-    for(let i = 0; i < pathSpec.length; i++){
-        const spec = pathSpec[pathSpec.length - i - 1];
-        if (spec.type === 'wildcard') {
-            wildcardEndIndex = actual.length - i - 1;
-            break;
-        }
-        if (!matchSpecSegment(spec, actual[actual.length - i - 1], mapping)) {
-            return null;
-        }
-    }
-    const wildcardName = pathSpec[wildcardStartIndex].name;
-    if (wildcardName) {
-        mapping[wildcardName] = actual.slice(wildcardStartIndex, wildcardEndIndex + 1);
-    }
-    return mapping;
-};
 // basePath config is ensured to have trailing slash (see plugin)
 export function removeBase(url, base) {
     if (base !== '/') {
@@ -237,21 +75,5 @@ export function addBase(url, base) {
     }
     return url;
 }
-export function countSlugsAndWildcards(pathSpec) {
-    let numSlugs = 0;
-    let numWildcards = 0;
-    for (const slug of pathSpec){
-        if (slug.type !== 'literal') {
-            numSlugs++;
-        }
-        if (slug.type === 'wildcard') {
-            numWildcards++;
-        }
-    }
-    return {
-        numSlugs,
-        numWildcards
-    };
-}
 
 //# sourceMappingURL=path.js.map

package/dist/lib/utils/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/utils/path.ts"],"sourcesContent":["// Terminology:\n// - filePath: posix-like file path, e.g. `/foo/bar.js` or `c:/foo/bar.js`\n//   This is used by Vite.\n// - fileURL: file URL, e.g. `file:///foo/bar.js` or `file:///c:/foo/bar.js`\n//   This is used by import().\n// - osPath: os dependent path, e.g. `/foo/bar.js` or `c:\\foo\\bar.js`\n//   This is used by node:fs.\n\nconst ABSOLUTE_WIN32_PATH_REGEXP = /^\\/[a-zA-Z]:\\//;\n\nexport const encodeFilePathToAbsolute = (filePath: string) => {\n  if (ABSOLUTE_WIN32_PATH_REGEXP.test(filePath)) {\n    throw new Error('Unsupported absolute file path: ' + filePath);\n  }\n  if (filePath.startsWith('/')) {\n    return filePath;\n  }\n  return '/' + filePath;\n};\n\nexport const decodeFilePathFromAbsolute = (filePath: string) => {\n  if (ABSOLUTE_WIN32_PATH_REGEXP.test(filePath)) {\n    return filePath.slice(1);\n  }\n  return filePath;\n};\n\nexport const filePathToFileURL = (filePath: string) =>\n  'file://' + encodeURI(filePath);\n\nexport const fileURLToFilePath = (fileURL: string) => {\n  if (!fileURL.startsWith('file://')) {\n    throw new Error('Not a file URL');\n  }\n  return decodeURI(fileURL.slice('file://'.length));\n};\n\n// for filePath\nexport const joinPath = (...paths: string[]) => {\n  const isAbsolute = paths[0]?.startsWith('/');\n  const items = ([] as string[]).concat(\n    ...paths.map((path) => path.split('/')),\n  );\n  const stack: string[] = [];\n  for (const item of items) {\n    if (item === '..') {\n      if (stack.length && stack[stack.length - 1] !== '..') {\n        stack.pop();\n      } else if (!isAbsolute) {\n        stack.push('..');\n      }\n    } else if (item && item !== '.') {\n      stack.push(item);\n    }\n  }\n  return (isAbsolute ? '/' : '') + stack.join('/') || '.';\n};\n\nexport const extname = (filePath: string) => {\n  const index = filePath.lastIndexOf('.');\n  if (index <= 0) {\n    return '';\n  }\n  if (['/', '.'].includes(filePath[index - 1]!)) {\n    return '';\n  }\n  return filePath.slice(index);\n};\n\nexport type PathSpecItem =\n  | { type: 'literal'; name: string }\n  | { type: 'group'; name?: string; prefix?: string; suffix?: string }\n  | { type: 'wildcard'; name?: string };\nexport type PathSpec = readonly PathSpecItem[];\n\nconst SLUG_PATTERN = /^(.*?)\\[([^\\]]+)\\](.*)$/;\n\nexport const parsePathWithSlug = (path: string): PathSpec =>\n  path\n    .split('/')\n    .filter(Boolean)\n    .map((name) => {\n      const match = SLUG_PATTERN.exec(name);\n      if (!match) {\n        return { type: 'literal' as const, name };\n      }\n      const [, prefix, inner, suffix] = match;\n      if (inner!.startsWith('...')) {\n        return {\n          type: 'wildcard' as const,\n          name: inner!.slice(3),\n        };\n      }\n      return {\n        type: 'group' as const,\n        name: inner!,\n        ...(prefix ? { prefix } : {}),\n        ...(suffix ? { suffix } : {}),\n      };\n    });\n\nexport const parseExactPath = (path: string): PathSpec =>\n  path\n    .split('/')\n    .filter(Boolean)\n    .map((name) => ({ type: 'literal', name }));\n\nconst escapeRegExp = (s: string) => s.replace(/[\\\\^$.*+?()[\\]{}|]/g, '\\\\$&');\n\n/**\n * Transform a path spec to a regular expression.\n */\nexport const path2regexp = (path: PathSpec) => {\n  const parts = path.map((item) => {\n    if (item.type === 'literal') {\n      return escapeRegExp(item.name);\n    } else if (item.type === 'group') {\n      const prefix = escapeRegExp(item.prefix ?? '');\n      const suffix = escapeRegExp(item.suffix ?? '');\n      return `${prefix}([^/]+)${suffix}`;\n    } else {\n      return `(.*)`;\n    }\n  });\n  return `^/${parts.join('/')}$`;\n};\n\n/** Convert a path spec to a string for the path */\nexport const pathSpecAsString = (path: PathSpec) => {\n  return (\n    '/' +\n    path\n      .map((item) => {\n        if (item.type === 'literal') {\n          return item.name;\n        } else if (item.type === 'group') {\n          const prefix = item.prefix ?? '';\n          const suffix = item.suffix ?? '';\n          return `${prefix}[${item.name}]${suffix}`;\n        } else {\n          return `[...${item.name}]`;\n        }\n      })\n      .join('/')\n  );\n};\n\nconst matchSpecSegment = (\n  spec: Exclude<PathSpecItem, { type: 'wildcard' }>,\n  segment: string | undefined,\n  mapping: Record<string, string | string[]>,\n): boolean => {\n  if (spec.type === 'literal') {\n    return spec.name === segment;\n  }\n  if (segment === undefined) {\n    return false;\n  }\n  const prefix = spec.prefix ?? '';\n  const suffix = spec.suffix ?? '';\n  if (prefix || suffix) {\n    if (!segment.startsWith(prefix) || !segment.endsWith(suffix)) {\n      return false;\n    }\n    const value = segment.slice(\n      prefix.length,\n      suffix ? -suffix.length : undefined,\n    );\n    if (!value) {\n      return false;\n    }\n    if (spec.name) {\n      mapping[spec.name] = value;\n    }\n  } else if (spec.name) {\n    mapping[spec.name] = segment;\n  }\n  return true;\n};\n\n/**\n * Helper function to get the path mapping from the path spec and the pathname.\n *\n * @param pathSpec\n * @param pathname - route as a string\n * @example\n * getPathMapping(\n *   [\n *     { type: 'literal', name: 'foo' },\n *     { type: 'group', name: 'a' },\n *   ],\n *   '/foo/bar',\n * );\n * // => { a: 'bar' }\n */\nexport const getPathMapping = (\n  pathSpec: PathSpec,\n  pathname: string,\n): Record<string, string | string[]> | null => {\n  const actual = pathname.split('/').filter(Boolean);\n  if (pathSpec.length > actual.length) {\n    const wildcardIndex = pathSpec.findIndex(\n      (spec) => spec.type === 'wildcard',\n    );\n    if (wildcardIndex === -1) {\n      return null;\n    }\n    const isTerminalWildcard = wildcardIndex === pathSpec.length - 1;\n    if (isTerminalWildcard) {\n      // Terminal wildcards only pass through with zero actual segments\n      // (handled by the root-wildcard special case below)\n      if (actual.length > 0) {\n        return null;\n      }\n    } else if (actual.length < pathSpec.length - 1) {\n      // Non-terminal wildcards can match zero segments; just need enough\n      // actual segments for every non-wildcard spec in the pathSpec\n      return null;\n    }\n  }\n  const mapping: Record<string, string | string[]> = {};\n  let wildcardStartIndex = -1;\n  for (let i = 0; i < pathSpec.length; i++) {\n    const spec = pathSpec[i]!;\n    if (spec.type === 'wildcard') {\n      wildcardStartIndex = i;\n      break;\n    }\n    if (!matchSpecSegment(spec, actual[i], mapping)) {\n      return null;\n    }\n  }\n  if (wildcardStartIndex === -1) {\n    if (pathSpec.length !== actual.length) {\n      return null;\n    }\n    return mapping;\n  }\n\n  if (wildcardStartIndex === 0 && actual.length === 0) {\n    const wildcardName = pathSpec[wildcardStartIndex]!.name;\n    if (wildcardName) {\n      mapping[wildcardName] = [];\n    }\n    return mapping;\n  }\n\n  let wildcardEndIndex = -1;\n  for (let i = 0; i < pathSpec.length; i++) {\n    const spec = pathSpec[pathSpec.length - i - 1]!;\n    if (spec.type === 'wildcard') {\n      wildcardEndIndex = actual.length - i - 1;\n      break;\n    }\n    if (!matchSpecSegment(spec, actual[actual.length - i - 1], mapping)) {\n      return null;\n    }\n  }\n  const wildcardName = pathSpec[wildcardStartIndex]!.name;\n  if (wildcardName) {\n    mapping[wildcardName] = actual.slice(\n      wildcardStartIndex,\n      wildcardEndIndex + 1,\n    );\n  }\n  return mapping;\n};\n\n// basePath config is ensured to have trailing slash (see plugin)\nexport function removeBase(url: string, base: string) {\n  if (base !== '/') {\n    if (!url.startsWith(base)) {\n      throw new Error('pathname must start with basePath: ' + url);\n    }\n    return url.slice(base.length - 1);\n  }\n  return url;\n}\n\nexport function addBase(url: string, base: string) {\n  if (base !== '/' && url.startsWith('/')) {\n    return base.slice(0, -1) + url;\n  }\n  return url;\n}\n\nexport function countSlugsAndWildcards(pathSpec: PathSpec) {\n  let numSlugs = 0;\n  let numWildcards = 0;\n  for (const slug of pathSpec) {\n    if (slug.type !== 'literal') {\n      numSlugs++;\n    }\n    if (slug.type === 'wildcard') {\n      numWildcards++;\n    }\n  }\n  return { numSlugs, numWildcards };\n}\n"],"names":["ABSOLUTE_WIN32_PATH_REGEXP","encodeFilePathToAbsolute","filePath","test","Error","startsWith","decodeFilePathFromAbsolute","slice","filePathToFileURL","encodeURI","fileURLToFilePath","fileURL","decodeURI","length","joinPath","paths","isAbsolute","items","concat","map","path","split","stack","item","pop","push","join","extname","index","lastIndexOf","includes","SLUG_PATTERN","parsePathWithSlug","filter","Boolean","name","match","exec","type","prefix","inner","suffix","parseExactPath","escapeRegExp","s","replace","path2regexp","parts","pathSpecAsString","matchSpecSegment","spec","segment","mapping","undefined","endsWith","value","getPathMapping","pathSpec","pathname","actual","wildcardIndex","findIndex","isTerminalWildcard","wildcardStartIndex","i","wildcardName","wildcardEndIndex","removeBase","url","base","addBase","countSlugsAndWildcards","numSlugs","numWildcards","slug"],"mappings":"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"}
+{"version":3,"sources":["../../../src/lib/utils/path.ts"],"sourcesContent":["// Terminology:\n// - filePath: posix-like file path, e.g. `/foo/bar.js` or `c:/foo/bar.js`\n//   This is used by Vite.\n// - fileURL: file URL, e.g. `file:///foo/bar.js` or `file:///c:/foo/bar.js`\n//   This is used by import().\n// - osPath: os dependent path, e.g. `/foo/bar.js` or `c:\\foo\\bar.js`\n//   This is used by node:fs.\n\nconst ABSOLUTE_WIN32_PATH_REGEXP = /^\\/[a-zA-Z]:\\//;\n\nexport const encodeFilePathToAbsolute = (filePath: string) => {\n  if (ABSOLUTE_WIN32_PATH_REGEXP.test(filePath)) {\n    throw new Error('Unsupported absolute file path: ' + filePath);\n  }\n  if (filePath.startsWith('/')) {\n    return filePath;\n  }\n  return '/' + filePath;\n};\n\nexport const decodeFilePathFromAbsolute = (filePath: string) => {\n  if (ABSOLUTE_WIN32_PATH_REGEXP.test(filePath)) {\n    return filePath.slice(1);\n  }\n  return filePath;\n};\n\nexport const filePathToFileURL = (filePath: string) =>\n  'file://' + encodeURI(filePath);\n\nexport const fileURLToFilePath = (fileURL: string) => {\n  if (!fileURL.startsWith('file://')) {\n    throw new Error('Not a file URL');\n  }\n  return decodeURI(fileURL.slice('file://'.length));\n};\n\n// for filePath\nexport const joinPath = (...paths: string[]) => {\n  const isAbsolute = paths[0]?.startsWith('/');\n  const items = ([] as string[]).concat(\n    ...paths.map((path) => path.split('/')),\n  );\n  const stack: string[] = [];\n  for (const item of items) {\n    if (item === '..') {\n      if (stack.length && stack[stack.length - 1] !== '..') {\n        stack.pop();\n      } else if (!isAbsolute) {\n        stack.push('..');\n      }\n    } else if (item && item !== '.') {\n      stack.push(item);\n    }\n  }\n  return (isAbsolute ? '/' : '') + stack.join('/') || '.';\n};\n\nexport const extname = (filePath: string) => {\n  const index = filePath.lastIndexOf('.');\n  if (index <= 0) {\n    return '';\n  }\n  if (['/', '.'].includes(filePath[index - 1]!)) {\n    return '';\n  }\n  return filePath.slice(index);\n};\n\n// basePath config is ensured to have trailing slash (see plugin)\nexport function removeBase(url: string, base: string) {\n  if (base !== '/') {\n    if (!url.startsWith(base)) {\n      throw new Error('pathname must start with basePath: ' + url);\n    }\n    return url.slice(base.length - 1);\n  }\n  return url;\n}\n\nexport function addBase(url: string, base: string) {\n  if (base !== '/' && url.startsWith('/')) {\n    return base.slice(0, -1) + url;\n  }\n  return url;\n}\n"],"names":["ABSOLUTE_WIN32_PATH_REGEXP","encodeFilePathToAbsolute","filePath","test","Error","startsWith","decodeFilePathFromAbsolute","slice","filePathToFileURL","encodeURI","fileURLToFilePath","fileURL","decodeURI","length","joinPath","paths","isAbsolute","items","concat","map","path","split","stack","item","pop","push","join","extname","index","lastIndexOf","includes","removeBase","url","base","addBase"],"mappings":"AAAA,eAAe;AACf,0EAA0E;AAC1E,0BAA0B;AAC1B,4EAA4E;AAC5E,8BAA8B;AAC9B,qEAAqE;AACrE,6BAA6B;AAE7B,MAAMA,6BAA6B;AAEnC,OAAO,MAAMC,2BAA2B,CAACC;IACvC,IAAIF,2BAA2BG,IAAI,CAACD,WAAW;QAC7C,MAAM,IAAIE,MAAM,qCAAqCF;IACvD;IACA,IAAIA,SAASG,UAAU,CAAC,MAAM;QAC5B,OAAOH;IACT;IACA,OAAO,MAAMA;AACf,EAAE;AAEF,OAAO,MAAMI,6BAA6B,CAACJ;IACzC,IAAIF,2BAA2BG,IAAI,CAACD,WAAW;QAC7C,OAAOA,SAASK,KAAK,CAAC;IACxB;IACA,OAAOL;AACT,EAAE;AAEF,OAAO,MAAMM,oBAAoB,CAACN,WAChC,YAAYO,UAAUP,UAAU;AAElC,OAAO,MAAMQ,oBAAoB,CAACC;IAChC,IAAI,CAACA,QAAQN,UAAU,CAAC,YAAY;QAClC,MAAM,IAAID,MAAM;IAClB;IACA,OAAOQ,UAAUD,QAAQJ,KAAK,CAAC,UAAUM,MAAM;AACjD,EAAE;AAEF,eAAe;AACf,OAAO,MAAMC,WAAW,CAAC,GAAGC;IAC1B,MAAMC,aAAaD,KAAK,CAAC,EAAE,EAAEV,WAAW;IACxC,MAAMY,QAAQ,AAAC,EAAE,CAAcC,MAAM,IAChCH,MAAMI,GAAG,CAAC,CAACC,OAASA,KAAKC,KAAK,CAAC;IAEpC,MAAMC,QAAkB,EAAE;IAC1B,KAAK,MAAMC,QAAQN,MAAO;QACxB,IAAIM,SAAS,MAAM;YACjB,IAAID,MAAMT,MAAM,IAAIS,KAAK,CAACA,MAAMT,MAAM,GAAG,EAAE,KAAK,MAAM;gBACpDS,MAAME,GAAG;YACX,OAAO,IAAI,CAACR,YAAY;gBACtBM,MAAMG,IAAI,CAAC;YACb;QACF,OAAO,IAAIF,QAAQA,SAAS,KAAK;YAC/BD,MAAMG,IAAI,CAACF;QACb;IACF;IACA,OAAO,AAACP,CAAAA,aAAa,MAAM,EAAC,IAAKM,MAAMI,IAAI,CAAC,QAAQ;AACtD,EAAE;AAEF,OAAO,MAAMC,UAAU,CAACzB;IACtB,MAAM0B,QAAQ1B,SAAS2B,WAAW,CAAC;IACnC,IAAID,SAAS,GAAG;QACd,OAAO;IACT;IACA,IAAI;QAAC;QAAK;KAAI,CAACE,QAAQ,CAAC5B,QAAQ,CAAC0B,QAAQ,EAAE,GAAI;QAC7C,OAAO;IACT;IACA,OAAO1B,SAASK,KAAK,CAACqB;AACxB,EAAE;AAEF,iEAAiE;AACjE,OAAO,SAASG,WAAWC,GAAW,EAAEC,IAAY;IAClD,IAAIA,SAAS,KAAK;QAChB,IAAI,CAACD,IAAI3B,UAAU,CAAC4B,OAAO;YACzB,MAAM,IAAI7B,MAAM,wCAAwC4B;QAC1D;QACA,OAAOA,IAAIzB,KAAK,CAAC0B,KAAKpB,MAAM,GAAG;IACjC;IACA,OAAOmB;AACT;AAEA,OAAO,SAASE,QAAQF,GAAW,EAAEC,IAAY;IAC/C,IAAIA,SAAS,OAAOD,IAAI3B,UAAU,CAAC,MAAM;QACvC,OAAO4B,KAAK1B,KAAK,CAAC,GAAG,CAAC,KAAKyB;IAC7B;IACA,OAAOA;AACT"}

package/dist/lib/utils/render.js

@@ -1,3 +1,4 @@
+import { ETAG_ID_PREFIX } from './etags.js';
 import { sanitizeLog } from './log.js';
 const validateRscElementIds = (elements)=>{
     for (const id of Object.keys(elements)){
@@ -25,6 +26,11 @@ export function createRenderUtils(temporaryReferences, renderToReadableStream, c
             if (options && 'value' in options) {
                 data._value = options.value;
             }
+            if (options?.etags) {
+                for (const [slotId, etag] of Object.entries(options.etags)){
+                    data[ETAG_ID_PREFIX + slotId] = etag;
+                }
+            }
             return renderToReadableStream(data, {
                 temporaryReferences,
                 onError,

package/dist/lib/utils/render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/utils/render.ts"],"sourcesContent":["import type {\n  Unstable_ParseRsc,\n  Unstable_RenderHtml,\n  Unstable_RenderRsc,\n} from '../types.js';\nimport { sanitizeLog } from './log.js';\n\nconst validateRscElementIds = (elements: Record<string, unknown>) => {\n  for (const id of Object.keys(elements)) {\n    if (id.startsWith('_')) {\n      throw new Error(\n        `RSC element IDs starting with \"_\" are reserved for Waku internals: ${id}`,\n      );\n    }\n  }\n};\n\nexport function createRenderUtils(\n  temporaryReferences: unknown,\n  renderToReadableStream: (\n    data: unknown,\n    options?: object,\n    extraOptions?: object,\n  ) => ReadableStream,\n  createFromReadableStream: (\n    stream: ReadableStream,\n    options?: object,\n  ) => Promise<unknown>,\n  loadSsrEntryModule: () => Promise<\n    typeof import('../vite-entries/entry.ssr.js')\n  >,\n  buildId: string,\n  debugChannel?: { readable?: ReadableStream; writable?: WritableStream },\n  debugId?: string,\n): {\n  renderRsc: Unstable_RenderRsc;\n  parseRsc: Unstable_ParseRsc;\n  renderHtml: Unstable_RenderHtml;\n} {\n  const onError = (e: unknown) => {\n    if (\n      e &&\n      typeof e === 'object' &&\n      'digest' in e &&\n      typeof e.digest === 'string'\n    ) {\n      return e.digest;\n    }\n    console.error('Error during rendering:', sanitizeLog(e));\n  };\n\n  return {\n    async renderRsc(elements, options) {\n      validateRscElementIds(elements);\n      const data: Record<string, unknown> = buildId\n        ? { ...elements, _buildId: buildId }\n        : { ...elements };\n      if (options && 'value' in options) {\n        data._value = options.value;\n      }\n      return renderToReadableStream(\n        data,\n        {\n          temporaryReferences,\n          onError,\n          debugChannel,\n        },\n        {\n          onClientReference(metadata: {\n            id: string;\n            name: string;\n            deps: { js: string[]; css: string[] };\n          }) {\n            options?.unstable_clientModuleCallback?.(metadata.deps.js);\n          },\n        },\n      );\n    },\n    async parseRsc(stream) {\n      return createFromReadableStream(stream, {}) as Promise<\n        Record<string, unknown>\n      >;\n    },\n    async renderHtml(elementsStream, html, options) {\n      const { INTERNAL_renderHtmlStream: renderHtmlStream } =\n        await loadSsrEntryModule();\n\n      const rscHtmlStream = renderToReadableStream(html, {\n        onError,\n      });\n      const htmlResult = await renderHtmlStream(elementsStream, rscHtmlStream, {\n        rscPath: options.rscPath,\n        formState: options.formState as never,\n        nonce: options.nonce,\n        extraScriptContent: options.unstable_extraScriptContent,\n        debugId,\n      });\n      return new Response(htmlResult.stream, {\n        status: htmlResult.status || options.status || 200,\n        headers: { 'content-type': 'text/html; charset=utf-8' },\n      });\n    },\n  };\n}\n"],"names":["sanitizeLog","validateRscElementIds","elements","id","Object","keys","startsWith","Error","createRenderUtils","temporaryReferences","renderToReadableStream","createFromReadableStream","loadSsrEntryModule","buildId","debugChannel","debugId","onError","e","digest","console","error","renderRsc","options","data","_buildId","_value","value","onClientReference","metadata","unstable_clientModuleCallback","deps","js","parseRsc","stream","renderHtml","elementsStream","html","INTERNAL_renderHtmlStream","renderHtmlStream","rscHtmlStream","htmlResult","rscPath","formState","nonce","extraScriptContent","unstable_extraScriptContent","Response","status","headers"],"mappings":"AAKA,SAASA,WAAW,QAAQ,WAAW;AAEvC,MAAMC,wBAAwB,CAACC;IAC7B,KAAK,MAAMC,MAAMC,OAAOC,IAAI,CAACH,UAAW;QACtC,IAAIC,GAAGG,UAAU,CAAC,MAAM;YACtB,MAAM,IAAIC,MACR,CAAC,mEAAmE,EAAEJ,IAAI;QAE9E;IACF;AACF;AAEA,OAAO,SAASK,kBACdC,mBAA4B,EAC5BC,sBAImB,EACnBC,wBAGqB,EACrBC,kBAEC,EACDC,OAAe,EACfC,YAAuE,EACvEC,OAAgB;IAMhB,MAAMC,UAAU,CAACC;QACf,IACEA,KACA,OAAOA,MAAM,YACb,YAAYA,KACZ,OAAOA,EAAEC,MAAM,KAAK,UACpB;YACA,OAAOD,EAAEC,MAAM;QACjB;QACAC,QAAQC,KAAK,CAAC,2BAA2BpB,YAAYiB;IACvD;IAEA,OAAO;QACL,MAAMI,WAAUnB,QAAQ,EAAEoB,OAAO;YAC/BrB,sBAAsBC;YACtB,MAAMqB,OAAgCV,UAClC;gBAAE,GAAGX,QAAQ;gBAAEsB,UAAUX;YAAQ,IACjC;gBAAE,GAAGX,QAAQ;YAAC;YAClB,IAAIoB,WAAW,WAAWA,SAAS;gBACjCC,KAAKE,MAAM,GAAGH,QAAQI,KAAK;YAC7B;YACA,OAAOhB,uBACLa,MACA;gBACEd;gBACAO;gBACAF;YACF,GACA;gBACEa,mBAAkBC,QAIjB;oBACCN,SAASO,gCAAgCD,SAASE,IAAI,CAACC,EAAE;gBAC3D;YACF;QAEJ;QACA,MAAMC,UAASC,MAAM;YACnB,OAAOtB,yBAAyBsB,QAAQ,CAAC;QAG3C;QACA,MAAMC,YAAWC,cAAc,EAAEC,IAAI,EAAEd,OAAO;YAC5C,MAAM,EAAEe,2BAA2BC,gBAAgB,EAAE,GACnD,MAAM1B;YAER,MAAM2B,gBAAgB7B,uBAAuB0B,MAAM;gBACjDpB;YACF;YACA,MAAMwB,aAAa,MAAMF,iBAAiBH,gBAAgBI,eAAe;gBACvEE,SAASnB,QAAQmB,OAAO;gBACxBC,WAAWpB,QAAQoB,SAAS;gBAC5BC,OAAOrB,QAAQqB,KAAK;gBACpBC,oBAAoBtB,QAAQuB,2BAA2B;gBACvD9B;YACF;YACA,OAAO,IAAI+B,SAASN,WAAWP,MAAM,EAAE;gBACrCc,QAAQP,WAAWO,MAAM,IAAIzB,QAAQyB,MAAM,IAAI;gBAC/CC,SAAS;oBAAE,gBAAgB;gBAA2B;YACxD;QACF;IACF;AACF"}
+{"version":3,"sources":["../../../src/lib/utils/render.ts"],"sourcesContent":["import type {\n  Unstable_ParseRsc,\n  Unstable_RenderHtml,\n  Unstable_RenderRsc,\n} from '../types.js';\nimport { ETAG_ID_PREFIX } from './etags.js';\nimport { sanitizeLog } from './log.js';\n\nconst validateRscElementIds = (elements: Record<string, unknown>) => {\n  for (const id of Object.keys(elements)) {\n    if (id.startsWith('_')) {\n      throw new Error(\n        `RSC element IDs starting with \"_\" are reserved for Waku internals: ${id}`,\n      );\n    }\n  }\n};\n\nexport function createRenderUtils(\n  temporaryReferences: unknown,\n  renderToReadableStream: (\n    data: unknown,\n    options?: object,\n    extraOptions?: object,\n  ) => ReadableStream,\n  createFromReadableStream: (\n    stream: ReadableStream,\n    options?: object,\n  ) => Promise<unknown>,\n  loadSsrEntryModule: () => Promise<\n    typeof import('../vite-entries/entry.ssr.js')\n  >,\n  buildId: string,\n  debugChannel?: { readable?: ReadableStream; writable?: WritableStream },\n  debugId?: string,\n): {\n  renderRsc: Unstable_RenderRsc;\n  parseRsc: Unstable_ParseRsc;\n  renderHtml: Unstable_RenderHtml;\n} {\n  const onError = (e: unknown) => {\n    if (\n      e &&\n      typeof e === 'object' &&\n      'digest' in e &&\n      typeof e.digest === 'string'\n    ) {\n      return e.digest;\n    }\n    console.error('Error during rendering:', sanitizeLog(e));\n  };\n\n  return {\n    async renderRsc(elements, options) {\n      validateRscElementIds(elements);\n      const data: Record<string, unknown> = buildId\n        ? { ...elements, _buildId: buildId }\n        : { ...elements };\n      if (options && 'value' in options) {\n        data._value = options.value;\n      }\n      if (options?.etags) {\n        for (const [slotId, etag] of Object.entries(options.etags)) {\n          data[ETAG_ID_PREFIX + slotId] = etag;\n        }\n      }\n      return renderToReadableStream(\n        data,\n        {\n          temporaryReferences,\n          onError,\n          debugChannel,\n        },\n        {\n          onClientReference(metadata: {\n            id: string;\n            name: string;\n            deps: { js: string[]; css: string[] };\n          }) {\n            options?.unstable_clientModuleCallback?.(metadata.deps.js);\n          },\n        },\n      );\n    },\n    async parseRsc(stream) {\n      return createFromReadableStream(stream, {}) as Promise<\n        Record<string, unknown>\n      >;\n    },\n    async renderHtml(elementsStream, html, options) {\n      const { INTERNAL_renderHtmlStream: renderHtmlStream } =\n        await loadSsrEntryModule();\n\n      const rscHtmlStream = renderToReadableStream(html, {\n        onError,\n      });\n      const htmlResult = await renderHtmlStream(elementsStream, rscHtmlStream, {\n        rscPath: options.rscPath,\n        formState: options.formState as never,\n        nonce: options.nonce,\n        extraScriptContent: options.unstable_extraScriptContent,\n        debugId,\n      });\n      return new Response(htmlResult.stream, {\n        status: htmlResult.status || options.status || 200,\n        headers: { 'content-type': 'text/html; charset=utf-8' },\n      });\n    },\n  };\n}\n"],"names":["ETAG_ID_PREFIX","sanitizeLog","validateRscElementIds","elements","id","Object","keys","startsWith","Error","createRenderUtils","temporaryReferences","renderToReadableStream","createFromReadableStream","loadSsrEntryModule","buildId","debugChannel","debugId","onError","e","digest","console","error","renderRsc","options","data","_buildId","_value","value","etags","slotId","etag","entries","onClientReference","metadata","unstable_clientModuleCallback","deps","js","parseRsc","stream","renderHtml","elementsStream","html","INTERNAL_renderHtmlStream","renderHtmlStream","rscHtmlStream","htmlResult","rscPath","formState","nonce","extraScriptContent","unstable_extraScriptContent","Response","status","headers"],"mappings":"AAKA,SAASA,cAAc,QAAQ,aAAa;AAC5C,SAASC,WAAW,QAAQ,WAAW;AAEvC,MAAMC,wBAAwB,CAACC;IAC7B,KAAK,MAAMC,MAAMC,OAAOC,IAAI,CAACH,UAAW;QACtC,IAAIC,GAAGG,UAAU,CAAC,MAAM;YACtB,MAAM,IAAIC,MACR,CAAC,mEAAmE,EAAEJ,IAAI;QAE9E;IACF;AACF;AAEA,OAAO,SAASK,kBACdC,mBAA4B,EAC5BC,sBAImB,EACnBC,wBAGqB,EACrBC,kBAEC,EACDC,OAAe,EACfC,YAAuE,EACvEC,OAAgB;IAMhB,MAAMC,UAAU,CAACC;QACf,IACEA,KACA,OAAOA,MAAM,YACb,YAAYA,KACZ,OAAOA,EAAEC,MAAM,KAAK,UACpB;YACA,OAAOD,EAAEC,MAAM;QACjB;QACAC,QAAQC,KAAK,CAAC,2BAA2BpB,YAAYiB;IACvD;IAEA,OAAO;QACL,MAAMI,WAAUnB,QAAQ,EAAEoB,OAAO;YAC/BrB,sBAAsBC;YACtB,MAAMqB,OAAgCV,UAClC;gBAAE,GAAGX,QAAQ;gBAAEsB,UAAUX;YAAQ,IACjC;gBAAE,GAAGX,QAAQ;YAAC;YAClB,IAAIoB,WAAW,WAAWA,SAAS;gBACjCC,KAAKE,MAAM,GAAGH,QAAQI,KAAK;YAC7B;YACA,IAAIJ,SAASK,OAAO;gBAClB,KAAK,MAAM,CAACC,QAAQC,KAAK,IAAIzB,OAAO0B,OAAO,CAACR,QAAQK,KAAK,EAAG;oBAC1DJ,IAAI,CAACxB,iBAAiB6B,OAAO,GAAGC;gBAClC;YACF;YACA,OAAOnB,uBACLa,MACA;gBACEd;gBACAO;gBACAF;YACF,GACA;gBACEiB,mBAAkBC,QAIjB;oBACCV,SAASW,gCAAgCD,SAASE,IAAI,CAACC,EAAE;gBAC3D;YACF;QAEJ;QACA,MAAMC,UAASC,MAAM;YACnB,OAAO1B,yBAAyB0B,QAAQ,CAAC;QAG3C;QACA,MAAMC,YAAWC,cAAc,EAAEC,IAAI,EAAElB,OAAO;YAC5C,MAAM,EAAEmB,2BAA2BC,gBAAgB,EAAE,GACnD,MAAM9B;YAER,MAAM+B,gBAAgBjC,uBAAuB8B,MAAM;gBACjDxB;YACF;YACA,MAAM4B,aAAa,MAAMF,iBAAiBH,gBAAgBI,eAAe;gBACvEE,SAASvB,QAAQuB,OAAO;gBACxBC,WAAWxB,QAAQwB,SAAS;gBAC5BC,OAAOzB,QAAQyB,KAAK;gBACpBC,oBAAoB1B,QAAQ2B,2BAA2B;gBACvDlC;YACF;YACA,OAAO,IAAImC,SAASN,WAAWP,MAAM,EAAE;gBACrCc,QAAQP,WAAWO,MAAM,IAAI7B,QAAQ6B,MAAM,IAAI;gBAC/CC,SAAS;oBAAE,gBAAgB;gBAA2B;YACxD;QACF;IACF;AACF"}

package/dist/lib/utils/request.d.ts

@@ -1,6 +1,6 @@
 import type { ReactFormState } from 'react-dom/client';
 import type { Config } from '../../config.js';
-export declare function getInput(req: Request, config: Omit<Required<Config>, 'vite'>, temporaryReferences: unknown, decodeReply: (body: string | FormData, options?: object) => Promise<unknown[]>, decodeAction: (body: FormData) => Promise<() => Promise<void>>, decodeFormState: (actionResult: unknown, body: FormData) => Promise<ReactFormState | undefined>, loadServerAction: (id: string) => Promise<unknown>): Promise<({
+export declare function getInput(req: Request, config: Omit<Required<Config>, 'vite'>, temporaryReferences: unknown, decodeReply: (body: string | FormData, options?: object) => Promise<unknown[]>, decodeAction: (body: FormData) => Promise<() => Promise<void>> | null, decodeFormState: (actionResult: unknown, body: FormData) => Promise<ReactFormState | undefined>, loadServerAction: (id: string) => Promise<unknown>): Promise<({
     type: "component";
     rscPath: string;
     rscParams: unknown;
@@ -16,4 +16,5 @@ export declare function getInput(req: Request, config: Omit<Required<Config>, 'v
 }) & {
     pathname: string;
     req: Request;
+    etags?: import("./etags.js").Etags;
 }>;