@ogygia/core 0.12.1 → 0.12.3

package/dist/vite/index.d.ts

@@ -5,6 +5,7 @@ import { debarrel } from "../compiler/debarrel/plugin.js";
 import { BuildContext, MacroContext, MacroHandler, MarkupRegions, MarkupSource, OgygiaPlugin, PluginDefinition, definePlugin } from "./plugin-api.js";
 import { DebarrelOptions, Matcher } from "../compiler/debarrel/options.js";
 import { OgygiaOptions, OgygiaPreset, OgygiaRateLimit } from "./options.js";
+import { PreprocessorGroup } from "svelte/compiler";
 import { Plugin } from "vite";
 /**
  * Vite plugin: transforms `with { hydrate | defer | preset }` imports into islands,
@@ -16,4 +17,16 @@ import { Plugin } from "vite";
  * @returns Vite plugins (`ogygia` pre + island sourcemap fix post). Vite flattens the array.
  */
 export declare function ogygia(options?: OgygiaOptions): Plugin[];
+export declare namespace ogygia {
+  /**
+   * @deprecated Does nothing: returns `['.svelte']`. Markdown extensions come from
+   * `extensions()` in `@ogygia/content/vite`.
+   */
+  export const extensions: () => string[];
+  /**
+   * @deprecated Does nothing: returns `[]`. The markdown preprocessor comes from `preprocess()` in
+   * `@ogygia/content/vite`.
+   */
+  export const preprocess: () => PreprocessorGroup[];
+}
 export { type BuildContext, CLIENT_BINDING_STUB, DEFAULT_IMPORT_KEYS, type Matcher as DebarrelMatcher, type DebarrelOptions, type ImportKeys, type MacroContext, type MacroHandler, type MarkupRegions, type MarkupSource, type OgygiaOptions, type OgygiaPlugin, type OgygiaPreset, type OgygiaRateLimit, type PluginDefinition, debarrel, definePlugin, import_keys_hint, islandChunkFileName, islandId, islandPublicUrl, normalize_import_keys, regionId, regionIdentity, rewrite_lake_import_to_placeholder, strategyKey, wrapperVirtualId };

package/dist/vite/index.js

@@ -16,7 +16,7 @@ import { fill_profiler_maps } from "./profiler-maps.js";
 import { DEFAULT_REGION_TTL_SEC } from "../server/endpoint.js";
 import { RENEW_WINDOW_SEC } from "../server/shared-cache.js";
 import { derive_id_salt, secret_has_min_entropy } from "../server/hmac.js";
-import { buildFoucCssModuleSource, collectFoucCssReachable, compileFoucScopedCss, foucRelFromId, isFoucCssId, isFoucScopedId } from "../compiler/fouc-css.js";
+import { buildFoucCssModuleSource, collectFoucCssReachable, compileFoucScopedCss, foucRelFromId, isFoucCssId, isFoucScopedId, svelteHasStyle } from "../compiler/fouc-css.js";
 import { preprocess_component_for_css } from "./style-preprocess.js";
 import { needs_csr_false_full_reload, needs_island_entry_full_reload } from "../compiler/dev/hmr.js";
 import { derive_css_scope_owners } from "../compiler/dev/css-scope.js";
