@tanstack/start-plugin-core 1.132.0-alpha.7 → 1.132.0-alpha.9

package/dist/esm/create-server-fn-plugin/compiler.d.ts

@@ -0,0 +1,61 @@
+import { parseAst } from '@tanstack/router-utils';
+import * as t from '@babel/types';
+type Binding = {
+    type: 'import';
+    source: string;
+    importedName: string;
+    resolvedKind?: Kind;
+} | {
+    type: 'var';
+    init: t.Expression | null;
+    resolvedKind?: Kind;
+};
+type ExportEntry = {
+    tag: 'Normal';
+    name: string;
+} | {
+    tag: 'Default';
+    name: string;
+} | {
+    tag: 'Namespace';
+    name: string;
+    targetId: string;
+};
+type Kind = 'None' | 'Root' | 'Builder' | 'ServerFn';
+interface ModuleInfo {
+    id: string;
+    code: string;
+    ast: ReturnType<typeof parseAst>;
+    bindings: Map<string, Binding>;
+    exports: Map<string, ExportEntry>;
+}
+export declare class ServerFnCompiler {
+    private options;
+    private moduleCache;
+    private resolvedLibId;
+    private initialized;
+    constructor(options: {
+        env: 'client' | 'server';
+        libName: string;
+        rootExport: string;
+        loadModule: (id: string) => Promise<void>;
+        resolveId: (id: string, importer?: string) => Promise<string | null>;
+    });
+    private init;
+    ingestModule({ code, id }: {
+        code: string;
+        id: string;
+    }): ModuleInfo;
+    invalidateModule(id: string): boolean;
+    compile({ code, id }: {
+        code: string;
+        id: string;
+    }): Promise<import('@tanstack/router-utils').GeneratorResult | null>;
+    private collectHandlerCandidates;
+    private resolveIdentifierKind;
+    private resolveBindingKind;
+    private resolveExprKind;
+    private resolveCalleeKind;
+    private getModuleInfo;
+}
+export {};

package/dist/esm/create-server-fn-plugin/compiler.js

