velocious 1.0.466 → 1.0.468

package/build/utils/ransack.js

@@ -4,6 +4,28 @@ import * as inflection from "inflection"
 import {isPlainObject} from "is-plain-object"
 import {resolveFrontendModelClass} from "../frontend-models/model-registry.js"
 
+/** Error raised when a Ransack descriptor is malformed. */
+export class RansackQueryError extends Error {
+  /**
+   * Creates a Ransack query error.
+   * @param {string} message - Error message.
+   */
+  constructor(message) {
+    super(message)
+
+    this.name = "RansackQueryError"
+  }
+}
+
+/**
+ * Builds a Ransack query error.
+ * @param {string} message - Error message.
+ * @returns {RansackQueryError} - Ransack query error.
+ */
+function ransackQueryError(message) {
+  return new RansackQueryError(message)
+}
+
 /**
  * RansackPredicate type.
  * @typedef {"cont" | "end" | "eq" | "gt" | "gteq" | "in" | "lt" | "lteq" | "not_eq" | "not_in" | "null" | "start"} RansackPredicate
@@ -76,7 +98,7 @@ export function normalizeRansackParams(modelClass, params) {
  */
 export function normalizeRansackGroup(modelClass, params) {
   if (!isPlainObject(params)) {
-    throw new Error(`ransack params must be a plain object, got: ${typeof params}`)
+    throw ransackQueryError(`ransack params must be a plain object, got: ${typeof params}`)
   }
 
   /**
@@ -124,7 +146,7 @@ function normalizeSimpleRansackCondition({key, modelClass, rawValue}) {
   const parsedKey = parseRansackKey(key)
 
   if (!parsedKey) {
-    throw new Error(`Unsupported ransack predicate in key: ${key}`)
+    throw ransackQueryError(`Unsupported ransack predicate in key: ${key}`)
   }
 
   const value = normalizeRansackValue({
@@ -159,17 +181,17 @@ function normalizeAdvancedRansackConditions({modelClass, value}) {
 
   for (const entry of normalizeRansackCollection(value, "conditions")) {
     if (!isPlainObject(entry)) {
-      throw new Error(`Ransack condition entries must be plain objects, got: ${typeof entry}`)
+      throw ransackQueryError(`Ransack condition entries must be plain objects, got: ${typeof entry}`)
     }
 
     const predicateValue = entry.p
 
     if (typeof predicateValue !== "string") {
-      throw new Error("Ransack condition predicate must be a string")
+      throw ransackQueryError("Ransack condition predicate must be a string")
     }
 
     if (!supportedPredicates.includes(predicateValue)) {
-      throw new Error(`Unsupported ransack predicate in condition: ${predicateValue}`)
+      throw ransackQueryError(`Unsupported ransack predicate in condition: ${predicateValue}`)
     }
 
     const predicate = /** @type {RansackPredicate} */ (predicateValue)
@@ -206,7 +228,7 @@ function normalizeAdvancedRansackGroups({modelClass, value}) {
 
   for (const entry of normalizeRansackCollection(value, "groupings")) {
     if (!isPlainObject(entry)) {
-      throw new Error(`Ransack grouping entries must be plain objects, got: ${typeof entry}`)
+      throw ransackQueryError(`Ransack grouping entries must be plain objects, got: ${typeof entry}`)
     }
 
     groupings.push(normalizeRansackGroup(modelClass, entry))
@@ -225,7 +247,7 @@ function normalizeRansackCombinator(value, defaultValue) {
   if (value === undefined || value === null || value === "") return defaultValue
   if (value === "and" || value === "or") return value
 
-  throw new Error(`Invalid ransack combinator: ${String(value)}`)
+  throw ransackQueryError(`Invalid ransack combinator: ${String(value)}`)
 }
 
 /**
@@ -253,7 +275,7 @@ function normalizeRansackCollection(value, name) {
       .map((key) => value[key])
   }
 
-  throw new Error(`Ransack ${name} must be an array or object, got: ${typeof value}`)
+  throw ransackQueryError(`Ransack ${name} must be an array or object, got: ${typeof value}`)
 }
 
 /**
@@ -292,7 +314,7 @@ function resolveRansackAttributesFromAdvancedValue({modelClass, value}) {
   }
 
   if (attributes.length < 1) {
-    throw new Error("Ransack condition must include at least one attribute")
+    throw ransackQueryError("Ransack condition must include at least one attribute")
   }
 
   return attributes
@@ -314,7 +336,7 @@ function normalizeAdvancedAttributeValues(value) {
     return normalizeRansackCollection(value, "attributes").map((entry) => normalizeAdvancedAttributeValue(entry))
   }
 
-  throw new Error(`Ransack condition attributes must be strings, arrays, or objects, got: ${typeof value}`)
+  throw ransackQueryError(`Ransack condition attributes must be strings, arrays, or objects, got: ${typeof value}`)
 }
 
 /**
@@ -329,7 +351,7 @@ function normalizeAdvancedAttributeValue(value) {
     return value.name
   }
 
-  throw new Error(`Ransack condition attribute entries must be strings or {name}, got: ${typeof value}`)
+  throw ransackQueryError(`Ransack condition attribute entries must be strings or {name}, got: ${typeof value}`)
 }
 
 /**
@@ -346,7 +368,7 @@ function resolveRansackAttributes({modelClass, value}) {
     const attributeName = resolveAttributeName({modelClass: targetModelClass, value: resolvedPath.attributeValue})
 
     if (!attributeName) {
-      throw new Error(`Unknown ransack attribute "${resolvedPath.attributeValue}" for ${targetModelClass.name}`)
+      throw ransackQueryError(`Unknown ransack attribute "${resolvedPath.attributeValue}" for ${targetModelClass.name}`)
     }
 
     return {
@@ -370,7 +392,7 @@ function modelClassAtPath({modelClass, path}) {
     const relationship = relationshipEntries(currentModelClass)[relationshipName]
 
     if (!relationship) {
-      throw new Error(`Unknown ransack relationship "${relationshipName}" for ${currentModelClass.name}`)
+      throw ransackQueryError(`Unknown ransack relationship "${relationshipName}" for ${currentModelClass.name}`)
     }
 
     currentModelClass = relationship.targetModelClass
@@ -412,7 +434,7 @@ function resolveRansackPath({modelClass, value}) {
   }
 
   if (remainingValue.length < 1) {
-    throw new Error(`Invalid ransack key path: ${value}`)
+    throw ransackQueryError(`Invalid ransack key path: ${value}`)
   }
 
   return {
@@ -648,7 +670,7 @@ function parseRansackKey(key) {
     const pathValue = key.slice(0, key.length - suffix.length)
 
     if (pathValue.length < 1) {
-      throw new Error(`Invalid ransack key: ${key}`)
+      throw ransackQueryError(`Invalid ransack key: ${key}`)
     }
 
     return {
@@ -665,7 +687,7 @@ function parseRansackKey(key) {
     const pathValue = key.slice(0, key.length - camelSuffix.length)
 
     if (pathValue.length < 1) {
-      throw new Error(`Invalid ransack key: ${key}`)
+      throw ransackQueryError(`Invalid ransack key: ${key}`)
     }
 
     return {
@@ -750,7 +772,7 @@ function normalizeRansackBoolean(value) {
   if (ransackFalseValues.has(value)) return false
   if (ransackValueIsBlank(value)) return null
 
-  throw new Error(`Invalid ransack boolean value: ${String(value)}`)
+  throw ransackQueryError(`Invalid ransack boolean value: ${String(value)}`)
 }
 
 /**
@@ -789,10 +811,10 @@ function normalizeRansackArray(value) {
  */
 
 /**
- * Parses and validates a ransack `s` sort string against model attributes.
- * @param {RansackModelClass} modelClass - Model class for attribute validation.
+ * Parses a ransack `s` sort string against model attributes.
+ * @param {RansackModelClass} modelClass - Model class for attribute lookup.
  * @param {string} sortString - Ransack sort string (e.g., "name asc" or "name asc, createdAt desc").
- * @returns {RansackSort[]} - Validated sort definitions.
+ * @returns {RansackSort[]} - Parsed sort definitions.
  */
 export function parseRansackSort(modelClass, sortString) {
   const segments = sortString.split(",").map((segment) => segment.trim()).filter((segment) => segment.length > 0)
@@ -808,13 +830,13 @@ export function parseRansackSort(modelClass, sortString) {
     const directionCandidate = parts.length > 1 ? parts[1].toLowerCase() : "asc"
 
     if (directionCandidate !== "asc" && directionCandidate !== "desc") {
-      throw new Error(`Invalid ransack sort direction "${directionCandidate}" in: ${segment}`)
+      throw ransackQueryError(`Invalid ransack sort direction "${directionCandidate}" in: ${segment}`)
     }
 
     const resolvedAttribute = resolveAttributeName({modelClass, value: columnCandidate})
 
     if (!resolvedAttribute) {
-      throw new Error(`Unknown ransack sort attribute "${columnCandidate}" for ${modelClass.name}`)
+      throw ransackQueryError(`Unknown ransack sort attribute "${columnCandidate}" for ${modelClass.name}`)
     }
 
     sorts.push({attribute: resolvedAttribute, direction: directionCandidate})

package/package.json

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

package/src/configuration.js

@@ -2230,8 +2230,8 @@ export default class VelociousConfiguration {
 
       if (!matches) continue
 
-      this.withoutCurrentConnectionContexts(() => {
-        void Promise
+      void this.withoutCurrentConnectionContexts(() => {
+        return Promise
           .resolve()
           .then(() => this._deliverWebsocketChannelBroadcast(subscription, body, {eventId: meta?.eventId}))
           .catch((error) => {

package/src/database/pool/async-tracked-multi-connection.js

@@ -6,6 +6,7 @@ import BasePool, {POOL_CONFIGURATION_KEY} from "./base.js"
 export const CLOSED_CONNECTION = Symbol("velociousClosedConnection")
 const IDLE_CONNECTION_CHECKED_IN_AT = Symbol("velociousIdleConnectionCheckedInAt")
 const CONNECTION_CHECKED_OUT_AT = Symbol("velociousConnectionCheckedOutAt")
+const SUPPRESSED_CONNECTION_CONTEXT = Symbol("velociousSuppressedConnectionContext")
 const DEFAULT_MAX_CONNECTIONS = 10
 const DEFAULT_IDLE_TIMEOUT_MILLIS = 5000
 const DEFAULT_CHECKOUT_TIMEOUT_MILLIS = 10000
@@ -103,7 +104,7 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
      * Runs a callback without the inherited current connection context.
      * @type {(callback: () => ?) => ?}
      */
-    const withoutCurrentConnectionContext = (callback) => this.asyncLocalStorage.run(undefined, callback)
+    const withoutCurrentConnectionContext = (callback) => this.asyncLocalStorage.run(SUPPRESSED_CONNECTION_CONTEXT, callback)
     this._withoutCurrentConnectionContext = withoutCurrentConnectionContext
   }
 
@@ -720,6 +721,7 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
     const id = this.asyncLocalStorage.getStore()
 
     if (id === undefined) return this.currentFallbackConnectionOrFail()
+    if (id === SUPPRESSED_CONNECTION_CONTEXT) return this.currentFallbackConnectionOrFail()
 
     this.ensureConnectionIsInUse(id)
 
@@ -815,6 +817,7 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
   getCurrentContextConnection() {
     const id = this.asyncLocalStorage.getStore()
 
+    if (id === SUPPRESSED_CONNECTION_CONTEXT) return undefined
     if (id === undefined) return this._testSharedConnection
 
     return this.getCurrentConnection()
@@ -825,7 +828,9 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
    * @returns {boolean} - Whether nested code can reuse the current connection context.
    */
   hasCurrentConnectionContext() {
-    return this.asyncLocalStorage.getStore() !== undefined
+    const id = this.asyncLocalStorage.getStore()
+
+    return id !== undefined && id !== SUPPRESSED_CONNECTION_CONTEXT
   }
 
   /**

package/src/database/pool/single-multi-use.js

@@ -3,6 +3,8 @@
 import BasePool from "./base.js"
 
 export default class VelociousDatabasePoolSingleMultiUser extends BasePool {
+  suppressedConnectionContextCount = 0
+
   /**
    * Runs checkin.
    * @param {import("../drivers/base.js").default} connection - Connection.
@@ -58,6 +60,32 @@ export default class VelociousDatabasePoolSingleMultiUser extends BasePool {
     }
   }
 
+  /**
+   * Runs without current connection context.
+   * @template T
+   * @param {() => T} callback - Callback to run without the shared current connection.
+   * @returns {T} - Callback result.
+   */
+  withoutCurrentConnectionContext(callback) {
+    this.suppressedConnectionContextCount += 1
+
+    try {
+      const result = callback()
+
+      if (result instanceof Promise) {
+        return /** @type {T} */ (result.finally(() => {
+          this.suppressedConnectionContextCount -= 1
+        }))
+      }
+
+      this.suppressedConnectionContextCount -= 1
+      return result
+    } catch (error) {
+      this.suppressedConnectionContextCount -= 1
+      throw error
+    }
+  }
+
   /**
    * Clears schema metadata cached by the reusable connection if it exists.
    * @returns {void} - No return value.
@@ -97,9 +125,19 @@ export default class VelociousDatabasePoolSingleMultiUser extends BasePool {
    * @returns {import("../drivers/base.js").default | undefined} - The current context connection.
    */
   getCurrentContextConnection() {
+    if (this.suppressedConnectionContextCount > 0) return undefined
+
     return this.connection
   }
 
+  /**
+   * Returns whether the shared connection is available to the current execution context.
+   * @returns {boolean} - Whether nested code can reuse the shared connection.
+   */
+  hasCurrentConnectionContext() {
+    return this.suppressedConnectionContextCount === 0
+  }
+
   /**
    * Runs get debug snapshot.
    * @returns {import("./base.js").DatabasePoolDebugSnapshot} - Diagnostic snapshot for this pool.

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

@@ -29,7 +29,7 @@ export default class DbGenerateFrontendModels extends BaseCommand {
   /** @type {Map<string, string> | null} */
   _resourceMethodReturnTypes = null
 
-  /** @type {Map<string, string[]> | null} */
+  /** @type {Map<string, Array<{name: string | null, type: string}>> | null} */
   _resourceMethodParameterTypes = null
 
   /**
@@ -288,7 +288,12 @@ export default class DbGenerateFrontendModels extends BaseCommand {
     }
     const collectionCommands = modelConfig.collectionCommands
     const memberCommands = modelConfig.memberCommands
-    const commandMetadata = modelConfig.commandMetadata || {}
+    const declaredCommandMetadata = modelConfig.commandMetadata || {}
+    const commandMetadata = await this.commandMetadataWithResourceJsDoc({
+      commandMetadata: declaredCommandMetadata,
+      commandNames: [...Object.keys(collectionCommands), ...Object.keys(memberCommands)],
+      resourceClass
+    })
     const builtInCollectionCommandsAreDefault = builtInCollectionCommands.create === "create" && builtInCollectionCommands.index === "index"
     const builtInMemberCommandsAreDefault = builtInMemberCommands.attach === "attach"
       && builtInMemberCommands.destroy === "destroy"
@@ -472,12 +477,12 @@ export default class DbGenerateFrontendModels extends BaseCommand {
       fileContent += `   * @returns {Promise<${signature.returnType}>} - Command response.\n`
       fileContent += "   */\n"
       fileContent += `  static async ${methodName}(${signature.parameters}) {\n`
-      fileContent += "    return await this.executeCustomCommand({\n"
+      fileContent += `    return /** @type {${signature.returnType}} */ (await this.executeCustomCommand({\n`
       fileContent += `      commandName: ${JSON.stringify(collectionCommands[methodName])},\n`
       fileContent += `      commandType: ${JSON.stringify(collectionCommands[methodName])},\n`
       fileContent += `      payload: ${className}.normalizeCustomCommandPayloadArguments(${signature.payloadArguments}),\n`
       fileContent += "      resourcePath: this.resourcePath()\n"
-      fileContent += "    })\n"
+      fileContent += "    }))\n"
       fileContent += "  }\n"
     }
 
@@ -491,13 +496,13 @@ export default class DbGenerateFrontendModels extends BaseCommand {
       fileContent += `   * @returns {Promise<${signature.returnType}>} - Command response.\n`
       fileContent += "   */\n"
       fileContent += `  async ${methodName}(${signature.parameters}) {\n`
-      fileContent += `    return await ${className}.executeCustomCommand({\n`
+      fileContent += `    return /** @type {${signature.returnType}} */ (await ${className}.executeCustomCommand({\n`
       fileContent += `      commandName: ${JSON.stringify(memberCommands[methodName])},\n`
       fileContent += `      commandType: ${JSON.stringify(memberCommands[methodName])},\n`
       fileContent += "      memberId: this.primaryKeyValue(),\n"
       fileContent += `      payload: ${className}.normalizeCustomCommandPayloadArguments(${signature.payloadArguments}),\n`
       fileContent += `      resourcePath: ${className}.resourcePath()\n`
-      fileContent += "    })\n"
+      fileContent += "    }))\n"
       fileContent += "  }\n"
     }
 
@@ -1406,11 +1411,7 @@ export default class DbGenerateFrontendModels extends BaseCommand {
    * @returns {string} - A frontend-resolvable attribute type.
    */
   frontendResolvableAttributeJsDocType(jsDocType) {
-    const safeTypeIdentifiers = new Set([
-      "Array", "Date", "Exclude", "Extract", "FrontendModelAttributeValue", "FrontendModelTransportValue",
-      "Map", "NonNullable", "Omit", "Partial", "Pick", "Promise", "Readonly", "ReadonlyArray", "Record",
-      "Required", "ReturnType", "Set"
-    ])
+    const safeTypeIdentifiers = this.frontendResolvableTypeIdentifiers()
     const referencedIdentifiers = jsDocType.match(/[A-Z][A-Za-z0-9_$]*/g) || []
 
     if (referencedIdentifiers.some((identifier) => !safeTypeIdentifiers.has(identifier))) {
@@ -1420,6 +1421,43 @@ export default class DbGenerateFrontendModels extends BaseCommand {
     return jsDocType
   }
 
+  /**
+   * Capitalized identifiers a generated frontend model can resolve on its own
+   * (primitives are lower-case and matched separately), so only framework-owned
+   * and builtin generic types are listed.
+   * @returns {Set<string>} - Frontend-resolvable type identifiers.
+   */
+  frontendResolvableTypeIdentifiers() {
+    return new Set([
+      "Array", "Date", "Exclude", "Extract", "FrontendModelAttributeValue", "FrontendModelTransportValue",
+      "Map", "NonNullable", "Omit", "Partial", "Pick", "Promise", "Readonly", "ReadonlyArray", "Record",
+      "Required", "ReturnType", "Set"
+    ])
+  }
+
+  /**
+   * Rewrites a custom-command param/return JSDoc type so it resolves in the generated
+   * frontend model: each model-class (or otherwise non-frontend-resolvable) identifier
+   * becomes `any` in place, keeping the surrounding object fields typed. A command-result
+   * field holding a model arrives as a serialized transport value, so the consumer hydrates
+   * it with `Model.instantiateFromResponse(...)`. The word boundary avoids matching the
+   * capitalized middle of a camelCase property name (e.g. `adjustedTotalCents`).
+   * @param {string} jsDocType - Resolved (Promise-unwrapped) JSDoc type.
+   * @returns {string} - A frontend-resolvable JSDoc type.
+   */
+  frontendResolvableCommandJsDocType(jsDocType) {
+    const safeTypeIdentifiers = this.frontendResolvableTypeIdentifiers()
+
+    return jsDocType
+      // A type that reaches into a backend source file via `import("...")` (optionally
+      // `.Member` and `[]`) can't resolve from the generated frontend model and would type
+      // a serialized result as a backend model instance, so collapse it to `any`.
+      .replace(/import\(\s*["'][^"']*["']\s*\)(\s*\.\s*[A-Za-z_$][\w$]*)*(\s*\[\s*\])*/g, "any")
+      // Remaining capitalized identifiers are model classes or otherwise non-resolvable
+      // types; downgrade each in place so sibling scalar fields keep their real types.
+      .replace(/\b[A-Z][A-Za-z0-9_$]*/g, (identifier) => safeTypeIdentifiers.has(identifier) ? identifier : "any")
+  }
+
   /**
    * Builds the JSDoc param block, parameter list, payload-argument expression, and
    * return type for a custom command method. With declared `args` each becomes a
@@ -1453,6 +1491,69 @@ export default class DbGenerateFrontendModels extends BaseCommand {
     }
   }
 
+  /**
+   * Enriches custom-command metadata by deriving a command's typed args and return
+   * type from the backend resource method's `@param`/`@returns` JSDoc when they are
+   * not already declared in `resourceConfig`. Precedence: explicit `resourceConfig`
+   * `{args, returnType}` wins, then the derived backend-method JSDoc, then the generic
+   * default. Model-class identifiers in the derived types are downgraded to `any`
+   * because the frontend receives a serialized record, not a model instance, which the
+   * consumer hydrates with `Model.instantiateFromResponse(...)`.
+   * @param {object} args - Arguments.
+   * @param {Record<string, {args: Array<{name: string, type: string}>, returnType: string | null}>} args.commandMetadata - Declared per-command metadata.
+   * @param {string[]} args.commandNames - Command method names to resolve.
+   * @param {import("../../../../../configuration-types.js").FrontendModelResourceClassType | null | undefined} args.resourceClass - Resource class.
+   * @returns {Promise<Record<string, {args: Array<{name: string, type: string}>, returnType: string | null}>>} - Enriched metadata.
+   */
+  async commandMetadataWithResourceJsDoc({commandMetadata, commandNames, resourceClass}) {
+    if (!resourceClass) return commandMetadata
+
+    /** @type {Record<string, {args: Array<{name: string, type: string}>, returnType: string | null}>} */
+    const enriched = {...commandMetadata}
+
+    for (const commandName of commandNames) {
+      const declared = commandMetadata[commandName] || {args: [], returnType: null}
+      const sourceClassName = this.methodOwnerClassName({methodName: commandName, targetClass: resourceClass})
+
+      if (!sourceClassName) {
+        enriched[commandName] = declared
+
+        continue
+      }
+
+      let returnType = declared.returnType
+
+      if (!returnType) {
+        const jsDocReturnType = await this.resourceMethodReturnType({methodName: commandName, sourceClassName})
+
+        if (jsDocReturnType) {
+          returnType = this.frontendResolvableCommandJsDocType(this.unwrappedPromiseJsDocType({jsDocType: jsDocReturnType}))
+        }
+      }
+
+      let args = declared.args
+
+      if (!args || args.length === 0) {
+        const jsDocParameters = await this.resourceMethodParameters({methodName: commandName, sourceClassName})
+        // Skip object-property tags (`@param {string} args.message`); only the
+        // top-level parameters map to method arguments, otherwise the shared
+        // `@param {object} args` + property style would emit `name(args, args)`.
+        const topLevelParameters = (jsDocParameters || []).filter((parameter) => typeof parameter.name === "string" && !parameter.name.includes("."))
+
+        if (topLevelParameters.length > 0) {
+          args = topLevelParameters.map((parameter) => ({
+            name: /** @type {string} */ (parameter.name),
+            type: this.frontendResolvableCommandJsDocType(parameter.type)
+          }))
+        }
+      }
+
+      enriched[commandName] = {args: args || [], returnType: returnType || null}
+    }
+
+    return enriched
+  }
+
   /**
    * Runs unwrapped promise js doc type.
    * @param {object} args - Arguments.
@@ -1534,26 +1635,39 @@ export default class DbGenerateFrontendModels extends BaseCommand {
    * @returns {Promise<string | null>} - JSDoc parameter type when documented.
    */
   async resourceMethodParameterType({methodName, parameterIndex, sourceClassName}) {
-    const resourceMethodParameterTypes = await this.resourceMethodParameterTypes()
-    const parameterTypesKey = `${sourceClassName}.${methodName}`
+    const parameters = await this.resourceMethodParameters({methodName, sourceClassName})
 
-    if (!resourceMethodParameterTypes.has(parameterTypesKey)) return null
+    if (!parameters) return null
 
-    const parameterTypes = resourceMethodParameterTypes.get(parameterTypesKey)
+    const parameter = parameters[parameterIndex]
 
-    if (!parameterTypes) {
-      throw new Error(`Expected JSDoc parameter types for ${parameterTypesKey}`)
+    if (parameter === undefined) return null
+
+    if (parameter.type.length < 1) {
+      throw new Error(`Expected non-empty JSDoc parameter type for ${sourceClassName}.${methodName} parameter ${parameterIndex}`)
     }
 
-    const parameterType = parameterTypes[parameterIndex]
+    return parameter.type
+  }
+
+  /**
+   * Runs resource method parameters.
+   * @param {{methodName: string, sourceClassName: string}} args - Arguments.
+   * @returns {Promise<Array<{name: string | null, type: string}> | null>} - JSDoc parameters (name + type) when documented.
+   */
+  async resourceMethodParameters({methodName, sourceClassName}) {
+    const resourceMethodParameterTypes = await this.resourceMethodParameterTypes()
+    const parameterTypesKey = `${sourceClassName}.${methodName}`
+
+    if (!resourceMethodParameterTypes.has(parameterTypesKey)) return null
 
-    if (parameterType === undefined) return null
+    const parameters = resourceMethodParameterTypes.get(parameterTypesKey)
 
-    if (parameterType.length < 1) {
-      throw new Error(`Expected non-empty JSDoc parameter type for ${parameterTypesKey} parameter ${parameterIndex}`)
+    if (!parameters) {
+      throw new Error(`Expected JSDoc parameters for ${parameterTypesKey}`)
     }
 
-    return parameterType
+    return parameters
   }
 
   /**
@@ -1579,7 +1693,7 @@ export default class DbGenerateFrontendModels extends BaseCommand {
 
   /**
    * Runs resource method parameter types.
-   * @returns {Promise<Map<string, string[]>>} - Resource method parameter types keyed by ClassName.methodName.
+   * @returns {Promise<Map<string, Array<{name: string | null, type: string}>>>} - Resource method parameters keyed by ClassName.methodName.
    */
   async resourceMethodParameterTypes() {
     if (this._resourceMethodParameterTypes) return this._resourceMethodParameterTypes
@@ -1678,7 +1792,7 @@ export default class DbGenerateFrontendModels extends BaseCommand {
 
   /**
    * Adds resource method parameter types from source.
-   * @param {{parameterTypes: Map<string, string[]>, sourceText: string}} args - Arguments.
+   * @param {{parameterTypes: Map<string, Array<{name: string | null, type: string}>>, sourceText: string}} args - Arguments.
    * @returns {void}
    */
   addResourceMethodParameterTypesFromSource({parameterTypes, sourceText}) {
@@ -1710,10 +1824,10 @@ export default class DbGenerateFrontendModels extends BaseCommand {
         if (!methodMatch) continue
 
         const methodName = methodMatch[1]
-        const jsDocParameterTypes = this.jsDocParameterTypes(jsDocMatch[1])
+        const jsDocParameters = this.jsDocParameters(jsDocMatch[1])
 
-        if (jsDocParameterTypes.length > 0) {
-          parameterTypes.set(`${className}.${methodName}`, jsDocParameterTypes)
+        if (jsDocParameters.length > 0) {
+          parameterTypes.set(`${className}.${methodName}`, jsDocParameters)
         }
       }
 
@@ -1748,12 +1862,12 @@ export default class DbGenerateFrontendModels extends BaseCommand {
   }
 
   /**
-   * Runs js doc parameter types.
+   * Runs js doc parameters.
    * @param {string} jsDocText - JSDoc text inside comment markers.
-   * @returns {string[]} - JSDoc parameter types in declaration order.
+   * @returns {Array<{name: string | null, type: string}>} - JSDoc parameters (name + type) in declaration order.
    */
-  jsDocParameterTypes(jsDocText) {
-    const parameterTypes = []
+  jsDocParameters(jsDocText) {
+    const parameters = []
     const paramRegex = /@param\s*\{/g
     let _paramMatch
 
@@ -1765,17 +1879,23 @@ export default class DbGenerateFrontendModels extends BaseCommand {
         throw new Error(`Could not parse JSDoc parameter type from: ${jsDocText}`)
       }
 
-      const parameterType = jsDocText.slice(typeOpenIndex + 1, typeCloseIndex).trim()
+      const type = jsDocText.slice(typeOpenIndex + 1, typeCloseIndex).trim()
 
-      if (parameterType.length < 1) {
+      if (type.length < 1) {
         throw new Error(`Expected non-empty JSDoc parameter type in: ${jsDocText}`)
       }
 
-      parameterTypes.push(parameterType)
+      // After the closing brace the parameter name follows (optionally bracketed
+      // for `@param {type} [name]`). Capture the leading name token — including any
+      // dotted path so object-property tags like `@param {string} args.message` stay
+      // distinguishable from the top-level `@param {object} args` parameter.
+      const nameMatch = jsDocText.slice(typeCloseIndex + 1).match(/^\s*\[?\s*([A-Za-z_$][\w$.]*)/)
+
+      parameters.push({name: nameMatch ? nameMatch[1] : null, type})
       paramRegex.lastIndex = typeCloseIndex + 1
     }
 
-    return parameterTypes
+    return parameters
   }
 
   /**