npm - @teyik0/furin - Versions diffs - 0.1.0-alpha.4 → 0.1.0-alpha.6 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

package/dist/build/client.d.ts +12 -5
package/dist/build/compile-entry.d.ts +1 -0
package/dist/build/entry-template.d.ts +1 -0
package/dist/build/index.js +109 -33
package/dist/build/server-routes-entry.d.ts +1 -0
package/dist/build/types.d.ts +1 -0
package/dist/cli/index.js +104 -29
package/dist/client.d.ts +30 -3
package/dist/furin.d.ts +2 -200
package/dist/furin.js +485 -223
package/dist/internal.d.ts +1 -0
package/dist/link.d.ts +103 -5
package/dist/link.js +202 -19
package/dist/render/cache.d.ts +89 -1
package/dist/render/index.d.ts +3 -2
package/dist/render/shell.d.ts +4 -1
package/dist/render/template.d.ts +2 -0
package/dist/router.d.ts +4 -2
package/dist/router.js +302 -150
package/package.json +3 -3
package/src/adapter/bun.ts +74 -3
package/src/build/client.ts +19 -9
package/src/build/compile-entry.ts +3 -1
package/src/build/entry-template.ts +10 -2
package/src/build/index.ts +1 -5
package/src/build/scan-server.ts +2 -2
package/src/build/server-routes-entry.ts +3 -1
package/src/build/shared.ts +1 -0
package/src/build/types.ts +1 -0
package/src/client.ts +51 -8
package/src/furin.ts +99 -22
package/src/internal.ts +1 -0
package/src/link.tsx +365 -20
package/src/render/cache.ts +233 -1
package/src/render/index.ts +231 -124
package/src/render/loaders.ts +9 -4
package/src/render/shell.ts +29 -5
package/src/render/template.ts +17 -1
package/src/router.ts +183 -71

package/dist/build/client.d.ts CHANGED Viewed

@@ -1,18 +1,25 @@
 import type { ResolvedRoute } from "../router";
 import type { BuildClientOptions } from "./types";
+export interface BuildClientResult {
+    /** Public path of the JS entry chunk, e.g. `/_client/chunk-abc.js` */
+    entryChunk: string;
+    /** Public paths of all CSS chunks, e.g. `["/_client/chunk-abc.css"]` */
+    cssChunks: string[];
+}
 /**
  * Builds the production client bundle via Bun.build() using _hydrate.tsx as
  * the JS entrypoint (NOT an HTML entrypoint). Bun produces:
  *   <outDir>/client/chunk-*.js  — code-split bundles
  *   <outDir>/client/chunk-*.css — extracted CSS (if imported)
  *
- * After the build, index.html is written manually using the entry chunk path
- * from result.outputs. Using an HTML entrypoint with code-splitting causes a
- * Bun bug where the output index.html references a leaf chunk instead of the
- * actual entry chunk, preventing React from mounting in production.
+ * Returns the chunk paths so the caller can compute a `buildId` and write
+ * `index.html` with the correct meta tag. Using an HTML entrypoint with
+ * code-splitting causes a Bun bug where the output index.html references a
+ * leaf chunk instead of the actual entry chunk, preventing React from mounting
+ * in production.
  *
  * The output index.html is NOT served to browsers directly. The server reads
  * it as an SSR template, injects the pre-rendered React HTML into
  * <!--ssr-outlet-->, and sends the complete page.
  */
-export declare function buildClient(routes: ResolvedRoute[], { outDir, rootLayout, plugins }: BuildClientOptions): Promise<void>;
+export declare function buildClient(routes: ResolvedRoute[], { outDir, rootLayout, plugins }: BuildClientOptions): Promise<BuildClientResult>;

