one 1.1.483 → 1.1.485

package/dist/esm/vercel/build/generate/createApiServerlessFunction.js

@@ -1,25 +1,36 @@
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
+import FSExtra from "fs-extra";
+import { resolvePath } from "@vxrn/resolve";
+import parser from "@babel/parser";
+import traverse from "@babel/traverse";
+import t from "@babel/types";
+import generator from "@babel/generator";
 import fs from "fs-extra";
 import { serverlessVercelPackageJson } from "../config/vc-package-base";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base";
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute";
+async function createApiServerlessFunction(route, code, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`);
-    await fs.ensureDir(funcFolder), code.includes("react") && (postBuildLogs.push(
-      `[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${pageName}`
-    ), await fs.copy(
-      resolve(join(oneOptionsRoot, "..", "..", "node_modules", "react")),
-      resolve(join(funcFolder, "node_modules", "react"))
-    ));
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`);
+    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${path}.func`);
+    if (await fs.ensureDir(funcFolder), code.includes("react")) {
+      postBuildLogs.push(
+        `[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${path}`
+      );
+      const reactPath = dirname(resolvePath("react/package.json", oneOptionsRoot));
+      await fs.copy(resolve(reactPath), resolve(join(funcFolder, "node_modules", "react")));
+    }
     const distAssetsFolder = resolve(join(funcFolder, "assets"));
     postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`
-    ), await fs.copy(resolve(join(oneOptionsRoot, "dist", "api", "assets")), distAssetsFolder), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
+    );
+    const sourceAssetsFolder = resolve(join(oneOptionsRoot, "dist", "api", "assets"));
+    await FSExtra.pathExists(sourceAssetsFolder) && await fs.copy(sourceAssetsFolder, distAssetsFolder), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
     const entrypointFilePath = resolve(join(funcFolder, "entrypoint", "index.js"));
     postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`
-    ), await fs.writeFile(entrypointFilePath, code);
+    ), await fs.writeFile(entrypointFilePath, wrapHandlerFunctions(code));
     const packageJsonFilePath = resolve(join(funcFolder, "package.json"));
     return postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] writing package.json to ${packageJsonFilePath}`
@@ -31,11 +42,75 @@ async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postB
     });
   } catch (e) {
     console.error(
-      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`,
+      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`,
       e
     );
   }
 }
+function wrapHandlerFunctions(code) {
+  const ast = parser.parse(code, {
+    sourceType: "module"
+  });
+  return traverse.default(ast, {
+    FunctionDeclaration(path) {
+      const { node } = path, functionNamesToHandle = [
+        "GET",
+        "POST",
+        "PUT",
+        "PATCH",
+        "DELETE",
+        "HEAD",
+        "OPTIONS"
+        // TODO: more possibilities?
+      ];
+      if (!node.id || !functionNamesToHandle.includes(node.id.name) || node.extra && node.extra.isWrapper || node.extra && node.extra.isWrapped) return;
+      const originalName = `orig_${node.id.name}`, originalFunction = t.functionDeclaration(
+        t.identifier(originalName),
+        node.params,
+        node.body,
+        node.generator,
+        node.async
+      ), requestIdentifier = t.identifier("request"), wrapperParams = [requestIdentifier], urlIdentifier = t.identifier("url"), paramsIdentifier = t.identifier("params"), urlDecl = t.variableDeclaration("const", [
+        t.variableDeclarator(
+          urlIdentifier,
+          t.newExpression(t.identifier("URL"), [
+            t.memberExpression(requestIdentifier, t.identifier("url"))
+          ])
+        )
+      ]), paramsDecl = t.variableDeclaration("const", [
+        t.variableDeclarator(
+          paramsIdentifier,
+          t.callExpression(
+            t.memberExpression(t.identifier("Object"), t.identifier("fromEntries")),
+            [
+              t.callExpression(
+                t.memberExpression(
+                  t.memberExpression(
+                    urlIdentifier,
+                    t.identifier("searchParams")
+                  ),
+                  t.identifier("entries")
+                ),
+                []
+              )
+            ]
+          )
+        )
+      ]), callOrigFnStatement = t.callExpression(t.identifier(originalName), [
+        requestIdentifier,
+        t.objectExpression([t.objectProperty(t.identifier("params"), paramsIdentifier)])
+      ]), wrapperFunction = t.functionDeclaration(
+        t.identifier(node.id.name + ""),
+        wrapperParams,
+        t.blockStatement([urlDecl, paramsDecl, t.returnStatement(callOrigFnStatement)])
+        // No need to care if the wrapper function should be async,
+        // since we didn't use any await in the wrapper function, and we'll
+        // just return what the original function returns.
+      );
+      node.extra = node.extra || {}, node.extra.isWrapped = !0, wrapperFunction.extra = wrapperFunction.extra || {}, wrapperFunction.extra.isWrapper = !0, path.parentPath.isExportNamedDeclaration() ? path.replaceWithMultiple([originalFunction, t.exportNamedDeclaration(wrapperFunction, [])]) : path.replaceWithMultiple([originalFunction, wrapperFunction]);
+    }
+  }), generator.default(ast, {}).code;
+}
 export {
   createApiServerlessFunction
 };

