dinou 7.3.0 → 8.0.0

package/dinou/core/handler.js

@@ -2,10 +2,11 @@
 // Universal Web Standards Request Handler for Dinou.
 // Implements (Request) => Promise<Response> independently of Express.
 
-const path = require("path");
-const { readFileSync, existsSync } = require("fs");
-const { fileURLToPath, pathToFileURL } = require("url");
-const { PassThrough, Readable } = require("node:stream");
+import path from "node:path";
+import { readFileSync, existsSync, readdirSync } from "node:fs";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { PassThrough, Readable } from "node:stream";
+
 const FormData = globalThis.FormData;
 const Blob = globalThis.Blob;
 
@@ -16,30 +17,33 @@ const isDevelopment =
   process.env.NODE_ENV !== "production";
 const outputFolder = isDevelopment ? ".dinou/public" : ".dinou/dist3";
 
-const { normalizePathCase } = require("./path-utils.js");
-const { resolveRelativeUrl } = require("./url-resolver.js");
-const { getFilePathAndDynamicParams } = require("./get-file-path-and-dynamic-params.js");
-const getJSX = require("./get-jsx.js");
-const { getErrorJSX } = require("./get-error-jsx.js");
-const importModule = require("./import-module.js");
-const { resolveLayoutFunctionsConfig } = require("./layout-functions.js");
-const { revalidating, regenerating, inFlightGenerations } = require("./revalidating.js");
-const { generatingISG } = require("./generating-isg.js");
-const { requestStorage, setCurrentContext } = require("./request-context.js");
-const { getStatus } = require("./status-manifest.js");
-
-const {
+import { normalizePathCase } from "./path-utils.js";
+import { resolveRelativeUrl } from "./url-resolver.js";
+import { getFilePathAndDynamicParams } from "./get-file-path-and-dynamic-params.js";
+import getJSX from "./get-jsx.js";
+import { getErrorJSX } from "./get-error-jsx.js";
+import importModule from "./import-module.js";
+import { resolveLayoutFunctionsConfig } from "./layout-functions.js";
+import { revalidating, regenerating, inFlightGenerations } from "./revalidating.js";
+import { generatingISG } from "./generating-isg.js";
+import { requestStorage, setCurrentContext } from "./request-context.js";
+import { getStatus } from "./status-manifest.js";
+
+import {
   isManifestReady,
   getClientManifest,
   getServerFunctionsManifest,
-} = require("./manifest-provider.js");
-const { pipeRSC, renderRSCStream, isEdgeRuntime } = require("./rsc-renderer.js");
-const { getStorageAdapter, setStorageAdapter } = require("./storage-adapter.js");
-const { createBailoutProxy } = require("./bailout-proxy.js");
-const getAssetFromManifest = require("./get-asset-from-manifest.js");
-const { handlePprResume } = require("./ppr-runtime.js");
-const { resolveModulePpr } = require("./resolve-module-ppr.js");
-const { getDinouConfig: loadDinouConfig } = require("./load-dinou-config");
+} from "./manifest-provider.js";
+import { pipeRSC, renderRSCStream, isEdgeRuntime } from "./rsc-renderer.js";
+import { getStorageAdapter, setStorageAdapter } from "./storage-adapter.js";
+import { createBailoutProxy } from "./bailout-proxy.js";
+import getAssetFromManifest from "./get-asset-from-manifest.js";
+import { handlePprResume } from "./ppr-runtime.js";
+import { resolveModulePpr } from "./resolve-module-ppr.js";
+import { getDinouConfig as loadDinouConfig } from "./load-dinou-config.js";
+import { getSlotJSX } from "./cache-slot.js";
+import { runWithPprContext, getRegisteredHoles } from "./ppr-context.js";
+import { asyncRenderJSXToClientJSX } from "./render-jsx-to-client-jsx.js";
 
 // Load Dinou configuration and plugins
 let dinouConfig = { plugins: [] };
