@vibeorm/generator 1.0.2 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibeorm/generator",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "TypeScript client generator for VibeORM — produces typed delegates, inputs, and Zod schemas from a Prisma schema",
   "license": "MIT",
   "keywords": [
@@ -37,6 +37,6 @@
     "bun": ">=1.1.0"
   },
   "dependencies": {
-    "@vibeorm/parser": "1.0.2"
+    "@vibeorm/parser": "1.1.1"
   }
 }

package/src/generators/generate-client.ts

@@ -28,7 +28,7 @@ export function generateClient(params: { schema: Schema }): string {
 
   // Import runtime
   parts.push(`import { createClient } from "@vibeorm/runtime";`);
-  parts.push(`import type { VibeClientOptions } from "@vibeorm/runtime";`);
+  parts.push(`import type { VibeClientOptions, TransactionOptions } from "@vibeorm/runtime";`);
   parts.push(``);
 
   // Import schemas for validation wiring
@@ -54,8 +54,8 @@ export function generateClient(params: { schema: Schema }): string {
 
   parts.push(`export type VibeClientInstance = {
 ${clientProperties}
-  $transaction<T>(fn: (tx: VibeClientInstance) => Promise<T>): Promise<T>;
-  $transaction(promises: Promise<unknown>[]): Promise<unknown[]>;
+  $transaction<T>(fn: (tx: VibeClientInstance) => Promise<T>, options?: TransactionOptions): Promise<T>;
+  $transaction(promises: Promise<unknown>[], options?: TransactionOptions): Promise<unknown[]>;
   $queryRaw<T = unknown>(strings: TemplateStringsArray, ...values: unknown[]): Promise<T[]>;
   $executeRaw(strings: TemplateStringsArray, ...values: unknown[]): Promise<number>;
   $queryRawUnsafe<T = unknown>(query: string, ...values: unknown[]): Promise<T[]>;

package/src/generators/generate-delegates.ts

@@ -39,7 +39,13 @@ export function generateDelegates(params: { schema: Schema }): string {
   const payloadImports = schema.models
     .map((m) => `$${m.name}Payload`)
     .join(", ");
-  parts.push(`import type { ${payloadImports} } from "./models.ts";`);
+
+  // Include JsonValue if any model has Json scalar fields (used in aggregate/groupBy types)
+  const hasJsonField = schema.models.some((m) =>
+    m.fields.some((f) => f.kind === "scalar" && f.prismaType === "Json")
+  );
+  const extraImports = hasJsonField ? ", JsonValue" : "";
+  parts.push(`import type { ${payloadImports}${extraImports} } from "./models.ts";`);
 
   parts.push(`import type { GetResult } from "./result.ts";`);
 

package/src/generators/generate-inputs.ts

@@ -64,7 +64,7 @@ function generateWhereInput(params: { model: Model; schema: Schema }): string {
         const listFilterType = scalarListFilterType({ field });
         entries.push(`  ${field.name}?: ${listFilterType};`);
       } else {
-        entries.push(`  ${field.name}?: ${scalarFilterType({ field })} | ${scalarTsType({ field })};`);
+        entries.push(`  ${field.name}?: ${scalarFilterType({ field })} | ${scalarTsType({ field, context: "input" })};`);
       }
     } else if (field.kind === "enum") {
       entries.push(`  ${field.name}?: EnumFilter<${field.enumName}> | ${field.enumName};`);
@@ -124,6 +124,21 @@ function generateWhereUniqueInput(params: { model: Model }): string {
     entries.push(`  ${model.primaryKey.fields.join("_")}?: { ${compositeType} };`);
   }
 
+  // Also support compound @@unique constraints
+  for (const uc of model.uniqueConstraints) {
+    if (uc.fields.length > 1) {
+      const compositeType = uc.fields
+        .map((fn) => {
+          const field = model.fields.find((f) => f.name === fn);
+          if (!field || field.kind === "relation") return `${fn}: unknown`;
+          const tsType = field.kind === "scalar" ? field.tsType : field.enumName;
+          return `${fn}: ${tsType}`;
+        })
+        .join("; ");
+      entries.push(`  ${uc.fields.join("_")}?: { ${compositeType} };`);
+    }
+  }
+
   return `export type ${model.name}WhereUniqueInput = {
 ${entries.join("\n")}
 };
@@ -178,7 +193,7 @@ function generateCreateInput(params: {
           field.default.kind === "nanoid" ||
           field.default.kind === "ulid");
       const isOptional = !field.isRequired || field.default !== undefined || isAutoGenerated || field.isUpdatedAt;
-      const tsType = scalarTsType({ field });
+      const tsType = scalarTsType({ field, context: "input" });
       entries.push(`  ${field.name}${isOptional ? "?" : ""}: ${tsType};`);
     } else if (field.kind === "enum") {
       const isOptional = !field.isRequired || field.default !== undefined;
@@ -224,7 +239,7 @@ function generateUpdateInput(params: {
         const listUpdateType = scalarListUpdateType({ field });
         entries.push(`  ${field.name}?: ${listUpdateType};`);
       } else {
-        const tsType = scalarTsType({ field });
+        const tsType = scalarTsType({ field, context: "input" });
         const atomicType = numericFieldUpdateType({ field });
         if (atomicType) {
           entries.push(`  ${field.name}?: ${tsType} | ${atomicType};`);
@@ -270,9 +285,10 @@ ${entries.join("\n")}
 
 // ─── Scalar Filter Types ──────────────────────────────────────────
 
-function scalarTsType(params: { field: ScalarField }): string {
-  const { field } = params;
-  const base = field.tsType;
+function scalarTsType(params: { field: ScalarField; context?: "input" | "output" }): string {
+  const { field, context } = params;
+  // For Decimal input types, accept both number and string for better DX
+  const base = context === "input" && field.prismaType === "Decimal" ? "number | string" : field.tsType;
   if (field.isList) return `${base}[]`;
   if (!field.isRequired) return `${base} | null`;
   return base;

package/src/generators/generate-result.ts

@@ -74,16 +74,16 @@ export type GetFindResult<P extends OperationPayload, A> =
                   S[K] extends Record<string, unknown>
                   ? GetFindResult<P["objects"][K][number], S[K]>[]
                   : DefaultSelection<P["objects"][K][number]>[]
-                : P["objects"][K] extends OperationPayload | null
-                  ? // Nullable single relation
+                : P["objects"][K] extends OperationPayload
+                  ? // Required single relation (checked before nullable to avoid false match)
                     S[K] extends Record<string, unknown>
-                    ? GetFindResult<NonNullable<P["objects"][K]> & OperationPayload, S[K]> | null
-                    : DefaultSelection<NonNullable<P["objects"][K]> & OperationPayload> | null
-                  : P["objects"][K] extends OperationPayload
-                    ? // Required single relation
+                    ? GetFindResult<P["objects"][K], S[K]>
+                    : DefaultSelection<P["objects"][K]>
+                  : P["objects"][K] extends OperationPayload | null
+                    ? // Nullable single relation
                       S[K] extends Record<string, unknown>
-                      ? GetFindResult<P["objects"][K], S[K]>
-                      : DefaultSelection<P["objects"][K]>
+                      ? GetFindResult<NonNullable<P["objects"][K]> & OperationPayload, S[K]> | null
+                      : DefaultSelection<NonNullable<P["objects"][K]> & OperationPayload> | null
                     : never
               : never;
         }>
@@ -100,16 +100,16 @@ export type GetFindResult<P extends OperationPayload, A> =
                     I[K] extends Record<string, unknown>
                     ? GetFindResult<P["objects"][K][number], I[K]>[]
                     : DefaultSelection<P["objects"][K][number]>[]
-                  : P["objects"][K] extends OperationPayload | null
-                    ? // Nullable single relation
+                  : P["objects"][K] extends OperationPayload
+                    ? // Required single relation (checked before nullable to avoid false match)
                       I[K] extends Record<string, unknown>
-                      ? GetFindResult<NonNullable<P["objects"][K]> & OperationPayload, I[K]> | null
-                      : DefaultSelection<NonNullable<P["objects"][K]> & OperationPayload> | null
-                    : P["objects"][K] extends OperationPayload
-                      ? // Required single relation
+                      ? GetFindResult<P["objects"][K], I[K]>
+                      : DefaultSelection<P["objects"][K]>
+                    : P["objects"][K] extends OperationPayload | null
+                      ? // Nullable single relation
                         I[K] extends Record<string, unknown>
-                        ? GetFindResult<P["objects"][K], I[K]>
-                        : DefaultSelection<P["objects"][K]>
+                        ? GetFindResult<NonNullable<P["objects"][K]> & OperationPayload, I[K]> | null
+                        : DefaultSelection<NonNullable<P["objects"][K]> & OperationPayload> | null
                       : never
                 : never;
             }

package/src/generators/generate-schemas.ts

@@ -265,7 +265,7 @@ function generateWhereFilterSchemas(): string {
   return `
 // ─── Where Filter Schemas ───────────────────────────────────────
 
-export const StringFilterSchema = z.object({
+export const StringFilterSchema: z.ZodTypeAny = z.object({
   equals: z.string().optional(),
   not: z.union([z.string(), z.lazy(() => StringFilterSchema)]).optional(),
   in: z.array(z.string()).optional(),
@@ -280,7 +280,7 @@ export const StringFilterSchema = z.object({
   mode: z.enum(["default", "insensitive"]).optional(),
 });
 
-export const NullableStringFilterSchema = z.object({
+export const NullableStringFilterSchema: z.ZodTypeAny = z.object({
   equals: z.string().nullable().optional(),
   not: z.union([z.string().nullable(), z.lazy(() => NullableStringFilterSchema)]).optional(),
   in: z.array(z.string().nullable()).optional(),
@@ -295,7 +295,7 @@ export const NullableStringFilterSchema = z.object({
   mode: z.enum(["default", "insensitive"]).optional(),
 });
 
-export const NumberFilterSchema = z.object({
+export const NumberFilterSchema: z.ZodTypeAny = z.object({
   equals: z.number().optional(),
   not: z.union([z.number(), z.lazy(() => NumberFilterSchema)]).optional(),
   in: z.array(z.number()).optional(),
@@ -306,7 +306,7 @@ export const NumberFilterSchema = z.object({
   gte: z.number().optional(),
 });
 
-export const NullableNumberFilterSchema = z.object({
+export const NullableNumberFilterSchema: z.ZodTypeAny = z.object({
   equals: z.number().nullable().optional(),
   not: z.union([z.number().nullable(), z.lazy(() => NullableNumberFilterSchema)]).optional(),
   in: z.array(z.number().nullable()).optional(),
@@ -317,7 +317,7 @@ export const NullableNumberFilterSchema = z.object({
   gte: z.number().optional(),
 });
 
-export const BigIntFilterSchema = z.object({
+export const BigIntFilterSchema: z.ZodTypeAny = z.object({
   equals: z.bigint().optional(),
   not: z.union([z.bigint(), z.lazy(() => BigIntFilterSchema)]).optional(),
   in: z.array(z.bigint()).optional(),
@@ -328,7 +328,7 @@ export const BigIntFilterSchema = z.object({
   gte: z.bigint().optional(),
 });
 
-export const NullableBigIntFilterSchema = z.object({
+export const NullableBigIntFilterSchema: z.ZodTypeAny = z.object({
   equals: z.bigint().nullable().optional(),
   not: z.union([z.bigint().nullable(), z.lazy(() => NullableBigIntFilterSchema)]).optional(),
   in: z.array(z.bigint().nullable()).optional(),
@@ -339,17 +339,17 @@ export const NullableBigIntFilterSchema = z.object({
   gte: z.bigint().optional(),
 });
 
-export const BooleanFilterSchema = z.object({
+export const BooleanFilterSchema: z.ZodTypeAny = z.object({
   equals: z.boolean().optional(),
   not: z.union([z.boolean(), z.lazy(() => BooleanFilterSchema)]).optional(),
 });
 
-export const NullableBooleanFilterSchema = z.object({
+export const NullableBooleanFilterSchema: z.ZodTypeAny = z.object({
   equals: z.boolean().nullable().optional(),
   not: z.union([z.boolean().nullable(), z.lazy(() => NullableBooleanFilterSchema)]).optional(),
 });
 
-export const DateTimeFilterSchema = z.object({
+export const DateTimeFilterSchema: z.ZodTypeAny = z.object({
   equals: z.union([z.date(), z.string()]).optional(),
   not: z.union([z.date(), z.string(), z.lazy(() => DateTimeFilterSchema)]).optional(),
   in: z.array(z.union([z.date(), z.string()])).optional(),
@@ -360,7 +360,7 @@ export const DateTimeFilterSchema = z.object({
   gte: z.union([z.date(), z.string()]).optional(),
 });
 
-export const NullableDateTimeFilterSchema = z.object({
+export const NullableDateTimeFilterSchema: z.ZodTypeAny = z.object({
   equals: z.union([z.date(), z.string()]).nullable().optional(),
   not: z.union([z.date(), z.string(), z.lazy(() => NullableDateTimeFilterSchema)]).nullable().optional(),
   in: z.array(z.union([z.date(), z.string()]).nullable()).optional(),
@@ -371,14 +371,14 @@ export const NullableDateTimeFilterSchema = z.object({
   gte: z.union([z.date(), z.string()]).optional(),
 });
 
-export const EnumFilterSchema = z.object({
+export const EnumFilterSchema: z.ZodTypeAny = z.object({
   equals: z.string().optional(),
   not: z.union([z.string(), z.lazy(() => EnumFilterSchema)]).optional(),
   in: z.array(z.string()).optional(),
   notIn: z.array(z.string()).optional(),
 });
 
-export const NullableEnumFilterSchema = z.object({
+export const NullableEnumFilterSchema: z.ZodTypeAny = z.object({
   equals: z.string().nullable().optional(),
   not: z.union([z.string().nullable(), z.lazy(() => NullableEnumFilterSchema)]).optional(),
   in: z.array(z.string().nullable()).optional(),