@@ -104,6 +104,31 @@ function ogygia(options = {}) {
 	let id_salt = "";
 	/** content_css_key → emitted CSS asset referenceId (client leg). Resolved to hrefs in writeBundle. */
 	const content_css_refs = /* @__PURE__ */ new Map();
+	const compiled_css = /* @__PURE__ */ new Map();
+	const tree_css_walk = (ctx) => {
+		const walk_resolve = bundler_resolve(ctx);
+		return async (abs, opts = {}) => {
+			const { own, skip } = opts;
+			const parts = [];
+			for (const e of await collectFoucCssReachable(abs, {
+				root,
+				libDir,
+				readFile: own == null ? readFile : (p) => p === abs ? own : readFile(p),
+				alias: resolve_alias,
+				resolve: walk_resolve
+			})) {
+				if (own != null && e.abs === abs || skip?.(e.abs)) continue;
+				let css = compiled_css.get(e.abs);
+				if (css === void 0) {
+					const src = readFile(e.abs);
+					css = src == null ? null : e.kind === "scoped" ? compileFoucScopedCss(e.abs, await preprocess_component_for_css(src, e.abs, root), { keepScript: true }) : CSS_EXT_RE.test(e.abs) ? src : null;
+					compiled_css.set(e.abs, css);
+				}
+				if (css) parts.push(css);
+			}
+			return parts.join("\n");
+		};
+	};
 	/** router-css `rcss:<rel>` key → emitted CSS asset referenceId (client leg). A server router page
 	*  component's whole-tree scoped CSS, compiled + emitted as a dedicated asset (link/router-css.ts). */
 	const router_css_refs = /* @__PURE__ */ new Map();
@@ -394,85 +419,32 @@ function ogygia(options = {}) {
 						loaded
 					});
 					if (skipped && isMainThread) console.log(`[ogygia] ${skipped} island chunk(s) not emitted: their host modules are not in the server bundle (unreachable from this build's routes).`);
+					compiled_css.clear();
+					const tree_css = tree_css_walk(this);
 					router_css_refs.clear();
-					const walk_resolve = bundler_resolve(this);
 					for (const abs of compiler.router_css_roots()) {
-						const parts = [];
-						for (const e of await collectFoucCssReachable(abs, {
-							root,
-							libDir,
-							readFile,
-							alias: resolve_alias,
-							resolve: walk_resolve
-						})) if (e.kind === "scoped") {
-							const src = readFile(e.abs);
-							if (src == null) continue;
-							const css = compileFoucScopedCss(e.abs, await preprocess_component_for_css(src, e.abs, root), { keepScript: true });
-							if (css) parts.push(css);
-						} else if (CSS_EXT_RE.test(e.abs)) {
-							const css = readFile(e.abs);
-							if (css) parts.push(css);
-						}
-						if (!parts.length) continue;
-						const ref = this.emitFile({
+						const source = await tree_css(abs);
+						if (source) router_css_refs.set(router_css_key(root, abs), this.emitFile({
 							type: "asset",
 							name: "og-rcss.css",
-							source: parts.join("\n")
-						});
-						router_css_refs.set(router_css_key(root, abs), ref);
+							source
+						}));
 					}
 					hole_css_refs.clear();
 					const hole_css_by_abs = /* @__PURE__ */ new Map();
 					for (const { iid, abs } of compiler.server_island_css_roots()) {
 						let ref = hole_css_by_abs.get(abs);
 						if (ref === void 0) {
-							const parts = [];
-							for (const e of await collectFoucCssReachable(abs, {
-								root,
-								libDir,
-								readFile,
-								alias: resolve_alias,
-								resolve: walk_resolve
-							})) if (e.kind === "scoped") {
-								const src = readFile(e.abs);
-								if (src == null) continue;
-								const css = compileFoucScopedCss(e.abs, await preprocess_component_for_css(src, e.abs, root), { keepScript: true });
-								if (css) parts.push(css);
-							} else if (CSS_EXT_RE.test(e.abs)) {
-								const css = readFile(e.abs);
-								if (css) parts.push(css);
-							}
-							ref = parts.length ? this.emitFile({
+							const source = await tree_css(abs);
+							ref = source ? this.emitFile({
 								type: "asset",
 								name: "og-hole.css",
-								source: parts.join("\n")
+								source
 							}) : "";
 							hole_css_by_abs.set(abs, ref);
 						}
 						if (ref) hole_css_refs.set(iid, ref);
 					}
-					content_css_refs.clear();
-					const styles = markup.flatMap((m) => m.styles ? [...m.styles] : []);
-					if (styles.length) {
-						const { compile } = await import("svelte/compiler");
-						for (const [abs, source] of styles) try {
-							const { css } = compile(source, {
-								filename: abs,
-								css: "external",
-								dev: false,
-								generate: "client",
-								experimental: { async: true }
-							});
-							if (css?.code) {
-								const ref = this.emitFile({
-									type: "asset",
-									name: "og-content.css",
-									source: css.code
-								});
-								content_css_refs.set(content_css_key(abs), ref);
-							}
-						} catch {}
-					}
 				}
 			},
 			configureServer(server) {
@@ -699,13 +671,43 @@ function ogygia(options = {}) {
 					chunkFileNames: ours(output.chunkFileNames, "[name]-[hash].js")
 				};
 			},