@@ -0,0 +1,336 @@
+import * as t from "@babel/types";
+import { parseAst, generateFromAst } from "@tanstack/router-utils";
+import babel__default from "@babel/core";
+import { findReferencedIdentifiers, deadCodeElimination } from "babel-dead-code-elimination";
+import { handleCreateServerFn } from "./handleCreateServerFn.js";
+class ServerFnCompiler {
+  constructor(options) {
+    this.options = options;
+  }
+  moduleCache = /* @__PURE__ */ new Map();
+  resolvedLibId;
+  initialized = false;
+  async init(id) {
+    const libId = await this.options.resolveId(this.options.libName, id);
+    if (!libId) {
+      throw new Error(`could not resolve "${this.options.libName}"`);
+    }
+    const rootModule = {
+      ast: null,
+      bindings: /* @__PURE__ */ new Map(),
+      exports: /* @__PURE__ */ new Map(),
+      code: "",
+      id: libId
+    };
+    rootModule.exports.set(this.options.rootExport, {
+      tag: "Normal",
+      name: this.options.rootExport
+    });
+    rootModule.bindings.set(this.options.rootExport, {
+      type: "var",
+      init: t.identifier(this.options.rootExport),
+      resolvedKind: "Root"
+    });
+    this.moduleCache.set(libId, rootModule);
+    this.initialized = true;
+    this.resolvedLibId = libId;
+  }
+  ingestModule({ code, id }) {
+    const ast = parseAst({ code });
+    const bindings = /* @__PURE__ */ new Map();
+    const exports = /* @__PURE__ */ new Map();
+    for (const node of ast.program.body) {
+      if (t.isImportDeclaration(node)) {
+        const source = node.source.value;
+        for (const s of node.specifiers) {
+          if (t.isImportSpecifier(s)) {
+            const importedName = t.isIdentifier(s.imported) ? s.imported.name : s.imported.value;
+            bindings.set(s.local.name, { type: "import", source, importedName });
+          } else if (t.isImportDefaultSpecifier(s)) {
+            bindings.set(s.local.name, {
+              type: "import",
+              source,
+              importedName: "default"
+            });
+          } else if (t.isImportNamespaceSpecifier(s)) {
+            bindings.set(s.local.name, {
+              type: "import",
+              source,
+              importedName: "*"
+            });
+          }
+        }
+      } else if (t.isVariableDeclaration(node)) {
+        for (const decl of node.declarations) {
+          if (t.isIdentifier(decl.id)) {
+            bindings.set(decl.id.name, {
+              type: "var",
+              init: decl.init ?? null
+            });
+          }
+        }
+      } else if (t.isExportNamedDeclaration(node)) {
+        if (node.declaration) {
+          if (t.isVariableDeclaration(node.declaration)) {
+            for (const d of node.declaration.declarations) {
+              if (t.isIdentifier(d.id)) {
+                exports.set(d.id.name, { tag: "Normal", name: d.id.name });
+                bindings.set(d.id.name, { type: "var", init: d.init ?? null });
+              }
+            }
+          }
+        }
+        for (const sp of node.specifiers) {
+          if (t.isExportNamespaceSpecifier(sp)) {
+            exports.set(sp.exported.name, {
+              tag: "Namespace",
+              name: sp.exported.name,
+              targetId: node.source?.value || ""
+            });
+          } else if (t.isExportSpecifier(sp)) {
+            const local = sp.local.name;
+            const exported = t.isIdentifier(sp.exported) ? sp.exported.name : sp.exported.value;
+            exports.set(exported, { tag: "Normal", name: local });
+          }
+        }
+      } else if (t.isExportDefaultDeclaration(node)) {
+        const d = node.declaration;
+        if (t.isIdentifier(d)) {
+          exports.set("default", { tag: "Default", name: d.name });
+        } else {
+          const synth = "__default_export__";
+          bindings.set(synth, { type: "var", init: d });
+          exports.set("default", { tag: "Default", name: synth });
+        }
+      }
+    }
+    const info = { code, id, ast, bindings, exports };
+    this.moduleCache.set(id, info);
+    return info;
+  }
+  invalidateModule(id) {
+    return this.moduleCache.delete(id);
+  }
+  async compile({ code, id }) {
+    if (!this.initialized) {
+      await this.init(id);
+    }
+    const { bindings, ast } = this.ingestModule({ code, id });
+    const candidates = this.collectHandlerCandidates(bindings);
+    if (candidates.length === 0) {
+      return null;
+    }
+    const toRewrite = [];
+    for (const handler of candidates) {
+      const kind = await this.resolveExprKind(handler, id);
+      if (kind === "ServerFn") {
+        toRewrite.push(handler);
+      }
+    }
+    if (toRewrite.length === 0) {
+      return null;
+    }
+    const pathsToRewrite = [];
+    babel__default.traverse(ast, {
+      CallExpression(path) {
+        const found = toRewrite.findIndex((h) => path.node === h);
+        if (found !== -1) {
+          pathsToRewrite.push(path);
+          toRewrite.splice(found, 1);
+        }
+      }
+    });
+    if (toRewrite.length > 0) {
+      throw new Error(
+        `Internal error: could not find all paths to rewrite. please file an issue`
+      );
+    }
+    const refIdents = findReferencedIdentifiers(ast);
+    pathsToRewrite.map(
+      (p) => handleCreateServerFn(p, { env: this.options.env, code })
+    );
+    deadCodeElimination(ast, refIdents);
+    return generateFromAst(ast, {
+      sourceMaps: true,
+      sourceFileName: id,
+      filename: id
+    });
+  }
+  // collects all `.handler(...)` CallExpressions at top-level
+  collectHandlerCandidates(bindings) {
+    const candidates = [];
+    for (const binding of bindings.values()) {
+      if (binding.type === "var") {
+        const handler = isHandlerCall(binding.init);
+        if (handler) {
+          candidates.push(handler);
+        }
+      }
+    }
+    return candidates;
+  }
+  async resolveIdentifierKind(ident, id, visited = /* @__PURE__ */ new Set()) {
+    const info = await this.getModuleInfo(id);
+    const binding = info.bindings.get(ident);
+    if (!binding) {
+      return "None";
+    }
+    if (binding.resolvedKind) {
+      return binding.resolvedKind;
+    }
+    const vKey = `${id}:${ident}`;
+    if (visited.has(vKey)) {
+      return "None";
+    }
+    visited.add(vKey);
+    const resolvedKind = await this.resolveBindingKind(binding, id, visited);
+    binding.resolvedKind = resolvedKind;
+    return resolvedKind;
+  }
+  async resolveBindingKind(binding, fileId, visited = /* @__PURE__ */ new Set()) {
+    if (binding.resolvedKind) {
+      return binding.resolvedKind;
+    }
+    if (binding.type === "import") {
+      const target = await this.options.resolveId(binding.source, fileId);
+      if (!target) {
+        return "None";
+      }
+      if (binding.importedName === "*") {
+        throw new Error(
+          `should never get here, namespace imports are handled in resolveCalleeKind`
+        );
+      }
+      const importedModule = await this.getModuleInfo(target);
+      const moduleExport = importedModule.exports.get(binding.importedName);
+      if (!moduleExport) {
+        return "None";
+      }
+      const importedBinding = importedModule.bindings.get(moduleExport.name);
+      if (!importedBinding) {
+        return "None";
+      }
+      if (importedBinding.resolvedKind) {
+        return importedBinding.resolvedKind;
+      }
+      const resolvedKind2 = await this.resolveBindingKind(
+        importedBinding,
+        importedModule.id,
+        visited
+      );
+      importedBinding.resolvedKind = resolvedKind2;
+      return resolvedKind2;
+    }
+    const resolvedKind = await this.resolveExprKind(
+      binding.init,
+      fileId,
+      visited
+    );
+    binding.resolvedKind = resolvedKind;
+    return resolvedKind;
+  }
+  async resolveExprKind(expr, fileId, visited = /* @__PURE__ */ new Set()) {
+    if (!expr) {
+      return "None";
+    }
+    let result = "None";
+    if (t.isCallExpression(expr)) {
+      if (!t.isExpression(expr.callee)) {
+        return "None";
+      }
+      const calleeKind = await this.resolveCalleeKind(
+        expr.callee,
+        fileId,
+        visited
+      );
+      if (calleeKind === "Root" || calleeKind === "Builder") {
+        return "Builder";
+      }
+      if (calleeKind === "ServerFn") {
+        return "ServerFn";
+      }
+    } else if (t.isMemberExpression(expr) && t.isIdentifier(expr.property)) {
+      result = await this.resolveCalleeKind(expr.object, fileId, visited);
+    }
+    if (result === "None" && t.isIdentifier(expr)) {
+      result = await this.resolveIdentifierKind(expr.name, fileId, visited);
+    }
+    if (result === "None" && t.isTSAsExpression(expr)) {
+      result = await this.resolveExprKind(expr.expression, fileId, visited);
+    }
+    if (result === "None" && t.isTSNonNullExpression(expr)) {
+      result = await this.resolveExprKind(expr.expression, fileId, visited);
+    }
+    if (result === "None" && t.isParenthesizedExpression(expr)) {
+      result = await this.resolveExprKind(expr.expression, fileId, visited);
+    }
+    return result;
+  }
+  async resolveCalleeKind(callee, fileId, visited = /* @__PURE__ */ new Set()) {
+    if (t.isIdentifier(callee)) {
+      return this.resolveIdentifierKind(callee.name, fileId, visited);
+    }
+    if (t.isMemberExpression(callee) && t.isIdentifier(callee.property)) {
+      const prop = callee.property.name;
+      if (prop === "handler") {
+        const base = await this.resolveExprKind(callee.object, fileId, visited);
+        if (base === "Root" || base === "Builder") {
+          return "ServerFn";
+        }
+        return "None";
+      }
+      if (t.isIdentifier(callee.object)) {
+        const info = await this.getModuleInfo(fileId);
+        const binding = info.bindings.get(callee.object.name);
+        if (binding && binding.type === "import" && binding.importedName === "*") {
+          const targetModuleId = await this.options.resolveId(
+            binding.source,
+            fileId
+          );
+          if (targetModuleId) {
+            const targetModule = await this.getModuleInfo(targetModuleId);
+            const exportEntry = targetModule.exports.get(callee.property.name);
+            if (exportEntry) {
+              const exportedBinding = targetModule.bindings.get(
+                exportEntry.name
+              );
+              if (exportedBinding) {
+                return await this.resolveBindingKind(
+                  exportedBinding,
+                  targetModule.id,
+                  visited
+                );
+              }
+            }
+          }
+        }
+      }
+      return this.resolveExprKind(callee.object, fileId, visited);
+    }
+    return this.resolveExprKind(callee, fileId, visited);
+  }
+  async getModuleInfo(id) {
+    let cached = this.moduleCache.get(id);
+    if (cached) {
+      return cached;
+    }
+    await this.options.loadModule(id);
+    cached = this.moduleCache.get(id);
+    if (!cached) {
+      throw new Error(`could not load module info for ${id}`);
+    }
+    return cached;
+  }
+}
+function isHandlerCall(node) {
+  if (!t.isCallExpression(node)) return void 0;
+  const callee = node.callee;
+  if (!t.isMemberExpression(callee) || !t.isIdentifier(callee.property, { name: "handler" })) {
+    return void 0;
+  }
+  return node;
+}
+export {
+  ServerFnCompiler
+};
+//# sourceMappingURL=compiler.js.map