package/dist/build/compile-entry.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export interface CompileEntryOptions {
+    buildId?: string;
     outDir: string;
     rootPath: string;
     routes: Array<{

package/dist/build/entry-template.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export interface EntryTemplateOptions {
+    buildId?: string;
     headerComment: string;
     rootPath: string;
     routes: Array<{

package/dist/build/index.js CHANGED Viewed

@@ -1,10 +1,10 @@
 // @bun
 // src/build/index.ts
-import { existsSync as existsSync8, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync8, writeFileSync as writeFileSync7 } from "fs";
 import { join as join9, relative as relative3, resolve as resolve4 } from "path";
 // src/adapter/bun.ts
-import { existsSync as existsSync6, rmSync as rmSync2 } from "fs";
+import { existsSync as existsSync6, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
 import { join as join7, resolve as resolve3 } from "path";
 // src/build/client.ts
@@ -1368,13 +1368,22 @@ function transformForClient(code, filename) {
   };
 }
+// src/build/hydrate.ts
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { join as join2 } from "path";
 // src/render/shell.ts
+function escapeHtml(str) {
+  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+}
+var THEME_INIT_SCRIPT = `<script>try{var __t=localStorage.getItem("furin-theme");` + `document.documentElement.classList.add(__t==="light"?"light":"dark")}` + `catch(e){document.documentElement.classList.add("dark")}</script>`;
 function generateIndexHtml() {
   return `<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    ${THEME_INIT_SCRIPT}
     <!--ssr-head-->
   </head>
   <body>
@@ -1384,16 +1393,19 @@ function generateIndexHtml() {
 </html>
 `;
 }
-function generateProdIndexHtml(entryChunk, cssChunks) {
+function generateProdIndexHtml(entryChunk, cssChunks, buildId) {
   const cssLinks = cssChunks.map((c) => `    <link rel="stylesheet" crossorigin href="${c}">`).join(`
 `);
-  const scriptTag = entryChunk ? `<script type="module" crossorigin src="${entryChunk}"></script>` : "";
+  const scriptTag = `<script type="module" crossorigin src="${entryChunk}"></script>`;
+  const buildIdMeta = buildId ? `    <meta name="furin-build-id" content="${escapeHtml(buildId)}">
+` : "";
   return `<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-${cssLinks ? `${cssLinks}
+    ${THEME_INIT_SCRIPT}
+${buildIdMeta}${cssLinks ? `${cssLinks}
 ` : ""}    <!--ssr-head-->
   </head>
   <body>
@@ -1404,10 +1416,6 @@ ${cssLinks ? `${cssLinks}
 `;
 }
-// src/build/hydrate.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-import { join as join2 } from "path";
 // src/build/route-types.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
@@ -1607,6 +1615,7 @@ function toBuildRouteManifestEntry(route, rootDir) {
 function buildTargetManifest(rootDir, buildRoot, target, serverEntry) {
   const targetDir = join3(buildRoot, target);
   return {
+    buildId: "",
     generatedAt: new Date().toISOString(),
     targetDir: toPosixPath(relative(rootDir, targetDir)),
     clientDir: toPosixPath(relative(rootDir, join3(targetDir, "client"))),
@@ -1683,10 +1692,13 @@ ${transformed}`;
   }
   const entryOutput = result.outputs.find((o) => o.kind === "entry-point");
   const cssOutputs = result.outputs.filter((o) => o.path.endsWith(".css") && !o.path.endsWith(".css.map"));
-  const entryChunk = entryOutput ? `/_client/${basename(entryOutput.path)}` : undefined;
+  if (!entryOutput) {
+    throw new Error("[furin] client build did not emit entry chunk");
+  }
+  const entryChunk = `/_client/${basename(entryOutput.path)}`;
   const cssChunks = cssOutputs.map((o) => `/_client/${basename(o.path)}`);
-  writeFileSync3(join4(clientDir, "index.html"), generateProdIndexHtml(entryChunk, cssChunks));
   console.log("[furin] Production client build complete");
+  return { entryChunk, cssChunks };
 }
 // src/build/compile-entry.ts
@@ -1698,7 +1710,14 @@ 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, "/");
 function buildEntrySource(options) {
-  const { headerComment, rootPath, routes, serverEntry, extraImports = [], extraContext = [] } = options;
+  const { buildId, headerComment, rootPath, routes, serverEntry } = options;
+  let { extraImports, extraContext } = options;
+  if (extraImports === undefined) {
+    extraImports = [];
+  }
+  if (extraContext === undefined) {
+    extraContext = [];
+  }
   const allModulePaths = [rootPath, ...routes.map((r) => r.path)];
   const moduleImports = [];
   const moduleEntries = [];
@@ -1721,6 +1740,7 @@ function buildEntrySource(options) {
     'process.env.NODE_ENV = "production";',
     "",
     "__setCompileContext({",
+    `  buildId: ${JSON.stringify(buildId ?? "")},`,
     `  rootPath: ${JSON.stringify(rootPath.replace(/\\/g, "/"))},`,
     "  modules: {",
     ...moduleEntries,
@@ -1740,7 +1760,7 @@ function buildEntrySource(options) {
 // src/build/compile-entry.ts
 function generateCompileEntry(options) {
-  const { outDir, rootPath, routes, serverEntry, embed, publicDir } = options;
+  const { buildId, outDir, rootPath, routes, serverEntry, embed, publicDir } = options;
   ensureDir(outDir);
   const assetImports = [];
   let embeddedBlock = [];
@@ -1788,6 +1808,7 @@ function generateCompileEntry(options) {
     ];
   }
   const source = buildEntrySource({
+    buildId,
     headerComment: "// Auto-generated by furin compile \u2014 do not edit",
     rootPath,
     routes,
@@ -1804,9 +1825,10 @@ function generateCompileEntry(options) {
 import { writeFileSync as writeFileSync5 } from "fs";
 import { join as join6 } from "path";
 function generateServerRoutesEntry(options) {
-  const { outDir, rootPath, routes, serverEntry } = options;
+  const { buildId, outDir, rootPath, routes, serverEntry } = options;
   ensureDir(outDir);
   const source = buildEntrySource({
+    buildId,
     headerComment: "// Auto-generated by furin build \u2014 do not edit",
     rootPath,
     routes,
@@ -1818,6 +1840,33 @@ function generateServerRoutesEntry(options) {
 }
 // src/adapter/bun.ts
+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")
+];
+async function createBuildFingerprint(entryChunk, cssChunks, routes, rootPath, serverEntry) {
+  const fingerprintPaths = new Set([rootPath, ...routes.map((route) => route.path)]);
+  if (serverEntry) {
+    fingerprintPaths.add(serverEntry);
+  }
+  for (const path of BUILD_ID_INPUT_PATHS) {
+    if (!existsSync6(path)) {
+      console.warn(`[furin] Warning: build fingerprint input "${toPosixPath(path)}" is missing \u2014 ` + "the generated build ID may not reflect all framework changes.");
+    }
+    fingerprintPaths.add(path);
+  }
+  const fileParts = await Promise.all([...fingerprintPaths].sort().map(async (path) => {
+    const content = existsSync6(path) ? await Bun.file(path).text() : "";
+    return `${toPosixPath(path)}:${content}`;
+  }));
+  const routeParts = routes.map((route) => JSON.stringify({ mode: route.mode, path: toPosixPath(route.path), pattern: route.pattern })).sort();
+  return [entryChunk, ...[...cssChunks].sort(), ...routeParts, ...fileParts].join(`
+`);
+}
 async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry, options) {
   if (options.compile && !serverEntry) {
     throw new Error(`[furin] \`compile: "${options.compile}"\` requires a server entry point. ` + "Create src/server.ts or set `serverEntry` in your furin.config.ts.");
@@ -1827,11 +1876,16 @@ async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry,
   const targetDir = resolve3(rootDir, targetManifest.targetDir);
   rmSync2(targetDir, { force: true, recursive: true });
   ensureDir(targetDir);
-  await buildClient(routes, {
+  const { entryChunk, cssChunks } = await buildClient(routes, {
     outDir: targetDir,
     rootLayout: rootPath,
     plugins: options.plugins
   });
+  const buildFingerprint = await createBuildFingerprint(entryChunk, cssChunks, routes, rootPath, serverEntry);
+  const buildId = Bun.hash(buildFingerprint).toString(16).slice(0, 12);
+  targetManifest.buildId = buildId;
+  const clientDir = join7(targetDir, "client");
+  writeFileSync6(join7(clientDir, "index.html"), generateProdIndexHtml(entryChunk, cssChunks, buildId));
   const routeManifest = routes.map((r) => ({ pattern: r.pattern, path: r.path, mode: r.mode }));
   const publicDir = existsSync6(join7(rootDir, "public")) ? join7(rootDir, "public") : undefined;
   const targetPublicDir = publicDir ? join7(targetDir, "public") : undefined;
@@ -1839,14 +1893,15 @@ async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry,
     copyDirRecursive(publicDir, targetPublicDir);
   }
   if (options.compile && serverEntry) {
-    const clientDir = join7(targetDir, "client");
+    const clientDir2 = join7(targetDir, "client");
     const outfile = join7(targetDir, "server");
     const entryPath = generateCompileEntry({
+      buildId,
       rootPath,
       routes: routeManifest,
       serverEntry,
       outDir: targetDir,
-      embed: options.compile === "embed" ? { clientDir } : undefined,
+      embed: options.compile === "embed" ? { clientDir: clientDir2 } : undefined,
       publicDir
     });
     await Bun.build({
@@ -1859,12 +1914,13 @@ async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry,
     console.log(`[furin] Server binary: ${outfile}`);
     targetManifest.serverPath = toPosixPath(join7(targetManifest.targetDir, "server"));
     if (options.compile === "embed") {
-      rmSync2(clientDir, { force: true, recursive: true });
+      rmSync2(clientDir2, { force: true, recursive: true });
       targetManifest.clientDir = null;
       targetManifest.templatePath = null;
     }
   } else if (serverEntry) {
     const entryPath = generateServerRoutesEntry({
+      buildId,
       rootPath,
       routes: routeManifest,
       serverEntry,
@@ -1885,8 +1941,7 @@ async function buildBunTarget(routes, rootDir, buildRoot, rootPath, serverEntry,
     "_compile-entry.ts",
     "_compile-entry.js.map",
     "server.ts",
-    "_hydrate.tsx",
-    "index.html"
+    "_hydrate.tsx"
   ]) {
     rmSync2(join7(targetDir, file), { force: true });
   }
@@ -1924,14 +1979,20 @@ function getCompileContext() {
 import { renderToReadableStream } from "react-dom/server";
 // src/render/cache.ts
+import { AsyncLocalStorage } from "async_hooks";
 var isrCache = new Map;
 var ssgCache = new Map;
+var _requestInvalidationScope = new AsyncLocalStorage;
+var _globalPendingInvalidations = new Set;
 // src/render/element.tsx
 import { jsxDEV } from "react/jsx-dev-runtime";
 // src/runtime-env.ts
 var IS_DEV = true;
+// src/render/index.ts
+var pendingRevalidations = new Set;
 // src/utils.ts
 function isFurinPage(value) {
   return typeof value === "object" && value !== null && "__type" in value && value.__type === "FURIN_PAGE";
@@ -2007,13 +2068,7 @@ async function scanPageFiles(pagesDir, root) {
       continue;
     }
     if (IS_DEV) {
-      routes.push({
-        pattern: filePathToPattern(relativePath),
-        path: absolutePath,
-        mode: "ssr",
-        page: undefined,
-        routeChain: []
-      });
+      routes.push(await buildDevRoute(absolutePath, relativePath, root));
       continue;
     }
     const ctx = getCompileContext();
@@ -2034,6 +2089,30 @@ async function scanPageFiles(pagesDir, root) {
   }
   return routes;
 }
+async function buildDevRoute(absolutePath, relativePath, root) {
+  let page;
+  let routeChain = [];
+  try {
+    const pageMod = await import(`${absolutePath}?furin-server&t=${Date.now()}`);
+    if (isFurinPage(pageMod.default)) {
+      page = pageMod.default;
+      routeChain = collectRouteChainFromRoute(page._route);
+      validateRouteChain(routeChain, root.route, relativePath);
+    }
+  } catch {}
+  const devStubPage = {
+    __type: "FURIN_PAGE",
+    _route: { __type: "FURIN_ROUTE" },
+    component: () => null
+  };
+  return {
+    pattern: filePathToPattern(relativePath),
+    path: absolutePath,
+    mode: page ? resolveMode(page, routeChain) : "ssr",
+    page: page ?? devStubPage,
+    routeChain
+  };
+}
 async function collectPageFilePaths(dir) {
   const files = [];
   for (const entry of await readdir(dir, { withFileTypes: true })) {
@@ -2103,8 +2182,8 @@ function walkNode(node, out) {
   if (node.type === "CallExpression") {
     const callee = node.callee;
     const args = node.arguments;
-    const isElyraCall = callee?.type === "Identifier" && callee.name === "furin";
-    if (isElyraCall && Array.isArray(args) && args.length > 0) {
+    const isFurinCall = callee?.type === "Identifier" && callee.name === "furin";
+    if (isFurinCall && Array.isArray(args) && args.length > 0) {
       const firstArg = args[0];
       if (firstArg?.type === "ObjectExpression") {
         const pagesDir = extractStringProperty(firstArg, "pagesDir");
@@ -2184,9 +2263,6 @@ async function buildApp(options) {
     return target;
   });
   const { root, routes } = await scanPages(pagesDir);
-  if (!root) {
-    throw new Error("[furin] No root layout found. Create a root.tsx in your pages directory with a layout component.");
-  }
   ensureDir(buildRoot);
   const manifest = {
     version: 1,
@@ -2211,7 +2287,7 @@ async function buildApp(options) {
         throw new Error(`[furin] Unsupported build target "${target}"`);
     }
   }
-  writeFileSync6(join9(buildRoot, "manifest.json"), `${JSON.stringify(manifest, null, 2)}
+  writeFileSync7(join9(buildRoot, "manifest.json"), `${JSON.stringify(manifest, null, 2)}
 `);
   return {
     manifest,

package/dist/build/server-routes-entry.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export interface ServerRoutesEntryOptions {
+    buildId?: string;
     outDir: string;
     rootPath: string;
     routes: Array<{

package/dist/build/types.d.ts CHANGED Viewed

@@ -15,6 +15,7 @@ export interface BuildRouteManifestEntry {
     revalidate: number | null;
 }
 export interface TargetBuildManifest {
+    buildId: string;
     clientDir: string | null;
     generatedAt: string;
     serverEntry: string | null;