@ogygia/core 0.11.2 → 0.11.4

package/dist/hooks.d.ts

@@ -1,8 +1,9 @@
+import { Handle } from "./kit-handle.js";
 import { TransformKind } from "./server/reversible.js";
 import { ogygiaTransport } from "./transport.js";
 import { DocumentOptions, document } from "./document.js";
 import { LiftResult, LiftedRegion, RegionKind, RegionSpan, liftRegions, restoreRegions, scanRegions } from "./server/split-regions.js";
-import { Handle, RequestEvent } from "@sveltejs/kit";
+import { RequestEvent } from "@sveltejs/kit";
 /**
  * Options for {@link handle}.
  */

package/dist/kit-handle.d.ts

@@ -0,0 +1,20 @@
+import { RequestEvent } from "@sveltejs/kit";
+type MaybePromise<T> = T | Promise<T>;
+/** Kit's `resolve()` options. */
+export interface ResolveOptions {
+  transformPageChunk?(input: {
+    html: string;
+    done: boolean;
+  }): MaybePromise<string | undefined>;
+  filterSerializedResponseHeaders?(name: string, value: string): boolean;
+  preload?(input: {
+    type: "font" | "css" | "js" | "asset";
+    path: string;
+  }): boolean;
+}
+/** Kit's `Handle` hook. */
+export type Handle = (input: {
+  event: RequestEvent;
+  resolve: (event: RequestEvent, opts?: ResolveOptions) => MaybePromise<Response>;
+}) => MaybePromise<Response>;
+export {};

package/dist/plugin/index.d.ts

@@ -1,3 +1,4 @@
+import { Handle, ResolveOptions } from "../kit-handle.js";
 import { RequestFacts } from "./facts.js";
 import { Ask, Notify, ServerHooks } from "./hooks.js";
 import { DevtoolsEventInput } from "../events/schema.js";
@@ -5,7 +6,7 @@ import { DeferredRegion, og_html_region, region } from "../region.js";
 import { RouteConfig, RouteConfigMatcher, register_route_config } from "./routes.js";
 import { LateRegion, open_late_scope, take_late_regions } from "../late-region-registry.js";
 import { LATE_BOOT_SCRIPT, late_chunk, late_slot } from "../server/late-wire.js";
-import { Handle, RequestEvent } from "@sveltejs/kit";
+import { RequestEvent } from "@sveltejs/kit";
 /** The server process, as one plugin sees it (handed to `setup`, and on every `ctx.app`). */
 export interface ServerApp<Options = undefined> {
   /** The plugin's name (its package name). */
@@ -81,8 +82,6 @@ export interface RequestContext<Options = undefined, State = undefined> {
   perVisitor(reason: string): void;
 }
 type MaybePromise<T> = T | Promise<T>;
-/** Kit's `resolve()` options (a `transformPageChunk`, `filterSerializedResponseHeaders`, …). */
-export type ResolveOptions = NonNullable<Parameters<Parameters<Handle>[0]["resolve"]>[1]>;
 /** A request as an AROUND hook sees it: before anything is decided about it. */
 export interface HandleContext<Options = undefined> {
   /** Kit's own event, untouched. */
@@ -124,4 +123,4 @@ export declare const STORED_DOCUMENT_META = "<meta name=\"ogygia-stored\" conten
 /** A deferred region value whose HTML the browser fetches from `url` (a capability the plugin minted,
  *  `''` for an inert one). HTML only: whatever islands the answer carries wake themselves. */
 export declare function deferredRegion(id: string, url: string): DeferredRegion;
-export { type DevtoolsEventInput, LATE_BOOT_SCRIPT, type LateRegion, type RequestFacts, type RouteConfig, type RouteConfigMatcher, type ServerHooks, og_html_region as htmlRegion, late_chunk as lateChunk, late_slot as lateSlot, open_late_scope as openLateScope, region, register_route_config as registerRouteConfig, take_late_regions as takeLateRegions };
+export { type DevtoolsEventInput, type Handle, LATE_BOOT_SCRIPT, type LateRegion, type RequestFacts, type ResolveOptions, type RouteConfig, type RouteConfigMatcher, type ServerHooks, og_html_region as htmlRegion, late_chunk as lateChunk, late_slot as lateSlot, open_late_scope as openLateScope, region, register_route_config as registerRouteConfig, take_late_regions as takeLateRegions };

package/dist/plugin/server.d.ts

@@ -1,7 +1,8 @@
-import { RequestContext, ResolveOptions, ServerApp, ServerPlugin } from "./index.js";
+import { Handle, ResolveOptions } from "../kit-handle.js";
+import { RequestContext, ServerApp, ServerPlugin } from "./index.js";
 import { RequestFacts } from "./facts.js";
 import { CapabilitySigner } from "./capability.js";
-import { Handle, RequestEvent } from "@sveltejs/kit";
+import { RequestEvent } from "@sveltejs/kit";
 /** One plugin's server half as the build lists it (`virtual:ogygia/server-plugins`). */
 export interface ServerPluginEntry {
   name: string;

package/dist/server/reversible.js

@@ -490,9 +490,11 @@ const attr_map = (attrs) => {
 * gives (Svelte's children in the light DOM), never in the transform's server form only the
 * component's first hydrate reads (that form, morphed into a live host, left the transform's tree in
 * its light DOM: a site nav collapsed to one unstyled item after an in-place navigation). In a
-* document loaded as one, every one in Svelte-owned markup, and every one with Svelte-owned markup
-* below it (a server-owned host around an island: adopting it would reach into the island). A first
-* pass, so the marking pass knows a host's plan before it reaches the host's children.
+* document loaded as one, every one in Svelte-owned markup, and every one with Svelte-owned markup or
+* a hole below it (a server-owned host around an island or a hole: adopting it would reach into a
+* region ogygia hydrates or swaps — a web component relocating its slotted children moved a hole's
+* fallback twice, and its tabs kept a second copy of a document listener). A first pass, so the
+* marking pass knows a host's plan before it reaches the host's children.
 */
 function plan_hosts(html, kind, csr, answer) {
 	const planned = [];
@@ -507,13 +509,18 @@ function plan_hosts(html, kind, csr, answer) {
 		const parent = stack[stack.length - 1];
 		const foreign = name === "svg" || name === "math" || !!parent?.foreign;
 		let owned = name === "body" && kind === "document" && csr || (parent ? parent.owned : false);
-		if (name === "ogygia-region") owned = region_kind(parse_attrs(html, tok.name_end, tok.end - 1)) === "island";
+		let swapped = false;
+		if (name === "ogygia-region") {
+			const region = region_kind(parse_attrs(html, tok.name_end, tok.end - 1));
+			owned = region === "island";
+			swapped = region === "hole";
+		}
 		let host = -1;
 		if (in_body && is_custom(name, foreign)) {
 			host = planned.length;
 			planned.push(answer || kind !== "document" || owned);
 		}
-		if (owned && !(parent ? parent.owned : false)) {
+		if ((owned || swapped) && !(parent ? parent.owned : false)) {
 			for (const f of stack) if (f.host !== -1) planned[f.host] = true;
 		}
 		if (!(VOID.has(name) || tok.self && foreign)) push(stack, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygia/core",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "The core of ogygia (SSR islands for SvelteKit): apps install `ogygia`, plugins build on this",
   "homepage": "https://ogygiajs.dev",
   "bugs": {