@mandujs/core 0.54.19 → 0.54.21

package/src/db/__tests__/db.test.ts

@@ -20,6 +20,9 @@ import {
   _createDbWith,
   createDb,
   detectProvider,
+  isSqlFragment,
+  join,
+  sql,
   type BunSqlCtor,
   type SqlProvider,
 } from "../index";
@@ -480,3 +483,133 @@ describe("@mandujs/core/db — public createDb lazy probe", () => {
     await expect(db.close()).resolves.toBeUndefined();
   });
 });
+
+// ─── Composable SQL fragments (#315) ─────────────────────────────────────────
+
+describe("@mandujs/core/db — sql fragments", () => {
+  it("sql`` produces an inert fragment; isSqlFragment recognizes it", () => {
+    const frag = sql`x = ${1}`;
+    expect(isSqlFragment(frag)).toBe(true);
+    expect(isSqlFragment({})).toBe(false);
+    expect(isSqlFragment(null)).toBe(false);
+    expect(isSqlFragment("x = 1")).toBe(false);
+    // A fragment must NOT be a Promise — it should not be executed on its own.
+    expect(typeof (frag as unknown as { then?: unknown }).then).toBe("undefined");
+  });
+
+  it("flattens a fragment into merged static text + bound values", async () => {
+    const { Ctor, state } = createFakeCtor();
+    state.nextRowsQueue.push([]);
+    const db = _createDbWith(Ctor, { url: "sqlite::memory:" });
+
+    const where = db.sql`WHERE party = ${"green"}`;
+    await db`SELECT * FROM pledges ${where} ORDER BY id`;
+
+    const call = state.calls[0]!;
+    // Static text merged; the value stays a bound parameter (placeholder gap).
+    expect(Array.from(call.strings).join("?")).toBe(
+      "SELECT * FROM pledges WHERE party = ? ORDER BY id",
+    );
+    expect(call.values).toEqual(["green"]);
+  });
+
+  it("composes optional filters with join and keeps every value bound", async () => {
+    const { Ctor, state } = createFakeCtor();
+    state.nextRowsQueue.push([]);
+    const db = _createDbWith(Ctor, { url: "sqlite::memory:" });
+
+    const party = "green";
+    const region: string | null = "seoul";
+    const search = "climate";
+    const conds = [];
+    if (party) conds.push(db.sql`party = ${party}`);
+    if (region) conds.push(db.sql`region = ${region}`);
+    if (search) conds.push(db.sql`title ILIKE ${"%" + search + "%"}`);
+
+    const where = conds.length
+      ? db.sql`WHERE ${db.join(conds, " AND ")}`
+      : db.sql``;
+    const limit = 20;
+    await db`SELECT * FROM pledges ${where} ORDER BY created_at DESC LIMIT ${limit}`;
+
+    const call = state.calls[0]!;
+    // Values bind left-to-right across the whole assembled query.
+    expect(call.values).toEqual(["green", "seoul", "%climate%", 20]);
+    // No interpolated value leaked into the SQL text.
+    const joined = Array.from(call.strings).join("");
+    expect(joined).toContain("WHERE party = ");
+    expect(joined).toContain(" AND region = ");
+    expect(joined).toContain(" AND title ILIKE ");
+    expect(joined).toContain("LIMIT ");
+    expect(joined).not.toContain("green");
+    expect(joined).not.toContain("%climate%");
+  });
+
+  it("empty join / empty fragment collapse to no-op text and bind nothing", async () => {
+    const { Ctor, state } = createFakeCtor();
+    state.nextRowsQueue.push([]);
+    const db = _createDbWith(Ctor, { url: "sqlite::memory:" });
+
+    const conds: ReturnType<typeof sql>[] = [];
+    const where = conds.length ? db.sql`WHERE ${db.join(conds, " AND ")}` : db.sql``;
+    await db`SELECT * FROM pledges ${where} ORDER BY id`;
+
+    const call = state.calls[0]!;
+    expect(Array.from(call.strings).join("")).toBe(
+      "SELECT * FROM pledges  ORDER BY id",
+    );
+    expect(call.values).toEqual([]);
+  });
+
+  it("flattens nested fragments recursively with correct bind order", async () => {
+    const { Ctor, state } = createFakeCtor();
+    state.nextRowsQueue.push([]);
+    const db = _createDbWith(Ctor, { url: "sqlite::memory:" });
+
+    const inner = sql`b = ${2} AND c = ${3}`;
+    const outer = sql`a = ${1} AND (${inner})`;
+    await db`SELECT * FROM t WHERE ${outer}`;
+
+    const call = state.calls[0]!;
+    expect(call.values).toEqual([1, 2, 3]);
+    expect(Array.from(call.strings).join("?")).toBe(
+      "SELECT * FROM t WHERE a = ? AND (b = ? AND c = ?)",
+    );
+  });
+
+  it("treats injection attempts inside a fragment value as a bound parameter", async () => {
+    const { Ctor, state } = createFakeCtor();
+    state.nextRowsQueue.push([]);
+    const db = _createDbWith(Ctor, { url: "sqlite::memory:" });
+
+    const evil = "'; DROP TABLE users; --";
+    const where = db.sql`name = ${evil}`;
+    await db`SELECT * FROM users WHERE ${where}`;
+
+    const call = state.calls[0]!;
+    for (const s of call.strings) {
+      expect(s).not.toContain("DROP TABLE");
+      expect(s).not.toContain(evil);
+    }
+    expect(call.values).toEqual([evil]);
+  });
+
+  it("fragments compose through .one() as well", async () => {
+    const { Ctor, state } = createFakeCtor();
+    state.nextRowsQueue.push([{ id: 7 }]);
+    const db = _createDbWith(Ctor, { url: "sqlite::memory:" });
+
+    const where = db.sql`id = ${7}`;
+    const row = await db.one`SELECT * FROM t WHERE ${where}`;
+
+    expect(row).toEqual({ id: 7 });
+    expect(state.calls[0]!.values).toEqual([7]);
+  });
+
+  it("exposes sql/join on the lazy createDb handle too", () => {
+    const db = createDb({ url: "sqlite::memory:" });
+    expect(typeof db.sql).toBe("function");
+    expect(typeof db.join).toBe("function");
+    expect(isSqlFragment(db.sql`x = ${1}`)).toBe(true);
+  });
+});

