@vibeorm/generator 1.1.5 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibeorm/generator",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "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.1.4"
+    "@vibeorm/parser": "1.1.5"
   }
 }

package/src/generators/generate-view-types.ts

@@ -73,6 +73,9 @@ export type ViewResultWrapper<T> = T & {
   toJSON(): Partial<T>;
   $unsafe(): T;
 };
+
+/** Flatten intersection types for cleaner hover tooltips and type resolution */
+type Compute<T> = T extends Function ? T : { [K in keyof T]: T[K] } & unknown;
 `);
 
   // ─── ViewDefinitionInput ──────────────────────────────────────────
@@ -109,6 +112,18 @@ export type ViewResultWrapper<T> = T & {
   }
   parts.push(``);
 
+  // ─── Per-model ViewIncludeResult ──────────────────────────────────
+
+  for (const model of schema.models) {
+    parts.push(generateViewIncludeResult({ model, schema }));
+  }
+
+  // ─── Per-model GetViewResult ────────────────────────────────────
+
+  for (const model of schema.models) {
+    parts.push(generateGetViewResult({ model, schema }));
+  }
+
   // ─── Per-model ViewFindArgs ───────────────────────────────────────
 
   for (const model of schema.models) {
@@ -128,6 +143,114 @@ export type ViewResultWrapper<T> = T & {
   return parts.join("\n");
 }
 
+// ─── ViewIncludeResult (per model) ────────────────────────────────
+
+/**
+ * Generates a mapped type that computes the result types for included
+ * relations on a view query. For each relation field:
+ *
+ * - If the related model is in VD: result is ViewResultWrapper<Pick<Model, viewFields>>
+ * - If the related model is NOT in VD: result is the full model type
+ * - Array relations get [], nullable singles get | null
+ */
+function generateViewIncludeResult(params: { model: Model; schema: Schema }): string {
+  const { model } = params;
+  const n = model.name;
+
+  const relationFields = model.fields.filter(
+    (f): f is RelationField => f.kind === "relation"
+  );
+
+  if (relationFields.length === 0) {
+    // No relations — include result is always empty
+    return `
+// ─── ${n} View Include Result ────────────────────────────────
+
+type ${n}ViewIncludeResult<
+  I extends Record<string, unknown>,
+  VD extends ViewDefinitionInput,
+> = {};
+`;
+  }
+
+  // Build nested conditional branches: K extends "relName" ? ... : K extends ... : never
+  const branches = relationFields.map((f) => {
+    const relModelVar = toCamelCase({ str: f.relatedModel });
+    const relModel = f.relatedModel;
+
+    // Type when the related model IS in the view definition
+    const viewRestricted = `ViewResultWrapper<Pick<${relModel}, keyof RF & keyof ${relModel}>>`;
+    // Type when the related model is NOT in the view definition
+    const fullType = relModel;
+
+    let inViewType: string;
+    let notInViewType: string;
+
+    if (f.isList) {
+      inViewType = `${viewRestricted}[]`;
+      notInViewType = `${fullType}[]`;
+    } else if (!f.isRequired) {
+      inViewType = `${viewRestricted} | null`;
+      notInViewType = `${fullType} | null`;
+    } else {
+      inViewType = viewRestricted;
+      notInViewType = fullType;
+    }
+
+    return `    K extends "${f.name}"
+      ? (VD extends { ${relModelVar}: infer RF extends Record<string, true> }
+        ? ${inViewType}
+        : ${notInViewType})`;
+  });
+
+  return `
+// ─── ${n} View Include Result ────────────────────────────────
+
+type ${n}ViewIncludeResult<
+  I extends Record<string, unknown>,
+  VD extends ViewDefinitionInput,
+> = {
+  [K in keyof I as I[K] extends false | undefined | null ? never : K]:
+${branches.join("\n    : ")}
+    : never;
+};
+`;
+}
+
+// ─── GetViewResult (per model) ────────────────────────────────────
+
+/**
+ * Generates a top-level conditional type that resolves the complete result
+ * type for a view query, including both scalar fields and included relations.
+ *
+ * The conditional is at the outermost position (matching how GetFindResult
+ * works in the regular client) so TypeScript evaluates it eagerly at call
+ * sites instead of deferring it inside ViewResultWrapper's type parameter.
+ */
+function generateGetViewResult(params: { model: Model; schema: Schema }): string {
+  const { model } = params;
+  const n = model.name;
+  const hasRelations = model.fields.some((f) => f.kind === "relation");
+
+  if (!hasRelations) return "";
+
+  return `
+// ─── ${n} Get View Result ───────────────────────────────────
+
+type ${n}GetViewResult<
+  VF extends Record<string, true>,
+  T,
+  VD extends ViewDefinitionInput,
+> =
+  T extends { include: infer I extends Record<string, unknown> }
+    ? ViewResultWrapper<Compute<
+        ViewSelectResult<${n}, VF, T>
+        & ${n}ViewIncludeResult<I, VD>
+      >>
+    : ViewResultWrapper<ViewSelectResult<${n}, VF, T>>;
+`;
+}
+
 // ─── ViewFindArgs (per model) ─────────────────────────────────────
 
 function generateViewFindArgs(params: { model: Model; schema: Schema }): string {
@@ -195,6 +318,20 @@ function generateViewDelegate(params: { model: Model; schema: Schema }): string
   const { model } = params;
   const n = model.name;
 
+  const hasRelations = model.fields.some((f) => f.kind === "relation");
+
+  // Helper: builds the full result type including the include intersection.
+  // Models with relations use a dedicated GetViewResult type that places the
+  // conditional at the outermost position (matching GetFindResult in the regular
+  // client) so TypeScript evaluates it eagerly instead of deferring it inside
+  // ViewResultWrapper's type parameter.
+  const resultType = (argsType: string) => {
+    if (!hasRelations) {
+      return `ViewResultWrapper<ViewSelectResult<${n}, VF, ${argsType}>>`;
+    }
+    return `${n}GetViewResult<VF, ${argsType}, VD>`;
+  };
+
   return `
 // ─── ${n} View Delegate ─────────────────────────────────────
 
