@tanstack/start-plugin-core 1.163.3 → 1.163.4

package/src/import-protection-plugin/virtualModules.ts

@@ -2,6 +2,7 @@ import { resolveViteId } from '../utils'
 import { VITE_ENVIRONMENT_NAMES } from '../constants'
 import { isValidExportName } from './rewriteDeniedImports'
 import { CLIENT_ENV_SUGGESTIONS } from './trace'
+import { VITE_BROWSER_VIRTUAL_PREFIX } from './constants'
 import { relativizePath } from './utils'
 import type { ViolationInfo } from './trace'
 
@@ -23,7 +24,7 @@ export const MOCK_RUNTIME_PREFIX =
   'tanstack-start-import-protection:mock-runtime:'
 const RESOLVED_MOCK_RUNTIME_PREFIX = resolveViteId(MOCK_RUNTIME_PREFIX)
 
-export const MARKER_PREFIX = 'tanstack-start-import-protection:marker:'
+const MARKER_PREFIX = 'tanstack-start-import-protection:marker:'
 const RESOLVED_MARKER_PREFIX = resolveViteId(MARKER_PREFIX)
 
 const RESOLVED_MARKER_SERVER_ONLY = resolveViteId(`${MARKER_PREFIX}server-only`)
@@ -55,6 +56,13 @@ const RESOLVED_VIRTUAL_MODULE_MATCHERS = [
   RESOLVED_MARKER_PREFIX,
 ] as const
 
+const RESOLVE_PREFIX_PAIRS = [
+  [MOCK_EDGE_PREFIX, RESOLVED_MOCK_EDGE_PREFIX],
+  [MOCK_RUNTIME_PREFIX, RESOLVED_MOCK_RUNTIME_PREFIX],
+  [MOCK_BUILD_PREFIX, RESOLVED_MOCK_BUILD_PREFIX],
+  [MARKER_PREFIX, RESOLVED_MARKER_PREFIX],
+] as const
+
 /**
  * Resolve import-protection's internal virtual module IDs.
  *
@@ -64,11 +72,26 @@ const RESOLVED_VIRTUAL_MODULE_MATCHERS = [
 export function resolveInternalVirtualModuleId(
   source: string,
 ): string | undefined {
-  if (source === MOCK_MODULE_ID) return RESOLVED_MOCK_MODULE_ID
-  if (source.startsWith(MOCK_EDGE_PREFIX)) return resolveViteId(source)
-  if (source.startsWith(MOCK_RUNTIME_PREFIX)) return resolveViteId(source)
-  if (source.startsWith(MOCK_BUILD_PREFIX)) return resolveViteId(source)
-  if (source.startsWith(MARKER_PREFIX)) return resolveViteId(source)
+  if (source.startsWith(VITE_BROWSER_VIRTUAL_PREFIX)) {
+    return resolveInternalVirtualModuleId(
+      `\0${source.slice(VITE_BROWSER_VIRTUAL_PREFIX.length)}`,
+    )
+  }
+
+  if (source === MOCK_MODULE_ID || source === RESOLVED_MOCK_MODULE_ID) {
+    return RESOLVED_MOCK_MODULE_ID
+  }
+
+  for (const [unresolvedPrefix, resolvedPrefix] of RESOLVE_PREFIX_PAIRS) {
+    if (source.startsWith(unresolvedPrefix)) {
+      return resolveViteId(source)
+    }
+
+    if (source.startsWith(resolvedPrefix)) {
+      return source
+    }
+  }
+
   return undefined
 }
 
@@ -118,10 +141,9 @@ export function mockRuntimeModuleIdFromViolation(
 
 export function makeMockEdgeModuleId(
   exports: Array<string>,
-  source: string,
   runtimeId: string,
 ): string {
-  const payload = { source, exports, runtimeId }
+  const payload = { exports, runtimeId }
   return `${MOCK_EDGE_PREFIX}${toBase64Url(JSON.stringify(payload))}`
 }
 
@@ -254,36 +276,30 @@ export function loadSilentMockModule(): { code: string } {
   return { code: generateMockCode() }
 }
 
-export function loadMockEdgeModule(encodedPayload: string): { code: string } {
-  let payload: { exports?: Array<string>; runtimeId?: string }
-  try {
-    payload = JSON.parse(fromBase64Url(encodedPayload)) as typeof payload
-  } catch {
-    payload = { exports: [] }
-  }
-  const names: Array<string> = Array.isArray(payload.exports)
-    ? payload.exports.filter(
-        (n): n is string =>
-          typeof n === 'string' && n.length > 0 && n !== 'default',
-      )
-    : []
-
-  const runtimeId: string =
-    typeof payload.runtimeId === 'string' && payload.runtimeId.length > 0
-      ? payload.runtimeId
-      : MOCK_MODULE_ID
+/**
+ * Filter export names to valid, non-default names.
+ */
+function filterExportNames(exports: ReadonlyArray<string>): Array<string> {
+  return exports.filter((n) => n.length > 0 && n !== 'default')
+}
 
