dinou 6.1.1 → 7.1.0

package/dinou/core/get-jsx.js

@@ -1,4 +1,5 @@
 const path = require("path");
+const { pathToFileURL } = require("url");
 const { existsSync } = require("./vfs");
 const React = require("react");
 const {
@@ -6,6 +7,7 @@ const {
 } = require("./get-file-path-and-dynamic-params");
 const importModule = require("./import-module");
 const { asyncRenderJSXToClientJSX } = require("./render-jsx-to-client-jsx");
+const { getLayoutProps } = require("./layout-functions");
 
 async function getJSX(
   reqPath,
@@ -13,74 +15,148 @@ async function getJSX(
   isNotFound = null,
   isDevelopment = false,
   forceNotFound = false,
+  options = {},
 ) {
   const srcFolder = path.resolve(process.cwd(), "src");
   const reqSegments = reqPath.split("/").filter(Boolean);
-  const hasRouterSyntax = reqSegments.some((seg) => {
-    const isGroup = seg.startsWith("(") && seg.endsWith(")");
-
-    const isDynamic = seg.startsWith("[") && seg.endsWith("]");
-    const isSlot = seg.startsWith("@");
-
-    return isGroup || isDynamic || isSlot;
-  });
-
-  let pagePath;
-  if (!hasRouterSyntax) {
-    const folderPath = path.join(srcFolder, ...reqSegments);
-    if (existsSync(folderPath)) {
-      for (const ext of [".tsx", ".ts", ".jsx", ".js"]) {
-        const candidatePath = path.join(folderPath, `page${ext}`);
-        if (existsSync(candidatePath)) {
-          pagePath = candidatePath;
-          break;
-        }
+  const normalizedReqPath =
+    "/" + reqSegments.join("/") + (reqSegments.length > 0 ? "/" : "");
+
+  let jsx;
+  let pageFunctionsProps;
+
+  // 1. Segmented handling for Layout: If only the layout is requested
+  if (options && options.segment === "layout") {
+    let { DinouPageSlot } = require("./slot.js");
+    if (
+      typeof DinouPageSlot === "function" &&
+      DinouPageSlot.$$typeof !== Symbol.for("react.client.reference")
+    ) {
+      const slotPath = path.resolve(__dirname, "slot.js");
+      const fileUrl = pathToFileURL(slotPath).href;
+      let regFn = null;
+      try {
+        const pkg = require("react-server-dom-webpack/server");
+        regFn = pkg.registerClientReference;
+      } catch (e) {}
+      if (!regFn) {
+        try {
+          const pkg = require("@roggc/react-server-dom-esm/server.node.js");
+          regFn = pkg.registerClientReference;
+        } catch (e) {}
+      }
+      if (regFn) {
+        DinouPageSlot = regFn(DinouPageSlot, fileUrl, "DinouPageSlot");
+      } else {
+        Object.defineProperties(DinouPageSlot, {
+          $$typeof: { value: Symbol.for("react.client.reference") },
+          $$id: { value: fileUrl + "#DinouPageSlot" },
+        });
       }
     }
-  }
-  let dynamicParams = {};
+    jsx = React.createElement(DinouPageSlot);
+  } else {
+    const hasRouterSyntax = reqSegments.some((seg) => {
+      const isGroup = seg.startsWith("(") && seg.endsWith(")");
 
-  if (!pagePath) {
-    const [filePath, dParams] = getFilePathAndDynamicParams(
-      reqSegments,
-      query,
-      srcFolder,
-    );
-    pagePath = filePath;
-    dynamicParams = dParams ?? {};
-  }
+      const isDynamic = seg.startsWith("[") && seg.endsWith("]");
+      const isSlot = seg.startsWith("@");
+      const isPrivate = seg.startsWith("_");
 
-  let jsx;
-  let pageFunctionsProps;
+      return isGroup || isDynamic || isSlot || isPrivate;
+    });
 
-  if (!pagePath || forceNotFound) {
-    if (isNotFound) isNotFound.value = true;
-    const [notFoundPath, dParams] = getFilePathAndDynamicParams(
-      reqSegments,
-      query,
-      srcFolder,
-      "not_found",
-      true,
-      false,
-    );
-    if (!notFoundPath) {
-      jsx = React.createElement(
-        "div",
-        null,
-        `Page not found: no "page" file found for "${reqPath}"`,
+    let pagePath;
+    let folderPath = "";
+    if (!hasRouterSyntax) {
+      folderPath = path.join(srcFolder, ...reqSegments);
+      if (existsSync(folderPath)) {
+        for (const ext of [".tsx", ".ts", ".jsx", ".js"]) {
+          const candidatePath = path.join(folderPath, `page${ext}`);
+          if (existsSync(candidatePath)) {
+            pagePath = candidatePath;
+            break;
+          }
+        }
+      }
+    }
+    let dynamicParams = {};
+
+    if (!pagePath) {
+      const [filePath, dParams] = getFilePathAndDynamicParams(
+        reqSegments,
+        query,
+        srcFolder,
+      );
+      pagePath = filePath;
+      dynamicParams = dParams ?? {};
+    }
+
+    if (!pagePath || forceNotFound) {
+      if (isNotFound) isNotFound.value = true;
+      const [notFoundPath, dParams] = getFilePathAndDynamicParams(
+        reqSegments,
+        query,
+        srcFolder,
+        "not_found",
+        true,
+        false,
       );
+      if (!notFoundPath) {
+        jsx = React.createElement(
+          "div",
+          null,
+          `Page not found: no "page" file found for "${normalizedReqPath}"`,
+        );
+      } else {
+        const pageModule = await importModule(notFoundPath);
+        const Page = pageModule.default ?? pageModule;
+        let props = {
+          params: dParams ?? {},
+        };
+        const notFoundDir = path.dirname(notFoundPath);
+
+        const [pageFunctionsPath] = getFilePathAndDynamicParams(
+          reqSegments,
+          query,
+          notFoundDir,
+          "page_functions",
+          true,
+          true,
+          undefined,
+          reqSegments.length,
+        );
+        if (pageFunctionsPath) {
+          const pageFunctionsModule = await importModule(pageFunctionsPath);
+          const defaultExport = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
+          const getProps = pageFunctionsModule.getProps || defaultExport?.getProps;
+          pageFunctionsProps = await getProps?.(dParams ?? {});
+          props = { ...props, ...(pageFunctionsProps ?? {}) };
+        }
+
+        jsx = React.createElement(Page, props);
+        const noLayoutNotFoundPath = path.join(
+          notFoundDir,
+          `no_layout_not_found`,
+        );
+        if (existsSync(noLayoutNotFoundPath)) {
+          return jsx;
+        }
+      }
     } else {
-      const pageModule = await importModule(notFoundPath);
+      if (isNotFound) isNotFound.value = false;
+      const pageModule = await importModule(pagePath);
       const Page = pageModule.default ?? pageModule;
+
       let props = {
-        params: dParams ?? {},
+        params: dynamicParams,
       };
-      const notFoundDir = path.dirname(notFoundPath);
 
+      const pageFolder = path.dirname(pagePath);
       const [pageFunctionsPath] = getFilePathAndDynamicParams(
         reqSegments,
         query,
-        notFoundDir,
+        pageFolder,
         "page_functions",
         true,
         true,
@@ -89,48 +165,19 @@ async function getJSX(
       );
       if (pageFunctionsPath) {
         const pageFunctionsModule = await importModule(pageFunctionsPath);
-        const getProps = pageFunctionsModule.getProps;
-        pageFunctionsProps = await getProps?.(dParams ?? {});
-        props = { ...props, ...(pageFunctionsProps?.page ?? {}) };
+        const defaultExport = pageFunctionsModule.default?.default ? pageFunctionsModule.default.default : pageFunctionsModule.default;
+        const getProps = pageFunctionsModule.getProps || defaultExport?.getProps;
+        pageFunctionsProps = await getProps?.(dynamicParams);
+        props = { ...props, ...(pageFunctionsProps ?? {}) };
       }
 
       jsx = React.createElement(Page, props);
-      const noLayoutNotFoundPath = path.join(
-        notFoundDir,
-        `no_layout_not_found`,
-      );
-      if (existsSync(noLayoutNotFoundPath)) {
-        return jsx;
-      }
     }
-  } else {
-    if (isNotFound) isNotFound.value = false;
-    const pageModule = await importModule(pagePath);
-    const Page = pageModule.default ?? pageModule;
-
-    let props = {
-      params: dynamicParams,
-    };
 
-    const pageFolder = path.dirname(pagePath);
-    const [pageFunctionsPath] = getFilePathAndDynamicParams(
-      reqSegments,
-      query,
-      pageFolder,
-      "page_functions",
-      true,
-      true,
-      undefined,
-      reqSegments.length,
-    );
-    if (pageFunctionsPath) {
-      const pageFunctionsModule = await importModule(pageFunctionsPath);
-      const getProps = pageFunctionsModule.getProps;
-      pageFunctionsProps = await getProps?.(dynamicParams);
-      props = { ...props, ...(pageFunctionsProps?.page ?? {}) };
+    // 2. Segmented handling for Page: If only the page is requested, return without layouts
+    if (options && options.segment === "page") {
+      return jsx;
     }
-
-    jsx = React.createElement(Page, props);
   }
 
   if (
@@ -172,14 +219,26 @@ async function getJSX(
       )[0];
       const Layout = layoutModule.default ?? layoutModule;
       const updatedSlots = {};
-      for (const [slotName, slotElement] of Object.entries(slots)) {
+      for (const [slotName, slotValue] of Object.entries(slots)) {
         let updatedSlotElement;
+        const slotFilePath = slotValue?.slotPath || slotValue?.props?.__modulePath;
+        const slotParams = slotValue?.slotParams || slotValue?.props?.params || {};
         try {
-          await asyncRenderJSXToClientJSX(slotElement);
-          updatedSlotElement = slotElement;
+          let elementToRender;
+          if (slotValue && slotValue.slotPath) {
+            const slotModule = await importModule(slotValue.slotPath);
+            const Slot = slotModule.default ?? slotModule;
+            elementToRender = React.createElement(Slot, {
+              params: slotParams,
+              key: slotName,
+              __modulePath: slotValue.slotPath,
+            });
+          } else {
+            elementToRender = slotValue;
+          }
+          await asyncRenderJSXToClientJSX(elementToRender);
+          updatedSlotElement = elementToRender;
         } catch (e) {
-          const slotFilePath = slotElement.props?.__modulePath;
-
           if (slotFilePath) {
             const realSlotFolder = path.dirname(slotFilePath);
 
@@ -226,11 +285,31 @@ async function getJSX(
           updatedSlots[slotName] = updatedSlotElement;
         }
       }
-      let props = { params: dParams, ...updatedSlots };
-      if (index === layouts.length - 1 || resetLayoutPath) {
-        props = { ...props, ...(pageFunctionsProps?.layout ?? {}) };
+      const layoutProps = await getLayoutProps(layoutPath, dParams);
+      let props = { params: dParams, ...updatedSlots, ...(layoutProps ?? {}) };
+      try {
+        const testElement = React.createElement(Layout, props, null);
+        await asyncRenderJSXToClientJSX(testElement);
+        jsx = React.createElement(Layout, props, jsx);
+      } catch (layoutErr) {
+        console.warn(
+          `[Dinou] Layout ${layoutPath} failed during render, isolating layout error:`,
+          layoutErr?.message || layoutErr
+        );
+        const { getErrorJSX } = require("./get-error-jsx");
+        const serializedError = {
+          message: layoutErr.message || "Unknown Error",
+          name: layoutErr.name || "Error",
+          stack: isDevelopment ? layoutErr.stack : undefined,
+        };
+        jsx = await getErrorJSX(
+          reqPath,
+          query,
+          serializedError,
+          isDevelopment,
+          { segment: "page" }
+        );
       }
-      jsx = React.createElement(Layout, props, jsx);
       if (resetLayoutPath) {
         break;
       }