@tanstack/start-plugin-core 1.132.0-alpha.6 → 1.132.0-alpha.8

package/dist/esm/start-compiler-plugin/plugin.js

@@ -1,21 +1,36 @@
 import { pathToFileURL, fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
 import { logDiff } from "@tanstack/router-utils";
 import { VIRTUAL_MODULES } from "@tanstack/start-server-core";
+import { normalizePath } from "vite";
+import path from "pathe";
+import { VITE_ENVIRONMENT_NAMES } from "../constants.js";
 import { compileStartOutputFactory } from "./compilers.js";
 import { transformFuncs } from "./constants.js";
 const debug = process.env.TSR_VITE_DEBUG && ["true", "start-plugin"].includes(process.env.TSR_VITE_DEBUG);
 const tokenRegex = new RegExp(transformFuncs.join("|"));
+const require2 = createRequire(import.meta.url);
+function resolveRuntimeFiles(opts) {
+  const pkgRoot = resolvePackage(opts.package);
+  const basePath = path.join(pkgRoot, "dist", "esm");
+  return opts.files.map((file) => normalizePath(path.join(basePath, file)));
+}
+function resolvePackage(packageName) {
+  const pkgRoot = path.dirname(require2.resolve(packageName + "/package.json"));
+  return pkgRoot;
+}
 function startCompilerPlugin(framework, inputOpts) {
   const opts = {
     client: {
-      envName: "client",
+      envName: VITE_ENVIRONMENT_NAMES.client,
       ...inputOpts?.client
     },
     server: {
-      envName: "server",
+      envName: VITE_ENVIRONMENT_NAMES.server,
       ...inputOpts?.server
     }
   };
+  const compileStartOutput = compileStartOutputFactory(framework);
   return {
     name: "tanstack-start-core:compiler",
     enforce: "pre",
@@ -26,7 +41,36 @@ function startCompilerPlugin(framework, inputOpts) {
       filter: {
         code: tokenRegex,
         id: {
-          exclude: VIRTUAL_MODULES.serverFnManifest
+          exclude: [
+            VIRTUAL_MODULES.serverFnManifest,
+            // N.B. the following files either just re-export or provide the runtime implementation of those functions
+            // we do not want to include them in the transformation
+            // however, those packages (especially start-client-core ATM) also USE these functions
+            // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed
+            ...resolveRuntimeFiles({
+              package: "@tanstack/start-client-core",
+              files: [
+                "index.js",
+                "createIsomorphicFn.js",
+                "envOnly.js",
+                "createServerFn.js",
+                "createMiddleware.js",
+                "serverFnFetcher.js"
+              ]
+            }),
+            ...resolveRuntimeFiles({
+              package: "@tanstack/start-server-core",
+              files: [
+                "index.js",
+                "server-functions-handler.js",
+                "serverRoute.js"
+              ]
+            }),
+            ...resolveRuntimeFiles({
+              package: `@tanstack/${framework}-start-client`,
+              files: ["index.js"]
+            })
+          ]
         }
       },
       handler(code, id) {
@@ -35,35 +79,24 @@ function startCompilerPlugin(framework, inputOpts) {
             `Environment ${this.environment.name} not configured`
           );
         })();
-        return transformCode({
+        const url = pathToFileURL(id);
+        url.searchParams.delete("v");
+        id = fileURLToPath(url).replace(/\\/g, "/");
+        if (debug) console.info(`${env} Compiling Start: `, id);
+        const compiled = compileStartOutput({
           code,
-          id,
-          env,
-          framework
+          filename: id,
+          env
         });
+        if (debug) {
+          logDiff(code, compiled.code);
+          console.log("Output:\n", compiled.code + "\n\n");
+        }
+        return compiled;
       }
     }
   };
 }
-function transformCode(opts) {
-  const { code, env, framework } = opts;
-  let { id } = opts;
-  const url = pathToFileURL(id);
-  url.searchParams.delete("v");
-  id = fileURLToPath(url).replace(/\\/g, "/");
-  if (debug) console.info(`${env} Compiling Start: `, id);
-  const compileStartOutput = compileStartOutputFactory(framework);
-  const compiled = compileStartOutput({
-    code,
-    filename: id,
-    env
-  });
-  if (debug) {
-    logDiff(code, compiled.code);
-    console.log("Output:\n", compiled.code + "\n\n");
-  }
-  return compiled;
-}
 export {
   startCompilerPlugin
 };

package/dist/esm/start-compiler-plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../../src/start-compiler-plugin/plugin.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url'\nimport { logDiff } from '@tanstack/router-utils'\n\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { compileStartOutputFactory } from './compilers'\nimport { transformFuncs } from './constants'\nimport type { Plugin } from 'vite'\nimport type { CompileStartFrameworkOptions } from './compilers'\n\nconst debug =\n  process.env.TSR_VITE_DEBUG &&\n  ['true', 'start-plugin'].includes(process.env.TSR_VITE_DEBUG)\n\nexport type TanStackStartViteOptions = {\n  globalMiddlewareEntry: string\n}\n\nconst tokenRegex = new RegExp(transformFuncs.join('|'))\n\nexport function startCompilerPlugin(\n  framework: CompileStartFrameworkOptions,\n  inputOpts?: {\n    client?: {\n      envName?: string\n    }\n    server?: {\n      envName?: string\n    }\n  },\n): Plugin {\n  const opts = {\n    client: {\n      envName: 'client',\n      ...inputOpts?.client,\n    },\n    server: {\n      envName: 'server',\n      ...inputOpts?.server,\n    },\n  }\n\n  return {\n    name: 'tanstack-start-core:compiler',\n    enforce: 'pre',\n    applyToEnvironment(env) {\n      return [opts.client.envName, opts.server.envName].includes(env.name)\n    },\n    transform: {\n      filter: {\n        code: tokenRegex,\n        id: {\n          exclude: VIRTUAL_MODULES.serverFnManifest,\n        },\n      },\n      handler(code, id) {\n        const env =\n          this.environment.name === opts.client.envName\n            ? 'client'\n            : this.environment.name === opts.server.envName\n              ? 'server'\n              : (() => {\n                  throw new Error(\n                    `Environment ${this.environment.name} not configured`,\n                  )\n                })()\n\n        return transformCode({\n          code,\n          id,\n          env,\n          framework,\n        })\n      },\n    },\n  }\n}\n\nfunction transformCode(opts: {\n  code: string\n  id: string\n  env: 'server' | 'client'\n  framework: CompileStartFrameworkOptions\n}) {\n  const { code, env, framework } = opts\n  let { id } = opts\n\n  const url = pathToFileURL(id)\n  url.searchParams.delete('v')\n  id = fileURLToPath(url).replace(/\\\\/g, '/')\n\n  if (debug) console.info(`${env} Compiling Start: `, id)\n\n  const compileStartOutput = compileStartOutputFactory(framework)\n  const compiled = compileStartOutput({\n    code,\n    filename: id,\n    env,\n  })\n\n  if (debug) {\n    logDiff(code, compiled.code)\n    console.log('Output:\\n', compiled.code + '\\n\\n')\n  }\n\n  return compiled\n}\n"],"names":[],"mappings":";;;;;AASA,MAAM,QACJ,QAAQ,IAAI,kBACZ,CAAC,QAAQ,cAAc,EAAE,SAAS,QAAQ,IAAI,cAAc;AAM9D,MAAM,aAAa,IAAI,OAAO,eAAe,KAAK,GAAG,CAAC;AAE/C,SAAS,oBACd,WACA,WAQQ;AACR,QAAM,OAAO;AAAA,IACX,QAAQ;AAAA,MACN,SAAS;AAAA,MACT,GAAG,WAAW;AAAA,IAAA;AAAA,IAEhB,QAAQ;AAAA,MACN,SAAS;AAAA,MACT,GAAG,WAAW;AAAA,IAAA;AAAA,EAChB;AAGF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,mBAAmB,KAAK;AACtB,aAAO,CAAC,KAAK,OAAO,SAAS,KAAK,OAAO,OAAO,EAAE,SAAS,IAAI,IAAI;AAAA,IACrE;AAAA,IACA,WAAW;AAAA,MACT,QAAQ;AAAA,QACN,MAAM;AAAA,QACN,IAAI;AAAA,UACF,SAAS,gBAAgB;AAAA,QAAA;AAAA,MAC3B;AAAA,MAEF,QAAQ,MAAM,IAAI;AAChB,cAAM,MACJ,KAAK,YAAY,SAAS,KAAK,OAAO,UAClC,WACA,KAAK,YAAY,SAAS,KAAK,OAAO,UACpC,YACC,MAAM;AACL,gBAAM,IAAI;AAAA,YACR,eAAe,KAAK,YAAY,IAAI;AAAA,UAAA;AAAA,QAExC,GAAA;AAER,eAAO,cAAc;AAAA,UACnB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA,CACD;AAAA,MACH;AAAA,IAAA;AAAA,EACF;AAEJ;AAEA,SAAS,cAAc,MAKpB;AACD,QAAM,EAAE,MAAM,KAAK,UAAA,IAAc;AACjC,MAAI,EAAE,OAAO;AAEb,QAAM,MAAM,cAAc,EAAE;AAC5B,MAAI,aAAa,OAAO,GAAG;AAC3B,OAAK,cAAc,GAAG,EAAE,QAAQ,OAAO,GAAG;AAE1C,MAAI,MAAO,SAAQ,KAAK,GAAG,GAAG,sBAAsB,EAAE;AAEtD,QAAM,qBAAqB,0BAA0B,SAAS;AAC9D,QAAM,WAAW,mBAAmB;AAAA,IAClC;AAAA,IACA,UAAU;AAAA,IACV;AAAA,EAAA,CACD;AAED,MAAI,OAAO;AACT,YAAQ,MAAM,SAAS,IAAI;AAC3B,YAAQ,IAAI,aAAa,SAAS,OAAO,MAAM;AAAA,EACjD;AAEA,SAAO;AACT;"}
+{"version":3,"file":"plugin.js","sources":["../../../src/start-compiler-plugin/plugin.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url'\nimport { createRequire } from 'node:module'\nimport { logDiff } from '@tanstack/router-utils'\n\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { normalizePath } from 'vite'\nimport path from 'pathe'\nimport { VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { compileStartOutputFactory } from './compilers'\nimport { transformFuncs } from './constants'\nimport type { Plugin } from 'vite'\nimport type { CompileStartFrameworkOptions } from './compilers'\n\nconst debug =\n  process.env.TSR_VITE_DEBUG &&\n  ['true', 'start-plugin'].includes(process.env.TSR_VITE_DEBUG)\n\nexport type TanStackStartViteOptions = {\n  globalMiddlewareEntry: string\n}\n\nconst tokenRegex = new RegExp(transformFuncs.join('|'))\n\nconst require = createRequire(import.meta.url)\n\nfunction resolveRuntimeFiles(opts: { package: string; files: Array<string> }) {\n  const pkgRoot = resolvePackage(opts.package)\n  const basePath = path.join(pkgRoot, 'dist', 'esm')\n\n  return opts.files.map((file) => normalizePath(path.join(basePath, file)))\n}\n\nfunction resolvePackage(packageName: string): string {\n  const pkgRoot = path.dirname(require.resolve(packageName + '/package.json'))\n  return pkgRoot\n}\n\nexport function startCompilerPlugin(\n  framework: CompileStartFrameworkOptions,\n  inputOpts?: {\n    client?: {\n      envName?: string\n    }\n    server?: {\n      envName?: string\n    }\n  },\n): Plugin {\n  const opts = {\n    client: {\n      envName: VITE_ENVIRONMENT_NAMES.client,\n      ...inputOpts?.client,\n    },\n    server: {\n      envName: VITE_ENVIRONMENT_NAMES.server,\n      ...inputOpts?.server,\n    },\n  }\n\n  const compileStartOutput = compileStartOutputFactory(framework)\n\n  return {\n    name: 'tanstack-start-core:compiler',\n    enforce: 'pre',\n    applyToEnvironment(env) {\n      return [opts.client.envName, opts.server.envName].includes(env.name)\n    },\n    transform: {\n      filter: {\n        code: tokenRegex,\n        id: {\n          exclude: [\n            VIRTUAL_MODULES.serverFnManifest,\n            // N.B. the following files either just re-export or provide the runtime implementation of those functions\n            // we do not want to include them in the transformation\n            // however, those packages (especially start-client-core ATM) also USE these functions\n            // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed\n            ...resolveRuntimeFiles({\n              package: '@tanstack/start-client-core',\n              files: [\n                'index.js',\n                'createIsomorphicFn.js',\n                'envOnly.js',\n                'createServerFn.js',\n                'createMiddleware.js',\n                'serverFnFetcher.js',\n              ],\n            }),\n            ...resolveRuntimeFiles({\n              package: '@tanstack/start-server-core',\n              files: [\n                'index.js',\n                'server-functions-handler.js',\n                'serverRoute.js',\n              ],\n            }),\n            ...resolveRuntimeFiles({\n              package: `@tanstack/${framework}-start-client`,\n              files: ['index.js'],\n            }),\n          ],\n        },\n      },\n      handler(code, id) {\n        const env =\n          this.environment.name === opts.client.envName\n            ? 'client'\n            : this.environment.name === opts.server.envName\n              ? 'server'\n              : (() => {\n                  throw new Error(\n                    `Environment ${this.environment.name} not configured`,\n                  )\n                })()\n\n        const url = pathToFileURL(id)\n        url.searchParams.delete('v')\n        id = fileURLToPath(url).replace(/\\\\/g, '/')\n\n        if (debug) console.info(`${env} Compiling Start: `, id)\n\n        const compiled = compileStartOutput({\n          code,\n          filename: id,\n          env,\n        })\n\n        if (debug) {\n          logDiff(code, compiled.code)\n          console.log('Output:\\n', compiled.code + '\\n\\n')\n        }\n\n        return compiled\n      },\n    },\n  }\n}\n"],"names":["require"],"mappings":";;;;;;;;;AAaA,MAAM,QACJ,QAAQ,IAAI,kBACZ,CAAC,QAAQ,cAAc,EAAE,SAAS,QAAQ,IAAI,cAAc;AAM9D,MAAM,aAAa,IAAI,OAAO,eAAe,KAAK,GAAG,CAAC;AAEtD,MAAMA,WAAU,cAAc,YAAY,GAAG;AAE7C,SAAS,oBAAoB,MAAiD;AAC5E,QAAM,UAAU,eAAe,KAAK,OAAO;AAC3C,QAAM,WAAW,KAAK,KAAK,SAAS,QAAQ,KAAK;AAEjD,SAAO,KAAK,MAAM,IAAI,CAAC,SAAS,cAAc,KAAK,KAAK,UAAU,IAAI,CAAC,CAAC;AAC1E;AAEA,SAAS,eAAe,aAA6B;AACnD,QAAM,UAAU,KAAK,QAAQA,SAAQ,QAAQ,cAAc,eAAe,CAAC;AAC3E,SAAO;AACT;AAEO,SAAS,oBACd,WACA,WAQQ;AACR,QAAM,OAAO;AAAA,IACX,QAAQ;AAAA,MACN,SAAS,uBAAuB;AAAA,MAChC,GAAG,WAAW;AAAA,IAAA;AAAA,IAEhB,QAAQ;AAAA,MACN,SAAS,uBAAuB;AAAA,MAChC,GAAG,WAAW;AAAA,IAAA;AAAA,EAChB;AAGF,QAAM,qBAAqB,0BAA0B,SAAS;AAE9D,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,mBAAmB,KAAK;AACtB,aAAO,CAAC,KAAK,OAAO,SAAS,KAAK,OAAO,OAAO,EAAE,SAAS,IAAI,IAAI;AAAA,IACrE;AAAA,IACA,WAAW;AAAA,MACT,QAAQ;AAAA,QACN,MAAM;AAAA,QACN,IAAI;AAAA,UACF,SAAS;AAAA,YACP,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA,YAKhB,GAAG,oBAAoB;AAAA,cACrB,SAAS;AAAA,cACT,OAAO;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,cAAA;AAAA,YACF,CACD;AAAA,YACD,GAAG,oBAAoB;AAAA,cACrB,SAAS;AAAA,cACT,OAAO;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA;AAAA,cAAA;AAAA,YACF,CACD;AAAA,YACD,GAAG,oBAAoB;AAAA,cACrB,SAAS,aAAa,SAAS;AAAA,cAC/B,OAAO,CAAC,UAAU;AAAA,YAAA,CACnB;AAAA,UAAA;AAAA,QACH;AAAA,MACF;AAAA,MAEF,QAAQ,MAAM,IAAI;AAChB,cAAM,MACJ,KAAK,YAAY,SAAS,KAAK,OAAO,UAClC,WACA,KAAK,YAAY,SAAS,KAAK,OAAO,UACpC,YACC,MAAM;AACL,gBAAM,IAAI;AAAA,YACR,eAAe,KAAK,YAAY,IAAI;AAAA,UAAA;AAAA,QAExC,GAAA;AAER,cAAM,MAAM,cAAc,EAAE;AAC5B,YAAI,aAAa,OAAO,GAAG;AAC3B,aAAK,cAAc,GAAG,EAAE,QAAQ,OAAO,GAAG;AAE1C,YAAI,MAAO,SAAQ,KAAK,GAAG,GAAG,sBAAsB,EAAE;AAEtD,cAAM,WAAW,mBAAmB;AAAA,UAClC;AAAA,UACA,UAAU;AAAA,UACV;AAAA,QAAA,CACD;AAED,YAAI,OAAO;AACT,kBAAQ,MAAM,SAAS,IAAI;AAC3B,kBAAQ,IAAI,aAAa,SAAS,OAAO,MAAM;AAAA,QACjD;AAEA,eAAO;AAAA,MACT;AAAA,IAAA;AAAA,EACF;AAEJ;"}

package/dist/esm/start-compiler-plugin/serverFileRoute.d.ts

@@ -0,0 +1,4 @@
+import { CompileOptions, CompileStartFrameworkOptions } from './compilers.js';
+import * as t from '@babel/types';
+import type * as babel from '@babel/core';
+export declare function handleCreateServerFileRouteCallExpressionFactory(framework: CompileStartFrameworkOptions, method: 'createServerFileRoute' | 'createServerRoute' | 'createServerRootRoute'): (path: babel.NodePath<t.CallExpression>, opts: CompileOptions) => void;

package/dist/esm/start-compiler-plugin/serverFileRoute.js

@@ -0,0 +1,38 @@
+import * as t from "@babel/types";
+function handleCreateServerFileRouteCallExpressionFactory(framework, method) {
+  return function handleCreateServerFileRouteCallExpression(path, opts) {
+    const PACKAGES = { start: `@tanstack/${framework}-start/server` };
+    let highestParent = path;
+    while (highestParent.parentPath && !highestParent.parentPath.isProgram()) {
+      highestParent = highestParent.parentPath;
+    }
+    const programPath = highestParent.parentPath;
+    if (opts.env === "client") {
+      highestParent.remove();
+      return;
+    }
+    let isCreateServerFileRouteImported = false;
+    programPath.traverse({
+      ImportDeclaration(importPath) {
+        const importSource = importPath.node.source.value;
+        if (importSource === PACKAGES.start) {
+          const specifiers = importPath.node.specifiers;
+          isCreateServerFileRouteImported ||= specifiers.some((specifier) => {
+            return t.isImportSpecifier(specifier) && t.isIdentifier(specifier.imported) && specifier.imported.name === method;
+          });
+        }
+      }
+    });
+    if (!isCreateServerFileRouteImported) {
+      const importDeclaration = t.importDeclaration(
+        [t.importSpecifier(t.identifier(method), t.identifier(method))],
+        t.stringLiteral(PACKAGES.start)
+      );
+      programPath.node.body.unshift(importDeclaration);
+    }
+  };
+}
+export {
+  handleCreateServerFileRouteCallExpressionFactory
+};
+//# sourceMappingURL=serverFileRoute.js.map

package/dist/esm/start-compiler-plugin/serverFileRoute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverFileRoute.js","sources":["../../../src/start-compiler-plugin/serverFileRoute.ts"],"sourcesContent":["import * as t from '@babel/types'\nimport type * as babel from '@babel/core'\n\nimport type { CompileOptions, CompileStartFrameworkOptions } from './compilers'\n\nexport function handleCreateServerFileRouteCallExpressionFactory(\n  framework: CompileStartFrameworkOptions,\n  method:\n    | 'createServerFileRoute'\n    | 'createServerRoute'\n    | 'createServerRootRoute',\n) {\n  return function handleCreateServerFileRouteCallExpression(\n    path: babel.NodePath<t.CallExpression>,\n    opts: CompileOptions,\n  ) {\n    const PACKAGES = { start: `@tanstack/${framework}-start/server` }\n\n    let highestParent: babel.NodePath<any> = path\n\n    while (highestParent.parentPath && !highestParent.parentPath.isProgram()) {\n      highestParent = highestParent.parentPath\n    }\n\n    const programPath = highestParent.parentPath as babel.NodePath<t.Program>\n\n    // If we're on the client, remove the entire variable\n    if (opts.env === 'client') {\n      highestParent.remove()\n      return\n    }\n\n    let isCreateServerFileRouteImported = false as boolean\n\n    programPath.traverse({\n      ImportDeclaration(importPath) {\n        const importSource = importPath.node.source.value\n        if (importSource === PACKAGES.start) {\n          const specifiers = importPath.node.specifiers\n          isCreateServerFileRouteImported ||= specifiers.some((specifier) => {\n            return (\n              t.isImportSpecifier(specifier) &&\n              t.isIdentifier(specifier.imported) &&\n              specifier.imported.name === method\n            )\n          })\n        }\n      },\n    })\n\n    if (!isCreateServerFileRouteImported) {\n      const importDeclaration = t.importDeclaration(\n        [t.importSpecifier(t.identifier(method), t.identifier(method))],\n        t.stringLiteral(PACKAGES.start),\n      )\n      programPath.node.body.unshift(importDeclaration)\n    }\n  }\n}\n"],"names":[],"mappings":";AAKO,SAAS,iDACd,WACA,QAIA;AACA,SAAO,SAAS,0CACd,MACA,MACA;AACA,UAAM,WAAW,EAAE,OAAO,aAAa,SAAS,gBAAA;AAEhD,QAAI,gBAAqC;AAEzC,WAAO,cAAc,cAAc,CAAC,cAAc,WAAW,aAAa;AACxE,sBAAgB,cAAc;AAAA,IAChC;AAEA,UAAM,cAAc,cAAc;AAGlC,QAAI,KAAK,QAAQ,UAAU;AACzB,oBAAc,OAAA;AACd;AAAA,IACF;AAEA,QAAI,kCAAkC;AAEtC,gBAAY,SAAS;AAAA,MACnB,kBAAkB,YAAY;AAC5B,cAAM,eAAe,WAAW,KAAK,OAAO;AAC5C,YAAI,iBAAiB,SAAS,OAAO;AACnC,gBAAM,aAAa,WAAW,KAAK;AACnC,8CAAoC,WAAW,KAAK,CAAC,cAAc;AACjE,mBACE,EAAE,kBAAkB,SAAS,KAC7B,EAAE,aAAa,UAAU,QAAQ,KACjC,UAAU,SAAS,SAAS;AAAA,UAEhC,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IAAA,CACD;AAED,QAAI,CAAC,iCAAiC;AACpC,YAAM,oBAAoB,EAAE;AAAA,QAC1B,CAAC,EAAE,gBAAgB,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,MAAM,CAAC,CAAC;AAAA,QAC9D,EAAE,cAAc,SAAS,KAAK;AAAA,MAAA;AAEhC,kBAAY,KAAK,KAAK,QAAQ,iBAAiB;AAAA,IACjD;AAAA,EACF;AACF;"}

package/dist/esm/start-compiler-plugin/serverFn.d.ts

@@ -0,0 +1,4 @@
+import { CompileOptions } from './compilers.js';
+import * as t from '@babel/types';
+import type * as babel from '@babel/core';
+export declare function handleCreateServerFnCallExpression(path: babel.NodePath<t.CallExpression>, opts: CompileOptions): void;

package/dist/esm/start-compiler-plugin/serverFn.js

@@ -0,0 +1,87 @@
+import * as t from "@babel/types";
+import { getRootCallExpression, codeFrameError } from "./utils.js";
+function handleCreateServerFnCallExpression(path, opts) {
+  const calledOptions = path.node.arguments[0] ? path.get("arguments.0") : null;
+  const shouldValidateClient = !!calledOptions?.node.properties.find((prop) => {
+    return t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "validateClient" && t.isBooleanLiteral(prop.value) && prop.value.value === true;
+  });
+  const callExpressionPaths = {
+    middleware: null,
+    validator: null,
+    handler: null
+  };
+  const validMethods = Object.keys(callExpressionPaths);
+  const rootCallExpression = getRootCallExpression(path);
+  if (!rootCallExpression.parentPath.isVariableDeclarator()) {
+    throw new Error("createServerFn must be assigned to a variable!");
+  }
+  const variableDeclarator = rootCallExpression.parentPath.node;
+  const existingVariableName = variableDeclarator.id.name;
+  rootCallExpression.traverse({
+    MemberExpression(memberExpressionPath) {
+      if (t.isIdentifier(memberExpressionPath.node.property)) {
+        const name = memberExpressionPath.node.property.name;
+        if (validMethods.includes(name) && memberExpressionPath.parentPath.isCallExpression()) {
+          callExpressionPaths[name] = memberExpressionPath.parentPath;
+        }
+      }
+    }
+  });
+  if (callExpressionPaths.validator) {
+    const innerInputExpression = callExpressionPaths.validator.node.arguments[0];
+    if (!innerInputExpression) {
+      throw new Error(
+        "createServerFn().validator() must be called with a validator!"
+      );
+    }
+    if (opts.env === "client" && !shouldValidateClient && t.isMemberExpression(callExpressionPaths.validator.node.callee)) {
+      callExpressionPaths.validator.replaceWith(
+        callExpressionPaths.validator.node.callee.object
+      );
+    }
+  }
+  const handlerFnPath = callExpressionPaths.handler?.get(
+    "arguments.0"
+  );
+  if (!callExpressionPaths.handler || !handlerFnPath.node) {
+    throw codeFrameError(
+      opts.code,
+      path.node.callee.loc,
+      `createServerFn must be called with a "handler" property!`
+    );
+  }
+  const handlerFn = handlerFnPath.node;
+  if (t.isIdentifier(handlerFn)) {
+    if (opts.env === "client") {
+      const binding = handlerFnPath.scope.getBinding(handlerFn.name);
+      if (binding) {
+        binding.path.remove();
+      }
+    }
+  }
+  handlerFnPath.replaceWith(
+    t.arrowFunctionExpression(
+      [t.identifier("opts"), t.identifier("signal")],
+      t.blockStatement(
+        // Everything in here is server-only, since the client
+        // will strip out anything in the 'use server' directive.
+        [
+          t.returnStatement(
+            t.callExpression(
+              t.identifier(`${existingVariableName}.__executeServer`),
+              [t.identifier("opts"), t.identifier("signal")]
+            )
+          )
+        ],
+        [t.directive(t.directiveLiteral("use server"))]
+      )
+    )
+  );
+  if (opts.env === "server") {
+    callExpressionPaths.handler.node.arguments.push(handlerFn);
+  }
+}
+export {
+  handleCreateServerFnCallExpression
+};
+//# sourceMappingURL=serverFn.js.map

package/dist/esm/start-compiler-plugin/serverFn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverFn.js","sources":["../../../src/start-compiler-plugin/serverFn.ts"],"sourcesContent":["import * as t from '@babel/types'\nimport { codeFrameError, getRootCallExpression } from './utils'\nimport type * as babel from '@babel/core'\n\nimport type { CompileOptions } from './compilers'\n\nexport function handleCreateServerFnCallExpression(\n  path: babel.NodePath<t.CallExpression>,\n  opts: CompileOptions,\n) {\n  // Traverse the member expression and find the call expressions for\n  // the validator, handler, and middleware methods. Check to make sure they\n  // are children of the createServerFn call expression.\n\n  const calledOptions = path.node.arguments[0]\n    ? (path.get('arguments.0') as babel.NodePath<t.ObjectExpression>)\n    : null\n\n  const shouldValidateClient = !!calledOptions?.node.properties.find((prop) => {\n    return (\n      t.isObjectProperty(prop) &&\n      t.isIdentifier(prop.key) &&\n      prop.key.name === 'validateClient' &&\n      t.isBooleanLiteral(prop.value) &&\n      prop.value.value === true\n    )\n  })\n\n  const callExpressionPaths = {\n    middleware: null as babel.NodePath<t.CallExpression> | null,\n    validator: null as babel.NodePath<t.CallExpression> | null,\n    handler: null as babel.NodePath<t.CallExpression> | null,\n  }\n\n  const validMethods = Object.keys(callExpressionPaths)\n\n  const rootCallExpression = getRootCallExpression(path)\n\n  // if (debug)\n  //   console.info(\n  //     'Handling createServerFn call expression:',\n  //     rootCallExpression.toString(),\n  //   )\n\n  // Check if the call is assigned to a variable\n  if (!rootCallExpression.parentPath.isVariableDeclarator()) {\n    throw new Error('createServerFn must be assigned to a variable!')\n  }\n\n  // Get the identifier name of the variable\n  const variableDeclarator = rootCallExpression.parentPath.node\n  const existingVariableName = (variableDeclarator.id as t.Identifier).name\n\n  rootCallExpression.traverse({\n    MemberExpression(memberExpressionPath) {\n      if (t.isIdentifier(memberExpressionPath.node.property)) {\n        const name = memberExpressionPath.node.property\n          .name as keyof typeof callExpressionPaths\n\n        if (\n          validMethods.includes(name) &&\n          memberExpressionPath.parentPath.isCallExpression()\n        ) {\n          callExpressionPaths[name] = memberExpressionPath.parentPath\n        }\n      }\n    },\n  })\n\n  if (callExpressionPaths.validator) {\n    const innerInputExpression = callExpressionPaths.validator.node.arguments[0]\n\n    if (!innerInputExpression) {\n      throw new Error(\n        'createServerFn().validator() must be called with a validator!',\n      )\n    }\n\n    // If we're on the client, and we're not validating the client, remove the validator call expression\n    if (\n      opts.env === 'client' &&\n      !shouldValidateClient &&\n      t.isMemberExpression(callExpressionPaths.validator.node.callee)\n    ) {\n      callExpressionPaths.validator.replaceWith(\n        callExpressionPaths.validator.node.callee.object,\n      )\n    }\n  }\n\n  // First, we need to move the handler function to a nested function call\n  // that is applied to the arguments passed to the server function.\n\n  const handlerFnPath = callExpressionPaths.handler?.get(\n    'arguments.0',\n  ) as babel.NodePath<any>\n\n  if (!callExpressionPaths.handler || !handlerFnPath.node) {\n    throw codeFrameError(\n      opts.code,\n      path.node.callee.loc!,\n      `createServerFn must be called with a \"handler\" property!`,\n    )\n  }\n\n  const handlerFn = handlerFnPath.node\n\n  // So, the way we do this is we give the handler function a way\n  // to access the serverFn ctx on the server via function scope.\n  // The 'use server' extracted function will be called with the\n  // payload from the client, then use the scoped serverFn ctx\n  // to execute the handler function.\n  // This way, we can do things like data and middleware validation\n  // in the __execute function without having to AST transform the\n  // handler function too much itself.\n\n  // .handler((optsOut, ctx) => {\n  //   return ((optsIn) => {\n  //     'use server'\n  //     ctx.__execute(handlerFn, optsIn)\n  //   })(optsOut)\n  // })\n\n  // If the handler function is an identifier and we're on the client, we need to\n  // remove the bound function from the file.\n  // If we're on the server, you can leave it, since it will get referenced\n  // as a second argument.\n\n  if (t.isIdentifier(handlerFn)) {\n    if (opts.env === 'client') {\n      // Find the binding for the handler function\n      const binding = handlerFnPath.scope.getBinding(handlerFn.name)\n      // Remove it\n      if (binding) {\n        binding.path.remove()\n      }\n    }\n    // If the env is server, just leave it alone\n  }\n\n  handlerFnPath.replaceWith(\n    t.arrowFunctionExpression(\n      [t.identifier('opts'), t.identifier('signal')],\n      t.blockStatement(\n        // Everything in here is server-only, since the client\n        // will strip out anything in the 'use server' directive.\n        [\n          t.returnStatement(\n            t.callExpression(\n              t.identifier(`${existingVariableName}.__executeServer`),\n              [t.identifier('opts'), t.identifier('signal')],\n            ),\n          ),\n        ],\n        [t.directive(t.directiveLiteral('use server'))],\n      ),\n    ),\n  )\n\n  if (opts.env === 'server') {\n    callExpressionPaths.handler.node.arguments.push(handlerFn)\n  }\n}\n"],"names":[],"mappings":";;AAMO,SAAS,mCACd,MACA,MACA;AAKA,QAAM,gBAAgB,KAAK,KAAK,UAAU,CAAC,IACtC,KAAK,IAAI,aAAa,IACvB;AAEJ,QAAM,uBAAuB,CAAC,CAAC,eAAe,KAAK,WAAW,KAAK,CAAC,SAAS;AAC3E,WACE,EAAE,iBAAiB,IAAI,KACvB,EAAE,aAAa,KAAK,GAAG,KACvB,KAAK,IAAI,SAAS,oBAClB,EAAE,iBAAiB,KAAK,KAAK,KAC7B,KAAK,MAAM,UAAU;AAAA,EAEzB,CAAC;AAED,QAAM,sBAAsB;AAAA,IAC1B,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,SAAS;AAAA,EAAA;AAGX,QAAM,eAAe,OAAO,KAAK,mBAAmB;AAEpD,QAAM,qBAAqB,sBAAsB,IAAI;AASrD,MAAI,CAAC,mBAAmB,WAAW,wBAAwB;AACzD,UAAM,IAAI,MAAM,gDAAgD;AAAA,EAClE;AAGA,QAAM,qBAAqB,mBAAmB,WAAW;AACzD,QAAM,uBAAwB,mBAAmB,GAAoB;AAErE,qBAAmB,SAAS;AAAA,IAC1B,iBAAiB,sBAAsB;AACrC,UAAI,EAAE,aAAa,qBAAqB,KAAK,QAAQ,GAAG;AACtD,cAAM,OAAO,qBAAqB,KAAK,SACpC;AAEH,YACE,aAAa,SAAS,IAAI,KAC1B,qBAAqB,WAAW,oBAChC;AACA,8BAAoB,IAAI,IAAI,qBAAqB;AAAA,QACnD;AAAA,MACF;AAAA,IACF;AAAA,EAAA,CACD;AAED,MAAI,oBAAoB,WAAW;AACjC,UAAM,uBAAuB,oBAAoB,UAAU,KAAK,UAAU,CAAC;AAE3E,QAAI,CAAC,sBAAsB;AACzB,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAGA,QACE,KAAK,QAAQ,YACb,CAAC,wBACD,EAAE,mBAAmB,oBAAoB,UAAU,KAAK,MAAM,GAC9D;AACA,0BAAoB,UAAU;AAAA,QAC5B,oBAAoB,UAAU,KAAK,OAAO;AAAA,MAAA;AAAA,IAE9C;AAAA,EACF;AAKA,QAAM,gBAAgB,oBAAoB,SAAS;AAAA,IACjD;AAAA,EAAA;AAGF,MAAI,CAAC,oBAAoB,WAAW,CAAC,cAAc,MAAM;AACvD,UAAM;AAAA,MACJ,KAAK;AAAA,MACL,KAAK,KAAK,OAAO;AAAA,MACjB;AAAA,IAAA;AAAA,EAEJ;AAEA,QAAM,YAAY,cAAc;AAuBhC,MAAI,EAAE,aAAa,SAAS,GAAG;AAC7B,QAAI,KAAK,QAAQ,UAAU;AAEzB,YAAM,UAAU,cAAc,MAAM,WAAW,UAAU,IAAI;AAE7D,UAAI,SAAS;AACX,gBAAQ,KAAK,OAAA;AAAA,MACf;AAAA,IACF;AAAA,EAEF;AAEA,gBAAc;AAAA,IACZ,EAAE;AAAA,MACA,CAAC,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,QAAQ,CAAC;AAAA,MAC7C,EAAE;AAAA;AAAA;AAAA,QAGA;AAAA,UACE,EAAE;AAAA,YACA,EAAE;AAAA,cACA,EAAE,WAAW,GAAG,oBAAoB,kBAAkB;AAAA,cACtD,CAAC,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,QAAQ,CAAC;AAAA,YAAA;AAAA,UAC/C;AAAA,QACF;AAAA,QAEF,CAAC,EAAE,UAAU,EAAE,iBAAiB,YAAY,CAAC,CAAC;AAAA,MAAA;AAAA,IAChD;AAAA,EACF;AAGF,MAAI,KAAK,QAAQ,UAAU;AACzB,wBAAoB,QAAQ,KAAK,UAAU,KAAK,SAAS;AAAA,EAC3D;AACF;"}

package/dist/esm/start-compiler-plugin/utils.d.ts

@@ -0,0 +1,13 @@
+import type * as t from '@babel/types';
+import type * as babel from '@babel/core';
+export declare function getRootCallExpression(path: babel.NodePath<t.CallExpression>): babel.NodePath<t.CallExpression>;
+export declare function codeFrameError(code: string, loc: {
+    start: {
+        line: number;
+        column: number;
+    };
+    end: {
+        line: number;
+        column: number;
+    };
+}, message: string): Error;

package/dist/esm/start-compiler-plugin/utils.js

@@ -0,0 +1,30 @@
+import { codeFrameColumns } from "@babel/code-frame";
+function getRootCallExpression(path) {
+  let rootCallExpression = path;
+  while (rootCallExpression.parentPath.isMemberExpression()) {
+    const parent = rootCallExpression.parentPath;
+    if (parent.parentPath.isCallExpression()) {
+      rootCallExpression = parent.parentPath;
+    }
+  }
+  return rootCallExpression;
+}
+function codeFrameError(code, loc, message) {
+  const frame = codeFrameColumns(
+    code,
+    {
+      start: loc.start,
+      end: loc.end
+    },
+    {
+      highlightCode: true,
+      message
+    }
+  );
+  return new Error(frame);
+}
+export {
+  codeFrameError,
+  getRootCallExpression
+};
+//# sourceMappingURL=utils.js.map

package/dist/esm/start-compiler-plugin/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sources":["../../../src/start-compiler-plugin/utils.ts"],"sourcesContent":["import { codeFrameColumns } from '@babel/code-frame'\nimport type * as t from '@babel/types'\nimport type * as babel from '@babel/core'\n\nexport function getRootCallExpression(path: babel.NodePath<t.CallExpression>) {\n  // Find the highest callExpression parent\n  let rootCallExpression: babel.NodePath<t.CallExpression> = path\n\n  // Traverse up the chain of CallExpressions\n  while (rootCallExpression.parentPath.isMemberExpression()) {\n    const parent = rootCallExpression.parentPath\n    if (parent.parentPath.isCallExpression()) {\n      rootCallExpression = parent.parentPath\n    }\n  }\n\n  return rootCallExpression\n}\n\nexport function codeFrameError(\n  code: string,\n  loc: {\n    start: { line: number; column: number }\n    end: { line: number; column: number }\n  },\n  message: string,\n) {\n  const frame = codeFrameColumns(\n    code,\n    {\n      start: loc.start,\n      end: loc.end,\n    },\n    {\n      highlightCode: true,\n      message,\n    },\n  )\n\n  return new Error(frame)\n}\n"],"names":[],"mappings":";AAIO,SAAS,sBAAsB,MAAwC;AAE5E,MAAI,qBAAuD;AAG3D,SAAO,mBAAmB,WAAW,sBAAsB;AACzD,UAAM,SAAS,mBAAmB;AAClC,QAAI,OAAO,WAAW,oBAAoB;AACxC,2BAAqB,OAAO;AAAA,IAC9B;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,eACd,MACA,KAIA,SACA;AACA,QAAM,QAAQ;AAAA,IACZ;AAAA,IACA;AAAA,MACE,OAAO,IAAI;AAAA,MACX,KAAK,IAAI;AAAA,IAAA;AAAA,IAEX;AAAA,MACE,eAAe;AAAA,MACf;AAAA,IAAA;AAAA,EACF;AAGF,SAAO,IAAI,MAAM,KAAK;AACxB;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.132.0-alpha.6",
+  "version": "1.132.0-alpha.8",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -57,12 +57,12 @@
     "vitefu": "^1.1.1",
     "xmlbuilder2": "^3.1.1",
     "zod": "^3.24.2",
-    "@tanstack/router-core": "1.132.0-alpha.4",
-    "@tanstack/router-generator": "1.132.0-alpha.4",
-    "@tanstack/router-plugin": "1.132.0-alpha.4",
+    "@tanstack/router-core": "1.132.0-alpha.8",
+    "@tanstack/router-generator": "1.132.0-alpha.8",
     "@tanstack/router-utils": "1.132.0-alpha.1",
+    "@tanstack/router-plugin": "1.132.0-alpha.8",
     "@tanstack/server-functions-plugin": "1.132.0-alpha.3",
-    "@tanstack/start-server-core": "1.132.0-alpha.5"
+    "@tanstack/start-server-core": "1.132.0-alpha.8"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",