@timber-js/app 0.2.0-alpha.100 → 0.2.0-alpha.101

package/src/plugins/static-build.ts

@@ -3,31 +3,25 @@
  *
  * When `output: 'static'` is set in timber.config.ts, this plugin:
  * 1. Validates that no dynamic APIs (getCookies(), getHeaders()) are used
- * 2. When client JavaScript is disabled, rejects 'use client' and 'use server' directives
- * 3. Coordinates build-time rendering of all pages
+ * 2. Coordinates build-time rendering of all pages
  *
  * Design doc: design/15-future-prerendering.md
  */
 
 import type { Plugin } from 'vite';
 import type { PluginContext } from '../plugin-context.js';
-import { detectFileDirective } from '../utils/directive-parser.js';
 
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
 
 export interface StaticValidationError {
-  type: 'dynamic-api' | 'nojs-directive';
+  type: 'dynamic-api';
   file: string;
   message: string;
   line?: number;
 }
 
-export interface StaticOptions {
-  clientJavascriptDisabled: boolean;
-}
-
 // ---------------------------------------------------------------------------
 // Detection: dynamic APIs (getCookies, getHeaders, and legacy cookies/headers)
 // ---------------------------------------------------------------------------
@@ -80,78 +74,6 @@ export function detectDynamicApis(code: string, fileId: string): StaticValidatio
   return errors;
 }
 
-// ---------------------------------------------------------------------------
-// Detection: 'use client' / 'use server' directives (clientJavascript disabled)
-// ---------------------------------------------------------------------------
-
-/**
- * Detect 'use client' and 'use server' directives using AST-based parsing.
- * When client JavaScript is disabled, both are hard build errors — no React
- * runtime or server actions are allowed in the output.
- *
- * When client JavaScript is enabled, these are allowed (client components
- * hydrate, server actions get extracted to API endpoints).
- */
-export function detectDirectives(
-  code: string,
-  fileId: string,
-  options: StaticOptions
-): StaticValidationError[] {
-  if (!options.clientJavascriptDisabled) return [];
-
-  const errors: StaticValidationError[] = [];
-
-  const clientDirective = detectFileDirective(code, ['use client']);
-  if (clientDirective) {
-    errors.push({
-      type: 'nojs-directive',
-      file: fileId,
-      message:
-        `'use client' is not allowed when client JavaScript is disabled (clientJavascript: false). ` +
-        `This mode produces zero JavaScript — client components cannot exist.`,
-      line: clientDirective.line,
-    });
-  }
-
-  const serverDirective = detectFileDirective(code, ['use server']);
-  if (serverDirective) {
-    errors.push({
-      type: 'nojs-directive',
-      file: fileId,
-      message:
-        `'use server' is not allowed when client JavaScript is disabled (clientJavascript: false). ` +
-        `This mode produces zero JavaScript — server actions cannot exist.`,
-      line: serverDirective.line,
-    });
-  }
-
-  return errors;
-}
-
-// ---------------------------------------------------------------------------
-// Combined validation
-// ---------------------------------------------------------------------------
-
-/**
- * Run all static mode validations on a source file.
- *
- * Combines:
- * - Dynamic API detection (getCookies, getHeaders) — always in static mode
- * - Directive detection ('use client', 'use server') — only when client JS is disabled
- */
-export function validateStaticMode(
-  code: string,
-  fileId: string,
-  options: StaticOptions
-): StaticValidationError[] {
-  const errors: StaticValidationError[] = [];
-
-  errors.push(...detectDynamicApis(code, fileId));
-  errors.push(...detectDirectives(code, fileId, options));
-
-  return errors;
-}
-
 // ---------------------------------------------------------------------------
 // Vite Plugin
 // ---------------------------------------------------------------------------
