@vibeorm/generator 2.2.2 → 2.3.0

package/dist/emit-dts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-dts.d.ts","sourceRoot":"","sources":["../src/emit-dts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,qBAAqB,EAAyC,MAAM,iBAAiB,CAAC;AAGpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAgD,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAgXjG;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG,MAAM,CAejE;AAgyDD,2DAA2D;AAC3D,wBAAgB,OAAO,CAAC,MAAM,EAAE;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC7C,GAAG,MAAM,CAoGT"}
+{"version":3,"file":"emit-dts.d.ts","sourceRoot":"","sources":["../src/emit-dts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,qBAAqB,EAAyC,MAAM,iBAAiB,CAAC;AAGpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAgD,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAkXjG;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG,MAAM,CAejE;AA00DD,2DAA2D;AAC3D,wBAAgB,OAAO,CAAC,MAAM,EAAE;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC7C,GAAG,MAAM,CAoGT"}

package/dist/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAyB,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAM7H,mCAAmC;AACnC,MAAM,MAAM,cAAc,GAAG;IAC3B,qEAAqE;IACrE,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAOF;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,+EAA+E;IAC/E,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,iFAAiF;IACjF,UAAU,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IACtC,qFAAqF;IACrF,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,GAAG,OAAO,CAAC,cAAc,CAAC,CA6B1B"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAyB,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAM7H,mCAAmC;AACnC,MAAM,MAAM,cAAc,GAAG;IAC3B,qEAAqE;IACrE,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAOF;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,+EAA+E;IAC/E,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,iFAAiF;IACjF,UAAU,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IACtC,qFAAqF;IACrF,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B,GAAG,OAAO,CAAC,cAAc,CAAC,CA8B1B"}

package/dist/index.d.ts

@@ -6,6 +6,7 @@
  * typed surface in an index.d.ts written as text (decision D3) — the consumer's
  * tsserver never re-infers ORM internals (constitution rules 1–2).
  */
+export { prepareDatabaseModuleSchema } from "./module-schema.ts";
 export { generateClient } from "./generate.ts";
 export type { GenerateResult } from "./generate.ts";
 export { bakeExtensions } from "./extension-bake.ts";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/index.js

@@ -1,4 +1,6 @@
 // @bun
+// packages/generator/src/module-schema.ts
+import { prepareDatabaseModuleSchema } from "@vibeorm/schema";
 // packages/generator/src/emit-module.ts
 import { createHash } from "crypto";
 import { VibeError as VibeError2, providerToDialect } from "@vibeorm/schema";
@@ -638,6 +640,8 @@ export type RelationStrategy = "query" | "join";
  * query still applies its own where/scoped/policy/RLS filters.
  */
 export type KeysetToken = string;
