json-rest-api 1.0.23 → 1.0.25

package/plugins/core/lib/anyapi/anyapi-registry.js

@@ -9,6 +9,21 @@ const clone = (value) => {
 
 const SUPPORTED_TYPES = new Set([...TYPE_TO_POOL.keys(), 'id'])
 
+const resolveIdProperty = (schema = {}, explicitIdProperty = null) => {
+  if (explicitIdProperty) return explicitIdProperty
+  if (schema.id) return 'id'
+
+  const idFields = Object.entries(schema)
+    .filter(([, fieldDef]) => (
+      fieldDef?.type === 'id' &&
+      !fieldDef.belongsTo &&
+      !fieldDef.belongsToPolymorphic
+    ))
+    .map(([fieldName]) => fieldName)
+
+  return idFields.length === 1 ? idFields[0] : 'id'
+}
+
 const BELONGS_TO_ALIAS = (fieldName, fieldDef) => {
   if (fieldDef.as) return fieldDef.as
   if (fieldName.endsWith('_id')) {
@@ -305,6 +320,7 @@ export class AnyapiRegistry {
 
   async #register (definition, externalTrx) {
     const { tenant, resource, schema, relationships = {}, canonicalFieldMap = null } = definition
+    const idProperty = resolveIdProperty(schema, definition.idProperty)
     const trx = externalTrx || await this.knex.transaction()
     const managed = !externalTrx
 
@@ -520,7 +536,7 @@ export class AnyapiRegistry {
         await trx('any_relationship_configs').insert(relationshipInserts)
       }
 
-      const descriptor = await this.#loadDescriptor(tenant, resource, trx)
+      const descriptor = await this.#loadDescriptor(tenant, resource, trx, { idProperty })
 
       if (managed) {
         await trx.commit()
@@ -535,7 +551,7 @@ export class AnyapiRegistry {
     }
   }
 
-  async #loadDescriptor (tenant, resource, trx) {
+  async #loadDescriptor (tenant, resource, trx, options = {}) {
     const query = (trx || this.knex)('any_resource_configs')
       .where({ tenant_id: tenant, resource })
       .first()
@@ -568,6 +584,7 @@ export class AnyapiRegistry {
       slotState,
       fieldRows,
       relationshipRows,
+      idProperty: options.idProperty,
     })
 
     const canonicalFieldMap = {}
@@ -589,7 +606,7 @@ export class AnyapiRegistry {
     return descriptor
   }
 
-  #buildDescriptor ({ tenant, resource, schema, relationships, slotState, fieldRows, relationshipRows }) {
+  #buildDescriptor ({ tenant, resource, schema, relationships, slotState, fieldRows, relationshipRows, idProperty }) {
     const fields = {}
     const reverseAttributes = {}
     const belongsTo = {}
@@ -671,6 +688,7 @@ export class AnyapiRegistry {
     return {
       tenant,
       resource,
+      idProperty: resolveIdProperty(schema, idProperty),
       schema,
       relationships,
       canonical: DEFAULT_CANONICAL_CONFIG,

package/plugins/core/lib/anyapi/schema-utils.js

@@ -18,6 +18,7 @@ export const DEFAULT_CANONICAL_CONFIG = {
   scopeName: 'anyapi_records',
   tableName: 'any_records',
   type: 'anyapi_records',
+  logicalIdColumn: 'logical_id',
   tenantColumn: 'tenant_id',
   resourceColumn: 'resource',
   relationshipColumn: 'relationship',
@@ -34,20 +35,37 @@ const ensureTable = async (knex, tableName, tableBuilder) => {
   }
 }
 
-const ensureIndex = async (knex, tableName, columns, indexName) => {
+const ensureColumn = async (knex, tableName, columnName, columnBuilder) => {
+  const exists = await knex.schema.hasTable(tableName)
+  if (!exists) return
+
+  const hasColumn = await knex.schema.hasColumn(tableName, columnName)
+  if (!hasColumn) {
+    await knex.schema.table(tableName, columnBuilder)
+  }
+}
+
+const ensureUniqueIndex = async (knex, tableName, columns, indexName) => {
   const exists = await knex.schema.hasTable(tableName)
   if (!exists) return
   const hasIndex = await knex.schema.withSchema('main').hasIndex?.(tableName, indexName)
   if (!hasIndex) {
-    await knex.schema.table(tableName, (table) => {
-      table.index(columns, indexName)
-    })
+    try {
+      await knex.schema.table(tableName, (table) => {
+        table.unique(columns, indexName)
+      })
+    } catch (error) {
+      if (!String(error?.message || '').includes('already exists')) {
+        throw error
+      }
+    }
   }
 }
 
 export const ensureAnyApiSchema = async (knex) => {
   await ensureTable(knex, 'any_records', (table) => {
     table.increments('id').primary()
+    table.string('logical_id')
     table.string('tenant_id').notNullable()
     table.string('resource').notNullable()
 
@@ -77,9 +95,30 @@ export const ensureAnyApiSchema = async (knex) => {
     table.dateTime('deleted_at')
 
     table.index(['tenant_id', 'resource'])
+    table.unique(['tenant_id', 'resource', 'logical_id'], 'any_records_tenant_resource_logical_id_unique')
     table.index(['resource'])
   })
 
+  await ensureColumn(knex, 'any_records', 'logical_id', (table) => {
+    table.string('logical_id')
+  })
+  await ensureUniqueIndex(
+    knex,
+    'any_records',
+    ['tenant_id', 'resource', 'logical_id'],
+    'any_records_tenant_resource_logical_id_unique'
+  )
+
+  const rowsMissingLogicalId = await knex('any_records')
+    .select('id')
+    .whereNull('logical_id')
+
+  for (const row of rowsMissingLogicalId) {
+    await knex('any_records')
+      .where({ id: row.id })
+      .update({ logical_id: String(row.id) })
+  }
+
   await ensureTable(knex, 'any_links', (table) => {
     table.increments('id').primary()
     table.string('tenant_id').notNullable()
@@ -171,6 +210,7 @@ export const TYPE_TO_POOL = new Map([
   ['text', 'string'],
   ['uuid', 'string'],
   ['email', 'string'],
+  ['file', 'string'],
   ['number', 'number'],
   ['integer', 'number'],
   ['float', 'number'],

package/plugins/core/lib/anyapi/utils/descriptor-helpers.js

@@ -1,4 +1,5 @@
 import { RestApiValidationError } from '../../../../../lib/rest-api-errors.js'
+import { normalizeDateValue } from '../../querying-writing/database-value-normalizers.js'
 
 export const normalizeId = (value) => (value === null || value === undefined ? null : String(value))
 
@@ -21,8 +22,12 @@ export const findSchemaFieldByAlias = (descriptor, alias) => {
 
 export const resolveFieldInfo = (descriptor, field) => {
   if (!descriptor) return null
-  if (field === 'id') {
-    return { column: 'id', definition: { type: 'id' } }
+  const idProperty = descriptor.idProperty || 'id'
+  if (field === 'id' || field === idProperty) {
+    return {
+      column: descriptor?.canonical?.logicalIdColumn || 'logical_id',
+      definition: { type: 'id' }
+    }
   }
 
   const directField = descriptor.fields?.[field]
@@ -87,6 +92,10 @@ export const coerceValueForDefinition = (value, definition, { isRelationship } =
     return String(value)
   }
 
+  if (['date', 'dateTime', 'time'].includes(type)) {
+    return normalizeDateValue(value, type)
+  }
+
   return value
 }
 

package/plugins/core/lib/dbIntrospection.js

@@ -763,7 +763,7 @@ function deriveSqliteColumnNumbers (dataType, args = '') {
 async function introspectSqliteTableSnapshot (knex, { tableName, idColumn }) {
   const quotedTableName = quoteSqliteIdentifier(tableName)
   const tableRows = normalizeRows(await knex.raw(
-    `SELECT name, sql FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1`,
+    'SELECT name, sql FROM sqlite_master WHERE type = \'table\' AND name = ? LIMIT 1',
     [tableName]
   ))
   const firstTableRow = Array.isArray(tableRows) ? tableRows[0] : null

package/plugins/core/lib/dbTablesOperations.js

@@ -103,13 +103,14 @@ function buildSetColumnType (values = []) {
   return `set(${normalized.map((value) => quoteJsString(value)).join(', ')})`
 }
 
-function createTableBuilderContext (schemaStructure = {}, idColumn = 'id') {
+function createTableBuilderContext (schemaStructure = {}, idColumn = 'id', storage = undefined) {
   return {
     schemaStructure,
     idProperty: idColumn,
     storageInfo: buildStorageInfo({
       schemaStructure,
-      idProperty: idColumn
+      idProperty: idColumn,
+      storage
     })
   }
 }
@@ -400,7 +401,8 @@ function buildImplicitIdDefinition (idColumn) {
 function resolveTableSchemaContext (schemaLike, options = {}) {
   const schemaStructure = schemaLike?.structure || schemaLike || {}
   const configuredIdColumn = options.idProperty || schemaStructure.id?.storage?.column || 'id'
-  const tableContext = createTableBuilderContext(schemaStructure, configuredIdColumn)
+  const storage = options.storage ?? schemaLike?.storage
+  const tableContext = createTableBuilderContext(schemaStructure, configuredIdColumn, storage)
 
   let resourceIdField = null
   for (const [fieldName, definition] of Object.entries(schemaStructure)) {
@@ -888,6 +890,7 @@ export async function createKnexTable (knex, schemaInfo, tableSchemaInstance, op
   const dialect = detectKnexDialect(knex)
   const tableSchemaContext = resolveTableSchemaContext(tableSchemaInstance, {
     idProperty: schemaInfo.idProperty,
+    storage: schemaInfo.storage,
     tableName
   })
 
@@ -918,6 +921,7 @@ export async function addKnexFields (knex, tableName, schema, options = {}) {
   assertNoTopLevelTableMetadata(schema, 'addKnexFields')
   const dialect = detectKnexDialect(knex)
   const tableSchemaContext = resolveTableSchemaContext(schema, {
+    storage: options.storage,
     ...options,
     tableName
   })
@@ -936,6 +940,7 @@ export async function alterKnexFields (knex, tableName, fields, options = {}) {
   assertNoTopLevelTableMetadata(fields, 'alterKnexFields')
   const dialect = detectKnexDialect(knex)
   const tableSchemaContext = resolveTableSchemaContext(fields, {
+    storage: options.storage,
     ...options,
     tableName
   })
@@ -961,6 +966,7 @@ export function generateKnexMigration (tableName, schema, options = {}) {
   const { autoIncrement = true, timestamps = false, dialect = '' } = options
   const tableSchemaContext = resolveTableSchemaContext(schema, {
     ...options,
+    storage: options.storage,
     tableName
   })
 
@@ -1028,6 +1034,7 @@ export function generateKnexMigrationDiff (tableName, currentSnapshot, schema, o
   const resolvedDialect = normalizeText(dialect || currentSnapshot?.dialect).toLowerCase()
   const tableSchemaContext = resolveTableSchemaContext(schema, {
     ...options,
+    storage: options.storage,
     tableName
   })
   const desiredColumns = buildDesiredColumnsMap(tableSchemaContext, { autoIncrement })

package/plugins/core/lib/querying/knex-cross-table-search.js

@@ -208,7 +208,6 @@ export const buildJoinChain = async (scopes, log, fromScopeName, targetPath, sea
     let foundRelationship = null
     let relationshipType = null
     let relationshipField = null
-    let relationshipDef = null
 
     if (currentRelationships) {
       for (const [relName, relDef] of Object.entries(currentRelationships)) {
@@ -222,7 +221,6 @@ export const buildJoinChain = async (scopes, log, fromScopeName, targetPath, sea
               foundRelationship = targetScope
               relationshipType = 'hasManyPolymorphic'
               relationshipField = { typeField, idField, via: relDef.via }
-              relationshipDef = relDef
               log.trace('[BUILD-JOIN] Found polymorphic hasMany relationship:', {
                 relName, targetScope, via: relDef.via, typeField, idField
               })
@@ -238,7 +236,6 @@ export const buildJoinChain = async (scopes, log, fromScopeName, targetPath, sea
               foreignKey: relDef.foreignKey,
               otherKey: relDef.otherKey
             }
-            relationshipDef = relDef
             log.trace('[BUILD-JOIN] Found many-to-many relationship:', {
               relName,
               targetScope,
@@ -256,7 +253,6 @@ export const buildJoinChain = async (scopes, log, fromScopeName, targetPath, sea
             log.error('[BUILD-JOIN] Missing foreignKey in hasMany relationship:', { relName, currentScope })
             throw new Error(`Missing foreignKey in hasMany relationship '${relName}' for scope '${currentScope}'`)
           }
-          relationshipDef = relDef
           log.trace('[BUILD-JOIN] Found hasMany relationship:', { relName, targetScope, foreignKey: relationshipField })
           break
         }
@@ -269,7 +265,6 @@ export const buildJoinChain = async (scopes, log, fromScopeName, targetPath, sea
           foundRelationship = targetScope
           relationshipType = 'belongsTo'
           relationshipField = fieldName
-          relationshipDef = fieldDef
           log.trace('[BUILD-JOIN] Found belongsTo relationship:', { fieldName, targetScope })
           break
         }
@@ -282,9 +277,7 @@ export const buildJoinChain = async (scopes, log, fromScopeName, targetPath, sea
       )
     }
 
-    const sourceSchema = scopes[currentScope].vars.schemaInfo.schemaInstance
     const sourceTableName = scopes[currentScope].vars.schemaInfo.tableName
-    const targetSchemaInstance = scopes[targetScope].vars.schemaInfo.schemaInstance
     const targetTableName = scopes[targetScope].vars.schemaInfo.tableName
 
     if (relationshipType === 'manyToMany') {

package/plugins/core/lib/querying/knex-json-api-transformers-querying.js

@@ -350,37 +350,42 @@ export const toJsonApiRecord = (scope, record, scopeName) => {
 export const buildJsonApiResponse = async (scope, records, included = [], isSingle = false, scopeName, context) => {
   const {
     vars: {
-      schemaInfo: { schemaInstance, schemaRelationships: relationships, idProperty }
+      schemaInfo
     }
   } = scope
 
-  const idField = idProperty || 'id'
+  const {
+    schemaInstance,
+    schemaRelationships: relationships
+  } = schemaInfo
 
   const schemaStructure = getSchemaStructure(schemaInstance)
 
   const processedRecords = records.map(record => {
     const { [RELATIONSHIPS_KEY]: _relationships, ...cleanRecord } = record
+    const logicalRecord = translateRecordFromStorage(cleanRecord, schemaInfo)
     const jsonApiRecord = toJsonApiRecord(scope, cleanRecord, scopeName)
+    const resourceId = jsonApiRecord.id
 
     if (_relationships) {
       jsonApiRecord.relationships = _relationships
     }
 
     for (const [fieldName, fieldDef] of Object.entries(schemaStructure)) {
-      if (fieldDef.belongsTo && fieldDef.as && fieldName in cleanRecord) {
+      if (fieldDef.belongsTo && fieldDef.as && fieldName in logicalRecord) {
         jsonApiRecord.relationships = jsonApiRecord.relationships || {}
         if (!jsonApiRecord.relationships[fieldDef.as]) {
-          if (cleanRecord[fieldName] !== null && cleanRecord[fieldName] !== undefined) {
+          if (logicalRecord[fieldName] !== null && logicalRecord[fieldName] !== undefined) {
             const relationshipObject = {
               data: {
                 type: fieldDef.belongsTo,
-                id: String(cleanRecord[fieldName])
+                id: String(logicalRecord[fieldName])
               }
             }
 
             relationshipObject.links = {
-              self: buildRelationshipUrl(context, scope, scopeName, record[idField], fieldDef.as, true),
-              related: buildRelationshipUrl(context, scope, scopeName, record[idField], fieldDef.as, false)
+              self: buildRelationshipUrl(context, scope, scopeName, resourceId, fieldDef.as, true),
+              related: buildRelationshipUrl(context, scope, scopeName, resourceId, fieldDef.as, false)
             }
 
             jsonApiRecord.relationships[fieldDef.as] = relationshipObject
@@ -390,8 +395,8 @@ export const buildJsonApiResponse = async (scope, records, included = [], isSing
             }
 
             relationshipObject.links = {
-              self: buildRelationshipUrl(context, scope, scopeName, record[idField], fieldDef.as, true),
-              related: buildRelationshipUrl(context, scope, scopeName, record[idField], fieldDef.as, false)
+              self: buildRelationshipUrl(context, scope, scopeName, resourceId, fieldDef.as, true),
+              related: buildRelationshipUrl(context, scope, scopeName, resourceId, fieldDef.as, false)
             }
 
             jsonApiRecord.relationships[fieldDef.as] = relationshipObject
@@ -402,8 +407,8 @@ export const buildJsonApiResponse = async (scope, records, included = [], isSing
 
     Object.entries(relationships || {}).forEach(([relName, relDef]) => {
       if (relDef.belongsToPolymorphic) {
-        const typeValue = cleanRecord[relDef.belongsToPolymorphic.typeField]
-        const idValue = cleanRecord[relDef.belongsToPolymorphic.idField]
+        const typeValue = logicalRecord[relDef.belongsToPolymorphic.typeField]
+        const idValue = logicalRecord[relDef.belongsToPolymorphic.idField]
 
         if (typeValue && idValue) {
           jsonApiRecord.relationships = jsonApiRecord.relationships || {}
@@ -415,8 +420,8 @@ export const buildJsonApiResponse = async (scope, records, included = [], isSing
           }
 
           relationshipObject.links = {
-            self: buildRelationshipUrl(context, scope, scopeName, record[idField], relName, true),
-            related: buildRelationshipUrl(context, scope, scopeName, record[idField], relName, false)
+            self: buildRelationshipUrl(context, scope, scopeName, resourceId, relName, true),
+            related: buildRelationshipUrl(context, scope, scopeName, resourceId, relName, false)
           }
 
           jsonApiRecord.relationships[relName] = relationshipObject
@@ -427,8 +432,8 @@ export const buildJsonApiResponse = async (scope, records, included = [], isSing
           }
 
           relationshipObject.links = {
-            self: buildRelationshipUrl(context, scope, scopeName, record[idField], relName, true),
-            related: buildRelationshipUrl(context, scope, scopeName, record[idField], relName, false)
+            self: buildRelationshipUrl(context, scope, scopeName, resourceId, relName, true),
+            related: buildRelationshipUrl(context, scope, scopeName, resourceId, relName, false)
           }
 
           jsonApiRecord.relationships[relName] = relationshipObject
@@ -439,7 +444,6 @@ export const buildJsonApiResponse = async (scope, records, included = [], isSing
     return jsonApiRecord
   })
 
-  const urlPrefix = context.urlPrefix || scope.vars.transport?.mountPath || ''
   const normalizedData = isSingle ? processedRecords[0] : processedRecords
 
   if (normalizedData) {

package/plugins/core/lib/querying/knex-pagination-helpers.js

@@ -1,3 +1,11 @@
+import { getFieldValue } from '../storage/storage-mapping.js'
+import { serializeJsonApiQuery } from '../querying-writing/connectors-query-parser.js'
+
+const buildJsonApiLink = (baseUrl, queryParams, page) => {
+  const queryString = serializeJsonApiQuery(queryParams, { page })
+  return queryString ? `${baseUrl}?${queryString}` : baseUrl
+}
+
 /**
  * Calculates pagination metadata from query results
  *
@@ -127,7 +135,7 @@ export const calculatePaginationMeta = (total, page, pageSize) => {
  * Purpose:
  * - JSON:API spec requires pagination links for easy navigation
  * - Preserves all other query parameters (filters, sorts, includes)
- * - Handles complex nested parameters like filter[author][name]=John
+ * - Uses the shared JSON:API query serializer for transport-supported params
  * - Only includes prev/next when applicable
  *
  * Data flow:
@@ -143,52 +151,20 @@ export const generatePaginationLinks = (urlPrefix, scopeName, queryParams, pagin
   const { page, pageCount, pageSize } = paginationMeta
   const links = {}
 
-  const otherParams = Object.entries(queryParams)
-    .filter(([key]) => key !== 'page')
-    .flatMap(([key, value]) => {
-      if (Array.isArray(value)) {
-        return value.length === 0
-          ? []
-          : value.map((v) => `${key}=${encodeURIComponent(v)}`)
-      }
-      if (typeof value === 'object' && value !== null) {
-        const parts = []
-        const processObject = (obj, prefix) => {
-          Object.entries(obj).forEach(([k, v]) => {
-            const newKey = prefix ? `${prefix}[${k}]` : `${key}[${k}]`
-            if (typeof v === 'object' && v !== null && !Array.isArray(v)) {
-              processObject(v, newKey)
-            } else if (v !== undefined && v !== null && !(Array.isArray(v) && v.length === 0)) {
-              parts.push(`${newKey}=${encodeURIComponent(v)}`)
-            }
-          })
-        }
-        processObject(value, key)
-        return parts
-      }
-      if (value === undefined || value === null) {
-        return []
-      }
-      return [`${key}=${encodeURIComponent(value)}`]
-    })
-    .filter(Boolean)
-    .join('&')
-
   const baseUrl = `${urlPrefix}/${scopeName}`
-  const queryPrefix = otherParams ? `?${otherParams}&` : '?'
 
-  links.self = `${baseUrl}${queryPrefix}page[number]=${page}&page[size]=${pageSize}`
+  links.self = buildJsonApiLink(baseUrl, queryParams, { number: page, size: pageSize })
 
   if (pageCount !== undefined) {
-    links.first = `${baseUrl}${queryPrefix}page[number]=1&page[size]=${pageSize}`
-    links.last = `${baseUrl}${queryPrefix}page[number]=${pageCount}&page[size]=${pageSize}`
+    links.first = buildJsonApiLink(baseUrl, queryParams, { number: 1, size: pageSize })
+    links.last = buildJsonApiLink(baseUrl, queryParams, { number: pageCount, size: pageSize })
 
     if (page > 1) {
-      links.prev = `${baseUrl}${queryPrefix}page[number]=${page - 1}&page[size]=${pageSize}`
+      links.prev = buildJsonApiLink(baseUrl, queryParams, { number: page - 1, size: pageSize })
     }
 
     if (page < pageCount) {
-      links.next = `${baseUrl}${queryPrefix}page[number]=${page + 1}&page[size]=${pageSize}`
+      links.next = buildJsonApiLink(baseUrl, queryParams, { number: page + 1, size: pageSize })
     }
   }
 
@@ -257,11 +233,13 @@ export const generatePaginationLinks = (urlPrefix, scopeName, queryParams, pagin
  * 4. Cursor used in 'next' link for fetching subsequent pages
  * 5. Enables efficient "WHERE (field1, field2) > (val1, val2)" queries
  */
-export const createCursor = (record, sortFields = ['id']) => {
+export const createCursor = (record, sortFields = ['id'], { schemaInfo = null } = {}) => {
   const parts = []
   sortFields.forEach(field => {
-    if (record[field] !== undefined) {
-      const value = record[field]
+    const value = schemaInfo
+      ? getFieldValue(record, schemaInfo, field)
+      : record[field]
+    if (value !== undefined) {
       const stringValue = value instanceof Date ? value.toISOString() : String(value)
       parts.push(`${field}:${encodeURIComponent(stringValue)}`)
     }
@@ -427,60 +405,36 @@ export const parseCursor = (cursor) => {
  * 4. Added to response.links for navigation
  * 5. Client uses next link to fetch subsequent pages
  */
-export const generateCursorPaginationLinks = (urlPrefix, scopeName, queryParams, records, pageSize, hasMore, sortFields = ['id']) => {
+export const generateCursorPaginationLinks = (
+  urlPrefix,
+  scopeName,
+  queryParams,
+  records,
+  pageSize,
+  hasMore,
+  sortFields = ['id'],
+  { schemaInfo = null } = {}
+) => {
   // Allow empty urlPrefix to generate relative links
   if (!records.length) return null
 
   const links = {}
   const baseUrl = `${urlPrefix}/${scopeName}`
-
-  const otherParams = Object.entries(queryParams)
-    .filter(([key]) => key !== 'page')
-    .flatMap(([key, value]) => {
-      if (Array.isArray(value)) {
-        return value.length === 0
-          ? []
-          : value.map((v) => `${key}=${encodeURIComponent(v)}`)
-      }
-      if (typeof value === 'object' && value !== null) {
-        const parts = []
-        const processObject = (obj, prefix) => {
-          Object.entries(obj).forEach(([k, v]) => {
-            const newKey = prefix ? `${prefix}[${k}]` : `${key}[${k}]`
-            if (typeof v === 'object' && v !== null && !Array.isArray(v)) {
-              processObject(v, newKey)
-            } else if (v !== undefined && v !== null && !(Array.isArray(v) && v.length === 0)) {
-              parts.push(`${newKey}=${encodeURIComponent(v)}`)
-            }
-          })
-        }
-        processObject(value, key)
-        return parts
-      }
-      if (value === undefined || value === null) {
-        return []
-      }
-      return [`${key}=${encodeURIComponent(value)}`]
-    })
-    .filter(Boolean)
-    .join('&')
-
-  const queryPrefix = otherParams ? `?${otherParams}&` : '?'
+  const selfPage = { size: pageSize }
 
   if (queryParams.page?.after) {
-    links.self = `${baseUrl}${queryPrefix}page[size]=${pageSize}&page[after]=${queryParams.page.after}`
+    selfPage.after = queryParams.page.after
   } else if (queryParams.page?.before) {
-    links.self = `${baseUrl}${queryPrefix}page[size]=${pageSize}&page[before]=${queryParams.page.before}`
-  } else {
-    links.self = `${baseUrl}${queryPrefix}page[size]=${pageSize}`
+    selfPage.before = queryParams.page.before
   }
 
-  links.first = `${baseUrl}${queryPrefix}page[size]=${pageSize}`
+  links.self = buildJsonApiLink(baseUrl, queryParams, selfPage)
+  links.first = buildJsonApiLink(baseUrl, queryParams, { size: pageSize })
 
   if (hasMore && records.length > 0) {
     const lastRecord = records[records.length - 1]
-    const nextCursor = createCursor(lastRecord, sortFields)
-    links.next = `${baseUrl}${queryPrefix}page[size]=${pageSize}&page[after]=${nextCursor}`
+    const nextCursor = createCursor(lastRecord, sortFields, { schemaInfo })
+    links.next = buildJsonApiLink(baseUrl, queryParams, { size: pageSize, after: nextCursor })
   }
 
   return links
@@ -543,7 +497,7 @@ export const generateCursorPaginationLinks = (urlPrefix, scopeName, queryParams,
  * 3. Added to response.meta.pagination
  * 4. Clients can use cursor directly or use the next link
  */
-export const buildCursorMeta = (records, pageSize, hasMore, sortFields = ['id']) => {
+export const buildCursorMeta = (records, pageSize, hasMore, sortFields = ['id'], { schemaInfo = null } = {}) => {
   const meta = {
     pageSize,
     hasMore
@@ -552,7 +506,7 @@ export const buildCursorMeta = (records, pageSize, hasMore, sortFields = ['id'])
   if (hasMore && records.length > 0) {
     const lastRecord = records[records.length - 1]
     meta.cursor = {
-      next: createCursor(lastRecord, sortFields)
+      next: createCursor(lastRecord, sortFields, { schemaInfo })
     }
   }
 

package/plugins/core/lib/querying/knex-query-helpers.js

@@ -191,7 +191,7 @@ export const polymorphicFiltersHook = async (hookParams, dependencies) => {
   // Step 2: Build polymorphic JOINs
   log.trace('[POLYMORPHIC-SEARCH] Building JOINs for polymorphic searches')
 
-  for (const [filterKey, searchInfo] of polymorphicSearches) {
+  for (const [, searchInfo] of polymorphicSearches) {
     const { fieldDef, polymorphicField } = searchInfo
 
     // Get the relationship definition
@@ -485,7 +485,6 @@ export const crossTableFiltersHook = async (hookParams, dependencies) => {
   }
 
   const schemaInfo = scopes[scopeName].vars.schemaInfo
-  const tableName = schemaInfo.tableName
   const tableAlias = adapterUtils.defaultAliasForScope(scopeName)
   const aliasScopeMap = new Map()
   aliasScopeMap.set(tableAlias, scopeName)
@@ -730,7 +729,7 @@ export const crossTableFiltersHook = async (hookParams, dependencies) => {
           fieldDef.applyFilter.call(this, this, filterValue)
           break
 
-        default:
+        default: {
           const targetField = fieldDef.actualField || filterKey
           const columnRef = resolveFieldColumn(targetField)
           const operator = resolveSearchOperator(fieldDef)
@@ -738,6 +737,7 @@ export const crossTableFiltersHook = async (hookParams, dependencies) => {
           applyWhereForOperator({ builder: this, columnRef, operator, value: normalized, knex })
           break
         }
+      }
     }
   })
 }
@@ -891,8 +891,6 @@ export const basicFiltersHook = async (hookParams, dependencies) => {
   const scopeName = hookParams.context?.knexQuery?.scopeName
   const filters = hookParams.context?.knexQuery?.filters
   const query = hookParams.context?.knexQuery?.query
-  const db = hookParams.context?.knexQuery?.db || knex
-
   if (!scopeName || !filters || !scopes[scopeName]) {
     return
   }
@@ -993,7 +991,7 @@ export const basicFiltersHook = async (hookParams, dependencies) => {
           fieldDef.applyFilter.call(this, this, filterValue)
           break
 
-        default:
+        default: {
           // Standard filtering
           const actualField = fieldDef.actualField || filterKey
           // Always qualify field names
@@ -1005,6 +1003,7 @@ export const basicFiltersHook = async (hookParams, dependencies) => {
           applyWhereForOperator({ builder: this, columnRef: dbField, operator, value: normalized, knex })
           break
         }
+      }
     }
   })
 }