velocious 1.0.673 → 1.0.674

package/package.json

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

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))
   }
 
   /**