package/dist/esm/vercel/build/generate/createApiServerlessFunction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],
-  "mappings": "AAAA,SAAS,MAAM,eAAe;AAE9B,OAAO,QAAQ;AAEf,SAAS,mCAAmC;AAC5C,SAAS,oCAAoC;AAI7C,eAAsB,4BACpB,UACA,MACA,gBACA,eACA;AACA,MAAI;AACF,kBAAc,KAAK,6DAA6D,QAAQ,EAAE;AAE1F,UAAM,aAAa,KAAK,gBAAgB,4BAA4B,QAAQ,OAAO;AACnF,UAAM,GAAG,UAAU,UAAU,GAEzB,KAAK,SAAS,OAAO,MACvB,cAAc;AAAA,MACZ,wFAAwF,QAAQ;AAAA,IAClG,GACA,MAAM,GAAG;AAAA,MACP,QAAQ,KAAK,gBAAgB,MAAM,MAAM,gBAAgB,OAAO,CAAC;AAAA,MACjE,QAAQ,KAAK,YAAY,gBAAgB,OAAO,CAAC;AAAA,IACnD;AAGF,UAAM,mBAAmB,QAAQ,KAAK,YAAY,QAAQ,CAAC;AAC3D,kBAAc;AAAA,MACZ,yEAAyE,gBAAgB;AAAA,IAC3F,GACA,MAAM,GAAG,KAAK,QAAQ,KAAK,gBAAgB,QAAQ,OAAO,QAAQ,CAAC,GAAG,gBAAgB,GAEtF,MAAM,GAAG,UAAU,QAAQ,KAAK,YAAY,YAAY,CAAC,CAAC;AAC1D,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG,UAAU,oBAAoB,IAAI;AAE3C,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,yBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B,GAEnE,cAAc;AAAA,MACZ,8EAA8E,KAAK,YAAY,iBAAiB,CAAC;AAAA,IACnH,GAGO,GAAG,UAAU,KAAK,YAAY,iBAAiB,GAAG;AAAA,MACvD,GAAG;AAAA,MACH,SAAS;AAAA,IACX,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,QAAQ;AAAA,MACvF;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/vercel/build/generate/createApiServerlessFunction.mjs

