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

package/src/start-compiler-plugin/compilers.ts

@@ -7,10 +7,7 @@ import {
 } from 'babel-dead-code-elimination'
 import { generateFromAst, parseAst } from '@tanstack/router-utils'
 import { transformFuncs } from './constants'
-import { handleCreateServerFileRouteCallExpressionFactory } from './serverFileRoute'
 import { handleCreateIsomorphicFnCallExpression } from './isomorphicFn'
-import { handleCreateMiddlewareCallExpression } from './middleware'
-import { handleCreateServerFnCallExpression } from './serverFn'
 import {
   handleCreateClientOnlyFnCallExpression,
   handleCreateServerOnlyFnCallExpression,
@@ -20,64 +17,29 @@ import type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils'
 export type CompileStartFrameworkOptions = 'react' | 'solid'
 
 type Identifiers = { [K in (typeof transformFuncs)[number]]: IdentifierConfig }
-const getIdentifiers = (
-  framework: CompileStartFrameworkOptions,
-): Identifiers => ({
-  createServerRootRoute: {
-    name: 'createServerRootRoute',
-    handleCallExpression: handleCreateServerFileRouteCallExpressionFactory(
-      framework,
-      'createServerRootRoute',
-    ),
-    paths: [],
-  },
-  createServerRoute: {
-    name: 'createServerRoute',
-    handleCallExpression: handleCreateServerFileRouteCallExpressionFactory(
-      framework,
-      'createServerRoute',
-    ),
-    paths: [],
-  },
-  createServerFileRoute: {
-    name: 'createServerFileRoute',
-    handleCallExpression: handleCreateServerFileRouteCallExpressionFactory(
-      framework,
-      'createServerFileRoute',
-    ),
-    paths: [],
-  },
-  createServerFn: {
-    name: 'createServerFn',
-    handleCallExpression: handleCreateServerFnCallExpression,
-    paths: [],
-  },
-  createMiddleware: {
-    name: 'createMiddleware',
-    handleCallExpression: handleCreateMiddlewareCallExpression,
-    paths: [],
-  },
-  createServerOnlyFn: {
-    name: 'createServerOnlyFn',
-    handleCallExpression: handleCreateServerOnlyFnCallExpression,
-    paths: [],
-  },
-  createClientOnlyFn: {
-    name: 'createClientOnlyFn',
-    handleCallExpression: handleCreateClientOnlyFnCallExpression,
-    paths: [],
-  },
-  createIsomorphicFn: {
-    name: 'createIsomorphicFn',
-    handleCallExpression: handleCreateIsomorphicFnCallExpression,
-    paths: [],
-  },
-})
 
 export function compileStartOutputFactory(
   framework: CompileStartFrameworkOptions,
 ) {
   return function compileStartOutput(opts: CompileOptions): GeneratorResult {
+    const identifiers: Identifiers = {
+      createServerOnlyFn: {
+        name: 'createServerOnlyFn',
+        handleCallExpression: handleCreateServerOnlyFnCallExpression,
+        paths: [],
+      },
+      createClientOnlyFn: {
+        name: 'createClientOnlyFn',
+        handleCallExpression: handleCreateClientOnlyFnCallExpression,
+        paths: [],
+      },
+      createIsomorphicFn: {
+        name: 'createIsomorphicFn',
+        handleCallExpression: handleCreateIsomorphicFnCallExpression,
+        paths: [],
+      },
+    }
+
     const ast = parseAst(opts)
 
     const doDce = opts.dce ?? true
@@ -87,7 +49,6 @@ export function compileStartOutputFactory(
     babel.traverse(ast, {
       Program: {
         enter(programPath) {
-          const identifiers = getIdentifiers(framework)
           programPath.traverse({
             ImportDeclaration: (path) => {
               if (path.node.source.value !== `@tanstack/${framework}-start`) {

package/src/start-compiler-plugin/constants.ts

@@ -1,10 +1,5 @@
 export const transformFuncs = [
-  'createServerFn',
-  'createMiddleware',
   'createServerOnlyFn',
   'createClientOnlyFn',
   'createIsomorphicFn',
-  'createServerRoute',
-  'createServerFileRoute',
-  'createServerRootRoute',
 ] as const

package/src/start-compiler-plugin/plugin.ts

@@ -8,6 +8,7 @@ import path from 'pathe'
 import { VITE_ENVIRONMENT_NAMES } from '../constants'
 import { compileStartOutputFactory } from './compilers'
 import { transformFuncs } from './constants'
+import type { ViteEnvironmentNames } from '../constants'
 import type { Plugin } from 'vite'
 import type { CompileStartFrameworkOptions } from './compilers'
 
@@ -37,33 +38,17 @@ function resolvePackage(packageName: string): string {
 
 export function startCompilerPlugin(
   framework: CompileStartFrameworkOptions,
-  inputOpts?: {
-    client?: {
-      envName?: string
-    }
-    server?: {
-      envName?: string
-    }
-  },
 ): Plugin {
-  const opts = {
-    client: {
-      envName: VITE_ENVIRONMENT_NAMES.client,
-      ...inputOpts?.client,
-    },
-    server: {
-      envName: VITE_ENVIRONMENT_NAMES.server,
-      ...inputOpts?.server,
-    },
-  }
-
   const compileStartOutput = compileStartOutputFactory(framework)
 
   return {
     name: 'tanstack-start-core:compiler',
     enforce: 'pre',
     applyToEnvironment(env) {
-      return [opts.client.envName, opts.server.envName].includes(env.name)
+      return [
+        VITE_ENVIRONMENT_NAMES.client,
+        VITE_ENVIRONMENT_NAMES.server,
+      ].includes(env.name as ViteEnvironmentNames)
     },
     transform: {
       filter: {
@@ -103,9 +88,9 @@ export function startCompilerPlugin(
       },
       handler(code, id) {
         const env =
-          this.environment.name === opts.client.envName
+          this.environment.name === VITE_ENVIRONMENT_NAMES.client
             ? 'client'
-            : this.environment.name === opts.server.envName
+            : this.environment.name === VITE_ENVIRONMENT_NAMES.server
               ? 'server'
               : (() => {
                   throw new Error(

package/src/start-router-plugin/constants.ts

@@ -0,0 +1 @@
+export const SERVER_PROP = 'server'

package/src/start-router-plugin/generator-plugins/routes-manifest-plugin.ts

@@ -9,20 +9,14 @@ import type { GeneratorPlugin } from '@tanstack/router-generator'
 export function routesManifestPlugin(): GeneratorPlugin {
   return {
     name: 'routes-manifest-plugin',
-    onRouteTreesChanged: ({ routeTrees, rootRouteNode }) => {
-      const routeTree = routeTrees.find((tree) => tree.exportName === 'Route')
-      if (!routeTree) {
-        throw new Error(
-          'No route tree found with export name "Route". Please ensure your routes are correctly defined.',
-        )
-      }
+    onRouteTreeChanged: ({ routeTree, rootRouteNode, routeNodes }) => {
       const routesManifest = {
         [rootRouteId]: {
           filePath: rootRouteNode.fullPath,
-          children: routeTree.acc.routeTree.map((d) => d.routePath),
+          children: routeTree.map((d) => d.routePath),
         },
         ...Object.fromEntries(
-          routeTree.acc.routeNodes.map((d) => {
+          routeNodes.map((d) => {
             const filePathId = d.routePath
 
             return [

package/src/start-router-plugin/plugin.ts

@@ -1,59 +1,247 @@
-/*
-what is this plugin doing, especially compared to one already existing in the @tanstack/router-plugin package?
-
-it configures:
-1. the generator to generate both the render-route-tree as well as the server-route-tree
-2. the code-splitter plugin, so it could possibly be enabled per environment (e.g. disable on the server)
-3. the auto import plugin for both environments
-4. the route tree client plugin, which removes the server part from the generated route tree
-5. the virtual route tree plugin, which provides the route tree to the server
-*/
-
 import {
   tanStackRouterCodeSplitter,
   tanstackRouterAutoImport,
   tanstackRouterGenerator,
 } from '@tanstack/router-plugin/vite'
+import { normalizePath } from 'vite'
+import path from 'pathe'
 import { VITE_ENVIRONMENT_NAMES } from '../constants'
-import { routeTreeClientPlugin } from './route-tree-client-plugin'
-import { virtualRouteTreePlugin } from './virtual-route-tree-plugin'
 import { routesManifestPlugin } from './generator-plugins/routes-manifest-plugin'
-import { serverRoutesPlugin } from './generator-plugins/server-routes-plugin'
-import type { PluginOption } from 'vite'
-import type { Config } from '@tanstack/router-plugin'
+import { pruneServerOnlySubtrees } from './pruneServerOnlySubtrees'
+import { SERVER_PROP } from './constants'
+import type {
+  Generator,
+  GeneratorPlugin,
+  RouteNode,
+} from '@tanstack/router-generator'
+import type { DevEnvironment, Plugin, PluginOption } from 'vite'
+import type { TanStackStartInputConfig } from '../schema'
+import type { GetConfigFn, TanStackStartVitePluginCoreOptions } from '../plugin'
 
-export function tanStackStartRouter(config: Config): Array<PluginOption> {
-  return [
-    tanstackRouterGenerator({
-      ...config,
-      plugins: [serverRoutesPlugin(), routesManifestPlugin()],
-      plugin: {
-        vite: { environmentName: VITE_ENVIRONMENT_NAMES.client },
-      },
-    }),
-    tanStackRouterCodeSplitter({
-      ...config,
-      codeSplittingOptions: {
-        ...config.codeSplittingOptions,
-        deleteNodes: ['ssr'],
-        addHmr: true,
+function isServerOnlyNode(node: RouteNode | undefined) {
+  if (!node?.createFileRouteProps) {
+    return false
+  }
+  return (
+    node.createFileRouteProps.has(SERVER_PROP) &&
+    node.createFileRouteProps.size === 1
+  )
+}
+
+function moduleDeclaration({
+  startFilePath,
+  routerFilePath,
+  corePluginOpts,
+  generatedRouteTreePath,
+}: {
+  startFilePath: string | undefined
+  routerFilePath: string
+  corePluginOpts: TanStackStartVitePluginCoreOptions
+  generatedRouteTreePath: string
+}): string {
+  function getImportPath(absolutePath: string) {
+    let relativePath = path.relative(
+      path.dirname(generatedRouteTreePath),
+      absolutePath,
+    )
+
+    if (!relativePath.startsWith('.')) {
+      relativePath = './' + relativePath
+    }
+
+    // convert to POSIX-style for ESM imports (important on Windows)
+    relativePath = relativePath.split(path.sep).join('/')
+    return relativePath
+  }
+
+  const result: Array<string> = [
+    `import type { getRouter } from '${getImportPath(routerFilePath)}'`,
+  ]
+  if (startFilePath) {
+    result.push(
+      `import type { startInstance } from '${getImportPath(startFilePath)}'`,
+    )
+  }
+  // make sure we import something from start to get the server route declaration merge
+  else {
+    result.push(
+      `import type { createStart } from '@tanstack/${corePluginOpts.framework}-start'`,
+    )
+  }
+  result.push(
+    `declare module '@tanstack/${corePluginOpts.framework}-start' {
+  interface Register {
+    router: Awaited<ReturnType<typeof getRouter>>`,
+  )
+  if (startFilePath) {
+    result.push(
+      `    config: Awaited<ReturnType<typeof startInstance.getOptions>>`,
+    )
+  }
+  result.push(`  }
+}`)
+
+  return result.join('\n')
+}
+
+export function tanStackStartRouter(
+  startPluginOpts: TanStackStartInputConfig,
+  getConfig: GetConfigFn,
+  corePluginOpts: TanStackStartVitePluginCoreOptions,
+): Array<PluginOption> {
+  const getGeneratedRouteTreePath = () => {
+    const { startConfig } = getConfig()
+    return path.resolve(startConfig.router.generatedRouteTree)
+  }
+
+  let clientEnvironment: DevEnvironment | null = null
+  function invalidate() {
+    if (!clientEnvironment) {
+      return
+    }
+
+    const mod = clientEnvironment.moduleGraph.getModuleById(
+      getGeneratedRouteTreePath(),
+    )
+    if (mod) {
+      clientEnvironment.moduleGraph.invalidateModule(mod)
+    }
+    clientEnvironment.hot.send({ type: 'full-reload', path: '*' })
+  }
+
+  let generatorInstance: Generator | null = null
+
+  const clientTreeGeneratorPlugin: GeneratorPlugin = {
+    name: 'start-client-tree-plugin',
+    init({ generator }) {
+      generatorInstance = generator
+    },
+    afterTransform({ node, prevNode }) {
+      if (isServerOnlyNode(node) !== isServerOnlyNode(prevNode)) {
+        invalidate()
+      }
+    },
+  }
+
+  let routeTreeFileFooter: Array<string> | null = null
+
+  function getRouteTreeFileFooter() {
+    if (routeTreeFileFooter) {
+      return routeTreeFileFooter
+    }
+    const { startConfig, resolvedStartConfig } = getConfig()
+    const ogRouteTreeFileFooter = startConfig.router.routeTreeFileFooter
+    if (ogRouteTreeFileFooter) {
+      if (Array.isArray(ogRouteTreeFileFooter)) {
+        routeTreeFileFooter = ogRouteTreeFileFooter
+      } else {
+        routeTreeFileFooter = ogRouteTreeFileFooter()
+      }
+    }
+    routeTreeFileFooter = [
+      moduleDeclaration({
+        generatedRouteTreePath: getGeneratedRouteTreePath(),
+        corePluginOpts,
+        startFilePath: resolvedStartConfig.startFilePath,
+        routerFilePath: resolvedStartConfig.routerFilePath,
+      }),
+      ...(routeTreeFileFooter ?? []),
+    ]
+    return routeTreeFileFooter
+  }
+
+  let resolvedGeneratedRouteTreePath: string | null = null
+  const clientTreePlugin: Plugin = {
+    name: 'tanstack-start:route-tree-client-plugin',
+    enforce: 'pre',
+    applyToEnvironment: (env) => env.name === VITE_ENVIRONMENT_NAMES.client,
+    configureServer(server) {
+      clientEnvironment = server.environments[VITE_ENVIRONMENT_NAMES.client]
+    },
+    config() {
+      type LoadObjectHook = Extract<
+        typeof clientTreePlugin.load,
+        { filter?: unknown }
+      >
+      resolvedGeneratedRouteTreePath = normalizePath(
+        getGeneratedRouteTreePath(),
+      )
+      ;(clientTreePlugin.load as LoadObjectHook).filter = {
+        id: { include: new RegExp(resolvedGeneratedRouteTreePath) },
+      }
+    },
+
+    load: {
+      filter: {
+        // this will be set in the config hook above since it relies on `config` hook being called first
       },
-      plugin: {
-        vite: { environmentName: VITE_ENVIRONMENT_NAMES.client },
+      async handler() {
+        if (!generatorInstance) {
+          throw new Error('Generator instance not initialized')
+        }
+        const crawlingResult = await generatorInstance.getCrawlingResult()
+        if (!crawlingResult) {
+          throw new Error('Crawling result not available')
+        }
+        const prunedAcc = pruneServerOnlySubtrees(crawlingResult)
+        const acc = {
+          ...crawlingResult.acc,
+          ...prunedAcc,
+        }
+        const buildResult = generatorInstance.buildRouteTree({
+          ...crawlingResult,
+          acc,
+          config: {
+            // importRoutesUsingAbsolutePaths: true,
+            // addExtensions: true,
+            disableTypes: true,
+            enableRouteTreeFormatting: false,
+            routeTreeFileHeader: [],
+            routeTreeFileFooter: [],
+          },
+        })
+        return { code: buildResult.routeTreeContent, map: null }
       },
+    },
+  }
+  return [
+    clientTreePlugin,
+    tanstackRouterGenerator(() => {
+      const routerConfig = getConfig().startConfig.router
+      return {
+        ...routerConfig,
+        target: corePluginOpts.framework,
+        routeTreeFileFooter: getRouteTreeFileFooter,
+        plugins: [clientTreeGeneratorPlugin, routesManifestPlugin()],
+      }
     }),
-    tanStackRouterCodeSplitter({
-      ...config,
-      codeSplittingOptions: {
-        ...config.codeSplittingOptions,
-        addHmr: false,
-      },
-      plugin: {
-        vite: { environmentName: VITE_ENVIRONMENT_NAMES.server },
-      },
+    tanStackRouterCodeSplitter(() => {
+      const routerConfig = getConfig().startConfig.router
+      return {
+        ...routerConfig,
+        codeSplittingOptions: {
+          ...routerConfig.codeSplittingOptions,
+          deleteNodes: ['ssr', 'server'],
+          addHmr: true,
+        },
+        plugin: {
+          vite: { environmentName: VITE_ENVIRONMENT_NAMES.client },
+        },
+      }
+    }),
+    tanStackRouterCodeSplitter(() => {
+      const routerConfig = getConfig().startConfig.router
+      return {
+        ...routerConfig,
+        codeSplittingOptions: {
+          ...routerConfig.codeSplittingOptions,
+          addHmr: false,
+        },
+        plugin: {
+          vite: { environmentName: VITE_ENVIRONMENT_NAMES.server },
+        },
+      }
     }),
-    tanstackRouterAutoImport(config),
-    routeTreeClientPlugin(config),
-    virtualRouteTreePlugin(config),
+    tanstackRouterAutoImport(startPluginOpts?.router),
   ]
 }

package/src/start-router-plugin/pruneServerOnlySubtrees.ts

@@ -0,0 +1,51 @@
+import { SERVER_PROP } from './constants'
+import type {
+  HandleNodeAccumulator,
+  RouteNode,
+} from '@tanstack/router-generator'
+
+export function pruneServerOnlySubtrees({
+  rootRouteNode,
+  acc,
+}: {
+  rootRouteNode: RouteNode
+  acc: HandleNodeAccumulator
+}) {
+  const routeNodes: Array<RouteNode> = []
+  const routeTree =
+    prune({ ...rootRouteNode, children: acc.routeTree }, routeNodes)
+      ?.children || []
+  // remove root node from routeNodes
+  routeNodes.pop()
+  return {
+    routeTree,
+    routeNodes,
+  }
+}
+function prune(
+  node: RouteNode,
+  collectedRouteNodes: Array<RouteNode>,
+): RouteNode | null {
+  const newChildren: Array<RouteNode> = []
+  let allChildrenServerOnly = true
+
+  for (const child of node.children || []) {
+    const newChild = prune(child, collectedRouteNodes)
+    if (newChild) {
+      newChildren.push(newChild)
+      // at least one child survived pruning
+      allChildrenServerOnly = false
+    }
+  }
+
+  const allServerOnly =
+    node.createFileRouteProps?.has(SERVER_PROP) &&
+    node.createFileRouteProps.size === 1 &&
+    allChildrenServerOnly
+  // prune this subtree
+  if (allServerOnly) {
+    return null
+  }
+  collectedRouteNodes.push(node)
+  return { ...node, children: newChildren }
+}

package/dist/esm/debug.js

@@ -1,5 +0,0 @@
-const debug = process.env.TSR_VITE_DEBUG && ["true", "start-plugin-core"].includes(process.env.TSR_VITE_DEBUG);
-export {
-  debug
-};
-//# sourceMappingURL=debug.js.map

package/dist/esm/debug.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug.js","sources":["../../src/debug.ts"],"sourcesContent":["export const debug =\n  process.env.TSR_VITE_DEBUG &&\n  ['true', 'start-plugin-core'].includes(process.env.TSR_VITE_DEBUG)\n"],"names":[],"mappings":"AAAO,MAAM,QACX,QAAQ,IAAI,kBACZ,CAAC,QAAQ,mBAAmB,EAAE,SAAS,QAAQ,IAAI,cAAc;"}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"middleware.js","sources":["../../../src/start-compiler-plugin/middleware.ts"],"sourcesContent":["import * as t from '@babel/types'\nimport { getRootCallExpression } from './utils'\nimport type * as babel from '@babel/core'\n\nimport type { CompileOptions } from './compilers'\n\nexport function handleCreateMiddlewareCallExpression(\n  path: babel.NodePath<t.CallExpression>,\n  opts: CompileOptions,\n) {\n  const rootCallExpression = getRootCallExpression(path)\n\n  // if (debug)\n  //   console.info(\n  //     'Handling createMiddleware call expression:',\n  //     rootCallExpression.toString(),\n  //   )\n\n  const callExpressionPaths = {\n    middleware: null as babel.NodePath<t.CallExpression> | null,\n    validator: null as babel.NodePath<t.CallExpression> | null,\n    client: null as babel.NodePath<t.CallExpression> | null,\n    server: null as babel.NodePath<t.CallExpression> | null,\n  }\n\n  const validMethods = Object.keys(callExpressionPaths)\n\n  rootCallExpression.traverse({\n    MemberExpression(memberExpressionPath) {\n      if (t.isIdentifier(memberExpressionPath.node.property)) {\n        const name = memberExpressionPath.node.property\n          .name as keyof typeof callExpressionPaths\n\n        if (\n          validMethods.includes(name) &&\n          memberExpressionPath.parentPath.isCallExpression()\n        ) {\n          callExpressionPaths[name] = memberExpressionPath.parentPath\n        }\n      }\n    },\n  })\n\n  if (callExpressionPaths.validator) {\n    const innerInputExpression = callExpressionPaths.validator.node.arguments[0]\n\n    if (!innerInputExpression) {\n      throw new Error(\n        'createMiddleware().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  const serverFnPath = callExpressionPaths.server?.get(\n    'arguments.0',\n  ) as babel.NodePath<any>\n\n  if (\n    callExpressionPaths.server &&\n    serverFnPath.node &&\n    opts.env === 'client'\n  ) {\n    // If we're on the client, remove the server call expression\n    if (t.isMemberExpression(callExpressionPaths.server.node.callee)) {\n      callExpressionPaths.server.replaceWith(\n        callExpressionPaths.server.node.callee.object,\n      )\n    }\n  }\n}\n"],"names":[],"mappings":";;AAMO,SAAS,qCACd,MACA,MACA;AACA,QAAM,qBAAqB,sBAAsB,IAAI;AAQrD,QAAM,sBAAsB;AAAA,IAC1B,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,QAAQ;AAAA,EAAA;AAGV,QAAM,eAAe,OAAO,KAAK,mBAAmB;AAEpD,qBAAmB,SAAS;AAAA,IAC1B,iBAAiB,sBAAsB;AACrC,UAAI,EAAE,aAAa,qBAAqB,KAAK,QAAQ,GAAG;AACtD,cAAM,OAAO,qBAAqB,KAAK,SACpC;AAEH,YACE,aAAa,SAAS,IAAI,KAC1B,qBAAqB,WAAW,oBAChC;AACA,8BAAoB,IAAI,IAAI,qBAAqB;AAAA,QACnD;AAAA,MACF;AAAA,IACF;AAAA,EAAA,CACD;AAED,MAAI,oBAAoB,WAAW;AACjC,UAAM,uBAAuB,oBAAoB,UAAU,KAAK,UAAU,CAAC;AAE3E,QAAI,CAAC,sBAAsB;AACzB,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAGA,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;AAEA,QAAM,eAAe,oBAAoB,QAAQ;AAAA,IAC/C;AAAA,EAAA;AAGF,MACE,oBAAoB,UACpB,aAAa,QACb,KAAK,QAAQ,UACb;AAEA,QAAI,EAAE,mBAAmB,oBAAoB,OAAO,KAAK,MAAM,GAAG;AAChE,0BAAoB,OAAO;AAAA,QACzB,oBAAoB,OAAO,KAAK,OAAO;AAAA,MAAA;AAAA,IAE3C;AAAA,EACF;AACF;"}

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

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

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

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

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

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

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

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

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

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

package/dist/esm/start-router-plugin/generator-plugins/server-routes-plugin.d.ts

@@ -1,2 +0,0 @@
-import { GeneratorPluginWithTransform } from '@tanstack/router-generator';
-export declare function serverRoutesPlugin(): GeneratorPluginWithTransform;