@@ -207,45 +344,35 @@ export type ${n}ViewDelegate<
    */
   findMany<T extends ${n}ViewFindManyArgs<VF, VD>>(
     args?: Exact<T, ${n}ViewFindManyArgs<VF, VD>>
-  ): Promise<ViewResultWrapper<
-    ViewSelectResult<${n}, VF, T>
-  >[]>;
+  ): Promise<${resultType("T")}[]>;
 
   /**
    * Find the first ${n} matching the filter, or null.
    */
   findFirst<T extends ${n}ViewFindFirstArgs<VF, VD>>(
     args?: Exact<T, ${n}ViewFindFirstArgs<VF, VD>>
-  ): Promise<ViewResultWrapper<
-    ViewSelectResult<${n}, VF, T>
-  > | null>;
+  ): Promise<${resultType("T")} | null>;
 
   /**
    * Find a unique ${n} by its primary key or unique field, or null.
    */
   findUnique<T extends ${n}ViewFindUniqueArgs<VF, VD>>(
     args: Exact<T, ${n}ViewFindUniqueArgs<VF, VD>>
-  ): Promise<ViewResultWrapper<
-    ViewSelectResult<${n}, VF, T>
-  > | null>;
+  ): Promise<${resultType("T")} | null>;
 
   /**
    * Find a unique ${n} or throw if not found.
    */
   findUniqueOrThrow<T extends ${n}ViewFindUniqueArgs<VF, VD>>(
     args: Exact<T, ${n}ViewFindUniqueArgs<VF, VD>>
-  ): Promise<ViewResultWrapper<
-    ViewSelectResult<${n}, VF, T>
-  >>;
+  ): Promise<${resultType("T")}>;
 
   /**
    * Find the first ${n} matching the filter, or throw.
    */
   findFirstOrThrow<T extends ${n}ViewFindFirstArgs<VF, VD>>(
     args?: Exact<T, ${n}ViewFindFirstArgs<VF, VD>>
-  ): Promise<ViewResultWrapper<
-    ViewSelectResult<${n}, VF, T>
-  >>;
+  ): Promise<${resultType("T")}>;
 
   /**
    * Count matching ${n} records.