json-rest-api 1.0.21 → 1.0.23

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

@@ -1,6 +1,7 @@
 import { getForeignKeyFields as getForeignKeyFieldsFromUtils } from '../querying-writing/field-utils.js'
 import { RELATIONSHIPS_KEY, RELATIONSHIP_METADATA_KEY, ROW_NUMBER_KEY, COMPUTED_DEPENDENCIES_KEY, getSchemaStructure } from '../querying-writing/knex-constants.js'
 import { getUrlPrefix, buildResourceUrl, buildRelationshipUrl } from './url-helpers.js'
+import { translateRecordFromStorage } from '../storage/storage-mapping.js'
 
 /**
  * Transforms a flat database record into JSON:API resource format
@@ -75,14 +76,16 @@ import { getUrlPrefix, buildResourceUrl, buildRelationshipUrl } from './url-help
 const toJsonApi = (scope, record, deps) => {
   if (!record) return null
 
-  const schemaInstance = scope.vars.schemaInfo.schemaInstance
+  const schemaInfo = scope.vars.schemaInfo
+  const schemaInstance = schemaInfo.schemaInstance
+  const logicalRecord = translateRecordFromStorage(record, schemaInfo)
 
   const { context } = deps
   const scopeName = context.scopeName
   const idProperty = context.schemaInfo?.idProperty || 'id'
   const polymorphicFields = context.polymorphicFields || new Set()
 
-  const { id, ...allAttributes } = record
+  const { id, ...allAttributes } = logicalRecord
 
   const foreignKeys = schemaInstance ? getForeignKeyFieldsFromUtils(schemaInstance) : new Set()
 

package/plugins/core/lib/querying/knex-process-includes.js

@@ -111,7 +111,6 @@ export const processIncludes = async (scope, records, deps) => {
 
     const db = context.transaction || knex
     const queryParams = context.queryParams
-    const idProperty = context.schemaInfo.idProperty
 
     if (!queryParams.include) {
       return []
@@ -124,15 +123,15 @@ export const processIncludes = async (scope, records, deps) => {
         records,
         scopeName,
         includeParam: queryParams.include,
-        fields: queryParams.fields || {},
-        idProperty
+        fields: queryParams.fields || {}
       },
       {
         context: {
           scopes,
           log,
           knex: db,
-          capabilities: api?.knex?.capabilities
+          capabilities: api?.knex?.capabilities,
+          requestContext: context
         }
       }
     )

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

@@ -1,12 +1,11 @@
 import { analyzeRequiredIndexes, buildJoinChain } from './knex-cross-table-search.js'
+import { createStorageAdapterUtilities } from './storage-adapter-utils.js'
 
 // Resolve operator with sensible defaults for fields declared in searchSchema.
 // - If filterOperator is provided, use it as-is
-// - If field type is string and no operator provided, default to 'like' (contains)
-// - Otherwise default to '='
+// - If no operator is provided, default to '='
 export function resolveSearchOperator (fieldDef) {
   if (fieldDef && fieldDef.filterOperator) return String(fieldDef.filterOperator)
-  if (fieldDef && fieldDef.type === 'string') return 'like'
   return '='
 }
 
@@ -74,58 +73,6 @@ export function applyWhereForOperator ({ builder, columnRef, operator, value, kn
   builder[method](columnRef, operator || '=', firstVal)
 }
 
-const createAdapterUtilities = (hookParams, { getStorageAdapter } = {}) => {
-  const context = hookParams.context || {}
-  const storageCache = new Map()
-
-  const fetchStorageAdapter = (scopeName) => {
-    if (!scopeName) return null
-    if (storageCache.has(scopeName)) return storageCache.get(scopeName)
-
-    let adapter = null
-    if (scopeName === context?.knexQuery?.scopeName) {
-      adapter = context.storageAdapter ||
-        context.knexQuery?.storageAdapter ||
-        (typeof getStorageAdapter === 'function' ? getStorageAdapter(scopeName) : null)
-      if (adapter && !context.storageAdapter) {
-        context.storageAdapter = adapter
-      }
-    } else {
-      adapter = typeof getStorageAdapter === 'function' ? getStorageAdapter(scopeName) : null
-    }
-
-    storageCache.set(scopeName, adapter)
-    return adapter
-  }
-
-  const defaultAliasForScope = (scopeName) => {
-    if (scopeName === context?.knexQuery?.scopeName) {
-      return context.knexQuery?.tableName || scopeName
-    }
-    return scopeName
-  }
-
-  const translateColumn = (scopeName, field, alias = defaultAliasForScope(scopeName)) => {
-    const adapter = fetchStorageAdapter(scopeName)
-    const translated = adapter?.translateColumn?.(field) ?? field
-    if (!alias) return translated
-    return `${alias}.${translated}`
-  }
-
-  const translateFilterValue = (scopeName, field, value) => {
-    const adapter = fetchStorageAdapter(scopeName)
-    if (!adapter?.translateFilterValue) return value
-    return adapter.translateFilterValue(field, value)
-  }
-
-  return {
-    fetchStorageAdapter,
-    defaultAliasForScope,
-    translateColumn,
-    translateFilterValue,
-  }
-}
-
 /**
  * Processes filters that target polymorphic relationships where a single relationship can point to different types of resources
  *
@@ -201,7 +148,7 @@ const createAdapterUtilities = (hookParams, { getStorageAdapter } = {}) => {
  */
 export const polymorphicFiltersHook = async (hookParams, dependencies) => {
   const { log, scopes, knex } = dependencies
-  const adapterUtils = createAdapterUtilities(hookParams, dependencies)
+  const adapterUtils = createStorageAdapterUtilities(hookParams, dependencies)
 
   // Extract context
   const scopeName = hookParams.context?.knexQuery?.scopeName
@@ -209,13 +156,13 @@ export const polymorphicFiltersHook = async (hookParams, dependencies) => {
   const query = hookParams.context?.knexQuery?.query
   const db = hookParams.context?.knexQuery?.db || knex
 
-  const schemaInfo = scopes[scopeName].vars.schemaInfo
-  const tableAlias = adapterUtils.defaultAliasForScope(scopeName)
-
-  if (!filters) {
+  if (!scopeName || !filters || !scopes[scopeName]) {
     return
   }
 
+  const schemaInfo = scopes[scopeName].vars.schemaInfo
+  const tableAlias = adapterUtils.defaultAliasForScope(scopeName)
+
   // Step 1: Identify polymorphic searches
   const polymorphicSearches = new Map()
   const polymorphicJoins = new Map()
@@ -525,7 +472,7 @@ export const polymorphicFiltersHook = async (hookParams, dependencies) => {
  */
 export const crossTableFiltersHook = async (hookParams, dependencies) => {
   const { log, scopes, knex } = dependencies
-  const adapterUtils = createAdapterUtilities(hookParams, dependencies)
+  const adapterUtils = createStorageAdapterUtilities(hookParams, dependencies)
 
   // Extract context
   const scopeName = hookParams.context?.knexQuery?.scopeName
@@ -533,16 +480,16 @@ export const crossTableFiltersHook = async (hookParams, dependencies) => {
   const query = hookParams.context?.knexQuery?.query
   const db = hookParams.context?.knexQuery?.db || knex
 
+  if (!scopeName || !filters || !scopes[scopeName]) {
+    return
+  }
+
   const schemaInfo = scopes[scopeName].vars.schemaInfo
   const tableName = schemaInfo.tableName
   const tableAlias = adapterUtils.defaultAliasForScope(scopeName)
   const aliasScopeMap = new Map()
   aliasScopeMap.set(tableAlias, scopeName)
 
-  if (!filters) {
-    return
-  }
-
   // Step 1: Analyze indexes
   const requiredIndexes = analyzeRequiredIndexes(scopes, log, scopeName, schemaInfo)
   if (requiredIndexes.length > 0) {
@@ -938,7 +885,7 @@ export const crossTableFiltersHook = async (hookParams, dependencies) => {
  */
 export const basicFiltersHook = async (hookParams, dependencies) => {
   const { log, scopes, knex } = dependencies
-  const adapterUtils = createAdapterUtilities(hookParams, dependencies)
+  const adapterUtils = createStorageAdapterUtilities(hookParams, dependencies)
 
   // Extract context
   const scopeName = hookParams.context?.knexQuery?.scopeName
@@ -946,6 +893,10 @@ export const basicFiltersHook = async (hookParams, dependencies) => {
   const query = hookParams.context?.knexQuery?.query
   const db = hookParams.context?.knexQuery?.db || knex
 
+  if (!scopeName || !filters || !scopes[scopeName]) {
+    return
+  }
+
   const schemaInfo = scopes[scopeName].vars.schemaInfo
   const tableName = schemaInfo.tableName
   const tableAlias = adapterUtils.defaultAliasForScope(scopeName)
@@ -958,11 +909,6 @@ export const basicFiltersHook = async (hookParams, dependencies) => {
     tableName
   })
 
-  if (!filters) {
-    log.trace('[DEBUG basicFiltersHook] Returning early - no filters')
-    return
-  }
-
   // Check if we have any JOINs applied (to know if we need to qualify fields)
   // Instead of relying on hasJoins flag, always qualify fields for safety
   const qualifyField = (field) => adapterUtils.translateColumn(scopeName, field, tableAlias)