package/src/db/index.ts

@@ -45,6 +45,22 @@
  * escape hatch on the public surface — use Bun.SQL directly if you need
  * `sql.unsafe()` semantics.
  *
+ * ## Dynamic queries
+ *
+ * For runtime-variable filters (optional `WHERE` conditions, sort direction,
+ * pagination) compose {@link SqlFragment}s with `db.sql` and `db.join`
+ * instead of branching whole queries or hand-synthesising a
+ * `TemplateStringsArray`. Fragments are inert until embedded in an executing
+ * call, at which point their static text inlines and their values stay bound:
+ *
+ * ```ts
+ * const conds = [];
+ * if (party)  conds.push(db.sql`party = ${party}`);
+ * if (search) conds.push(db.sql`title ILIKE ${"%" + search + "%"}`);
+ * const where = conds.length ? db.sql`WHERE ${db.join(conds, " AND ")}` : db.sql``;
+ * const rows = await db`SELECT * FROM pledges ${where} LIMIT ${limit}`;
+ * ```
+ *
  * @example
  * ```ts
  * import { createDb } from "@mandujs/core/db";
@@ -159,6 +175,36 @@ export interface Db {
    * "pool closed" error. Calling `close()` twice is a no-op (idempotent).
    */
   close(options?: DbCloseOptions): Promise<void>;
+
+  /**
+   * Builds a composable, not-yet-executed SQL {@link SqlFragment}. Embed it
+   * inside another `db`/`db.one` tagged-template call to assemble dynamic
+   * queries (optional filters, conditional `WHERE`, sort direction) while
+   * keeping every interpolated value a bound parameter.
+   *
+   * Static text in the fragment template is merged into the surrounding SQL;
+   * `${value}` placeholders stay bound — never string-interpolated.
+   *
+   * @example
+   * ```ts
+   * const conds = [];
+   * if (party)  conds.push(db.sql`party = ${party}`);
+   * if (region) conds.push(db.sql`region = ${region}`);
+   * const where = conds.length ? db.sql`WHERE ${db.join(conds, " AND ")}` : db.sql``;
+   * const rows = await db`SELECT * FROM pledges ${where} ORDER BY created_at DESC`;
+   * ```
+   */
+  sql(strings: TemplateStringsArray, ...values: unknown[]): SqlFragment;
+
+  /**
+   * Joins fragments with a separator into a single {@link SqlFragment}.
+   * Empty list → an empty fragment. The separator is static text (default
+   * `", "`); pass a fragment if you need a bound value inside it.
+   */
+  join(
+    fragments: readonly SqlFragment[],
+    separator?: SqlFragment | string,
+  ): SqlFragment;
 }
 
 /** Options forwarded to Bun.SQL pool shutdown. */
@@ -170,6 +216,128 @@ export interface DbCloseOptions {
   timeout?: number;
 }
 
+// ─── Composable SQL fragments (dynamic WHERE / filters) ─────────────────────
+
+const SQL_FRAGMENT_MARKER = "__manduSqlFragment";
+
+/**
+ * A composable, not-yet-executed SQL fragment produced by {@link sql} (or
+ * `db.sql`). Holds the static template `strings` and the interpolated
+ * `values` (which may themselves be nested fragments). Flattened into the
+ * surrounding query at execution time so values stay bound parameters.
+ */
+export interface SqlFragment {
+  readonly [SQL_FRAGMENT_MARKER]: true;
+  readonly strings: readonly string[];
+  readonly values: readonly unknown[];
+}
+
+/** Structural check for a {@link SqlFragment}. */
+export function isSqlFragment(value: unknown): value is SqlFragment {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    (value as Record<string, unknown>)[SQL_FRAGMENT_MARKER] === true
+  );
+}
+
+/**
+ * Tagged-template builder for a {@link SqlFragment}. Also exposed as
+ * `db.sql`. The fragment is inert until embedded in an executing
+ * `db`/`db.one` call.
+ */
+export function sql(
+  strings: TemplateStringsArray,
+  ...values: unknown[]
+): SqlFragment {
+  return { [SQL_FRAGMENT_MARKER]: true, strings: Array.from(strings), values };
+}
+
+/** A fragment carrying only static text and no bound values. */
+function staticFragment(text: string): SqlFragment {
+  return { [SQL_FRAGMENT_MARKER]: true, strings: [text], values: [] };
+}
+
+/**
+ * Joins fragments with a separator. Also exposed as `db.join`. An empty list
+ * yields an empty fragment; a single-element list returns that element.
+ */
+export function join(
+  fragments: readonly SqlFragment[],
+  separator: SqlFragment | string = ", ",
+): SqlFragment {
+  if (fragments.length === 0) return staticFragment("");
+  if (fragments.length === 1) return fragments[0]!;
+  const sep = typeof separator === "string" ? staticFragment(separator) : separator;
+  const values: unknown[] = [];
+  for (let i = 0; i < fragments.length; i++) {
+    if (i > 0) values.push(sep);
+    values.push(fragments[i]);
+  }
+  return {
+    [SQL_FRAGMENT_MARKER]: true,
+    strings: new Array<string>(values.length + 1).fill(""),
+    values,
+  };
+}
+
+interface FlatSql {
+  parts: string[];
+  binds: unknown[];
+}
+
+/**
+ * Recursively flattens a (possibly fragment-bearing) template into a single
+ * `{ parts, binds }` pair. Static text from nested fragments is merged into
+ * `parts`; every non-fragment value becomes one bound parameter in `binds`.
+ * Invariant: `parts.length === binds.length + 1`.
+ */
+function flattenSqlTemplate(
+  strings: readonly string[],
+  values: readonly unknown[],
+): FlatSql {
+  const parts: string[] = [strings[0] ?? ""];
+  const binds: unknown[] = [];
+
+  for (let i = 0; i < values.length; i++) {
+    const value = values[i];
+    const tail = strings[i + 1] ?? "";
+
+    if (isSqlFragment(value)) {
+      const inner = flattenSqlTemplate(value.strings, value.values);
+      parts[parts.length - 1] += inner.parts[0] ?? "";
+      for (let j = 0; j < inner.binds.length; j++) {
+        binds.push(inner.binds[j]);
+        parts.push(inner.parts[j + 1] ?? "");
+      }
+      parts[parts.length - 1] += tail;
+    } else {
+      binds.push(value);
+      parts.push(tail);
+    }
+  }
+
+  return { parts, binds };
+}
+
+/** True when any value needs fragment flattening before reaching Bun.SQL. */
+function hasSqlFragment(values: readonly unknown[]): boolean {
+  for (const value of values) {
+    if (isSqlFragment(value)) return true;
+  }
+  return false;
+}
+
+/**
+ * Rebuilds a synthetic `TemplateStringsArray` from flattened parts so the
+ * merged query can be handed back to Bun.SQL's tagged-template entry point.
+ * `raw` mirrors the cooked strings — we never expose a raw-interpolation path.
+ */
+function toTemplateStringsArray(parts: readonly string[]): TemplateStringsArray {
+  const arr = parts.slice();
+  return Object.assign(arr, { raw: parts.slice() }) as unknown as TemplateStringsArray;
+}
+
 // ─── Bun runtime surface (structural; no `any`) ─────────────────────────────
 
 /** Shape of the options object Bun.SQL accepts. */
@@ -405,9 +573,18 @@ function buildDbHandle(bunSql: BunSqlInstance, provider: SqlProvider): Db {
     if (closed) {
       throw new Error(POOL_CLOSED_MESSAGE);
     }
+    // Flatten any composable fragments into a single merged template so
+    // their static text inlines and their values stay bound parameters.
+    let tsa: TemplateStringsArray = strings;
+    let binds: unknown[] = values;
+    if (hasSqlFragment(values)) {
+      const flat = flattenSqlTemplate(strings, values);
+      tsa = toTemplateStringsArray(flat.parts);
+      binds = flat.binds;
+    }
     try {
       // `bunSql` is itself a tagged-template callable; pass through verbatim.
-      const result = await bunSql<T>(strings, ...values);
+      const result = await bunSql<T>(tsa, ...binds);
       // Bun.SQL returns an array-like with metadata props (count/command/…).
       // Coerce to a plain array so consumers don't accidentally couple to
       // those fields through this wrapper's public surface.
@@ -474,6 +651,9 @@ function buildDbHandle(bunSql: BunSqlInstance, provider: SqlProvider): Db {
     }
   };
 
+  (db as { sql: Db["sql"] }).sql = sql;
+  (db as { join: Db["join"] }).join = join;
+
   return db;
 }
 
@@ -581,6 +761,8 @@ export function createDb(config: DbConfig): Db {
     real = null;
     await db.close(options);
   };
+  (forward as { sql: Db["sql"] }).sql = sql;
+  (forward as { join: Db["join"] }).join = join;
   Object.defineProperty(forward, PIN_DB_HANDLE, {
     value: async function withPinnedHandle<R>(fn: () => Promise<R>): Promise<R> {
       pinDepth += 1;

package/src/runtime/__tests__/searchparams-page-props.test.ts

@@ -0,0 +1,81 @@
+import { describe, expect, it } from "bun:test";
+import React from "react";
+import type { RoutesManifest } from "../../spec/schema";
+import {
+  createServerRegistry,
+  startServer,
+  type ManduServer,
+} from "../server";
+
+// Issue #314 — server page components must receive `searchParams` (query
+// string) as a prop, matching the value `generateMetadata` already gets.
+// SearchPage renders the query so we can assert it survives SSR.
+function SearchPage({
+  params,
+  searchParams,
+}: {
+  params: Record<string, string>;
+  searchParams: Record<string, string>;
+}): React.ReactElement {
+  return React.createElement(
+    "main",
+    null,
+    React.createElement("p", { "data-testid": "q" }, `q = ${searchParams.q ?? "(undefined)"}`),
+    React.createElement("p", { "data-testid": "id" }, `id = ${params.id ?? "(none)"}`),
+  );
+}
+
+function searchManifest(): RoutesManifest {
+  return {
+    version: 1,
+    routes: [
+      {
+        id: "search",
+        kind: "page",
+        pattern: "/search",
+        module: "app/search/page.tsx",
+        componentModule: "app/search/page.tsx",
+        hydration: { strategy: "none", priority: "visible", preload: false },
+      },
+    ],
+  };
+}
+
+async function fetchSearch(query: string): Promise<{ status: number; html: string }> {
+  const registry = createServerRegistry();
+  registry.registerRouteComponent("search", SearchPage);
+
+  let server: ManduServer | undefined;
+  try {
+    server = startServer(searchManifest(), {
+      port: 0,
+      registry,
+      transitions: false,
+      prefetch: false,
+      spa: false,
+      devtools: false,
+      silent: true,
+    });
+    const response = await fetch(`http://127.0.0.1:${server.server.port}/search${query}`);
+    return { status: response.status, html: await response.text() };
+  } finally {
+    server?.stop();
+  }
+}
+
+describe("server page searchParams prop (#314)", () => {
+  it("passes the query string to the page component", async () => {
+    const { status, html } = await fetchSearch("?q=foo");
+
+    expect(status).toBe(200);
+    expect(html).toContain("q = foo");
+    expect(html).not.toContain("q = (undefined)");
+  });
+
+  it("renders gracefully when the query string is absent", async () => {
+    const { status, html } = await fetchSearch("");
+
+    expect(status).toBe(200);
+    expect(html).toContain("q = (undefined)");
+  });
+});