-			generateBundle() {
+			async generateBundle() {
 				if (!is_build || server_leg_of(this)) return;
 				for (const file of compiler.location_maps((ref) => this.getFileName(ref))) this.emitFile({
 					type: "asset",
 					fileName: file.fileName,
 					source: file.source
 				});
+				content_css_refs.clear();
+				const modules = markup.flatMap((m) => m.modules ? [...m.modules] : []);
+				if (!modules.length) return;
+				const client = /* @__PURE__ */ new Set();
+				for (const id of this.getModuleIds()) client.add(path.normalize(id.split("?")[0]));
+				const tree_css = tree_css_walk(this);
+				const { compile } = await import("svelte/compiler");
+				for (const [abs, source] of modules) try {
+					let own = "";
+					if (svelteHasStyle(source)) {
+						const { css } = compile(source, {
+							filename: abs,
+							css: "external",
+							dev: false,
+							generate: "client",
+							experimental: { async: true }
+						});
+						own = css?.code ?? "";
+					}
+					const tree = await tree_css(abs, {
+						own: source,
+						skip: (p) => client.has(p)
+					});
+					const css = [own, tree].filter(Boolean).join("\n");
+					if (css) content_css_refs.set(content_css_key(abs), this.emitFile({
+						type: "asset",
+						name: "og-content.css",
+						source: css
+					}));
+				} catch {}
 			},
 			closeBundle: {
 				order: "pre",
@@ -818,4 +820,8 @@ function ogygia(options = {}) {
 		server_sourcemaps_plugin(() => measure)
 	];
 }
+Object.assign(ogygia, {
+	extensions: () => [".svelte"],
+	preprocess: () => []
+});
 export { CLIENT_BINDING_STUB, DEFAULT_IMPORT_KEYS, debarrel, definePlugin, import_keys_hint, islandChunkFileName, islandId, islandPublicUrl, normalize_import_keys, ogygia, regionId, regionIdentity, rewrite_lake_import_to_placeholder, strategyKey, wrapperVirtualId };

package/dist/vite/plugin-api.d.ts

@@ -40,7 +40,7 @@ export interface MacroContext {
   readonly markupExts: readonly string[];
 }
 /** A source format that becomes Svelte only through a preprocessor (markdown → Svelte): how its
- *  islands and its modules' own scoped CSS reach the build. */
+ *  islands and its modules' CSS reach the build. */
 export interface MarkupSource {
   /** The format's file extensions (`['.svx', '.md']`). */
   extensions: readonly string[];
@@ -50,10 +50,11 @@ export interface MarkupSource {
     root: string;
     readFile(abs: string): string | null;
   }): void | Promise<void>;
-  /** Modules that carry their OWN scoped `<style>`, absolute path → their post-preprocess Svelte
-   *  source: the build compiles each one's CSS and ships it as a client asset (the module itself
-   *  only ever renders on the server). The plugin keeps filling this map; the build reads it late. */
-  styles?: ReadonlyMap<string, string>;
+  /** The format's modules, absolute path → their post-preprocess Svelte source. A module only ever
+   *  renders on the server, so no client chunk carries its CSS: the build ships, as one client asset
+   *  per module, the scoped CSS of its own `<style>` and of every component it imports (and plain
+   *  style imports). The plugin keeps filling this map; the build reads it late. */
+  modules?: ReadonlyMap<string, string>;
 }
 /** What the build hands back for a markup source: run the region transform on preprocessed Svelte. */
 export interface MarkupRegions {

package/package.json

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