+/** A bounded page; the continuation is null when no lookahead row exists. */
+export type KeysetPage<T> = { readonly items: T[]; readonly nextCursor: KeysetToken | null };
 
 /** Per-query keyset options. */
 export type KeysetOptions = {
@@ -935,7 +939,13 @@ function checkedCreateLines(params) {
 function uncheckedCreateLines(params) {
   const { model, omitRelation } = params;
   const omitted = new Set(omitRelation === undefined ? [] : model.relations.find((relation) => relation.name === omitRelation)?.fkFields ?? []);
-  return model.fields.filter((field) => !omitted.has(field.name)).map((field) => createFieldProp({ field }));
+  return [
+    ...model.fields.filter((field) => !omitted.has(field.name)).map((field) => createFieldProp({ field })),
+    ...model.relations.map((relation) => {
+      const value = params.scalarOnly !== true && relation.fkFields.length === 0 && relation.name !== omitRelation ? nestedRefName({ relation, verb: "Create" }) : "never";
+      return `  readonly ${propKey({ name: relation.name })}?: ${value};`;
+    })
+  ];
 }
 function checkedUpdateLines(params) {
   const { model, omitRelation } = params;
@@ -955,7 +965,13 @@ function checkedUpdateLines(params) {
 function uncheckedUpdateLines(params) {
   const { model, omitRelation } = params;
   const omitted = new Set(omitRelation === undefined ? [] : model.relations.find((relation) => relation.name === omitRelation)?.fkFields ?? []);
-  return model.fields.filter((field) => !omitted.has(field.name)).map((field) => updateFieldProp({ field }));
+  return [
+    ...model.fields.filter((field) => !omitted.has(field.name)).map((field) => updateFieldProp({ field })),
+    ...model.relations.map((relation) => {
+      const value = params.scalarOnly !== true && relation.fkFields.length === 0 && relation.name !== omitRelation ? nestedRefName({ relation, verb: "Update" }) : "never";
+      return `  readonly ${propKey({ name: relation.name })}?: ${value};`;
+    })
+  ];
 }
 function register(params) {
   const { registry, name, text } = params;
@@ -1032,7 +1048,7 @@ function registerNestedContext(params) {
       lines: [`  readonly where: ${t}WhereUniqueInput;`, `  readonly create: ${createUnion};`]
     })
   });
-  const createManyData = inverse === null ? `readonly ${t}CreateManyInput[]` : `readonly ${t}UncheckedCreate${suffix}Input[]`;
+  const createManyData = inverse === null ? `readonly ${t}CreateManyInput[]` : `readonly { ${uncheckedCreateLines({ model: target, omitRelation: inverse, scalarOnly: true }).map((line) => skippableMembers({ block: line }).trim()).join(" ")} }[]`;
   if (many) {
     register({
       registry,
@@ -1265,10 +1281,10 @@ ${model.relations.map((relation) => `  ${propKey({ name: relation.name })}: ${re
   }));
   parts.push(inputAlias({ name: `${n}CreateInput`, lines: checkedCreateLines({ model }) }));
   parts.push(inputAlias({ name: `${n}UncheckedCreateInput`, lines: uncheckedCreateLines({ model }) }));
-  parts.push(`export type ${n}CreateManyInput = ${n}UncheckedCreateInput;`);
+  parts.push(inputAlias({ name: `${n}CreateManyInput`, lines: uncheckedCreateLines({ model, scalarOnly: true }) }));
   parts.push(inputAlias({ name: `${n}UpdateInput`, lines: checkedUpdateLines({ model }) }));
   parts.push(inputAlias({ name: `${n}UncheckedUpdateInput`, lines: uncheckedUpdateLines({ model }) }));
-  parts.push(`export type ${n}UpdateManyInput = ${n}UncheckedUpdateInput;`);
+  parts.push(inputAlias({ name: `${n}UpdateManyInput`, lines: uncheckedUpdateLines({ model, scalarOnly: true }) }));
   const numericFields = model.fields.filter((field) => !field.isList && field.scalar !== null && NUMERIC_SCALARS.has(field.scalar));
   const minmaxFields = model.fields.filter((field) => !field.isList && field.scalar !== null && MINMAX_SCALARS.has(field.scalar));
   parts.push(inputAlias({
@@ -1319,6 +1335,21 @@ ${model.relations.map((relation) => `  ${propKey({ name: relation.name })}: ${re
       ]
     }));
   }
+  parts.push(inputAlias({
+    name: `${n}FindPageArgs`,
+    lines: [
+      `  readonly where?: ${n}WhereInput;`,
+      `  readonly orderBy: ${orMany({ type: `${n}ScalarOrderByInput` })};`,
+      `  readonly take: number;`,
+      `  readonly after?: KeysetToken;`,
+      `  readonly keyset?: KeysetOptions;`,
+      `  readonly select?: ${n}Select;`,
+      `  readonly include?: ${n}Include;`,
+      `  readonly omit?: ${n}OmitInput;`,
+      `  readonly relationStrategy?: RelationStrategy;`,
+      ...["skip", "cursor", "distinct", "lock"].map((key) => `  readonly ${key}?: never;`)
+    ]
+  }));
   parts.push(`export type ${n}FindFirstArgs = ${n}FindManyArgs;`);
   parts.push(inputAlias({
     name: `${n}FindUniqueArgs`,
@@ -1334,6 +1365,7 @@ ${model.relations.map((relation) => `  ${propKey({ name: relation.name })}: ${re
   parts.push(inputAlias({
     name: `${n}CreateArgs`,
     lines: [
+      `  readonly relationStrategy?: never;`,
       `  readonly onConflict?: never;`,
       `  readonly data: ${n}CreateInput | ${n}UncheckedCreateInput;`,
       `  readonly select?: ${n}Select;`,
@@ -1348,6 +1380,7 @@ ${model.relations.map((relation) => `  ${propKey({ name: relation.name })}: ${re
   parts.push(inputAlias({
     name: `${n}CreateOrSkipArgs`,
     lines: [
+      `  readonly relationStrategy?: never;`,
       `  readonly data: ${n}CreateInput | ${n}UncheckedCreateInput;`,
       `  readonly onConflict: ${n}CreateOnConflictInput;`,
       `  readonly select?: ${n}Select;`,
@@ -1358,6 +1391,7 @@ ${model.relations.map((relation) => `  ${propKey({ name: relation.name })}: ${re
   parts.push(inputAlias({
     name: `${n}CreateManyArgs`,
     lines: [
+      `  readonly relationStrategy?: never;`,
       `  readonly data: ${orMany({ type: `${n}CreateManyInput` })};`,
       `  readonly skipDuplicates?: boolean | { readonly target?: ${n}ConflictTarget; readonly where?: string };`
     ]
@@ -1365,6 +1399,7 @@ ${model.relations.map((relation) => `  ${propKey({ name: relation.name })}: ${re
   parts.push(inputAlias({
     name: `${n}CreateManyAndReturnArgs`,
     lines: [
+      `  readonly relationStrategy?: never;`,
       `  readonly data: ${orMany({ type: `${n}CreateManyInput` })};`,
       `  readonly skipDuplicates?: boolean | { readonly target?: ${n}ConflictTarget; readonly where?: string };`,
       `  readonly select?: ${n}Select;`,
@@ -1546,6 +1581,7 @@ ${relationCases}
 ` + `  (number extends A["by"]["length"] ? Partial<Pick<${n}, A["by"][number]>> : Pick<${n}, A["by"][number]>) & ${n}AggregateResult<A>;`);
   const readMethods = [
     `  findMany<A extends ${n}FindManyArgs = {}>(args?: A): VibeQueryPromise<${n}GetPayload<A>[]>;`,
+    `  findPage<A extends ${n}FindPageArgs>(args: A): VibeQueryPromise<KeysetPage<${n}GetPayload<A>>>;`,
     `  findFirst<A extends ${n}FindFirstArgs = {}>(args?: A): VibeQueryPromise<${n}GetPayload<A> | null>;`,
     `  findFirstOrThrow<A extends ${n}FindFirstArgs = {}>(args?: A): VibeQueryPromise<${n}GetPayload<A>>;`,
     `  findUnique<A extends ${n}FindUniqueArgs>(args: A): VibeQueryPromise<${n}GetPayload<A> | null>;`,
@@ -1881,8 +1917,9 @@ var CONNECTION_SURFACE_LINES = `  readonly $connect: () => Promise<void>;
 var DEFINE_VIEW_LINE = `  /** Field-masking views (v1 defineView parity): a read-only masked projection of models. */
 ` + `  readonly $defineView: <D extends ViewDefinitionInput>(options: { readonly name: string; readonly definition: D }) => ViewClient<D>;
 `;
-var READ_ONLY_LINE = `  /** A read-only handle over this one: reads pass through, and every write, raw-SQL and control method is refused with \`VIBE_READ_ONLY\`. Closed under composition \u2014 transactions, views, scoped and policy handles built from it stay read-only. */
-` + `  readonly $readOnly: () => ReadOnlyClientInstance;
+var READ_ONLY_DOC = `  /** A read-only handle over this one: reads pass through, and every write, raw-SQL and control method is refused with \`VIBE_READ_ONLY\`. Closed under composition \u2014 transactions, views, scoped and policy handles built from it stay read-only. */
+`;
+var READ_ONLY_LINE = READ_ONLY_DOC + `  readonly $readOnly: () => ReadOnlyClientInstance;
 `;
 function instanceSurfaceLines(params) {
   const { view, transactionType, inTransaction, selfLabel } = params;
@@ -2064,7 +2101,7 @@ function emitClient(params) {
 ` + `  // Deliberately ABSENT: model delegates, $models, $transaction, $queryRaw / $executeRaw / $queryRawUnsafe / $executeRawUnsafe, $advisoryLock / $tryAdvisoryLock, $defineView, $readOnly and every extension mount \u2014 an unbound client has no identity, so it cannot read or write a row. Bind one with $withContext.
 ` + `};`);
   } else {
-    parts.push(`export type VibeClientInstance = ClientContext<"root"> & {
+    parts.push(`export type VibeClientInstance = ClientContext<${tsString({ value: view.models.some((model) => model.policy !== undefined) ? "restricted" : "root" })}> & {
 ` + instanceSurfaceLines({
       view,
       transactionType: "VibeTransactionClientInstance",
@@ -2072,7 +2109,7 @@ function emitClient(params) {
       selfLabel: "db"
     }) + policyClientLines({ view, selfType: "VibeClientInstance" }) + scopedClientLines({ view, scopedType: "ScopedClientInstance" }) + READ_ONLY_LINE + clientExtensionLines + `};`);
     parts.push(`/** The handle \`$transaction\` gives its callback. A helper that REQUIRES a transaction takes this type, and an ordinary client no longer satisfies it. */
-` + `export type VibeTransactionClientInstance = ClientContext<"transaction"> & {
+` + `export type VibeTransactionClientInstance = ClientContext<${tsString({ value: view.models.some((model) => model.policy !== undefined) ? "restricted" : "transaction" })}> & {
 ` + instanceSurfaceLines({
       view,
       transactionType: "VibeTransactionClientInstance",
@@ -2135,7 +2172,8 @@ ${modelsProps.join(`
 ` + `  };
 ` + (params2.inTransaction ? advisoryLockLines({ view, selfLabel: "tx" }) : CONNECTION_SURFACE_LINES) + `  /** Field-masking views compose over the scoped handle (columns \xD7 rows). */
 ` + `  readonly $defineView: <D extends ViewDefinitionInput>(options: { readonly name: string; readonly definition: D }) => ViewClient<D>;
-` + READ_ONLY_LINE;
+` + READ_ONLY_DOC + `  readonly $readOnly: () => ReadOnlyClientInstance<"restricted">;
+`;
   return [
     banner({ title: "Tenant scoping ($scoped)" }),
     `/** What a scoped handle does when this model appears INSIDE another model's nested write: "verify" (default) rewrites reference verbs into tenant-verified lookups; "refuse" rejects them. */
@@ -2145,11 +2183,11 @@ export type ScopedModelsConfig = {
 ${entries.join(`
 `)}
 };`,
-    `export type ScopedClientInstance = {
+    `export type ScopedClientInstance = ClientContext<"restricted"> & {
 ` + scopedSurface({ transactionType: "ScopedTransactionClientInstance", inTransaction: false }) + `  // Deliberately ABSENT: $queryRaw / $executeRaw / $queryRawUnsafe / $executeRawUnsafe (raw SQL cannot be tenant-verified \u2014 use the base client) and $scoped (scope once, from the base client).
 ` + `};`,
     `/** The scoped handle inside \`$transaction\`: same scope, plus the locks that require a transaction. */
-` + `export type ScopedTransactionClientInstance = {
+` + `export type ScopedTransactionClientInstance = ClientContext<"restricted"> & {
 ` + scopedSurface({ transactionType: "ScopedTransactionClientInstance", inTransaction: true }) + `  // Deliberately ABSENT: the raw-SQL doors, $scoped, and $connect / $disconnect (the open transaction owns the connection).
 ` + `};`
   ];
@@ -2186,6 +2224,9 @@ function emitReadOnlySection(params) {
   const extensionLines = baked.readOnlyClientDts.length === 0 ? "" : `${baked.readOnlyClientDts.join(`
 `)}
 `;
+  const scopeLines = scopedClientLines({ view, scopedType: 'ReadOnlyClientInstance<"restricted">' });
+  const scopeSurface = scopeLines.length === 0 ? "" : `(ContextKind extends "readOnly" ? {
+${scopeLines}} : {}) & `;
   return [
     banner({ title: "Read-only clients ($readOnly)" }),
     `/**
@@ -2199,9 +2240,9 @@ function emitReadOnlySection(params) {
 ` + ` * await reader.user.findMany();          // fine
 ` + ` * await reader.user.upsertMany({ \u2026 });   // VIBE_READ_ONLY, and a compile error
 ` + ` */
-` + `export type ReadOnlyClientInstance = ClientContext<"readOnly"> & {
-` + delegateSurfaceLines({ view, delegateSuffix: "ReadOnlyDelegate" }) + transactionLines({ transactionType: "ReadOnlyClientInstance", reads: true }) + DEFINE_VIEW_LINE + policyClientLines({ view, selfType: "ReadOnlyClientInstance" }) + scopedClientLines({ view, scopedType: "ReadOnlyClientInstance" }) + `  /** Idempotent \u2014 restricting an already-restricted handle returns the same handle. */
-` + `  readonly $readOnly: () => ReadOnlyClientInstance;
+` + `export type ReadOnlyClientInstance<ContextKind extends "readOnly" | "restricted" = ${tsString({ value: hasNativeRls({ view }) || view.models.some((model) => model.policy !== undefined) ? "restricted" : "readOnly" })}> = ClientContext<ContextKind> & ${scopeSurface}{
+` + delegateSurfaceLines({ view, delegateSuffix: "ReadOnlyDelegate" }) + transactionLines({ transactionType: "ReadOnlyClientInstance<ContextKind>", reads: true }) + DEFINE_VIEW_LINE + policyClientLines({ view, selfType: "ReadOnlyClientInstance<ContextKind>" }) + `  /** Idempotent: the same read-only restriction and underlying context are retained. */
+` + `  readonly $readOnly: () => ReadOnlyClientInstance<ContextKind>;
 ` + extensionLines + `  // Deliberately ABSENT: every write method, $queryRaw / $executeRaw / $queryRawUnsafe / $executeRawUnsafe, $connect / $disconnect, $advisoryLock / $tryAdvisoryLock, $withContext, and every extension surface its author did not classify as a read.
 ` + `};`
   ];
@@ -2451,7 +2492,8 @@ var README = `# Generated VibeORM client
 This directory was generated by \`@vibeorm/generator\` from your VibeORM schema \u2014 do not edit it by hand, any change is overwritten on the next generate. After every schema change, regenerate with \`vibeorm generate\` (or programmatically via \`generateClient({ schema, outDir })\` from \`@vibeorm/generator\`).
 `;
 async function generateClient(params) {
-  const { schema, outDir } = params;
+  const { outDir } = params;
+  const schema = params.module === undefined ? params.schema : prepareDatabaseModuleSchema({ schema: params.schema, module: params.module });
   const view = buildSchemaView({ schema });
   const baked = bakeExtensions({ schema: view.schema, extensions: params.extensions ?? [] });
   let computed = [];
@@ -2480,7 +2522,8 @@ async function generateClient(params) {
 }
 export {
   bakeExtensions,
-  generateClient
+  generateClient,
+  prepareDatabaseModuleSchema
 };
 
-//# debugId=BC4813FB63493C9C64756E2164756E21
+//# debugId=BD8C77FCC6EC9CEF64756E2164756E21