@stacksjs/orm 0.70.73 → 0.70.74

package/dist/auto-crud.d.ts

@@ -101,6 +101,8 @@ export declare function buildReadColumnMap(attributes: Record<string, unknown> |
  *   ?sort=discountType,name → ORDER BY discount_type ASC, name ASC
  */
 export declare function applySorting(query: any, sortParam: string | null, columns: ReadonlyMap<string, string>): any;
+declare function safeJSON(s: string): unknown;
+declare function safeJSONOrEmpty(_s: string): unknown;
 /**
  * Apply a model's `casts` to a record, in either direction:
  *   - `'get'`  — DB shape → JS-typed values (read responses)
@@ -161,18 +163,25 @@ export declare const SYSTEM_COLUMNS: string[];
  * Built-in cast resolvers — kept in sync with @stacksjs/orm/define-model.
  * A duplicate here is the simplest way to keep auto-CRUD parity with the
  * model-driven path without introducing a circular import.
- */
-export declare const AUTO_CRUD_CASTERS: {
-  string: { get: (v) => unknown; set: (v) => unknown };
-  number: { get: (v) => unknown; set: (v) => unknown };
-  integer: { get: (v) => unknown; set: (v) => unknown };
-  float: { get: (v) => unknown; set: (v) => unknown };
-  boolean: { get: (v) => unknown; set: (v) => unknown };
-  json: { get: (v) => unknown; set: (v) => unknown };
-  datetime: { get: (v) => unknown; set: (v) => unknown };
-  date: { get: (v) => unknown; set: (v) => unknown };
-  array: { get: (v) => unknown; set: (v) => unknown }
-};
+ * @defaultValue
+ * ```ts
+ * {
+ *   string: { get: (v) => unknown | null, set: (v) => unknown | null },
+ *   number: { get: (v) => unknown | null, set: (v) => unknown | null },
+ *   integer: { get: (v) => unknown | null, set: (v) => unknown | null },
+ *   float: { get: (v) => unknown | null, set: (v) => unknown | null },
+ *   boolean: { get: (v) => boolean, set: (v) => number },
+ *   json: { get: (v) => null | unknown, set: (v) => null | unknown },
+ *   datetime: { get: (v) => Date | null, set: (v) => unknown },
+ *   date: { get: (v) => Date | null, set: (v) => unknown },
+ *   array: {
+ *     get: (v) => never[] | unknown | unknown | never[],
+ *     set: (v) => null | unknown
+ *   }
+ * }
+ * ```
+ */
+export declare const AUTO_CRUD_CASTERS: Record<string, { get: (v: unknown) => unknown, set: (v: unknown) => unknown }>;
 // Default page size for the auto-CRUD index route. Matches the
 // request-aware Model.paginate() / resolvePageArgs default (15) so the
 // REST list endpoint and the in-process paginator agree out of the box.

package/dist/define-model.d.ts

@@ -5,6 +5,7 @@ import { createLikeableMethods } from './traits/likeable';
 import { createSoftDeleteMethods } from './traits/soft-deletes';
 import { createTaggableMethods } from './traits/taggable';
 import { createTwoFactorMethods } from './traits/two-factor';
+import { type OrmModelDefinition as BQBModelDefinition, type OrmModelStatic } from '@stacksjs/query-builder';
 import type { InferRelationNames } from '@stacksjs/query-builder';
 // Re-export types from bun-query-builder for convenience
 export type { ModelDefinition, InferRelationNames, ModelAttributes, InferModelAttributes, SystemFields, ColumnName, AttributeKeys, FillableKeys, HiddenKeys, ModelInstance, ModelQueryBuilder } from '@stacksjs/query-builder';
@@ -21,52 +22,7 @@ export type { ModelDefinition, InferRelationNames, ModelAttributes, InferModelAt
  * ```
  */
 export declare function withoutEvents<T>(fn: () => T | Promise<T>): Promise<T>;
-/**
- * Stacks-enhanced model definition.
- *
- * Wraps bun-query-builder's `createModel()` with:
- * - Event dispatching via `traits.observe`
- * - Trait methods (billable, taggable, categorizable, commentable, likeable, 2FA)
- * - Full backward compatibility with generators (migration, routes, dashboard)
- *
- * ### Relationships
- * Each entry in `belongsTo`, `hasMany`, `hasOne`, `belongsToMany`,
- * `hasOneThrough`, and `hasManyThrough` declares a typed relation
- * usable via `.with('relationName')`:
- *
- * ```ts
- * defineModel({
- *   belongsTo: ['Author'],     // ↪ post.author
- *   hasMany:   ['Comment'],    // ↪ post.comments (lowercase + pluralized)
- *   hasOne:    ['Cover'],      // ↪ post.cover
- * })
- * ```
- *
- * After eager loading the related row(s) are reachable as a property
- * on the instance — `(await Post.with('author').first()).author`.
- *
- * @example
- * ```ts
- * import { defineModel } from '@stacksjs/orm'
- * import { schema } from '@stacksjs/validation'
- *
- * export default defineModel({
- *   name: 'Post',
- *   table: 'posts',
- *   attributes: {
- *     title: { type: 'string', fillable: true, validation: { rule: schema.string() } },
- *     views: { type: 'number', fillable: true, validation: { rule: schema.number() } },
- *   },
- *   belongsTo: ['Author'],
- *   hasMany: ['Tag', 'Category', 'Comment'],
- *   traits: { useTimestamps: true, useUuid: true },
- * } as const)
- *
- * // Result: Post.where('title', 'test') — 'title' narrowed to valid columns
- * // Result: Post.with('author') — 'author' narrowed to valid relations
- * ```
- */
-export declare function defineModel<const TDef extends ModelDefinition>(definition: TDef): void;
+export declare function defineModel<const TDef extends ModelDefinition>(definition: TDef): StacksModelStatic<TDef>;
 /**
  * Normalize a ModelInstance (or array of them, or already-plain row) into
  * a serialization-ready plain object.
@@ -88,12 +44,12 @@ export declare interface CasterInterface {
   get(value: unknown): unknown
   set(value: unknown): unknown
 }
-declare interface StacksModelDefinition {
+declare interface StacksModelDefinition extends Omit<BQBModelDefinition, 'attributes' | 'indexes' | 'traits'> {
   name: string
   table: string
   primaryKey?: string
   autoIncrement?: boolean
-  traits?: Record<string, unknown>
+  traits?: NonNullable<BQBModelDefinition['traits']> & Record<string, unknown>
   indexes?: Array<{ name: string, columns: string[], unique?: boolean, where?: string }>
   casts?: Record<string, CastType | CasterInterface>
   attributes: {
@@ -139,6 +95,58 @@ export declare interface TraitMethods {
  */
 export type CastType = 'string' | 'number' | 'boolean' | 'json' | 'datetime' | 'date' | 'array' | 'integer' | 'float';
 declare type ModelDefinition = StacksModelDefinition;
+/**
+ * Stacks-enhanced model definition.
+ *
+ * Wraps bun-query-builder's `createModel()` with:
+ * - Event dispatching via `traits.observe`
+ * - Trait methods (billable, taggable, categorizable, commentable, likeable, 2FA)
+ * - Full backward compatibility with generators (migration, routes, dashboard)
+ *
+ * ### Relationships
+ * Each entry in `belongsTo`, `hasMany`, `hasOne`, `belongsToMany`,
+ * `hasOneThrough`, and `hasManyThrough` declares a typed relation
+ * usable via `.with('relationName')`:
+ *
+ * ```ts
+ * defineModel({
+ *   belongsTo: ['Author'],     // ↪ post.author
+ *   hasMany:   ['Comment'],    // ↪ post.comments (lowercase + pluralized)
+ *   hasOne:    ['Cover'],      // ↪ post.cover
+ * })
+ * ```
+ *
+ * After eager loading the related row(s) are reachable as a property
+ * on the instance — `(await Post.with('author').first()).author`.
+ *
+ * @example
+ * ```ts
+ * import { defineModel } from '@stacksjs/orm'
+ * import { schema } from '@stacksjs/validation'
+ *
+ * export default defineModel({
+ *   name: 'Post',
+ *   table: 'posts',
+ *   attributes: {
+ *     title: { type: 'string', fillable: true, validation: { rule: schema.string() } },
+ *     views: { type: 'number', fillable: true, validation: { rule: schema.number() } },
+ *   },
+ *   belongsTo: ['Author'],
+ *   hasMany: ['Tag', 'Category', 'Comment'],
+ *   traits: { useTimestamps: true, useUuid: true },
+ * } as const)
+ *
+ * // Result: Post.where('title', 'test') — 'title' narrowed to valid columns
+ * // Result: Post.with('author') — 'author' narrowed to valid relations
+ * ```
+ */
+export type StacksModelStatic<TDef extends ModelDefinition> = OrmModelStatic<TDef> & TDef & TraitMethods & {
+  update: (id: number | string, data: Record<string, unknown>) => ReturnType<OrmModelStatic<TDef>['find']>
+  forceUpdate: (id: number | string, data: Record<string, unknown>) => ReturnType<OrmModelStatic<TDef>['find']>
+  forceCreate: (data: Record<string, unknown>) => ReturnType<OrmModelStatic<TDef>['create']>
+  delete: (id: number | string) => Promise<boolean>
+  withoutEvents: <T>(fn: () => T | Promise<T>) => Promise<T>
+}
 /**
  * Thrown by `Model.findOrFail(id)` (and other strict lookups) when no row matches.
  * Callers can `instanceof` against this to distinguish "missing" from other errors.

package/dist/index.d.ts

@@ -15,6 +15,13 @@ export type {
   InferTableName,
   ModelDefinition,
 } from '@stacksjs/query-builder';
+/**
+ * Returns a Proxy that lazily forwards every property access to the
+ * loaded model in `_loaded[name]`. Returns `undefined` before the
+ * deferred load completes — callers that need the load to finish
+ * first should `await ormReady`.
+ */
+declare function lazyModel<T>(name: string): T;
 /**
  * Resolves once all framework-default models have been loaded into the
  * lazy-export proxies. Server bootstrap code that wants to ensure model
@@ -23,7 +30,7 @@ export type {
  * time any HTTP handler runs, the microtask queue has long drained.
  */
 export declare const ormReady: Promise<void>;
-export declare const User: any;
+export declare const User: boolean;
 // Queue framework models. The CLI commands `buddy queue:status`,
 // `queue:failed`, `queue:flush`, `queue:inspect`, `queue:monitor`,
 // `queue:clear` import them as `import { Job, FailedJob } from
@@ -37,62 +44,62 @@ export declare const User: any;
 // returns `undefined` for unloaded models, and the CLI queue commands
 // can check `await ormReady; if (!Job) throw …` to surface a clear
 // "run ./buddy queue:install" error.
-export declare const Job: any;
-export declare const FailedJob: any;
-export declare const Activity: any;
-export declare const Author: any;
-export declare const Campaign: any;
-export declare const Cart: any;
-export declare const CartItem: any;
-export declare const Category: any;
-export declare const Comment: any;
-export declare const Coupon: any;
-export declare const Customer: any;
-export declare const DeliveryRoute: any;
-export declare const Deployment: any;
-export declare const DigitalDelivery: any;
-export declare const Driver: any;
-export declare const CampaignSend: any;
-export declare const EmailList: any;
-export declare const EmailListSubscriber: any;
-export declare const ErrorModel: any;
-export declare const GiftCard: any;
-export declare const LicenseKey: any;
-export declare const Log: any;
-export declare const LoyaltyPoint: any;
-export declare const LoyaltyReward: any;
-export declare const Manufacturer: any;
-export declare const Notification: any;
-export declare const Order: any;
-export declare const OrderItem: any;
-export declare const Page: any;
-export declare const Payment: any;
-export declare const PaymentMethod: any;
-export declare const PaymentProduct: any;
-export declare const PaymentTransaction: any;
-export declare const Post: any;
-export declare const PrintDevice: any;
-export declare const Product: any;
-export declare const ProductUnit: any;
-export declare const ProductVariant: any;
-export declare const Receipt: any;
-export declare const Release: any;
-export declare const Request: any;
-export declare const Review: any;
-export declare const ShippingMethod: any;
-export declare const ShippingRate: any;
-export declare const ShippingZone: any;
-export declare const SocialPost: any;
-export declare const Subscriber: any;
-export declare const SubscriberEmail: any;
-export declare const Subscription: any;
-export declare const Tag: any;
-export declare const TaxRate: any;
-export declare const Team: any;
-export declare const Transaction: any;
-export declare const WaitlistProduct: any;
-export declare const WaitlistRestaurant: any;
-export declare const Websocket: any;
+export declare const Job: boolean;
+export declare const FailedJob: boolean;
+export declare const Activity: boolean;
+export declare const Author: boolean;
+export declare const Campaign: boolean;
+export declare const Cart: boolean;
+export declare const CartItem: boolean;
+export declare const Category: boolean;
+export declare const Comment: boolean;
+export declare const Coupon: boolean;
+export declare const Customer: boolean;
+export declare const DeliveryRoute: boolean;
+export declare const Deployment: boolean;
+export declare const DigitalDelivery: boolean;
+export declare const Driver: boolean;
+export declare const CampaignSend: boolean;
+export declare const EmailList: boolean;
+export declare const EmailListSubscriber: boolean;
+export declare const ErrorModel: boolean;
+export declare const GiftCard: boolean;
+export declare const LicenseKey: boolean;
+export declare const Log: boolean;
+export declare const LoyaltyPoint: boolean;
+export declare const LoyaltyReward: boolean;
+export declare const Manufacturer: boolean;
+export declare const Notification: boolean;
+export declare const Order: boolean;
+export declare const OrderItem: boolean;
+export declare const Page: boolean;
+export declare const Payment: boolean;
+export declare const PaymentMethod: boolean;
+export declare const PaymentProduct: boolean;
+export declare const PaymentTransaction: boolean;
+export declare const Post: boolean;
+export declare const PrintDevice: boolean;
+export declare const Product: boolean;
+export declare const ProductUnit: boolean;
+export declare const ProductVariant: boolean;
+export declare const Receipt: boolean;
+export declare const Release: boolean;
+export declare const Request: boolean;
+export declare const Review: boolean;
+export declare const ShippingMethod: boolean;
+export declare const ShippingRate: boolean;
+export declare const ShippingZone: boolean;
+export declare const SocialPost: boolean;
+export declare const Subscriber: boolean;
+export declare const SubscriberEmail: boolean;
+export declare const Subscription: boolean;
+export declare const Tag: boolean;
+export declare const TaxRate: boolean;
+export declare const Team: boolean;
+export declare const Transaction: boolean;
+export declare const WaitlistProduct: boolean;
+export declare const WaitlistRestaurant: boolean;
+export declare const Websocket: boolean;
 /**
  * Framework-default User row shape. Matches the attributes declared on
  * `storage/framework/defaults/app/Models/User.ts` plus the system
@@ -113,6 +120,12 @@ export declare interface UserModel {
   public_key?: string | null
   created_at: string
   updated_at: string | null
+  stripe_id?: string | null
+  two_factor_enabled?: boolean
+  hasStripeId: () => boolean
+  hasRole: (role: string) => boolean | Promise<boolean>
+  assignRole: (role: string) => unknown | Promise<unknown>
+  update: (data: Record<string, unknown>) => Promise<UserModel>
   [key: string]: unknown
 }
 /**