primitive-admin 1.0.53 → 1.0.55

package/dist/src/lib/db-codegen/dbTemplates.js

@@ -11,15 +11,25 @@
  *      classes — so we emit plain `export interface` types with no class
  *      shell, no barrel registration, and `import type` only.
  *   2. We add an OPERATIONS half codegen-v2 has no analog for: per-op
- *      input-params interfaces + per-op result aliases keyed off `op.type`.
+ *      input-params interfaces + per-op result aliases. The alias for an op
+ *      is derived from `op.type` AND, where it matters, the op's parsed
+ *      `definition`: a query op's `projection` (#1439), a mutation op's step
+ *      kinds (#1438), and a pipeline op's `return` step (#1437). The generator
+ *      resolves those into the small descriptors below; the templates stay pure
+ *      string-emitters.
  */
 import { tsTypeForDbField, tsTypeForDbParamType } from "./dbTsTypes.js";
 const HEADER_BANNER = "// AUTO-GENERATED FROM database-types TOML — DO NOT EDIT.";
 const REGEN_INSTRUCTION = "// Run `primitive databases codegen <database-type>` to regenerate.";
-/** The shared generic result aliases, keyed off `op.type`. */
-export const RESULT_ALIASES_BLOCK = `// Generic per-op result shapes, keyed off the operation type. The op
-// return contract is NOT stored in the TOML — these mirror the runtime
-// result shapes produced by the database-operations controller.
+/**
+ * The shared generic result shapes referenced by the per-op aliases. These
+ * mirror the runtime result shapes produced by the database-operations
+ * controller; per-op aliases point at them (and, where the definition makes the
+ * shape derivable, at a narrowed form — see `renderOpResultAlias`).
+ */
+export const RESULT_ALIASES_BLOCK = `// Generic per-op result shapes. These mirror the runtime result shapes
+// produced by the database-operations controller; per-op aliases reference
+// them (or a narrowed form when the op definition makes the shape derivable).
 
 /** \`query\` ops return a page of records. */
 export interface QueryResult<T = Record<string, unknown>> {
@@ -28,9 +38,29 @@ export interface QueryResult<T = Record<string, unknown>> {
   nextCursor?: string;
 }
 
-/** \`mutation\` ops return per-step results. */
+/**
+ * One step's result inside a \`mutation\` op's uniform response (#1458).
+ * \`op\` is the step kind; \`id\` is the record id (the resolved canonical id for
+ * \`upsertOn\` saves). \`values\` carries an \`increment\` step's post-increment
+ * counters; \`error\` a per-step failure string.
+ */
+export interface MutationStepResult {
+  op: "save" | "patch" | "delete" | "increment" | "addToSet" | "removeFromSet";
+  success: boolean;
+  id: string;
+  values?: Record<string, number>;
+  error?: string;
+}
+
+/**
+ * Every \`mutation\` op returns a uniform \`{ results: MutationStepResult[] }\`
+ * in DEFINITION-STEP order — one entry per step, tagged with its \`op\` kind and
+ * record \`id\` (#1458). This is a SUCCESS-PATH guarantee: a step that fails at
+ * the HTTP level surfaces as an error, and committed sibling writes in the same
+ * op are not reported (the ops are not yet executed atomically — see #1478).
+ */
 export interface MutationResult {
-  results: unknown[];
+  results: MutationStepResult[];
 }
 
 /** \`count\` ops return a single count. */
@@ -125,22 +155,67 @@ export function renderOpParamsInterface(input) {
     lines.push(`export interface ${interfaceName} {`);
     for (const p of params) {
         const optional = p.required ? "" : "?";
-        lines.push(`  ${p.name}${optional}: ${tsTypeForDbParamType(p.type, p.enum)};`);
+        lines.push(`  ${p.name}${optional}: ${tsTypeForDbParamType(p.type, p.enum, p.items)};`);
     }
     lines.push(`}`);
     return lines.join("\n");
 }
 /**
- * Render a per-op result alias keyed off `op.type`.
+ * Compute the generic argument for a `QueryResult<...>` from the op's record
+ * interface + projection classification (#1439). Reused for a pipeline op's
+ * returning `query` step (#1437), so both type identically to a plain query.
+ *
+ * A null record interface (the op's model has no `[models.*]` schema) has
+ * nothing to `Pick` from, so it always falls back to
+ * `Record<string, unknown>` regardless of any projection.
+ */
+function queryResultGeneric(recordInterfaceName, projection) {
+    if (recordInterfaceName === null)
+        return "Record<string, unknown>";
+    const p = projection ?? { kind: "full" };
+    switch (p.kind) {
+        case "full":
+            return recordInterfaceName;
+        case "partial":
+            return `Partial<${recordInterfaceName}>`;
+        case "pick": {
+            // The generator guarantees a non-empty, field-guarded, sorted list; a
+            // defensive empty check keeps this total. Field names are emitted as TS
+            // string literals via JSON.stringify.
+            if (p.fields.length === 0)
+                return recordInterfaceName;
+            const members = p.fields.map((f) => JSON.stringify(f)).join(" | ");
+            return `Pick<${recordInterfaceName}, ${members}>`;
+        }
+        case "omit": {
+            // Static all-exclusion over known members (id/type already filtered out by
+            // the generator). The classifier guarantees a non-empty, sorted, member-
+            // guarded list; the defensive empty check keeps this total. Same literal
+            // emission style as `pick`.
+            if (p.fields.length === 0)
+                return recordInterfaceName;
+            const members = p.fields.map((f) => JSON.stringify(f)).join(" | ");
+            return `Omit<${recordInterfaceName}, ${members}>`;
+        }
+    }
+}
+/**
+ * Render a per-op result alias. The alias is derived from `op.type` and, where
+ * the shape is derivable from the parsed op definition, a narrowed form:
+ *   - `query`    → `QueryResult<M>`, narrowed by the op `projection` (#1439).
+ *   - `mutation` → `MutationResult` — every mutation op returns the uniform
+ *                  `{ results: MutationStepResult[] }` in definition order (#1458).
+ *   - `pipeline` → the returned step's result type (#1437); `return: "all"` /
+ *                  no-return / unresolvable keep the generic `PipelineResult`.
  */
 export function renderOpResultAlias(input) {
-    const { aliasName, opType, recordInterfaceName } = input;
+    const { aliasName, opType, recordInterfaceName, projection } = input;
     switch (opType) {
-        case "query": {
-            const generic = recordInterfaceName ?? "Record<string, unknown>";
-            return `export type ${aliasName} = QueryResult<${generic}>;`;
-        }
+        case "query":
+            return `export type ${aliasName} = QueryResult<${queryResultGeneric(recordInterfaceName, projection)}>;`;
         case "mutation":
+            // Every mutation op returns the uniform `{ results: MutationStepResult[] }`
+            // in definition-step order (#1458) — no more per-category flat shapes.
             return `export type ${aliasName} = MutationResult;`;
         case "count":
             return `export type ${aliasName} = CountResult;`;
@@ -148,12 +223,213 @@ export function renderOpResultAlias(input) {
             return `export type ${aliasName} = AggregateResult;`;
         case "applyToQuery":
             return `export type ${aliasName} = ApplyToQueryResult;`;
-        case "pipeline":
-            return `export type ${aliasName} = PipelineResult;`;
+        case "pipeline": {
+            const d = input.pipelineReturn ?? { kind: "opaque" };
+            switch (d.kind) {
+                case "query":
+                    return `export type ${aliasName} = QueryResult<${queryResultGeneric(d.recordInterfaceName, d.projection)}>;`;
+                case "count":
+                    return `export type ${aliasName} = CountResult;`;
+                case "aggregate":
+                    return `export type ${aliasName} = AggregateResult;`;
+                // `opaque` — `return: "all"`, no `return`, or a step the generator
+                // couldn't resolve — keeps the generic `PipelineResult` (unchanged).
+                case "opaque":
+                default:
+                    return `export type ${aliasName} = PipelineResult;`;
+            }
+        }
         default:
             // Unknown op type — emit a permissive alias rather than throwing,
             // so one stray op doesn't block codegen for the whole file.
             return `export type ${aliasName} = unknown;`;
     }
 }
+// The `databases.executeOperation<R>` member on the structural client shape.
+// `object` (not `Record<string, unknown>`) so a strict generated `<Op>Params`
+// interface — which has no index signature — is still assignable here.
+const EXECUTE_OPERATION_MEMBER = [
+    "    executeOperation<R>(",
+    "      databaseId: string,",
+    "      name: string,",
+    "      options?: {",
+    "        params?: object;",
+    "        limit?: number;",
+    "        cursor?: string;",
+    "        direction?: 1 | -1;",
+    "        timing?: boolean;",
+    "      },",
+    "    ): Promise<R>;",
+];
+// The `databases.subscribe<T>` member on the structural client shape
+// (#1544 Phase 2). Mirrors the client's `subscribe<T, P>` closely enough that
+// the real `JsBaoClient` satisfies it structurally; `P` defaults there so the
+// single generic here is compatible.
+const SUBSCRIBE_MEMBER = [
+    "    subscribe<T>(",
+    "      databaseId: string,",
+    "      subscriptionKey: string,",
+    "      options: SubscribeOptions<T>,",
+    "    ): () => void;",
+];
+// Non-param options (pagination + diagnostics) each ops factory method accepts.
+const OPS_CALL_OPTIONS_BLOCK = [
+    "// Non-param options (pagination + diagnostics) each factory method accepts",
+    "// alongside its params, passed straight through to `executeOperation`.",
+    "interface OpsCallOptions {",
+    "  limit?: number;",
+    "  cursor?: string;",
+    "  direction?: 1 | -1;",
+    "  timing?: boolean;",
+    "}",
+].join("\n");
+// Inlined structural subscribe types (#1544 Phase 2) — import-free mirrors of
+// the client's `DatabaseSubscribeOptions` / `DatabaseChangePayload` /
+// `DatabaseChangeEvent`. `T` is the record type bound to each change; a
+// projected subscription binds `T` to a `Pick<Record, …select>`.
+const SUBSCRIBE_TYPES_BLOCK = [
+    "interface SubscribeOptions<T> {",
+    "  params?: Record<string, any>;",
+    "  onChange: (event: SubscribeChangePayload<T>) => void;",
+    "}",
+    "interface SubscribeChangePayload<T> {",
+    '  type: "db.change";',
+    "  databaseId: string;",
+    "  subscriptionKey: string;",
+    "  changes: SubscribeChangeEvent<T>[];",
+    "  timestamp: string;",
+    "  originConnectionId: string | null;",
+    "  originUserId: string | null;",
+    "  isOrigin: boolean;",
+    "  isOriginUser: boolean;",
+    "}",
+    "interface SubscribeChangeEvent<T> {",
+    '  changeType?: "enter" | "update" | "leave";',
+    '  op: "save" | "patch" | "delete" | "increment" | "addToSet" | "removeFromSet";',
+    "  modelName: string;",
+    "  id: string;",
+    "  data?: T | null;",
+    "  previousData?: T | null;",
+    "}",
+].join("\n");
+/**
+ * The inlined structural client shape, carrying whichever members the file
+ * needs (`executeOperation` for ops, `subscribe` for subscriptions). One shared
+ * `OpsClient` interface serves both the `<type>Ops` and `<type>Subscriptions`
+ * factories so the file never declares the interface twice.
+ */
+function renderClientInterface(members) {
+    return [
+        "// Minimal structural client shape — inlined so this file stays import-free",
+        "// and carries no runtime dependency on the client package. The real",
+        "// `JsBaoClient` satisfies it structurally.",
+        "interface OpsClient {",
+        "  databases: {",
+        ...members,
+        "  };",
+        "}",
+    ].join("\n");
+}
+/** One factory method per op, pairing `<Op>Params` in with `<Op>Result` out. */
+function opsMethodLines(ops) {
+    return ops.map((op) => {
+        const nameLiteral = JSON.stringify(op.opName);
+        if (op.hasParams) {
+            return (`    ${op.propertyKey}: (params: ${op.paramsInterfaceName}, options?: OpsCallOptions): Promise<${op.resultAliasName}> =>\n` +
+                `      client.databases.executeOperation<${op.resultAliasName}>(databaseId, ${nameLiteral}, { params, ...options }),`);
+        }
+        // No declared params: the method takes only the optional options object, so
+        // it stays callable with no arguments (`ops.foo()`).
+        return (`    ${op.propertyKey}: (options?: OpsCallOptions): Promise<${op.resultAliasName}> =>\n` +
+            `      client.databases.executeOperation<${op.resultAliasName}>(databaseId, ${nameLiteral}, { ...options }),`);
+    });
+}
+/** The `export function <type>Ops(...)` factory body. */
+function opsFactoryBlock(factoryName, databaseType, ops) {
+    return [
+        `/** Typed accessor for \`${databaseType}\` operations. */`,
+        `export function ${factoryName}(client: OpsClient, databaseId: string) {`,
+        "  return {",
+        ...opsMethodLines(ops),
+        "  };",
+        "}",
+    ].join("\n");
+}
+/**
+ * Render the typed-operations factory (#1441): an inlined structural client
+ * interface + a shared call-options type + the `export function <type>Ops`
+ * factory. Each method pairs an op's `<Op>Params` input with its `<Op>Result`
+ * output and calls `client.databases.executeOperation<<Op>Result>(...)`, so the
+ * generated code carries no `as` cast and no import — the real `JsBaoClient`
+ * satisfies the structural `OpsClient` param.
+ *
+ * Returns "" for a database type with no operations, so the caller can omit the
+ * factory entirely rather than emit an empty function.
+ */
+export function renderOpsFactory(input) {
+    const { factoryName, databaseType, ops } = input;
+    if (ops.length === 0)
+        return "";
+    return [
+        renderClientInterface(EXECUTE_OPERATION_MEMBER),
+        OPS_CALL_OPTIONS_BLOCK,
+        opsFactoryBlock(factoryName, databaseType, ops),
+    ].join("\n\n");
+}
+/** The `export function <type>Subscriptions(...)` factory body. */
+function subscriptionsFactoryBlock(factoryName, databaseType, subscriptions) {
+    const methodLines = subscriptions.map((sub) => {
+        const keyLiteral = JSON.stringify(sub.subscriptionKey);
+        return (`    ${sub.propertyKey}: (options: SubscribeOptions<${sub.eventType}>): (() => void) =>\n` +
+            `      client.databases.subscribe<${sub.eventType}>(databaseId, ${keyLiteral}, options),`);
+    });
+    return [
+        `/** Typed accessor for \`${databaseType}\` realtime subscriptions. */`,
+        `export function ${factoryName}(client: OpsClient, databaseId: string) {`,
+        "  return {",
+        ...methodLines,
+        "  };",
+        "}",
+    ].join("\n");
+}
+/**
+ * Render the typed-ops factory (#1441) and the typed-subscriptions factory
+ * (#1544 Phase 2) for one database type, sharing a single structural `OpsClient`
+ * interface (Fork 4 = A).
+ *
+ * With no subscriptions this is byte-identical to {@link renderOpsFactory}, so
+ * every existing generated file (none of which has subscriptions) is unchanged.
+ * When subscriptions exist, the shared `OpsClient` gains a `subscribe<T>`
+ * member, the inlined subscribe types are emitted once, and a separate
+ * `<type>Subscriptions` factory follows the ops factory. The file stays
+ * import-free (behavior 10).
+ *
+ * Returns "" when the type has neither ops nor subscriptions.
+ */
+export function renderFactories(input) {
+    const { databaseType, ops, subscriptions } = input;
+    // No subscriptions → identical to the standalone ops factory (keeps every
+    // pre-#1544 generated file byte-for-byte unchanged).
+    if (subscriptions.length === 0) {
+        return renderOpsFactory({
+            factoryName: input.opsFactoryName,
+            databaseType,
+            ops,
+        });
+    }
+    const hasOps = ops.length > 0;
+    const members = [
+        ...(hasOps ? EXECUTE_OPERATION_MEMBER : []),
+        ...SUBSCRIBE_MEMBER,
+    ];
+    const blocks = [renderClientInterface(members)];
+    if (hasOps)
+        blocks.push(OPS_CALL_OPTIONS_BLOCK);
+    blocks.push(SUBSCRIBE_TYPES_BLOCK);
+    if (hasOps) {
+        blocks.push(opsFactoryBlock(input.opsFactoryName, databaseType, ops));
+    }
+    blocks.push(subscriptionsFactoryBlock(input.subscriptionsFactoryName, databaseType, subscriptions));
+    return blocks.join("\n\n");
+}
 //# sourceMappingURL=dbTemplates.js.map

package/dist/src/lib/db-codegen/dbTemplates.js.map

@@ -1 +1 @@
-{"version":3,"file":"dbTemplates.js","sourceRoot":"","sources":["../../../../src/lib/db-codegen/dbTemplates.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dbTemplates.js","sourceRoot":"","sources":["../../../../src/lib/db-codegen/dbTemplates.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/db-codegen/dbTsTypes.d.ts

@@ -33,8 +33,12 @@
  * library's internal type paths.
  */
 export type DbFieldType = "string" | "number" | "boolean" | "date" | "id" | "stringset";
-/** Param types accepted in an `[[operations]]` `params` block. */
-export type DbParamType = "string" | "number" | "boolean" | "object";
+/**
+ * Param types accepted in an `[[operations]]` `params` block. `array` (#1488)
+ * carries a scalar `items` element type; `integer` (also surfaced in #1488 when
+ * reconciling the registration/runtime type lists) maps to `number`.
+ */
+export type DbParamType = "string" | "number" | "boolean" | "integer" | "object" | "array";
 /**
  * Returns the TS type expression for a record field type. Unknown types
  * fall back to `unknown` rather than throwing: the database-type TOML is
@@ -75,4 +79,4 @@ export declare function tsTypeForDbField(fieldType: string, enumValues?: string[
  * the base type for a non-string param or an empty enum rather than throwing —
  * the server is the source of truth for rejecting a malformed param `enum`.
  */
-export declare function tsTypeForDbParamType(paramType: string, enumValues?: string[]): string;
+export declare function tsTypeForDbParamType(paramType: string, enumValues?: string[], items?: string): string;

package/dist/src/lib/db-codegen/dbTsTypes.js

@@ -90,7 +90,28 @@ export function tsTypeForDbField(fieldType, enumValues) {
  * the base type for a non-string param or an empty enum rather than throwing —
  * the server is the source of truth for rejecting a malformed param `enum`.
  */
-export function tsTypeForDbParamType(paramType, enumValues) {
+export function tsTypeForDbParamType(paramType, enumValues, items) {
+    // Array param (#1488): a declared `type = "array"` (Phase 2) or one inferred
+    // from a `$in`/`$nin` binding (Phase 1). `items` is the scalar element type;
+    // a per-element `enum` on a string-element array renders `("a" | "b")[]`.
+    // A missing/unresolved `items` renders `unknown[]` (the conservative widen).
+    if (paramType === "array") {
+        let elem;
+        if (items === "string" &&
+            Array.isArray(enumValues) &&
+            enumValues.length > 0) {
+            elem = `(${tsUnionFromEnum(enumValues)})`;
+        }
+        else if (items) {
+            // Element type is always scalar here, so the recursion never re-enters
+            // this array branch.
+            elem = tsTypeForDbParamType(items);
+        }
+        else {
+            elem = "unknown";
+        }
+        return `${elem}[]`;
+    }
     if (paramType === "string" &&
         Array.isArray(enumValues) &&
         enumValues.length > 0) {
@@ -100,6 +121,7 @@ export function tsTypeForDbParamType(paramType, enumValues) {
         case "string":
             return "string";
         case "number":
+        case "integer":
             return "number";
         case "boolean":
             return "boolean";

package/dist/src/lib/db-codegen/dbTsTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"dbTsTypes.js","sourceRoot":"","sources":["../../../../src/lib/db-codegen/dbTsTypes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAoBH;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI,CAAC;QACV,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,WAAW;YACd,sDAAsD;YACtD,OAAO,UAAU,CAAC;QACpB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAAC,MAAgB;IAC9C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAC9B,SAAiB,EACjB,UAAqB;IAErB,IACE,SAAS,KAAK,QAAQ;QACtB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,UAAU,CAAC,MAAM,GAAG,CAAC,EACrB,CAAC;QACD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,oBAAoB,CAAC,SAAS,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAiB,EACjB,UAAqB;IAErB,IACE,SAAS,KAAK,QAAQ;QACtB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,UAAU,CAAC,MAAM,GAAG,CAAC,EACrB,CAAC;QACD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,yBAAyB,CAAC;QACnC;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"dbTsTypes.js","sourceRoot":"","sources":["../../../../src/lib/db-codegen/dbTsTypes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AA8BH;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI,CAAC;QACV,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,WAAW;YACd,sDAAsD;YACtD,OAAO,UAAU,CAAC;QACpB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAAC,MAAgB;IAC9C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAC9B,SAAiB,EACjB,UAAqB;IAErB,IACE,SAAS,KAAK,QAAQ;QACtB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,UAAU,CAAC,MAAM,GAAG,CAAC,EACrB,CAAC;QACD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,oBAAoB,CAAC,SAAS,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAAiB,EACjB,UAAqB,EACrB,KAAc;IAEd,6EAA6E;IAC7E,6EAA6E;IAC7E,0EAA0E;IAC1E,6EAA6E;IAC7E,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,IAAI,IAAY,CAAC;QACjB,IACE,KAAK,KAAK,QAAQ;YAClB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;YACzB,UAAU,CAAC,MAAM,GAAG,CAAC,EACrB,CAAC;YACD,IAAI,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC5C,CAAC;aAAM,IAAI,KAAK,EAAE,CAAC;YACjB,uEAAuE;YACvE,qBAAqB;YACrB,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,GAAG,IAAI,IAAI,CAAC;IACrB,CAAC;IACD,IACE,SAAS,KAAK,QAAQ;QACtB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,UAAU,CAAC,MAAM,GAAG,CAAC,EACrB,CAAC;QACD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IACD,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,yBAAyB,CAAC;QACnC;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}

package/dist/src/lib/db-codegen/dbTypeIR.d.ts

@@ -0,0 +1,146 @@
+/**
+ * Shared database-type operation IR (issue #1547, Phase 4).
+ *
+ * `describeDbType` resolves ONE database-type TOML into a naming-neutral
+ * descriptor of its record models and operations — the record fields (with
+ * inferred required-ness), the per-op input params, and the per-op result
+ * descriptor (query projection #1439, mutation, count, aggregate,
+ * applyToQuery, pipeline return #1437). It performs NO language-specific
+ * naming: the TS renderer (`dbGenerator.ts`) and the Swift renderer
+ * (`swift-codegen/dbGenerator.ts`) both consume this SAME IR and each apply
+ * their own identifier rules. Neither renderer re-walks the op definitions, so
+ * the two clients can never disagree on which operations a database type
+ * exposes, what params they take, or what shape they return (issue #1547
+ * binding item 5 — the same "shared operation IR, no metadata reconstruction"
+ * contract Phase 3's `describeWorkflowInvoker` gives the workflow invoker).
+ *
+ * The resolution logic here was lifted verbatim from `renderDbTypeFile`'s
+ * former inline body; the only change is that result descriptors reference a
+ * MODEL NAME (naming-neutral) rather than a resolved TS interface name, so the
+ * Swift renderer can map the same model to its own type name.
+ */
+import type { RecordField, ParamField, ProjectionClassification } from "./dbTemplates.js";
+export interface DbCodegenInput {
+    /** Database type name (drives the output filename). */
+    databaseType: string;
+    /** Path to the source `database-types/<type>.toml` file. */
+    tomlPath: string;
+    /** Raw TOML content (already read from disk). */
+    tomlContent: string;
+}
+/**
+ * Naming-neutral form of a pipeline op's resolved `return` step (#1437). Same
+ * shape as `dbTemplates.PipelineReturnDescriptor` but keyed on the returning
+ * step's MODEL NAME instead of a resolved interface name, so each renderer maps
+ * it to its own record type. `opaque` → the generic pipeline-result envelope.
+ */
+export type PipelineReturnIR = {
+    kind: "query";
+    modelName: string | null;
+    projection: ProjectionClassification;
+} | {
+    kind: "count";
+} | {
+    kind: "aggregate";
+} | {
+    kind: "opaque";
+};
+/** One record model on a database type (read shape), naming-neutral. */
+export interface DbRecordIR {
+    /** TOML model name (e.g. `accounts`). */
+    modelName: string;
+    /** Optional `class_name` override from the schema (naming input). */
+    className?: string;
+    /**
+     * Record fields with required-ness already resolved (schema `required`,
+     * `id` auto-assign, and op-params inference #842 folded in). Rendered into a
+     * struct/interface member per field.
+     */
+    fields: RecordField[];
+}
+/** One operation on a database type, naming-neutral. */
+export interface DbOpIR {
+    /** Exact operation name (the `executeOperation` string argument). */
+    opName: string;
+    /** Operation type (`query|mutation|count|aggregate|pipeline|applyToQuery`). */
+    opType: string;
+    /** Declared input params (sorted by name), write shape. */
+    params: ParamField[];
+    /** Whether the op declares any params (a param-less op is callable bare). */
+    hasParams: boolean;
+    /**
+     * For a `query` op, the model its result rows are typed over — or null when
+     * the op has no model or the model has no record schema (the result falls
+     * back to an open/untyped row).
+     */
+    resultModelName: string | null;
+    /** For a `query` op, how its static `projection` narrows the record (#1439). */
+    projection?: ProjectionClassification;
+    /** For a `pipeline` op, the resolved `return`-step shape (#1437). */
+    pipelineReturn?: PipelineReturnIR;
+}
+/**
+ * One realtime subscription on a database type (#1544 Phase 2), naming-neutral.
+ *
+ * `modelName` is guaranteed to name a model that has a record schema on this
+ * type (`describeDbType` throws otherwise — a subscription can't be typed
+ * against a model the type doesn't declare; matches the server's
+ * `modelName is required` create validation). `select` fields, when present,
+ * are each guaranteed to be a known member of that record (declared field or
+ * stamped field) unless the record is the open `Record<string, unknown>` form,
+ * so the renderer can emit a valid `Pick<Record, …>` without a further guard.
+ */
+export interface DbSubscriptionIR {
+    /** Subscription key (the `subscribe()` string argument). */
+    subscriptionKey: string;
+    /** Model whose record type binds the delivered change payload. */
+    modelName: string;
+    /**
+     * Projected field names when the subscription declares `select` (→ the event
+     * record narrows to `Pick<Record, …fields>`), else null (→ the full record).
+     * Sorted + de-duplicated for deterministic output.
+     */
+    select: string[] | null;
+}
+/** The shared, naming-neutral descriptor of one database type. */
+export interface DbTypeIR {
+    /** Database type name (drives the output filename). */
+    databaseType: string;
+    /** Content fingerprint stamped in the generated header. */
+    fingerprint: string;
+    /** Server-stamped field names appended as OPTIONAL props on every record. */
+    stampedFields: string[];
+    /** Record models (schema order; renderers sort by their own type name). */
+    records: DbRecordIR[];
+    /** Operations, sorted by op name for deterministic output. */
+    ops: DbOpIR[];
+    /** Subscriptions, sorted by subscription key for deterministic output. */
+    subscriptions: DbSubscriptionIR[];
+}
+/**
+ * Resolve a database-type TOML into the shared, naming-neutral IR. Pure: no
+ * I/O beyond parsing the passed content. Both the TS and Swift renderers call
+ * this so their op/record metadata can never diverge.
+ */
+export declare function describeDbType(input: DbCodegenInput): DbTypeIR;
+/**
+ * Infer the scalar element type for op params consumed by a `$in`/`$nin`
+ * filter operator (#1488). See the original doc in `dbGenerator.ts` — moved
+ * here unchanged. Returns a map of param name → element TS type
+ * (`"unknown"` sentinel → widen to an untyped element).
+ */
+export declare function inferArrayParamElementTypes(op: any, fieldTypesByModel: Map<string, Map<string, string>>): Map<string, string>;
+/**
+ * Per-model result of {@link inferRequiredRecordFields}. Shaped as an object so
+ * it can grow additional inferred metadata later without changing callers.
+ */
+export interface InferredRecordModelInfo {
+    /** Record field names promoted to non-optional by op-params inference. */
+    fields: Set<string>;
+}
+/**
+ * Infer which record fields are always supplied at create time from `save` op
+ * params (#842). See the original doc in `dbGenerator.ts` — moved here
+ * unchanged.
+ */
+export declare function inferRequiredRecordFields(operations: any[]): Map<string, InferredRecordModelInfo>;