@@ -1,24 +1,69 @@
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
+import FSExtra from "fs-extra";
+import { resolvePath } from "@vxrn/resolve";
+import parser from "@babel/parser";
+import traverse from "@babel/traverse";
+import t from "@babel/types";
+import generator from "@babel/generator";
 import fs from "fs-extra";
 import { serverlessVercelPackageJson } from "../config/vc-package-base.mjs";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base.mjs";
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute.mjs";
+async function createApiServerlessFunction(route, code, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`);
-    await fs.ensureDir(funcFolder), code.includes("react") && (postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${pageName}`), await fs.copy(resolve(join(oneOptionsRoot, "..", "..", "node_modules", "react")), resolve(join(funcFolder, "node_modules", "react"))));
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`);
+    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${path}.func`);
+    if (await fs.ensureDir(funcFolder), code.includes("react")) {
+      postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${path}`);
+      const reactPath = dirname(resolvePath("react/package.json", oneOptionsRoot));
+      await fs.copy(resolve(reactPath), resolve(join(funcFolder, "node_modules", "react")));
+    }
     const distAssetsFolder = resolve(join(funcFolder, "assets"));
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`), await fs.copy(resolve(join(oneOptionsRoot, "dist", "api", "assets")), distAssetsFolder), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`);
+    const sourceAssetsFolder = resolve(join(oneOptionsRoot, "dist", "api", "assets"));
+    (await FSExtra.pathExists(sourceAssetsFolder)) && (await fs.copy(sourceAssetsFolder, distAssetsFolder)), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
     const entrypointFilePath = resolve(join(funcFolder, "entrypoint", "index.js"));
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, code);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, wrapHandlerFunctions(code));
     const packageJsonFilePath = resolve(join(funcFolder, "package.json"));
     return postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing package.json to ${packageJsonFilePath}`), await fs.writeJSON(packageJsonFilePath, serverlessVercelPackageJson), postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing .vc-config.json to ${join(funcFolder, ".vc-config.json")}`), fs.writeJson(join(funcFolder, ".vc-config.json"), {
       ...serverlessVercelNodeJsConfig,
       handler: "entrypoint/index.js"
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
 }
+function wrapHandlerFunctions(code) {
+  const ast = parser.parse(code, {
+    sourceType: "module"
+  });
+  return traverse.default(ast, {
+    FunctionDeclaration(path) {
+      const {
+          node
+        } = path,
+        functionNamesToHandle = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"
+        // TODO: more possibilities?
+        ];
+      if (!node.id || !functionNamesToHandle.includes(node.id.name) || node.extra && node.extra.isWrapper || node.extra && node.extra.isWrapped) return;
+      const originalName = `orig_${node.id.name}`,
+        originalFunction = t.functionDeclaration(t.identifier(originalName), node.params, node.body, node.generator, node.async),
+        requestIdentifier = t.identifier("request"),
+        wrapperParams = [requestIdentifier],
+        urlIdentifier = t.identifier("url"),
+        paramsIdentifier = t.identifier("params"),
+        urlDecl = t.variableDeclaration("const", [t.variableDeclarator(urlIdentifier, t.newExpression(t.identifier("URL"), [t.memberExpression(requestIdentifier, t.identifier("url"))]))]),
+        paramsDecl = t.variableDeclaration("const", [t.variableDeclarator(paramsIdentifier, t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("fromEntries")), [t.callExpression(t.memberExpression(t.memberExpression(urlIdentifier, t.identifier("searchParams")), t.identifier("entries")), [])]))]),
+        callOrigFnStatement = t.callExpression(t.identifier(originalName), [requestIdentifier, t.objectExpression([t.objectProperty(t.identifier("params"), paramsIdentifier)])]),
+        wrapperFunction = t.functionDeclaration(t.identifier(node.id.name + ""), wrapperParams, t.blockStatement([urlDecl, paramsDecl, t.returnStatement(callOrigFnStatement)])
+        // No need to care if the wrapper function should be async,
+        // since we didn't use any await in the wrapper function, and we'll
+        // just return what the original function returns.
+        );
+      node.extra = node.extra || {}, node.extra.isWrapped = !0, wrapperFunction.extra = wrapperFunction.extra || {}, wrapperFunction.extra.isWrapper = !0, path.parentPath.isExportNamedDeclaration() ? path.replaceWithMultiple([originalFunction, t.exportNamedDeclaration(wrapperFunction, [])]) : path.replaceWithMultiple([originalFunction, wrapperFunction]);
+    }
+  }), generator.default(ast, {}).code;
+}
 export { createApiServerlessFunction };
 //# sourceMappingURL=createApiServerlessFunction.mjs.map

package/dist/esm/vercel/build/generate/createApiServerlessFunction.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["join","resolve","fs","serverlessVercelPackageJson","serverlessVercelNodeJsConfig","createApiServerlessFunction","pageName","code","oneOptionsRoot","postBuildLogs","push","funcFolder","ensureDir","includes","copy","distAssetsFolder","entrypointFilePath","writeFile","packageJsonFilePath","writeJSON","writeJson","handler","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAE9B,OAAOC,EAAA,MAAQ;AAEf,SAASC,2BAAA,QAAmC;AAC5C,SAASC,4BAAA,QAAoC;AAI7C,eAAsBC,4BACpBC,QAAA,EACAC,IAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACFA,aAAA,CAAcC,IAAA,CAAK,6DAA6DJ,QAAQ,EAAE;IAE1F,MAAMK,UAAA,GAAaX,IAAA,CAAKQ,cAAA,EAAgB,4BAA4BF,QAAQ,OAAO;IACnF,MAAMJ,EAAA,CAAGU,SAAA,CAAUD,UAAU,GAEzBJ,IAAA,CAAKM,QAAA,CAAS,OAAO,MACvBJ,aAAA,CAAcC,IAAA,CACZ,wFAAwFJ,QAAQ,EAClG,GACA,MAAMJ,EAAA,CAAGY,IAAA,CACPb,OAAA,CAAQD,IAAA,CAAKQ,cAAA,EAAgB,MAAM,MAAM,gBAAgB,OAAO,CAAC,GACjEP,OAAA,CAAQD,IAAA,CAAKW,UAAA,EAAY,gBAAgB,OAAO,CAAC,CACnD;IAGF,MAAMI,gBAAA,GAAmBd,OAAA,CAAQD,IAAA,CAAKW,UAAA,EAAY,QAAQ,CAAC;IAC3DF,aAAA,CAAcC,IAAA,CACZ,yEAAyEK,gBAAgB,EAC3F,GACA,MAAMb,EAAA,CAAGY,IAAA,CAAKb,OAAA,CAAQD,IAAA,CAAKQ,cAAA,EAAgB,QAAQ,OAAO,QAAQ,CAAC,GAAGO,gBAAgB,GAEtF,MAAMb,EAAA,CAAGU,SAAA,CAAUX,OAAA,CAAQD,IAAA,CAAKW,UAAA,EAAY,YAAY,CAAC,CAAC;IAC1D,MAAMK,kBAAA,GAAqBf,OAAA,CAAQD,IAAA,CAAKW,UAAA,EAAY,cAAc,UAAU,CAAC;IAC7EF,aAAA,CAAcC,IAAA,CACZ,yEAAyEM,kBAAkB,EAC7F,GACA,MAAMd,EAAA,CAAGe,SAAA,CAAUD,kBAAA,EAAoBT,IAAI;IAE3C,MAAMW,mBAAA,GAAsBjB,OAAA,CAAQD,IAAA,CAAKW,UAAA,EAAY,cAAc,CAAC;IACpE,OAAAF,aAAA,CAAcC,IAAA,CACZ,2EAA2EQ,mBAAmB,EAChG,GACA,MAAMhB,EAAA,CAAGiB,SAAA,CAAUD,mBAAA,EAAqBf,2BAA2B,GAEnEM,aAAA,CAAcC,IAAA,CACZ,8EAA8EV,IAAA,CAAKW,UAAA,EAAY,iBAAiB,CAAC,EACnH,GAGOT,EAAA,CAAGkB,SAAA,CAAUpB,IAAA,CAAKW,UAAA,EAAY,iBAAiB,GAAG;MACvD,GAAGP,4BAAA;MACHiB,OAAA,EAAS;IACX,CAAC;EACH,SAASC,CAAA,EAAG;IACVC,OAAA,CAAQC,KAAA,CACN,+EAA+ElB,QAAQ,IACvFgB,CACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["dirname","join","resolve","FSExtra","resolvePath","parser","traverse","t","generator","fs","serverlessVercelPackageJson","serverlessVercelNodeJsConfig","getPathFromRoute","createApiServerlessFunction","route","code","oneOptionsRoot","postBuildLogs","path","push","funcFolder","ensureDir","includes","reactPath","copy","distAssetsFolder","sourceAssetsFolder","pathExists","entrypointFilePath","writeFile","wrapHandlerFunctions","packageJsonFilePath","writeJSON","writeJson","handler","e","console","error","file","ast","parse","sourceType","default","FunctionDeclaration","node","functionNamesToHandle","id","name","extra","isWrapper","isWrapped","originalName","originalFunction","functionDeclaration","identifier","params","body","async","requestIdentifier","wrapperParams","urlIdentifier","paramsIdentifier","urlDecl","variableDeclaration","variableDeclarator","newExpression","memberExpression","paramsDecl","callExpression","callOrigFnStatement","objectExpression","objectProperty","wrapperFunction","blockStatement","returnStatement","parentPath","isExportNamedDeclaration","replaceWithMultiple","exportNamedDeclaration"],"sources":["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vercel/build/generate/createApiServerlessFunction.native.js

@@ -1,24 +1,68 @@
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
+import FSExtra from "fs-extra";
+import { resolvePath } from "@vxrn/resolve";
+import parser from "@babel/parser";
+import traverse from "@babel/traverse";
+import t from "@babel/types";
+import generator from "@babel/generator";
 import fs from "fs-extra";
 import { serverlessVercelPackageJson } from "../config/vc-package-base.native.js";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base.native.js";
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute.native.js";
+async function createApiServerlessFunction(route, code, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    var funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`);
-    await fs.ensureDir(funcFolder), code.includes("react") && (postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${pageName}`), await fs.copy(resolve(join(oneOptionsRoot, "..", "..", "node_modules", "react")), resolve(join(funcFolder, "node_modules", "react"))));
+    var path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`);
+    var funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${path}.func`);
+    if (await fs.ensureDir(funcFolder), code.includes("react")) {
+      postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${path}`);
+      var reactPath = dirname(resolvePath("react/package.json", oneOptionsRoot));
+      await fs.copy(resolve(reactPath), resolve(join(funcFolder, "node_modules", "react")));
+    }
     var distAssetsFolder = resolve(join(funcFolder, "assets"));
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`), await fs.copy(resolve(join(oneOptionsRoot, "dist", "api", "assets")), distAssetsFolder), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`);
+    var sourceAssetsFolder = resolve(join(oneOptionsRoot, "dist", "api", "assets"));
+    (await FSExtra.pathExists(sourceAssetsFolder)) && (await fs.copy(sourceAssetsFolder, distAssetsFolder)), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
     var entrypointFilePath = resolve(join(funcFolder, "entrypoint", "index.js"));
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, code);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, wrapHandlerFunctions(code));
     var packageJsonFilePath = resolve(join(funcFolder, "package.json"));
     return postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing package.json to ${packageJsonFilePath}`), await fs.writeJSON(packageJsonFilePath, serverlessVercelPackageJson), postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing .vc-config.json to ${join(funcFolder, ".vc-config.json")}`), fs.writeJson(join(funcFolder, ".vc-config.json"), {
       ...serverlessVercelNodeJsConfig,
       handler: "entrypoint/index.js"
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
 }
+function wrapHandlerFunctions(code) {
+  var ast = parser.parse(code, {
+    sourceType: "module"
+  });
+  traverse.default(ast, {
+    FunctionDeclaration(path) {
+      var {
+          node
+        } = path,
+        functionNamesToHandle = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"];
+      if (!(!node.id || !functionNamesToHandle.includes(node.id.name)) && !(node.extra && node.extra.isWrapper) && !(node.extra && node.extra.isWrapped)) {
+        var originalName = `orig_${node.id.name}`,
+          originalFunction = t.functionDeclaration(t.identifier(originalName), node.params, node.body, node.generator, node.async),
+          requestIdentifier = t.identifier("request"),
+          wrapperParams = [requestIdentifier],
+          urlIdentifier = t.identifier("url"),
+          paramsIdentifier = t.identifier("params"),
+          urlDecl = t.variableDeclaration("const", [t.variableDeclarator(urlIdentifier, t.newExpression(t.identifier("URL"), /* Node.js global */
+          [t.memberExpression(requestIdentifier, t.identifier("url"))]))]),
+          paramsDecl = t.variableDeclaration("const", [t.variableDeclarator(paramsIdentifier, t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("fromEntries")), [t.callExpression(t.memberExpression(t.memberExpression(urlIdentifier, t.identifier("searchParams")), /* url.searchParams */
+          t.identifier("entries")), [])]))]),
+          callOrigFnStatement = t.callExpression(t.identifier(originalName), [requestIdentifier, t.objectExpression([t.objectProperty(t.identifier("params"), paramsIdentifier)])]),
+          wrapperFunction = t.functionDeclaration(t.identifier(node.id.name + ""), wrapperParams, t.blockStatement([urlDecl, paramsDecl, t.returnStatement(callOrigFnStatement)]));
+        node.extra = node.extra || {}, node.extra.isWrapped = !0, wrapperFunction.extra = wrapperFunction.extra || {}, wrapperFunction.extra.isWrapper = !0, path.parentPath.isExportNamedDeclaration() ? path.replaceWithMultiple([originalFunction, t.exportNamedDeclaration(wrapperFunction, [])]) : path.replaceWithMultiple([originalFunction, wrapperFunction]);
+      }
+    }
+  });
+  var output = generator.default(ast, {}).code;
+  return output;
+}
 export { createApiServerlessFunction };
 //# sourceMappingURL=createApiServerlessFunction.native.js.map

