bun-query-builder 0.1.26 → 0.1.28

package/dist/type-inference.d.ts

@@ -302,72 +302,42 @@ export type InferPivotColumns<TModel, R extends string> = ResolveDefinition<TMod
         : Record<string, unknown>
       : Record<string, unknown>
     : Record<string, unknown>;
-// ============================================================================
-// Internal relation name inference helpers
-// ============================================================================
-declare type InferBelongsToNames<TDef> = (TDef extends { belongsTo: readonly (infer R)[] }
-    ? R extends string ? Lowercase<R> : never : never)
-  | (TDef extends { belongsTo: Readonly<Record<infer K, unknown>> }
-    ? K extends string ? K : never : never);
-declare type InferHasManyNames<TDef> = (TDef extends { hasMany: readonly (infer R)[] }
-    ? R extends string ? Lowercase<R> : never : never)
-  | (TDef extends { hasMany: Readonly<Record<infer K, unknown>> }
-    ? K extends string ? K : never : never);
-declare type InferHasOneNames<TDef> = (TDef extends { hasOne: readonly (infer R)[] }
-    ? R extends string ? Lowercase<R> : never : never)
-  | (TDef extends { hasOne: Readonly<Record<infer K, unknown>> }
-    ? K extends string ? K : never : never);
-declare type InferBelongsToManyNames<TDef> = (TDef extends { belongsToMany: readonly (infer R)[] }
-    ? R extends string ? Lowercase<R> : R extends { model: infer M extends string } ? Lowercase<M> : never : never)
-  | (TDef extends { belongsToMany: Readonly<Record<infer K, unknown>> }
-    ? K extends string ? K : never : never);
-declare type InferHasOneThroughNames<TDef> = (TDef extends { hasOneThrough: readonly (infer R)[] }
-    ? R extends string ? Lowercase<R> : R extends { model: infer M extends string } ? Lowercase<M> : never : never)
-  | (TDef extends { hasOneThrough: Readonly<Record<infer K, unknown>> }
-    ? K extends string ? K : never : never);
-declare type InferHasManyThroughNames<TDef> = (TDef extends { hasManyThrough: readonly (infer R)[] }
-    ? R extends string ? Lowercase<R> : R extends { model: infer M extends string } ? Lowercase<M> : never : never)
-  | (TDef extends { hasManyThrough: Readonly<Record<infer K, unknown>> }
-    ? K extends string ? K : never : never);
+/**
+ * Relation names of one relation declaration. Array form lowercases the
+ * (unwrapped) model name; record form uses the keys. The array case MUST be
+ * checked first: a tuple also structurally matches `Readonly<Record<...>>`
+ * and would otherwise leak its own keys ('length', indices, ...) into the
+ * relation-name union.
+ */
+declare type RelationKeyOf<V> = V extends readonly (infer E)[]
+    ? E extends string ? Lowercase<E>
+      : E extends { model: infer M extends string } ? Lowercase<M>
+        : never
+    : V extends Readonly<Record<infer K, unknown>>
+      ? K & string
+      : never;
+declare type InferBelongsToNames<TDef> = TDef extends { belongsTo: infer V } ? RelationKeyOf<V> : never;
+declare type InferHasManyNames<TDef> = TDef extends { hasMany: infer V } ? RelationKeyOf<V> : never;
+declare type InferHasOneNames<TDef> = TDef extends { hasOne: infer V } ? RelationKeyOf<V> : never;
+declare type InferBelongsToManyNames<TDef> = TDef extends { belongsToMany: infer V } ? RelationKeyOf<V> : never;
+declare type InferHasOneThroughNames<TDef> = TDef extends { hasOneThrough: infer V } ? RelationKeyOf<V> : never;
+declare type InferHasManyThroughNames<TDef> = TDef extends { hasManyThrough: infer V } ? RelationKeyOf<V> : never;
 /**
  * Determine the cardinality of a relation on a model.
- * hasMany → 'many', hasOne/belongsTo → 'one'
+ * hasMany / belongsToMany / hasManyThrough / morphMany / morphToMany /
+ * morphedByMany → 'many'; hasOne / belongsTo / hasOneThrough / morphOne →
+ * 'one'. Both array and record declaration forms are supported via
+ * `RelationKeyOf` (array-first, so tuple keys never leak in).
  */
 export type RelationCardinality<TModel, R extends string> = ResolveDefinition<TModel> extends infer TDef
-    ? // hasMany array syntax
-    (TDef extends { hasMany: readonly (infer M)[] }
-        ? Lowercase<M & string> extends R ? 'many' : never
-        : never)
-    // hasMany object syntax
-    | (TDef extends { hasMany: Readonly<Record<infer K, unknown>> }
-        ? K extends string ? K extends R ? 'many' : never : never
-        : never)
-    // hasOne array syntax
-    | (TDef extends { hasOne: readonly (infer M)[] }
-        ? Lowercase<M & string> extends R ? 'one' : never
-        : never)
-    // hasOne object syntax
-    | (TDef extends { hasOne: Readonly<Record<infer K, unknown>> }
-        ? K extends string ? K extends R ? 'one' : never : never
-        : never)
-    // belongsTo array syntax
-    | (TDef extends { belongsTo: readonly (infer M)[] }
-        ? Lowercase<M & string> extends R ? 'one' : never
-        : never)
-    // belongsTo object syntax
-    | (TDef extends { belongsTo: Readonly<Record<infer K, unknown>> }
-        ? K extends string ? K extends R ? 'one' : never : never
-        : never)
-    // belongsToMany array syntax
-    | (TDef extends { belongsToMany: readonly (infer M)[] }
-        ? M extends string
-          ? Lowercase<M> extends R ? 'many' : never
-          : M extends { model: infer N extends string }
-            ? Lowercase<N> extends R ? 'many' : never
-            : never
-        : never)
-    // belongsToMany object syntax
-    | (TDef extends { belongsToMany: Readonly<Record<infer K, unknown>> }
-        ? K extends string ? K extends R ? 'many' : never : never
-        : never)
+    ? (TDef extends { hasMany: infer V } ? (R extends RelationKeyOf<V> ? 'many' : never) : never)
+    | (TDef extends { hasOne: infer V } ? (R extends RelationKeyOf<V> ? 'one' : never) : never)
+    | (TDef extends { belongsTo: infer V } ? (R extends RelationKeyOf<V> ? 'one' : never) : never)
+    | (TDef extends { belongsToMany: infer V } ? (R extends RelationKeyOf<V> ? 'many' : never) : never)
+    | (TDef extends { hasOneThrough: infer V } ? (R extends RelationKeyOf<V> ? 'one' : never) : never)
+    | (TDef extends { hasManyThrough: infer V } ? (R extends RelationKeyOf<V> ? 'many' : never) : never)
+    | (TDef extends { morphOne: infer V } ? (R extends RelationKeyOf<V> ? 'one' : never) : never)
+    | (TDef extends { morphMany: infer V } ? (R extends RelationKeyOf<V> ? 'many' : never) : never)
+    | (TDef extends { morphToMany: infer V } ? (R extends RelationKeyOf<V> ? 'many' : never) : never)
+    | (TDef extends { morphedByMany: infer V } ? (R extends RelationKeyOf<V> ? 'many' : never) : never)
     : never;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",