@avelonjs/orm 0.1.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avelonjs/orm",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "private": false,
   "description": "Model layer and QueryIR builder for Avelon applications.",
   "license": "MIT",

package/src/model.ts

@@ -16,6 +16,7 @@ import {
   type QueryIR,
   type QueryResult,
   type RelationLoad,
+  type WardAction,
   type WardInput,
 } from '@avelonjs/core'
 
@@ -278,10 +279,7 @@ export class QueryBuilder<TModel extends Model = Model> {
       ...(this.#limit !== undefined && mode !== 'count' ? { limit: this.#limit } : {}),
       ...(this.#offset !== undefined && mode !== 'count' ? { offset: this.#offset } : {}),
     }
-    if (this.#unwarded) return this.#ward === undefined ? base : injectWard(base, this.#ward)
-    const resolved = this.#resolvedWard()
-    if (resolved === undefined && this.#ward === undefined) return base
-    return injectWard(base, this.#ward ?? resolved ?? true)
+    return this.#warded(base, 'read')
   }
 
   /** Executes a select and hydrates models. */
@@ -322,9 +320,9 @@ export class QueryBuilder<TModel extends Model = Model> {
     }
   }
 
-  /** Inserts one or more rows. */
+  /** Inserts one or more rows under the model's `insert` ward. */
   async insert(values: Row | Row[], returning?: string[] | '*'): Promise<QueryResult<Row>> {
-    return this.#driver.execute<Row>({
+    const base: QueryIR = {
       table: tableOf(this.#model),
       mode: 'insert',
       select: [],
@@ -333,7 +331,8 @@ export class QueryBuilder<TModel extends Model = Model> {
       order: [],
       values,
       returning,
-    })
+    }
+    return this.#driver.execute<Row>(this.#warded(base, 'insert'))
   }
 
   /** Updates matching rows. */
@@ -360,15 +359,19 @@ export class QueryBuilder<TModel extends Model = Model> {
     })
   }
 
-  #resolvedWard(): WardInput | undefined {
+  #warded(base: QueryIR, action: WardAction): QueryIR {
+    if (this.#unwarded) return this.#ward === undefined ? base : injectWard(base, this.#ward)
+    const resolved = this.#resolvedWard(action)
+    if (resolved === undefined && this.#ward === undefined) return base
+    return injectWard(base, this.#ward ?? resolved ?? true)
+  }
+
+  #resolvedWard(action: WardAction): WardInput | undefined {
+    const actor = this.#actor === undefined ? Gate.actor() : this.#actor
     try {
-      return resolveWard(
-        this.#model,
-        'read',
-        this.#actor === undefined ? Gate.actor() : this.#actor,
-      )
+      return resolveWard(this.#model, action, actor)
     } catch {
-      return this.#model.ward?.(this.#actor === undefined ? Gate.actor() : this.#actor)
+      return this.#model.ward?.(actor)
     }
   }