package/dist/esm/vercel/build/generate/createApiServerlessFunction.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["join","resolve","fs","serverlessVercelPackageJson","serverlessVercelNodeJsConfig","createApiServerlessFunction","pageName","code","oneOptionsRoot","postBuildLogs","push","funcFolder","ensureDir","includes","copy","distAssetsFolder","entrypointFilePath","writeFile","packageJsonFilePath","writeJSON","writeJson","handler","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAE9B,OAAOC,EAAA,MAAQ;AAEf,SAASC,2BAAA,QAAmC;AAC5C,SAASC,4BAAA,QAAoC;AAI7C,eAAsBC,4BACpBC,QAAA,EACAC,IAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACFA,aAAA,CAAcC,IAAA,CAAK,6DAA6DJ,QAAQ,EAAE;IAE1F,IAAAK,UAAM,GAAAX,IAAa,CAAAQ,cAAK,8BAAgBF,QAA4B,OAAQ;IAC5E,MAAMJ,EAAA,CAAGU,SAAA,CAAUD,UAAU,GAEzBJ,IAAA,CAAKM,QAAA,CAAS,OAAO,MACvBJ,aAAA,CAAcC,IAAA,yFAAAJ,QAAA,WAAAJ,EAAA,CAAAY,IAAA,CAAAb,OAAA,CAAAD,IAAA,CAAAQ,cAAA,yCAAAP,OAAA,CAAAD,IAAA,CAAAW,UAAA;IAAA,IACZI,gBAAA,GAAAd,OAAA,CAAAD,IAAA,CAAAW,UAAA;IACFF,aACS,CAAAC,IAAA,0EAAAK,gBAAA,WAAAb,EAAA,CAAAY,IAAA,CAAAb,OAAA,CAAAD,IAAA,CAAAQ,cAAA,6BAAAO,gBAAA,SAAAb,EAAA,CAAAU,SAAA,CAAAX,OAAA,CAAAD,IAAA,CAAAW,UAAA;IAAA,IACPK,kBAAa,GAAAf,OAAgB,CAAAD,IAAM,CAAAW,UAAM,cAAgB,YAAQ;IAAAF,aACzD,CAAAC,IAAK,0EAAoCM,kBAAA,WAAAd,EAAA,CAAAe,SAAA,CAAAD,kBAAA,EAAAT,IAAA;IACnD,IAAAW,mBAAA,GAAAjB,OAAA,CAAAD,IAAA,CAAAW,UAAA;IAGF,OAAMF,aAAA,CAAAC,IAAmB,4EAAkCQ,mBAAA,WAAAhB,EAAA,CAAAiB,SAAA,CAAAD,mBAAA,EAAAf,2BAAA,GAAAM,aAAA,CAAAC,IAAA,+EAAAV,IAAA,CAAAW,UAAA,yBAAAT,EAAA,CAAAkB,SAAA,CAAApB,IAAA,CAAAW,UAAA;MAC3D,GAAAP,4BAAc;MACZiB,OAAA;IACF;EAIA,SAAMC,CAAA;IACNC,OAAA,CAAAC,KAAA,CAAc,+EAAAlB,QAAA,IAAAgB,CAAA;EAAA;AAC+E;AAI7F,SACAjB,2BAAc","ignoreList":[]}
+{"version":3,"names":["dirname","join","resolve","FSExtra","resolvePath","parser","traverse","t","generator","fs","serverlessVercelPackageJson","serverlessVercelNodeJsConfig","getPathFromRoute","createApiServerlessFunction","route","code","oneOptionsRoot","postBuildLogs","path","push","funcFolder","ensureDir","includes","reactPath","copy","distAssetsFolder","sourceAssetsFolder","pathExists","entrypointFilePath","writeFile","wrapHandlerFunctions","packageJsonFilePath","writeJSON","writeJson","handler","e","console","error","file","ast","parse","sourceType","default","FunctionDeclaration","node","functionNamesToHandle","id","name","extra","isWrapper","isWrapped","originalName","originalFunction","functionDeclaration","identifier","params","body","async","requestIdentifier","wrapperParams","urlIdentifier","paramsIdentifier","urlDecl","variableDeclaration","variableDeclarator","newExpression","memberExpression","paramsDecl","callExpression","callOrigFnStatement","objectExpression","objectProperty","wrapperFunction","blockStatement","returnStatement","parentPath","isExportNamedDeclaration","replaceWithMultiple","exportNamedDeclaration","output"],"sources":["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js

@@ -2,10 +2,12 @@ import fs from "fs-extra";
 import { join, resolve } from "node:path";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base";
 import { serverlessVercelPackageJson } from "../config/vc-package-base";
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute";
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const buildInfoAsString = JSON.stringify(buildInfo), funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
+    const buildInfoAsString = JSON.stringify(buildInfo), funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await fs.ensureDir(funcFolder);
     const distServerFrom = resolve(join(oneOptionsRoot, "dist", "server")), distServerTo = resolve(join(funcFolder, "server"));
     await fs.ensureDir(distServerTo), postBuildLogs.push(
@@ -19,6 +21,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -28,7 +31,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -80,7 +83,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     });
   } catch (e) {
     console.error(
-      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`,
+      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`,
       e
     );
   }

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],
-  "mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,MAAM,eAAe;AAC9B,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAK5C,eAAsB,4BACpB,UACA,WACA,gBACA,eACA;AACA,MAAI;AACF,kBAAc,KAAK,6DAA6D,QAAQ,EAAE;AAE1F,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,aAAa,QAAQ,KAAK,gBAAgB,4BAA4B,QAAQ,OAAO,CAAC;AAC5F,UAAM,GAAG,UAAU,UAAU;AAE7B,UAAM,iBAAiB,QAAQ,KAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,eAAe,QAAQ,KAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,GAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,GAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,GAAG,UAAU,KAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,GAAG,UAAU,KAAK,YAAY,YAAY,CAAC;AACjD,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA8CF;AAEA,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B;AAInE,UAAM,mBAAmB,QAAQ,KAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,GAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,6BAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,QAAQ;AAAA,MACvF;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,MAAM,eAAe;AAC9B,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAE5C,SAAS,wBAAwB;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,OAAO,iBAAiB,KAAK;AACnC,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,aAAa,QAAQ,KAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,GAAG,UAAU,UAAU;AAE7B,UAAM,iBAAiB,QAAQ,KAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,eAAe,QAAQ,KAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,GAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,GAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,GAAG,UAAU,KAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,GAAG,UAAU,KAAK,YAAY,YAAY,CAAC;AACjD,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA4C5C;AAEA,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B;AAInE,UAAM,mBAAmB,QAAQ,KAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,GAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,6BAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,MAAM,IAAI;AAAA,MACzF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs

@@ -2,11 +2,13 @@ import fs from "fs-extra";
 import { join, resolve } from "node:path";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base.mjs";
 import { serverlessVercelPackageJson } from "../config/vc-package-base.mjs";
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute.mjs";
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
     const buildInfoAsString = JSON.stringify(buildInfo),
-      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await fs.ensureDir(funcFolder);
     const distServerFrom = resolve(join(oneOptionsRoot, "dist", "server")),
       distServerTo = resolve(join(funcFolder, "server"));
@@ -15,6 +17,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -24,7 +27,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -70,7 +73,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       }
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
 }
 export { createSsrServerlessFunction };

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","createSsrServerlessFunction","pageName","buildInfo","oneOptionsRoot","postBuildLogs","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAK5C,eAAsBC,4BACpBC,QAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACFA,aAAA,CAAcC,IAAA,CAAK,6DAA6DJ,QAAQ,EAAE;IAE1F,MAAMK,iBAAA,GAAoBC,IAAA,CAAKC,SAAA,CAAUN,SAAS;MAC5CO,UAAA,GAAaZ,OAAA,CAAQD,IAAA,CAAKO,cAAA,EAAgB,4BAA4BF,QAAQ,OAAO,CAAC;IAC5F,MAAMN,EAAA,CAAGe,SAAA,CAAUD,UAAU;IAE7B,MAAME,cAAA,GAAiBd,OAAA,CAAQD,IAAA,CAAKO,cAAA,EAAgB,QAAQ,QAAQ,CAAC;MAC/DS,YAAA,GAAef,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,QAAQ,CAAC;IACvD,MAAMd,EAAA,CAAGe,SAAA,CAAUE,YAAY,GAC/BR,aAAA,CAAcC,IAAA,CACZ,+EAA+EM,cAAc,OAAOC,YAAY,EAClH,GACA,MAAMjB,EAAA,CAAGkB,IAAA,CAAKF,cAAA,EAAgBC,YAAY,GAE1CR,aAAA,CAAcC,IAAA,CAAK,wEAAwE,GAC3F,MAAMV,EAAA,CAAGmB,SAAA,CAAUlB,IAAA,CAAKa,UAAA,EAAY,cAAc,GAAG,kBAAkBH,iBAAiB,EAAE,GAE1F,MAAMX,EAAA,CAAGe,SAAA,CAAUd,IAAA,CAAKa,UAAA,EAAY,YAAY,CAAC;IACjD,MAAMM,kBAAA,GAAqBlB,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,cAAc,UAAU,CAAC;IAC7EL,aAAA,CAAcC,IAAA,CACZ,yEAAyEU,kBAAkB,EAC7F,GACA,MAAMpB,EAAA,CAAGmB,SAAA,CACPC,kBAAA,EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GA8CF;IAEA,MAAMC,mBAAA,GAAsBnB,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,cAAc,CAAC;IACpEL,aAAA,CAAcC,IAAA,CACZ,2EAA2EW,mBAAmB,EAChG,GACA,MAAMrB,EAAA,CAAGsB,SAAA,CAAUD,mBAAA,EAAqBjB,2BAA2B;IAInE,MAAMmB,gBAAA,GAAmBrB,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,iBAAiB,CAAC;IACpE,OAAAL,aAAA,CAAcC,IAAA,CACZ,8EAA8Ea,gBAAgB,EAChG,GACOvB,EAAA,CAAGwB,SAAA,CAAUD,gBAAA,EAAkB;MACpC,GAAGpB,4BAAA;MACHsB,OAAA,EAAS;MACTC,WAAA,EAAa;QACX,GAAGvB,4BAAA,CAA6BuB,WAAA;QAChCC,uBAAA,EAAyB;MAC3B;IACF,CAAC;EACH,SAASC,CAAA,EAAG;IACVC,OAAA,CAAQC,KAAA,CACN,+EAA+ExB,QAAQ,IACvFsB,CACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAE5C,SAASC,gBAAA,QAAwB;AAIjC,eAAsBC,4BACpBC,KAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACF,MAAMC,IAAA,GAAON,gBAAA,CAAiBE,KAAK;IACnCG,aAAA,CAAcE,IAAA,CAAK,yDAAyDD,IAAI,EAAE;IAElF,MAAME,iBAAA,GAAoBC,IAAA,CAAKC,SAAA,CAAUP,SAAS;MAC5CQ,UAAA,GAAad,OAAA,CAAQD,IAAA,CAAKQ,cAAA,EAAgB,4BAA4BE,IAAI,OAAO,CAAC;IACxF,MAAMX,EAAA,CAAGiB,SAAA,CAAUD,UAAU;IAE7B,MAAME,cAAA,GAAiBhB,OAAA,CAAQD,IAAA,CAAKQ,cAAA,EAAgB,QAAQ,QAAQ,CAAC;MAC/DU,YAAA,GAAejB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,QAAQ,CAAC;IACvD,MAAMhB,EAAA,CAAGiB,SAAA,CAAUE,YAAY,GAC/BT,aAAA,CAAcE,IAAA,CACZ,+EAA+EM,cAAc,OAAOC,YAAY,EAClH,GACA,MAAMnB,EAAA,CAAGoB,IAAA,CAAKF,cAAA,EAAgBC,YAAY,GAE1CT,aAAA,CAAcE,IAAA,CAAK,wEAAwE,GAC3F,MAAMZ,EAAA,CAAGqB,SAAA,CAAUpB,IAAA,CAAKe,UAAA,EAAY,cAAc,GAAG,kBAAkBH,iBAAiB,EAAE,GAE1F,MAAMb,EAAA,CAAGiB,SAAA,CAAUhB,IAAA,CAAKe,UAAA,EAAY,YAAY,CAAC;IACjD,MAAMM,kBAAA,GAAqBpB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,cAAc,UAAU,CAAC;IAC7EN,aAAA,CAAcE,IAAA,CACZ,yEAAyEU,kBAAkB,EAC7F,GACA,MAAMtB,EAAA,CAAGqB,SAAA,CACPC,kBAAA,EACA;AAAA;AAAA;AAAA,sBAGgBR,IAAA,CAAKC,SAAA,CAAUR,KAAA,CAAMgB,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GA4C5C;IAEA,MAAMC,mBAAA,GAAsBtB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,cAAc,CAAC;IACpEN,aAAA,CAAcE,IAAA,CACZ,2EAA2EY,mBAAmB,EAChG,GACA,MAAMxB,EAAA,CAAGyB,SAAA,CAAUD,mBAAA,EAAqBpB,2BAA2B;IAInE,MAAMsB,gBAAA,GAAmBxB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,iBAAiB,CAAC;IACpE,OAAAN,aAAA,CAAcE,IAAA,CACZ,8EAA8Ec,gBAAgB,EAChG,GACO1B,EAAA,CAAG2B,SAAA,CAAUD,gBAAA,EAAkB;MACpC,GAAGvB,4BAAA;MACHyB,OAAA,EAAS;MACTC,WAAA,EAAa;QACX,GAAG1B,4BAAA,CAA6B0B,WAAA;QAChCC,uBAAA,EAAyB;MAC3B;IACF,CAAC;EACH,SAASC,CAAA,EAAG;IACVC,OAAA,CAAQC,KAAA,CACN,+EAA+E1B,KAAA,CAAMgB,IAAI,IACzFQ,CACF;EACF;AACF","ignoreList":[]}

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js

