@wular/pnext 0.0.21 → 0.0.23

package/src/resolve/imports.ts

@@ -11,6 +11,12 @@ import {
 } from './engine'
 import { onExtensionHostReset } from '../extensions'
 
+// `Bun` through globalThis: pnext ships TypeScript source, so app compilers without
+// bun-types typecheck this file and a bare `Bun` identifier would fail them.
+const { Bun: bun } = globalThis as unknown as {
+  Bun: { resolveSync(specifier: string, parent: string): string }
+}
+
 // Conditions for "is this a local source file" lookups. Ordered to mirror the
 // preference a bundler applies, though `exports` key order ultimately decides.
 const localConditions = ['source', 'import', 'browser', 'node', 'default', 'require']
@@ -668,7 +674,7 @@ export function resolveRuntimeSpecifier(dir: string, specifier: string): string
   const cached = runtimeResolveCache.get(key)
   if (cached !== undefined) return cached
   try {
-    const resolved = Bun.resolveSync(specifier, dir)
+    const resolved = bun.resolveSync(specifier, dir)
     runtimeResolveCache.set(key, resolved)
     return resolved
   } catch {

package/src/resolve/scan-facts.ts

@@ -17,6 +17,12 @@ const parseSync: typeof import('oxc-parser').parseSync = (...args) =>
 import { loadNative } from '../utils/native-require'
 import { spliceSource } from '../runtime/module-transform'
 
+// `Bun` through globalThis: pnext ships TypeScript source, so app compilers without
+// bun-types typecheck this file and a bare `Bun` identifier would fail them.
+const { Bun: bun } = globalThis as unknown as {
+  Bun: { hash(input: string | ArrayBufferView): { toString(radix?: number): string } }
+}
+
 export interface ScanEdge {
   specifier: string
   /** Bound names: `default`, `*` (namespace object), or the imported names. */
@@ -187,7 +193,7 @@ export function rewriteFacts(file: string, source: string): RewriteFacts {
 }
 
 function parsed(file: string, source: string, lang = langForFile(file)) {
-  const key = `${lang}\0${source.length}\0${Bun.hash(source).toString()}`
+  const key = `${lang}\0${source.length}\0${bun.hash(source).toString()}`
   const cached = memo.get(key)
   if (cached) {
     hits += 1

package/src/runtime/fetch-host.ts

@@ -3,10 +3,18 @@
  * always derives Host from the request URL and drops any supplied one. An app that forwards its
  * inbound request headers to an upstream - every proxy/BFF route handler - would otherwise send
  * the local Host upstream, an RFC 9110 7.2 violation that real upstreams reject. Match undici.
+ *
+ * Bun also ignores response-body cancellation: cancelling a fetch Response's stream leaves the
+ * upstream request in flight and its keep-alive socket checked out for good, so a passthrough proxy
+ * route whose client disconnects mid-stream leaks a connection per abort until later fetches to that
+ * host queue behind them forever. Only the fetch's own AbortSignal tears the request down, so each
+ * response body is tracked against its controller here and the serving layer fires it on disconnect.
  */
 
 let installed = false
 
+const upstreamAborts = new WeakMap<ReadableStream<Uint8Array>, AbortController>()
+
 function isHostKey(key: unknown): boolean {
   return typeof key === 'string' && key.length === 4 && key.toLowerCase() === 'host'
 }
@@ -36,7 +44,43 @@ export function installFetchHostNormalization(): void {
   const original = globalThis.fetch.bind(globalThis)
   globalThis.fetch = function fetch(input: RequestInfo | URL, init?: RequestInit) {
     const source = init?.headers ?? (input instanceof Request ? input.headers : undefined)
-    if (source === undefined || !hasHost(source)) return original(input, init)
-    return original(input, { ...init, headers: withoutHost(source) })
+    const normalized =
+      source !== undefined && hasHost(source) ? { ...init, headers: withoutHost(source) } : init
+    return trackUpstream(original, input, normalized)
   } as typeof globalThis.fetch
 }
+
+/** Give every fetch an abort handle of its own, keyed on the body it streams back. */
+function trackUpstream(
+  original: typeof globalThis.fetch,
+  input: RequestInfo | URL,
+  init: RequestInit | undefined,
+): Promise<Response> {
+  const controller = new AbortController()
+  const caller = init?.signal ?? (input instanceof Request ? input.signal : undefined)
+  const signal = caller ? AbortSignal.any([caller, controller.signal]) : controller.signal
+  return original(input, { ...init, signal }).then(response => {
+    if (response.body) upstreamAborts.set(response.body, controller)
+    return response
+  })
+}
+
+/**
+ * Tear down the upstream fetch `body` is streaming from once the client goes away. Bun.serve never
+ * cancels the body it is writing, so this disconnect is the only chance to release that socket.
+ * Zero-cost for any response that is not a fetch passthrough.
+ */
+export function abortUpstreamFetchOnDisconnect(
+  body: ReadableStream<Uint8Array> | null,
+  signal: AbortSignal | undefined,
+): void {
+  if (!body || !signal || !upstreamAborts.has(body)) return
+  const abort = () => {
+    const controller = upstreamAborts.get(body)
+    if (!controller) return
+    upstreamAborts.delete(body)
+    controller.abort()
+  }
+  if (signal.aborted) abort()
+  else signal.addEventListener('abort', abort, { once: true })
+}

package/src/types.ts

@@ -95,7 +95,8 @@ export interface ResourceHint extends Omit<MetadataLink, 'url'> {
 export type MetadataTitle =
   string | number | { absolute?: string; default?: string; template?: string | null }
 
-export type MetadataIcon = string | URL | (Partial<MetadataLink> & { url: string | URL })
+export type MetadataIcon =
+  string | URL | (Omit<Partial<MetadataLink>, 'url'> & { url: string | URL })
 
 export interface MetadataIconGroups {
   icon?: MetadataIcon | MetadataIcon[]
@@ -116,7 +117,7 @@ export interface MetadataRobots {
   nosnippet?: boolean
   noimageindex?: boolean
   nocache?: boolean
-  googleBot?: MetadataRobots & Record<string, string | number | boolean | undefined>
+  googleBot?: string | (MetadataRobots & Record<string, string | number | boolean | undefined>)
 }
 
 export type MetadataImage =
@@ -134,7 +135,7 @@ export type MetadataImage =
 export interface MetadataOpenGraph {
   title?: MetadataTitle
   description?: string
-  url?: string | URL
+  url?: string | URL | null
   siteName?: string
   locale?: string
   type?: string
@@ -142,109 +143,125 @@ export interface MetadataOpenGraph {
   videos?: MetadataImage | MetadataImage[]
   audio?: MetadataImage | MetadataImage[]
   publishedTime?: string
-  authors?: string | string[]
+  authors?: string | URL | (string | URL)[] | null
   emails?: string | string[]
   phoneNumbers?: string | string[]
   faxNumbers?: string | string[]
 }
 
+export interface MetadataTwitterPlayer {
+  playerUrl?: string | URL
+  streamUrl?: string | URL
+  width?: string | number
+  height?: string | number
+}
+
 export interface MetadataTwitter {
   card?: string
-  site?: string
-  siteId?: string
-  creator?: string
-  creatorId?: string
+  site?: string | null
+  siteId?: string | null
+  creator?: string | null
+  creatorId?: string | null
   title?: MetadataTitle
-  description?: string
+  description?: string | null
   images?: MetadataImage | MetadataImage[]
-  players?: {
-    playerUrl?: string | URL
-    streamUrl?: string | URL
-    width?: string | number
-    height?: string | number
-  }
+  players?: MetadataTwitterPlayer | MetadataTwitterPlayer[]
   app?: {
     name?: string
-    id?: Record<string, string | undefined>
+    id?: Record<string, MetadataValue | undefined>
     url?: Record<string, string | URL | undefined>
   }
 }
 
+export type MetadataAlternate =
+  | string
+  | URL
+  | { url: string | URL; title?: string }
+  | (string | URL | { url: string | URL; title?: string })[]
+
 export interface MetadataAlternates {
-  canonical?: string | URL | { url: string | URL }
-  languages?: Record<string, string | URL>
-  media?: Record<string, string | URL>
-  types?: Record<
-    string,
-    | string
-    | URL
-    | { url: string | URL; title?: string }
-    | (string | URL | { url: string | URL; title?: string })[]
-  >
+  canonical?: string | URL | { url: string | URL; title?: string } | null
+  languages?: Record<string, MetadataAlternate | null | undefined>
+  media?: Record<string, MetadataAlternate | null | undefined>
+  types?: Record<string, MetadataAlternate | null | undefined>
 }
 
+// Every field is nullable: a metadata object may explicitly null a field out to
+// suppress an inherited value, and null reads the same as absent here.
 export interface Metadata {
-  metadataBase?: string | URL
-  title?: MetadataTitle
-  description?: string
-  lang?: string
-  keywords?: string | number | (string | number)[]
-  authors?: string | MetadataAuthor | (string | MetadataAuthor)[]
-  generator?: string
-  applicationName?: string
-  referrer?: string
-  robots?: string | MetadataRobots
-  openGraph?: MetadataOpenGraph
-  twitter?: MetadataTwitter
-  alternates?: MetadataAlternates
+  metadataBase?: string | URL | null
+  title?: MetadataTitle | null
+  description?: string | null
+  lang?: string | null
+  keywords?: string | number | (string | number)[] | null
+  authors?: string | MetadataAuthor | (string | MetadataAuthor)[] | null
+  generator?: string | null
+  applicationName?: string | null
+  referrer?: string | null
+  robots?: string | MetadataRobots | null
+  openGraph?: MetadataOpenGraph | null
+  twitter?: MetadataTwitter | null
+  alternates?: MetadataAlternates | null
   pagination?: {
-    previous?: string | URL
-    next?: string | URL
-  }
-  icons?: MetadataIcon | MetadataIcon[] | MetadataIconGroups
-  manifest?: string | URL
-  creator?: string
-  publisher?: string
+    previous?: string | URL | null
+    next?: string | URL | null
+  } | null
+  icons?: MetadataIcon | MetadataIcon[] | MetadataIconGroups | null
+  manifest?: string | URL | null
+  creator?: string | null
+  publisher?: string | null
   formatDetection?: {
-    email?: boolean
-    address?: boolean
-    telephone?: boolean
-    url?: boolean
-  }
+    email?: boolean | null
+    address?: boolean | null
+    telephone?: boolean | null
+    url?: boolean | null
+  } | null
   verification?: {
-    google?: string | string[]
-    yahoo?: string | string[]
-    yandex?: string | string[]
-    other?: Record<string, string | string[]>
-  }
+    google?: MetadataValue | MetadataValue[] | null
+    yahoo?: MetadataValue | MetadataValue[] | null
+    yandex?: MetadataValue | MetadataValue[] | null
+    other?: Record<string, MetadataValue | MetadataValue[]>
+  } | null
   itunes?: {
     appId?: string
-    appArgument?: string
-  }
+    appArgument?: string | null
+  } | null
   appleWebApp?:
     | boolean
     | {
         capable?: boolean
-        title?: string
+        title?: string | null
         statusBarStyle?: string
         startupImage?:
           | string
           | URL
           | { url: string | URL; media?: string }
           | (string | URL | { url: string | URL; media?: string })[]
+          | null
       }
+    | null
   facebook?: {
     appId?: string
-    admins?: string | string[]
-  }
+    admins?: MetadataValue | MetadataValue[]
+  } | null
   pinterest?: {
-    richPin?: boolean
-  }
-  appLinks?: Record<string, Record<string, string | boolean | undefined>>
-  other?: Record<string, string | string[]>
+    richPin?: boolean | string | null
+  } | null
+  appLinks?: MetadataAppLinks | null
+  other?: Record<string, MetadataValue | MetadataValue[] | null>
   links?: MetadataLink[]
 }
 
+/** A metadata value that renders to text; numbers are stringified. */
+export type MetadataValue = string | number
+
+export type MetadataAppLinkTarget = Record<string, MetadataValue | boolean | URL | undefined>
+
+export type MetadataAppLinks = Record<
+  string,
+  MetadataAppLinkTarget | MetadataAppLinkTarget[] | undefined
+>
+
 export type ThemeColor = string | { color: string; media?: string }
 
 export interface Viewport {
@@ -255,8 +272,8 @@ export interface Viewport {
   userScalable?: boolean
   viewportFit?: 'auto' | 'contain' | 'cover'
   interactiveWidget?: 'resizes-visual' | 'resizes-content' | 'overlays-content'
-  themeColor?: ThemeColor | ThemeColor[]
-  colorScheme?: string
+  themeColor?: ThemeColor | ThemeColor[] | null
+  colorScheme?: string | null
 }
 
 export interface NextRequestCookie {

package/tsconfig.json

@@ -6,5 +6,5 @@
     "allowImportingTsExtensions": true
   },
   "include": ["."],
-  "exclude": ["node_modules", ".pnext", "bench/fixtures"]
+  "exclude": ["node_modules", ".pnext", "bench/fixtures", "src/cli/template"]
 }