@timber-js/app 0.2.0-alpha.80 → 0.2.0-alpha.81

package/src/index.ts

@@ -43,6 +43,8 @@ import {
   mergeFileConfig,
   resolveAppDir,
   resolveClientJavascript,
+  resolveBuildDir,
+  DEFAULT_BUILD_DIR,
 } from './plugin-context.js';
 
 // ── Public API ────────────────────────────────────────────────────────────
@@ -247,6 +249,15 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
       ctx.config.output ??= 'server';
       ctx.timer.end('config-load');
 
+      // ── Resolve build output directory ─────────────────────────
+      // Priority: timber.config.ts `buildDir` > Vite `build.outDir` > .timber/dist
+      // Set Vite's build.outDir so the RSC plugin and all environment
+      // builds write to the correct location.
+      const viteOutDir = userConfig.build?.outDir;
+      const timberBuildDir = ctx.config.buildDir;
+      const resolvedRoot = resolve(userConfig.root ?? process.cwd());
+      ctx.buildDir = resolveBuildDir(resolvedRoot, timberBuildDir, viteOutDir);
+
       // Warn if the Vite root differs from cwd and the re-loaded config
       // has reactCompiler but the early cwd-based load missed it. In this
       // edge case the user must move reactCompiler to inline config.
@@ -308,8 +319,28 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
         }
       }
 
+      // Return the resolved buildDir as Vite's build.outDir so the RSC
+      // plugin and all environment builds write to the correct location.
+      // This is always set — either from timber config, Vite config, or default.
+      const buildOutDir = timberBuildDir
+        ? timberBuildDir
+        : viteOutDir && viteOutDir !== 'dist'
+          ? viteOutDir
+          : DEFAULT_BUILD_DIR;
+
+      // Set per-environment build.outDir so Vite's RSC plugin writes
+      // each environment to the correct subdirectory under our buildDir.
+      // Without this, the RSC plugin defaults to dist/<envName> instead
+      // of <buildOutDir>/<envName>.
+      const envOutDirs: Record<string, { build: { outDir: string } }> = {};
+      for (const envName of ['rsc', 'ssr', 'client']) {
+        envOutDirs[envName] = { build: { outDir: join(buildOutDir, envName) } };
+      }
+
       if (command === 'build') {
         return {
+          build: { outDir: buildOutDir },
+          environments: envOutDirs,
           oxc: {
             jsx: {
               development: false,
@@ -317,11 +348,17 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
           },
         };
       }
+
+      // Dev mode: set outDir so dev-time references are consistent
+      return { build: { outDir: buildOutDir }, environments: envOutDirs };
     },
     configResolved(resolved) {
       ctx.root = resolved.root;
       ctx.appDir = resolveAppDir(resolved.root, ctx.config.appDir);
       ctx.dev = resolved.command === 'serve';
+      // Sync buildDir from Vite's resolved build.outDir. Vite keeps
+      // outDir as-is (may be relative), so resolve against root.
+      ctx.buildDir = resolve(resolved.root, resolved.build.outDir);
       // In production builds, swap to a no-op timer to avoid overhead
       if (!ctx.dev) {
         ctx.timer = createNoopTimer();

package/src/plugin-context.ts

@@ -77,6 +77,16 @@ export interface PluginContext {
   timer: StartupTimer;
   /** Holding server that binds the port during dev startup (closed in timber-dev-server) */
   holdingServer?: HoldingServer | null;
+  /**
+   * Resolved absolute path to the build output directory.
+   *
+   * Defaults to `<root>/.timber/dist`. Can be overridden via
+   * `timber.config.ts` `buildDir` or Vite's `build.outDir`.
+   * Timber config takes precedence when both are set.
+   *
+   * Used by adapter-build and cli preview.
+   */
+  buildDir: string;
 }
 
 // ── App directory resolution ──────────────────────────────────────────────
@@ -126,9 +136,39 @@ export function createPluginContext(config?: TimberUserConfig, root?: string): P
     deploymentId: null,
     timer: createStartupTimer(),
     holdingServer: null,
+    buildDir: resolveBuildDir(projectRoot, resolvedConfig.buildDir),
   };
 }
 