package/dist/esm/create-server-fn-plugin/compiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compiler.js","sources":["../../../src/create-server-fn-plugin/compiler.ts"],"sourcesContent":["/* eslint-disable import/no-commonjs */\nimport * as t from '@babel/types'\nimport { generateFromAst, parseAst } from '@tanstack/router-utils'\nimport babel from '@babel/core'\nimport {\n  deadCodeElimination,\n  findReferencedIdentifiers,\n} from 'babel-dead-code-elimination'\nimport { handleCreateServerFn } from './handleCreateServerFn'\n\ntype Binding =\n  | {\n      type: 'import'\n      source: string\n      importedName: string\n      resolvedKind?: Kind\n    }\n  | {\n      type: 'var'\n      init: t.Expression | null\n      resolvedKind?: Kind\n    }\n\ntype ExportEntry =\n  | { tag: 'Normal'; name: string }\n  | { tag: 'Default'; name: string }\n  | { tag: 'Namespace'; name: string; targetId: string } // for `export * as ns from './x'`\n\ntype Kind = 'None' | 'Root' | 'Builder' | 'ServerFn'\n\ninterface ModuleInfo {\n  id: string\n  code: string\n  ast: ReturnType<typeof parseAst>\n  bindings: Map<string, Binding>\n  exports: Map<string, ExportEntry>\n}\n\nexport class ServerFnCompiler {\n  private moduleCache = new Map<string, ModuleInfo>()\n  private resolvedLibId!: string\n  private initialized = false\n  constructor(\n    private options: {\n      env: 'client' | 'server'\n      libName: string\n      rootExport: string\n      loadModule: (id: string) => Promise<void>\n      resolveId: (id: string, importer?: string) => Promise<string | null>\n    },\n  ) {}\n\n  private async init(id: string) {\n    const libId = await this.options.resolveId(this.options.libName, id)\n    if (!libId) {\n      throw new Error(`could not resolve \"${this.options.libName}\"`)\n    }\n    // insert root binding\n    const rootModule = {\n      ast: null as any,\n      bindings: new Map(),\n      exports: new Map(),\n      code: '',\n      id: libId,\n    }\n    rootModule.exports.set(this.options.rootExport, {\n      tag: 'Normal',\n      name: this.options.rootExport,\n    })\n    rootModule.bindings.set(this.options.rootExport, {\n      type: 'var',\n      init: t.identifier(this.options.rootExport),\n      resolvedKind: 'Root',\n    })\n    this.moduleCache.set(libId, rootModule)\n    this.initialized = true\n    this.resolvedLibId = libId\n  }\n\n  public ingestModule({ code, id }: { code: string; id: string }) {\n    const ast = parseAst({ code })\n\n    const bindings = new Map<string, Binding>()\n    const exports = new Map<string, ExportEntry>()\n\n    // we are only interested in top-level bindings, hence we don't traverse the AST\n    // instead we only iterate over the program body\n    for (const node of ast.program.body) {\n      if (t.isImportDeclaration(node)) {\n        const source = node.source.value\n        for (const s of node.specifiers) {\n          if (t.isImportSpecifier(s)) {\n            const importedName = t.isIdentifier(s.imported)\n              ? s.imported.name\n              : s.imported.value\n            bindings.set(s.local.name, { type: 'import', source, importedName })\n          } else if (t.isImportDefaultSpecifier(s)) {\n            bindings.set(s.local.name, {\n              type: 'import',\n              source,\n              importedName: 'default',\n            })\n          } else if (t.isImportNamespaceSpecifier(s)) {\n            bindings.set(s.local.name, {\n              type: 'import',\n              source,\n              importedName: '*',\n            })\n          }\n        }\n      } else if (t.isVariableDeclaration(node)) {\n        for (const decl of node.declarations) {\n          if (t.isIdentifier(decl.id)) {\n            bindings.set(decl.id.name, {\n              type: 'var',\n              init: decl.init ?? null,\n            })\n          }\n        }\n      } else if (t.isExportNamedDeclaration(node)) {\n        // export const foo = ...\n        if (node.declaration) {\n          if (t.isVariableDeclaration(node.declaration)) {\n            for (const d of node.declaration.declarations) {\n              if (t.isIdentifier(d.id)) {\n                exports.set(d.id.name, { tag: 'Normal', name: d.id.name })\n                bindings.set(d.id.name, { type: 'var', init: d.init ?? null })\n              }\n            }\n          }\n        }\n        for (const sp of node.specifiers) {\n          if (t.isExportNamespaceSpecifier(sp)) {\n            exports.set(sp.exported.name, {\n              tag: 'Namespace',\n              name: sp.exported.name,\n              targetId: node.source?.value || '',\n            })\n          }\n          // export { local as exported }\n          else if (t.isExportSpecifier(sp)) {\n            const local = sp.local.name\n            const exported = t.isIdentifier(sp.exported)\n              ? sp.exported.name\n              : sp.exported.value\n            exports.set(exported, { tag: 'Normal', name: local })\n          }\n        }\n      } else if (t.isExportDefaultDeclaration(node)) {\n        const d = node.declaration\n        if (t.isIdentifier(d)) {\n          exports.set('default', { tag: 'Default', name: d.name })\n        } else {\n          const synth = '__default_export__'\n          bindings.set(synth, { type: 'var', init: d as t.Expression })\n          exports.set('default', { tag: 'Default', name: synth })\n        }\n      }\n    }\n\n    const info: ModuleInfo = { code, id, ast, bindings, exports }\n    this.moduleCache.set(id, info)\n    return info\n  }\n\n  public invalidateModule(id: string) {\n    return this.moduleCache.delete(id)\n  }\n\n  public async compile({ code, id }: { code: string; id: string }) {\n    if (!this.initialized) {\n      await this.init(id)\n    }\n    const { bindings, ast } = this.ingestModule({ code, id })\n    const candidates = this.collectHandlerCandidates(bindings)\n    if (candidates.length === 0) {\n      // this hook will only be invoked if there is `.handler(` in the code,\n      // so not discovering a handler candidate is rather unlikely, but maybe possible?\n      return null\n    }\n\n    // let's find out which of the candidates are actually server functions\n    const toRewrite: Array<t.CallExpression> = []\n    for (const handler of candidates) {\n      const kind = await this.resolveExprKind(handler, id)\n      if (kind === 'ServerFn') {\n        toRewrite.push(handler)\n      }\n    }\n    if (toRewrite.length === 0) {\n      return null\n    }\n    const pathsToRewrite: Array<babel.NodePath<t.CallExpression>> = []\n    babel.traverse(ast, {\n      CallExpression(path) {\n        const found = toRewrite.findIndex((h) => path.node === h)\n        if (found !== -1) {\n          pathsToRewrite.push(path)\n          // delete from toRewrite\n          toRewrite.splice(found, 1)\n        }\n      },\n    })\n\n    if (toRewrite.length > 0) {\n      throw new Error(\n        `Internal error: could not find all paths to rewrite. please file an issue`,\n      )\n    }\n\n    const refIdents = findReferencedIdentifiers(ast)\n\n    pathsToRewrite.map((p) =>\n      handleCreateServerFn(p, { env: this.options.env, code }),\n    )\n\n    deadCodeElimination(ast, refIdents)\n\n    return generateFromAst(ast, {\n      sourceMaps: true,\n      sourceFileName: id,\n      filename: id,\n    })\n  }\n\n  // collects all `.handler(...)` CallExpressions at top-level\n  private collectHandlerCandidates(bindings: Map<string, Binding>) {\n    const candidates: Array<t.CallExpression> = []\n\n    for (const binding of bindings.values()) {\n      if (binding.type === 'var') {\n        const handler = isHandlerCall(binding.init)\n        if (handler) {\n          candidates.push(handler)\n        }\n      }\n    }\n    return candidates\n  }\n\n  private async resolveIdentifierKind(\n    ident: string,\n    id: string,\n    visited = new Set<string>(),\n  ): Promise<Kind> {\n    const info = await this.getModuleInfo(id)\n\n    const binding = info.bindings.get(ident)\n    if (!binding) {\n      return 'None'\n    }\n    if (binding.resolvedKind) {\n      return binding.resolvedKind\n    }\n\n    // TODO improve cycle detection? should we throw here instead of returning 'None'?\n    // prevent cycles\n    const vKey = `${id}:${ident}`\n    if (visited.has(vKey)) {\n      return 'None'\n    }\n    visited.add(vKey)\n\n    const resolvedKind = await this.resolveBindingKind(binding, id, visited)\n    binding.resolvedKind = resolvedKind\n    return resolvedKind\n  }\n\n  private async resolveBindingKind(\n    binding: Binding,\n    fileId: string,\n    visited = new Set<string>(),\n  ): Promise<Kind> {\n    if (binding.resolvedKind) {\n      return binding.resolvedKind\n    }\n    if (binding.type === 'import') {\n      const target = await this.options.resolveId(binding.source, fileId)\n      if (!target) {\n        return 'None'\n      }\n\n      if (binding.importedName === '*') {\n        throw new Error(\n          `should never get here, namespace imports are handled in resolveCalleeKind`,\n        )\n      }\n\n      const importedModule = await this.getModuleInfo(target)\n\n      const moduleExport = importedModule.exports.get(binding.importedName)\n      if (!moduleExport) {\n        return 'None'\n      }\n      const importedBinding = importedModule.bindings.get(moduleExport.name)\n      if (!importedBinding) {\n        return 'None'\n      }\n      if (importedBinding.resolvedKind) {\n        return importedBinding.resolvedKind\n      }\n\n      const resolvedKind = await this.resolveBindingKind(\n        importedBinding,\n        importedModule.id,\n        visited,\n      )\n      importedBinding.resolvedKind = resolvedKind\n      return resolvedKind\n    }\n\n    const resolvedKind = await this.resolveExprKind(\n      binding.init,\n      fileId,\n      visited,\n    )\n    binding.resolvedKind = resolvedKind\n    return resolvedKind\n  }\n\n  private async resolveExprKind(\n    expr: t.Expression | null,\n    fileId: string,\n    visited = new Set<string>(),\n  ): Promise<Kind> {\n    if (!expr) {\n      return 'None'\n    }\n\n    let result: Kind = 'None'\n\n    if (t.isCallExpression(expr)) {\n      if (!t.isExpression(expr.callee)) {\n        return 'None'\n      }\n      const calleeKind = await this.resolveCalleeKind(\n        expr.callee,\n        fileId,\n        visited,\n      )\n      if (calleeKind === 'Root' || calleeKind === 'Builder') {\n        return 'Builder'\n      }\n      if (calleeKind === 'ServerFn') {\n        return 'ServerFn'\n      }\n    } else if (t.isMemberExpression(expr) && t.isIdentifier(expr.property)) {\n      result = await this.resolveCalleeKind(expr.object, fileId, visited)\n    }\n\n    if (result === 'None' && t.isIdentifier(expr)) {\n      result = await this.resolveIdentifierKind(expr.name, fileId, visited)\n    }\n\n    if (result === 'None' && t.isTSAsExpression(expr)) {\n      result = await this.resolveExprKind(expr.expression, fileId, visited)\n    }\n    if (result === 'None' && t.isTSNonNullExpression(expr)) {\n      result = await this.resolveExprKind(expr.expression, fileId, visited)\n    }\n    if (result === 'None' && t.isParenthesizedExpression(expr)) {\n      result = await this.resolveExprKind(expr.expression, fileId, visited)\n    }\n\n    return result\n  }\n\n  private async resolveCalleeKind(\n    callee: t.Expression,\n    fileId: string,\n    visited = new Set<string>(),\n  ): Promise<Kind> {\n    if (t.isIdentifier(callee)) {\n      return this.resolveIdentifierKind(callee.name, fileId, visited)\n    }\n\n    if (t.isMemberExpression(callee) && t.isIdentifier(callee.property)) {\n      const prop = callee.property.name\n\n      if (prop === 'handler') {\n        const base = await this.resolveExprKind(callee.object, fileId, visited)\n        if (base === 'Root' || base === 'Builder') {\n          return 'ServerFn'\n        }\n        return 'None'\n      }\n      // Check if the object is a namespace import\n      if (t.isIdentifier(callee.object)) {\n        const info = await this.getModuleInfo(fileId)\n        const binding = info.bindings.get(callee.object.name)\n        if (\n          binding &&\n          binding.type === 'import' &&\n          binding.importedName === '*'\n        ) {\n          // resolve the property from the target module\n          const targetModuleId = await this.options.resolveId(\n            binding.source,\n            fileId,\n          )\n          if (targetModuleId) {\n            const targetModule = await this.getModuleInfo(targetModuleId)\n            const exportEntry = targetModule.exports.get(callee.property.name)\n            if (exportEntry) {\n              const exportedBinding = targetModule.bindings.get(\n                exportEntry.name,\n              )\n              if (exportedBinding) {\n                return await this.resolveBindingKind(\n                  exportedBinding,\n                  targetModule.id,\n                  visited,\n                )\n              }\n            }\n          }\n        }\n      }\n      return this.resolveExprKind(callee.object, fileId, visited)\n    }\n\n    // handle nested expressions\n    return this.resolveExprKind(callee, fileId, visited)\n  }\n\n  private async getModuleInfo(id: string) {\n    let cached = this.moduleCache.get(id)\n    if (cached) {\n      return cached\n    }\n\n    await this.options.loadModule(id)\n\n    cached = this.moduleCache.get(id)\n    if (!cached) {\n      throw new Error(`could not load module info for ${id}`)\n    }\n    return cached\n  }\n}\n\nfunction isHandlerCall(\n  node: t.Node | null | undefined,\n): undefined | t.CallExpression {\n  if (!t.isCallExpression(node)) return undefined\n\n  const callee = node.callee\n  if (\n    !t.isMemberExpression(callee) ||\n    !t.isIdentifier(callee.property, { name: 'handler' })\n  ) {\n    return undefined\n  }\n\n  return node\n}\n"],"names":["babel","resolvedKind"],"mappings":";;;;;AAsCO,MAAM,iBAAiB;AAAA,EAI5B,YACU,SAOR;AAPQ,SAAA,UAAA;AAAA,EAOP;AAAA,EAXK,kCAAkB,IAAA;AAAA,EAClB;AAAA,EACA,cAAc;AAAA,EAWtB,MAAc,KAAK,IAAY;AAC7B,UAAM,QAAQ,MAAM,KAAK,QAAQ,UAAU,KAAK,QAAQ,SAAS,EAAE;AACnE,QAAI,CAAC,OAAO;AACV,YAAM,IAAI,MAAM,sBAAsB,KAAK,QAAQ,OAAO,GAAG;AAAA,IAC/D;AAEA,UAAM,aAAa;AAAA,MACjB,KAAK;AAAA,MACL,8BAAc,IAAA;AAAA,MACd,6BAAa,IAAA;AAAA,MACb,MAAM;AAAA,MACN,IAAI;AAAA,IAAA;AAEN,eAAW,QAAQ,IAAI,KAAK,QAAQ,YAAY;AAAA,MAC9C,KAAK;AAAA,MACL,MAAM,KAAK,QAAQ;AAAA,IAAA,CACpB;AACD,eAAW,SAAS,IAAI,KAAK,QAAQ,YAAY;AAAA,MAC/C,MAAM;AAAA,MACN,MAAM,EAAE,WAAW,KAAK,QAAQ,UAAU;AAAA,MAC1C,cAAc;AAAA,IAAA,CACf;AACD,SAAK,YAAY,IAAI,OAAO,UAAU;AACtC,SAAK,cAAc;AACnB,SAAK,gBAAgB;AAAA,EACvB;AAAA,EAEO,aAAa,EAAE,MAAM,MAAoC;AAC9D,UAAM,MAAM,SAAS,EAAE,MAAM;AAE7B,UAAM,+BAAe,IAAA;AACrB,UAAM,8BAAc,IAAA;AAIpB,eAAW,QAAQ,IAAI,QAAQ,MAAM;AACnC,UAAI,EAAE,oBAAoB,IAAI,GAAG;AAC/B,cAAM,SAAS,KAAK,OAAO;AAC3B,mBAAW,KAAK,KAAK,YAAY;AAC/B,cAAI,EAAE,kBAAkB,CAAC,GAAG;AAC1B,kBAAM,eAAe,EAAE,aAAa,EAAE,QAAQ,IAC1C,EAAE,SAAS,OACX,EAAE,SAAS;AACf,qBAAS,IAAI,EAAE,MAAM,MAAM,EAAE,MAAM,UAAU,QAAQ,cAAc;AAAA,UACrE,WAAW,EAAE,yBAAyB,CAAC,GAAG;AACxC,qBAAS,IAAI,EAAE,MAAM,MAAM;AAAA,cACzB,MAAM;AAAA,cACN;AAAA,cACA,cAAc;AAAA,YAAA,CACf;AAAA,UACH,WAAW,EAAE,2BAA2B,CAAC,GAAG;AAC1C,qBAAS,IAAI,EAAE,MAAM,MAAM;AAAA,cACzB,MAAM;AAAA,cACN;AAAA,cACA,cAAc;AAAA,YAAA,CACf;AAAA,UACH;AAAA,QACF;AAAA,MACF,WAAW,EAAE,sBAAsB,IAAI,GAAG;AACxC,mBAAW,QAAQ,KAAK,cAAc;AACpC,cAAI,EAAE,aAAa,KAAK,EAAE,GAAG;AAC3B,qBAAS,IAAI,KAAK,GAAG,MAAM;AAAA,cACzB,MAAM;AAAA,cACN,MAAM,KAAK,QAAQ;AAAA,YAAA,CACpB;AAAA,UACH;AAAA,QACF;AAAA,MACF,WAAW,EAAE,yBAAyB,IAAI,GAAG;AAE3C,YAAI,KAAK,aAAa;AACpB,cAAI,EAAE,sBAAsB,KAAK,WAAW,GAAG;AAC7C,uBAAW,KAAK,KAAK,YAAY,cAAc;AAC7C,kBAAI,EAAE,aAAa,EAAE,EAAE,GAAG;AACxB,wBAAQ,IAAI,EAAE,GAAG,MAAM,EAAE,KAAK,UAAU,MAAM,EAAE,GAAG,KAAA,CAAM;AACzD,yBAAS,IAAI,EAAE,GAAG,MAAM,EAAE,MAAM,OAAO,MAAM,EAAE,QAAQ,KAAA,CAAM;AAAA,cAC/D;AAAA,YACF;AAAA,UACF;AAAA,QACF;AACA,mBAAW,MAAM,KAAK,YAAY;AAChC,cAAI,EAAE,2BAA2B,EAAE,GAAG;AACpC,oBAAQ,IAAI,GAAG,SAAS,MAAM;AAAA,cAC5B,KAAK;AAAA,cACL,MAAM,GAAG,SAAS;AAAA,cAClB,UAAU,KAAK,QAAQ,SAAS;AAAA,YAAA,CACjC;AAAA,UACH,WAES,EAAE,kBAAkB,EAAE,GAAG;AAChC,kBAAM,QAAQ,GAAG,MAAM;AACvB,kBAAM,WAAW,EAAE,aAAa,GAAG,QAAQ,IACvC,GAAG,SAAS,OACZ,GAAG,SAAS;AAChB,oBAAQ,IAAI,UAAU,EAAE,KAAK,UAAU,MAAM,OAAO;AAAA,UACtD;AAAA,QACF;AAAA,MACF,WAAW,EAAE,2BAA2B,IAAI,GAAG;AAC7C,cAAM,IAAI,KAAK;AACf,YAAI,EAAE,aAAa,CAAC,GAAG;AACrB,kBAAQ,IAAI,WAAW,EAAE,KAAK,WAAW,MAAM,EAAE,MAAM;AAAA,QACzD,OAAO;AACL,gBAAM,QAAQ;AACd,mBAAS,IAAI,OAAO,EAAE,MAAM,OAAO,MAAM,GAAmB;AAC5D,kBAAQ,IAAI,WAAW,EAAE,KAAK,WAAW,MAAM,OAAO;AAAA,QACxD;AAAA,MACF;AAAA,IACF;AAEA,UAAM,OAAmB,EAAE,MAAM,IAAI,KAAK,UAAU,QAAA;AACpD,SAAK,YAAY,IAAI,IAAI,IAAI;AAC7B,WAAO;AAAA,EACT;AAAA,EAEO,iBAAiB,IAAY;AAClC,WAAO,KAAK,YAAY,OAAO,EAAE;AAAA,EACnC;AAAA,EAEA,MAAa,QAAQ,EAAE,MAAM,MAAoC;AAC/D,QAAI,CAAC,KAAK,aAAa;AACrB,YAAM,KAAK,KAAK,EAAE;AAAA,IACpB;AACA,UAAM,EAAE,UAAU,QAAQ,KAAK,aAAa,EAAE,MAAM,IAAI;AACxD,UAAM,aAAa,KAAK,yBAAyB,QAAQ;AACzD,QAAI,WAAW,WAAW,GAAG;AAG3B,aAAO;AAAA,IACT;AAGA,UAAM,YAAqC,CAAA;AAC3C,eAAW,WAAW,YAAY;AAChC,YAAM,OAAO,MAAM,KAAK,gBAAgB,SAAS,EAAE;AACnD,UAAI,SAAS,YAAY;AACvB,kBAAU,KAAK,OAAO;AAAA,MACxB;AAAA,IACF;AACA,QAAI,UAAU,WAAW,GAAG;AAC1B,aAAO;AAAA,IACT;AACA,UAAM,iBAA0D,CAAA;AAChEA,mBAAM,SAAS,KAAK;AAAA,MAClB,eAAe,MAAM;AACnB,cAAM,QAAQ,UAAU,UAAU,CAAC,MAAM,KAAK,SAAS,CAAC;AACxD,YAAI,UAAU,IAAI;AAChB,yBAAe,KAAK,IAAI;AAExB,oBAAU,OAAO,OAAO,CAAC;AAAA,QAC3B;AAAA,MACF;AAAA,IAAA,CACD;AAED,QAAI,UAAU,SAAS,GAAG;AACxB,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAEA,UAAM,YAAY,0BAA0B,GAAG;AAE/C,mBAAe;AAAA,MAAI,CAAC,MAClB,qBAAqB,GAAG,EAAE,KAAK,KAAK,QAAQ,KAAK,KAAA,CAAM;AAAA,IAAA;AAGzD,wBAAoB,KAAK,SAAS;AAElC,WAAO,gBAAgB,KAAK;AAAA,MAC1B,YAAY;AAAA,MACZ,gBAAgB;AAAA,MAChB,UAAU;AAAA,IAAA,CACX;AAAA,EACH;AAAA;AAAA,EAGQ,yBAAyB,UAAgC;AAC/D,UAAM,aAAsC,CAAA;AAE5C,eAAW,WAAW,SAAS,UAAU;AACvC,UAAI,QAAQ,SAAS,OAAO;AAC1B,cAAM,UAAU,cAAc,QAAQ,IAAI;AAC1C,YAAI,SAAS;AACX,qBAAW,KAAK,OAAO;AAAA,QACzB;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,sBACZ,OACA,IACA,UAAU,oBAAI,OACC;AACf,UAAM,OAAO,MAAM,KAAK,cAAc,EAAE;AAExC,UAAM,UAAU,KAAK,SAAS,IAAI,KAAK;AACvC,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AACA,QAAI,QAAQ,cAAc;AACxB,aAAO,QAAQ;AAAA,IACjB;AAIA,UAAM,OAAO,GAAG,EAAE,IAAI,KAAK;AAC3B,QAAI,QAAQ,IAAI,IAAI,GAAG;AACrB,aAAO;AAAA,IACT;AACA,YAAQ,IAAI,IAAI;AAEhB,UAAM,eAAe,MAAM,KAAK,mBAAmB,SAAS,IAAI,OAAO;AACvE,YAAQ,eAAe;AACvB,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,mBACZ,SACA,QACA,UAAU,oBAAI,OACC;AACf,QAAI,QAAQ,cAAc;AACxB,aAAO,QAAQ;AAAA,IACjB;AACA,QAAI,QAAQ,SAAS,UAAU;AAC7B,YAAM,SAAS,MAAM,KAAK,QAAQ,UAAU,QAAQ,QAAQ,MAAM;AAClE,UAAI,CAAC,QAAQ;AACX,eAAO;AAAA,MACT;AAEA,UAAI,QAAQ,iBAAiB,KAAK;AAChC,cAAM,IAAI;AAAA,UACR;AAAA,QAAA;AAAA,MAEJ;AAEA,YAAM,iBAAiB,MAAM,KAAK,cAAc,MAAM;AAEtD,YAAM,eAAe,eAAe,QAAQ,IAAI,QAAQ,YAAY;AACpE,UAAI,CAAC,cAAc;AACjB,eAAO;AAAA,MACT;AACA,YAAM,kBAAkB,eAAe,SAAS,IAAI,aAAa,IAAI;AACrE,UAAI,CAAC,iBAAiB;AACpB,eAAO;AAAA,MACT;AACA,UAAI,gBAAgB,cAAc;AAChC,eAAO,gBAAgB;AAAA,MACzB;AAEA,YAAMC,gBAAe,MAAM,KAAK;AAAA,QAC9B;AAAA,QACA,eAAe;AAAA,QACf;AAAA,MAAA;AAEF,sBAAgB,eAAeA;AAC/B,aAAOA;AAAAA,IACT;AAEA,UAAM,eAAe,MAAM,KAAK;AAAA,MAC9B,QAAQ;AAAA,MACR;AAAA,MACA;AAAA,IAAA;AAEF,YAAQ,eAAe;AACvB,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,gBACZ,MACA,QACA,UAAU,oBAAI,OACC;AACf,QAAI,CAAC,MAAM;AACT,aAAO;AAAA,IACT;AAEA,QAAI,SAAe;AAEnB,QAAI,EAAE,iBAAiB,IAAI,GAAG;AAC5B,UAAI,CAAC,EAAE,aAAa,KAAK,MAAM,GAAG;AAChC,eAAO;AAAA,MACT;AACA,YAAM,aAAa,MAAM,KAAK;AAAA,QAC5B,KAAK;AAAA,QACL;AAAA,QACA;AAAA,MAAA;AAEF,UAAI,eAAe,UAAU,eAAe,WAAW;AACrD,eAAO;AAAA,MACT;AACA,UAAI,eAAe,YAAY;AAC7B,eAAO;AAAA,MACT;AAAA,IACF,WAAW,EAAE,mBAAmB,IAAI,KAAK,EAAE,aAAa,KAAK,QAAQ,GAAG;AACtE,eAAS,MAAM,KAAK,kBAAkB,KAAK,QAAQ,QAAQ,OAAO;AAAA,IACpE;AAEA,QAAI,WAAW,UAAU,EAAE,aAAa,IAAI,GAAG;AAC7C,eAAS,MAAM,KAAK,sBAAsB,KAAK,MAAM,QAAQ,OAAO;AAAA,IACtE;AAEA,QAAI,WAAW,UAAU,EAAE,iBAAiB,IAAI,GAAG;AACjD,eAAS,MAAM,KAAK,gBAAgB,KAAK,YAAY,QAAQ,OAAO;AAAA,IACtE;AACA,QAAI,WAAW,UAAU,EAAE,sBAAsB,IAAI,GAAG;AACtD,eAAS,MAAM,KAAK,gBAAgB,KAAK,YAAY,QAAQ,OAAO;AAAA,IACtE;AACA,QAAI,WAAW,UAAU,EAAE,0BAA0B,IAAI,GAAG;AAC1D,eAAS,MAAM,KAAK,gBAAgB,KAAK,YAAY,QAAQ,OAAO;AAAA,IACtE;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,MAAc,kBACZ,QACA,QACA,UAAU,oBAAI,OACC;AACf,QAAI,EAAE,aAAa,MAAM,GAAG;AAC1B,aAAO,KAAK,sBAAsB,OAAO,MAAM,QAAQ,OAAO;AAAA,IAChE;AAEA,QAAI,EAAE,mBAAmB,MAAM,KAAK,EAAE,aAAa,OAAO,QAAQ,GAAG;AACnE,YAAM,OAAO,OAAO,SAAS;AAE7B,UAAI,SAAS,WAAW;AACtB,cAAM,OAAO,MAAM,KAAK,gBAAgB,OAAO,QAAQ,QAAQ,OAAO;AACtE,YAAI,SAAS,UAAU,SAAS,WAAW;AACzC,iBAAO;AAAA,QACT;AACA,eAAO;AAAA,MACT;AAEA,UAAI,EAAE,aAAa,OAAO,MAAM,GAAG;AACjC,cAAM,OAAO,MAAM,KAAK,cAAc,MAAM;AAC5C,cAAM,UAAU,KAAK,SAAS,IAAI,OAAO,OAAO,IAAI;AACpD,YACE,WACA,QAAQ,SAAS,YACjB,QAAQ,iBAAiB,KACzB;AAEA,gBAAM,iBAAiB,MAAM,KAAK,QAAQ;AAAA,YACxC,QAAQ;AAAA,YACR;AAAA,UAAA;AAEF,cAAI,gBAAgB;AAClB,kBAAM,eAAe,MAAM,KAAK,cAAc,cAAc;AAC5D,kBAAM,cAAc,aAAa,QAAQ,IAAI,OAAO,SAAS,IAAI;AACjE,gBAAI,aAAa;AACf,oBAAM,kBAAkB,aAAa,SAAS;AAAA,gBAC5C,YAAY;AAAA,cAAA;AAEd,kBAAI,iBAAiB;AACnB,uBAAO,MAAM,KAAK;AAAA,kBAChB;AAAA,kBACA,aAAa;AAAA,kBACb;AAAA,gBAAA;AAAA,cAEJ;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AACA,aAAO,KAAK,gBAAgB,OAAO,QAAQ,QAAQ,OAAO;AAAA,IAC5D;AAGA,WAAO,KAAK,gBAAgB,QAAQ,QAAQ,OAAO;AAAA,EACrD;AAAA,EAEA,MAAc,cAAc,IAAY;AACtC,QAAI,SAAS,KAAK,YAAY,IAAI,EAAE;AACpC,QAAI,QAAQ;AACV,aAAO;AAAA,IACT;AAEA,UAAM,KAAK,QAAQ,WAAW,EAAE;AAEhC,aAAS,KAAK,YAAY,IAAI,EAAE;AAChC,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,kCAAkC,EAAE,EAAE;AAAA,IACxD;AACA,WAAO;AAAA,EACT;AACF;AAEA,SAAS,cACP,MAC8B;AAC9B,MAAI,CAAC,EAAE,iBAAiB,IAAI,EAAG,QAAO;AAEtC,QAAM,SAAS,KAAK;AACpB,MACE,CAAC,EAAE,mBAAmB,MAAM,KAC5B,CAAC,EAAE,aAAa,OAAO,UAAU,EAAE,MAAM,UAAA,CAAW,GACpD;AACA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;"}

