@teyik0/furin 0.1.0-alpha.6 → 0.1.0-alpha.7

package/dist/build/index.js

@@ -1,11 +1,12 @@
 // @bun
 // src/build/index.ts
 import { existsSync as existsSync8, writeFileSync as writeFileSync7 } from "fs";
-import { join as join9, relative as relative3, resolve as resolve4 } from "path";
+import { join as join9, relative as relative3, resolve as resolve2 } from "path";
 
 // src/adapter/bun.ts
 import { existsSync as existsSync6, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
-import { join as join7, resolve as resolve3 } from "path";
+import { dirname as dirname2, join as join7, resolve } from "path";
+import { fileURLToPath } from "url";
 
 // src/build/client.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
@@ -1547,7 +1548,9 @@ const _match = routes.find((r) => r.regex.test(pathname));
   } else {
     log.error({ action: "hydrate_no_match", pathname });
   }
-})();
+})().catch((err: unknown) => {
+  log.error({ action: "hydrate_failed", pathname, error: String(err) });
+});
 `;
 }
 function writeDevFiles(routes, { outDir, rootLayout }, projectRoot) {
@@ -1572,9 +1575,9 @@ function writeDevFiles(routes, { outDir, rootLayout }, projectRoot) {
 
 // src/build/shared.ts
 import { cpSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readdirSync, rmSync } from "fs";
-import { join as join3, relative, resolve } from "path";
-var CLIENT_MODULE_PATH = resolve(import.meta.dir, "../client.ts").replace(/\\/g, "/");
-var LINK_MODULE_PATH = resolve(import.meta.dir, "../link.tsx").replace(/\\/g, "/");
+import { join as join3, relative } from "path";
+var CLIENT_MODULE_PATH = new URL(import.meta.resolve("@teyik0/furin/client")).pathname;
+var LINK_MODULE_PATH = new URL(import.meta.resolve("@teyik0/furin/link")).pathname;
 function ensureDir(path) {
   if (!existsSync3(path)) {
     mkdirSync2(path, { recursive: true });
@@ -1676,6 +1679,10 @@ ${transformed}`;
     splitting: true,
     minify: true,
     sourcemap: "linked",