@@ -420,7 +424,7 @@ function getDiscoveredLayouts() {
         if (!existsSync(dir)) return;
         let entries;
         try {
-          entries = require("fs").readdirSync(dir, { withFileTypes: true });
+          entries = readdirSync(dir, { withFileTypes: true });
         } catch {
           return;
         }
@@ -1138,7 +1142,6 @@ async function handleRequest(request, platformContext = {}) {
       const urlObj = new URL(request.url || `http://localhost${pathname}`);
       const isFresh = urlObj.searchParams.get("fresh") === "1" || urlObj.searchParams.has("fresh");
 
-      const { getSlotJSX } = require("./cache-slot.js");
       const currentPath =
         request.headers?.get?.("x-dinou-current-path") ||
         simReq.headers?.["x-dinou-current-path"] ||
@@ -1385,7 +1388,27 @@ async function handleRequest(request, platformContext = {}) {
         for (const [lPath, lParams] of layouts) {
           const lConfig = await resolveLayoutFunctionsConfig(lPath, lParams);
           if (!isDevelopment && lConfig.allowISG === false) {
-            return new Response("Not Found", { status: 404 });
+            let isPathAllowed = false;
+            if (lConfig.staticPathsSet) {
+              const sortedEntries = Object.entries(lParams || {})
+                .sort((a, b) => a[0].localeCompare(b[0]))
+                .map(([k, v]) => {
+                  if (Array.isArray(v)) return [k, v.join(",")];
+                  return [k, String(v)];
+                });
+              const serializedQuery = JSON.stringify(sortedEntries);
+              const singleVal = Object.values(lParams || {})[0];
+              const singleValStr = Array.isArray(singleVal) ? singleVal.join(",") : String(singleVal);
+              isPathAllowed = lConfig.staticPathsSet.has(serializedQuery) || lConfig.staticPathsSet.has(singleValStr);
+            }
+            if (!isPathAllowed) {
+              const cleanReq = reqPath.replace(/^\//, "").replace(/\/$/, "");
+              const rscPath = path.join(process.cwd(), ".dinou/dist2", cleanReq, "layout.rsc");
+              if (!existsSync(rscPath)) {
+                isPathBlocked = true;
+                break;
+              }
+            }
           }
           if (lConfig.validateParams) {
             const isValid = await lConfig.validateParams(lParams);
@@ -1400,7 +1423,26 @@ async function handleRequest(request, platformContext = {}) {
           layoutConfig = await resolveLayoutFunctionsConfig(layoutPath, layoutParams);
         }
         if (!isDevelopment && layoutConfig.allowISG === false) {
-          return new Response("Not Found", { status: 404 });
+          let isPathAllowed = false;
+          if (layoutConfig.staticPathsSet) {
+            const sortedEntries = Object.entries(layoutParams || {})
+              .sort((a, b) => a[0].localeCompare(b[0]))
+              .map(([k, v]) => {
+                if (Array.isArray(v)) return [k, v.join(",")];
+                return [k, String(v)];
+              });
+            const serializedQuery = JSON.stringify(sortedEntries);
+            const singleVal = Object.values(layoutParams || {})[0];
+            const singleValStr = Array.isArray(singleVal) ? singleVal.join(",") : String(singleVal);
+            isPathAllowed = layoutConfig.staticPathsSet.has(serializedQuery) || layoutConfig.staticPathsSet.has(singleValStr);
+          }
+          if (!isPathAllowed) {
+            const cleanReq = reqPath.replace(/^\//, "").replace(/\/$/, "");
+            const rscPath = path.join(process.cwd(), ".dinou/dist2", cleanReq, "layout.rsc");
+            if (!existsSync(rscPath)) {
+              isPathBlocked = true;
+            }
+          }
         }
         if (layoutConfig.validateParams) {
           const isValid = await layoutConfig.validateParams(layoutParams);
@@ -1804,8 +1846,6 @@ async function handleRequest(request, platformContext = {}) {
         try {
           if (!isError) {
             if (platformContext?.isSSG && isPprConfig) {
-              const { runWithPprContext, getRegisteredHoles } = require("./ppr-context.js");
-              const { asyncRenderJSXToClientJSX } = require("./render-jsx-to-client-jsx.js");
               await requestStorage.run(context, async () => {
                 await runWithPprContext({ isPpr: true }, async () => {
                   jsx = await getJSX(reqPath, queryObj, isNotFound, isDevelopment, !pagePath);
@@ -2294,10 +2334,10 @@ async function handleRequest(request, platformContext = {}) {
   return bridge.toResponse();
 }
 
-module.exports = {
+export {
   handleRequest,
   WebResponseBridge,
   resolvePageFunctionsConfig,
 };
-module.exports.default = handleRequest;
+export default handleRequest;
 

package/dinou/core/http-adapter.js

@@ -2,7 +2,7 @@
 // Bidirectional adapter between Node.js HTTP (IncomingMessage/ServerResponse)
 // and WHATWG Web Standards (Request/Response/ReadableStream).
 
-const { Readable } = require("node:stream");
+import { Readable } from "node:stream";
 
 /**
  * Converts a Node.js IncomingMessage / Express Request into a standard Web Request.
@@ -109,7 +109,11 @@ async function sendWebResponseToNode(webResponse, res) {
   }
 }
 
-module.exports = {
+export {
+  nodeToWebRequest,
+  sendWebResponseToNode,
+};
+export default {
   nodeToWebRequest,
   sendWebResponseToNode,
 };

package/dinou/core/import-module.js

@@ -1,6 +1,6 @@
-const { pathToFileURL } = require("url");
-const path = require("path");
-const fs = require("fs");
+import { pathToFileURL } from "node:url";
+import path from "node:path";
+import fs from "node:fs";
 
 function getMtimeParam(absPath) {
   try {
@@ -80,4 +80,5 @@ function registerRouteModules(modulesMap) {
 
 importModule.register = registerRouteModules;
 
-module.exports = importModule;
+export { importModule, registerRouteModules };
+export default importModule;

package/dinou/core/layout-functions.js

@@ -1,9 +1,9 @@
-const path = require("path");
-const { existsSync } = require("./vfs");
-const importModule = require("./import-module");
-const { resolveModulePpr } = require("./resolve-module-ppr");
+import path from "node:path";
+import { existsSync } from "./vfs.js";
+import importModule from "./import-module.js";
+import { resolveModulePpr } from "./resolve-module-ppr.js";
 
-const LAYOUT_FUNCTIONS_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js"];
+const LAYOUT_FUNCTIONS_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mjs"];
 const LAYOUT_FUNCTIONS_NAMES = ["layout_functions", "layout.functions"];
 
 /**
@@ -175,7 +175,12 @@ async function resolveLayoutFunctionsConfig(layoutPath, dParams = {}) {
   }
 }
 
-module.exports = {
+export {
+  getLayoutFunctionsPath,
+  getLayoutProps,
+  resolveLayoutFunctionsConfig,
+};
+export default {
   getLayoutFunctionsPath,
   getLayoutProps,
   resolveLayoutFunctionsConfig,

package/dinou/core/load-dinou-config.js

@@ -1,6 +1,9 @@
-const path = require("path");
-const { existsSync, mkdirSync } = require("fs");
-const { pathToFileURL } = require("url");
+import path from "node:path";
+import { existsSync, mkdirSync } from "node:fs";
+import { pathToFileURL } from "node:url";
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
 
 let dinouConfig = { plugins: [] };
 let dinouConfigPromise = null;
@@ -87,6 +90,9 @@ if (typeof globalThis !== "undefined" && globalThis.__DINOU_CONFIG__) {
   dinouConfig = globalThis.__DINOU_CONFIG__;
 }
 
-module.exports = {
+export {
+  getDinouConfig,
+};
+export default {
   getDinouConfig,
 };

package/dinou/core/manifest-provider.js

@@ -2,8 +2,9 @@
 // Universal provider for RSC Client Manifest and Server Functions Manifest.
 // Supports in-memory injection for Edge/Cloudflare Workers and disk fallback for Node.js.
 
-const path = require("path");
-const fs = require("fs");
+import path from "node:path";
+import fs from "node:fs";
+import { fileURLToPath } from "node:url";
 
 let cachedClientManifest = null;
 let cachedServerFunctionsManifest = null;
@@ -149,7 +150,6 @@ function createDevClientManifestProxy(target) {
       // 4. Fallback for client files in src/ during hot edits
       if (baseUri.startsWith("file:///")) {
         try {
-          const { fileURLToPath } = require("url");
           const localPath = fileURLToPath(baseUri);
           if (fs.existsSync(localPath)) {
             const isWebpack = process.env.DINOU_BUILD_TOOL === "webpack";
@@ -252,7 +252,14 @@ function setServerFunctionsManifest(manifest) {
   }
 }
 
-module.exports = {
+export {
+  isManifestReady,
+  getClientManifest,
+  setClientManifest,
+  getServerFunctionsManifest,
+  setServerFunctionsManifest,
+};
+export default {
   isManifestReady,
   getClientManifest,
   setClientManifest,

package/dinou/core/parse-exports.js

@@ -1,11 +1,16 @@
+import parser from "@babel/parser";
+import traverseModule from "@babel/traverse";
+import { createRequire } from "node:module";
+import { resolveModulePpr } from "./resolve-module-ppr.js";
+
+const require = createRequire(import.meta.url);
+const traverse = traverseModule?.default || traverseModule;
+
 let swc = null;
 try {
   swc = require("@swc/core");
 } catch (e) {}
 
-const parser = require("@babel/parser");
-const traverse = require("@babel/traverse");
-
 function parseExportsWithBabel(code) {
   const ast = parser.parse(code, {
     sourceType: "module",
@@ -283,11 +288,11 @@ function parsePprConfig(code) {
   return parsePprConfigWithBabel(code);
 }
 
-const { resolveModulePpr } = require("./resolve-module-ppr");
-
 parseExports.parsePprConfig = parsePprConfig;
 parseExports.hasPpr = (code) => parsePprConfig(code) === true;
 parseExports.resolveModulePpr = resolveModulePpr;
 
-module.exports = parseExports;
+export { parseExports, parsePprConfig, resolveModulePpr };
+export const hasPpr = (code) => parsePprConfig(code) === true;
+export default parseExports;
 

package/dinou/core/path-utils.js

@@ -1,10 +1,10 @@
-function normalizePathCase(p) {
+export function normalizePathCase(p) {
   if (process.platform === "win32" && typeof p === "string" && p[1] === ":") {
     return p.charAt(0).toLowerCase() + p.slice(1);
   }
   return p;
 }
 
-module.exports = {
+export default {
   normalizePathCase,
 };

package/dinou/core/ppr-context.js

@@ -1,7 +1,7 @@
 // dinou/core/ppr-context.js
 // PPR Pre-rendering Context and Suspense Hole Tracker for Dinou v7.2.
 
-const { AsyncLocalStorage } = require("async_hooks");
+import { AsyncLocalStorage } from "node:async_hooks";
 
 const pprStorage = new AsyncLocalStorage();
 
@@ -11,7 +11,7 @@ const pprStorage = new AsyncLocalStorage();
  * @param {Function} callback
  * @returns {Promise<any>}
  */
-function runWithPprContext(options, callback) {
+export function runWithPprContext(options, callback) {
   const store = {
     isPpr: Boolean(options?.isPpr),
     suspenseDepth: 0,
@@ -23,21 +23,21 @@ function runWithPprContext(options, callback) {
   return pprStorage.run(store, callback);
 }
 
-function getPprStore() {
+export function getPprStore() {
   return pprStorage.getStore() || null;
 }
 
-function isPprBuildActive() {
+export function isPprBuildActive() {
   const store = getPprStore();
   return Boolean(store && store.isPpr);
 }
 
-function isInsideSuspense() {
+export function isInsideSuspense() {
   const store = getPprStore();
   return Boolean(store && store.suspenseDepth > 0);
 }
 
-function enterSuspense(holeId = null) {
+export function enterSuspense(holeId = null) {
   const store = getPprStore();
   if (store) {
     store.suspenseDepth++;
@@ -51,7 +51,7 @@ function enterSuspense(holeId = null) {
   return null;
 }
 
-function exitSuspense() {
+export function exitSuspense() {
   const store = getPprStore();
   if (store) {
     store.suspenseDepth = Math.max(0, store.suspenseDepth - 1);
@@ -61,7 +61,7 @@ function exitSuspense() {
   }
 }
 
-function markDynamicAccess(type = "dynamic") {
+export function markDynamicAccess(type = "dynamic") {
   const store = getPprStore();
   if (store && store.isPpr && store.suspenseDepth > 0) {
     const holeId = store.currentHoleId || `ppr-hole-${store.nextHoleIndex}`;
@@ -73,7 +73,7 @@ function markDynamicAccess(type = "dynamic") {
   }
 }
 
-function registerHole(holeId, meta = {}) {
+export function registerHole(holeId, meta = {}) {
   const store = getPprStore();
   if (store) {
     store.holes.set(holeId, {
@@ -84,7 +84,7 @@ function registerHole(holeId, meta = {}) {
   }
 }
 
-function getRegisteredHoles() {
+export function getRegisteredHoles() {
   const store = getPprStore();
   if (store) {
     return Array.from(store.holes.keys());
@@ -92,7 +92,7 @@ function getRegisteredHoles() {
   return [];
 }
 
-module.exports = {
+export default {
   runWithPprContext,
   getPprStore,
   isPprBuildActive,

package/dinou/core/ppr-runtime.js

@@ -4,11 +4,11 @@
 // streams dynamic Suspense holes as they resolve over the same HTTP connection.
 // Designed for the Dual-Bundle architecture (Pass A: RSC, Pass B: SSR).
 
-const React = require("react");
-const { renderRSCStream } = require("./rsc-renderer.js");
-const { getClientManifest } = require("./manifest-provider.js");
-const { requestStorage, setCurrentContext } = require("./request-context.js");
-const getJSX = require("./get-jsx.js");
+import React from "react";
+import { renderRSCStream } from "./rsc-renderer.js";
+import { getClientManifest } from "./manifest-provider.js";
+import { requestStorage, setCurrentContext } from "./request-context.js";
+import getJSX from "./get-jsx.js";
 
 /**
  * Traverses a React JSX element tree to find Suspense boundaries,
@@ -257,7 +257,11 @@ async function handlePprResume({
   });
 }
 
-module.exports = {
+export {
+  streamDynamicHoles,
+  handlePprResume,
+};
+export default {
   streamDynamicHoles,
   handlePprResume,
 };

package/dinou/core/render-jsx-to-client-jsx.js

@@ -1,9 +1,9 @@
-const {
+import {
   isPprBuildActive,
   enterSuspense,
   exitSuspense,
   registerHole,
-} = require("./ppr-context.js");
+} from "./ppr-context.js";
 
 // Function to check if a component is a client component
 function isClientComponent(type) {
@@ -176,6 +176,9 @@ async function asyncRenderJSXToClientJSX(jsx, key = null) {
   }
 }
 
-module.exports = {
+export {
+  asyncRenderJSXToClientJSX,
+};
+export default {
   asyncRenderJSXToClientJSX,
 };

package/dinou/core/request-context.js

@@ -1,14 +1,12 @@
 // dinou/core/request-context.js
-
 const DINOU_CONTEXT_KEY = Symbol.for("dinou.request.context.storage");
 let requestStorage;
 
 if (typeof window === "undefined") {
-  let AsyncLocalStorageClass;
-
-  if (typeof globalThis.AsyncLocalStorage !== "undefined") {
-    AsyncLocalStorageClass = globalThis.AsyncLocalStorage;
-  }
+  let AsyncLocalStorageClass =
+    typeof globalThis.AsyncLocalStorage !== "undefined"
+      ? globalThis.AsyncLocalStorage
+      : undefined;
 
   if (!AsyncLocalStorageClass) {
     try {
@@ -69,7 +67,13 @@ function getContext() {
   return store || getCurrentContext() || {};
 }
 
-module.exports = {
+export {
+  requestStorage,
+  getContext,
+  setCurrentContext,
+  getCurrentContext,
+};
+export default {
   requestStorage,
   getContext,
   setCurrentContext,

package/dinou/core/resolve-module-ppr.js

@@ -3,7 +3,7 @@
 // Supports constants (export const ppr = true/false), sync functions (export function ppr()),
 // and async functions (export async function ppr()).
 
-async function resolveModulePpr(mod) {
+export async function resolveModulePpr(mod) {
   if (!mod) return null;
   const raw =
     mod.ppr !== undefined
@@ -29,6 +29,6 @@ async function resolveModulePpr(mod) {
   return Boolean(raw);
 }
 
-module.exports = {
+export default {
   resolveModulePpr,
 };