dinou 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [2.2.0]
+
+### Fixed
+
+- buildStaticPages - collectPages.
+- getFilePathAndDynamicParams.
+
+### Added
+
+- Cookies support. Now getProps receive params, query, and cookies as parameters (function getProps(params, query, cookies)).
+
+## [2.1.1]
+
+### Fixed
+
+- Warning in Rollup about serverFunctionProxy.
+
 ## [2.1.0]
 
 ### Added

package/dinou/build-static-pages.js

@@ -26,7 +26,7 @@ async function buildStaticPages() {
     mkdirSync(distFolder, { recursive: true });
   }
 
-  function collectPages(currentPath, segments = []) {
+  function collectPages(currentPath, segments = [], params = {}) {
     const entries = readdirSync(currentPath, { withFileTypes: true });
     const pages = [];
 
@@ -74,17 +74,18 @@ async function buildStaticPages() {
             console.log(
               `Found optional catch-all route: ${
                 segments.join("/") ?? ""
-              }/[${paramName}]`
+              }/[[...${paramName}]]`
             );
             try {
               if (getStaticPaths) {
                 const paths = getStaticPaths();
                 for (const path of paths) {
-                  pages.push({
-                    path: dynamicPath,
-                    segments: [...segments, ...path],
-                    params: { [paramName]: path },
-                  });
+                  pages.push(
+                    ...collectPages(dynamicPath, [...segments, ...path], {
+                      ...params,
+                      [paramName]: path,
+                    })
+                  );
                 }
               }
             } catch (err) {
@@ -125,17 +126,18 @@ async function buildStaticPages() {
             console.log(
               `Found catch-all route: ${
                 segments.join("/") ?? ""
-              }/[${paramName}]`
+              }/[...${paramName}]`
             );
             try {
               if (getStaticPaths) {
                 const paths = getStaticPaths();
                 for (const path of paths) {
-                  pages.push({
-                    path: dynamicPath,
-                    segments: [...segments, ...path],
-                    params: { [paramName]: path },
-                  });
+                  pages.push(
+                    ...collectPages(dynamicPath, [...segments, ...path], {
+                      ...params,
+                      [paramName]: path,
+                    })
+                  );
                 }
               }
             } catch (err) {
@@ -177,17 +179,18 @@ async function buildStaticPages() {
             console.log(
               `Found optional dynamic route: ${
                 segments.join("/") ?? ""
-              }/[${paramName}]`
+              }/[[${paramName}]]`
             );
             try {
               if (getStaticPaths) {
                 const paths = getStaticPaths();
                 for (const path of paths) {
-                  pages.push({
-                    path: dynamicPath,
-                    segments: [...segments, path],
-                    params: { [paramName]: path },
-                  });
+                  pages.push(
+                    ...collectPages(dynamicPath, [...segments, path], {
+                      ...params,
+                      [paramName]: path,
+                    })
+                  );
                 }
               }
             } catch (err) {
@@ -232,11 +235,12 @@ async function buildStaticPages() {
               if (getStaticPaths) {
                 const paths = getStaticPaths();
                 for (const path of paths) {
-                  pages.push({
-                    path: dynamicPath,
-                    segments: [...segments, path],
-                    params: { [paramName]: path },
-                  });
+                  pages.push(
+                    ...collectPages(dynamicPath, [...segments, path], {
+                      ...params,
+                      [paramName]: path,
+                    })
+                  );
                 }
               }
             } catch (err) {
@@ -245,10 +249,11 @@ async function buildStaticPages() {
           }
         } else if (!entry.name.startsWith("@")) {
           pages.push(
-            ...collectPages(path.join(currentPath, entry.name), [
-              ...segments,
-              entry.name,
-            ])
+            ...collectPages(
+              path.join(currentPath, entry.name),
+              [...segments, entry.name],
+              params
+            )
           );
         }
       }
@@ -262,7 +267,8 @@ async function buildStaticPages() {
       true,
       true,
       undefined,
-      segments.length
+      segments.length,
+      params
     );
     const [pageFunctionsPath] = getFilePathAndDynamicParams(
       segments,
@@ -326,7 +332,7 @@ async function buildStaticPages() {
         const pageFunctionsModule = require(pageFunctionsPath);
         const getProps = pageFunctionsModule.getProps;
         revalidate = pageFunctionsModule.revalidate;
-        pageFunctionsProps = await getProps?.(params);
+        pageFunctionsProps = await getProps?.(params, {}, {});
         props = { ...props, ...(pageFunctionsProps?.page ?? {}) };
       }
 
@@ -504,7 +510,7 @@ async function buildStaticPage(reqPath) {
       const pageFunctionsModule = require(pageFunctionsPath);
       const getProps = pageFunctionsModule.getProps;
       revalidate = pageFunctionsModule.revalidate;
-      pageFunctionsProps = await getProps?.(dParams);
+      pageFunctionsProps = await getProps?.(dParams, {}, {});
       props = { ...props, ...(pageFunctionsProps?.page ?? {}) };
     }
 

package/dinou/get-file-path-and-dynamic-params.js

@@ -58,13 +58,14 @@ function getFilePathAndDynamicParams(
             if (!accumulative) return [candidatePath, dParams];
             const slots = getSlots(currentPath, reqSegments, query);
             accumulate.push([candidatePath, dParams, slots]);
-            return accumulate;
-          }
-          if (accumulative) {
-            const slots = getSlots(currentPath, reqSegments, query);
-            accumulate.push([candidatePath, dParams, slots]);
+            if (finalDestination) return accumulate;
           } else {
-            foundInCurrentPath = candidatePath;
+            if (accumulative) {
+              const slots = getSlots(currentPath, reqSegments, query);
+              accumulate.push([candidatePath, dParams, slots]);
+            } else {
+              foundInCurrentPath = candidatePath;
+            }
           }
         }
       }
@@ -76,13 +77,14 @@ function getFilePathAndDynamicParams(
           if (!accumulative) return [candidatePath, dParams];
           const slots = getSlots(currentPath, reqSegments, query);
           accumulate.push([candidatePath, dParams, slots]);
-          return accumulate;
-        }
-        if (accumulative) {
-          const slots = getSlots(currentPath, reqSegments, query);
-          accumulate.push([candidatePath, dParams, slots]);
+          if (finalDestination) return accumulate;
         } else {
-          foundInCurrentPath = candidatePath;
+          if (accumulative) {
+            const slots = getSlots(currentPath, reqSegments, query);
+            accumulate.push([candidatePath, dParams, slots]);
+          } else {
+            foundInCurrentPath = candidatePath;
+          }
         }
       }
     }

package/dinou/get-jsx.js

@@ -5,7 +5,7 @@ const {
   getFilePathAndDynamicParams,
 } = require("./get-file-path-and-dynamic-params");
 
-async function getJSX(reqPath, query) {
+async function getJSX(reqPath, query, cookies) {
   const srcFolder = path.resolve(process.cwd(), "src");
   const reqSegments = reqPath.split("/").filter(Boolean);
   const folderPath = path.join(srcFolder, ...reqSegments);
@@ -55,13 +55,13 @@ async function getJSX(reqPath, query) {
         params: dParams ?? {},
         query,
       });
-      
+
       const notFoundDir = path.dirname(notFoundPath);
       const noLayoutNotFoundPath = path.join(
         notFoundDir,
         `no_layout_not_found`
       );
-      if (existsSync(noLayoutNotFoundPath)) {  
+      if (existsSync(noLayoutNotFoundPath)) {
         return jsx;
       }
     }
@@ -73,7 +73,7 @@ async function getJSX(reqPath, query) {
       params: dynamicParams,
       query,
     };
-    
+
     const pageFolder = path.dirname(pagePath);
     const [pageFunctionsPath] = getFilePathAndDynamicParams(
       reqSegments,
@@ -85,11 +85,10 @@ async function getJSX(reqPath, query) {
       undefined,
       reqSegments.length
     );
-
     if (pageFunctionsPath) {
       const pageFunctionsModule = require(pageFunctionsPath);
       const getProps = pageFunctionsModule.getProps;
-      pageFunctionsProps = await getProps?.(dynamicParams);
+      pageFunctionsProps = await getProps?.(dynamicParams, query, cookies);
       props = { ...props, ...(pageFunctionsProps?.page ?? {}) };
     }
 

package/dinou/get-ssg-jsx-or-jsx.js

@@ -1,11 +1,16 @@
 const getJSX = require("./get-jsx.js");
 const getSSGJSX = require("./get-ssg-jsx.js");
 
-async function getSSGJSXOrJSX(reqPath, query, isDevelopment = false) {
+async function getSSGJSXOrJSX(
+  reqPath,
+  query,
+  cookies = {},
+  isDevelopment = false
+) {
   const result =
-    Object.keys(query).length || isDevelopment
-      ? await getJSX(reqPath, query)
-      : getSSGJSX(reqPath) ?? (await getJSX(reqPath, query));
+    Object.keys(query).length || isDevelopment || Object.keys(cookies).length
+      ? await getJSX(reqPath, query, cookies)
+      : getSSGJSX(reqPath) ?? (await getJSX(reqPath, query, cookies));
   return result;
 }
 

package/dinou/render-app-to-html.js

@@ -1,11 +1,16 @@
 const path = require("path");
 const { spawn } = require("child_process");
 
-function renderAppToHtml(reqPath, paramsString) {
+function renderAppToHtml(reqPath, paramsString, cookiesString = "{}") {
   return new Promise((resolve, reject) => {
     const child = spawn(
       "node",
-      [path.resolve(__dirname, "render-html.js"), reqPath, paramsString],
+      [
+        path.resolve(__dirname, "render-html.js"),
+        reqPath,
+        paramsString,
+        cookiesString,
+      ],
       {
         env: {
           ...process.env,

package/dinou/render-html.js

@@ -133,13 +133,13 @@ function formatErrorHtmlProduction(error) {
   `;
 }
 
-async function renderToStream(reqPath, query) {
+async function renderToStream(reqPath, query, cookies = {}) {
   try {
     const jsx =
-      Object.keys(query).length || isDevelopment
-        ? renderJSXToClientJSX(await getJSX(reqPath, query))
+      Object.keys(query).length || isDevelopment || Object.keys(cookies).length
+        ? renderJSXToClientJSX(await getJSX(reqPath, query, cookies))
         : getSSGJSX(reqPath) ??
-          renderJSXToClientJSX(await getJSX(reqPath, query));
+          renderJSXToClientJSX(await getJSX(reqPath, query, cookies));
 
     const stream = renderToPipeableStream(jsx, {
       onError(error) {
@@ -174,7 +174,7 @@ async function renderToStream(reqPath, query) {
               );
               process.exit(1);
             },
-            bootstrapScripts: ["/error.js"],
+            bootstrapModules: ["/error.js"],
             bootstrapScriptContent: `window.__DINOU_ERROR_MESSAGE__=${JSON.stringify(
               error.message || "Unknown error"
             )};window.__DINOU_ERROR_STACK__=${JSON.stringify(
@@ -218,6 +218,7 @@ async function renderToStream(reqPath, query) {
 
 const reqPath = process.argv[2];
 const query = JSON.parse(process.argv[3]);
+const cookies = JSON.parse(process.argv[4] || "{}");
 
 process.on("uncaughtException", (error) => {
   process.stdout.write(formatErrorHtml(error));
@@ -242,4 +243,4 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 
-renderToStream(reqPath, query);
+renderToStream(reqPath, query, cookies);

package/dinou/server.js

@@ -182,9 +182,10 @@ if (isDevelopment) {
     }
   });
 }
-
+const cookieParser = require("cookie-parser");
+const appUseCookieParser = cookieParser();
 const app = express();
-
+app.use(appUseCookieParser);
 app.use(express.json());
 
 app.use(express.static(path.resolve(process.cwd(), webpackFolder)));
@@ -217,9 +218,12 @@ app.get(/^\/____rsc_payload____\/.*\/?$/, async (req, res) => {
         return readStream.pipe(res);
       }
     }
-
-    const jsx = await getSSGJSXOrJSX(reqPath, { ...req.query }, isDevelopment);
-
+    const jsx = await getSSGJSXOrJSX(
+      reqPath,
+      { ...req.query },
+      { ...req.cookies },
+      isDevelopment
+    );
     const manifest = JSON.parse(
       readFileSync(
         path.resolve(`${webpackFolder}/react-client-manifest.json`),
@@ -273,7 +277,8 @@ app.get(/^\/.*\/?$/, async (req, res) => {
 
     const appHtmlStream = await renderAppToHtml(
       reqPath,
-      JSON.stringify({ ...req.query })
+      JSON.stringify({ ...req.query }),
+      JSON.stringify({ ...req.cookies })
     );
 
     res.setHeader("Content-Type", "text/html");
@@ -305,6 +310,10 @@ app.post("/____server_function____", async (req, res) => {
       return res.status(400).json({ error: "Export is not a function" });
     }
 
+    const context = { req, res };
+    if (fn.length === args.length + 1) {
+      args.push(context);
+    }
     const result = await fn(...args);
 
     if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinou",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Minimal React 19 Framework",
   "main": "index.js",
   "bin": {
@@ -38,6 +38,7 @@
     "chokidar": "^4.0.3",
     "commander": "^14.0.0",
     "concurrently": "^9.2.0",
+    "cookie-parser": "^1.4.7",
     "cross-env": "^7.0.3",
     "css-modules-require-hook": "^4.2.3",
     "dotenv": "^16.5.0",

package/rollup.config.js

@@ -51,7 +51,7 @@ module.exports = async function () {
       entryFileNames: "[name].js",
       chunkFileNames: "[name].js",
     },
-    external: ["/refresh.js", "/__hmr_client__.js"],
+    external: ["/refresh.js", "/__hmr_client__.js", "/serverFunctionProxy.js"],
     plugins: [
       del({
         targets: `${outputDirectory}/*`,