@webtypen/webframez-react 0.0.14 → 0.0.16

package/dist/index.js

@@ -166,6 +166,7 @@ function createRSCHandler(options) {
 
 // src/file-router.tsx
 import fs from "node:fs";
+import Module from "node:module";
 import path2 from "node:path";
 
 // src/router-runtime.tsx
@@ -228,6 +229,26 @@ function injectRouteChildren(node, routeChildren) {
 
 // src/file-router.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
+var ROOT_RUNTIME_REQUIRE = Module.createRequire(
+  path2.join(process.cwd(), "__webframez_react_runtime__.js")
+);
+var FORCED_PACKAGE_REQUESTS = [
+  "@webtypen/webframez-core",
+  "@webtypen/webframez-react",
+  "react",
+  "react/jsx-runtime",
+  "react/jsx-dev-runtime",
+  "react-dom",
+  "react-dom/client",
+  "react-dom/server",
+  "react-dom/server.node",
+  "react-server-dom-webpack",
+  "react-server-dom-webpack/server",
+  "react-server-dom-webpack/client",
+  "react-server-dom-webpack/client.node",
+  "scheduler"
+];
+var forcedPackageResolutionInstalled = false;
 function normalizePathname(pathname) {
   const trimmed = pathname.replace(/\/+$/, "") || "/";
   return trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
@@ -276,6 +297,28 @@ var MANAGED_HEAD_ATTR = "data-webframez-head";
 function createManagedAttributes() {
   return `${MANAGED_HEAD_ATTR}="true"`;
 }
+function shouldForcePackageResolution(request) {
+  return FORCED_PACKAGE_REQUESTS.some(
+    (candidate) => request === candidate || request.startsWith(`${candidate}/`)
+  );
+}
+function installForcedPackageResolution() {
+  if (forcedPackageResolutionInstalled) {
+    return;
+  }
+  const moduleWithPrivateResolver = Module;
+  const originalResolveFilename = moduleWithPrivateResolver._resolveFilename;
+  moduleWithPrivateResolver._resolveFilename = function patchedResolveFilename(request, parent, isMain, options) {
+    if (typeof request === "string" && shouldForcePackageResolution(request)) {
+      try {
+        return ROOT_RUNTIME_REQUIRE.resolve(request);
+      } catch {
+      }
+    }
+    return originalResolveFilename.call(this, request, parent, isMain, options);
+  };
+  forcedPackageResolutionInstalled = true;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -423,9 +466,11 @@ function isRouteAbort(value) {
   }
 }
 function createFileRouter(options) {
+  installForcedPackageResolution();
   const pagesDir = options.pagesDir;
   const layoutPath = path2.join(pagesDir, "layout.js");
   const errorPath = path2.join(pagesDir, "errors.js");
+  const middlewaresPath = path2.join(pagesDir, "middlewares.js");
   function buildRouteEntries() {
     const files = walkFiles(pagesDir);
     return files.map((filePath) => toRouteEntry(pagesDir, filePath)).filter((entry) => entry !== null).sort((a, b) => {
@@ -468,6 +513,75 @@ function createFileRouter(options) {
       head: mergeHead(layoutHead, errorHead)
     };
   }
+  function normalizeMiddlewareNames(config) {
+    if (!config) {
+      return [];
+    }
+    return Array.isArray(config) ? config : [config];
+  }
+  function isPlainObject(value) {
+    if (!value || typeof value !== "object") {
+      return false;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+  }
+  function mergeRouteData(currentData, nextData) {
+    if (typeof nextData === "undefined") {
+      return currentData;
+    }
+    if (isPlainObject(currentData) && isPlainObject(nextData)) {
+      return {
+        ...currentData,
+        ...nextData
+      };
+    }
+    return nextData;
+  }
+  async function resolveMiddlewares(config, context) {
+    const middlewareNames = normalizeMiddlewareNames(config);
+    const requiresNamedMiddleware = middlewareNames.length > 0;
+    if (!fs.existsSync(middlewaresPath)) {
+      if (!requiresNamedMiddleware) {
+        return context;
+      }
+      throw createAbort({
+        status: 500,
+        message: `Invalid middleware '${middlewareNames[0]}'`
+      });
+    }
+    const middlewareModule = resolveModule(middlewaresPath);
+    const registry = middlewareModule.middlewares;
+    if (!registry) {
+      if (!requiresNamedMiddleware) {
+        return context;
+      }
+      throw createAbort({
+        status: 500,
+        message: `Invalid middleware '${middlewareNames[0]}'`
+      });
+    }
+    const orderedMiddlewareNames = typeof registry["*"] === "function" ? ["*", ...middlewareNames] : middlewareNames;
+    if (orderedMiddlewareNames.length === 0) {
+      return context;
+    }
+    let nextContext = context;
+    for (const middlewareName of orderedMiddlewareNames) {
+      const middleware = registry[middlewareName];
+      if (typeof middleware !== "function") {
+        throw createAbort({
+          status: 500,
+          message: `Invalid middleware '${middlewareName}'`
+        });
+      }
+      const middlewareData = await middleware(nextContext);
+      nextContext = {
+        ...nextContext,
+        data: mergeRouteData(nextContext.data, middlewareData)
+      };
+    }
+    return nextContext;
+  }
   async function resolve(input) {
     const pathname = normalizePathname(input.pathname);
     const contextBase = {
@@ -493,10 +607,12 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageData = await resolvePageData(pageModule, context);
+      const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
+      activeContext = middlewareContext;
+      const pageData = await resolvePageData(pageModule, middlewareContext);
       const pageContext = {
-        ...context,
-        data: pageData
+        ...middlewareContext,
+        data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
       const pageNode = await pageModule.default(pageContext);
@@ -544,19 +660,34 @@ if (!pagesDir) {
   throw new Error("Missing WEBFRAMEZ_REACT_PAGES_DIR");
 }
 
-const appRequire = Module.createRequire(path.join(pagesDir, "__webframez_react_worker__.js"));
+const rootRequire = Module.createRequire(path.join(process.cwd(), "__webframez_react_worker__.js"));
 const originalResolveFilename = Module._resolveFilename;
 const forcedResolutions = new Map([
-  ["react", appRequire.resolve("react")],
-  ["react/jsx-runtime", appRequire.resolve("react/jsx-runtime")],
-  ["react/jsx-dev-runtime", appRequire.resolve("react/jsx-dev-runtime")],
-  ["react-dom/client", appRequire.resolve("react-dom/client")]
+  ["@webtypen/webframez-core", rootRequire.resolve("@webtypen/webframez-core")],
+  ["@webtypen/webframez-react", rootRequire.resolve("@webtypen/webframez-react")],
+  ["react", rootRequire.resolve("react")],
+  ["react/jsx-runtime", rootRequire.resolve("react/jsx-runtime")],
+  ["react/jsx-dev-runtime", rootRequire.resolve("react/jsx-dev-runtime")],
+  ["react-dom", rootRequire.resolve("react-dom")],
+  ["react-dom/client", rootRequire.resolve("react-dom/client")],
+  ["react-dom/server", rootRequire.resolve("react-dom/server")],
+  ["react-dom/server.node", rootRequire.resolve("react-dom/server.node")],
+  ["react-server-dom-webpack", rootRequire.resolve("react-server-dom-webpack")],
+  ["react-server-dom-webpack/server", rootRequire.resolve("react-server-dom-webpack/server")],
+  ["react-server-dom-webpack/client", rootRequire.resolve("react-server-dom-webpack/client")],
+  ["react-server-dom-webpack/client.node", rootRequire.resolve("react-server-dom-webpack/client.node")],
+  ["scheduler", rootRequire.resolve("scheduler")]
 ]);
 
 Module._resolveFilename = function(request, parent, isMain, options) {
   if (forcedResolutions.has(request)) {
     return forcedResolutions.get(request);
   }
+  for (const forcedRequest of forcedResolutions.keys()) {
+    if (request.startsWith(forcedRequest + "/")) {
+      return rootRequire.resolve(request);
+    }
+  }
   return originalResolveFilename.call(this, request, parent, isMain, options);
 };
 

package/dist/router.cjs

@@ -38,6 +38,7 @@ module.exports = __toCommonJS(router_exports);
 
 // src/file-router.tsx
 var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_module = __toESM(require("node:module"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 
 // src/router-runtime.tsx
@@ -100,6 +101,26 @@ function injectRouteChildren(node, routeChildren) {
 
 // src/file-router.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
+var ROOT_RUNTIME_REQUIRE = import_node_module.default.createRequire(
+  import_node_path.default.join(process.cwd(), "__webframez_react_runtime__.js")
+);
+var FORCED_PACKAGE_REQUESTS = [
+  "@webtypen/webframez-core",
+  "@webtypen/webframez-react",
+  "react",
+  "react/jsx-runtime",
+  "react/jsx-dev-runtime",
+  "react-dom",
+  "react-dom/client",
+  "react-dom/server",
+  "react-dom/server.node",
+  "react-server-dom-webpack",
+  "react-server-dom-webpack/server",
+  "react-server-dom-webpack/client",
+  "react-server-dom-webpack/client.node",
+  "scheduler"
+];
+var forcedPackageResolutionInstalled = false;
 function normalizePathname(pathname) {
   const trimmed = pathname.replace(/\/+$/, "") || "/";
   return trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
@@ -148,6 +169,28 @@ var MANAGED_HEAD_ATTR = "data-webframez-head";
 function createManagedAttributes() {
   return `${MANAGED_HEAD_ATTR}="true"`;
 }
+function shouldForcePackageResolution(request) {
+  return FORCED_PACKAGE_REQUESTS.some(
+    (candidate) => request === candidate || request.startsWith(`${candidate}/`)
+  );
+}
+function installForcedPackageResolution() {
+  if (forcedPackageResolutionInstalled) {
+    return;
+  }
+  const moduleWithPrivateResolver = import_node_module.default;
+  const originalResolveFilename = moduleWithPrivateResolver._resolveFilename;
+  moduleWithPrivateResolver._resolveFilename = function patchedResolveFilename(request, parent, isMain, options) {
+    if (typeof request === "string" && shouldForcePackageResolution(request)) {
+      try {
+        return ROOT_RUNTIME_REQUIRE.resolve(request);
+      } catch {
+      }
+    }
+    return originalResolveFilename.call(this, request, parent, isMain, options);
+  };
+  forcedPackageResolutionInstalled = true;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -295,9 +338,11 @@ function isRouteAbort(value) {
   }
 }
 function createFileRouter(options) {
+  installForcedPackageResolution();
   const pagesDir = options.pagesDir;
   const layoutPath = import_node_path.default.join(pagesDir, "layout.js");
   const errorPath = import_node_path.default.join(pagesDir, "errors.js");
+  const middlewaresPath = import_node_path.default.join(pagesDir, "middlewares.js");
   function buildRouteEntries() {
     const files = walkFiles(pagesDir);
     return files.map((filePath) => toRouteEntry(pagesDir, filePath)).filter((entry) => entry !== null).sort((a, b) => {
@@ -340,6 +385,75 @@ function createFileRouter(options) {
       head: mergeHead(layoutHead, errorHead)
     };
   }
+  function normalizeMiddlewareNames(config) {
+    if (!config) {
+      return [];
+    }
+    return Array.isArray(config) ? config : [config];
+  }
+  function isPlainObject(value) {
+    if (!value || typeof value !== "object") {
+      return false;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+  }
+  function mergeRouteData(currentData, nextData) {
+    if (typeof nextData === "undefined") {
+      return currentData;
+    }
+    if (isPlainObject(currentData) && isPlainObject(nextData)) {
+      return {
+        ...currentData,
+        ...nextData
+      };
+    }
+    return nextData;
+  }
+  async function resolveMiddlewares(config, context) {
+    const middlewareNames = normalizeMiddlewareNames(config);
+    const requiresNamedMiddleware = middlewareNames.length > 0;
+    if (!import_node_fs.default.existsSync(middlewaresPath)) {
+      if (!requiresNamedMiddleware) {
+        return context;
+      }
+      throw createAbort({
+        status: 500,
+        message: `Invalid middleware '${middlewareNames[0]}'`
+      });
+    }
+    const middlewareModule = resolveModule(middlewaresPath);
+    const registry = middlewareModule.middlewares;
+    if (!registry) {
+      if (!requiresNamedMiddleware) {
+        return context;
+      }
+      throw createAbort({
+        status: 500,
+        message: `Invalid middleware '${middlewareNames[0]}'`
+      });
+    }
+    const orderedMiddlewareNames = typeof registry["*"] === "function" ? ["*", ...middlewareNames] : middlewareNames;
+    if (orderedMiddlewareNames.length === 0) {
+      return context;
+    }
+    let nextContext = context;
+    for (const middlewareName of orderedMiddlewareNames) {
+      const middleware = registry[middlewareName];
+      if (typeof middleware !== "function") {
+        throw createAbort({
+          status: 500,
+          message: `Invalid middleware '${middlewareName}'`
+        });
+      }
+      const middlewareData = await middleware(nextContext);
+      nextContext = {
+        ...nextContext,
+        data: mergeRouteData(nextContext.data, middlewareData)
+      };
+    }
+    return nextContext;
+  }
   async function resolve(input) {
     const pathname = normalizePathname(input.pathname);
     const contextBase = {
@@ -365,10 +479,12 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageData = await resolvePageData(pageModule, context);
+      const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
+      activeContext = middlewareContext;
+      const pageData = await resolvePageData(pageModule, middlewareContext);
       const pageContext = {
-        ...context,
-        data: pageData
+        ...middlewareContext,
+        data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
       const pageNode = await pageModule.default(pageContext);

package/dist/router.js

@@ -8,6 +8,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/file-router.tsx
 import fs from "node:fs";
+import Module from "node:module";
 import path from "node:path";
 
 // src/router-runtime.tsx
@@ -70,6 +71,26 @@ function injectRouteChildren(node, routeChildren) {
 
 // src/file-router.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
+var ROOT_RUNTIME_REQUIRE = Module.createRequire(
+  path.join(process.cwd(), "__webframez_react_runtime__.js")
+);
+var FORCED_PACKAGE_REQUESTS = [
+  "@webtypen/webframez-core",
+  "@webtypen/webframez-react",
+  "react",
+  "react/jsx-runtime",
+  "react/jsx-dev-runtime",
+  "react-dom",
+  "react-dom/client",
+  "react-dom/server",
+  "react-dom/server.node",
+  "react-server-dom-webpack",
+  "react-server-dom-webpack/server",
+  "react-server-dom-webpack/client",
+  "react-server-dom-webpack/client.node",
+  "scheduler"
+];
+var forcedPackageResolutionInstalled = false;
 function normalizePathname(pathname) {
   const trimmed = pathname.replace(/\/+$/, "") || "/";
   return trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
@@ -118,6 +139,28 @@ var MANAGED_HEAD_ATTR = "data-webframez-head";
 function createManagedAttributes() {
   return `${MANAGED_HEAD_ATTR}="true"`;
 }
+function shouldForcePackageResolution(request) {
+  return FORCED_PACKAGE_REQUESTS.some(
+    (candidate) => request === candidate || request.startsWith(`${candidate}/`)
+  );
+}
+function installForcedPackageResolution() {
+  if (forcedPackageResolutionInstalled) {
+    return;
+  }
+  const moduleWithPrivateResolver = Module;
+  const originalResolveFilename = moduleWithPrivateResolver._resolveFilename;
+  moduleWithPrivateResolver._resolveFilename = function patchedResolveFilename(request, parent, isMain, options) {
+    if (typeof request === "string" && shouldForcePackageResolution(request)) {
+      try {
+        return ROOT_RUNTIME_REQUIRE.resolve(request);
+      } catch {
+      }
+    }
+    return originalResolveFilename.call(this, request, parent, isMain, options);
+  };
+  forcedPackageResolutionInstalled = true;
+}
 function toRouteEntry(pagesDir, filePath) {
   const normalized = filePath.replace(/\\/g, "/");
   if (!normalized.endsWith("/index.js")) {
@@ -265,9 +308,11 @@ function isRouteAbort(value) {
   }
 }
 function createFileRouter(options) {
+  installForcedPackageResolution();
   const pagesDir = options.pagesDir;
   const layoutPath = path.join(pagesDir, "layout.js");
   const errorPath = path.join(pagesDir, "errors.js");
+  const middlewaresPath = path.join(pagesDir, "middlewares.js");
   function buildRouteEntries() {
     const files = walkFiles(pagesDir);
     return files.map((filePath) => toRouteEntry(pagesDir, filePath)).filter((entry) => entry !== null).sort((a, b) => {
@@ -310,6 +355,75 @@ function createFileRouter(options) {
       head: mergeHead(layoutHead, errorHead)
     };
   }
+  function normalizeMiddlewareNames(config) {
+    if (!config) {
+      return [];
+    }
+    return Array.isArray(config) ? config : [config];
+  }
+  function isPlainObject(value) {
+    if (!value || typeof value !== "object") {
+      return false;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+  }
+  function mergeRouteData(currentData, nextData) {
+    if (typeof nextData === "undefined") {
+      return currentData;
+    }
+    if (isPlainObject(currentData) && isPlainObject(nextData)) {
+      return {
+        ...currentData,
+        ...nextData
+      };
+    }
+    return nextData;
+  }
+  async function resolveMiddlewares(config, context) {
+    const middlewareNames = normalizeMiddlewareNames(config);
+    const requiresNamedMiddleware = middlewareNames.length > 0;
+    if (!fs.existsSync(middlewaresPath)) {
+      if (!requiresNamedMiddleware) {
+        return context;
+      }
+      throw createAbort({
+        status: 500,
+        message: `Invalid middleware '${middlewareNames[0]}'`
+      });
+    }
+    const middlewareModule = resolveModule(middlewaresPath);
+    const registry = middlewareModule.middlewares;
+    if (!registry) {
+      if (!requiresNamedMiddleware) {
+        return context;
+      }
+      throw createAbort({
+        status: 500,
+        message: `Invalid middleware '${middlewareNames[0]}'`
+      });
+    }
+    const orderedMiddlewareNames = typeof registry["*"] === "function" ? ["*", ...middlewareNames] : middlewareNames;
+    if (orderedMiddlewareNames.length === 0) {
+      return context;
+    }
+    let nextContext = context;
+    for (const middlewareName of orderedMiddlewareNames) {
+      const middleware = registry[middlewareName];
+      if (typeof middleware !== "function") {
+        throw createAbort({
+          status: 500,
+          message: `Invalid middleware '${middlewareName}'`
+        });
+      }
+      const middlewareData = await middleware(nextContext);
+      nextContext = {
+        ...nextContext,
+        data: mergeRouteData(nextContext.data, middlewareData)
+      };
+    }
+    return nextContext;
+  }
   async function resolve(input) {
     const pathname = normalizePathname(input.pathname);
     const contextBase = {
@@ -335,10 +449,12 @@ function createFileRouter(options) {
       activeContext = context;
       const pageModule = resolveModule(match.entry.filePath);
       const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
-      const pageData = await resolvePageData(pageModule, context);
+      const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
+      activeContext = middlewareContext;
+      const pageData = await resolvePageData(pageModule, middlewareContext);
       const pageContext = {
-        ...context,
-        data: pageData
+        ...middlewareContext,
+        data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
       const pageNode = await pageModule.default(pageContext);

package/dist/types.d.ts

@@ -69,10 +69,18 @@ export type PageDataResolver<TData = unknown> = (
   context: RouteContext
 ) => TData | Promise<TData>;
 
+export type RouteMiddlewareResult = Record<string, unknown> | undefined | void;
+export type RouteMiddlewareResolver<TData = unknown> = (
+  context: RouteContext<TData>
+) => RouteMiddlewareResult | Promise<RouteMiddlewareResult>;
+export type RouteMiddlewareRegistry = Record<string, RouteMiddlewareResolver<any>>;
+export type RouteMiddlewareConfig = string | string[];
+
 export type PageModule<TData = unknown> = {
   default: (props: PageProps<TData>) => ReactNode | Promise<ReactNode>;
   Head?: HeadResolver<PageProps<TData>>;
   Data?: PageDataResolver<TData>;
+  middlewares?: RouteMiddlewareConfig;
 };
 
 export type LayoutModule = {
@@ -91,6 +99,8 @@ export type CreateHtmlShellOptions = {
   clientScriptUrl?: string;
   headTags?: string;
   rootHtml?: string;
+  initialFlightData?: string;
+  clientRenderMode?: "hydrate" | "mount";
   basename?: string;
   liveReloadPath?: string;
   liveReloadServerId?: string;