bosia 0.6.19 → 0.6.21

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bosia",
-	"version": "0.6.19",
+	"version": "0.6.21",
 	"type": "module",
 	"description": "A fast, batteries-included fullstack framework — SSR · Svelte 5 Runes · Bun · ElysiaJS. File-based routing inspired by SvelteKit. No Node.js, no Vite, no adapters.",
 	"keywords": [

package/src/cli/add.ts

@@ -7,6 +7,7 @@ import {
 	resolveLocalRegistryOrExit,
 	readRegistryJSON,
 	readRegistryFile,
+	writeRegistryFile,
 	mergePkgJson,
 	bunAdd,
 } from "./registry.ts";
@@ -150,7 +151,7 @@ export async function addComponent(name: string, root = false, options?: Install
 		const content = await readRegistryFile(registryRoot, "components", fullPath, file);
 		const dest = join(destDir, file);
 		if (file.includes("/")) mkdirSync(dirname(dest), { recursive: true });
-		writeFileSync(dest, content, "utf-8");
+		writeRegistryFile(dest, content);
 		console.log(`   ✍️  src/lib/components/${fullPath}/${file}`);
 	}
 

package/src/cli/addRouter.ts

@@ -0,0 +1,53 @@
+// ─── Dispatch logic for `bosia add ...` ──────────────────
+// Split out from index.ts so the routing can be unit-tested with injected
+// runners (index.ts does top-level `process.argv` parsing on import).
+
+export interface AddRunners {
+	runAdd: (names: string[], flags: string[]) => Promise<void> | void;
+	runAddBlock: (name: string | undefined, flags: string[]) => Promise<void> | void;
+	runAddTheme: (name: string | undefined, flags: string[]) => Promise<void> | void;
+	runAddFont: (family: string | undefined, url: string | undefined) => Promise<void> | void;
+	runAddList: () => Promise<void> | void;
+}
+
+export async function routeAdd(args: string[], runners: AddRunners): Promise<void> {
+	const positional = args.filter((a) => !a.startsWith("-"));
+	const flags = args.filter((a) => a.startsWith("-"));
+	const sub = positional[0];
+
+	if (sub === "block") {
+		await runners.runAddBlock(positional[1], flags);
+		return;
+	}
+	if (sub === "theme") {
+		const themeFlags = args.filter((a) => a.startsWith("--"));
+		await runners.runAddTheme(positional[1], themeFlags);
+		return;
+	}
+	if (sub === "font") {
+		await runners.runAddFont(positional[1], positional[2]);
+		return;
+	}
+	if (sub === "list") {
+		await runners.runAddList();
+		return;
+	}
+
+	// Alias: `blocks/<cat>/<name>` tokens dispatch to runAddBlock.
+	// Skills/AI agents frequently emit the plural `blocks/...` form alongside
+	// `ui/*` components; route those to the block installer transparently
+	// and let any remaining plain component names fall through to runAdd.
+	const blockTokens = positional.filter((p) => p.startsWith("blocks/"));
+	const componentTokens = positional.filter((p) => !p.startsWith("blocks/"));
+	if (blockTokens.length > 0) {
+		if (componentTokens.length > 0) {
+			await runners.runAdd(componentTokens, flags);
+		}
+		for (const token of blockTokens) {
+			await runners.runAddBlock(token.slice("blocks/".length), flags);
+		}
+		return;
+	}
+
+	await runners.runAdd(positional, flags);
+}

package/src/cli/block.ts

@@ -1,11 +1,12 @@
 import { join, dirname } from "path";
-import { mkdirSync, writeFileSync, existsSync } from "fs";
+import { mkdirSync, existsSync } from "fs";
 import * as p from "@clack/prompts";
 import {
 	type InstallOptions,
 	resolveLocalRegistryOrExit,
 	readRegistryJSON,
 	readRegistryFile,
+	writeRegistryFile,
 	mergePkgJson,
 	bunAdd,
 } from "./registry.ts";
@@ -83,7 +84,7 @@ export async function runAddBlock(
 		const content = await readRegistryFile(registryRoot, "blocks", name, file);
 		const dest = join(destDir, file);
 		if (file.includes("/")) mkdirSync(dirname(dest), { recursive: true });
-		writeFileSync(dest, content, "utf-8");
+		writeRegistryFile(dest, content);
 		console.log(`   ✍️  src/lib/blocks/${name}/${file}`);
 	}
 

package/src/cli/index.ts

@@ -59,27 +59,29 @@ async function main() {
 			break;
 		}
 		case "add": {
-			const positional = args.filter((a) => !a.startsWith("-"));
-			const flags = args.filter((a) => a.startsWith("-"));
-			const sub = positional[0];
-			if (sub === "block") {
-				const blockFlags = flags;
-				const { runAddBlock } = await import("./block.ts");
-				await runAddBlock(positional[1], blockFlags);
-			} else if (sub === "theme") {
-				const themeFlags = args.filter((a) => a.startsWith("--"));
-				const { runAddTheme } = await import("./theme.ts");
-				await runAddTheme(positional[1], themeFlags);
-			} else if (sub === "font") {
-				const { runAddFont } = await import("./font.ts");
-				await runAddFont(positional[1], positional[2]);
-			} else if (sub === "list") {
-				const { runAddList } = await import("./add.ts");
-				runAddList();
-			} else {
-				const { runAdd } = await import("./add.ts");
-				await runAdd(positional, flags);
-			}
+			const { routeAdd } = await import("./addRouter.ts");
+			await routeAdd(args, {
+				runAdd: async (names, flags) => {
+					const { runAdd } = await import("./add.ts");
+					await runAdd(names, flags);
+				},
+				runAddBlock: async (name, flags) => {
+					const { runAddBlock } = await import("./block.ts");
+					await runAddBlock(name, flags);
+				},
+				runAddTheme: async (name, flags) => {
+					const { runAddTheme } = await import("./theme.ts");
+					await runAddTheme(name, flags);
+				},
+				runAddFont: async (family, url) => {
+					const { runAddFont } = await import("./font.ts");
+					await runAddFont(family, url);
+				},
+				runAddList: async () => {
+					const { runAddList } = await import("./add.ts");
+					runAddList();
+				},
+			});
 			break;
 		}
 		case "feat": {
@@ -137,6 +139,7 @@ Examples:
   bun x bosia@latest add -y button card      → auto-confirm overwrites (CI / scripts)
   bun x bosia@latest add shop/cart           → src/lib/components/shop/cart/
   bun x bosia@latest add block cards/feature-editorial
+  bun x bosia@latest add blocks/cards/feature-editorial   (alias for: add block cards/feature-editorial)
   bun x bosia@latest add theme editorial
   bun x bosia@latest add font "Fredoka" "https://fonts.googleapis.com/css2?family=Fredoka:wght@400;700&display=swap"
   bun x bosia@latest feat login

package/src/cli/registry.ts

@@ -1,5 +1,5 @@
 import { join, dirname } from "path";
-import { writeFileSync, readFileSync, existsSync } from "fs";
+import { writeFileSync, readFileSync, existsSync, unlinkSync } from "fs";
 import { spawn } from "bun";
 
 // ─── Shared registry utilities for feat.ts and add.ts ─────
@@ -80,6 +80,42 @@ export async function readRegistryFile(
 	return fetchText(`${REGISTRY_URL}/${category}/${name}/${file}`);
 }
 
+// ─── Registry file writer ─────────────────────────────────
+
+/**
+ * Write a registry file with one EACCES/EPERM recovery attempt.
+ *
+ * Component/block file loops abort mid-install when a target path is owned by a
+ * different uid — bosapi tenant apps run sandboxed as `bosapi-app-N`, so a
+ * subsequent install from the bosapi user hits EACCES on the first foreign-owned
+ * file and leaves a partial install behind. Unlink + retry recovers; only the
+ * unrecoverable case surfaces the chown hint.
+ */
+export function writeRegistryFile(dest: string, content: string): void {
+	try {
+		writeFileSync(dest, content, "utf-8");
+		return;
+	} catch (err) {
+		const code = (err as NodeJS.ErrnoException).code;
+		if (code !== "EACCES" && code !== "EPERM") throw err;
+	}
+	try {
+		unlinkSync(dest);
+	} catch {
+		// ignore — retry will surface the real error
+	}
+	try {
+		writeFileSync(dest, content, "utf-8");
+	} catch (retry) {
+		const e = retry as NodeJS.ErrnoException;
+		throw new Error(
+			`Cannot write ${dest}: ${e.code}. ` +
+				`The existing file is owned by a different user (likely created from inside ` +
+				`the app sandbox). Fix from the project root: chown -R $(whoami) src/lib`,
+		);
+	}
+}
+
 // ─── package.json helpers ─────────────────────────────────
 
 export interface PkgDeps {

package/src/core/build.ts

@@ -222,10 +222,19 @@ if (!isProduction && svelteMapCache.size > 0) {
 // 6. Collect output files for dist/manifest.json
 const jsFiles: string[] = [];
 const cssFiles: string[] = [];
+// 0.6.19 hashed the entry filename; the old `f === "hydrate.js"` exact-match
+// no longer hits, and the fallback `startsWith("hydrate")` picks the first
+// hydrate-* chunk by array order — which can be a small leaf module (e.g.
+// `src/lib/version.ts`) that sorts before the real entry. Use Bun's
+// `output.kind === "entry-point"` instead so we pin the actual entry.
+let clientEntry: string | null = null;
 for (const output of clientResult.outputs) {
 	const rel = relative(`${OUT_DIR}/client`, output.path);
 	if (output.path.endsWith(".js")) jsFiles.push(rel);
 	if (output.path.endsWith(".css")) cssFiles.push(rel);
+	if ((output as { kind?: string }).kind === "entry-point" && output.path.endsWith(".js")) {
+		clientEntry = rel;
+	}
 }
 
 // Entry is always "index.js" due to naming: { entry: "index.[ext]" }
@@ -241,6 +250,7 @@ const distManifest = {
 	js: jsFiles,
 	css: cssFiles,
 	entry:
+		clientEntry ??
 		jsFiles.find((f) => f === "hydrate.js") ??
 		jsFiles.find((f) => f.startsWith("hydrate")) ??
 		"hydrate.js",

package/src/core/client/page.svelte.ts

@@ -0,0 +1,28 @@
+// ─── Reactive page object ─────────────────────────────────
+// Mirrors what user-facing skills (bosia-page-shell, bosia-seo,
+// bosia-navigation) teach: `import { page } from "bosia/client"` then read
+// `page.url.pathname`. Backed by `router.currentRoute` (`$state` in
+// router.svelte.ts), so the `$derived` URL re-runs on every nav.
+//
+// No `params` getter on purpose — Bosia already passes `params` as a prop to
+// `+page.svelte` / `+layout.svelte` (see App.svelte), mirroring the modern
+// SvelteKit `$app/state` direction. Route components should destructure
+// `params` from `$props()`, not from here.
+
+import { router } from "./router.svelte.ts";
+
+class Page {
+	#url = $derived.by(() => {
+		if (typeof window === "undefined") return new URL("http://localhost/");
+		return new URL(router.currentRoute, window.location.origin);
+	});
+
+	get url() {
+		return this.#url;
+	}
+	get pathname() {
+		return this.#url.pathname;
+	}
+}
+
+export const page = new Page();

package/src/lib/client.ts

@@ -18,3 +18,4 @@ export {
 	invalidateAll,
 } from "../core/client/navigation.ts";
 export type { GotoOptions, Navigation, NavigationTarget } from "../core/client/navigation.ts";
+export { page } from "../core/client/page.svelte.ts";