@tanstack/start-plugin-core 1.132.0-alpha.20 → 1.132.0-alpha.22

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

@@ -32,7 +32,6 @@ interface ModuleInfo {
 export declare class ServerFnCompiler {
     private options;
     private moduleCache;
-    private resolvedLibId;
     private initialized;
     constructor(options: {
         env: 'client' | 'server';

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

@@ -8,7 +8,6 @@ class ServerFnCompiler {
     this.options = options;
   }
   moduleCache = /* @__PURE__ */ new Map();
-  resolvedLibId;
   initialized = false;
   async init(id) {
     const libId = await this.options.resolveId(this.options.libName, id);
@@ -33,7 +32,6 @@ class ServerFnCompiler {
     });
     this.moduleCache.set(libId, rootModule);
     this.initialized = true;
-    this.resolvedLibId = libId;
   }
   ingestModule({ code, id }) {
     const ast = parseAst({ code });
@@ -302,6 +300,8 @@ class ServerFnCompiler {
                 );
               }
             }
+          } else {
+            return "None";
           }
         }
       }

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

@@ -1 +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;"}
+{"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 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  }\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          } else {\n            return 'None'\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":"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"}

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

@@ -79,7 +79,12 @@ function createServerFnPlugin(framework) {
               },
               resolveId: async (source, importer) => {
                 const r = await this.resolve(source, importer);
-                return r ? cleanId(r.id) : null;
+                if (r) {
+                  if (!r.external) {
+                    return cleanId(r.id);
+                  }
+                }
+                return null;
               }
             });
             compilers[this.environment.name] = compiler;

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

@@ -1 +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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"}
+{"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                if (r) {\n                  if (!r.external) {\n                    return cleanId(r.id)\n                  }\n                }\n                return 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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.132.0-alpha.20",
+  "version": "1.132.0-alpha.22",
   "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.20",
+    "@tanstack/router-generator": "1.132.0-alpha.21",
+    "@tanstack/router-core": "1.132.0-alpha.21",
+    "@tanstack/router-plugin": "1.132.0-alpha.21",
     "@tanstack/router-utils": "1.132.0-alpha.9",
-    "@tanstack/router-generator": "1.132.0-alpha.20",
-    "@tanstack/router-plugin": "1.132.0-alpha.20",
     "@tanstack/server-functions-plugin": "1.132.0-alpha.9",
-    "@tanstack/start-server-core": "1.132.0-alpha.20"
+    "@tanstack/start-server-core": "1.132.0-alpha.21"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",

package/src/create-server-fn-plugin/compiler.ts

@@ -38,7 +38,6 @@ interface ModuleInfo {
 
 export class ServerFnCompiler {
   private moduleCache = new Map<string, ModuleInfo>()
-  private resolvedLibId!: string
   private initialized = false
   constructor(
     private options: {
@@ -74,7 +73,6 @@ export class ServerFnCompiler {
     })
     this.moduleCache.set(libId, rootModule)
     this.initialized = true
-    this.resolvedLibId = libId
   }
 
   public ingestModule({ code, id }: { code: string; id: string }) {
@@ -413,6 +411,8 @@ export class ServerFnCompiler {
                 )
               }
             }
+          } else {
+            return 'None'
           }
         }
       }

package/src/create-server-fn-plugin/plugin.ts

@@ -104,7 +104,12 @@ export function createServerFnPlugin(
               },
               resolveId: async (source: string, importer?: string) => {
                 const r = await this.resolve(source, importer)
-                return r ? cleanId(r.id) : null
+                if (r) {
+                  if (!r.external) {
+                    return cleanId(r.id)
+                  }
+                }
+                return null
               },
             })
             compilers[this.environment.name as ViteEnvironmentNames] = compiler