@ogygia/core 0.12.2 → 0.13.0

package/dist/compiler/driver.js

@@ -27,6 +27,7 @@ import { export_names, is_registry_stub_id, registry_client_id, registry_client_
 import { island_host_loaded } from "./link/emit-gate.js";
 import { stamp_opaque } from "./ownership-stamps.js";
 import { strip_bom } from "./bom.js";
+import { OgygiaError, line, warn } from "../messages/build.js";
 // src/compiler/driver.ts
 /**
 * The `Compiler` — the driver / long-lived compile session. It holds the `Program` (cross-file
@@ -116,7 +117,7 @@ const warned_undeclared = /* @__PURE__ */ new Set();
 function warn_undeclared_pkg_marks(id) {
 	if (warned_undeclared.has(id)) return;
 	warned_undeclared.add(id);
-	console.warn(`[ogygia] ${id} uses ogygia marks, but its package declares no \`"ogygia": { "files": [...] }\` — the marks are IGNORED. Add the field to that package's package.json (npm-"files"-style paths/globs) to put it on ogygia's compile surface.`);
+	warn("package_marks_undeclared", { file: id });
 }
 /** The client-hooks boot snippet for a generated runtime entry: an import of the runtime runner and
 *  a call that dynamic-imports the app's `hooks.client.*` — empty when the app has none. Runs the
@@ -460,7 +461,10 @@ var Compiler = class {
 			}
 			for (const { file, keys } of reads) for (const key of keys) {
 				if (island_set.has(key)) continue;
-				console.warn(`[ogygia] island code ${path.relative(root, file)} reads getContext('${key}'), but this app registers no ogygia context provider and no island code sets '${key}'. On a csr=false page a value set with Svelte's setContext in a page/layout does NOT cross the island boundary — the island reads undefined on the client, re-renders a different tree, and Svelte discards its server-rendered DOM on hydration (a silent full re-render). Fix: provide '${key}' with setContext / <Provide> / createContext imported from 'ogygia' (in a csr=false layout); the read stays getContext('${key}').`);
+				warn("island_context_unprovided", {
+					file: path.relative(root, file),
+					key
+				});
 			}
 		}
 		if (transportable_modules.size > 0) runtime_marks.wire = true;
@@ -854,7 +858,7 @@ var Compiler = class {
 		if (id === RESOLVED("virtual:ogygia/secret")) return secret_module(ssr, ctx.build_secret, ctx.id_salt !== "");
 		if (id === RESOLVED("virtual:ogygia/sign")) return sign_module(ssr, ctx.hmac_module);
 		if (id === RESOLVED("virtual:ogygia/request-event")) {
-			if (!ssr) return `export function getRequestEvent() { throw new Error('[ogygia] getRequestEvent is server-only'); }`;
+			if (!ssr) return `export function getRequestEvent() { throw new Error(${JSON.stringify(line("request_event_server_only"))}); }`;
 			return `export { getRequestEvent } from '$app/server';`;
 		}
 		if (id === RESOLVED("virtual:ogygia/region-endpoint")) {
@@ -979,7 +983,10 @@ var Compiler = class {
 			const host = registry.get(importer_id).hostPath ?? "";
 			const resolved = await resolve(source, host, { skipSelf: true });
 			if (resolved?.id) island_graph.add(strip_id(resolved.id));
-			if (!resolved && !source.startsWith(".") && !source.startsWith("\0") && !source.startsWith("virtual:") && !path.isAbsolute(source)) throw new Error(`[ogygia] cannot resolve '${source}' imported by the generated island module for ${path.relative(ctx.root, host)}. That island was marked on a package import, so the specifier must resolve from the host file: check the package is installed and its "exports" map exposes this subpath (with a "svelte" condition for .svelte components).`);
+			if (!resolved && !source.startsWith(".") && !source.startsWith("\0") && !source.startsWith("virtual:") && !path.isAbsolute(source)) throw new OgygiaError("island_import_unresolved", {
+				specifier: source,
+				host: path.relative(ctx.root, host)
+			});
 			return resolved;
 		}
 		if (!ssr && importer_id && island_graph.has(importer_id) && !is_island_path(source)) {

package/dist/compiler/flags.js

@@ -24,11 +24,22 @@ const KINDS = /* @__PURE__ */ new Set(["flag"]);
 const MAYBE_RE = /\bflag\b/;
 /** All `<script …>` blocks of a `.svelte` file (instance AND module — flags can sit in either). */
 const SCRIPT_BLOCK_RE = /<script\b[^>]*>([\s\S]*?)<\/script>/g;
-const NL = 10;
-function line_at(src, index, base_line) {
-	let line = base_line;
-	for (let i = 0; i < index; i++) if (src.charCodeAt(i) === NL) line++;
-	return line;
+/** Where every newline of `src` is, in order: one pass, then each line is a binary search. */
+function newlines_of(src) {
+	const at = [];
+	for (let i = src.indexOf("\n"); i !== -1; i = src.indexOf("\n", i + 1)) at.push(i);
+	return at;
+}
+/** The line `index` is on: `base_line` plus the newlines before it. */
+function line_at(newlines, index, base_line) {
+	let lo = 0;
+	let hi = newlines.length;
+	while (lo < hi) {
+		const mid = lo + hi >>> 1;
+		if (newlines[mid] < index) lo = mid + 1;
+		else hi = mid;
+	}
+	return base_line + lo;
 }
 function string_arg(node) {
 	if (!node) return null;
@@ -51,6 +62,7 @@ function collect_from_source(src, id, file, base_line, out) {
 		} else if (s.type === "ImportNamespaceSpecifier") namespaces.add(s.local.name);
 	}
 	if (locals.size === 0 && namespaces.size === 0) return;
+	let newlines;
 	walk(result.program, { enter(n) {
 		const node = n;
 		if (node.type !== "CallExpression") return;
@@ -61,11 +73,12 @@ function collect_from_source(src, id, file, base_line, out) {
 		if (!kind) return;
 		const name = string_arg(node.arguments?.[0]);
 		if (name == null) return;
+		newlines ??= newlines_of(src);
 		out.push({
 			name,
 			kind,
 			file,
-			line: line_at(src, node.start ?? 0, base_line)
+			line: line_at(newlines, node.start ?? 0, base_line)
 		});
 	} });
 }
@@ -74,10 +87,11 @@ function collect_flag_sites(code, id, file) {
 	const out = [];
 	if (id.endsWith(".svelte")) {
 		SCRIPT_BLOCK_RE.lastIndex = 0;
+		const newlines = newlines_of(code);
 		let m;
 		while (m = SCRIPT_BLOCK_RE.exec(code)) {
 			const body_start = m.index + m[0].indexOf(">") + 1;
-			collect_from_source(m[1], id + ".ts", file, line_at(code, body_start, 1), out);
+			collect_from_source(m[1], id + ".ts", file, line_at(newlines, body_start, 1), out);
 		}
 	} else collect_from_source(code, id, file, 1, out);
 	return out;

package/dist/compiler/fouc-css.js

@@ -3,6 +3,7 @@ import { unscoped_marker } from "../unscoped-css.js";
 import { blank_styles } from "./blank-styles.js";
 import { BarrelIndex } from "./debarrel/barrel.js";
 import { analyze_exports, analyze_imports } from "./debarrel/parse.js";
+import { warn } from "../messages/build.js";
 import { compile, parse } from "svelte/compiler";
 import { walk } from "estree-walker";
 // src/compiler/fouc-css.ts
@@ -251,7 +252,10 @@ function compileFoucScopedCss(abs, source, opts = {}) {
 		err ??= e;
 	}
 	const why = err.message.split("\n")[0];
-	if (opts.keepScript) console.warn(`[ogygia] scoped CSS for ${abs} could not be compiled (${why}) — shipping its style bodies unscoped`);
+	if (opts.keepScript) warn("scoped_css_failed", {
+		file: abs,
+		reason: why
+	});
 	const raw = extractRawStyleBodies(source);
 	return raw ? unscoped_marker(abs, why) + raw : raw;
 }

package/dist/compiler/kit.js

@@ -1,6 +1,7 @@
 import { dir_entries, fs, path } from "./host.js";
 import "./region/transform.js";
 import { parse_module } from "./parse/oxc.js";
+import { OgygiaError } from "../messages/build.js";
 import { createRequire } from "node:module";
 // src/compiler/kit.ts
 /**
@@ -168,7 +169,10 @@ function read_route_config_uncached(file, keys) {
 		const key = property.key?.type === "Identifier" ? property.key.name : property.key?.value;
 		if (typeof key !== "string" || !keys.includes(key)) continue;
 		const value = literal_value(property.value);
-		if (value === NOT_LITERAL) throw new Error(`[ogygia] ${file}: \`config.${key}\` must be a literal (true, false, a number, a string or null) — ogygia reads it at build time.`);
+		if (value === NOT_LITERAL) throw new OgygiaError("kit_config_not_literal", {
+			file,
+			key
+		});
 		out[key] = value;
 	}
 	return out;

package/dist/compiler/link/build-output.js

@@ -1,5 +1,6 @@
 import { dir_entries, fs, path } from "../host.js";
 import { islandDepsHandoffPath } from "./island-deps.js";
+import { line, warn } from "../../messages/build.js";
 // src/compiler/link/build-output.ts
 /**
 * Whole-program build-output side effects — the work the adapter's `writeBundle` does AFTER the
@@ -36,8 +37,11 @@ function warn_content_leaks(bundle, root, is_island_path) {
 		}
 		if (leaks.length) {
 			const all = [...new Set(leaks.flatMap((l) => l.modules))];
-			const sample = all.slice(0, 5).map((m) => "    " + path.relative(root, m.split("?")[0])).join("\n");
-			console.warn(`[ogygia] content leaked into the CLIENT bundle: ${all.length} corpus module(s) (.svx/.md) shipped to the browser (in chunk '${leaks[0].chunk}').\n  A content() collection was imported into client-shipped code — usually an island — which drags its eager import.meta.glob (every doc) in.\n  Fix: keep the collection in a server-only module (or a .remote.ts) and feed islands DATA (refs) via props or a remote, never the collection itself.\n${sample}${all.length > 5 ? "\n    …" : ""}`);
+			warn("content_leaked_to_client", {
+				count: all.length,
+				chunk: leaks[0].chunk,
+				modules: all.slice(0, 5).map((m) => path.relative(root, m.split("?")[0])).join("\n")
+			});
 		}
 	} catch {}
 }
@@ -106,7 +110,12 @@ function report_seed_shaping(map, bundle, program, root, file_of = (identity) =>
 	const key_count = new Set(pinned.flatMap((e) => map.page_keys[e] ?? [])).size;
 	const rel = (p) => p.startsWith(root) ? p.slice(root.length).replace(/^\//, "") : p;
 	const lines = [];
-	lines.push(`[ogygia] page seed: ${readers.length} island${readers.length === 1 ? "" : "s"} read page.data — ${pinned.length} pinned to ${key_count} key${key_count === 1 ? "" : "s"}, ${unpinned.length} ship all of it`);
+	lines.push(line("page_seed_report", {
+		islands: readers.length,
+		pinned: pinned.length,
+		keys: key_count,
+		unpinned: unpinned.length
+	}));
 	if (unpinned.length) {
 		const closure = (entry) => {
 			const seen = /* @__PURE__ */ new Set();

package/dist/compiler/macros/bake.js

@@ -3,6 +3,7 @@ import { og_member } from "./wire.js";
 import { parse_module } from "../parse/oxc.js";
 import { og_js_regions } from "../parse/scan.js";
 import { BuildCache } from "../../build-cache.js";
+import { OgygiaError } from "../../messages/build.js";
 import { uneval } from "devalue";
 import { pathToFileURL } from "node:url";
 // src/compiler/macros/bake.ts
@@ -76,9 +77,15 @@ function scan(src, id, markup_exts) {
 			if (n.type !== "CallExpression" || og_member(n.callee) !== "bake") return;
 			const abs = off + n.start;
 			const args = n.arguments ?? [];
-			if (args.length !== 1) throw new Error(`[ogygia] ${id}:${line_of(src, abs)} — import.meta.og.bake(fn) takes exactly one argument (a function).`);
+			if (args.length !== 1) throw new OgygiaError("macro_bake_arity", {
+				file: id,
+				line: line_of(src, abs)
+			});
 			const a = args[0];
-			if (a.type !== "ArrowFunctionExpression" && a.type !== "FunctionExpression") throw new Error(`[ogygia] ${id}:${line_of(src, abs)} — import.meta.og.bake(fn): the argument must be a function (\`() => …\`).`);
+			if (a.type !== "ArrowFunctionExpression" && a.type !== "FunctionExpression") throw new OgygiaError("macro_bake_not_function", {
+				file: id,
+				line: line_of(src, abs)
+			});
 			calls.push({
 				start: abs,
 				end: off + n.end,
@@ -270,7 +277,10 @@ async function rewrite_bake(src, id, opts) {
 		});
 	} catch (e) {
 		const msg = e instanceof Error ? e.message : String(e);
-		throw new Error(`[ogygia] import.meta.og.bake() in ${path.basename(id)}: evaluating the function failed — ${msg}. A baked function may use this module's IMPORTS and literals only (not its other local variables), and must not touch runtime-only modules ($app/*, the browser).`);
+		throw new OgygiaError("macro_bake_eval_failed", {
+			file: path.basename(id),
+			reason: msg
+		});
 	}
 	const edits = [];
 	found.calls.forEach((c, i) => {
@@ -279,7 +289,11 @@ async function rewrite_bake(src, id, opts) {
 			literal = uneval(results[i]);
 		} catch (e) {
 			const msg = e instanceof Error ? e.message : String(e);
-			throw new Error(`[ogygia] ${id}:${line_of(src, c.start)} — import.meta.og.bake(): the result is not serializable (${msg}). bake produces DATA — return plain values (JSON + Date/Map/Set/RegExp/BigInt), never a function, Promise, or class instance.`);
+			throw new OgygiaError("macro_bake_not_serializable", {
+				file: id,
+				line: line_of(src, c.start),
+				reason: msg
+			});
 		}
 		edits.push({
 			start: c.start,

package/dist/compiler/macros/dollar.js

@@ -1,6 +1,7 @@
 import { match_close, og_js_regions } from "../parse/scan.js";
 import { parse_module } from "../parse/oxc.js";
 import { og_member } from "./wire.js";
+import { OgygiaError } from "../../messages/build.js";
 // src/compiler/macros/dollar.ts
 /**
 * `import.meta.og.$()` — the boundary mark for FUNCTIONS, as a compile construct.
@@ -121,7 +122,11 @@ function line_of(src, offset) {
 	return line;
 }
 function misuse(id, src, offset, what) {
-	throw new Error(`[ogygia] ${id}:${line_of(src, offset)} — ${what}. import.meta.og.$ is legal in exactly one shape: a direct call wrapping an inline function — import.meta.og.$((args) => { … }). It hoists that function so its VALUE can cross an island boundary as a handle.`);
+	throw new OgygiaError("macro_dollar_misuse", {
+		file: id,
+		line: line_of(src, offset),
+		problem: what
+	});
 }
 /** Names DECLARED anywhere inside `fn` (params, vars, inner fns, catch, destructuring). */
 function declared_names(fn) {

package/dist/compiler/macros/source.js

@@ -1,6 +1,7 @@
 import { find_og_calls, og_js_regions } from "../parse/scan.js";
 import { parse_module } from "../parse/oxc.js";
 import { og_member } from "./wire.js";
+import { OgygiaError } from "../../messages/build.js";
 // src/compiler/macros/source.ts
 /**
 * `import.meta.og.source(fn)` — declared data sources, as a compile construct (the postrender
@@ -29,7 +30,11 @@ function line_of(src, offset) {
 	return line;
 }
 function misuse(id, src, offset, what) {
-	throw new Error(`[ogygia] ${id}:${line_of(src, offset)} — ${what}. import.meta.og.source is legal in exactly one position: \`export const <name> = import.meta.og.source(fn)\` (optionally \`(fn, { key })\`) at module top level. The compiler stamps the source id from that export's identity.`);
+	throw new OgygiaError("macro_source_misuse", {
+		file: id,
+		line: line_of(src, offset),
+		problem: what
+	});
 }
 function walk(node, visit) {
 	visit(node);

package/dist/compiler/macros/store.js

@@ -1,6 +1,7 @@
 import { og_js_regions } from "../parse/scan.js";
 import { parse_module } from "../parse/oxc.js";
 import { og_member } from "./wire.js";
+import { OgygiaError, warn } from "../../messages/build.js";
 // src/compiler/macros/store.ts
 /**
 * `import.meta.og.store()` — the store-factory assert mark, as a compile construct.
@@ -41,7 +42,11 @@ function line_of(src, offset) {
 	return line;
 }
 function misuse(id, src, offset, what) {
-	throw new Error(`[ogygia] ${id}:${line_of(src, offset)} — ${what}. import.meta.og.store is legal in exactly one shape: a direct call wrapping a store factory — import.meta.og.store((seed) => ({ subscribe, … })). It registers the factory under a build tag so islands rebuild the store THROUGH it (custom methods survive); the factory's first parameter is the seed value.`);
+	throw new OgygiaError("macro_store_misuse", {
+		file: id,
+		line: line_of(src, offset),
+		problem: what
+	});
 }
 /** Unwrap oxc's preserved parens. */
 function unparen(v) {
@@ -105,7 +110,10 @@ function rewrite_store(src, id, rel_id, markup_exts) {
 				claimed.add(n.callee);
 				if (fn.type !== "Identifier") {
 					const bad = first_non_store_return(fn);
-					if (bad !== void 0 && typeof console !== "undefined") console.warn(`[ogygia] ${id}:${line_of(src, region.offset + bad)} — this import.meta.og.store factory has a return that is provably not a store (undefined/null/primitive). Where that branch runs, the product crosses as plain data, unbranded. If it is an environment guard, return a store there too (e.g. writable(seed)) and guard the side effects inside the factory instead.`);
+					if (bad !== void 0 && typeof console !== "undefined") warn("macro_store_returns_non_store", {
+						file: id,
+						line: line_of(src, region.offset + bad)
+					});
 				}
 				const fn_text = region.code.slice(fn.start, fn.end);
 				const tag = `${rel_id}#store${seq++}`;

package/dist/compiler/macros/wire.js

@@ -1,5 +1,6 @@
 import { find_og_calls, og_js_regions } from "../parse/scan.js";
 import { parse_module } from "../parse/oxc.js";
+import { OgygiaError } from "../../messages/build.js";
 // src/compiler/macros/wire.ts
 /**
 * `import.meta.og.wire()` — the transportable mark, as a compile construct. A class opts into
@@ -66,7 +67,11 @@ function line_of(src, offset) {
 }
 /** The strict-position build error. `id` + line point at the offending spelling. */
 function misuse(id, src, offset, what) {
-	throw new Error(`[ogygia] ${id}:${line_of(src, offset)} — ${what}. import.meta.og.wire is legal in exactly one position: \`static wire = import.meta.og.wire({ encode, decode })\` inside a class body. The macro consumes that member and mints the symbol key; the construct is not a value.`);
+	throw new OgygiaError("macro_wire_misuse", {
+		file: id,
+		line: line_of(src, offset),
+		problem: what
+	});
 }
 /**
 * AST pass over one JS region. The ONLY legal shape rewrites; every other appearance of the

package/dist/compiler/parse/scan.js

@@ -1,3 +1,4 @@
+import { OgygiaError } from "../../messages/build.js";
 // src/compiler/parse/scan.ts
 /**
 * The string-aware macro SCANNER — the cheap-bailout front-end for `import.meta.og.*`.
@@ -152,15 +153,21 @@ function split_first_string(args, who) {
 	let i = 0;
 	while (i < args.length && WS_RE.test(args[i])) i++;
 	const q = args[i];
-	if (q !== "'" && q !== "\"" && q !== "`") throw new Error(`[ogygia] ${who}: the first argument must be a static string literal, got '${args.slice(0, 24)}…'`);
+	if (q !== "'" && q !== "\"" && q !== "`") throw new OgygiaError("call_arg_not_literal", {
+		call: who,
+		got: args.slice(0, 24)
+	});
 	let j = i + 1;
 	for (; j < args.length; j++) if (args[j] === "\\") j++;
 	else if (args[j] === q) break;
 	const value = args.slice(i + 1, j);
-	if (q === "`" && TEMPLATE_INTERPOLATION_RE.test(value)) throw new Error(`[ogygia] ${who}: the first argument must be a static string literal — a template literal with \${…} interpolation is a runtime value the build cannot resolve.`);
+	if (q === "`" && TEMPLATE_INTERPOLATION_RE.test(value)) throw new OgygiaError("call_arg_interpolated", { call: who });
 	let k = j + 1;
 	while (k < args.length && WS_RE.test(args[k])) k++;
-	if (k < args.length && args[k] !== ",") throw new Error(`[ogygia] ${who}: the first argument must be a static string literal, but it is part of a larger expression (near '${args.slice(i, k + 8)}…'). Use one plain string.`);
+	if (k < args.length && args[k] !== ",") throw new OgygiaError("call_arg_in_expression", {
+		call: who,
+		near: args.slice(i, k + 8)
+	});
 	if (args[k] === ",") k++;
 	return {
 		value,