velocious 1.0.441 → 1.0.443

package/build/authorization/base-resource.js

@@ -111,7 +111,7 @@ export default class AuthorizationBaseResource {
 
   /**
    * Runs current user.
-   * @returns {import("../configuration-types.js").VelociousLooseObject | null | undefined} - Current user from context.
+   * @returns {unknown} - Current user from context.
    */
   currentUser() {
     return this.context.currentUser
@@ -127,7 +127,7 @@ export default class AuthorizationBaseResource {
 
   /**
    * Runs params.
-   * @returns {import("../configuration-types.js").VelociousLooseObject | undefined} - Params from context.
+   * @returns {import("../configuration-types.js").VelociousParams | undefined} - Params from context.
    */
   params() {
     return this.context.params

package/build/beacon/client.js

@@ -225,14 +225,20 @@ export default class BeaconClient extends EventEmitter {
       this._reconnectTimer = undefined
     }
 
-    if (this._socket) {
-      const socket = this._socket
+    const socket = this._socket
 
-      await new Promise((resolve) => {
-        socket.once("close", () => resolve(undefined))
-        socket.end()
-      })
-    }
+    if (!socket) return
+
+    this._socket = undefined
+    this._jsonSocket = undefined
+
+    if (socket.destroyed) return
+
+    await new Promise((resolve) => {
+      socket.once("close", () => resolve(undefined))
+      socket.end()
+      socket.destroySoon()
+    })
   }
 
   /**

package/build/beacon/server.js

@@ -37,6 +37,11 @@ export default class BeaconServer {
      * Narrows the runtime value to the documented type.
       @type {net.Server | undefined} */
     this.server = undefined
+    /**
+     * Accepted sockets, including connections that have not completed the hello handshake yet.
+     * @type {Set<net.Socket>}
+     */
+    this.sockets = new Set()
   }
 
   /**
@@ -68,6 +73,10 @@ export default class BeaconServer {
       peer.close()
     }
 
+    for (const socket of this.sockets) {
+      socket.destroy()
+    }
+
     if (!this.server) return
 
     const {server} = this
@@ -97,6 +106,7 @@ export default class BeaconServer {
    * @returns {void}
    */
   _handleConnection(socket) {
+    this.sockets.add(socket)
     const jsonSocket = new JsonSocket(socket)
     /**
      * Defines peerId.
@@ -104,6 +114,7 @@ export default class BeaconServer {
     let peerId
 
     const cleanup = () => {
+      this.sockets.delete(socket)
       this.peers.delete(jsonSocket)
     }
 

package/build/cli/commands/lint/relationships.js

@@ -0,0 +1,12 @@
+import BaseCommand from "../../base-command.js"
+
+/** Lints model relationships (e.g. belongs-to relationships missing an inverse on the target model). */
+export default class VelociousCliCommandsLintRelationships extends BaseCommand {
+  /**
+   * Runs execute.
+   * @returns {Promise<?>} - Resolves with the command result.
+   */
+  async execute() {
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsLintRelationships(this)
+  }
+}

package/build/configuration-types.js

@@ -202,7 +202,11 @@
  */
 
 /**
- * @typedef {Record<string, unknown> & {configuration?: import("./configuration.js").default, currentUser?: Record<string, unknown> | null, params?: Record<string, unknown>, request?: import("./http-server/client/request.js").default | import("./http-server/client/websocket-request.js").default}} VelociousLooseObject
+ * @typedef {Record<string, string>} VelociousParams
+ */
+
+/**
+ * @typedef {Record<string, unknown> & {configuration?: import("./configuration.js").default, currentUser?: unknown, params?: VelociousParams, request?: import("./http-server/client/request.js").default | import("./http-server/client/websocket-request.js").default}} VelociousLooseObject
  */
 
 /**

package/build/controller.js

@@ -34,7 +34,7 @@ export default class VelociousController {
    * @param {string} args.action - Action.
    * @param {import("./configuration.js").default} args.configuration - Configuration instance.
    * @param {string} args.controller - Controller.
-   * @param {object} args.params - Parameters object.
+   * @param {Record<string, ?>} args.params - Parameters object.
    * @param {import("./http-server/client/request.js").default} args.request - Request object.
    * @param {import("./http-server/client/response.js").default} args.response - Response object.
    * @param {string} args.viewPath - View path.

package/build/database/drivers/base.js

@@ -103,6 +103,7 @@
 
 import BacktraceCleaner from "../../utils/backtrace-cleaner.js"
 import { getDatabaseAnnotations } from "../annotations.js"
+import isDate from "../../utils/is-date.js"
 import Logger from "../../logger.js"
 import Query from "../query/index.js"
 import Handler from "../handler.js"
@@ -644,7 +645,9 @@ export default class VelociousDatabaseDriversBase {
       return value ? 1 : 0
     }
 
-    if (value instanceof Date) {
+    // isDate instead of instanceof: a Date created in another realm (e.g. the console REPL) would
+    // fail instanceof, skip this conversion, and serialize as an empty SQL value downstream.
+    if (isDate(value)) {
       return strftime("%F %T.%L", value)
     }
 

package/build/database/record/index.js

@@ -14,7 +14,7 @@
 /**
  * Model class constructor type used for static `this` typing.
  * @template {VelociousDatabaseRecord} T
- * @typedef {{new (...args: Array<never>): T}} ModelConstructor
+ * @typedef {{new (changes?: Record<string, unknown>): T}} ModelConstructor
  */
 
 import timeout from "awaitery/build/timeout.js"
@@ -31,6 +31,7 @@ import HasOneRelationship from "./relationships/has-one.js"
 import RecordAttachmentHandle from "./attachments/handle.js"
 import * as inflection from "inflection"
 import deburrColumnName from "../../utils/deburr-column-name.js"
+import isDate from "../../utils/is-date.js"
 import ModelClassQuery from "../query/model-class-query.js"
 import Preloader from "../query/preloader.js"
 import {readPayloadAssociationCount, readPayloadComputedAbility, readPayloadQueryData, setPayloadAssociationCount, setPayloadComputedAbility, setPayloadQueryData} from "../../record-payload-values.js"
@@ -500,9 +501,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs before validation.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static beforeValidation(callback) {
@@ -511,9 +512,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs before save.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static beforeSave(callback) {
@@ -522,9 +523,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs before create.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static beforeCreate(callback) {
@@ -533,9 +534,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs before update.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static beforeUpdate(callback) {
@@ -544,9 +545,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs before destroy.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static beforeDestroy(callback) {
@@ -555,9 +556,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs after save.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static afterSave(callback) {
@@ -566,9 +567,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs after create.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static afterCreate(callback) {
@@ -577,9 +578,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs after update.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static afterUpdate(callback) {
@@ -588,9 +589,9 @@ class VelociousDatabaseRecord {
 
   /**
    * Runs after destroy.
-   * @template {VelociousDatabaseRecord} T
-   * @this {ModelConstructor<T> & typeof VelociousDatabaseRecord}
-   * @param {LifecycleCallbackType<T>} callback - Callback function or instance method name.
+   * @template {typeof VelociousDatabaseRecord} MC
+   * @this {MC}
+   * @param {LifecycleCallbackType<InstanceType<MC>>} callback - Callback function or instance method name.
    * @returns {void}
    */
   static afterDestroy(callback) {
@@ -2234,7 +2235,7 @@ class VelociousDatabaseRecord {
       normalizedValue = this._normalizeDateStringForInsert(normalizedValue)
     }
 
-    if (normalizedValue instanceof Date) {
+    if (isDate(normalizedValue)) {
       const configuration = this._getConfiguration()
       const offsetMinutes = configuration.getEnvironmentHandler().getTimezoneOffsetMinutes(configuration)
       const offsetMs = offsetMinutes * 60 * 1000
@@ -2437,7 +2438,7 @@ class VelociousDatabaseRecord {
           if (model.isChanged()) {
             await model.save()
 
-            const foreignKey = instanceRelationship.getForeignKey()
+            const foreignKey = this._relationshipForeignKeyAttribute(instanceRelationship)
 
             this.setAttribute(foreignKey, model.id())
 
@@ -2492,7 +2493,7 @@ class VelociousDatabaseRecord {
 
       if (loaded) {
         for (const model of loaded) {
-          const foreignKey = instanceRelationship.getForeignKey()
+          const foreignKey = model._relationshipForeignKeyAttribute(instanceRelationship)
 
           model.setAttribute(foreignKey, this.id())
 
@@ -2509,6 +2510,17 @@ class VelociousDatabaseRecord {
     return relationships
   }
 
+  /**
+   * Resolves a relationship foreign-key column to this model's public attribute name.
+   * @param {import("./instance-relationships/base.js").default<?, ?>} instanceRelationship - Relationship instance.
+   * @returns {string} Attribute name accepted by setAttribute/assign.
+   */
+  _relationshipForeignKeyAttribute(instanceRelationship) {
+    const foreignKey = instanceRelationship.getForeignKey()
+
+    return this.getModelClass().getColumnNameToAttributeNameMap()[foreignKey] || foreignKey
+  }
+
   /**
    * Runs auto save has many and has one relationships.
    * @param {object} args - Options object.
@@ -2534,7 +2546,7 @@ class VelociousDatabaseRecord {
       }
 
       for (const model of loaded) {
-        const foreignKey = instanceRelationship.getForeignKey()
+        const foreignKey = model._relationshipForeignKeyAttribute(instanceRelationship)
 
         model.setAttribute(foreignKey, this.id())
 
@@ -3904,7 +3916,7 @@ class VelociousDatabaseRecord {
     const offsetMinutes = configuration.getEnvironmentHandler().getTimezoneOffsetMinutes(configuration)
     const offsetMs = offsetMinutes * 60 * 1000
 
-    if (value instanceof Date) {
+    if (isDate(value)) {
       return new Date(value.getTime() + offsetMs)
     }
 
@@ -4063,7 +4075,7 @@ class VelociousDatabaseRecord {
 
       const value = data[columnName]
 
-      if (!(value instanceof Date)) continue
+      if (!isDate(value)) continue
 
       data[columnName] = new Date(value.getTime() - offsetMs)
     }

package/build/database/record/relationships/belongs-to.js

@@ -21,7 +21,7 @@ export default class VelociousDatabaseRecordBelongsToRelationship extends BaseRe
       }
     }
 
-    return this.foreignKey
+    return this.modelClass.getAttributeNameToColumnNameMap()[this.foreignKey] || this.foreignKey
   }
 
   /**

package/build/database/record/relationships/has-many.js

@@ -13,7 +13,9 @@ export default class VelociousDatabaseRecordHasManyRelationship extends BaseRela
       this.foreignKey = `${inflection.underscore(this.modelClass.getModelName())}_id`
     }
 
-    return this.foreignKey
+    const targetModelClass = this.className || this.klass ? this.getTargetModelClass() : undefined
+
+    return targetModelClass?.getAttributeNameToColumnNameMap()[this.foreignKey] || this.foreignKey
   }
 
   /**

package/build/database/record/relationships/has-one.js

@@ -13,7 +13,9 @@ export default class VelociousDatabaseRecordHasOneRelationship extends BaseRelat
       this.foreignKey = `${inflection.underscore(this.modelClass.getModelName())}_id`
     }
 
-    return this.foreignKey
+    const targetModelClass = this.className || this.klass ? this.getTargetModelClass() : undefined
+
+    return targetModelClass?.getAttributeNameToColumnNameMap()[this.foreignKey] || this.foreignKey
   }
 
   /**

package/build/environment-handlers/base.js

@@ -243,6 +243,16 @@ export default class VelociousEnvironmentHandlerBase {
     throw new Error("cliCommandsGenerateModel not implemented")
   }
 
+  /**
+   * Runs cli commands lint relationships.
+   * @abstract
+   * @param {import("../cli/base-command.js").default} _command - Command.
+   * @returns {Promise<?>} - Resolves with the command result.
+   */
+  async cliCommandsLintRelationships(_command) {
+    throw new Error("cliCommandsLintRelationships not implemented")
+  }
+
   /**
    * Runs cli commands routes.
    * @abstract

package/build/environment-handlers/node/cli/commands/generate/frontend-models.js

@@ -373,14 +373,14 @@ export default class DbGenerateFrontendModels extends BaseCommand {
 
       fileContent += "\n"
       fileContent += `  /** @returns {${attributesTypeName}[${JSON.stringify(attribute.name)}]} - Attribute value. */\n`
-      fileContent += `  ${camelizedAttribute}() { return this.readAttribute(${JSON.stringify(attribute.name)}) }\n`
+      fileContent += `  ${camelizedAttribute}() { return /** @type {${attributesTypeName}[${JSON.stringify(attribute.name)}]} */ (this.readAttribute(${JSON.stringify(attribute.name)})) }\n`
 
       fileContent += "\n"
       fileContent += "  /**\n"
       fileContent += `   * @param {${attributesTypeName}[${JSON.stringify(attribute.name)}]} newValue - New attribute value.\n`
       fileContent += `   * @returns {${attributesTypeName}[${JSON.stringify(attribute.name)}]} - Assigned value.\n`
       fileContent += "   */\n"
-      fileContent += `  set${camelizedAttributeUpper}(newValue) { return this.setAttribute(${JSON.stringify(attribute.name)}, newValue) }\n`
+      fileContent += `  set${camelizedAttributeUpper}(newValue) { return /** @type {${attributesTypeName}[${JSON.stringify(attribute.name)}]} */ (this.setAttribute(${JSON.stringify(attribute.name)}, newValue)) }\n`
     }
 
     for (const methodName of Object.keys(collectionCommands)) {

package/build/environment-handlers/node/cli/commands/lint/relationships.js

@@ -0,0 +1,144 @@
+// @ts-check
+
+import BaseCommand from "../../../../../cli/base-command.js"
+import fs from "node:fs/promises"
+import path from "node:path"
+
+/**
+ * Lints model relationships: every non-polymorphic belongs-to relationship should have an inverse
+ * has-many or has-one relationship declared on its target model class. A missing inverse usually
+ * means the target model was never told about the association (e.g. an Event model missing
+ * `hasMany("priceCategorySettings")` while PriceCategorySetting declares `belongsTo("event")`).
+ *
+ * Specific relationships can be ignored through a JSON config file (default:
+ * `relationship-lint.json` in the project directory, overridable with `--config <path>`):
+ *
+ *   {"ignore": ["PriceCategorySetting#event"]}
+ *
+ * where each entry is `<model class name>#<belongs-to relationship name>`.
+ */
+export default class VelociousCliCommandsLintRelationships extends BaseCommand {
+  /**
+   * Runs execute.
+   * @returns {Promise<{offences: Array<{ignoreKey: string, message: string}>}>} - Resolves with the found offences (empty when the lint passes).
+   */
+  async execute() {
+    // Relationship target resolution (getTargetModelClass) looks model classes up through the
+    // current configuration, so make this command's configuration the current one.
+    this.getConfiguration().setCurrent()
+
+    await this.getConfiguration().initializeModels()
+
+    const ignoredRelationships = await this._loadIgnoredRelationships()
+    const offences = []
+    const modelClasses = Object.values(this.getConfiguration().getModelClasses())
+
+    for (const modelClass of modelClasses) {
+      for (const relationship of modelClass.getRelationships()) {
+        if (relationship.getType() != "belongsTo") continue
+        if (relationship.getPolymorphic()) continue
+
+        const ignoreKey = `${modelClass.name}#${relationship.getRelationshipName()}`
+
+        if (ignoredRelationships.has(ignoreKey)) continue
+
+        let targetModelClass
+
+        try {
+          targetModelClass = relationship.getTargetModelClass()
+        } catch (error) {
+          offences.push({
+            ignoreKey,
+            message: `${ignoreKey}: couldn't resolve the target model class: ${error instanceof Error ? error.message : error}`
+          })
+
+          continue
+        }
+
+        if (!targetModelClass) {
+          offences.push({ignoreKey, message: `${ignoreKey}: couldn't resolve the target model class`})
+
+          continue
+        }
+
+        const inverseRelationship = targetModelClass.getRelationships().find((candidate) => {
+          if (candidate.getType() != "hasMany" && candidate.getType() != "hasOne") return false
+          if (candidate.through) return false
+
+          try {
+            return candidate.getTargetModelClass() === modelClass
+          } catch {
+            // A has-many/has-one with an unresolvable target can't be the inverse of this belongs-to.
+            // It is reported separately when its own model's belongs-to relationships are linted.
+            return false
+          }
+        })
+
+        if (inverseRelationship) continue
+
+        offences.push({
+          ignoreKey,
+          message: `${targetModelClass.name} is missing an inverse hasMany/hasOne relationship for ${ignoreKey} (belongsTo). ` +
+            `Declare the inverse on ${targetModelClass.name} or add "${ignoreKey}" to the ignore config.`
+        })
+      }
+    }
+
+    for (const offence of offences) {
+      console.error(offence.message)
+    }
+
+    if (offences.length > 0) {
+      throw new Error(`Relationship lint failed with ${offences.length} offence(s):\n${offences.map((offence) => offence.message).join("\n")}`)
+    }
+
+    console.log(`Relationship lint passed for ${modelClasses.length} model(s).`)
+
+    return {offences}
+  }
+
+  /**
+   * Loads the ignored relationship keys from the lint config file. The file is optional; when the
+   * default path doesn't exist, no relationships are ignored. An explicitly passed `--config` path
+   * must exist.
+   * @returns {Promise<Set<string>>} - Ignored `<model>#<relationship>` keys.
+   */
+  async _loadIgnoredRelationships() {
+    const configArgIndex = this.processArgs?.indexOf("--config") ?? -1
+    const explicitConfigPath = configArgIndex >= 0 ? this.processArgs?.[configArgIndex + 1] : undefined
+
+    if (configArgIndex >= 0 && !explicitConfigPath) {
+      throw new Error("--config was given without a path argument")
+    }
+
+    const configPath = explicitConfigPath
+      ? path.resolve(this.directory(), explicitConfigPath)
+      : path.join(this.directory(), "relationship-lint.json")
+
+    let configContent
+
+    try {
+      configContent = await fs.readFile(configPath, "utf8")
+    } catch (error) {
+      if (!explicitConfigPath && /** @type {NodeJS.ErrnoException} */ (error).code == "ENOENT") {
+        return new Set()
+      }
+
+      throw error
+    }
+
+    const config = JSON.parse(configContent)
+
+    if (config === null || typeof config != "object" || Array.isArray(config)) {
+      throw new Error(`Relationship lint config must be a JSON object: ${configPath}`)
+    }
+
+    const ignore = config.ignore ?? []
+
+    if (!Array.isArray(ignore) || ignore.some((entry) => typeof entry != "string")) {
+      throw new Error(`Relationship lint config "ignore" must be an array of "<model>#<relationship>" strings: ${configPath}`)
+    }
+
+    return new Set(ignore)
+  }
+}

package/build/environment-handlers/node.js

@@ -8,6 +8,7 @@ import CliCommandsGenerateBaseModels from "./node/cli/commands/generate/base-mod
 import CliCommandsGenerateFrontendModels from "./node/cli/commands/generate/frontend-models.js"
 import CliCommandsGenerateMigration from "./node/cli/commands/generate/migration.js"
 import CliCommandsGenerateModel from "./node/cli/commands/generate/model.js"
+import CliCommandsLintRelationships from "./node/cli/commands/lint/relationships.js"
 import CliCommandsRoutes from "./node/cli/commands/routes.js"
 import CliCommandsServer from "./node/cli/commands/server.js"
 import CliCommandsTest from "./node/cli/commands/test.js"
@@ -509,6 +510,15 @@ export default class VelociousEnvironmentHandlerNode extends Base{
     return await this.forwardCommand(command, CliCommandsGenerateModel)
   }
 
+  /**
+   * Runs cli commands lint relationships.
+   * @param {import("../cli/base-command.js").default} command - Command.
+   * @returns {Promise<?>} - Resolves with the command result.
+   */
+  async cliCommandsLintRelationships(command) {
+    return await this.forwardCommand(command, CliCommandsLintRelationships)
+  }
+
   /**
    * Runs cli commands routes.
    * @param {import("../cli/base-command.js").default} command - Command.

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

@@ -9,7 +9,7 @@ import * as inflection from "inflection"
  * @property {import("../controller.js").default} controller - Frontend-model controller instance.
  * @property {typeof import("../database/record/index.js").default} modelClass - Backing model class.
  * @property {string} modelName - Model name.
- * @property {import("../configuration-types.js").VelociousLooseObject} params - Request params.
+ * @property {import("../configuration-types.js").VelociousParams} params - Request params.
  * @property {import("../configuration-types.js").NormalizedFrontendModelResourceConfiguration | import("../configuration-types.js").FrontendModelResourceConfiguration} resourceConfiguration - Normalized resource configuration (or raw input shape during early bootstrap).
  */
 
@@ -21,13 +21,13 @@ import * as inflection from "inflection"
  * @property {import("../configuration-types.js").VelociousLooseObject} [locals] - Ability locals.
  * @property {typeof import("../database/record/index.js").default} [modelClass] - Optional backing model class override.
  * @property {string} [modelName] - Optional model name override.
- * @property {import("../configuration-types.js").VelociousLooseObject} [params] - Optional params override.
+ * @property {import("../configuration-types.js").VelociousParams} [params] - Optional params override.
  * @property {import("../configuration-types.js").NormalizedFrontendModelResourceConfiguration | import("../configuration-types.js").FrontendModelResourceConfiguration} [resourceConfiguration] - Optional normalized resource configuration.
  */
 
 /**
  * Base class for backend frontend-model resources.
- * @template {typeof import("../database/record/index.js").default} [out TModelClass=typeof import("../database/record/index.js").default]
+ * @template {typeof import("../database/record/index.js").default} [TModelClass=typeof import("../database/record/index.js").default]
  */
 export default class FrontendModelBaseResource extends AuthorizationBaseResource {
   /**
@@ -99,10 +99,10 @@ export default class FrontendModelBaseResource extends AuthorizationBaseResource
   /**
    * Runs typed controller instance.
    * @returns {import("../controller.js").default & {
-   *   frontendModelAuthorizedQuery: (action: "index" | "find" | "create" | "update" | "destroy" | "attach" | "download" | "url") => import("../database/query/model-class-query.js").default<typeof import("../database/record/index.js").default>,
+   *   frontendModelAuthorizedQuery: (action: "index" | "find" | "create" | "update" | "destroy" | "attach" | "download" | "url") => import("../database/query/model-class-query.js").default<TModelClass>,
    *   frontendModelAbilityAction: (action: string) => string,
    *   currentAbility: () => import("../authorization/ability.js").default | undefined,
-   *   frontendModelIndexQuery: () => import("../database/query/model-class-query.js").default<typeof import("../database/record/index.js").default>,
+   *   frontendModelIndexQuery: () => import("../database/query/model-class-query.js").default<TModelClass>,
    *   frontendModelPreload: () => import("../database/query/index.js").NestedPreloadRecord | null,
    *   serializeFrontendModel: (model: import("../database/record/index.js").default) => Promise<Record<string, unknown>>
    * }} - Controller instance with frontend-model helpers.
@@ -176,9 +176,9 @@ export default class FrontendModelBaseResource extends AuthorizationBaseResource
 
   /**
    * Runs params.
-   * @returns {import("../configuration-types.js").VelociousLooseObject} - Params.
+   * @returns {import("../configuration-types.js").VelociousParams} - Params.
    */
-  params() { return this.paramsValue || super.params() || {} }
+  params() { return /** @type {import("../configuration-types.js").VelociousParams} */ (this.paramsValue || super.params() || {}) }
 
   /**
    * Runs resource configuration.
@@ -243,11 +243,10 @@ export default class FrontendModelBaseResource extends AuthorizationBaseResource
   /**
    * Runs authorized query.
    * @param {"index" | "find" | "create" | "update" | "destroy" | "attach" | "download" | "url"} action - Ability action.
-   * @template {typeof import("../database/record/index.js").default} [MC=typeof import("../database/record/index.js").default]
-   * @returns {import("../database/query/model-class-query.js").default<MC>} - Authorized query.
+   * @returns {import("../database/query/model-class-query.js").default<TModelClass>} - Authorized query.
    */
   authorizedQuery(action) {
-    return /** Narrows the authorized query to the resource's model class. @type {import("../database/query/model-class-query.js").default<MC>} */ (this.typedControllerInstance().frontendModelAuthorizedQuery(action))
+    return this.typedControllerInstance().frontendModelAuthorizedQuery(action)
   }