+// ── Build directory resolution ────────────────────────────────────────────
+
+/** Default build output directory (relative to root). */
+export const DEFAULT_BUILD_DIR = join('.timber', 'dist');
+
+/**
+ * Resolve the build output directory.
+ *
+ * Priority:
+ * 1. Explicit `timberBuildDir` from timber.config.ts
+ * 2. Explicit `viteBuildOutDir` from Vite's build.outDir (if not the default 'dist')
+ * 3. Default: `.timber/dist`
+ *
+ * Returns an absolute path.
+ */
+export function resolveBuildDir(
+  root: string,
+  timberBuildDir?: string,
+  viteBuildOutDir?: string
+): string {
+  if (timberBuildDir) {
+    return join(root, timberBuildDir);
+  }
+  if (viteBuildOutDir && viteBuildOutDir !== 'dist') {
+    return join(root, viteBuildOutDir);
+  }
+  return join(root, DEFAULT_BUILD_DIR);
+}
+
 // ── Config file loading ───────────────────────────────────────────────────
 
 /**

package/src/plugins/adapter-build.ts

@@ -35,7 +35,7 @@ export function timberAdapterBuild(ctx: PluginContext): Plugin {
         const adapter = ctx.config.adapter as TimberPlatformAdapter | undefined;
         if (!adapter || typeof adapter.buildOutput !== 'function') return;
 
-        const buildDir = join(ctx.root, 'dist');
+        const buildDir = ctx.buildDir;
 
         // Serialize the build manifest as a JS module that sets the global.
         // The adapter writes this as _timber-manifest-init.mjs and imports it

package/src/segment-params/index.ts

@@ -1,29 +1,9 @@
-// @timber-js/app/segment-params — Typed route param coercion and search param definitions
+// @timber-js/app/segment-params — Typed route param coercion
 //
-// This is the primary import path for both segmentParams and searchParams.
-// params.ts convention files import from here.
+// This is the import path for defineSegmentParams and related types.
+// For search params, import from @timber-js/app/search-params instead.
 //
 // See design/07-routing.md §"params.ts Convention File"
 
-// --- Segment params (route path param coercion) ---
 export type { ParamsDefinition, InferParamField, ParamField } from './define.js';
 export { defineSegmentParams } from './define.js';
-
-// --- Search params (re-exported from search-params for convenience) ---
-// This lets params.ts import both from a single path:
-//   import { defineSegmentParams, defineSearchParams } from '@timber-js/app/segment-params'
-export { defineSearchParams } from '../search-params/define.js';
-
-// Codec bridges moved to @timber-js/app/codec
-// Import fromSchema / fromArraySchema from '@timber-js/app/codec' instead.
-export { withDefault, withUrlKey } from '../search-params/wrappers.js';
-// Codec is the canonical home for the Codec type — import from
-// @timber-js/app/codec. Re-export removed per TIM-721.
-export type {
-  SearchParamCodec,
-  SearchParamsDefinition,
-  SetParams,
-  SetParamsOptions,
-  QueryStatesOptions,
-  CodecMap,
-} from '../search-params/define.js';

package/src/server/action-client.ts

@@ -138,13 +138,15 @@ export interface ActionBuilder<TCtx> {
   /** Declare the input schema. Validation errors are returned typed. */
   schema<TInput>(schema: ActionSchema<TInput>): ActionBuilderWithSchema<TCtx, TInput>;
   /** Define the action body without input validation. */
-  action<TData>(fn: (ctx: ActionContext<TCtx, undefined>) => Promise<TData>): ActionFn<TData>;
+  action<TData>(
+    fn: (ctx: ActionContext<TCtx, undefined>) => Promise<TData>
+  ): ActionFn<undefined, TData>;
 }
 
 /** Builder after .schema() has been called. */
 export interface ActionBuilderWithSchema<TCtx, TInput> {
   /** Define the action body with validated input. */
-  action<TData>(fn: (ctx: ActionContext<TCtx, TInput>) => Promise<TData>): ActionFn<TData>;
+  action<TData>(fn: (ctx: ActionContext<TCtx, TInput>) => Promise<TData>): ActionFn<TInput, TData>;
 }
 
 /**
@@ -159,11 +161,21 @@ export interface ActionBuilderWithSchema<TCtx, TInput> {
  * discards it. This lets validated actions be passed directly to forms
  * without casts.
  */
