velocious 1.0.673 → 1.0.675

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "build/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.673",
+  "version": "1.0.675",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

package/src/database/query/model-class-query.js

@@ -940,10 +940,17 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
 
   /**
    * Runs first.
+   *
+   * An explicitly set order is preserved; the deterministic identity order is
+   * only applied as a fallback when no order was set, so `LIMIT 1` never
+   * returns an arbitrary row.
    * @returns {Promise<InstanceType<MC> | null>} - Resolves with the first.
    */
   async first() {
-    const newQuery = this.clone().limit(1).reorder(this._defaultIdentityOrder("ASC"))
+    const newQuery = this.clone().limit(1)
+
+    if (newQuery.getOrders().length == 0) newQuery.reorder(this._defaultIdentityOrder("ASC"))
+
     const results = await newQuery.toArray()
 
     return results[0] || null
@@ -951,10 +958,26 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
 
   /**
    * Runs last.
+   *
+   * An explicitly set order is preserved and read from its end; the
+   * deterministic identity order is only applied as a fallback when no order
+   * was set. The clone shares its order instances with the source query, so
+   * the explicit orders are replaced by independent reversed copies instead
+   * of mutating the shared ones.
    * @returns {Promise<InstanceType<MC> | null>} - Resolves with the last.
    */
   async last() {
-    const results = await this.clone().reorder(this._defaultIdentityOrder("DESC")).limit(1).toArray()
+    const newQuery = this.clone().limit(1)
+
+    if (newQuery.getOrders().length == 0) {
+      newQuery.reorder(this._defaultIdentityOrder("DESC"))
+    } else {
+      const orders = newQuery.getOrders()
+
+      for (let i = 0; i < orders.length; i += 1) orders[i] = orders[i].reversedCopy()
+    }
+
+    const results = await newQuery.toArray()
 
     return results[0] || null
   }

package/src/database/query/order-base.js

@@ -27,6 +27,15 @@ export default class VelociousDatabaseQueryOrderBase {
     throw new Error("setReverseOrder not implemented")
   }
 
+  /**
+   * Runs reversed copy.
+   * @abstract
+   * @returns {import("./order-base.js").default} - A new independent order with the direction reversed.
+   */
+  reversedCopy() {
+    throw new Error("reversedCopy not implemented")
+  }
+
   toSql() {
     throw new Error("'toSql' wasn't implemented")
   }

package/src/database/query/order-column.js

@@ -59,6 +59,16 @@ export default class VelociousDatabaseQueryOrderColumn extends OrderBase {
     this.reverseOrder = reverseOrder
   }
 
+  /**
+   * Runs reversed copy.
+   * @returns {VelociousDatabaseQueryOrderColumn} - A new independent order reversing the effective (rendered) direction.
+   */
+  reversedCopy() {
+    const direction = this.reverseOrder ? this.direction : reverseDirection(this.direction)
+
+    return new VelociousDatabaseQueryOrderColumn(this.query, {column: this.column, direction, tableName: this.tableName})
+  }
+
   /**
    * Runs to sql.
    * @returns {string} - SQL string.

package/src/database/query/order-plain.js

@@ -18,6 +18,22 @@ export default class VelociousDatabaseQueryOrderPlain extends OrderBase {
     this.reverseOrder = true
   }
 
+  /**
+   * Runs reversed copy.
+   * @returns {VelociousDatabaseQueryOrderPlain} - A new independent order reversing the effective (rendered) direction; a directionless plain order renders DESC.
+   */
+  reversedCopy() {
+    const effective = this.reverseOrder ? `${this.plain} DESC` : this.plain
+    const match = effective.match(/^(.*\S)\s+(ASC|DESC)$/i)
+
+    if (match) {
+      const direction = match[2].toUpperCase() == "ASC" ? "DESC" : "ASC"
+      return new VelociousDatabaseQueryOrderPlain(this.query, `${match[1]} ${direction}`)
+    }
+
+    return new VelociousDatabaseQueryOrderPlain(this.query, `${effective} DESC`)
+  }
+
   toSql() {
     if (this.reverseOrder) {
       return `${this.plain} DESC`

package/src/frontend-model-controller.js

@@ -1060,6 +1060,14 @@ export default class FrontendModelController extends Controller {
     return this.frontendModelResourceInstance().primaryKey()
   }
 
+  /**
+   * Runs frontend model database primary key.
+   * @returns {import("./utils/model-primary-key.js").ModelPrimaryKeyDefinition} - Primary key resolved to database-queryable attribute names.
+   */
+  frontendModelDatabasePrimaryKey() {
+    return this.frontendModelResourceInstance().databasePrimaryKey()
+  }
+
   /**
    * Runs frontend model ability action.
    * @param {"index" | "find" | "create" | "update" | "destroy" | "attach" | "attachmentList" | "download" | "url"} action - Frontend action.
@@ -1138,7 +1146,7 @@ export default class FrontendModelController extends Controller {
    * @returns {import("./utils/model-primary-key.js").ModelPrimaryKeyValue} - Primary key value.
    */
   frontendModelPrimaryKeyValue(model) {
-    const primaryKey = this.frontendModelPrimaryKey()
+    const primaryKey = this.frontendModelDatabasePrimaryKey()
 
     return readModelPrimaryKeyValue(primaryKey, (attributeName) => model.readAttribute(attributeName))
   }
@@ -1194,7 +1202,7 @@ export default class FrontendModelController extends Controller {
   async frontendModelFilterAuthorizedModels({action, models}) {
     if (models.length === 0) return models
 
-    const primaryKey = this.frontendModelPrimaryKey()
+    const primaryKey = this.frontendModelDatabasePrimaryKey()
 
     const identities = models.map((model) => this.frontendModelPrimaryKeyValue(model))
     const authorizedIds = await this.frontendModelAuthorizedIdentitySet({

package/src/frontend-model-resource/base-resource.js

@@ -699,7 +699,7 @@ export default class FrontendModelBaseResource extends AuthorizationBaseResource
       ? ModelClass.accessibleFor(this.syncAbilityAction(forDelete ? "destroy" : "update"), ability)
       : ModelClass.where({})
 
-    return await query.findBy(modelPrimaryKeyConditions(this.primaryKey(), mutation.resourceId))
+    return await query.findBy(modelPrimaryKeyConditions(this.databasePrimaryKey(), mutation.resourceId))
   }
 
   /**
@@ -894,6 +894,25 @@ export default class FrontendModelBaseResource extends AuthorizationBaseResource
     return ResourceClass.resolvedPrimaryKey(this.resourceConfiguration())
   }
 
+  /**
+   * Runs database primary key.
+   *
+   * Declared scalar resource primary keys are client-facing aliases (for example
+   * a camelCase name for a legacy raw-column primary key). Database-facing identity
+   * operations must resolve the alias to the model's canonical attribute so where
+   * and pluck clauses hit real columns, while client-facing payloads keep the alias.
+   * @returns {import("../utils/model-primary-key.js").ModelPrimaryKeyDefinition} - Primary key resolved to database-queryable attribute names.
+   */
+  databasePrimaryKey() {
+    const primaryKey = this.primaryKey()
+
+    if (Array.isArray(primaryKey)) return primaryKey
+
+    const modelClass = this.databaseModelClass()
+
+    return modelClass.resolveAttributeName(primaryKey) || primaryKey
+  }
+
   /**
    * Runs authorized query.
    * @param {FrontendModelResourceAction} action - Ability action.
@@ -1027,7 +1046,7 @@ export default class FrontendModelBaseResource extends AuthorizationBaseResource
       query = query.preload(preload)
     }
 
-    return await query.findBy(modelPrimaryKeyConditions(this.primaryKey(), id))
+    return await query.findBy(modelPrimaryKeyConditions(this.databasePrimaryKey(), id))
   }
 
   /**