json-rest-api 1.0.23 → 1.0.25

package/plugins/core/rest-api-anyapi-knex-plugin.js

@@ -14,7 +14,7 @@ import {
   buildCursorMeta,
   parseCursor,
 } from './lib/querying/knex-pagination-helpers.js'
-import { getUrlPrefix, buildResourceUrl } from './lib/querying/url-helpers.js'
+import { getUrlPrefix, buildResourceUrl, buildRelationshipUrl } from './lib/querying/url-helpers.js'
 import {
   normalizeId,
   resolveFieldInfo,
@@ -35,12 +35,16 @@ import {
   polymorphicFiltersHook,
   crossTableFiltersHook,
   basicFiltersHook,
+  resolveSearchOperator,
+  applyWhereForOperator,
 } from './lib/querying/knex-query-helpers.js'
 import {
   createStorageAdapter,
 } from './lib/storage/storage-adapter.js'
 import {
   translateCanonicalAttributesForStorage,
+  getCanonicalResourceId,
+  getCanonicalResourceIdColumn,
   translateCanonicalRecordFromStorage,
 } from './lib/storage/canonical-storage-mapping.js'
 import {
@@ -50,6 +54,7 @@ import {
   parseSortEntry
 } from './lib/querying/query-field-sort-helpers.js'
 import { unwrapQueryBuilderState } from './lib/querying/query-builder-utils.js'
+import { serializeJsonApiQuery } from './lib/querying-writing/connectors-query-parser.js'
 
 const DEFAULT_TENANT = 'default'
 const LINKS_TABLE = 'any_links'
@@ -118,49 +123,115 @@ export const RestApiAnyapiKnexPlugin = {
       if (!descriptor) {
         throw new Error(`Descriptor not found for resource '${scopeName}'`)
       }
+      const scope = api.resources?.[scopeName] || scopes?.[scopeName]
+      const stored = scopeOptionsRegistry.get(scopeName) || {}
+      descriptor.idProperty = stored.idProperty ||
+        scope?.vars?.schemaInfo?.idProperty ||
+        scope?.scopeOptions?.idProperty ||
+        descriptor.idProperty ||
+        vars.idProperty ||
+        'id'
       return descriptor
     }
 
+    const decorateResourceLinks = ({ resource, scope, scopeName, context }) => {
+      if (!resource || !scope || !scopeName || !context) return
+
+      resource.links = resource.links || {}
+      resource.links.self = buildResourceUrl(context, scope, scopeName, resource.id)
+
+      if (!resource.relationships || typeof resource.relationships !== 'object') {
+        return
+      }
+
+      for (const [relationshipName, relationshipObject] of Object.entries(resource.relationships)) {
+        if (!relationshipObject || typeof relationshipObject !== 'object') {
+          continue
+        }
+
+        relationshipObject.links = {
+          self: buildRelationshipUrl(context, scope, scopeName, resource.id, relationshipName, true),
+          related: buildRelationshipUrl(context, scope, scopeName, resource.id, relationshipName, false),
+        }
+      }
+    }
+
     const getAllowedQueryFieldNames = (scopeName) => (
       Object.keys(api.resources?.[scopeName]?.vars?.queryFields || {})
     )
 
+    const getLogicalResourceIdColumn = (descriptor) => getCanonicalResourceIdColumn(descriptor)
+
+    const getLogicalResourceId = (row, descriptor) => getCanonicalResourceId(row, descriptor)
+
     const applyFiltersToQuery = ({ query, filters, descriptor, searchSchema, adapter }) => {
-      // Filtering is handled by the query hooks to keep behavior consistent
-      // (operators, null handling, multi-field, joins, polymorphic, etc.).
-      // Avoid applying filters here to prevent duplicate conditions.
-      if (searchSchema) {
-        return
+      if (!filters || Object.keys(filters).length === 0) return
+
+      const normalizeValue = (field, value) => {
+        if (!adapter?.translateFilterValue) {
+          return value
+        }
+        if (Array.isArray(value)) {
+          return value.map((entry) => adapter.translateFilterValue(field, entry))
+        }
+        return adapter.translateFilterValue(field, value)
       }
 
-      // TODO: Probably delete the rest of the function. searchSchema is always there...!!!
-      if (!filters || Object.keys(filters).length === 0) return
+      for (const [filterKey, rawValue] of Object.entries(filters)) {
+        const fieldDef = searchSchema?.[filterKey]
+
+        if (fieldDef?.polymorphicField) {
+          continue
+        }
 
-      // Fallback: apply minimal safe filtering when no search schema is defined
-      for (const [field, rawValue] of Object.entries(filters)) {
-        const fieldInfo = ensureFilterableField(descriptor, field)
+        if (fieldDef?.actualField?.includes('.')) {
+          continue
+        }
+
+        if (fieldDef?.oneOf?.some((field) => field.includes('.'))) {
+          continue
+        }
+
+        if (fieldDef?.oneOf && Array.isArray(fieldDef.oneOf)) {
+          continue
+        }
+
+        if (fieldDef?.applyFilter && typeof fieldDef.applyFilter === 'function') {
+          continue
+        }
+
+        const actualField = fieldDef?.actualField || filterKey
+        const fieldInfo = ensureFilterableField(descriptor, filterKey)
+        const columnRef = adapter ? adapter.translateColumn(actualField) : fieldInfo.column
+        const operator = resolveSearchOperator(fieldDef || fieldInfo.definition)
         const values = normalizeFilterValues(rawValue, fieldInfo.definition, {
           isRelationship: fieldInfo.isRelationship,
         })
-
-        const nonNullValues = values.filter((value) => value !== null)
-        const hasNull = values.length !== nonNullValues.length
+        const normalizedValues = values.map((value) => normalizeValue(actualField, value))
+        const nonNullValues = normalizedValues.filter((value) => value !== null)
+        const hasNull = normalizedValues.length !== nonNullValues.length
 
         if (nonNullValues.length === 0 && hasNull) {
-          query.whereNull(fieldInfo.column)
+          query.whereNull(columnRef)
           continue
         }
         if (nonNullValues.length === 1 && !hasNull) {
-          query.where(fieldInfo.column, nonNullValues[0])
+          applyWhereForOperator({
+            builder: query,
+            columnRef,
+            operator,
+            value: nonNullValues[0],
+            knex,
+          })
           continue
         }
         if (nonNullValues.length > 1 && !hasNull) {
-          query.whereIn(fieldInfo.column, nonNullValues)
+          query.whereIn(columnRef, nonNullValues)
           continue
         }
         if (nonNullValues.length > 0 && hasNull) {
-          query.where(function filterGroup () {
-            this.whereIn(fieldInfo.column, nonNullValues).orWhereNull(fieldInfo.column)
+          query.where(function anyApiNullFilterGroup () {
+            this.whereIn(columnRef, nonNullValues).orWhereNull(columnRef)
           })
         }
       }
@@ -213,34 +284,6 @@ export const RestApiAnyapiKnexPlugin = {
       return descriptors
     }
 
-    const buildQueryString = (queryParams = {}) => {
-      const buildParts = (prefix, value) => {
-        const parts = []
-        if (Array.isArray(value)) {
-          if (value.length === 0) return parts
-          parts.push(`${prefix}=${value.map((item) => encodeURIComponent(item)).join(',')}`)
-          return parts
-        }
-        if (value && typeof value === 'object') {
-          for (const [key, subValue] of Object.entries(value)) {
-            if (subValue === undefined || subValue === null) continue
-            const newPrefix = `${prefix}[${key}]`
-            parts.push(...buildParts(newPrefix, subValue))
-          }
-          return parts
-        }
-        if (value === undefined || value === null) return parts
-        parts.push(`${prefix}=${encodeURIComponent(value)}`)
-        return parts
-      }
-
-      const parts = []
-      for (const [key, value] of Object.entries(queryParams)) {
-        parts.push(...buildParts(key, value))
-      }
-      return parts.length > 0 ? `?${parts.join('&')}` : ''
-    }
-
     const applyPaginationToQuery = ({
       query,
       scope,
@@ -317,13 +360,16 @@ export const RestApiAnyapiKnexPlugin = {
 
         predicateChains.forEach((chain) => {
           const chainParts = chain.map(({ descriptor, operator, value }) => {
+            const normalizedValue = adapter?.translateFilterValue
+              ? adapter.translateFilterValue(descriptor.field, value)
+              : value
             if (descriptor.queryFieldRuntime) {
-              predicateBindings.push(...(descriptor.queryFieldRuntime.bindings || []), value)
+              predicateBindings.push(...(descriptor.queryFieldRuntime.bindings || []), normalizedValue)
               return `(${descriptor.queryFieldRuntime.sql}) ${operator} ?`
             }
 
             const columnRef = adapter ? adapter.translateColumn(descriptor.column) : descriptor.column
-            predicateBindings.push(value)
+            predicateBindings.push(normalizedValue)
             return `${columnRef} ${operator} ?`
           })
 
@@ -624,7 +670,88 @@ export const RestApiAnyapiKnexPlugin = {
       return results
     }
 
-    const ensureTargetsExist = async ({ relInfo, relData, transaction }) => {
+    const applyTargetScopeFilters = async ({
+      query,
+      resourceName,
+      tableName,
+      context,
+      filters,
+      queryPurpose = 'include'
+    }) => {
+      const targetScope = api.resources?.[resourceName]
+      if (!targetScope?.applyQueryFilters) {
+        return { query }
+      }
+
+      const storageAdapter = getScopeStorageAdapter(resourceName)
+      const queryState = await targetScope.applyQueryFilters({
+        query,
+        filters,
+        schemaInfo: targetScope.vars?.schemaInfo,
+        scopeName: resourceName,
+        tableName,
+        db: context.db || context.transaction || api.knex.instance,
+        isAnyApi: true,
+        queryPurpose,
+        storageAdapter
+      }, {
+        ...context,
+        scopeName: resourceName,
+        schemaInfo: targetScope.vars?.schemaInfo,
+        storageAdapter
+      })
+
+      return {
+        query: unwrapQueryBuilderState(queryState, query)
+      }
+    }
+
+    const filterVisibleIdentifiers = async ({ identifiers, context }) => {
+      if (!identifiers || identifiers.length === 0) return []
+
+      const db = context.db || context.transaction || api.knex.instance
+      const identifiersByType = new Map()
+
+      for (const identifier of identifiers) {
+        if (!identifier?.type || identifier.id === undefined || identifier.id === null) continue
+        if (!identifiersByType.has(identifier.type)) {
+          identifiersByType.set(identifier.type, new Set())
+        }
+        identifiersByType.get(identifier.type).add(normalizeId(identifier.id))
+      }
+
+      const visibleKeys = new Set()
+
+      for (const [resourceName, idSet] of identifiersByType.entries()) {
+        const descriptor = await getDescriptor(resourceName)
+        const idColumn = getLogicalResourceIdColumn(descriptor)
+        let query = db(descriptor.canonical.tableName)
+          .where(descriptor.canonical.tenantColumn, descriptor.tenant)
+          .where(descriptor.canonical.resourceColumn, descriptor.resource)
+          .whereIn(idColumn, [...idSet])
+          .select(idColumn)
+
+        const scopedQueryState = await applyTargetScopeFilters({
+          query,
+          resourceName,
+          tableName: descriptor.canonical.tableName,
+          context,
+          queryPurpose: 'relationship-identifiers'
+        })
+        query = scopedQueryState.query
+
+        const rows = await query
+        for (const row of rows) {
+          visibleKeys.add(`${resourceName}:${String(getLogicalResourceId(row, descriptor))}`)
+        }
+      }
+
+      return identifiers.filter((identifier) => (
+        visibleKeys.has(`${identifier.type}:${String(identifier.id)}`)
+      ))
+    }
+
+    const ensureTargetsExist = async ({ relInfo, relData, context }) => {
       const relArray = Array.isArray(relData) ? relData : []
       if (relArray.length === 0) return
       const targetScope = api.resources[relInfo.target]
@@ -632,13 +759,17 @@ export const RestApiAnyapiKnexPlugin = {
         throw new Error(`Target resource '${relInfo.target}' not found`)
       }
       for (const identifier of relArray) {
-        if (!identifier?.id) {
+        if (identifier?.id === undefined || identifier.id === null) {
           throw new Error('Relationship data requires resource identifier with id')
         }
         if (identifier.type && identifier.type !== relInfo.target) {
           throw new Error(`Relationship expects type '${relInfo.target}' but received '${identifier.type}'`)
         }
-        await targetScope.get({ id: identifier.id, transaction, simplified: false })
+        await targetScope.get({
+          id: identifier.id,
+          transaction: context.transaction,
+          simplified: false
+        }, { ...context })
       }
     }
 
@@ -697,7 +828,7 @@ export const RestApiAnyapiKnexPlugin = {
         }
         const db = context.transaction || context.db || api.knex.instance
         const leftId = normalizeId(context.id)
-        await ensureTargetsExist({ relInfo: info.relInfo, relData, transaction: context.transaction })
+        await ensureTargetsExist({ relInfo: info.relInfo, relData, context })
         await attachLinks({
           descriptor: info.descriptor,
           relInfo: info.relInfo,
@@ -715,7 +846,7 @@ export const RestApiAnyapiKnexPlugin = {
         }
         const db = context.transaction || context.db || api.knex.instance
         const leftId = normalizeId(context.id)
-        await ensureTargetsExist({ relInfo: info.relInfo, relData, transaction: context.transaction })
+        await ensureTargetsExist({ relInfo: info.relInfo, relData, context })
         if (isUpdate) {
           await syncLinks({
             descriptor: info.descriptor,
@@ -762,7 +893,7 @@ export const RestApiAnyapiKnexPlugin = {
         }
         const db = context.transaction || context.db || api.knex.instance
         const leftId = normalizeId(context.id)
-        return listLinks({
+        const identifiers = await listLinks({
           descriptor: info.descriptor,
           relInfo: info.relInfo,
           relationshipKey: info.relationshipKey,
@@ -770,6 +901,10 @@ export const RestApiAnyapiKnexPlugin = {
           leftId,
           db,
         })
+        return filterVisibleIdentifiers({
+          identifiers,
+          context
+        })
       },
       fetchManyToManyRows: async ({ scopeName, relName, parentIds, context }) => {
         const info = await getManyToManyInfo(scopeName, relName)
@@ -891,12 +1026,13 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const id = context.id
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
 
       const row = await context.db(canonical.tableName)
         .select('id')
         .where(canonical.tenantColumn, descriptor.tenant)
         .where(canonical.resourceColumn, descriptor.resource)
-        .where('id', id)
+        .where(logicalIdColumn, id)
         .first()
 
       return !!row
@@ -909,10 +1045,17 @@ export const RestApiAnyapiKnexPlugin = {
       }
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
+      const explicitId = context.inputRecord?.data?.id
       const attributes = context.inputRecord?.data?.attributes || {}
       const row = storageAdapter?.toStorageRow
         ? storageAdapter.toStorageRow(attributes)
         : translateCanonicalAttributesForStorage(attributes, descriptor)
+
+      if (explicitId !== undefined && explicitId !== null) {
+        row[logicalIdColumn] = explicitId
+      }
+
       row[canonical.tenantColumn] = descriptor.tenant
       row[canonical.resourceColumn] = descriptor.resource
 
@@ -921,10 +1064,25 @@ export const RestApiAnyapiKnexPlugin = {
         .returning('id')
 
       const inserted = Array.isArray(result) ? result[0] : result
-      if (inserted && typeof inserted === 'object' && 'id' in inserted) {
-        return inserted.id
+      const insertedRowId = inserted && typeof inserted === 'object' && 'id' in inserted
+        ? inserted.id
+        : inserted
+
+      if (explicitId !== undefined && explicitId !== null) {
+        return explicitId
       }
-      return inserted
+
+      if (insertedRowId === undefined || insertedRowId === null) {
+        return insertedRowId
+      }
+
+      const generatedLogicalId = String(insertedRowId)
+
+      await context.db(canonical.tableName)
+        .where({ id: insertedRowId })
+        .update({ [logicalIdColumn]: generatedLogicalId })
+
+      return generatedLogicalId
     }
 
     helpers.dataPut = async ({ scopeName, context }) => {
@@ -935,6 +1093,7 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const id = context.id
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
       const attributes = context.inputRecord?.data?.attributes || {}
       const row = storageAdapter?.toStorageRow
         ? storageAdapter.toStorageRow(attributes)
@@ -943,19 +1102,27 @@ export const RestApiAnyapiKnexPlugin = {
       row[canonical.resourceColumn] = descriptor.resource
       row[canonical.tenantColumn] = descriptor.tenant
 
-      const updateRow = Object.fromEntries(
+      const writeRow = Object.fromEntries(
         Object.entries(row).filter(([, value]) => value !== undefined)
       )
 
-      if (Object.keys(updateRow).length === 0) {
+      if (context.isCreate) {
+        await context.db(canonical.tableName).insert({
+          ...writeRow,
+          [logicalIdColumn]: id,
+        })
+        return 1
+      }
+
+      if (Object.keys(writeRow).length === 0) {
         return 0
       }
 
       const result = await context.db(canonical.tableName)
-        .where('id', id)
+        .where(logicalIdColumn, id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
-        .update(updateRow)
+        .update(writeRow)
 
       return result
     }
@@ -968,6 +1135,7 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const id = context.id
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
       const attributes = context.inputRecord?.data?.attributes || {}
       const row = storageAdapter?.toStorageRow
         ? storageAdapter.toStorageRow(attributes)
@@ -982,7 +1150,7 @@ export const RestApiAnyapiKnexPlugin = {
       }
 
       const result = await context.db(canonical.tableName)
-        .where('id', id)
+        .where(logicalIdColumn, id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
         .update(updateRow)
@@ -998,9 +1166,10 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const id = context.id
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
 
       const result = await context.db(canonical.tableName)
-        .where('id', id)
+        .where(logicalIdColumn, id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
         .delete()
@@ -1008,7 +1177,14 @@ export const RestApiAnyapiKnexPlugin = {
       return result
     }
 
-    helpers.dataGetMinimal = async ({ scopeName, context, runHooks, applyQueryFilters }) => {
+    helpers.dataGetMinimal = async ({
+      scopeName,
+      context,
+      runHooks,
+      applyQueryFilters,
+      filters = context.queryParams?.filters,
+      queryPurpose = 'single'
+    }) => {
       const storageAdapter = getScopeStorageAdapter(scopeName)
       if (storageAdapter) {
         context.storageAdapter = storageAdapter
@@ -1016,41 +1192,51 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const id = context.id
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
       const scope = api.resources?.[scopeName]
 
       let query = context.db(canonical.tableName)
-        .where('id', id)
+        .where(logicalIdColumn, id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
 
       if (typeof applyQueryFilters === 'function') {
         const scopedQueryState = await applyQueryFilters({
           query,
-          filters: context.queryParams?.filters,
+          filters,
           tableName: canonical.tableName,
           db: context.db,
           scopeName,
+          queryPurpose,
           storageAdapter,
           isAnyApi: true
         })
         query = unwrapQueryBuilderState(scopedQueryState, query)
       } else if (runHooks) {
+        const previousKnexQuery = context.knexQuery
         context.knexQuery = {
           query,
-          filters: context.queryParams?.filters,
+          filters,
           schemaInfo: context.schemaInfo,
           scopeName,
           tableName: canonical.tableName,
           db: context.db,
+          queryPurpose,
           isAnyApi: true,
           adapter: storageAdapter,
           storageAdapter,
         }
 
-        await runHooks('knexQueryFiltering')
-
-        if (context.knexQuery) {
-          delete context.knexQuery
+        try {
+          await applyBuiltInAnyApiQueryFilters(context)
+          await runHooks('knexQueryFiltering')
+          query = context.knexQuery?.query || query
+        } finally {
+          if (previousKnexQuery === undefined) {
+            delete context.knexQuery
+          } else {
+            context.knexQuery = previousKnexQuery
+          }
         }
       }
 
@@ -1062,16 +1248,15 @@ export const RestApiAnyapiKnexPlugin = {
         descriptor,
         { allowedExtraFields: getAllowedQueryFieldNames(scopeName) }
       )
+      const resourceId = getLogicalResourceId(row, descriptor)
       const minimal = {
         type: descriptor.resource,
-        id: String(row.id),
+        id: resourceId,
         attributes: translated.attributes,
         relationships: translated.relationships,
       }
       if (scope) {
-        minimal.links = {
-          self: buildResourceUrl(context, scope, scopeName, minimal.id),
-        }
+        decorateResourceLinks({ resource: minimal, scope, scopeName, context })
       }
       return minimal
     }
@@ -1136,43 +1321,16 @@ export const RestApiAnyapiKnexPlugin = {
       }
     }
 
-    const applyTargetScopeFilters = async ({ query, resourceName, tableName, context, filters }) => {
-      const targetScope = api.resources?.[resourceName]
-      if (!targetScope?.applyQueryFilters) {
-        return { query }
-      }
-
-      const storageAdapter = getScopeStorageAdapter(resourceName)
-      const queryState = await targetScope.applyQueryFilters({
-        query,
-        filters,
-        schemaInfo: targetScope.vars?.schemaInfo,
-        scopeName: resourceName,
-        tableName,
-        db: context.db || context.transaction || api.knex.instance,
-        isAnyApi: true,
-        storageAdapter
-      }, {
-        ...context,
-        scopeName: resourceName,
-        schemaInfo: targetScope.vars?.schemaInfo,
-        storageAdapter
-      })
-
-      return {
-        query: unwrapQueryBuilderState(queryState, query)
-      }
-    }
-
     const buildIncludedResource = ({ row, descriptor, context, fieldSelectionInfo = null }) => {
       const translated = translateCanonicalRecordFromStorage(
         row,
         descriptor,
         { allowedExtraFields: getAllowedQueryFieldNames(descriptor.resource) }
       )
+      const resourceId = getLogicalResourceId(row, descriptor)
       const includeResource = {
         type: descriptor.resource,
-        id: String(row.id),
+        id: resourceId,
         attributes: translated.attributes,
       }
 
@@ -1186,8 +1344,12 @@ export const RestApiAnyapiKnexPlugin = {
 
       const targetScope = api.resources?.[descriptor.resource]
       if (targetScope) {
-        includeResource.links = includeResource.links || {}
-        includeResource.links.self = buildResourceUrl(context, targetScope, descriptor.resource, includeResource.id)
+        decorateResourceLinks({
+          resource: includeResource,
+          scope: targetScope,
+          scopeName: descriptor.resource,
+          context,
+        })
       }
 
       return includeResource
@@ -1216,7 +1378,7 @@ export const RestApiAnyapiKnexPlugin = {
           let query = db(targetDescriptor.canonical.tableName)
             .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
             .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
-            .whereIn('id', ids)
+            .whereIn(getLogicalResourceIdColumn(targetDescriptor), ids)
           const selectionState = await applyIncludeFieldSelection({
             query,
             resourceName: targetDescriptor.resource,
@@ -1224,11 +1386,19 @@ export const RestApiAnyapiKnexPlugin = {
             context
           })
           query = selectionState.query
+          const scopedQueryState = await applyTargetScopeFilters({
+            query,
+            resourceName: targetDescriptor.resource,
+            tableName: targetDescriptor.canonical.tableName,
+            context
+          })
+          query = scopedQueryState.query
           const rows = await query
 
           const newResources = []
           for (const row of rows) {
-            const includeKey = `${targetDescriptor.resource}:${row.id}`
+            const includeId = getLogicalResourceId(row, targetDescriptor)
+            const includeKey = `${targetDescriptor.resource}:${includeId}`
             if (seen.has(includeKey)) continue
             seen.add(includeKey)
             const includeResource = buildIncludedResource({
@@ -1284,7 +1454,7 @@ export const RestApiAnyapiKnexPlugin = {
             let query = db(targetDescriptor.canonical.tableName)
               .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
               .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
-              .whereIn('id', [...idSet])
+              .whereIn(getLogicalResourceIdColumn(targetDescriptor), [...idSet])
             const selectionState = await applyIncludeFieldSelection({
               query,
               resourceName: targetDescriptor.resource,
@@ -1292,10 +1462,18 @@ export const RestApiAnyapiKnexPlugin = {
               context
             })
             query = selectionState.query
+            const scopedQueryState = await applyTargetScopeFilters({
+              query,
+              resourceName: targetDescriptor.resource,
+              tableName: targetDescriptor.canonical.tableName,
+              context
+            })
+            query = scopedQueryState.query
             const rows = await query
 
             for (const row of rows) {
-              const includeKey = `${targetDescriptor.resource}:${row.id}`
+              const includeId = getLogicalResourceId(row, targetDescriptor)
+              const includeKey = `${targetDescriptor.resource}:${includeId}`
               if (seen.has(includeKey)) continue
               seen.add(includeKey)
               const includeResource = buildIncludedResource({
@@ -1432,7 +1610,8 @@ export const RestApiAnyapiKnexPlugin = {
 
           const newResources = []
           for (const row of rows) {
-            const includeKey = `${targetDescriptor.resource}:${row.id}`
+            const includeId = getLogicalResourceId(row, targetDescriptor)
+            const includeKey = `${targetDescriptor.resource}:${includeId}`
             if (seen.has(includeKey)) continue
             seen.add(includeKey)
             const includeResource = buildIncludedResource({
@@ -1481,7 +1660,7 @@ export const RestApiAnyapiKnexPlugin = {
           let query = db(targetDescriptor.canonical.tableName)
             .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
             .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
-            .whereIn('id', childIds)
+            .whereIn(getLogicalResourceIdColumn(targetDescriptor), childIds)
           const selectionState = await applyIncludeFieldSelection({
             query,
             resourceName: targetDescriptor.resource,
@@ -1489,11 +1668,19 @@ export const RestApiAnyapiKnexPlugin = {
             context
           })
           query = selectionState.query
+          const scopedQueryState = await applyTargetScopeFilters({
+            query,
+            resourceName: targetDescriptor.resource,
+            tableName: targetDescriptor.canonical.tableName,
+            context
+          })
+          query = scopedQueryState.query
           const rows = await query
 
           const newResources = []
           for (const row of rows) {
-            const includeKey = `${targetDescriptor.resource}:${row.id}`
+            const includeId = getLogicalResourceId(row, targetDescriptor)
+            const includeKey = `${targetDescriptor.resource}:${includeId}`
             if (seen.has(includeKey)) continue
             seen.add(includeKey)
             const includeResource = buildIncludedResource({
@@ -1577,7 +1764,8 @@ export const RestApiAnyapiKnexPlugin = {
             query,
             resourceName: targetDescriptor.resource,
             tableName: targetDescriptor.canonical.tableName,
-            context
+            context,
+            queryPurpose: 'relationship-identifiers'
           })
           query = scopedQueryState.query
           const rows = await query
@@ -1587,7 +1775,7 @@ export const RestApiAnyapiKnexPlugin = {
             if (parentId == null) return acc
             const key = String(parentId)
             acc[key] = acc[key] || []
-            acc[key].push({ type: targetDescriptor.resource, id: String(row.id) })
+            acc[key].push({ type: targetDescriptor.resource, id: getLogicalResourceId(row, targetDescriptor) })
             return acc
           }, {})
 
@@ -1623,7 +1811,8 @@ export const RestApiAnyapiKnexPlugin = {
             query,
             resourceName: targetDescriptor.resource,
             tableName: targetDescriptor.canonical.tableName,
-            context
+            context,
+            queryPurpose: 'relationship-identifiers'
           })
           query = scopedQueryState.query
           const rows = await query
@@ -1633,7 +1822,7 @@ export const RestApiAnyapiKnexPlugin = {
             if (parentId == null) return acc
             const key = String(parentId)
             acc[key] = acc[key] || []
-            acc[key].push({ type: targetDescriptor.resource, id: String(row.id) })
+            acc[key].push({ type: targetDescriptor.resource, id: getLogicalResourceId(row, targetDescriptor) })
             return acc
           }, {})
 
@@ -1654,16 +1843,25 @@ export const RestApiAnyapiKnexPlugin = {
       const db = context.db || context.transaction || api.knex.instance
       const parentIds = resources.map((resource) => resource.id)
 
-      for (const [relName, relInfo] of manyEntries) {
+      for (const [relName] of manyEntries) {
         const info = await getManyToManyInfo(descriptor.resource, relName)
         if (!info) continue
-        const rows = await fetchLinksForParents({
+        let rows = await fetchLinksForParents({
           descriptor: info.descriptor,
           relationshipKey: info.relationshipKey,
           parentIds,
           db,
         })
 
+        const visibleIdentifiers = await filterVisibleIdentifiers({
+          identifiers: rows.map((row) => ({ type: row.childType, id: row.childId })),
+          context
+        })
+        const visibleKeys = new Set(
+          visibleIdentifiers.map((identifier) => `${identifier.type}:${String(identifier.id)}`)
+        )
+        rows = rows.filter((row) => visibleKeys.has(`${row.childType}:${String(row.childId)}`))
+
         const grouped = rows.reduce((acc, row) => {
           const key = String(row.parentId)
           acc[key] = acc[key] || []
@@ -1687,6 +1885,7 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const id = context.id
+      const logicalIdColumn = getLogicalResourceIdColumn(descriptor)
       const scope = api.resources?.[scopeName]
 
       let fieldSelectionInfo = null
@@ -1698,7 +1897,7 @@ export const RestApiAnyapiKnexPlugin = {
       }
 
       let query = context.db(canonical.tableName)
-        .where('id', id)
+        .where(logicalIdColumn, id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
 
@@ -1726,9 +1925,10 @@ export const RestApiAnyapiKnexPlugin = {
         descriptor,
         { allowedExtraFields: getAllowedQueryFieldNames(scopeName) }
       )
+      const resourceId = getLogicalResourceId(row, descriptor)
       const data = {
         type: descriptor.resource,
-        id: String(row.id),
+        id: resourceId,
         attributes: record.attributes,
       }
 
@@ -1760,24 +1960,20 @@ export const RestApiAnyapiKnexPlugin = {
       }
 
       if (scope) {
-        data.links = data.links || {}
-        data.links.self = buildResourceUrl(context, scope, scopeName, data.id)
-        response.links = {
-          self: data.links.self,
-        }
+        decorateResourceLinks({ resource: data, scope, scopeName, context })
+        response.links = { self: data.links.self }
       }
 
       if (included.length > 0) {
         for (const includeResource of included) {
           const targetScope = api.resources?.[includeResource.type]
           if (!targetScope) continue
-          includeResource.links = includeResource.links || {}
-          includeResource.links.self = buildResourceUrl(
+          decorateResourceLinks({
+            resource: includeResource,
+            scope: targetScope,
+            scopeName: includeResource.type,
             context,
-            targetScope,
-            includeResource.type,
-            includeResource.id
-          )
+          })
         }
       }
 
@@ -1846,6 +2042,7 @@ export const RestApiAnyapiKnexPlugin = {
         scope.vars?.idProperty ||
         vars.idProperty ||
         'id'
+      descriptor.idProperty = idProperty
 
       scope.vars.schemaInfo = {
         ...existingInfo,
@@ -1894,32 +2091,14 @@ export const RestApiAnyapiKnexPlugin = {
       return { resourceToTableName, tableNameToResource }
     }
 
-    const scopesProxy = new Proxy({}, {
-      get (_target, prop) {
-        if (typeof prop !== 'string') {
-          return undefined
-        }
-        const resource = api.resources?.[prop]
-        if (resource?.vars?.schemaInfo) {
-          return resource
-        }
-        return scopes?.[prop]
-      },
-    })
-
-    const queryHookDependencies = { log, scopes: scopesProxy, knex, getStorageAdapter: getScopeStorageAdapter }
-
-    addHook('knexQueryFiltering', 'polymorphicFiltersHook', {}, async (hookParams) =>
-      polymorphicFiltersHook(hookParams, queryHookDependencies)
-    )
-
-    addHook('knexQueryFiltering', 'crossTableFiltersHook', {}, async (hookParams) =>
-      crossTableFiltersHook(hookParams, queryHookDependencies)
-    )
+    const queryHookDependencies = { log, scopes: api.resources, knex, getStorageAdapter: getScopeStorageAdapter }
 
-    addHook('knexQueryFiltering', 'basicFiltersHook', {}, async (hookParams) =>
-      basicFiltersHook(hookParams, queryHookDependencies)
-    )
+    const applyBuiltInAnyApiQueryFilters = async (context) => {
+      const hookParams = { context }
+      await polymorphicFiltersHook(hookParams, queryHookDependencies)
+      await crossTableFiltersHook(hookParams, queryHookDependencies)
+      await basicFiltersHook(hookParams, queryHookDependencies)
+    }
 
     helpers.dataQuery = async ({ scopeName, context, runHooks }) => {
       const storageAdapter = getScopeStorageAdapter(scopeName)
@@ -1971,11 +2150,14 @@ export const RestApiAnyapiKnexPlugin = {
         scopeName,
         tableName: tableNameForHooks,
         db,
+        queryPurpose: 'collection',
         isAnyApi: true,
         adapter,
         storageAdapter,
       }
 
+      await applyBuiltInAnyApiQueryFilters(context)
+
       if (runHooks) {
         await runHooks('knexQueryFiltering')
       }
@@ -1984,19 +2166,20 @@ export const RestApiAnyapiKnexPlugin = {
 
       const countQuery = queryBuilder.clone()
 
-      const selectionState = scope && fieldSelectionInfo
-        ? await applyFieldSelectionToQuery({
-            query: queryBuilder,
-            scope,
-            fieldSelectionInfo,
-            tableName: adapter.tableAlias,
-            useTablePrefix: false,
-            storageAdapter,
-            db,
-            context,
-            scopeName
-          })
-        : { query: queryBuilder, queryFieldRuntimeByField: new Map() }
+      let selectionState = { query: queryBuilder, queryFieldRuntimeByField: new Map() }
+      if (scope && fieldSelectionInfo) {
+        selectionState = await applyFieldSelectionToQuery({
+          query: queryBuilder,
+          scope,
+          fieldSelectionInfo,
+          tableName: adapter.tableAlias,
+          useTablePrefix: false,
+          storageAdapter,
+          db,
+          context,
+          scopeName
+        })
+      }
 
       const sortDescriptors = applySortingToQuery({
         query: selectionState.query,
@@ -2006,9 +2189,6 @@ export const RestApiAnyapiKnexPlugin = {
         queryFieldRuntimeByField: selectionState.queryFieldRuntimeByField
       })
 
-      if (queryParams?.page?.after) {
-      }
-
       const paginationInfo = applyPaginationToQuery({
         query: queryBuilder,
         scope,
@@ -2027,7 +2207,7 @@ export const RestApiAnyapiKnexPlugin = {
           const record = {}
           for (const descriptorEntry of cursorDescriptors) {
             if (descriptorEntry.field === 'id') {
-              record.id = row.id
+              record.id = getLogicalResourceId(row, descriptor)
             } else if (descriptorEntry.queryFieldRuntime) {
               record[descriptorEntry.field] = row[descriptorEntry.field]
             } else if (descriptorEntry.column) {
@@ -2050,9 +2230,10 @@ export const RestApiAnyapiKnexPlugin = {
           descriptor,
           { allowedExtraFields: getAllowedQueryFieldNames(scopeName) }
         )
+        const resourceId = getLogicalResourceId(row, descriptor)
         const resource = {
           type: descriptor.resource,
-          id: String(row.id),
+          id: resourceId,
           attributes: translated.attributes,
         }
         if (translated.relationships && Object.keys(translated.relationships).length > 0) {
@@ -2060,8 +2241,7 @@ export const RestApiAnyapiKnexPlugin = {
         }
         const resourceScope = scope
         if (resourceScope) {
-          resource.links = resource.links || {}
-          resource.links.self = buildResourceUrl(context, resourceScope, scopeName, resource.id)
+          decorateResourceLinks({ resource, scope: resourceScope, scopeName, context })
         }
         if (fieldSelectionInfo?.computedDependencies?.length) {
           resource.__$jsonrestapi_computed_deps$__ = fieldSelectionInfo.computedDependencies
@@ -2092,8 +2272,22 @@ export const RestApiAnyapiKnexPlugin = {
         response.included = included
       }
 
+      if (included.length > 0) {
+        for (const includeResource of included) {
+          const targetScope = api.resources?.[includeResource.type]
+          if (!targetScope) continue
+          decorateResourceLinks({
+            resource: includeResource,
+            scope: targetScope,
+            scopeName: includeResource.type,
+            context,
+          })
+        }
+      }
+
       context.returnMeta = context.returnMeta || {}
-      context.returnMeta.queryString = buildQueryString(queryParams)
+      const queryString = serializeJsonApiQuery(queryParams)
+      context.returnMeta.queryString = queryString ? `?${queryString}` : ''
       delete context.returnMeta.paginationMeta
       delete context.returnMeta.paginationLinks
 
@@ -2123,7 +2317,10 @@ export const RestApiAnyapiKnexPlugin = {
           cursorRecords,
           paginationInfo.pageSize,
           hasMore,
-          cursorFields
+          cursorFields,
+          {
+            schemaInfo
+          }
         )
         context.returnMeta.paginationMeta = paginationMeta
         const urlPrefix = getUrlPrefix(context, scope)
@@ -2134,7 +2331,10 @@ export const RestApiAnyapiKnexPlugin = {
           cursorRecords,
           paginationInfo.pageSize,
           hasMore,
-          cursorFields
+          cursorFields,
+          {
+            schemaInfo
+          }
         )
       }
 
@@ -2180,27 +2380,30 @@ export const RestApiAnyapiKnexPlugin = {
       const schemaInfo = scope?.vars?.schemaInfo
       const tableNameForHooks = schemaInfo?.tableName || adapter.tableAlias
 
-      const hookParams = {
-        context: {
-          knexQuery: {
-            query: adapter.query,
-            filters: context.queryParams?.filters,
-            schemaInfo,
-            scopeName,
-            tableName: tableNameForHooks,
-            db,
-            isAnyApi: true,
-            adapter,
-            storageAdapter,
-          },
-        },
+      const countContext = {
+        ...context,
+        knexQuery: {
+          query: adapter.query,
+          filters: context.queryParams?.filters,
+          schemaInfo,
+          scopeName,
+          tableName: tableNameForHooks,
+          db,
+          queryPurpose: 'count',
+          isAnyApi: true,
+          adapter,
+          storageAdapter,
+        }
       }
 
+      const hookParams = { context: countContext }
       await polymorphicFiltersHook(hookParams, queryHookDependencies)
       await crossTableFiltersHook(hookParams, queryHookDependencies)
       await basicFiltersHook(hookParams, queryHookDependencies)
+      await api.runHooks('knexQueryFiltering', countContext)
 
-      const [{ count }] = await adapter.query.count({ count: '*' })
+      const countQuery = countContext.knexQuery?.query || adapter.query
+      const [{ count }] = await countQuery.count({ count: '*' })
       return Number(count)
     }
 
@@ -2236,6 +2439,7 @@ export const RestApiAnyapiKnexPlugin = {
         schema,
         relationships,
         canonicalFieldMap: canonicalFieldsMap,
+        idProperty,
       })
 
       const updatedStored = scopeOptionsRegistry.get(scopeName) || {}
@@ -2306,6 +2510,7 @@ export const RestApiAnyapiKnexPlugin = {
         canonicalFieldMap: scopeOptions?.canonicalFieldsMap ||
           scope?.scopeOptions?.canonicalFieldsMap ||
           null,
+        idProperty,
       })
       if (scope) {
         scope.scopeOptions = {