velocious 1.0.460 → 1.0.462

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

@@ -216,9 +216,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
    * @returns {this} - The clone.
    */
   clone() {
-    const newQuery = /**
-                      * Narrows the runtime value to the documented type.
-                      * @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (new VelociousDatabaseQueryModelClassQuery({
+    const newQuery = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (new VelociousDatabaseQueryModelClassQuery({
       driver: this._driverFn,
       froms: [...this._froms],
       handler: this.handler.clone(),
@@ -338,9 +336,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     countQuery._selects = []
     countQuery.select(sql)
 
-    const results = /**
-                     * Narrows the runtime value to the documented type.
-                     * @type {{count: number}[]} */ (await countQuery._executeQuery({
+    const results = /** @type {{count: number}[]} */ (await countQuery._executeQuery({
       logName: countQuery.queryLogName("Count")
     }))
 
@@ -374,9 +370,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
       `SELECT ${countSql} AS ${this.driver.quoteColumn("count")}`,
       `FROM (${countQuery.toSql()}) AS ${this.driver.quoteTable("paginated_count_rows")}`
     ].join(" ")
-    const results = /**
-                     * Narrows the runtime value to the documented type.
-                     * @type {{count: number}[]} */ (await this.driver.query(
+    const results = /** @type {{count: number}[]} */ (await this.driver.query(
       sql,
       {logName: this.queryLogName("Count")}
     ))
@@ -470,18 +464,12 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     const froms = this.getFroms()
     const lastFrom = froms[froms.length - 1]
 
-    if (lastFrom && typeof /**
-                            * Narrows the runtime value to the documented type.
-                            * @type {?} */ (lastFrom).tableName === "string") {
+    if (lastFrom && typeof /** @type {?} */ (lastFrom).tableName === "string") {
       return /** @type {?} */ (lastFrom).tableName
     }
 
-    if (lastFrom && typeof /**
-                            * Narrows the runtime value to the documented type.
-                            * @type {?} */ (lastFrom).plain === "string") {
-      const parsedReference = parseFromPlainTableReference(/**
-                                                            * Narrows the runtime value to the documented type.
-                                                            * @type {?} */ (lastFrom).plain)
+    if (lastFrom && typeof /** @type {?} */ (lastFrom).plain === "string") {
+      const parsedReference = parseFromPlainTableReference(/** @type {?} */ (lastFrom).plain)
 
       if (parsedReference) return parsedReference
     }
@@ -539,9 +527,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
    * @returns {VelociousDatabaseQueryModelClassQuery<MC>} - The scoped query.
    */
   withJoinPath(joinBasePath) {
-    const scopedQuery = /**
-                         * Narrows the runtime value to the documented type.
-                         * @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
+    const scopedQuery = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
 
     scopedQuery._joinBasePath = joinBasePath
     scopedQuery._joinTracker = this._joinTracker
@@ -638,9 +624,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     }
 
     return this._applyJoinPathScope({
-      joinPath: normalizeScopePath(/**
-                                    * Narrows the runtime value to the documented type.
-                                    * @type {string | string[]} */ (pathOrScopeDescriptor)),
+      joinPath: normalizeScopePath(/** @type {string | string[]} */ (pathOrScopeDescriptor)),
       scopeDescriptor: maybeScopeDescriptor
     })
   }
@@ -659,9 +643,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
       throw new Error(`Cannot apply ${scopeDescriptor.modelClass.name} scope to ${this.getModelClass().name} query`)
     }
 
-    const scopedQuery = /**
-                         * Narrows the runtime value to the documented type.
-                         * @type {this | void} */ (scopeDescriptor.callback({
+    const scopedQuery = /** @type {this | void} */ (scopeDescriptor.callback({
       driver: this.driver,
       modelClass: this.getModelClass(),
       query: this,
@@ -693,9 +675,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     const scopedQuery = this.buildJoinScopeQuery(targetModelClass, fullJoinPath)
     const originalJoinCount = scopedQuery._joins.length
     const originalWhereCount = scopedQuery._wheres.length
-    const appliedQuery = /**
-                          * Narrows the runtime value to the documented type.
-                          * @type {typeof scopedQuery | void} */ (scopeDescriptor.callback({
+    const appliedQuery = /** @type {typeof scopedQuery | void} */ (scopeDescriptor.callback({
       driver: scopedQuery.driver,
       modelClass: targetModelClass,
       path: [...fullJoinPath],
@@ -742,9 +722,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
    * @returns {VelociousDatabaseQueryModelClassQuery<MC>} - The scoped join query.
    */
   buildJoinScopeQuery(targetModelClass, joinPath) {
-    const scopedQuery = /**
-                         * Narrows the runtime value to the documented type.
-                         * @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (targetModelClass._newQuery())
+    const scopedQuery = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (targetModelClass._newQuery())
 
     scopedQuery._joinTracker = this._joinTracker
     scopedQuery._joinBasePath = joinPath
@@ -817,9 +795,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
 
     conditions[this.getModelClass().primaryKey()] = recordId
 
-    const newQuery = /**
-                      * Narrows the runtime value to the documented type.
-                      * @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
+    const newQuery = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
 
     newQuery.where(conditions)
 
@@ -838,9 +814,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
    * @returns {Promise<InstanceType<MC> | null>} - Resolves with the by.
    */
   async findBy(conditions) {
-    const newQuery = /**
-                      * Narrows the runtime value to the documented type.
-                      * @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
+    const newQuery = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
 
     newQuery.where(conditions)
 
@@ -890,9 +864,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     if (record) return record
 
     const ModelClass = this.getModelClass()
-    const newRecord = /**
-                       * Narrows the runtime value to the documented type.
-                       * @type {InstanceType<MC>} */ (new ModelClass(conditions))
+    const newRecord = /** @type {InstanceType<MC>} */ (new ModelClass(conditions))
 
     if (callback) {
       callback(newRecord)
@@ -945,9 +917,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
 
     for (const result of results) {
       const ModelClass = this.getModelClass()
-      const model = /**
-                     * Narrows the runtime value to the documented type.
-                     * @type {InstanceType<MC>} */ (new ModelClass())
+      const model = /** @type {InstanceType<MC>} */ (new ModelClass())
 
       model.loadExistingRecord(result)
       models.push(model)
@@ -1013,9 +983,7 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
     const attributeMap = modelClass.getAttributeNameToColumnNameMap()
     const columnNames = flatColumns.map((column) => attributeMap[column] || column)
 
-    const query = /**
-                   * Narrows the runtime value to the documented type.
-                   * @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
+    const query = /** @type {VelociousDatabaseQueryModelClassQuery<MC>} */ (this.clone())
 
     query._preload = {}
     query._selects = []
@@ -1030,15 +998,11 @@ export default class VelociousDatabaseQueryModelClassQuery extends DatabaseQuery
 
     if (columnNames.length === 1) {
       const [columnName] = columnNames
-      return rows.map((row) => /**
-                                * Narrows the runtime value to the documented type.
-                                * @type {Record<string, ?>} */ (row)[columnName])
+      return rows.map((row) => /** @type {Record<string, ?>} */ (row)[columnName])
     }
 
     return rows.map((row) => {
-      const rowHash = /**
-                       * Narrows the runtime value to the documented type.
-                       * @type {Record<string, ?>} */ (row)
+      const rowHash = /** @type {Record<string, ?>} */ (row)
 
       return columnNames.map((columnName) => rowHash[columnName])
     })
@@ -1496,9 +1460,7 @@ function normalizeRelationshipWhereOperator(operator) {
   }
 
   return /** @type {"eq" | "notEq" | "gt" | "gteq" | "lt" | "lteq" | "like"} */ (
-    operatorAliases[/**
-                     * Narrows the runtime value to the documented type.
-                     * @type {"<" | "<=" | ">" | ">="} */ (operator)] || operator
+    operatorAliases[/** @type {"<" | "<=" | ">" | ">="} */ (operator)] || operator
   )
 }
 
@@ -1537,9 +1499,7 @@ function normalizeRelationshipWhereOperatorTuples(value) {
      */
     const addCondition = (conditionValue) => {
       if (isRelationshipWhereOperatorTuple(conditionValue)) {
-        const tuple = /**
-                       * Narrows the runtime value to the documented type.
-                       * @type {[string, "eq" | "notEq" | "gt" | "gteq" | "lt" | "lteq" | "like" | ">" | ">=" | "<" | "<=", unknown, ...Array<unknown>]} */ (conditionValue)
+        const tuple = /** @type {[string, "eq" | "notEq" | "gt" | "gteq" | "lt" | "lteq" | "like" | ">" | ">=" | "<" | "<=", unknown, ...Array<unknown>]} */ (conditionValue)
         const normalizedOperator = normalizeRelationshipWhereOperator(tuple[1])
 
         normalized.push([
@@ -1561,9 +1521,7 @@ function normalizeRelationshipWhereOperatorTuples(value) {
       throw new Error("Relationship where conditions must be tuples")
     }
 
-    /**
-     * Narrows the runtime value to the documented type.
-     * @type {Array<?>} */ (conditionValue).forEach((nestedConditionValue) => {
+    /** @type {Array<?>} */ (conditionValue).forEach((nestedConditionValue) => {
       addCondition(nestedConditionValue)
     })
   }

package/src/database/query/preloader/belongs-to.js

@@ -46,9 +46,7 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
       const instanceRelationship = model.getRelationshipByName(relationshipName)
 
       if (this.selection.isSatisfied({instanceRelationship, targetModelClass, mappingColumns: [primaryKey]})) {
-        const loaded = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {import("../../record/index.js").default | undefined} */ (instanceRelationship.getLoadedOrUndefined())
+        const loaded = /** @type {import("../../record/index.js").default | undefined} */ (instanceRelationship.getLoadedOrUndefined())
 
         if (loaded) satisfiedTargets.push(loaded)
       } else {
@@ -64,9 +62,7 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
     const foreignKeyValues = []
 
     for (const model of modelsToLoad) {
-      const foreignKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number | null | undefined} */ (model.readColumn(foreignKey))
+      const foreignKeyValue = /** @type {string | number | null | undefined} */ (model.readColumn(foreignKey))
 
       // Skip null/undefined foreign keys: a belongsTo with no foreign key has no
       // target, and including them would serialize to e.g. `IN (null)` which
@@ -106,9 +102,7 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
       targetModels = await query.toArray()
 
       for (const targetModel of targetModels) {
-        const primaryKeyValue = /**
-                                 * Narrows the runtime value to the documented type.
-                                 * @type {string | number} */ (targetModel.readColumn(primaryKey))
+        const primaryKeyValue = /** @type {string | number} */ (targetModel.readColumn(primaryKey))
 
         targetModelsById[primaryKeyValue] = targetModel
       }
@@ -116,9 +110,7 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
 
     // Set the target preloaded models on the given models
     for (const model of modelsToLoad) {
-      const foreignKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number} */ (model.readColumn(foreignKey))
+      const foreignKeyValue = /** @type {string | number} */ (model.readColumn(foreignKey))
       const targetModel = targetModelsById[foreignKeyValue]
       const modelRelationship = model.getRelationshipByName(relationshipName)
 
@@ -158,23 +150,17 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
     const targetModelsByClassName = {}
 
     for (const model of this.models) {
-      const targetType = /**
-                          * Narrows the runtime value to the documented type.
-                          * @type {string | undefined} */ (model.readColumn(typeColumn))
+      const targetType = /** @type {string | undefined} */ (model.readColumn(typeColumn))
       const instanceRelationship = model.getRelationshipByName(relationshipName)
       const targetModelClass = targetType ? configuration.getModelClass(targetType) : undefined
 
       if (targetModelClass && this.selection.isSatisfied({instanceRelationship, targetModelClass, mappingColumns: [primaryKey]})) {
-        const loaded = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {import("../../record/index.js").default | undefined} */ (instanceRelationship.getLoadedOrUndefined())
+        const loaded = /** @type {import("../../record/index.js").default | undefined} */ (instanceRelationship.getLoadedOrUndefined())
 
         if (loaded) {
           satisfiedTargets.push(loaded)
 
-          const className = /**
-                             * Narrows the runtime value to the documented type.
-                             * @type {typeof import("../../record/index.js").default} */ (loaded.constructor).getModelName()
+          const className = /** @type {typeof import("../../record/index.js").default} */ (loaded.constructor).getModelName()
 
           if (!targetModelsByClassName[className]) targetModelsByClassName[className] = []
           targetModelsByClassName[className].push(loaded)
@@ -184,9 +170,7 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
       }
 
       modelMeta.push({
-        foreignKeyValue: /**
-                          * Narrows the runtime value to the documented type.
-                          * @type {string | number | undefined} */ (model.readColumn(foreignKey)),
+        foreignKeyValue: /** @type {string | number | undefined} */ (model.readColumn(foreignKey)),
         model,
         targetType
       })
@@ -244,9 +228,7 @@ export default class VelociousDatabaseQueryPreloaderBelongsTo {
       targetModelsByTypeAndId[targetType] = {}
 
       for (const targetModel of foundTargetModels) {
-        const primaryKeyValue = /**
-                                 * Narrows the runtime value to the documented type.
-                                 * @type {string | number} */ (targetModel.readColumn(primaryKey))
+        const primaryKeyValue = /** @type {string | number} */ (targetModel.readColumn(primaryKey))
 
         targetModelsByTypeAndId[targetType][primaryKeyValue] = targetModel
       }

package/src/database/query/preloader/has-many.js

@@ -105,9 +105,7 @@ export default class VelociousDatabaseQueryPreloaderHasMany {
       throw new Error(`${this.relationship.getModelClass().name}#${this.relationship.getRelationshipName()} doesn't have a primary key`)
     }
 
-    const throughRelationshipName = /**
-                                     * Narrows the runtime value to the documented type.
-                                     * @type {string} */ (this.relationship.through)
+    const throughRelationshipName = /** @type {string} */ (this.relationship.through)
     const parentModelClass = this.relationship.getModelClass()
     const throughRelationship = parentModelClass.getRelationshipByName(throughRelationshipName)
     const throughModelClass = throughRelationship.getTargetModelClass()
@@ -146,9 +144,7 @@ export default class VelociousDatabaseQueryPreloaderHasMany {
     const preloadCollections = {}
 
     for (const model of modelsToLoad) {
-      const primaryKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number} */ (model.readColumn(primaryKey))
+      const primaryKeyValue = /** @type {string | number} */ (model.readColumn(primaryKey))
 
       preloadCollections[primaryKeyValue] = []
 
@@ -174,12 +170,8 @@ export default class VelociousDatabaseQueryPreloaderHasMany {
     const allTargetIds = new Set()
 
     for (const throughModel of throughModels) {
-      const parentId = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {string | number} */ (throughModel.readColumn(throughForeignKey))
-      const throughId = /**
-                         * Narrows the runtime value to the documented type.
-                         * @type {string | number} */ (throughModel.readColumn(throughModelClass.primaryKey()))
+      const parentId = /** @type {string | number} */ (throughModel.readColumn(throughForeignKey))
+      const throughId = /** @type {string | number} */ (throughModel.readColumn(throughModelClass.primaryKey()))
 
       if (!(parentId in parentToTargetIds)) parentToTargetIds[parentId] = []
 
@@ -208,9 +200,7 @@ export default class VelociousDatabaseQueryPreloaderHasMany {
     const targetModelsByForeignKey = {}
 
     for (const targetModel of targetModels) {
-      const fkValue = /**
-                       * Narrows the runtime value to the documented type.
-                       * @type {string | number} */ (targetModel.readColumn(targetForeignKey))
+      const fkValue = /** @type {string | number} */ (targetModel.readColumn(targetForeignKey))
 
       if (!(fkValue in targetModelsByForeignKey)) targetModelsByForeignKey[fkValue] = []
 
@@ -284,9 +274,7 @@ export default class VelociousDatabaseQueryPreloaderHasMany {
     const preloadCollections = {}
 
     for (const model of modelsToLoad) {
-      const primaryKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number} */ (model.readColumn(primaryKey))
+      const primaryKeyValue = /** @type {string | number} */ (model.readColumn(primaryKey))
 
       preloadCollections[primaryKeyValue] = []
 
@@ -319,9 +307,7 @@ export default class VelociousDatabaseQueryPreloaderHasMany {
     const targetModels = await query.toArray()
 
     for (const targetModel of targetModels) {
-      const foreignKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number} */ (targetModel.readColumn(foreignKey))
+      const foreignKeyValue = /** @type {string | number} */ (targetModel.readColumn(foreignKey))
 
       preloadCollections[foreignKeyValue].push(targetModel)
     }

package/src/database/query/preloader/has-one.js

@@ -53,17 +53,13 @@ export default class VelociousDatabaseQueryPreloaderHasOne {
       const instanceRelationship = model.getRelationshipByName(relationshipName)
 
       if (this.selection.isSatisfied({instanceRelationship, targetModelClass, mappingColumns: [foreignKey]})) {
-        const loaded = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {import("../../record/index.js").default | undefined} */ (instanceRelationship.getLoadedOrUndefined())
+        const loaded = /** @type {import("../../record/index.js").default | undefined} */ (instanceRelationship.getLoadedOrUndefined())
 
         if (loaded) satisfiedTargets.push(loaded)
         continue
       }
 
-      const primaryKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number} */ (model.readColumn(primaryKey))
+      const primaryKeyValue = /** @type {string | number} */ (model.readColumn(primaryKey))
 
       preloadCollections[primaryKeyValue] = undefined
 
@@ -99,9 +95,7 @@ export default class VelociousDatabaseQueryPreloaderHasOne {
     const targetModels = await query.toArray()
 
     for (const targetModel of targetModels) {
-      const foreignKeyValue = /**
-                               * Narrows the runtime value to the documented type.
-                               * @type {string | number} */ (targetModel.readColumn(foreignKey))
+      const foreignKeyValue = /** @type {string | number} */ (targetModel.readColumn(foreignKey))
 
       preloadCollections[foreignKeyValue] = targetModel
     }

package/src/database/query/preloader.js

@@ -88,19 +88,13 @@ export default class VelociousDatabaseQueryPreloader {
   static async preload(models, queryOrSpec, {force = false} = {}) {
     if (models.length == 0) return
 
-    const modelClass = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {typeof import("../record/index.js").default} */ (models[0].constructor)
+    const modelClass = /** @type {typeof import("../record/index.js").default} */ (models[0].constructor)
     const isQuery = Boolean(queryOrSpec) && typeof queryOrSpec == "object" && "_preload" in queryOrSpec
     // Reuse the query builder's preload/select normalization for raw specs
     // instead of duplicating it here.
     const query = isQuery
-      ? /**
-         * Narrows the runtime value to the documented type.
-         * @type {import("./model-class-query.js").default} */ (queryOrSpec)
-      : modelClass.preload(/**
-                            * Narrows the runtime value to the documented type.
-                            * @type {?} */ (queryOrSpec))
+      ? /** @type {import("./model-class-query.js").default} */ (queryOrSpec)
+      : modelClass.preload(/** @type {?} */ (queryOrSpec))
 
     const preloader = new VelociousDatabaseQueryPreloader({
       modelClass,
@@ -141,23 +135,17 @@ export default class VelociousDatabaseQueryPreloader {
       let preloadResult
 
       if (relationship.getType() == "belongsTo") {
-        const belongsToRelationship = /**
-                                       * Narrows the runtime value to the documented type.
-                                       * @type {import("../record/relationships/belongs-to.js").default} */ (relationship)
+        const belongsToRelationship = /** @type {import("../record/relationships/belongs-to.js").default} */ (relationship)
         const hasManyPreloader = new BelongsToPreloader({models: this.models, relationship: belongsToRelationship, selection: this.selection})
 
         preloadResult = await hasManyPreloader.run()
       } else if (relationship.getType() == "hasMany") {
-        const hasManyRelationship = /**
-                                     * Narrows the runtime value to the documented type.
-                                     * @type {import("../record/relationships/has-many.js").default} */ (relationship)
+        const hasManyRelationship = /** @type {import("../record/relationships/has-many.js").default} */ (relationship)
         const hasManyPreloader = new HasManyPreloader({models: this.models, relationship: hasManyRelationship, selection: this.selection})
 
         preloadResult = await hasManyPreloader.run()
       } else if (relationship.getType() == "hasOne") {
-        const hasOneRelationship = /**
-                                    * Narrows the runtime value to the documented type.
-                                    * @type {import("../record/relationships/has-one.js").default} */ (relationship)
+        const hasOneRelationship = /** @type {import("../record/relationships/has-one.js").default} */ (relationship)
         const hasOnePreloader = new HasOnePreloader({models: this.models, relationship: hasOneRelationship, selection: this.selection})
 
         preloadResult = await hasOnePreloader.run()

package/src/database/query/query-data.js

@@ -69,9 +69,7 @@ export function normalizeQueryDataSpec(spec, chain = []) {
       }
 
       if (isPlainObject(item)) {
-        for (const nested of normalizeQueryDataSpec(/**
-                                                     * Narrows the runtime value to the documented type.
-                                                     * @type {?} */ (item), chain)) {
+        for (const nested of normalizeQueryDataSpec(/** @type {?} */ (item), chain)) {
           entries.push(nested)
         }
         continue
@@ -98,9 +96,7 @@ export function normalizeQueryDataSpec(spec, chain = []) {
       if (value === false) continue
 
       if (typeof value === "string" || Array.isArray(value) || isPlainObject(value)) {
-        for (const nested of normalizeQueryDataSpec(/**
-                                                     * Narrows the runtime value to the documented type.
-                                                     * @type {?} */ (value), [...chain, key])) {
+        for (const nested of normalizeQueryDataSpec(/** @type {?} */ (value), [...chain, key])) {
           entries.push(nested)
         }
         continue
@@ -193,9 +189,7 @@ export async function runQueryData({rootModelClass, rootModels, entries}) {
   if (rootModels.length === 0 || entries.length === 0) return
 
   const primaryKey = rootModelClass.primaryKey()
-  const rootIds = rootModels.map((model) => /**
-                                             * Narrows the runtime value to the documented type.
-                                             * @type {string | number} */ (model.readColumn(primaryKey)))
+  const rootIds = rootModels.map((model) => /** @type {string | number} */ (model.readColumn(primaryKey)))
 
   for (const entry of entries) {
     await runEntry({entry, primaryKey, rootIds, rootModelClass, rootModels})
@@ -270,9 +264,7 @@ async function runEntry({entry, primaryKey, rootIds, rootModelClass, rootModels}
     tableName: targetTableRef
   })
 
-  const rows = /**
-                * Narrows the runtime value to the documented type.
-                * @type {Array<Record<string, ?>>} */ (await query._executeQuery())
+  const rows = /** @type {Array<Record<string, ?>>} */ (await query._executeQuery())
   const byParent = new Map()
 
   for (const row of rows) {
@@ -284,9 +276,7 @@ async function runEntry({entry, primaryKey, rootIds, rootModelClass, rootModels}
   }
 
   for (const model of rootModels) {
-    const modelId = /**
-                     * Narrows the runtime value to the documented type.
-                     * @type {string | number} */ (model.readColumn(primaryKey))
+    const modelId = /** @type {string | number} */ (model.readColumn(primaryKey))
     // Driver-type tolerance: MySQL can return PKs as strings even when
     // the column is numeric. Fall back to a string lookup so results
     // still land on the right model.

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

@@ -26,9 +26,7 @@ function normalizeRelationshipWhereOperator(operator) {
   }
 
   return /** @type {"eq" | "notEq" | "gt" | "gteq" | "lt" | "lteq" | "like"} */ (
-    operatorAliases[/**
-                     * Narrows the runtime value to the documented type.
-                     * @type {"<" | "<=" | ">" | ">="} */ (operator)] || operator
+    operatorAliases[/** @type {"<" | "<=" | ">" | ">="} */ (operator)] || operator
   )
 }
 
@@ -66,9 +64,7 @@ export default class VelociousDatabaseQueryWhereModelClassHash extends WhereBase
   toSql() {
     let sql = "("
 
-    const modelQuery = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {import("./model-class-query.js").default} */ (this.query)
+    const modelQuery = /** @type {import("./model-class-query.js").default} */ (this.query)
     const baseTableName = this.qualifyBaseTable
       ? modelQuery.getTableReferenceForJoin()
       : undefined
@@ -144,9 +140,7 @@ export default class VelociousDatabaseQueryWhereModelClassHash extends WhereBase
      */
     const addCondition = (conditionValue) => {
       if (this._isRelationshipWhereOperatorTuple(conditionValue)) {
-        const tuple = /**
-                       * Narrows the runtime value to the documented type.
-                       * @type {[string, "eq" | "notEq" | "gt" | "gteq" | "lt" | "lteq" | "like" | ">" | ">=" | "<" | "<=", unknown, ...Array<unknown>]} */ (conditionValue)
+        const tuple = /** @type {[string, "eq" | "notEq" | "gt" | "gteq" | "lt" | "lteq" | "like" | ">" | ">=" | "<" | "<=", unknown, ...Array<unknown>]} */ (conditionValue)
         const normalizedOperator = normalizeRelationshipWhereOperator(tuple[1])
 
         normalized.push([
@@ -393,9 +387,7 @@ export default class VelociousDatabaseQueryWhereModelClassHash extends WhereBase
    */
   _whereSQLFromHash(hash, modelClass, path, tableName, index = 0) {
     const options = this.getOptions()
-    const modelQuery = /**
-                        * Narrows the runtime value to the documented type.
-                        * @type {import("./model-class-query.js").default} */ (this.query)
+    const modelQuery = /** @type {import("./model-class-query.js").default} */ (this.query)
     let sql = ""
 
     for (const whereKey in hash) {
@@ -441,9 +433,7 @@ export default class VelociousDatabaseQueryWhereModelClassHash extends WhereBase
 
         if (!targetModelClass) throw new Error(`Relationship "${whereKey}" for ${modelClass.name} has no target model class`)
 
-        const nestedHash = /**
-                            * Narrows the runtime value to the documented type.
-                            * @type {WhereHash} */ (whereValue)
+        const nestedHash = /** @type {WhereHash} */ (whereValue)
         const nestedPath = path.concat([whereKey])
         const nestedTableName = modelQuery.getTableReferenceForJoin(...nestedPath)
 

package/src/database/query/with-count.js

@@ -110,24 +110,18 @@ export async function runWithCount({models, modelClass, entries}) {
   if (models.length === 0 || entries.length === 0) return
 
   const primaryKey = modelClass.primaryKey()
-  const parentIds = models.map((model) => /**
-                                           * Narrows the runtime value to the documented type.
-                                           * @type {string | number} */ (model.readColumn(primaryKey)))
+  const parentIds = models.map((model) => /** @type {string | number} */ (model.readColumn(primaryKey)))
 
   for (const entry of entries) {
     const counts = await countForEntry({entries, entry, modelClass, parentIds})
 
     for (const model of models) {
-      const modelPrimaryKeyValue = /**
-                                    * Narrows the runtime value to the documented type.
-                                    * @type {string | number} */ (model.readColumn(primaryKey))
+      const modelPrimaryKeyValue = /** @type {string | number} */ (model.readColumn(primaryKey))
       // Tolerate driver differences in numeric return types: SQLite
       // returns integers as JS numbers, but MySQL's raw driver can
       // return count primary keys as strings. Try both.
       const resolvedCount = counts.has(modelPrimaryKeyValue)
-        ? /**
-           * Narrows the runtime value to the documented type.
-           * @type {number} */ (counts.get(modelPrimaryKeyValue))
+        ? /** @type {number} */ (counts.get(modelPrimaryKeyValue))
         : Number(counts.get(String(modelPrimaryKeyValue)) ?? 0)
 
       // Counts go on the record's dedicated association-count map,
@@ -196,9 +190,7 @@ async function countForEntry({entries, entry, modelClass, parentIds}) {
   countQuery.select(`${quotedTable}.${quotedFk} AS parent_id`)
   countQuery.select("COUNT(*) AS count_value")
 
-  const rows = /**
-                * Narrows the runtime value to the documented type.
-                * @type {Array<{parent_id: string | number, count_value: string | number}>} */ (
+  const rows = /** @type {Array<{parent_id: string | number, count_value: string | number}>} */ (
     await countQuery._executeQuery()
   )
 
@@ -208,9 +200,7 @@ async function countForEntry({entries, entry, modelClass, parentIds}) {
   const counts = new Map()
 
   for (const row of rows) {
-    const parentId = /**
-                      * Narrows the runtime value to the documented type.
-                      * @type {string | number} */ (row.parent_id)
+    const parentId = /** @type {string | number} */ (row.parent_id)
     const countValue = Number(row.count_value) || 0
     counts.set(parentId, countValue)
   }