json-rest-api 1.0.22 → 1.0.23

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

@@ -5,6 +5,7 @@ import { createSchema } from 'json-rest-schema'
 import {
   DEFAULT_QUERY_LIMIT,
   DEFAULT_MAX_QUERY_LIMIT,
+  COMPUTED_DEPENDENCIES_KEY,
 } from './lib/querying-writing/knex-constants.js'
 import {
   calculatePaginationMeta,
@@ -29,13 +30,26 @@ import {
   ensureSearchFieldsAreIndexed,
   generateSearchSchemaFromSchema,
 } from './lib/querying-writing/schema-helpers.js'
-import { buildFieldSelection } from './lib/querying-writing/knex-field-helpers.js'
+import { applyFieldSelectionToQuery, buildFieldSelection } from './lib/querying-writing/knex-field-helpers.js'
 import {
   polymorphicFiltersHook,
   crossTableFiltersHook,
   basicFiltersHook,
 } from './lib/querying/knex-query-helpers.js'
-import { createStorageAdapter } from './lib/storage/storage-adapter.js'
+import {
+  createStorageAdapter,
+} from './lib/storage/storage-adapter.js'
+import {
+  translateCanonicalAttributesForStorage,
+  translateCanonicalRecordFromStorage,
+} from './lib/storage/canonical-storage-mapping.js'
+import {
+  buildCursorPredicateChains,
+  applyQueryFieldOrder,
+  buildEffectiveSortList,
+  parseSortEntry
+} from './lib/querying/query-field-sort-helpers.js'
+import { unwrapQueryBuilderState } from './lib/querying/query-builder-utils.js'
 
 const DEFAULT_TENANT = 'default'
 const LINKS_TABLE = 'any_links'
@@ -107,6 +121,10 @@ export const RestApiAnyapiKnexPlugin = {
       return descriptor
     }
 
+    const getAllowedQueryFieldNames = (scopeName) => (
+      Object.keys(api.resources?.[scopeName]?.vars?.queryFields || {})
+    )
+
     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.).
@@ -148,35 +166,35 @@ export const RestApiAnyapiKnexPlugin = {
       }
     }
 
