@wular/pnext 0.0.4 → 0.0.7

package/src/compat/actions/flight.ts

@@ -1,20 +1,20 @@
-import { ACTION_REDIRECT_HEADER, REDIRECT_TYPE_HEADER } from './protocol';
+import { ACTION_REDIRECT_HEADER, REDIRECT_TYPE_HEADER } from './protocol'
 
-export const ACTION_FLIGHT_CONTENT_TYPE = 'text/x-component';
+export const ACTION_FLIGHT_CONTENT_TYPE = 'text/x-component'
 
 export interface ActionFlightPayload {
-  a?: unknown;
-  f: { kind: 'pnext-html'; html: string; url: string } | '';
-  q: string;
-  i: boolean;
+  a?: unknown
+  f: { kind: 'pnext-html'; html: string; url: string } | ''
+  q: string
+  i: boolean
 }
 
 export interface CreateActionFlightResponseOptions {
-  pageResponse: Response;
-  target: URL;
-  actionHeaders: Headers;
-  redirect?: string;
-  redirectType?: string;
+  pageResponse: Response
+  target: URL
+  actionHeaders: Headers
+  redirect?: string
+  redirectType?: string
 }
 
 export async function createActionFlightResponse({
@@ -24,29 +24,29 @@ export async function createActionFlightResponse({
   redirect,
   redirectType,
 }: CreateActionFlightResponseOptions): Promise<Response> {
-  const html = await pageResponse.text();
+  const html = await pageResponse.text()
   const payload: ActionFlightPayload = {
     f: { kind: 'pnext-html', html, url: target.pathname + target.search },
     q: target.search,
     i: false,
-  };
-  const headers = new Headers(pageResponse.headers);
-  headers.set('content-type', ACTION_FLIGHT_CONTENT_TYPE);
-  copyActionHeaders(actionHeaders, headers);
-  if (redirect) headers.set(ACTION_REDIRECT_HEADER, redirect);
-  if (redirectType) headers.set(REDIRECT_TYPE_HEADER, redirectType);
+  }
+  const headers = new Headers(pageResponse.headers)
+  headers.set('content-type', ACTION_FLIGHT_CONTENT_TYPE)
+  copyActionHeaders(actionHeaders, headers)
+  if (redirect) headers.set(ACTION_REDIRECT_HEADER, redirect)
+  if (redirectType) headers.set(REDIRECT_TYPE_HEADER, redirectType)
   // A framework redirect returns HTTP 303 (matching Next's action-redirect wire
   // the e2e suite asserts) with the destination page HTML inline in the flight
   // payload; the client swaps the document without a follow-up GET. A plain
   // flight envelope (revalidation, no redirect) stays 200.
-  return new Response(JSON.stringify(payload), { status: redirect ? 303 : 200, headers });
+  return new Response(JSON.stringify(payload), { status: redirect ? 303 : 200, headers })
 }
 
 function copyActionHeaders(from: Headers, to: Headers): void {
   for (const name of ['x-pnext-action-refresh', 'x-action-revalidated']) {
-    const value = from.get(name);
-    if (value) to.set(name, value);
+    const value = from.get(name)
+    if (value) to.set(name, value)
   }
-  const setCookies = (from as Headers & { getSetCookie?: () => string[] }).getSetCookie?.() ?? [];
-  for (const cookie of setCookies) to.append('set-cookie', cookie);
+  const setCookies = (from as Headers & { getSetCookie?: () => string[] }).getSetCookie?.() ?? []
+  for (const cookie of setCookies) to.append('set-cookie', cookie)
 }

package/src/compat/actions/form-state.ts

@@ -13,61 +13,61 @@ export async function renderWithFormStateOverride(
   actionId: string,
   render: () => Promise<Response>,
 ): Promise<Response | null> {
-  const initial = await render();
-  if (initial.status !== 200) return null;
-  const contentType = initial.headers.get('content-type') ?? '';
-  if (!contentType.includes('text/html')) return null;
-  const skip = formStateCallsBefore(await initial.text(), actionId);
-  if (skip === undefined) return null;
+  const initial = await render()
+  if (initial.status !== 200) return null
+  const contentType = initial.headers.get('content-type') ?? ''
+  if (!contentType.includes('text/html')) return null
+  const skip = formStateCallsBefore(await initial.text(), actionId)
+  if (skip === undefined) return null
 
-  const holder = globalThis as { __PNEXT_ACTION_STATE__?: unknown };
-  holder.__PNEXT_ACTION_STATE__ = { value: state, skip };
+  const holder = globalThis as { __PNEXT_ACTION_STATE__?: unknown }
+  holder.__PNEXT_ACTION_STATE__ = { value: state, skip }
   try {
-    const response = await render();
-    if (response.status !== 200) return null;
-    const contentType = response.headers.get('content-type') ?? '';
-    if (!contentType.includes('text/html')) return null;
-    const html = await response.text();
-    const script = `<script>window.__PNEXT_ACTION_STATE__ = ${inlineJson({ value: state, skip })};</script>`;
+    const response = await render()
+    if (response.status !== 200) return null
+    const contentType = response.headers.get('content-type') ?? ''
+    if (!contentType.includes('text/html')) return null
+    const html = await response.text()
+    const script = `<script>window.__PNEXT_ACTION_STATE__ = ${inlineJson({ value: state, skip })};</script>`
     const output = html.includes('</head>')
       ? html.replace('</head>', `${script}</head>`)
-      : script + html;
-    const headers = new Headers(response.headers);
-    headers.delete('content-length');
-    headers.delete('content-encoding');
-    return new Response(output, { status: 200, headers });
+      : script + html
+    const headers = new Headers(response.headers)
+    headers.delete('content-length')
+    headers.delete('content-encoding')
+    return new Response(output, { status: 200, headers })
   } finally {
-    delete holder.__PNEXT_ACTION_STATE__;
+    delete holder.__PNEXT_ACTION_STATE__
   }
 }
 
 function formStateCallsBefore(html: string, actionId: string): number | undefined {
-  const forms = html.match(/<form\b[\s\S]*?<\/form>/g) ?? [];
-  let count = 0;
+  const forms = html.match(/<form\b[\s\S]*?<\/form>/g) ?? []
+  let count = 0
   for (const form of forms) {
-    if (!form.includes('name="$pnext_form_state"')) continue;
-    const id = /name="\$pnext_action_id" value="([^"]+)"/.exec(form)?.[1];
-    if (id === actionId) return count;
-    count++;
+    if (!form.includes('name="$pnext_form_state"')) continue
+    const id = /name="\$pnext_action_id" value="([^"]+)"/.exec(form)?.[1]
+    if (id === actionId) return count
+    count++
   }
-  return undefined;
+  return undefined
 }
 
 function inlineJson(value: unknown): string {
   return JSON.stringify(value ?? null).replace(/[<>&\u2028\u2029]/g, char => {
     switch (char) {
       case '<':
-        return '\\u003c';
+        return '\\u003c'
       case '>':
-        return '\\u003e';
+        return '\\u003e'
       case '&':
-        return '\\u0026';
+        return '\\u0026'
       case '\u2028':
-        return '\\u2028';
+        return '\\u2028'
       case '\u2029':
-        return '\\u2029';
+        return '\\u2029'
       default:
-        return char;
+        return char
     }
-  });
+  })
 }