dinou 7.0.0 → 7.1.0

package/dinou/core/build-static-pages.js

@@ -168,8 +168,8 @@ async function buildStaticPages(onProgress = null) {
           let revalidate, getStaticPaths;
           if (pageFunctionsPath) {
             const module = await importModule(pageFunctionsPath);
-            getStaticPaths = module.getStaticPaths;
-            revalidate = module.revalidate;
+            getStaticPaths = module.getStaticPaths || module.default?.getStaticPaths;
+            revalidate = module.revalidate || module.default?.revalidate;
           }
           const isLocalPage =
             pagePath && path.dirname(pagePath) === dynamicPath;
@@ -313,8 +313,8 @@ async function buildStaticPages(onProgress = null) {
           let revalidate, getStaticPaths;
           if (pageFunctionsPath) {
             const module = await importModule(pageFunctionsPath);
-            getStaticPaths = module.getStaticPaths;
-            revalidate = module.revalidate;
+            getStaticPaths = module.getStaticPaths || module.default?.getStaticPaths;
+            revalidate = module.revalidate || module.default?.revalidate;
           }
           const isLocalPage =
             pagePath && path.dirname(pagePath) === dynamicPath;
@@ -421,8 +421,8 @@ async function buildStaticPages(onProgress = null) {
           let revalidate, getStaticPaths;
           if (pageFunctionsPath) {
             const module = await importModule(pageFunctionsPath);
-            getStaticPaths = module.getStaticPaths;
-            revalidate = module.revalidate;
+            getStaticPaths = module.getStaticPaths || module.default?.getStaticPaths;
+            revalidate = module.revalidate || module.default?.revalidate;
           }
           const isLocalPage =
             pagePath && path.dirname(pagePath) === dynamicPath;
@@ -548,8 +548,9 @@ async function buildStaticPages(onProgress = null) {
           let revalidate;
           if (pageFunctionsPath) {
             const module = await importModule(pageFunctionsPath);
-            getStaticPaths = module.getStaticPaths;
-            revalidate = module.revalidate;
+            const defMod = module.default?.default ? module.default.default : module.default;
+            getStaticPaths = module.getStaticPaths || defMod?.getStaticPaths;
+            revalidate = module.revalidate || defMod?.revalidate;
           }
           const { getLayoutFunctionsPath } = require("./layout-functions");
           const lfPath = getLayoutFunctionsPath(dynamicPath);
@@ -675,8 +676,9 @@ async function buildStaticPages(onProgress = null) {
             let getStaticPaths;
             if (pageFunctionsPath) {
               const module = await importModule(pageFunctionsPath);
-              getStaticPaths = module.getStaticPaths;
-              revalidate = module.revalidate;
+              const defMod = module.default?.default ? module.default.default : module.default;
+              getStaticPaths = module.getStaticPaths || defMod?.getStaticPaths;
+              revalidate = module.revalidate || defMod?.revalidate;
             }
             const isLocalPage =
               pagePath && path.dirname(pagePath) === dynamicPath;
@@ -786,7 +788,7 @@ async function buildStaticPages(onProgress = null) {
     if (pageFunctionsPath) {
       try {
         const module = await importModule(pageFunctionsPath);
-        revalidate = module.revalidate;
+        revalidate = module.revalidate || module.default?.revalidate;
       } catch (e) {}
     }
 
@@ -950,9 +952,10 @@ async function buildStaticPages(onProgress = null) {
 
         if (pageFunctionsPath) {
           const pageFunctionsModule = await importModule(pageFunctionsPath);
-          const getProps = pageFunctionsModule.getProps;
-          revalidate = pageFunctionsModule.revalidate;
-          const rawTags = pageFunctionsModule.getCacheTags ?? pageFunctionsModule.default?.getCacheTags;
+          const defMod = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
+          const getProps = pageFunctionsModule.getProps || defMod?.getProps;
+          revalidate = pageFunctionsModule.revalidate || defMod?.revalidate;
+          const rawTags = pageFunctionsModule.getCacheTags ?? defMod?.getCacheTags;
           if (typeof rawTags === "function") {
             try {
               cacheTags = await rawTags(params);
@@ -1311,11 +1314,12 @@ async function buildStaticPage(reqPath, isDynamic = null) {
       let pageFunctionsProps;
       if (pageFunctionsPath) {
         const pageFunctionsModule = await importModule(pageFunctionsPath);
-        const getProps = pageFunctionsModule.getProps;
-        revalidate = pageFunctionsModule.revalidate;
+        const defMod = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
+        const getProps = pageFunctionsModule.getProps || defMod?.getProps;
+        revalidate = pageFunctionsModule.revalidate || defMod?.revalidate;
         if (isDynamic && (isDynamic.value = await isDynamicRoute(revalidate)))
           return;
-        const rawTags = pageFunctionsModule.getCacheTags ?? pageFunctionsModule.default?.getCacheTags;
+        const rawTags = pageFunctionsModule.getCacheTags ?? defMod?.getCacheTags;
         if (typeof rawTags === "function") {
           try {
             cacheTags = await rawTags(dParams);
@@ -1509,5 +1513,6 @@ module.exports = {
   getStaticPaths,
   getStaticMetadata,
   getStaticLayouts,
+  isDynamicRoute,
 };
 

package/dinou/core/get-jsx.js

@@ -128,7 +128,8 @@ async function getJSX(
         );
         if (pageFunctionsPath) {
           const pageFunctionsModule = await importModule(pageFunctionsPath);
-          const getProps = pageFunctionsModule.getProps;
+          const defaultExport = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
+          const getProps = pageFunctionsModule.getProps || defaultExport?.getProps;
           pageFunctionsProps = await getProps?.(dParams ?? {});
           props = { ...props, ...(pageFunctionsProps ?? {}) };
         }
@@ -164,7 +165,8 @@ async function getJSX(
       );
       if (pageFunctionsPath) {
         const pageFunctionsModule = await importModule(pageFunctionsPath);
-        const getProps = pageFunctionsModule.getProps;
+        const defaultExport = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
+        const getProps = pageFunctionsModule.getProps || defaultExport?.getProps;
         pageFunctionsProps = await getProps?.(dynamicParams);
         props = { ...props, ...(pageFunctionsProps ?? {}) };
       }

package/dinou/core/handler.js

@@ -226,18 +226,20 @@ async function resolvePageFunctionsConfig(pagePath, reqSegments, queryObj, dynam
       const isPpr = await resolvePprForRoute(pagePath, pageFunctionsModule, reqSegments, queryObj);
 
       if (pageFunctionsModule) {
+        const defaultExport = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
         const resolvedAllowISG =
           typeof pageFunctionsModule.allowISG === "function"
             ? await pageFunctionsModule.allowISG()
-            : typeof pageFunctionsModule.default?.allowISG === "function"
-            ? await pageFunctionsModule.default.allowISG()
-            : (pageFunctionsModule.allowISG ?? pageFunctionsModule.default?.allowISG ?? true);
+            : typeof defaultExport?.allowISG === "function"
+            ? await defaultExport.allowISG()
+            : (pageFunctionsModule.allowISG ?? defaultExport?.allowISG ?? true);
 
+        const getStaticPathsFn = pageFunctionsModule.getStaticPaths || defaultExport?.getStaticPaths;
         let staticPathsSet = null;
-        if (pageFunctionsModule.getStaticPaths) {
-          const paths = await (typeof pageFunctionsModule.getStaticPaths === "function"
-            ? pageFunctionsModule.getStaticPaths()
-            : pageFunctionsModule.getStaticPaths);
+        if (getStaticPathsFn) {
+          const paths = await (typeof getStaticPathsFn === "function"
+            ? getStaticPathsFn()
+            : getStaticPathsFn);
           if (Array.isArray(paths)) {
             staticPathsSet = new Set(
               paths.map((pathObj) => {
@@ -253,12 +255,15 @@ async function resolvePageFunctionsConfig(pagePath, reqSegments, queryObj, dynam
           }
         }
 
-        let revalidateVal = typeof pageFunctionsModule.revalidate === "function"
-          ? await pageFunctionsModule.revalidate()
-          : pageFunctionsModule.revalidate;
+        let revalidateVal =
+          typeof pageFunctionsModule.revalidate === "function"
+            ? await pageFunctionsModule.revalidate()
+            : typeof defaultExport?.revalidate === "function"
+            ? await defaultExport.revalidate()
+            : (pageFunctionsModule.revalidate ?? defaultExport?.revalidate);
 
         const isDynamic = typeof revalidateVal === "number" && revalidateVal < 1;
-        const rawTags = pageFunctionsModule.getCacheTags ?? pageFunctionsModule.default?.getCacheTags;
+        const rawTags = pageFunctionsModule.getCacheTags ?? defaultExport?.getCacheTags;
         let tagsVal = [];
         if (typeof rawTags === "function") {
           try {
@@ -273,7 +278,7 @@ async function resolvePageFunctionsConfig(pagePath, reqSegments, queryObj, dynam
         cachedConfig = {
           allowISG: resolvedAllowISG,
           staticPathsSet,
-          validateParams: pageFunctionsModule.validateParams || null,
+          validateParams: pageFunctionsModule.validateParams || defaultExport?.validateParams || null,
           isDynamic,
           revalidate: revalidateVal,
           tags: tagsVal,
@@ -344,6 +349,7 @@ async function resolvePageFunctionsConfig(pagePath, reqSegments, queryObj, dynam
     revalidate: cachedConfig?.revalidate,
     tags: cachedConfig?.tags || [],
     ppr: Boolean(cachedConfig?.ppr),
+    staticPathsSet: cachedConfig?.staticPathsSet || null,
   };
 }
 
@@ -2291,6 +2297,7 @@ async function handleRequest(request, platformContext = {}) {
 module.exports = {
   handleRequest,
   WebResponseBridge,
+  resolvePageFunctionsConfig,
 };
 module.exports.default = handleRequest;
 

package/dinou/core/layout-functions.js

@@ -51,9 +51,10 @@ async function getLayoutProps(layoutPath, dParams = {}) {
 
   try {
     const mod = await importModule(layoutFunctionsPath);
+    const defaultExport = mod.default?.default ? mod.default.default : mod.default;
     const getPropsFn =
       mod.getProps ||
-      mod.default?.getProps ||
+      defaultExport?.getProps ||
       (typeof mod.default === "function" ? mod.default : null);
     if (typeof getPropsFn === "function") {
       const res = await getPropsFn(dParams);
@@ -106,14 +107,15 @@ async function resolveLayoutFunctionsConfig(layoutPath, dParams = {}) {
         }
       }
     }
+    const defaultExport = mod.default?.default ? mod.default.default : mod.default;
     const resolvedAllowISG =
       typeof mod.allowISG === "function"
         ? await mod.allowISG()
-        : typeof mod.default?.allowISG === "function"
-        ? await mod.default.allowISG()
-        : (mod.allowISG ?? mod.default?.allowISG ?? true);
+        : typeof defaultExport?.allowISG === "function"
+        ? await defaultExport.allowISG()
+        : (mod.allowISG ?? defaultExport?.allowISG ?? true);
 
-    const getStaticPathsFn = mod.getStaticPaths || mod.default?.getStaticPaths;
+    const getStaticPathsFn = mod.getStaticPaths || defaultExport?.getStaticPaths;
     let staticPathsSet = null;
     if (getStaticPathsFn) {
       const paths = await (typeof getStaticPathsFn === "function" ? getStaticPathsFn() : getStaticPathsFn);
@@ -133,13 +135,13 @@ async function resolveLayoutFunctionsConfig(layoutPath, dParams = {}) {
     const revalidateVal =
       typeof mod.revalidate === "function"
         ? await mod.revalidate()
-        : typeof mod.default?.revalidate === "function"
-        ? await mod.default.revalidate()
-        : (mod.revalidate ?? mod.default?.revalidate);
+        : typeof defaultExport?.revalidate === "function"
+        ? await defaultExport.revalidate()
+        : (mod.revalidate ?? defaultExport?.revalidate);
 
     const isDynamic = typeof revalidateVal === "number" && revalidateVal < 1;
 
-    const rawTags = mod.getCacheTags ?? mod.default?.getCacheTags;
+    const rawTags = mod.getCacheTags ?? defaultExport?.getCacheTags;
     let tagsVal = [];
     if (typeof rawTags === "function") {
       try {
@@ -151,10 +153,10 @@ async function resolveLayoutFunctionsConfig(layoutPath, dParams = {}) {
       tagsVal = rawTags;
     }
 
-    const validateParamsFn = mod.validateParams || mod.default?.validateParams;
+    const validateParamsFn = mod.validateParams || defaultExport?.validateParams;
     const getPropsFn =
       mod.getProps ||
-      mod.default?.getProps ||
+      defaultExport?.getProps ||
       (typeof mod.default === "function" ? mod.default : null);
 
     return {

package/dinou/core/parse-exports.js

@@ -153,6 +153,46 @@ function parsePprConfigWithBabel(code) {
           }
         }
       },
+      ExportDefaultDeclaration(p) {
+        function checkObject(objNode) {
+          if (!objNode || objNode.type !== "ObjectExpression") return;
+          for (const prop of objNode.properties || []) {
+            const key = prop.key?.name || prop.key?.value;
+            if (key === "ppr") {
+              const val = prop.value;
+              if (val?.type === "BooleanLiteral") pprValue = val.value;
+              else if (val?.type === "StringLiteral") pprValue = val.value !== "false";
+              else if (val?.type === "Identifier") pprValue = val.name === "true";
+              else if (val?.type === "ArrowFunctionExpression" || val?.type === "FunctionExpression") {
+                if (val.body?.type === "BooleanLiteral") pprValue = val.body.value;
+                else if (val.body?.type === "BlockStatement") {
+                  for (const s of val.body.body || []) {
+                    if (s.type === "ReturnStatement" && s.argument) {
+                      if (s.argument.type === "BooleanLiteral") pprValue = s.argument.value;
+                      else if (s.argument.type === "StringLiteral") pprValue = s.argument.value !== "false";
+                      else if (s.argument.type === "Identifier") pprValue = s.argument.name === "true";
+                    }
+                  }
+                }
+                if (pprValue === null) pprValue = true;
+              } else {
+                pprValue = true;
+              }
+            }
+          }
+        }
+
+        const decl = p.node.declaration;
+        if (!decl) return;
+        if (decl.type === "ObjectExpression") {
+          checkObject(decl);
+        } else if (decl.type === "Identifier") {
+          const binding = p.scope?.getBinding(decl.name);
+          if (binding && binding.path?.node?.init?.type === "ObjectExpression") {
+            checkObject(binding.path.node.init);
+          }
+        }
+      },
     });
 
     return pprValue;
@@ -172,6 +212,11 @@ function parsePprConfigWithBabel(code) {
       const val = matchArrow[1] || matchArrow[2];
       return val === "true";
     }
+    const matchProp = code.match(/\bppr\s*:\s*(true|false|"[^"]*"|'[^']*')/);
+    if (matchProp) {
+      const val = matchProp[1].trim();
+      return val !== "false" && val !== '"false"' && val !== "'false'";
+    }
     return null;
   }
 }
@@ -229,7 +274,7 @@ function parsePprConfig(code) {
           }
         }
       }
-      return null;
+      // If SWC didn't find named ppr, fall through to Babel for default export & scope analysis
     } catch (e) {
       // Fallback to Babel
     }

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

@@ -17,119 +17,6 @@ function isClientComponent(type) {
   );
 }
 
-function renderJSXToClientJSX(jsx, key = null) {
-  if (
-    typeof jsx === "string" ||
-    typeof jsx === "number" ||
-    typeof jsx === "boolean" ||
-    typeof jsx === "function" ||
-    typeof jsx === "undefined" ||
-    jsx == null
-  ) {
-    return jsx;
-  } else if (Array.isArray(jsx)) {
-    return jsx.map((child) =>
-      renderJSXToClientJSX(
-        child,
-        child?.key ?? null
-      )
-    );
-  } else if (typeof jsx === "symbol") {
-    if (jsx === Symbol.for("react.fragment")) {
-      // Handle Fragment as an empty props object
-      return {
-        $$typeof: Symbol.for("react.transitional.element"),
-        type: Symbol.for("react.fragment"),
-        props: {},
-        key: key,
-      };
-    }
-    console.error("Unsupported symbol:", String(jsx));
-    throw new Error(`Unsupported symbol: ${String(jsx)}`);
-  } else if (typeof jsx === "object") {
-    if (jsx.$$typeof === Symbol.for("react.transitional.element")) {
-      if (
-        jsx.type === Symbol.for("react.fragment") ||
-        jsx.type === Symbol.for("react.suspense") ||
-        jsx.type === Symbol.for("react.view_transition") ||
-        typeof jsx.type === "string"
-      ) {
-        return {
-          ...jsx,
-          props: renderJSXToClientJSX(jsx.props),
-          key: key ?? jsx.key,
-        };
-      } else if (typeof jsx.type === "function") {
-        const Component = jsx.type;
-        const props = jsx.props;
-        if (isClientComponent(Component)) {
-          return {
-            ...jsx,
-            $$typeof: Symbol.for("react.transitional.element"),
-            type: Component,
-            props: renderJSXToClientJSX(props),
-            key: key ?? jsx.key,
-          };
-        } else {
-          // Server component: execute and process
-          const returnedJsx = Component(props);
-          return renderJSXToClientJSX(returnedJsx, key ?? jsx.key);
-        }
-      } else if (
-        typeof jsx.type === "object" &&
-        jsx.type !== null &&
-        jsx.type.$$typeof === Symbol.for("react.forward_ref")
-      ) {
-        if (isClientComponent(jsx.type)) {
-          return {
-            ...jsx,
-            $$typeof: Symbol.for("react.transitional.element"),
-            type: jsx.type,
-            props: renderJSXToClientJSX(jsx.props),
-            key: key ?? jsx.key,
-          };
-        } else {
-          const returnedJsx = jsx.type.render(jsx.props, jsx.ref);
-          return renderJSXToClientJSX(returnedJsx, key ?? jsx.key);
-        }
-      } else if (
-        typeof jsx.type === "object" &&
-        jsx.type !== null &&
-        jsx.type.$$typeof === Symbol.for("react.memo")
-      ) {
-        if (isClientComponent(jsx.type)) {
-          return {
-            ...jsx,
-            $$typeof: Symbol.for("react.transitional.element"),
-            type: jsx.type,
-            props: renderJSXToClientJSX(jsx.props),
-            key: key ?? jsx.key,
-          };
-        } else {
-          const innerComp = jsx.type.type;
-          const returnedJsx = typeof innerComp === "function" ? innerComp(jsx.props) : null;
-          return renderJSXToClientJSX(returnedJsx, key ?? jsx.key);
-        }
-      } else {
-        console.error("Unsupported JSX type:", jsx.type);
-        throw new Error("Unsupported JSX type");
-      }
-    } else if (jsx instanceof Promise) {
-      return jsx;
-    } else {
-      // Process object props (e.g., { className: "foo" })
-      return Object.fromEntries(
-        Object.entries(jsx).map(([propName, value]) => [
-          propName,
-          renderJSXToClientJSX(value),
-        ])
-      );
-    }
-  } else {
-    throw new Error("Not implemented");
-  }
-}
-
 async function asyncRenderJSXToClientJSX(jsx, key = null) {
   if (
     typeof jsx === "string" ||
@@ -290,6 +177,5 @@ async function asyncRenderJSXToClientJSX(jsx, key = null) {
 }
 
 module.exports = {
-  renderJSXToClientJSX,
   asyncRenderJSXToClientJSX,
 };

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

@@ -10,6 +10,8 @@ async function resolveModulePpr(mod) {
       ? mod.ppr
       : mod.default?.ppr !== undefined
       ? mod.default.ppr
+      : mod.default?.default?.ppr !== undefined
+      ? mod.default.default.ppr
       : undefined;
 
   if (raw === undefined || raw === null) return null;

package/dinou/esbuild/helpers-esbuild/strip-namespace.mjs

@@ -1,9 +1,9 @@
-export function stripNamespace(p) {
-  if (!p) return "";
-  if (/^[a-zA-Z]:[/\\]/.test(p)) {
-    return p;
-  }
-  return p.replace(/^[a-zA-Z0-9_-]+:/, "");
-}
-
-export default stripNamespace;
+export function stripNamespace(p) {
+  if (!p) return "";
+  if (/^[a-zA-Z]:[/\\]/.test(p)) {
+    return p;
+  }
+  return p.replace(/^[a-zA-Z0-9_-]+:/, "");
+}
+
+export default stripNamespace;

package/dinou/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinou-ejected",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "main": "index.js",
   "private": true,
   "exports": {