@@ -2,11 +2,13 @@ import fs from "fs-extra";
 import { join, resolve } from "node:path";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base.native.js";
 import { serverlessVercelPackageJson } from "../config/vc-package-base.native.js";
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute.native.js";
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
+    var path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
     var buildInfoAsString = JSON.stringify(buildInfo),
-      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await fs.ensureDir(funcFolder);
     var distServerFrom = resolve(join(oneOptionsRoot, "dist", "server")),
       distServerTo = resolve(join(funcFolder, "server"));
@@ -15,6 +17,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -24,7 +27,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -70,7 +73,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       }
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
 }
 export { createSsrServerlessFunction };

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","createSsrServerlessFunction","pageName","buildInfo","oneOptionsRoot","postBuildLogs","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAK5C,eAAsBC,4BACpBC,QAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACFA,aAAA,CAAcC,IAAA,CAAK,6DAA6DJ,QAAQ,EAAE;IAE1F,IAAAK,iBAAM,GAAAC,IAAoB,CAAAC,SAAK,CAAAN,SAAU;MAASO,UAC5C,GAAAZ,OAAa,CAAAD,IAAQ,CAAAO,cAAK,8BAAgBF,QAA4B,OAAQ,EAAO;IAC3F,MAAMN,EAAA,CAAGe,SAAA,CAAUD,UAAU;IAE7B,IAAAE,cAAM,GAAAd,OAAiB,CAAAD,IAAQ,CAAAO,cAAK,QAAgB,UAAQ,EAAQ;MAACS,YAC/D,GAAAf,OAAe,CAAAD,IAAQ,CAAAa,UAAK,UAAY,EAAQ;IACtD,MAAMd,EAAA,CAAGe,SAAA,CAAUE,YAAY,GAC/BR,aAAA,CAAcC,IAAA,gFAAAM,cAAA,OAAAC,YAAA,WAAAjB,EAAA,CAAAkB,IAAA,CAAAF,cAAA,EAAAC,YAAA,GAAAR,aAAA,CAAAC,IAAA,kFAAAV,EAAA,CAAAmB,SAAA,CAAAlB,IAAA,CAAAa,UAAA,qCAAAH,iBAAA,WAAAX,EAAA,CAAAe,SAAA,CAAAd,IAAA,CAAAa,UAAA;IAAA,IACZM,kBAAA,GAAAlB,OAAA,CAAAD,IAAA,CAAAa,UAAA;IACFL,aACS,CAAAC,IAAK,0EAEKU,kBAAA,WAAApB,EAAA,CAAAmB,SAAA,CAAAC,kBACV;AAGT;AACA;AAAc;AAC+E;AAEpF;AACP;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAA,IAAAC,mBAAA,GAAAnB,OAAA,CAAAD,IAAA,CAAAa,UAAA;IAAAL,aAAA,CAAAC,IAAA,4EAAAW,mBAAA,WAAArB,EAAA,CAAAsB,SAAA,CAAAD,mBAAA,EAAAjB,2BAAA;IAAA,IAAAmB,gBAAA,GAAArB,OAAA,CAAAD,IAAA,CAAAa,UAAA;IAAA,OAAAL,aAAA,CAAAC,IAAA,+EAAAa,gBAAA,KAAAvB,EAAA,CAAAwB,SAAA,CAAAD,gBAAA;MAAA,GAAApB,4BAAA;MAAAsB,OAAA;MA8CFC,WAAA;QAEA,GAAMvB,4BAAsB,CAAQuB,WAAK;QACzCC,uBAAc;MACZ;IACF;EAKA,SAAMC,CAAA;IACNC,OAAA,CAAAC,KAAA,gFAAcxB,QAAA,IAAAsB,CAAA;EAAA;AACkF;AAE1D,SACjCvB,2BACM","ignoreList":[]}
+{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAE5C,SAASC,gBAAA,QAAwB;AAIjC,eAAsBC,4BACpBC,KAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACF,IAAAC,IAAM,GAAAN,gBAAO,CAAAE,KAAiB;IAC9BG,aAAA,CAAcE,IAAA,CAAK,yDAAyDD,IAAI,EAAE;IAElF,IAAAE,iBAAM,GAAAC,IAAoB,CAAAC,SAAK,CAAAP,SAAU;MAASQ,UAC5C,GAAAd,OAAa,CAAAD,IAAQ,CAAAQ,cAAK,8BAAgBE,IAA4B,OAAI,EAAO;IACvF,MAAMX,EAAA,CAAGiB,SAAA,CAAUD,UAAU;IAE7B,IAAAE,cAAM,GAAAhB,OAAiB,CAAAD,IAAQ,CAAAQ,cAAK,QAAgB,UAAQ,EAAQ;MAACU,YAC/D,GAAAjB,OAAe,CAAAD,IAAQ,CAAAe,UAAK,UAAY,EAAQ;IACtD,MAAMhB,EAAA,CAAGiB,SAAA,CAAUE,YAAY,GAC/BT,aAAA,CAAcE,IAAA,gFAAAM,cAAA,OAAAC,YAAA,WAAAnB,EAAA,CAAAoB,IAAA,CAAAF,cAAA,EAAAC,YAAA,GAAAT,aAAA,CAAAE,IAAA,kFAAAZ,EAAA,CAAAqB,SAAA,CAAApB,IAAA,CAAAe,UAAA,qCAAAH,iBAAA,WAAAb,EAAA,CAAAiB,SAAA,CAAAhB,IAAA,CAAAe,UAAA;IAAA,IACZM,kBAAA,GAAApB,OAAA,CAAAD,IAAA,CAAAe,UAAA;IACFN,aACS,CAAAE,IAAK,0EAEKU,kBAAA,WAAAtB,EAAA,CAAAqB,SAAA,CAAAC,kBACV;AAGT;AACA;AAAc,sBACZR,IAAA,CAAAC,SAAA,CAAAR,KAAA,CAAAgB,IAAA;AAA2F;AAEpF;AACP;AACA;AAAA;AAAA;AAG0C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAA,IAAAC,mBAAA,GAAAtB,OAAA,CAAAD,IAAA,CAAAe,UAAA;IAAAN,aAAA,CAAAE,IAAA,4EAAAY,mBAAA,WAAAxB,EAAA,CAAAyB,SAAA,CAAAD,mBAAA,EAAApB,2BAAA;IAAA,IAAAsB,gBAAA,GAAAxB,OAAA,CAAAD,IAAA,CAAAe,UAAA;IAAA,OAAAN,aAAA,CAAAE,IAAA,+EAAAc,gBAAA,KAAA1B,EAAA,CAAA2B,SAAA,CAAAD,gBAAA;MAAA,GAAAvB,4BAAA;MAAAyB,OAAA;MA4C5CC,WAAA;QAEA,GAAM1B,4BAAsB,CAAQ0B,WAAK;QACzCC,uBAAc;MACZ;IACF;EAKA,SAAMC,CAAA;IACNC,OAAA,CAAAC,KAAA,gFAAc1B,KAAA,CAAAgB,IAAA,IAAAQ,CAAA;EAAA;AACkF;AAE1D,SACjCzB,2BACM","ignoreList":[]}

package/dist/esm/vercel/build/getPathFromRoute.js

@@ -0,0 +1,8 @@
+import { getPathnameFromFilePath } from "../../utils/getPathnameFromFilePath";
+function getPathFromRoute(route) {
+  return getPathnameFromFilePath(route.file, {}, !1, { preserveExtensions: !0 }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+export {
+  getPathFromRoute
+};
+//# sourceMappingURL=getPathFromRoute.js.map

package/dist/esm/vercel/build/getPathFromRoute.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/vercel/build/getPathFromRoute.ts"],
+  "mappings": "AAAA,SAAS,+BAA+B;AAGjC,SAAS,iBAAiB,OAA0B;AACzD,SAAO,wBAAwB,MAAM,MAAM,CAAC,GAAG,IAAO,EAAE,oBAAoB,GAAK,CAAC,EAC/E,QAAQ,SAAS,GAAG,EACpB,QAAQ,QAAQ,EAAE;AACvB;",
+  "names": []
+}

package/dist/esm/vercel/build/getPathFromRoute.mjs

@@ -0,0 +1,8 @@
+import { getPathnameFromFilePath } from "../../utils/getPathnameFromFilePath.mjs";
+function getPathFromRoute(route) {
+  return getPathnameFromFilePath(route.file, {}, !1, {
+    preserveExtensions: !0
+  }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+export { getPathFromRoute };
+//# sourceMappingURL=getPathFromRoute.mjs.map

package/dist/esm/vercel/build/getPathFromRoute.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["getPathnameFromFilePath","getPathFromRoute","route","file","preserveExtensions","replace"],"sources":["../../../../src/vercel/build/getPathFromRoute.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,uBAAA,QAA+B;AAGjC,SAASC,iBAAiBC,KAAA,EAA0B;EACzD,OAAOF,uBAAA,CAAwBE,KAAA,CAAMC,IAAA,EAAM,CAAC,GAAG,IAAO;IAAEC,kBAAA,EAAoB;EAAK,CAAC,EAC/EC,OAAA,CAAQ,SAAS,GAAG,EACpBA,OAAA,CAAQ,QAAQ,EAAE;AACvB","ignoreList":[]}

package/dist/esm/vercel/build/getPathFromRoute.native.js

@@ -0,0 +1,8 @@
+import { getPathnameFromFilePath } from "../../utils/getPathnameFromFilePath.native.js";
+function getPathFromRoute(route) {
+  return getPathnameFromFilePath(route.file, {}, !1, {
+    preserveExtensions: !0
+  }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+export { getPathFromRoute };
+//# sourceMappingURL=getPathFromRoute.native.js.map

package/dist/esm/vercel/build/getPathFromRoute.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getPathnameFromFilePath","getPathFromRoute","route","file","preserveExtensions"],"sources":["../../../../src/vercel/build/getPathFromRoute.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,uBAAA,QAA+B;AAGjC,SAASC,iBAAiBC,KAAA,EAA0B;EACzD,OAAOF,uBAAA,CAAwBE,KAAA,CAAMC,IAAA,EAAM,CAAC,GAAG,IAAO;IAGxDC,kBAAA","ignoreList":[]}

package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js

@@ -1,4 +1,4 @@
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { debounce } from "perfect-debounce";
 import { generateRouteTypes } from "../../typed-routes/generateRouteTypes";
 import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions";
@@ -8,7 +8,7 @@ function generateFileSystemRouteTypesPlugin(options) {
     enforce: "post",
     apply: "serve",
     configureServer(server) {
-      const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)), outFile = join(process.cwd(), "routes.d.ts"), routerRoot = getRouterRootFromOneOptions(options), fileWatcherChangeListener = debounce(async (type, path) => {
+      const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)), outFile = dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts"), routerRoot = getRouterRootFromOneOptions(options), fileWatcherChangeListener = debounce(async (type, path) => {
         (type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
       }, 100);
       return server.watcher.addListener("all", fileWatcherChangeListener), () => {