@ogygia/core 0.11.0 → 0.11.2

package/dist/compiler/ctx.d.ts

@@ -142,6 +142,11 @@ export declare class CompileCtx {
   constructor(init: CompileCtxInit);
   /** True when `code` carries an ogygia `with { … }` island hint (gates node_modules `.svelte`). */
   has_island_hint(code: string): boolean;
+  /** True when a JS module has a real `import … with { <mark key>: … }` declaration. The hint
+   *  above is a text sniff, so it also matches a comment, a string or generated code that merely
+   *  mentions `with { wake }`; this parses. A module that does not parse counts as marked, so a
+   *  warning that depends on it errs toward speaking. */
+  has_marked_import(code: string, id: string): boolean;
   /** True when `id` is inside a dependency's DECLARED `ogygia.files` surface — those files are
    *  prescanned + transformed exactly like app source (the node_modules gates lift for them). */
   in_declared_pkg(id: string): boolean;

package/dist/compiler/ctx.js

@@ -1,6 +1,7 @@
 import { fs } from "./host.js";
 import { strip_bom } from "./bom.js";
 import { islandVirtualId } from "./ids.js";
+import { parse_module } from "./parse/oxc.js";
 import { islandChunkFileName, islandPublicUrl, wrapperVirtualId } from "./region/transform.js";
 // src/compiler/ctx.ts
 /**
@@ -55,6 +56,8 @@ var CompileCtx = class {
 	/** `with { … }` hint matcher — a node_modules `.svelte` is only transformed when it carries one
 	*  (so a library can declare its own islands). Built once from the resolved import keys. */
 	#island_hint_re;
+	/** The resolved import-attribute keys that make a mark (`wake`, `render`, …). */
+	#mark_keys;
 	/** Declared package files (exact) + dirs (prefix) — the transform-gate membership index. */
 	#pkg_files;
 	#pkg_dirs;
@@ -99,6 +102,7 @@ var CompileCtx = class {
 		this.devtools = init.devtools;
 		const hint_keys = Object.values(init.import_keys).filter((v) => typeof v === "string");
 		this.#island_hint_re = hint_keys.length ? new RegExp(`\\bwith\\s*\\{[^}]*\\b(?:${hint_keys.join("|")})\\b`) : NEVER_MATCH_RE;
+		this.#mark_keys = new Set(hint_keys);
 		this.#pkg_files = new Set(this.pkg_scan.flatMap((p) => p.files));
 		this.#pkg_dirs = this.pkg_scan.flatMap((p) => p.dirs);
 		this.#pkg_roots = this.pkg_scan.map((p) => ({
@@ -110,6 +114,22 @@ var CompileCtx = class {
 	has_island_hint(code) {
 		return this.#island_hint_re.test(code);
 	}
+	/** True when a JS module has a real `import … with { <mark key>: … }` declaration. The hint
+	*  above is a text sniff, so it also matches a comment, a string or generated code that merely
+	*  mentions `with { wake }`; this parses. A module that does not parse counts as marked, so a
+	*  warning that depends on it errs toward speaking. */
+	has_marked_import(code, id) {
+		const { program, ok } = parse_module(code, id);
+		if (!ok || !program) return true;
+		for (const node of program.body) {
+			if (node.type !== "ImportDeclaration") continue;
+			for (const attr of node.attributes ?? []) {
+				const key = attr.key?.type === "Identifier" ? attr.key.name : attr.key?.value;
+				if (typeof key === "string" && this.#mark_keys.has(key)) return true;
+			}
+		}
+		return false;
+	}
 	/** True when `id` is inside a dependency's DECLARED `ogygia.files` surface — those files are
 	*  prescanned + transformed exactly like app source (the node_modules gates lift for them). */
 	in_declared_pkg(id) {

package/dist/compiler/driver.js

@@ -1199,7 +1199,7 @@ var Compiler = class {
 			}
 		}
 		const nm_ts = id_n.endsWith(".ts") || id_n.endsWith(".js") || id_n.endsWith(".mjs") ? id_n.includes("/node_modules/") : null;
-		if (nm_ts === true && !id_n.startsWith(ctx.pkg_root) && !ctx.in_declared_pkg(id_n) && ctx.has_island_hint(out)) warn_undeclared_pkg_marks(id_n);
+		if (nm_ts === true && !id_n.startsWith(ctx.pkg_root) && !ctx.in_declared_pkg(id_n) && ctx.has_island_hint(out) && ctx.has_marked_import(out, id_n)) warn_undeclared_pkg_marks(id_n);
 		if (nm_ts !== null && (nm_ts === false || ctx.in_declared_pkg(id_n)) && !is_island_path(id_n)) {
 			const result = this.ts_regions(out, id_n);
 			if (result) {

package/dist/hooks.js

@@ -413,6 +413,14 @@ function has_body_close(carry, chunk) {
 function csr_page_of(html, body_end, event, bag) {
 	return event?.route?.id != null ? bag?.page?.error != null ? error_route_is_csr_true(event.route.id) : route_is_csr_true(event.route.id) : body_end !== -1 && html_has_kit_bootstrap(html, body_end);
 }
+/** The drop-in `setContext` page root (`<script data-ogygia-provide-page>`), or '' when the request
+*  set nothing an island can read. Drops any non-serializable value (function / store / class
+*  instance) instead of crashing. */
+function page_ctx_script(bag) {
+	if (!bag?.ctx?.size) return "";
+	const payload = serialize_provided_context(bag.ctx);
+	return payload ? emit_ogygia_script("ctx", payload, PAGE_CTX_MARKER) : "";
+}
 /** The restorer, inline (runtime/restore.ts — self-contained, so its source runs as is): restores the
 *  document now, and stays as `__og_restore` / `__og_restore_adopt` for hole answers and router swaps. */
 const RESTORER_SCRIPT = `<script data-og-restore>(function(){var r=${restore.toString()};window.__og_restore=r;window.__og_restore_adopt=${restore_adopt.toString()};r(document)})()<\/script>`;
@@ -630,9 +638,10 @@ var OgygiaHandle = class {
 			if (head !== null) {
 				head_inject = CSR_META;
 				if (devtools_boot_url && !head.includes("data-ogygia-devtools-boot")) head_inject += `<script type="module" data-ogygia-devtools-boot src="${devtools_boot_url}"><\/script>`;
+				if (bag) bag.kit_with_runtime = page_declares_runtime_script(head);
 			}
 			if (head !== null && bag?.transform_head) head_inject = bag.transform_head + head_inject;
-			const tail = spans.body_end !== -1 && bag ? (bag.transform_body ?? "") + bag.tail.render(null) : "";
+			const tail = spans.body_end !== -1 && bag ? (bag.transform_body ?? "") + bag.tail.render(null) + (bag.kit_with_runtime ? page_ctx_script(bag) : "") : "";
 			if (head === null && !tail) return html;
 			const ordered = head === null ? null : runtime_first(head, null);
 			return assemble(html, spans, ordered === head ? null : ordered, head_inject, tail);
@@ -735,13 +744,10 @@ var OgygiaHandle = class {
 			scripts.push(fnm_script);
 			fnm_bytes = fnm_script.length;
 		}
-		const provided = bag?.ctx;
-		if (provided?.size) {
-			const payload = serialize_provided_context(provided);
-			if (payload) {
-				scripts.push(emit_ogygia_script("ctx", payload, PAGE_CTX_MARKER));
-				ctx_bytes = payload.length;
-			}
+		const ctx_script = page_ctx_script(bag);
+		if (ctx_script) {
+			scripts.push(ctx_script);
+			ctx_bytes = ctx_script.length;
 		}
 		this.append_devtools_seed(scripts, bag);
 		const out = assemble(html, spans, head_out, head_inject, scripts.join(""));

package/package.json

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