package/dist/esm/create-server-fn-plugin/handleCreateServerFn.d.ts

@@ -0,0 +1,6 @@
+import * as t from '@babel/types';
+import type * as babel from '@babel/core';
+export declare function handleCreateServerFn(path: babel.NodePath<t.CallExpression>, opts: {
+    env: 'client' | 'server';
+    code: string;
+}): void;

package/dist/esm/{start-compiler-plugin/serverFn.js → create-server-fn-plugin/handleCreateServerFn.js}

@@ -1,16 +1,12 @@
 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;
-  });
+import { getRootCallExpression, codeFrameError } from "../start-compiler-plugin/utils.js";
+function handleCreateServerFn(path, opts) {
+  const validMethods = ["middleware", "validator", "handler"];
   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!");
@@ -34,10 +30,12 @@ function handleCreateServerFnCallExpression(path, opts) {
         "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
-      );
+    if (opts.env === "client") {
+      if (t.isMemberExpression(callExpressionPaths.validator.node.callee)) {
+        callExpressionPaths.validator.replaceWith(
+          callExpressionPaths.validator.node.callee.object
+        );
+      }
     }
   }
   const handlerFnPath = callExpressionPaths.handler?.get(
@@ -82,6 +80,6 @@ function handleCreateServerFnCallExpression(path, opts) {
   }
 }
 export {
-  handleCreateServerFnCallExpression
+  handleCreateServerFn
 };