@@ -193,9 +115,7 @@ export function timberStaticBuild(ctx: PluginContext): Plugin {
       // Only check JS/TS files
       if (!/\.[jt]sx?$/.test(id)) return null;
 
-      const errors = validateStaticMode(code, id, {
-        clientJavascriptDisabled: ctx.clientJavascript.disabled,
-      });
+      const errors = detectDynamicApis(code, id);
 
       if (errors.length > 0) {
         // Format all errors into a single build error message

package/dist/plugins/server-action-exports.d.ts

@@ -1,26 +0,0 @@
-import type { Plugin } from 'vite';
-/**
- * Rewrite 'use server' module exports to bypass RSC plugin AST validation.
- *
- * The RSC plugin's client/SSR proxy transform (transformProxyExport) requires
- * all `export const` initializers to be `async ArrowFunctionExpression`. But
- * `createActionClient().action()` and `validated()` return async functions via
- * CallExpressions — valid at runtime but rejected by the static AST check.
- *
- * This plugin rewrites non-function-expression exports from:
- *
- *   export const foo = someCall();
- *
- * to:
- *
- *   const foo = someCall();
- *   export { foo };
- *
- * The `export { name }` form bypasses the RSC plugin's validation without
- * changing runtime semantics. Function expression exports (async arrows,
- * async function expressions) are left untouched.
- *
- * See design/08-forms-and-actions.md §"Middleware for Server Actions"
- */
-export declare function timberServerActionExports(): Plugin;
-//# sourceMappingURL=server-action-exports.d.ts.map

package/dist/plugins/server-action-exports.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server-action-exports.d.ts","sourceRoot":"","sources":["../../src/plugins/server-action-exports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAOnC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAelD"}

package/dist/routing/status-file-lint.d.ts

@@ -1,34 +0,0 @@
-/**
- * Lint status files and error.tsx for missing 'use client' directive.
- *
- * Status files (error.tsx, 404.tsx, 4xx.tsx, 5xx.tsx, NNN.tsx) and legacy
- * compat files (not-found.tsx, forbidden.tsx, unauthorized.tsx) are passed
- * as fallbackComponent to TimberErrorBoundary — a 'use client' component.
- * RSC forbids passing server component functions as props to client
- * components, causing a hard-to-debug runtime error.
- *
- * This module provides a build/dev-time check that warns when these files
- * are missing the 'use client' directive.
- *
- * See design/10-error-handling.md §"Status-Code Files".
- */
-import type { RouteTree } from './types.js';
-export interface StatusFileLintWarning {
-    filePath: string;
-    fileType: string;
-}
-/**
- * Walk the route tree and check all status files and error files for
- * the 'use client' directive. Returns an array of warnings for files
- * that are missing it.
- *
- * MDX and JSON status files are excluded — MDX files are server components
- * by design (pre-rendered as elements via fallbackElement, see TIM-503),
- * and JSON files are data, not components.
- */
-export declare function lintStatusFileDirectives(tree: RouteTree): StatusFileLintWarning[];
-/**
- * Format warnings into human-readable console output.
- */
-export declare function formatStatusFileLintWarnings(warnings: StatusFileLintWarning[]): string;
-//# sourceMappingURL=status-file-lint.d.ts.map

package/dist/routing/status-file-lint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"status-file-lint.d.ts","sourceRoot":"","sources":["../../src/routing/status-file-lint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,YAAY,CAAC;AAOzD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,EAAE,CAIjF;AAqDD;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAiBtF"}

package/dist/utils/directive-parser.d.ts

@@ -1,28 +0,0 @@
-/**
- * AST-based directive detection for 'use client' and 'use server'.
- *
- * Uses acorn to parse source code and detect directives properly,
- * avoiding false positives from regex matching inside string literals,
- * comments, or template expressions.
- *
- * @module
- */
-export interface FileDirective {
-    /** The directive value, e.g. 'use client', 'use server' */
-    directive: string;
-    /** 1-based line number where the directive appears */
-    line: number;
-}
-/**
- * Detect a file-level directive ('use client', 'use server', etc.).
- *
- * Per the ECMAScript spec, directives are string literal expression
- * statements at the start of a program body (before any non-directive
- * statements). This function checks the AST `Program.body` for
- * `ExpressionStatement` nodes whose expression is a `Literal` string
- * matching a known directive.
- *
- * Returns the first matching directive, or null if none found.
- */
-export declare function detectFileDirective(code: string, directives?: string[]): FileDirective | null;
-//# sourceMappingURL=directive-parser.d.ts.map

package/dist/utils/directive-parser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"directive-parser.d.ts","sourceRoot":"","sources":["../../src/utils/directive-parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,MAAM,WAAW,aAAa;IAC5B,2DAA2D;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;CACd;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,UAAU,GAAE,MAAM,EAAiC,GAClD,aAAa,GAAG,IAAI,CAmCtB"}

package/src/plugins/server-action-exports.ts

@@ -1,220 +0,0 @@
-import type { Plugin } from 'vite';
-import { Parser } from 'acorn';
-import acornJsx from 'acorn-jsx';
-import { detectFileDirective } from '../utils/directive-parser.js';
-
-const jsxParser = Parser.extend(acornJsx());
-
-/**
- * Rewrite 'use server' module exports to bypass RSC plugin AST validation.
- *
- * The RSC plugin's client/SSR proxy transform (transformProxyExport) requires
- * all `export const` initializers to be `async ArrowFunctionExpression`. But
- * `createActionClient().action()` and `validated()` return async functions via
- * CallExpressions — valid at runtime but rejected by the static AST check.
- *
- * This plugin rewrites non-function-expression exports from:
- *
- *   export const foo = someCall();
- *
- * to:
- *
- *   const foo = someCall();
- *   export { foo };
- *
- * The `export { name }` form bypasses the RSC plugin's validation without
- * changing runtime semantics. Function expression exports (async arrows,
- * async function expressions) are left untouched.
- *
- * See design/08-forms-and-actions.md §"Middleware for Server Actions"
- */
-export function timberServerActionExports(): Plugin {
-  return {
-    name: 'timber-server-action-exports',
-    transform(code, id) {
-      // Skip non-JS/TS files
-      if (!/\.[jt]sx?$/.test(id)) return;
-      // Quick bail-out
-      if (!code.includes('use server')) return;
-      // Check for file-level directive
-      const directive = detectFileDirective(code, ['use server']);
-      if (!directive) return;
-
-      return rewriteServerActionExports(code);
-    },
-  };
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AcornNode = any;
-
-/**
- * Check if an AST node is an async function expression (arrow or regular).
- * These are handled correctly by the RSC plugin and don't need rewriting.
- */
-function isAsyncFunctionExpr(node: AcornNode): boolean {
-  if (!node) return false;
-  return (
-    (node.type === 'ArrowFunctionExpression' || node.type === 'FunctionExpression') && node.async
-  );
-}
-
-/**
- * Extract identifier names from a declarator's id pattern.
- * Handles simple identifiers and destructuring patterns.
- */
-function extractDeclNames(id: AcornNode): string[] {
-  if (id.type === 'Identifier') return [id.name];
-
-  // ObjectPattern: const { a, b } = ...
-  if (id.type === 'ObjectPattern') {
-    return id.properties.flatMap((p: AcornNode) => extractDeclNames(p.value ?? p.argument));
-  }
-
-  // ArrayPattern: const [a, b] = ...
-  if (id.type === 'ArrayPattern') {
-    return id.elements.filter(Boolean).flatMap((e: AcornNode) => extractDeclNames(e));
-  }
-
-  // RestElement: const [...rest] = ...
-  if (id.type === 'RestElement') {
-    return extractDeclNames(id.argument);
-  }
-
-  // AssignmentPattern: const { a = 1 } = ...
-  if (id.type === 'AssignmentPattern') {
-    return extractDeclNames(id.left);
-  }
-
-  return [];
-}
-
-interface RewriteTarget {
-  /** Start offset of the `export` keyword */
-  exportStart: number;
-  /** Start offset of the `const/let/var` keyword (right after `export `) */
-  declStart: number;
-  /** Names to re-export */
-  names: string[];
-}
-
-function rewriteServerActionExports(code: string): { code: string; map: null } | undefined {
-  let ast: AcornNode;
-  try {
-    ast = jsxParser.parse(code, {
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-    });
-  } catch {
-    // TypeScript that esbuild hasn't stripped yet — use regex fallback
-    return rewriteServerActionExportsFallback(code);
-  }
-
-  const targets: RewriteTarget[] = [];
-
-  for (const node of ast.body) {
-    // Case 1: export const/let/var name = <non-function-expression>
-    if (
-      node.type === 'ExportNamedDeclaration' &&
-      node.declaration?.type === 'VariableDeclaration'
-    ) {
-      const hasNonFunctionInit = node.declaration.declarations.some(
-        (d: AcornNode) => d.init && !isAsyncFunctionExpr(d.init)
-      );
-      if (!hasNonFunctionInit) continue;
-
-      const names = node.declaration.declarations.flatMap((d: AcornNode) => extractDeclNames(d.id));
-      if (names.length === 0) continue;
-
-      targets.push({
-        exportStart: node.start,
-        declStart: node.declaration.start,
-        names,
-      });
-    }
-
-    // Case 2: export default <non-function-expression>
-    if (node.type === 'ExportDefaultDeclaration') {
-      const decl = node.declaration;
-      if (
-        decl.type !== 'FunctionDeclaration' &&
-        decl.type !== 'Identifier' &&
-        !isAsyncFunctionExpr(decl)
-      ) {
-        // export default someCall() → const $$default = someCall(); export default $$default;
-        targets.push({
-          exportStart: node.start,
-          declStart: -1, // sentinel for default export
-          names: ['default'],
-        });
-      }
-    }
-  }
-
-  if (targets.length === 0) return undefined;
-
-  // Process from end to start to preserve character positions
-  let result = code;
-  const reExports: string[] = [];
-
-  for (let i = targets.length - 1; i >= 0; i--) {
-    const target = targets[i];
-
-    if (target.declStart === -1) {
-      // export default <expr> → const $$default = <expr>;\nexport default $$default;
-      const node = ast.body.find(
-        (n: AcornNode) => n.type === 'ExportDefaultDeclaration' && n.start === target.exportStart
-      );
-      if (node) {
-        const exprCode = code.slice(node.declaration.start, node.declaration.end);
-        const replacement = `const $$default = ${exprCode};\nexport default $$default;`;
-        result = result.slice(0, node.start) + replacement + result.slice(node.end);
-      }
-      continue;
-    }
-
-    // Remove 'export ' from the declaration
-    result = result.slice(0, target.exportStart) + result.slice(target.declStart);
-    reExports.push(...target.names);
-  }
-
-  if (reExports.length > 0) {
-    result += '\nexport { ' + reExports.join(', ') + ' };\n';
-  }
-
-  return { code: result, map: null };
-}
-
-/**
- * Regex fallback for TypeScript files that acorn cannot parse.
- *
- * Matches `export const/let/var name = <expr>` where the initializer does
- * NOT start with `async function` or `async (` (i.e., not an async
- * function expression or async arrow function).
- */
-function rewriteServerActionExportsFallback(code: string): { code: string; map: null } | undefined {
-  // Match: export const/let/var <name> = <non-async-function-expr>
-  const pattern =
-    /^(export\s+)((?:const|let|var)\s+(\w+)\s*=\s*)(?!async\s+(?:function[\s(]|\())/gm;
-
-  const names: string[] = [];
-  let result = code;
-  let offset = 0;
-  let match;
-
-  while ((match = pattern.exec(code)) !== null) {
-    const exportKeyword = match[1]; // 'export ' (with trailing space)
-    const name = match[3];
-
-    // Remove 'export ' at this position (adjusted for prior removals)
-    const pos = match.index + offset;
-    result = result.slice(0, pos) + result.slice(pos + exportKeyword.length);
-    offset -= exportKeyword.length;
-    names.push(name);
-  }
-
-  if (names.length === 0) return undefined;
-
-  result += '\nexport { ' + names.join(', ') + ' };\n';
-  return { code: result, map: null };
-}

package/src/routing/status-file-lint.ts

@@ -1,115 +0,0 @@
-/**
- * Lint status files and error.tsx for missing 'use client' directive.
- *
- * Status files (error.tsx, 404.tsx, 4xx.tsx, 5xx.tsx, NNN.tsx) and legacy
- * compat files (not-found.tsx, forbidden.tsx, unauthorized.tsx) are passed
- * as fallbackComponent to TimberErrorBoundary — a 'use client' component.
- * RSC forbids passing server component functions as props to client
- * components, causing a hard-to-debug runtime error.
- *
- * This module provides a build/dev-time check that warns when these files
- * are missing the 'use client' directive.
- *
- * See design/10-error-handling.md §"Status-Code Files".
- */
-
-import { readFileSync } from 'node:fs';
-import type { RouteTree, SegmentNode } from './types.js';
-import { detectFileDirective } from '../utils/directive-parser.js';
-import { swallow } from '../server/logger.js';
-
-/** Extensions that require 'use client' (component files, not MDX/JSON). */
-const CLIENT_REQUIRED_EXTENSIONS = new Set(['tsx', 'jsx', 'ts', 'js']);
-
-export interface StatusFileLintWarning {
-  filePath: string;
-  fileType: string;
-}
-
-/**
- * Walk the route tree and check all status files and error files for
- * the 'use client' directive. Returns an array of warnings for files
- * that are missing it.
- *
- * MDX and JSON status files are excluded — MDX files are server components
- * by design (pre-rendered as elements via fallbackElement, see TIM-503),
- * and JSON files are data, not components.
- */
-export function lintStatusFileDirectives(tree: RouteTree): StatusFileLintWarning[] {
-  const warnings: StatusFileLintWarning[] = [];
-  walkNode(tree.root, warnings);
-  return warnings;
-}
-
-function walkNode(node: SegmentNode, warnings: StatusFileLintWarning[]): void {
-  // Check error.tsx
-  if (node.error) {
-    checkFile(node.error.filePath, node.error.extension, 'error', warnings);
-  }
-
-  // Check status-code files (404.tsx, 4xx.tsx, 5xx.tsx, etc.)
-  if (node.statusFiles) {
-    for (const [code, file] of Object.entries(node.statusFiles)) {
-      checkFile(file.filePath, file.extension, code, warnings);
-    }
-  }
-
-  // Check legacy compat files (not-found.tsx, forbidden.tsx, unauthorized.tsx)
-  if (node.legacyStatusFiles) {
-    for (const [name, file] of Object.entries(node.legacyStatusFiles)) {
-      checkFile(file.filePath, file.extension, name, warnings);
-    }
-  }
-
-  // Recurse into children and slots
-  for (const child of node.children) {
-    walkNode(child, warnings);
-  }
-  for (const slotNode of Object.values(node.slots)) {
-    walkNode(slotNode, warnings);
-  }
-}
-
-function checkFile(
-  filePath: string,
-  extension: string,
-  fileType: string,
-  warnings: StatusFileLintWarning[]
-): void {
-  if (!CLIENT_REQUIRED_EXTENSIONS.has(extension)) return;
-
-  let code: string;
-  try {
-    code = readFileSync(filePath, 'utf-8');
-  } catch (err) {
-    swallow(err, `status-file-lint: unreadable file ${filePath}`);
-    return;
-  }
-
-  const directive = detectFileDirective(code, ['use client']);
-  if (!directive) {
-    warnings.push({ filePath, fileType });
-  }
-}
-
-/**
- * Format warnings into human-readable console output.
- */
-export function formatStatusFileLintWarnings(warnings: StatusFileLintWarning[]): string {
-  const lines = [
-    `[timber] ${warnings.length} status/error file${warnings.length > 1 ? 's' : ''} missing 'use client' directive:`,
-    '',
-  ];
-
-  for (const w of warnings) {
-    lines.push(`  ${w.filePath}`);
-  }
-
-  lines.push('');
-  lines.push(
-    "  Status files and error.tsx are rendered inside TimberErrorBoundary (a 'use client' component)."
-  );
-  lines.push("  Add 'use client' as the first line of each file to avoid a runtime error.");
-
-  return lines.join('\n');
-}