-    const applySortingToQuery = ({ query, sort, descriptor, scope }) => {
-      let sortList = Array.isArray(sort) ? sort : (sort ? [sort] : [])
-
-      if (sortList.length === 0 && scope?.vars?.defaultSort) {
-        const defaultSort = scope.vars.defaultSort
-        if (Array.isArray(defaultSort)) {
-          sortList = defaultSort
-        } else if (typeof defaultSort === 'string') {
-          sortList = [defaultSort]
-        } else if (defaultSort && typeof defaultSort === 'object') {
-          const field = defaultSort.field || defaultSort.column || 'id'
-          const direction = (defaultSort.direction || '').toLowerCase() === 'desc' ? '-' : ''
-          sortList = [`${direction}${field}`]
-        }
-      }
-
-      const effectiveSort = sortList.length > 0 ? sortList : ['id']
+    const applySortingToQuery = ({ query, sort, descriptor, scope, queryFieldRuntimeByField = new Map() }) => {
+      const effectiveSort = buildEffectiveSortList(sort, {
+        defaultSort: scope?.vars?.defaultSort,
+        idField: 'id'
+      })
       const descriptors = []
 
       for (const entry of effectiveSort) {
-        const desc = typeof entry === 'string' && entry.startsWith('-')
-        const field = typeof entry === 'string' ? (desc ? entry.slice(1) : entry) : entry
+        const { field, direction, sqlDirection } = parseSortEntry(entry)
+        const queryFieldRuntime = queryFieldRuntimeByField.get(field)
+        if (queryFieldRuntime) {
+          applyQueryFieldOrder(query, queryFieldRuntime, sqlDirection)
+          descriptors.push({
+            field,
+            direction,
+            definition: queryFieldRuntime.definition,
+            isRelationship: false,
+            queryFieldRuntime,
+          })
+          continue
+        }
+
         const fieldInfo = resolveFieldInfo(descriptor, field)
         if (!fieldInfo?.column) continue
-        query.orderBy(fieldInfo.column, desc ? 'desc' : 'asc')
+        query.orderBy(fieldInfo.column, direction)
         descriptors.push({
           field,
           column: fieldInfo.column,
-          direction: desc ? 'desc' : 'asc',
+          direction,
           definition: fieldInfo.definition || null,
           isRelationship: fieldInfo.isRelationship || false,
         })
@@ -282,64 +300,37 @@ export const RestApiAnyapiKnexPlugin = {
         return typed
       }
 
-      const buildCursorPredicate = (cursorValues, operatorSelector) => {
-        if (!descriptors || descriptors.length === 0) {
-          return
-        }
-
-        if (descriptors.length === 1) {
-          const descriptor = descriptors[0]
-          const value = cursorValues[descriptor.field]
-          if (value === undefined) return
-          const columnRef = adapter ? adapter.translateColumn(descriptor.column) : descriptor.column
-          const operator = operatorSelector(descriptor.direction)
-          if (adapter) {
-            query.whereRaw(`${columnRef} ${operator} ?`, [value])
-          } else {
-            query.where(columnRef, operator, value)
-          }
-          return
-        }
-
-        const translatedConditions = []
-
-        descriptors.forEach((descriptor, index) => {
-          const value = cursorValues[descriptor.field]
-          if (value === undefined) return
-
-          const chain = []
-          for (let i = 0; i < index; i += 1) {
-            const prev = descriptors[i]
-            const prevValue = cursorValues[prev.field]
-            if (prevValue === undefined) return
-            const prevColumn = adapter ? adapter.translateColumn(prev.column) : prev.column
-            chain.push({ column: prevColumn, operator: '=', value: prevValue })
-          }
-
-          const operator = operatorSelector(descriptor.direction)
-          const columnRef = adapter ? adapter.translateColumn(descriptor.column) : descriptor.column
-          chain.push({ column: columnRef, operator, value })
-          translatedConditions.push(chain)
-        })
+      const applyRawCursorPredicate = (cursorValues, operatorSelector) => {
+        const predicateChains = buildCursorPredicateChains(
+          descriptors,
+          cursorValues,
+          operatorSelector,
+          { onMissingValue: () => {} }
+        )
 
-        if (translatedConditions.length === 0) {
+        if (predicateChains.length === 0) {
           return
         }
 
         const predicateParts = []
         const predicateBindings = []
-        translatedConditions.forEach((chain) => {
-          const chainParts = chain.map(({ column, operator, value }) => {
+
+        predicateChains.forEach((chain) => {
+          const chainParts = chain.map(({ descriptor, operator, value }) => {
+            if (descriptor.queryFieldRuntime) {
+              predicateBindings.push(...(descriptor.queryFieldRuntime.bindings || []), value)
+              return `(${descriptor.queryFieldRuntime.sql}) ${operator} ?`
+            }
+
+            const columnRef = adapter ? adapter.translateColumn(descriptor.column) : descriptor.column
             predicateBindings.push(value)
-            return `${column} ${operator} ?`
+            return `${columnRef} ${operator} ?`
           })
+
           predicateParts.push(`(${chainParts.join(' AND ')})`)
         })
 
-        if (predicateParts.length > 0) {
-          const combined = predicateParts.join(' OR ')
-          query.whereRaw(`(${combined})`, predicateBindings)
-        }
+        query.whereRaw(`(${predicateParts.join(' OR ')})`, predicateBindings)
       }
 
       const ensurePageSize = () => {
@@ -378,11 +369,11 @@ export const RestApiAnyapiKnexPlugin = {
         if (pageParams.after) {
           const cursorMap = parseCursorOrThrow(pageParams.after, 'after')
           const cursorValues = coerceCursorValues(cursorMap)
-          buildCursorPredicate(cursorValues, (direction) => (direction === 'desc' ? '<' : '>'))
+          applyRawCursorPredicate(cursorValues, (direction) => (direction === 'desc' ? '<' : '>'))
         } else if (pageParams.before) {
           const cursorMap = parseCursorOrThrow(pageParams.before, 'before')
           const cursorValues = coerceCursorValues(cursorMap)
-          buildCursorPredicate(cursorValues, (direction) => (direction === 'desc' ? '>' : '<'))
+          applyRawCursorPredicate(cursorValues, (direction) => (direction === 'desc' ? '>' : '<'))
         }
 
         return {
@@ -919,7 +910,9 @@ export const RestApiAnyapiKnexPlugin = {
       const descriptor = await getDescriptor(scopeName)
       const { canonical } = descriptor
       const attributes = context.inputRecord?.data?.attributes || {}
-      const row = translateAttributesForStorage(attributes, descriptor)
+      const row = storageAdapter?.toStorageRow
+        ? storageAdapter.toStorageRow(attributes)
+        : translateCanonicalAttributesForStorage(attributes, descriptor)
       row[canonical.tenantColumn] = descriptor.tenant
       row[canonical.resourceColumn] = descriptor.resource
 
@@ -943,7 +936,9 @@ export const RestApiAnyapiKnexPlugin = {
       const { canonical } = descriptor
       const id = context.id
       const attributes = context.inputRecord?.data?.attributes || {}
-      const row = translateAttributesForStorage(attributes, descriptor)
+      const row = storageAdapter?.toStorageRow
+        ? storageAdapter.toStorageRow(attributes)
+        : translateCanonicalAttributesForStorage(attributes, descriptor)
 
       row[canonical.resourceColumn] = descriptor.resource
       row[canonical.tenantColumn] = descriptor.tenant
@@ -974,7 +969,9 @@ export const RestApiAnyapiKnexPlugin = {
       const { canonical } = descriptor
       const id = context.id
       const attributes = context.inputRecord?.data?.attributes || {}
-      const row = translateAttributesForStorage(attributes, descriptor)
+      const row = storageAdapter?.toStorageRow
+        ? storageAdapter.toStorageRow(attributes)
+        : translateCanonicalAttributesForStorage(attributes, descriptor)
 
       const updateRow = Object.fromEntries(
         Object.entries(row).filter(([, value]) => value !== undefined)
@@ -1011,7 +1008,7 @@ export const RestApiAnyapiKnexPlugin = {
       return result
     }
 
-    helpers.dataGetMinimal = async ({ scopeName, context }) => {
+    helpers.dataGetMinimal = async ({ scopeName, context, runHooks, applyQueryFilters }) => {
       const storageAdapter = getScopeStorageAdapter(scopeName)
       if (storageAdapter) {
         context.storageAdapter = storageAdapter
@@ -1021,14 +1018,50 @@ export const RestApiAnyapiKnexPlugin = {
       const id = context.id
       const scope = api.resources?.[scopeName]
 
-      const row = await context.db(canonical.tableName)
+      let query = context.db(canonical.tableName)
         .where('id', id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
-        .first()
+
+      if (typeof applyQueryFilters === 'function') {
+        const scopedQueryState = await applyQueryFilters({
+          query,
+          filters: context.queryParams?.filters,
+          tableName: canonical.tableName,
+          db: context.db,
+          scopeName,
+          storageAdapter,
+          isAnyApi: true
+        })
+        query = unwrapQueryBuilderState(scopedQueryState, query)
+      } else if (runHooks) {
+        context.knexQuery = {
+          query,
+          filters: context.queryParams?.filters,
+          schemaInfo: context.schemaInfo,
+          scopeName,
+          tableName: canonical.tableName,
+          db: context.db,
+          isAnyApi: true,
+          adapter: storageAdapter,
+          storageAdapter,
+        }
+
+        await runHooks('knexQueryFiltering')
+
+        if (context.knexQuery) {
+          delete context.knexQuery
+        }
+      }
+
+      const row = await query.first()
 
       if (!row) return null
-      const translated = translateRecordFromStorage(row, descriptor)
+      const translated = translateCanonicalRecordFromStorage(
+        row,
+        descriptor,
+        { allowedExtraFields: getAllowedQueryFieldNames(scopeName) }
+      )
       const minimal = {
         type: descriptor.resource,
         id: String(row.id),
@@ -1069,17 +1102,102 @@ export const RestApiAnyapiKnexPlugin = {
       return tree
     }
 
+    const applyIncludeFieldSelection = async ({ query, resourceName, tableName, context }) => {
+      const targetScope = api.resources?.[resourceName]
+      if (!targetScope) {
+        return { query, fieldSelectionInfo: null }
+      }
+
+      const storageAdapter = getScopeStorageAdapter(resourceName)
+      const fieldSelectionInfo = await buildFieldSelection(targetScope, {
+        context: {
+          ...context,
+          scopeName: resourceName,
+          schemaInfo: targetScope.vars.schemaInfo,
+          storageAdapter,
+        }
+      })
+
+      const selectionState = await applyFieldSelectionToQuery({
+        query,
+        scope: targetScope,
+        fieldSelectionInfo,
+        tableName,
+        useTablePrefix: false,
+        storageAdapter,
+        db: context.db || context.transaction || api.knex.instance,
+        context,
+        scopeName: resourceName
+      })
+
+      return {
+        query: selectionState.query,
+        fieldSelectionInfo
+      }
+    }
+
+    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 includeResource = {
+        type: descriptor.resource,
+        id: String(row.id),
+        attributes: translated.attributes,
+      }
+
+      if (translated.relationships && Object.keys(translated.relationships).length > 0) {
+        includeResource.relationships = translated.relationships
+      }
+
+      if (fieldSelectionInfo?.computedDependencies?.length) {
+        includeResource[COMPUTED_DEPENDENCIES_KEY] = fieldSelectionInfo.computedDependencies
+      }
+
+      const targetScope = api.resources?.[descriptor.resource]
+      if (targetScope) {
+        includeResource.links = includeResource.links || {}
+        includeResource.links.self = buildResourceUrl(context, targetScope, descriptor.resource, includeResource.id)
+      }
+
+      return includeResource
+    }
+
     const collectIncludes = async ({ descriptor, resources, includeTree, context, includes, seen }) => {
       const entries = Object.entries(includeTree || {})
       if (entries.length === 0 || !resources || resources.length === 0) return
 
       const db = context.db || context.transaction || api.knex.instance
-      const addSelfLink = (resource, resourceType) => {
-        const targetScope = api.resources?.[resourceType]
-        if (!targetScope) return
-        resource.links = resource.links || {}
-        resource.links.self = buildResourceUrl(context, targetScope, resourceType, resource.id)
-      }
 
       for (const [relName, childTree] of entries) {
         const childKeys = Object.keys(childTree || {})
@@ -1095,26 +1213,30 @@ export const RestApiAnyapiKnexPlugin = {
           const targetDescriptor = await registry.getDescriptor(tenantId, belongsToInfo.target)
           if (!targetDescriptor) continue
 
-          const rows = await db(targetDescriptor.canonical.tableName)
+          let query = db(targetDescriptor.canonical.tableName)
             .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
             .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
             .whereIn('id', ids)
+          const selectionState = await applyIncludeFieldSelection({
+            query,
+            resourceName: targetDescriptor.resource,
+            tableName: targetDescriptor.canonical.tableName,
+            context
+          })
+          query = selectionState.query
+          const rows = await query
 
           const newResources = []
           for (const row of rows) {
             const includeKey = `${targetDescriptor.resource}:${row.id}`
             if (seen.has(includeKey)) continue
             seen.add(includeKey)
-            const translated = translateRecordFromStorage(row, targetDescriptor)
-            const includeResource = {
-              type: targetDescriptor.resource,
-              id: String(row.id),
-              attributes: translated.attributes,
-            }
-            if (translated.relationships && Object.keys(translated.relationships).length > 0) {
-              includeResource.relationships = translated.relationships
-            }
-            addSelfLink(includeResource, targetDescriptor.resource)
+            const includeResource = buildIncludedResource({
+              row,
+              descriptor: targetDescriptor,
+              context,
+              fieldSelectionInfo: selectionState.fieldSelectionInfo
+            })
             includes.push(includeResource)
             newResources.push(includeResource)
           }
@@ -1159,25 +1281,29 @@ export const RestApiAnyapiKnexPlugin = {
               continue
             }
 
-            const rows = await db(targetDescriptor.canonical.tableName)
+            let query = db(targetDescriptor.canonical.tableName)
               .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
               .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
               .whereIn('id', [...idSet])
+            const selectionState = await applyIncludeFieldSelection({
+              query,
+              resourceName: targetDescriptor.resource,
+              tableName: targetDescriptor.canonical.tableName,
+              context
+            })
+            query = selectionState.query
+            const rows = await query
 
             for (const row of rows) {
               const includeKey = `${targetDescriptor.resource}:${row.id}`
               if (seen.has(includeKey)) continue
               seen.add(includeKey)
-              const translated = translateRecordFromStorage(row, targetDescriptor)
-              const includeResource = {
-                type: targetDescriptor.resource,
-                id: String(row.id),
-                attributes: translated.attributes,
-              }
-              if (translated.relationships && Object.keys(translated.relationships).length > 0) {
-                includeResource.relationships = translated.relationships
-              }
-              addSelfLink(includeResource, targetDescriptor.resource)
+              const includeResource = buildIncludedResource({
+                row,
+                descriptor: targetDescriptor,
+                context,
+                fieldSelectionInfo: selectionState.fieldSelectionInfo
+              })
               includes.push(includeResource)
               newResources.push(includeResource)
             }
@@ -1243,6 +1369,7 @@ export const RestApiAnyapiKnexPlugin = {
 
           let rows = []
           let groupingColumn = null
+          let fieldSelectionInfo = null
 
           if (hasManyInfo.foreignKey) {
             const foreignField = targetDescriptor.fields?.[hasManyInfo.foreignKey]
@@ -1250,21 +1377,53 @@ export const RestApiAnyapiKnexPlugin = {
               continue
             }
             groupingColumn = foreignField.slot
-            rows = await db(targetDescriptor.canonical.tableName)
+            let query = db(targetDescriptor.canonical.tableName)
               .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
               .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
               .whereIn(groupingColumn, parentIds)
+            const selectionState = await applyIncludeFieldSelection({
+              query,
+              resourceName: targetDescriptor.resource,
+              tableName: targetDescriptor.canonical.tableName,
+              context
+            })
+            query = selectionState.query
+            const scopedQueryState = await applyTargetScopeFilters({
+              query,
+              resourceName: targetDescriptor.resource,
+              tableName: targetDescriptor.canonical.tableName,
+              context
+            })
+            query = scopedQueryState.query
+            fieldSelectionInfo = selectionState.fieldSelectionInfo
+            rows = await query
           } else if (hasManyInfo.via) {
             const polyInfo = targetDescriptor.polymorphicBelongsTo?.[hasManyInfo.via]
             if (!polyInfo?.idColumn || !polyInfo?.typeColumn) {
               continue
             }
             groupingColumn = polyInfo.idColumn
-            rows = await db(targetDescriptor.canonical.tableName)
+            let query = db(targetDescriptor.canonical.tableName)
               .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
               .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
               .where(polyInfo.typeColumn, descriptor.resource)
               .whereIn(groupingColumn, queryIds)
+            const selectionState = await applyIncludeFieldSelection({
+              query,
+              resourceName: targetDescriptor.resource,
+              tableName: targetDescriptor.canonical.tableName,
+              context
+            })
+            query = selectionState.query
+            const scopedQueryState = await applyTargetScopeFilters({
+              query,
+              resourceName: targetDescriptor.resource,
+              tableName: targetDescriptor.canonical.tableName,
+              context
+            })
+            query = scopedQueryState.query
+            fieldSelectionInfo = selectionState.fieldSelectionInfo
+            rows = await query
           }
 
           if (!groupingColumn || rows.length === 0) {
@@ -1276,16 +1435,12 @@ export const RestApiAnyapiKnexPlugin = {
             const includeKey = `${targetDescriptor.resource}:${row.id}`
             if (seen.has(includeKey)) continue
             seen.add(includeKey)
-            const translated = translateRecordFromStorage(row, targetDescriptor)
-            const includeResource = {
-              type: targetDescriptor.resource,
-              id: String(row.id),
-              attributes: translated.attributes,
-            }
-            if (translated.relationships && Object.keys(translated.relationships).length > 0) {
-              includeResource.relationships = translated.relationships
-            }
-            addSelfLink(includeResource, targetDescriptor.resource)
+            const includeResource = buildIncludedResource({
+              row,
+              descriptor: targetDescriptor,
+              context,
+              fieldSelectionInfo
+            })
             includes.push(includeResource)
             newResources.push(includeResource)
           }
@@ -1323,26 +1478,30 @@ export const RestApiAnyapiKnexPlugin = {
           const targetDescriptor = await registry.getDescriptor(tenantId, info.relInfo.target)
           if (!targetDescriptor) continue
 
-          const rows = await db(targetDescriptor.canonical.tableName)
+          let query = db(targetDescriptor.canonical.tableName)
             .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
             .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
             .whereIn('id', childIds)
+          const selectionState = await applyIncludeFieldSelection({
+            query,
+            resourceName: targetDescriptor.resource,
+            tableName: targetDescriptor.canonical.tableName,
+            context
+          })
+          query = selectionState.query
+          const rows = await query
 
           const newResources = []
           for (const row of rows) {
             const includeKey = `${targetDescriptor.resource}:${row.id}`
             if (seen.has(includeKey)) continue
             seen.add(includeKey)
-            const translated = translateRecordFromStorage(row, targetDescriptor)
-            const includeResource = {
-              type: targetDescriptor.resource,
-              id: String(row.id),
-              attributes: translated.attributes,
-            }
-            if (translated.relationships && Object.keys(translated.relationships).length > 0) {
-              includeResource.relationships = translated.relationships
-            }
-            addSelfLink(includeResource, targetDescriptor.resource)
+            const includeResource = buildIncludedResource({
+              row,
+              descriptor: targetDescriptor,
+              context,
+              fieldSelectionInfo: selectionState.fieldSelectionInfo
+            })
             includes.push(includeResource)
             newResources.push(includeResource)
           }
@@ -1410,10 +1569,18 @@ export const RestApiAnyapiKnexPlugin = {
           if (!foreignField?.slot) continue
           const column = foreignField.slot
 
-          const rows = await db(targetDescriptor.canonical.tableName)
+          let query = db(targetDescriptor.canonical.tableName)
             .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
             .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
             .whereIn(column, normalizedParentIds)
+          const scopedQueryState = await applyTargetScopeFilters({
+            query,
+            resourceName: targetDescriptor.resource,
+            tableName: targetDescriptor.canonical.tableName,
+            context
+          })
+          query = scopedQueryState.query
+          const rows = await query
 
           const grouped = rows.reduce((acc, row) => {
             const parentId = row[column]
@@ -1447,11 +1614,19 @@ export const RestApiAnyapiKnexPlugin = {
               .filter((value) => value !== null),
           ]))
 
-          const rows = await db(targetDescriptor.canonical.tableName)
+          let query = db(targetDescriptor.canonical.tableName)
             .where(targetDescriptor.canonical.tenantColumn, targetDescriptor.tenant)
             .where(targetDescriptor.canonical.resourceColumn, targetDescriptor.resource)
             .where(polyInfo.typeColumn, descriptor.resource)
             .whereIn(polyInfo.idColumn, queryIds)
+          const scopedQueryState = await applyTargetScopeFilters({
+            query,
+            resourceName: targetDescriptor.resource,
+            tableName: targetDescriptor.canonical.tableName,
+            context
+          })
+          query = scopedQueryState.query
+          const rows = await query
 
           const grouped = rows.reduce((acc, row) => {
             const parentId = row[polyInfo.idColumn]
@@ -1522,15 +1697,35 @@ export const RestApiAnyapiKnexPlugin = {
         context.computedDependencies = []
       }
 
-      const row = await context.db(canonical.tableName)
+      let query = context.db(canonical.tableName)
         .where('id', id)
         .where(canonical.resourceColumn, descriptor.resource)
         .where(canonical.tenantColumn, descriptor.tenant)
-        .first()
+
+      if (scope && fieldSelectionInfo) {
+        const selectionState = await applyFieldSelectionToQuery({
+          query,
+          scope,
+          fieldSelectionInfo,
+          tableName: canonical.tableName,
+          useTablePrefix: false,
+          storageAdapter,
+          db: context.db,
+          context,
+          scopeName
+        })
+        query = selectionState.query
+      }
+
+      const row = await query.first()
 
       if (!row) return null
 
-      const record = translateRecordFromStorage(row, descriptor)
+      const record = translateCanonicalRecordFromStorage(
+        row,
+        descriptor,
+        { allowedExtraFields: getAllowedQueryFieldNames(scopeName) }
+      )
       const data = {
         type: descriptor.resource,
         id: String(row.id),
@@ -1592,10 +1787,11 @@ export const RestApiAnyapiKnexPlugin = {
     const rehydrateSchemaInfo = async (scopeName) => {
       const scope = api.resources?.[scopeName] || scopes?.[scopeName] || {}
       const storedOptions = scopeOptionsRegistry.get(scopeName) || {}
+      const rawSchema = scope.scopeOptions?.schema || storedOptions.schema || {}
 
       if (!scope.scopeOptions) {
         scope.scopeOptions = {
-          schema: storedOptions.schema || {},
+          schema: rawSchema,
           relationships: storedOptions.relationships || {},
           searchSchema: storedOptions.searchSchema || null,
           tableName: storedOptions.tableName || scopeName,
@@ -1611,7 +1807,6 @@ export const RestApiAnyapiKnexPlugin = {
 
       const mergedSchema = { ...(existingInfo.schemaInstance?.structure || {}) }
       const computed = { ...(existingInfo.computed || {}) }
-
       for (const [fieldName, definition] of Object.entries(descriptor.schema || {})) {
         if (definition?.computed) {
           if (!computed[fieldName]) {
@@ -1699,26 +1894,6 @@ export const RestApiAnyapiKnexPlugin = {
       return { resourceToTableName, tableNameToResource }
     }
 
-    const translateSelectFieldsForAdapter = (fields, adapter) => {
-      if (!adapter || !fields) return fields
-
-      return fields.map((field) => {
-        if (typeof field !== 'string') return field
-
-        if (field === '*') return '*'
-
-        const aliasMatch = field.match(/\s+as\s+/i)
-        if (aliasMatch) {
-          const [source, alias] = field.split(/\s+as\s+/i)
-          const translatedSource = adapter.translateColumn(source.trim()) || source.trim()
-          return `${translatedSource} as ${alias.trim()}`
-        }
-
-        const translated = adapter.translateColumn(field)
-        return translated || field
-      })
-    }
-
     const scopesProxy = new Proxy({}, {
       get (_target, prop) {
         if (typeof prop !== 'string') {
@@ -1809,11 +1984,26 @@ 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() }
+
       const sortDescriptors = applySortingToQuery({
-        query: queryBuilder,
+        query: selectionState.query,
         sort: queryParams.sort,
         descriptor,
         scope,
+        queryFieldRuntimeByField: selectionState.queryFieldRuntimeByField
       })
 
       if (queryParams?.page?.after) {
@@ -1827,14 +2017,6 @@ export const RestApiAnyapiKnexPlugin = {
         adapter,
       })
 
-      if (queryParams?.page?.after) {
-      }
-
-      if (fieldSelectionInfo && fieldSelectionInfo.fieldsToSelect && fieldSelectionInfo.fieldsToSelect.length > 0) {
-        const translatedSelect = translateSelectFieldsForAdapter(fieldSelectionInfo.fieldsToSelect, adapter)
-        queryBuilder.select(translatedSelect)
-      }
-
       let rows = await queryBuilder
       let cursorRecords = null
       let hasMore = false
@@ -1846,6 +2028,8 @@ export const RestApiAnyapiKnexPlugin = {
           for (const descriptorEntry of cursorDescriptors) {
             if (descriptorEntry.field === 'id') {
               record.id = row.id
+            } else if (descriptorEntry.queryFieldRuntime) {
+              record[descriptorEntry.field] = row[descriptorEntry.field]
             } else if (descriptorEntry.column) {
               record[descriptorEntry.field] = row[descriptorEntry.column]
             }
@@ -1861,7 +2045,11 @@ export const RestApiAnyapiKnexPlugin = {
       }
 
       const data = rows.map((row) => {
-        const translated = translateRecordFromStorage(row, descriptor)
+        const translated = translateCanonicalRecordFromStorage(
+          row,
+          descriptor,
+          { allowedExtraFields: getAllowedQueryFieldNames(scopeName) }
+        )
         const resource = {
           type: descriptor.resource,
           id: String(row.id),
@@ -2194,64 +2382,3 @@ export const RestApiAnyapiKnexPlugin = {
     })
   },
 }
-
-const translateAttributesForStorage = (attributes, descriptor) => {
-  const row = {}
-  for (const [fieldName, value] of Object.entries(attributes)) {
-    const slot = descriptor.fields[fieldName]
-    if (!slot) continue
-
-    if (slot.slotType === 'belongsTo') {
-      row[slot.slot] = value == null ? null : String(value)
-    } else {
-      row[slot.slot] = value
-    }
-
-    if (slot.slotType === 'belongsTo') {
-      const alias = slot.alias || descriptor.fields[fieldName]?.alias
-      const belongsToInfo = alias ? descriptor.belongsTo?.[alias] : null
-      if (belongsToInfo) {
-        row[belongsToInfo.typeColumn] = value == null ? null : belongsToInfo.target
-      }
-    }
-  }
-  return row
-}
-
-const translateRecordFromStorage = (row, descriptor) => {
-  const attributes = {}
-  for (const [slot, logical] of Object.entries(descriptor.reverseAttributes)) {
-    if (slot in row) {
-      attributes[logical] = row[slot]
-    }
-  }
-
-  const relationships = {}
-  for (const [alias, info] of Object.entries(descriptor.belongsTo || {})) {
-    const idValue = row[info.idColumn]
-    const relationshipData = idValue == null
-      ? null
-      : { type: info.target, id: String(idValue) }
-
-    relationships[alias] = { data: relationshipData }
-  }
-
-  for (const [alias, info] of Object.entries(descriptor.polymorphicBelongsTo || {})) {
-    const typeValue = info.typeColumn ? row[info.typeColumn] : null
-    const idValue = info.idColumn ? row[info.idColumn] : null
-
-    let relationshipData = null
-    if (typeValue != null && idValue != null) {
-      relationshipData = {
-        type: String(typeValue),
-        id: String(idValue),
-      }
-    } else if (typeValue == null && idValue == null) {
-      relationshipData = null
-    }
-
-    relationships[alias] = { data: relationshipData }
-  }
-
-  return { attributes, relationships }
-}