-//# sourceMappingURL=serverFn.js.map
+//# sourceMappingURL=handleCreateServerFn.js.map

package/dist/esm/create-server-fn-plugin/handleCreateServerFn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleCreateServerFn.js","sources":["../../../src/create-server-fn-plugin/handleCreateServerFn.ts"],"sourcesContent":["import * as t from '@babel/types'\nimport {\n  codeFrameError,\n  getRootCallExpression,\n} from '../start-compiler-plugin/utils'\nimport type * as babel from '@babel/core'\n\nexport function handleCreateServerFn(\n  path: babel.NodePath<t.CallExpression>,\n  opts: {\n    env: 'client' | 'server'\n    code: string\n  },\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 validMethods = ['middleware', 'validator', 'handler'] as const\n  type ValidMethods = (typeof validMethods)[number]\n  const callExpressionPaths: Record<\n    ValidMethods,\n    babel.NodePath<t.CallExpression> | null\n  > = {\n    middleware: null,\n    validator: null,\n    handler: null,\n  }\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.name as ValidMethods\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, remove the validator call expression\n    if (opts.env === 'client') {\n      if (t.isMemberExpression(callExpressionPaths.validator.node.callee)) {\n        callExpressionPaths.validator.replaceWith(\n          callExpressionPaths.validator.node.callee.object,\n        )\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":";;AAOO,SAAS,qBACd,MACA,MAIA;AAKA,QAAM,eAAe,CAAC,cAAc,aAAa,SAAS;AAE1D,QAAM,sBAGF;AAAA,IACF,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,SAAS;AAAA,EAAA;AAGX,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,SAAS;AAEhD,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,QAAI,KAAK,QAAQ,UAAU;AACzB,UAAI,EAAE,mBAAmB,oBAAoB,UAAU,KAAK,MAAM,GAAG;AACnE,4BAAoB,UAAU;AAAA,UAC5B,oBAAoB,UAAU,KAAK,OAAO;AAAA,QAAA;AAAA,MAE9C;AAAA,IACF;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/create-server-fn-plugin/plugin.d.ts

@@ -0,0 +1,3 @@
+import { PluginOption } from 'vite';
+import { CompileStartFrameworkOptions } from '../start-compiler-plugin/compilers.js';
+export declare function createServerFnPlugin(framework: CompileStartFrameworkOptions): PluginOption;

package/dist/esm/create-server-fn-plugin/plugin.js

@@ -0,0 +1,113 @@
+import { VITE_ENVIRONMENT_NAMES } from "../constants.js";
+import { ServerFnCompiler } from "./compiler.js";
+function cleanId(id) {
+  return id.split("?")[0];
+}
+function createServerFnPlugin(framework) {
+  const libName = `@tanstack/${framework}-start`;
+  const rootExport = "createServerFn";
+  const SERVER_FN_LOOKUP = "server-fn-module-lookup";
+  const compilers = {};
+  return [
+    {
+      name: "tanstack-start-core:capture-server-fn-module-lookup",
+      // we only need this plugin in dev mode
+      apply: "serve",
+      applyToEnvironment(env) {
+        return [
+          VITE_ENVIRONMENT_NAMES.client,
+          VITE_ENVIRONMENT_NAMES.server
+        ].includes(env.name);
+      },
+      transform: {
+        filter: {
+          id: new RegExp(`${SERVER_FN_LOOKUP}$`)
+        },
+        handler(code, id) {
+          const compiler = compilers[this.environment.name];
+          compiler?.ingestModule({ code, id: cleanId(id) });
+        }
+      }
+    },
+    {
+      name: "tanstack-start-core::server-fn",
+      enforce: "pre",
+      applyToEnvironment(env) {
+        return [
+          VITE_ENVIRONMENT_NAMES.client,
+          VITE_ENVIRONMENT_NAMES.server
+        ].includes(env.name);
+      },
+      transform: {
+        filter: {
+          id: {
+            exclude: new RegExp(`${SERVER_FN_LOOKUP}$`)
+          },
+          code: {
+            // only scan files that mention `.handler(`
+            include: [/\.handler\(/]
+          }
+        },
+        async handler(code, id) {
+          let compiler = compilers[this.environment.name];
+          if (!compiler) {
+            const env = this.environment.name === VITE_ENVIRONMENT_NAMES.client ? "client" : this.environment.name === VITE_ENVIRONMENT_NAMES.server ? "server" : (() => {
+              throw new Error(
+                `Environment ${this.environment.name} not configured`
+              );
+            })();
+            compiler = new ServerFnCompiler({
+              env,
+              libName,
+              rootExport,
+              loadModule: async (id2) => {
+                if (this.environment.mode === "build") {
+                  const loaded = await this.load({ id: id2 });
+                  if (!loaded.code) {
+                    throw new Error(`could not load module ${id2}`);
+                  }
+                  compiler.ingestModule({ code: loaded.code, id: id2 });
+                } else if (this.environment.mode === "dev") {
+                  await this.environment.fetchModule(
+                    id2 + "?" + SERVER_FN_LOOKUP
+                  );
+                } else {
+                  throw new Error(
+                    `could not load module ${id2}: unknown environment mode ${this.environment.mode}`
+                  );
+                }
+              },
+              resolveId: async (source, importer) => {
+                const r = await this.resolve(source, importer);
+                return r ? cleanId(r.id) : null;
+              }
+            });
+            compilers[this.environment.name] = compiler;
+          }
+          id = cleanId(id);
+          const result = await compiler.compile({ id, code });
+          return result;
+        }
+      },
+      hotUpdate(ctx) {
+        const compiler = compilers[this.environment.name];
+        ctx.modules.forEach((m) => {
+          if (m.id) {
+            const deleted = compiler?.invalidateModule(m.id);
+            if (deleted) {
+              m.importers.forEach((importer) => {
+                if (importer.id) {
+                  compiler?.invalidateModule(importer.id);
+                }
+              });
+            }
+          }
+        });
+      }
+    }
+  ];
+}
+export {
+  createServerFnPlugin
+};
+//# sourceMappingURL=plugin.js.map

package/dist/esm/create-server-fn-plugin/plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin.js","sources":["../../../src/create-server-fn-plugin/plugin.ts"],"sourcesContent":["import { VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { ServerFnCompiler } from './compiler'\nimport type { ViteEnvironmentNames } from '../constants'\nimport type { PluginOption } from 'vite'\nimport type { CompileStartFrameworkOptions } from '../start-compiler-plugin/compilers'\n\nfunction cleanId(id: string): string {\n  return id.split('?')[0]!\n}\n\nexport function createServerFnPlugin(\n  framework: CompileStartFrameworkOptions,\n): PluginOption {\n  const libName = `@tanstack/${framework}-start`\n  const rootExport = 'createServerFn'\n\n  const SERVER_FN_LOOKUP = 'server-fn-module-lookup'\n\n  const compilers: Partial<Record<ViteEnvironmentNames, ServerFnCompiler>> = {}\n  return [\n    {\n      name: 'tanstack-start-core:capture-server-fn-module-lookup',\n      // we only need this plugin in dev mode\n      apply: 'serve',\n      applyToEnvironment(env) {\n        return [\n          VITE_ENVIRONMENT_NAMES.client,\n          VITE_ENVIRONMENT_NAMES.server,\n        ].includes(env.name as ViteEnvironmentNames)\n      },\n      transform: {\n        filter: {\n          id: new RegExp(`${SERVER_FN_LOOKUP}$`),\n        },\n        handler(code, id) {\n          const compiler =\n            compilers[this.environment.name as ViteEnvironmentNames]\n          compiler?.ingestModule({ code, id: cleanId(id) })\n        },\n      },\n    },\n    {\n      name: 'tanstack-start-core::server-fn',\n      enforce: 'pre',\n\n      applyToEnvironment(env) {\n        return [\n          VITE_ENVIRONMENT_NAMES.client,\n          VITE_ENVIRONMENT_NAMES.server,\n        ].includes(env.name as ViteEnvironmentNames)\n      },\n      transform: {\n        filter: {\n          id: {\n            exclude: new RegExp(`${SERVER_FN_LOOKUP}$`),\n          },\n          code: {\n            // only scan files that mention `.handler(`\n            include: [/\\.handler\\(/],\n          },\n        },\n        async handler(code, id) {\n          let compiler =\n            compilers[this.environment.name as ViteEnvironmentNames]\n          if (!compiler) {\n            const env =\n              this.environment.name === VITE_ENVIRONMENT_NAMES.client\n                ? 'client'\n                : this.environment.name === VITE_ENVIRONMENT_NAMES.server\n                  ? 'server'\n                  : (() => {\n                      throw new Error(\n                        `Environment ${this.environment.name} not configured`,\n                      )\n                    })()\n\n            compiler = new ServerFnCompiler({\n              env,\n              libName,\n              rootExport,\n              loadModule: async (id: string) => {\n                if (this.environment.mode === 'build') {\n                  const loaded = await this.load({ id })\n                  if (!loaded.code) {\n                    throw new Error(`could not load module ${id}`)\n                  }\n                  compiler!.ingestModule({ code: loaded.code, id })\n                } else if (this.environment.mode === 'dev') {\n                  /**\n                   * in dev, vite does not return code from `ctx.load()`\n                   * so instead, we need to take a different approach\n                   * we must force vite to load the module and run it through the vite plugin pipeline\n                   * we can do this by using the `fetchModule` method\n                   * the `captureServerFnModuleLookupPlugin` captures the module code via its transform hook and invokes analyzeModuleAST\n                   */\n                  await this.environment.fetchModule(\n                    id + '?' + SERVER_FN_LOOKUP,\n                  )\n                } else {\n                  throw new Error(\n                    `could not load module ${id}: unknown environment mode ${this.environment.mode}`,\n                  )\n                }\n              },\n              resolveId: async (source: string, importer?: string) => {\n                const r = await this.resolve(source, importer)\n                return r ? cleanId(r.id) : null\n              },\n            })\n            compilers[this.environment.name as ViteEnvironmentNames] = compiler\n          }\n\n          id = cleanId(id)\n          const result = await compiler.compile({ id, code })\n          return result\n        },\n      },\n\n      hotUpdate(ctx) {\n        const compiler =\n          compilers[this.environment.name as ViteEnvironmentNames]\n\n        ctx.modules.forEach((m) => {\n          if (m.id) {\n            const deleted = compiler?.invalidateModule(m.id)\n            if (deleted) {\n              m.importers.forEach((importer) => {\n                if (importer.id) {\n                  compiler?.invalidateModule(importer.id)\n                }\n              })\n            }\n          }\n        })\n      },\n    },\n  ]\n}\n"],"names":["id"],"mappings":"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"}