-export type ActionFn<TData> = {
+/**
+ * Map schema output keys to `string | undefined` for form-facing APIs.
+ * HTML form values are always strings, and fields can be absent.
+ * Gives autocomplete for field names without lying about value types.
+ */
+export type InputHint<T> =
+  T extends Record<string, unknown> ? { [K in keyof T]: string | undefined } : T;
+
+export type ActionFn<TInput = unknown, TData = unknown> = {
   /** <form action={fn}> compatibility — React discards the return value. */
   (formData: FormData): void;
-  /** Direct call: action(input) */
-  (input?: unknown): Promise<ActionResult<TData>>;
+  /** Direct call: action(input) — optional when TInput is undefined (no-schema actions). */
+  (
+    ...args: undefined extends TInput ? [input?: TInput] : [input: TInput]
+  ): Promise<ActionResult<TData>>;
   /** React useActionState: action(prevState, formData) */
   (prevState: ActionResult<TData> | null, formData: FormData): Promise<ActionResult<TData>>;
 };
@@ -298,7 +310,7 @@ export function createActionClient<TCtx = Record<string, never>>(
   function buildAction<TInput, TData>(
     schema: ActionSchema<TInput> | undefined,
     fn: (ctx: ActionContext<TCtx, TInput>) => Promise<TData>
-  ): ActionFn<TData> {
+  ): ActionFn<TInput, TData> {
     async function actionHandler(...args: unknown[]): Promise<ActionResult<TData>> {
       try {
         // Run middleware
@@ -389,18 +401,22 @@ export function createActionClient<TCtx = Record<string, never>>(
       }
     }
 
-    return actionHandler as ActionFn<TData>;
+    return actionHandler as ActionFn<TInput, TData>;
   }
 
   return {
     schema<TInput>(schema: ActionSchema<TInput>) {
       return {
-        action<TData>(fn: (ctx: ActionContext<TCtx, TInput>) => Promise<TData>): ActionFn<TData> {
+        action<TData>(
+          fn: (ctx: ActionContext<TCtx, TInput>) => Promise<TData>
+        ): ActionFn<TInput, TData> {
           return buildAction(schema, fn);
         },
       };
     },
-    action<TData>(fn: (ctx: ActionContext<TCtx, undefined>) => Promise<TData>): ActionFn<TData> {
+    action<TData>(
+      fn: (ctx: ActionContext<TCtx, undefined>) => Promise<TData>
+    ): ActionFn<undefined, TData> {
       return buildAction(undefined, fn as (ctx: ActionContext<TCtx, unknown>) => Promise<TData>);
     },
   };
@@ -429,7 +445,7 @@ export function createActionClient<TCtx = Record<string, never>>(
 export function validated<TInput, TData>(
   schema: ActionSchema<TInput>,
   handler: (input: TInput) => Promise<TData>
-): ActionFn<TData> {
+): ActionFn<TInput, TData> {
   return createActionClient()
     .schema(schema)
     .action(async ({ input }) => handler(input));

package/src/server/index.ts

@@ -66,7 +66,6 @@ export { revalidatePath, revalidateTag } from './actions';
 // Design doc: design/17-logging.md §"trace_id is Always Set"
 export { getTraceId, getSpanId, withSpan, addSpanEvent } from './tracing';
 
-// Segment params — typed route param coercion for params.ts convention files.
-// Moved from @timber-js/app/segment-params to here per TIM-723.
-export { defineSegmentParams } from '../segment-params/define.js';
+// Segment params types — re-exported for convenience.
+// defineSegmentParams itself lives at @timber-js/app/segment-params.
 export type { ParamsDefinition, InferParamField, ParamField } from '../segment-params/define.js';

package/dist/_chunks/wrappers-_DTmImGt.js

@@ -1,63 +0,0 @@
-//#region src/search-params/wrappers.ts
-/**
-* Wrap a nullable codec with a default value. When the inner codec returns
-* null, the default is used instead. The output type becomes non-nullable.
-*
-* Works with any codec — nuqs parsers, custom codecs, fromSchema results.
-*
-* ```ts
-* import { parseAsInteger } from 'nuqs'
-* import { withDefault } from '@timber-js/app/search-params'
-*
-* const page = withDefault(parseAsInteger, 1)
-* // page.parse(undefined) → 1 (not null)
-* // page.parse('5') → 5
-* ```
-*/
-function withDefault(codec, defaultValue) {
-	return {
-		parse(value) {
-			const result = codec.parse(value);
-			return result === null ? defaultValue : result;
-		},
-		serialize(value) {
-			return codec.serialize(value);
-		}
-	};
-}
-/**
-* Attach a URL key alias to a codec. The alias determines what query
-* parameter key is used in the URL, while the TypeScript property name
-* stays descriptive.
-*
-* Aliases travel with codecs through object spread composition — when
-* you spread a bundle containing aliased codecs into defineSearchParams,
-* the aliases come along automatically.
-*
-* ```ts
-* import { parseAsString } from 'nuqs'
-* import { withUrlKey } from '@timber-js/app/search-params'
-*
-* export const searchable = {
-*   q: withUrlKey(parseAsString, 'search'),
-*   // ?search=shoes → { q: 'shoes' }
-* }
-* ```
-*
-* Composes with withDefault:
-* ```ts
-* import { parseAsInteger } from 'nuqs'
-* withUrlKey(withDefault(parseAsInteger, 1), 'p')
-* ```
-*/
-function withUrlKey(codec, urlKey) {
-	return {
-		parse: codec.parse.bind(codec),
-		serialize: codec.serialize.bind(codec),
-		urlKey
-	};
-}
-//#endregion
-export { withUrlKey as n, withDefault as t };
-
-//# sourceMappingURL=wrappers-_DTmImGt.js.map

package/dist/_chunks/wrappers-_DTmImGt.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrappers-_DTmImGt.js","names":[],"sources":["../../src/search-params/wrappers.ts"],"sourcesContent":["/**\n * Codec wrappers — withDefault and withUrlKey.\n *\n * These are timber-specific utilities that work with any SearchParamCodec.\n * For actual codecs (string, integer, boolean, etc.), use nuqs parsers\n * or Standard Schema objects (Zod, Valibot, ArkType) with auto-detection.\n *\n * Design doc: design/23-search-params.md\n */\n\nimport type { SearchParamCodec, SearchParamCodecWithUrlKey } from './define.js';\n\n// ---------------------------------------------------------------------------\n// withDefault\n// ---------------------------------------------------------------------------\n\n/**\n * Wrap a nullable codec with a default value. When the inner codec returns\n * null, the default is used instead. The output type becomes non-nullable.\n *\n * Works with any codec — nuqs parsers, custom codecs, fromSchema results.\n *\n * ```ts\n * import { parseAsInteger } from 'nuqs'\n * import { withDefault } from '@timber-js/app/search-params'\n *\n * const page = withDefault(parseAsInteger, 1)\n * // page.parse(undefined) → 1 (not null)\n * // page.parse('5') → 5\n * ```\n */\nexport function withDefault<T>(\n  codec: SearchParamCodec<T | null>,\n  defaultValue: T\n): SearchParamCodec<T> {\n  return {\n    parse(value: string | string[] | undefined): T {\n      const result = codec.parse(value);\n      return result === null ? defaultValue : result;\n    },\n    serialize(value: T): string | null {\n      return codec.serialize(value);\n    },\n  };\n}\n\n// ---------------------------------------------------------------------------\n// withUrlKey\n// ---------------------------------------------------------------------------\n\n/**\n * Attach a URL key alias to a codec. The alias determines what query\n * parameter key is used in the URL, while the TypeScript property name\n * stays descriptive.\n *\n * Aliases travel with codecs through object spread composition — when\n * you spread a bundle containing aliased codecs into defineSearchParams,\n * the aliases come along automatically.\n *\n * ```ts\n * import { parseAsString } from 'nuqs'\n * import { withUrlKey } from '@timber-js/app/search-params'\n *\n * export const searchable = {\n *   q: withUrlKey(parseAsString, 'search'),\n *   // ?search=shoes → { q: 'shoes' }\n * }\n * ```\n *\n * Composes with withDefault:\n * ```ts\n * import { parseAsInteger } from 'nuqs'\n * withUrlKey(withDefault(parseAsInteger, 1), 'p')\n * ```\n */\nexport function withUrlKey<T>(\n  codec: SearchParamCodec<T>,\n  urlKey: string\n): SearchParamCodecWithUrlKey<T> {\n  return {\n    parse: codec.parse.bind(codec),\n    serialize: codec.serialize.bind(codec),\n    urlKey,\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA+BA,SAAgB,YACd,OACA,cACqB;AACrB,QAAO;EACL,MAAM,OAAyC;GAC7C,MAAM,SAAS,MAAM,MAAM,MAAM;AACjC,UAAO,WAAW,OAAO,eAAe;;EAE1C,UAAU,OAAyB;AACjC,UAAO,MAAM,UAAU,MAAM;;EAEhC;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCH,SAAgB,WACd,OACA,QAC+B;AAC/B,QAAO;EACL,OAAO,MAAM,MAAM,KAAK,MAAM;EAC9B,WAAW,MAAM,UAAU,KAAK,MAAM;EACtC;EACD"}