@stacksjs/orm 0.70.72 → 0.70.74

package/dist/model-types.d.ts

@@ -1,9 +1,9 @@
-import type { AttributeKeys, ColumnName, FillableKeys, InferModelAttributes, ModelAttributes, ModelDefinition } from '@stacksjs/query-builder';
+import type { InferAttributes as QueryInferAttributes, InferColumnNames as QueryInferColumnNames, InferFillableAttributes as QueryInferFillableAttributes, InferNumericColumns as QueryInferNumericColumns, ModelRow as QueryModelRow } from '@stacksjs/query-builder';
 /**
  * Extract the raw ModelDefinition from a defineModel() return value.
  * Uses the getDefinition() accessor that defineModel() provides.
  */
-export type Def<T> = T extends { getDefinition: () => infer D extends ModelDefinition } ? D : never;
+export type Def<T> = T extends { getDefinition: () => infer D } ? D : never;
 /**
  * Extract foreign key columns from belongsTo relations.
  * e.g., belongsTo: ['Customer', 'Coupon'] → { customer_id: number, coupon_id: number }
@@ -20,7 +20,7 @@ export type BelongsToForeignKeys<TDef> = TDef extends { readonly belongsTo: read
  * import type Post from '../models/Post'
  * type PostJsonResponse = ModelRow<typeof Post>
  */
-export type ModelRow<T> = ModelAttributes<Def<T>> & BelongsToForeignKeys<Def<T>>;
+export type ModelRow<T> = QueryModelRow<T> & BelongsToForeignKeys<Def<T>>;
 /**
  * Same as {@link ModelRow} but with every field optional. Useful for
  * partial-projection reads (`select('id', 'name')`) and test fixtures
@@ -35,7 +35,7 @@ export type ModelRowLoose<T> = Partial<ModelRow<T>>;
  * import type Post from '../models/Post'
  * type NewPost = NewModelData<typeof Post>
  */
-export type NewModelData<T> = Partial<InferModelAttributes<Def<T>> & BelongsToForeignKeys<Def<T>>>;
+export type NewModelData<T> = Partial<QueryInferAttributes<T> & BelongsToForeignKeys<Def<T>>>;
 /**
  * Strict insertable shape: only attributes marked `fillable: true` in
  * the model definition (plus belongsTo foreign keys), partial because
@@ -45,7 +45,7 @@ export type NewModelData<T> = Partial<InferModelAttributes<Def<T>> & BelongsToFo
  * can't pass non-fillable fields to `create()` / `insert()`.
  * {@link NewModelData} is the looser sibling that allows any attribute.
  */
-export type ModelCreateData<T> = Partial<Pick<InferModelAttributes<Def<T>>, Extract<FillableKeys<Def<T>>, keyof InferModelAttributes<Def<T>>>> & BelongsToForeignKeys<Def<T>>>;
+export type ModelCreateData<T> = Partial<QueryInferFillableAttributes<T>> & BelongsToForeignKeys<Def<T>>;
 /** Loose variant of {@link ModelCreateData} — same shape as {@link NewModelData}, aliased for naming-parity with the row types. */
 export type ModelCreateDataLoose<T> = NewModelData<T>;
 /**
@@ -56,21 +56,23 @@ export type ModelCreateDataLoose<T> = NewModelData<T>;
  * import type Post from '../models/Post'
  * type PostUpdate = UpdateModelData<typeof Post>
  */
-export type UpdateModelData<T> = Partial<InferModelAttributes<Def<T>> & BelongsToForeignKeys<Def<T>>>;
+export type UpdateModelData<T> = Partial<QueryInferAttributes<T> & BelongsToForeignKeys<Def<T>>>;
 /**
  * Just the attribute records flagged `fillable: true` — useful for
  * code-generators and any helper that needs the typed shape of a
  * model's fillable-attribute config (e.g., admin form schemas).
  */
 export type InferFillableAttributes<T> = {
-  [K in Extract<FillableKeys<Def<T>>, keyof Def<T>['attributes']>]: Def<T>['attributes'][K]
+  [K in keyof QueryInferFillableAttributes<T>]: Def<T> extends { attributes: infer A }
+    ? K extends keyof A ? A[K] : never
+    : never
 }
 /**
  * Every valid column name for the model (attributes + system fields
  * added by traits like `id`, `uuid`, `created_at`). Useful for
  * constraining query builders that accept a `column` parameter.
  */
-export type InferColumnNames<T> = ColumnName<Def<T>>;
+export type InferColumnNames<T> = QueryInferColumnNames<T>;
 /**
  * Attribute keys whose `type` is declared as `'number'` in the model
  * definition. Used to constrain aggregate methods (`sum`, `avg`,
@@ -82,8 +84,4 @@ export type InferColumnNames<T> = ColumnName<Def<T>>;
  * `AttributeKeys<Def<T>>` here. Tighten by declaring `type: 'number'`
  * on the attribute spec when narrowing matters.
  */
-export type InferNumericColumns<T> = {
-  [K in AttributeKeys<Def<T>>]: Def<T>['attributes'][K] extends { type: 'number' } ? K : never
-}[AttributeKeys<Def<T>>] extends infer R
-  ? [R] extends [never] ? AttributeKeys<Def<T>> : R
-  : never;
+export type InferNumericColumns<T> = QueryInferNumericColumns<T>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/orm",
   "type": "module",
-  "version": "0.70.72",
+  "version": "0.70.74",
   "description": "The Stacks ORM integration",
   "author": "Chris Breuer",
   "contributors": [
@@ -58,13 +58,13 @@
   },
   "dependencies": {
     "@stacksjs/ts-validation": "^0.5.0",
-    "bun-query-builder": "^0.1.38"
+    "bun-query-builder": "^0.1.47"
   },
   "devDependencies": {
     "@stacksjs/build": "workspace:*",
-    "@stacksjs/config": "0.70.72",
-    "better-dx": "^0.2.12",
-    "@stacksjs/query-builder": "0.70.72",
-    "@stacksjs/types": "0.70.72"
+    "@stacksjs/config": "0.70.74",
+    "better-dx": "^0.2.16",
+    "@stacksjs/query-builder": "0.70.74",
+    "@stacksjs/types": "0.70.74"
   }
 }