-  const exportLines: Array<string> = []
+/**
+ * Generate ESM export lines that re-export named properties from `mock`.
+ *
+ * Produces `export const foo = mock.foo;` for valid identifiers and
+ * string-keyed re-exports for non-identifier names.
+ */
+function generateExportLines(names: ReadonlyArray<string>): Array<string> {
+  const lines: Array<string> = []
   const stringExports: Array<{ alias: string; name: string }> = []
 
   for (let i = 0; i < names.length; i++) {
     const n = names[i]!
     if (isValidExportName(n)) {
-      exportLines.push(`export const ${n} = mock.${n};`)
+      lines.push(`export const ${n} = mock.${n};`)
     } else {
-      // ES2022 string-keyed export: use a temp var + re-export with string literal
       const alias = `__tss_str_${i}`
-      exportLines.push(`const ${alias} = mock[${JSON.stringify(n)}];`)
+      lines.push(`const ${alias} = mock[${JSON.stringify(n)}];`)
       stringExports.push({ alias, name: n })
     }
   }
@@ -292,9 +308,79 @@ export function loadMockEdgeModule(encodedPayload: string): { code: string } {
     const reexports = stringExports
       .map((s) => `${s.alias} as ${JSON.stringify(s.name)}`)
       .join(', ')
-    exportLines.push(`export { ${reexports} };`)
+    lines.push(`export { ${reexports} };`)
   }
 
+  return lines
+}
+
+/**
+ * Generate a self-contained mock module with explicit named exports.
+ *
+ * Used by the transform hook's "self-denial" check: when a denied file
+ * (e.g. `.server.ts` in the client environment) is transformed, its entire
+ * content is replaced with this mock module.  This avoids returning virtual
+ * module IDs from `resolveId`, which prevents cross-environment cache
+ * contamination from third-party resolver plugins.
+ *
+ * The generated code is side-effect-free and tree-shakeable.
+ */
+export function generateSelfContainedMockModule(exportNames: Array<string>): {
+  code: string
+} {
+  const mockCode = generateMockCode()
+  const exportLines = generateExportLines(filterExportNames(exportNames))
+
+  return {
+    code: `${mockCode}
+${exportLines.join('\n')}
+`,
+  }
+}
+
+/**
+ * Generate a dev-mode mock module for self-denial transforms.
+ *
+ * Similar to `loadMockEdgeModule` but takes export names and a runtime ID
+ * directly (instead of parsing them from a base64url-encoded payload).
+ * Used by the transform hook when a denied file (e.g. `.server.ts` in
+ * the client environment) is replaced in dev mode.
+ *
+ * The generated module imports mock-runtime for runtime diagnostics
+ * (error/warn on property access) and re-exports explicit named exports
+ * so that `import { foo } from './denied.server'` works.
+ */
+export function generateDevSelfDenialModule(
+  exportNames: Array<string>,
+  runtimeId: string,
+): { code: string } {
+  const names = filterExportNames(exportNames)
+  const exportLines = generateExportLines(names)
+
+  return {
+    code: `import mock from ${JSON.stringify(runtimeId)};
+${exportLines.join('\n')}
+export default mock;
+`,
+  }
+}
+
+export function loadMockEdgeModule(encodedPayload: string): { code: string } {
+  let payload: { exports?: Array<string>; runtimeId?: string }
+  try {
+    payload = JSON.parse(fromBase64Url(encodedPayload)) as typeof payload
+  } catch {
+    payload = { exports: [] }
+  }
+  const names = filterExportNames(payload.exports ?? [])
+
+  const runtimeId: string =
+    typeof payload.runtimeId === 'string' && payload.runtimeId.length > 0
+      ? payload.runtimeId
+      : MOCK_MODULE_ID
+
+  const exportLines = generateExportLines(names)
+
   return {
     code: `import mock from ${JSON.stringify(runtimeId)};
 ${exportLines.join('\n')}

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

@@ -1,7 +1,11 @@
 import assert from 'node:assert'
 import { VIRTUAL_MODULES } from '@tanstack/start-server-core'
 import { resolve as resolvePath } from 'pathe'
-import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from '../constants'
+import {
+  SERVER_FN_LOOKUP,
+  TRANSFORM_ID_REGEX,
+  VITE_ENVIRONMENT_NAMES,
+} from '../constants'
 import {
   KindDetectionPatterns,
   LookupKindsPerEnv,
@@ -82,7 +86,8 @@ const getLookupConfigurationsForEnv = (
     ]
   }
 }
-export const SERVER_FN_LOOKUP = 'server-fn-module-lookup'
+// Re-export from shared constants for backwards compatibility
+export { SERVER_FN_LOOKUP }
 
 function resolveViteId(id: string) {
   return `\0${id}`