+    naming: {
+      entry: "[dir]/[name]-[hash].[ext]",
+      chunk: "[name]-[hash].[ext]"
+    },
     publicPath: "/_client/",
     plugins: plugins ? [...plugins, transformPlugin] : [transformPlugin],
     alias: {
@@ -1706,9 +1713,10 @@ import { existsSync as existsSync5, writeFileSync as writeFileSync4 } from "fs";
 import { join as join5, relative as relative2 } from "path";
 
 // src/build/entry-template.ts
-import { resolve as resolve2 } from "path";
-var INTERNAL_MODULE_PATH = resolve2(import.meta.dir, "../internal.ts").replace(/\\/g, "/");
-var RUNTIME_ENV_MODULE_PATH = resolve2(import.meta.dir, "../runtime-env.ts").replace(/\\/g, "/");
+import { dirname } from "path";
+var _pkgSrcDir = dirname(new URL(import.meta.resolve("@teyik0/furin")).pathname);
+var INTERNAL_MODULE_PATH = `${_pkgSrcDir}/internal.ts`;
+var RUNTIME_ENV_MODULE_PATH = `${_pkgSrcDir}/runtime-env.ts`;
 function buildEntrySource(options) {
   const { buildId, headerComment, rootPath, routes, serverEntry } = options;
   let { extraImports, extraContext } = options;
@@ -1840,13 +1848,14 @@ function generateServerRoutesEntry(options) {
 }
 
 // src/adapter/bun.ts
+var _pkgSrcDir2 = dirname2(fileURLToPath(import.meta.resolve("@teyik0/furin")));
 var BUILD_ID_INPUT_PATHS = [
-  resolve3(import.meta.dir, "../build/compile-entry.ts"),
-  resolve3(import.meta.dir, "../build/entry-template.ts"),
-  resolve3(import.meta.dir, "../build/server-routes-entry.ts"),
-  resolve3(import.meta.dir, "../render/index.ts"),
-  resolve3(import.meta.dir, "../render/shell.ts"),
-  resolve3(import.meta.dir, "../router.ts")
+  `${_pkgSrcDir2}/build/compile-entry.ts`,
+  `${_pkgSrcDir2}/build/entry-template.ts`,
+  `${_pkgSrcDir2}/build/server-routes-entry.ts`,
+  `${_pkgSrcDir2}/render/index.ts`,
+  `${_pkgSrcDir2}/render/shell.ts`,
+  `${_pkgSrcDir2}/router.ts`
 ];
 async function createBuildFingerprint(entryChunk, cssChunks, routes, rootPath, serverEntry) {
   const fingerprintPaths = new Set([rootPath, ...routes.map((route) => route.path)]);
@@ -1873,7 +1882,7 @@ async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry,
   }
   const target = "bun";
   const targetManifest = buildTargetManifest(rootDir, buildRoot, target, serverEntry);
-  const targetDir = resolve3(rootDir, targetManifest.targetDir);
+  const targetDir = resolve(rootDir, targetManifest.targetDir);
   rmSync2(targetDir, { force: true, recursive: true });
   ensureDir(targetDir);
   const { entryChunk, cssChunks } = await buildClient(routes, {
@@ -2237,25 +2246,25 @@ function resolvePagesDirFromServer(serverEntry, rootDir) {
   const detected = scanFurinInstances(serverEntry);
   if (detected.length === 0)
     return null;
-  return resolve4(rootDir, detected[0]);
+  return resolve2(rootDir, detected[0]);
 }
 async function buildApp(options) {
-  const rootDir = resolve4(options.rootDir ?? process.cwd());
+  const rootDir = resolve2(options.rootDir ?? process.cwd());
   const buildRoot = join9(rootDir, BUILD_OUTPUT_DIR);
   const serverEntry = (() => {
     if (options.serverEntry) {
-      const resolved = resolve4(rootDir, options.serverEntry);
+      const resolved = resolve2(rootDir, options.serverEntry);
       if (existsSync8(resolved))
         return resolved;
     }
-    const serverEntry2 = resolve4(rootDir, "src/server.ts");
+    const serverEntry2 = resolve2(rootDir, "src/server.ts");
     if (!existsSync8(serverEntry2)) {
       throw new Error("[furin] Entrypoint server.ts not found");
     }
     return serverEntry2;
   })();
   const rawPagesDir = options.pagesDir ?? resolvePagesDirFromServer(serverEntry, rootDir) ?? "src/pages";
-  const pagesDir = resolve4(rootDir, rawPagesDir);
+  const pagesDir = resolve2(rootDir, rawPagesDir);
   const requestedTargets = options.target === "all" ? [...IMPLEMENTED_TARGETS] : [options.target].map((target) => {
     if (!BUILD_TARGETS.includes(target)) {
       throw new Error(`[furin] Unsupported build target "${target}"`);

package/dist/cli/index.d.ts

@@ -1 +1,2 @@
+#!/usr/bin/env bun
 export {};

package/dist/cli/index.js

@@ -1,16 +1,19 @@
+#!/usr/bin/env bun
 // @bun
+
 // src/cli/index.ts
 import { existsSync as existsSync8 } from "fs";
-import { resolve as resolve6 } from "path";
+import { resolve as resolve4 } from "path";
 import { parseArgs } from "util";
 
 // src/build/index.ts
 import { existsSync as existsSync6, writeFileSync as writeFileSync5 } from "fs";
-import { join as join7, relative as relative3, resolve as resolve4 } from "path";
+import { join as join7, relative as relative3, resolve as resolve2 } from "path";
 
 // src/adapter/bun.ts
 import { existsSync as existsSync4, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
-import { join as join5, resolve as resolve3 } from "path";
+import { dirname as dirname2, join as join5, resolve } from "path";
+import { fileURLToPath } from "url";
 
 // src/build/client.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync } from "fs";
@@ -1468,15 +1471,17 @@ const _match = routes.find((r) => r.regex.test(pathname));
   } else {
     log.error({ action: "hydrate_no_match", pathname });
   }
-})();
+})().catch((err: unknown) => {
+  log.error({ action: "hydrate_failed", pathname, error: String(err) });
+});
 `;
 }
 
 // src/build/shared.ts
 import { cpSync, existsSync, mkdirSync, readdirSync, rmSync } from "fs";
-import { join, relative, resolve } from "path";
-var CLIENT_MODULE_PATH = resolve(import.meta.dir, "../client.ts").replace(/\\/g, "/");
-var LINK_MODULE_PATH = resolve(import.meta.dir, "../link.tsx").replace(/\\/g, "/");
+import { join, relative } from "path";
+var CLIENT_MODULE_PATH = new URL(import.meta.resolve("@teyik0/furin/client")).pathname;
+var LINK_MODULE_PATH = new URL(import.meta.resolve("@teyik0/furin/link")).pathname;
 function ensureDir(path) {
   if (!existsSync(path)) {
     mkdirSync(path, { recursive: true });
@@ -1578,6 +1583,10 @@ ${transformed}`;
     splitting: true,
     minify: true,
     sourcemap: "linked",
+    naming: {
+      entry: "[dir]/[name]-[hash].[ext]",
+      chunk: "[name]-[hash].[ext]"
+    },
     publicPath: "/_client/",
     plugins: plugins ? [...plugins, transformPlugin] : [transformPlugin],
     alias: {
@@ -1608,9 +1617,10 @@ import { existsSync as existsSync3, writeFileSync as writeFileSync2 } from "fs";
 import { join as join3, relative as relative2 } from "path";
 
 // src/build/entry-template.ts
-import { resolve as resolve2 } from "path";
-var INTERNAL_MODULE_PATH = resolve2(import.meta.dir, "../internal.ts").replace(/\\/g, "/");
-var RUNTIME_ENV_MODULE_PATH = resolve2(import.meta.dir, "../runtime-env.ts").replace(/\\/g, "/");
+import { dirname } from "path";
+var _pkgSrcDir = dirname(new URL(import.meta.resolve("@teyik0/furin")).pathname);
+var INTERNAL_MODULE_PATH = `${_pkgSrcDir}/internal.ts`;
+var RUNTIME_ENV_MODULE_PATH = `${_pkgSrcDir}/runtime-env.ts`;
 function buildEntrySource(options) {
   const { buildId, headerComment, rootPath, routes, serverEntry } = options;
   let { extraImports, extraContext } = options;
@@ -1742,13 +1752,14 @@ function generateServerRoutesEntry(options) {
 }
 
 // src/adapter/bun.ts
+var _pkgSrcDir2 = dirname2(fileURLToPath(import.meta.resolve("@teyik0/furin")));
 var BUILD_ID_INPUT_PATHS = [
-  resolve3(import.meta.dir, "../build/compile-entry.ts"),
-  resolve3(import.meta.dir, "../build/entry-template.ts"),
-  resolve3(import.meta.dir, "../build/server-routes-entry.ts"),
-  resolve3(import.meta.dir, "../render/index.ts"),
-  resolve3(import.meta.dir, "../render/shell.ts"),
-  resolve3(import.meta.dir, "../router.ts")
+  `${_pkgSrcDir2}/build/compile-entry.ts`,
+  `${_pkgSrcDir2}/build/entry-template.ts`,
+  `${_pkgSrcDir2}/build/server-routes-entry.ts`,
+  `${_pkgSrcDir2}/render/index.ts`,
+  `${_pkgSrcDir2}/render/shell.ts`,
+  `${_pkgSrcDir2}/router.ts`
 ];
 async function createBuildFingerprint(entryChunk, cssChunks, routes, rootPath, serverEntry) {
   const fingerprintPaths = new Set([rootPath, ...routes.map((route) => route.path)]);
@@ -1775,7 +1786,7 @@ async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry,
   }
   const target = "bun";
   const targetManifest = buildTargetManifest(rootDir, buildRoot, target, serverEntry);
-  const targetDir = resolve3(rootDir, targetManifest.targetDir);
+  const targetDir = resolve(rootDir, targetManifest.targetDir);
   rmSync2(targetDir, { force: true, recursive: true });
   ensureDir(targetDir);
   const { entryChunk, cssChunks } = await buildClient(routes, {
@@ -2139,25 +2150,25 @@ function resolvePagesDirFromServer(serverEntry, rootDir) {
   const detected = scanFurinInstances(serverEntry);
   if (detected.length === 0)
     return null;
-  return resolve4(rootDir, detected[0]);
+  return resolve2(rootDir, detected[0]);
 }
 async function buildApp(options) {
-  const rootDir = resolve4(options.rootDir ?? process.cwd());
+  const rootDir = resolve2(options.rootDir ?? process.cwd());
   const buildRoot = join7(rootDir, BUILD_OUTPUT_DIR);
   const serverEntry = (() => {
     if (options.serverEntry) {
-      const resolved = resolve4(rootDir, options.serverEntry);
+      const resolved = resolve2(rootDir, options.serverEntry);
       if (existsSync6(resolved))
         return resolved;
     }
-    const serverEntry2 = resolve4(rootDir, "src/server.ts");
+    const serverEntry2 = resolve2(rootDir, "src/server.ts");
     if (!existsSync6(serverEntry2)) {
       throw new Error("[furin] Entrypoint server.ts not found");
     }
     return serverEntry2;
   })();
   const rawPagesDir = options.pagesDir ?? resolvePagesDirFromServer(serverEntry, rootDir) ?? "src/pages";
-  const pagesDir = resolve4(rootDir, rawPagesDir);
+  const pagesDir = resolve2(rootDir, rawPagesDir);
   const requestedTargets = options.target === "all" ? [...IMPLEMENTED_TARGETS] : [options.target].map((target) => {
     if (!BUILD_TARGETS.includes(target)) {
       throw new Error(`[furin] Unsupported build target "${target}"`);
@@ -2199,7 +2210,7 @@ async function buildApp(options) {
 
 // src/cli/config.ts
 import { existsSync as existsSync7 } from "fs";
-import { resolve as resolve5 } from "path";
+import { resolve as resolve3 } from "path";
 import { pathToFileURL } from "url";
 import { TypeCompiler } from "elysia/type-system";
 var compiledConfigSchema = TypeCompiler.Compile(configSchema);
@@ -2209,13 +2220,13 @@ var DEFAULT_CONFIG_FILENAMES = [
   "furin.config.mjs"
 ];
 async function loadCliConfig(cwd, explicitConfigPath) {
-  const rootDir = resolve5(cwd);
-  const configPath = explicitConfigPath ? resolve5(rootDir, explicitConfigPath) : DEFAULT_CONFIG_FILENAMES.map((filename) => resolve5(rootDir, filename)).find((path) => existsSync7(path));
+  const rootDir = resolve3(cwd);
+  const configPath = explicitConfigPath ? resolve3(rootDir, explicitConfigPath) : DEFAULT_CONFIG_FILENAMES.map((filename) => resolve3(rootDir, filename)).find((path) => existsSync7(path));
   if (!configPath) {
     return {
       configPath: null,
       rootDir,
-      pagesDir: resolve5(rootDir, "src/pages")
+      pagesDir: resolve3(rootDir, "src/pages")
     };
   }
   const imported = await import(pathToFileURL(configPath).href);
@@ -2228,13 +2239,13 @@ async function loadCliConfig(cwd, explicitConfigPath) {
     const [firstError] = compiledConfigSchema.Errors(configToValidate);
     throw new Error(`[furin] Invalid config at ${configPath}: ${firstError?.message ?? "unknown error"} (path: ${firstError?.path ?? "/"})`);
   }
-  const resolvedRootDir = resolve5(rootDir, configToValidate.rootDir ?? ".");
+  const resolvedRootDir = resolve3(rootDir, configToValidate.rootDir ?? ".");
   return {
     ...configToValidate,
     plugins,
     configPath,
     rootDir: resolvedRootDir,
-    pagesDir: resolve5(resolvedRootDir, configToValidate.pagesDir ?? "src/pages")
+    pagesDir: resolve3(resolvedRootDir, configToValidate.pagesDir ?? "src/pages")
   };
 }
 
@@ -2285,7 +2296,7 @@ if (command === "build") {
     bail(`Unsupported build target "${target}". Valid: ${BUILD_TARGETS.join(", ")}, all`);
   }
   const config = await loadCliConfig(process.cwd(), values.config);
-  const resolvedServerEntry = resolve6(config.rootDir, config.serverEntry ?? "src/server.ts");
+  const resolvedServerEntry = resolve4(config.rootDir, config.serverEntry ?? "src/server.ts");
   if (!existsSync8(resolvedServerEntry)) {
     const expected = config.serverEntry ?? "src/server.ts";
     throw new Error(`[furin] Entrypoint ${expected} not found`);

package/dist/client.d.ts

@@ -2,6 +2,9 @@ import type { Cookie, StatusMap } from "elysia";
 import type { AnySchema, HTTPHeaders, UnwrapSchema } from "elysia/types";
 declare const UNSET: unique symbol;
 type Unset = typeof UNSET;
+type ToRecord<T> = {
+    [K in keyof T]: T[K];
+};
 type ResolvedSchema<T> = [T] extends [Unset] ? Unset : T extends AnySchema ? UnwrapSchema<T> : Unset;
 type MergeSchema<TParent, TOwn> = [TParent] extends [Unset] ? TOwn : [TOwn] extends [Unset] ? TParent : TParent & TOwn;
 type NormalizeUnset<T> = [T] extends [Unset] ? {} : T;
@@ -33,7 +36,7 @@ type ResolveParent<T> = T extends RouteRef<infer D, infer P, infer Q> ? {
     query: Unset;
 };
 interface Resolved<TParentRef, TLoaderData, TParamsSchema = Unset, TQuerySchema = Unset> {
-    data: ResolveParent<TParentRef>["data"] & TLoaderData;
+    data: ToRecord<ResolveParent<TParentRef>["data"] & TLoaderData>;
     params: MergeSchema<ResolveParent<TParentRef>["params"], ResolvedSchema<TParamsSchema>>;
     query: MergeSchema<ResolveParent<TParentRef>["query"], ResolvedSchema<TQuerySchema>>;
 }
@@ -89,7 +92,7 @@ export interface HeadOptions {
 export type LoaderDeps = (route: {
     __type: string;
 }) => Promise<Record<string, unknown>>;
-type ExtractLoaderReturn<TLoader> = TLoader extends (...args: never[]) => unknown ? Awaited<ReturnType<TLoader>> extends Record<string, unknown> ? Awaited<ReturnType<TLoader>> : {} : {};
+type ExtractLoaderReturn<TLoader> = TLoader extends (...args: never[]) => unknown ? Awaited<ReturnType<TLoader>> extends object ? ToRecord<Awaited<ReturnType<TLoader>>> : {} : {};
 export interface PageConfig<TParentData extends Record<string, unknown>, TParams, TQuery, TPageLoaderData extends object = {}> {
     component: React.FC<TParentData & TPageLoaderData & ComponentProps<TParams, TQuery>>;
     head?: (ctx: ComponentProps<TParams, TQuery> & TParentData & TPageLoaderData) => HeadOptions;
@@ -124,7 +127,7 @@ export interface RouteRef<TData extends Record<string, unknown> = Record<string,
         query: TQuery;
     };
 }
-interface PageResult<TData extends Record<string, unknown>, TParams, TQuery, TPageLoaderData extends Record<string, unknown>> {
+interface PageResult<TData extends Record<string, unknown>, TParams, TQuery, TPageLoaderData extends object> {
     __type: "FURIN_PAGE";
     _route: Route<TData, TParams, TQuery>;
     component: React.FC<TData & TPageLoaderData & ComponentProps<TParams, TQuery>>;
@@ -138,7 +141,7 @@ export interface Route<TParentData extends Record<string, unknown>, TParams, TQu
     } & ComponentProps<TParams, TQuery>>;
     loader?(ctx: RouteContext<TParams, TQuery> & TParentData, deps: TypedDeps): Promise<TParentData> | TParentData;
     mode?: "ssr" | "ssg" | "isr";
-    page<TLoader extends (ctx: RouteContext<TParams, TQuery> & TParentData, deps: TypedDeps) => unknown, TPageLoaderData extends Record<string, unknown> = ExtractLoaderReturn<TLoader>>(config: {
+    page<TLoader extends (ctx: RouteContext<TParams, TQuery> & TParentData, deps: TypedDeps) => unknown, TPageLoaderData extends object = ExtractLoaderReturn<TLoader>>(config: {
         loader: TLoader;
         mode?: "ssr" | "ssg" | "isr";
         revalidate?: number;
@@ -161,7 +164,7 @@ export interface Route<TParentData extends Record<string, unknown>, TParams, TQu
     revalidate?: number;
 }
 type TypedDeps = <TData extends Record<string, unknown>>(route: Route<TData, any, any>) => Promise<TData>;
-export declare function createRoute<TParentRef extends RouteRef | undefined = undefined, TParamsSchema extends AnySchema | Unset = Unset, TQuerySchema extends AnySchema | Unset = Unset, TLoaderData extends Record<string, unknown> = {}>(config?: {
+export declare function createRoute<TParentRef extends RouteRef | undefined = undefined, TParamsSchema extends AnySchema | Unset = Unset, TQuerySchema extends AnySchema | Unset = Unset, TLoaderData extends object = {}>(config?: {
     parent?: {
         ref: TParentRef;
     } & {