revert traversals

packages/core/admin/server/services/permission/permissions-manager/sanitize.js

@@ -47,7 +47,7 @@ module.exports = ({ action, ability, model }) => {
 
   const { removeDisallowedFields } = sanitize.visitors;
   const { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate, traverseQueryFields } =
-    traverse.traversals;
+    traverse;
 
   const createSanitizeQuery = (options = {}) => {
     const { fields } = options;

packages/core/admin/server/services/permission/permissions-manager/validate.js

@@ -51,7 +51,7 @@ const throwInvalidParam = ({ key }) => {
 module.exports = ({ action, ability, model }) => {
   const schema = strapi.getModel(model);
 
-  const { traverseQueryFilters, traverseQuerySort, traverseQueryFields } = traverse.traversals;
+  const { traverseQueryFilters, traverseQuerySort, traverseQueryFields } = traverse;
 
   const createValidateQuery = (options = {}) => {
     const { fields } = options;

packages/core/content-manager/server/services/utils/populate.js

@@ -223,7 +223,7 @@ const getDeepPopulateDraftCount = (uid) => {
 const getQueryPopulate = async (uid, query) => {
   let populateQuery = {};
 
-  await strapiUtils.traverse.traversals.traverseQueryFilters(
+  await strapiUtils.traverse.traverseQueryFilters(
     /**
      *
      * @param {Object} param0

packages/core/utils/src/sanitize/index.ts

@@ -8,11 +8,9 @@ import * as visitors from './visitors';
 import * as sanitizers from './sanitizers';
 import traverseEntity, { Data } from '../traverse-entity';
 
-import traversals from '../traverse/traversals';
+import { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate } from '../traverse';
 import { Model } from '../types';
 
-const { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate } = traversals;
-
 export interface Options {
   auth?: unknown;
 }

packages/core/utils/src/sanitize/sanitizers.ts

@@ -4,7 +4,12 @@ import { pipeAsync } from '../async';
 import traverseEntity, { Data } from '../traverse-entity';
 import { isScalarAttribute } from '../content-types';
 
-import traversals from '../traverse/traversals';
+import {
+  traverseQueryFilters,
+  traverseQuerySort,
+  traverseQueryPopulate,
+  traverseQueryFields,
+} from '../traverse';
 
 import {
   removePassword,
@@ -16,9 +21,6 @@ import { isOperator } from '../operators';
 
 import type { Model } from '../types';
 
-const { traverseQueryFilters, traverseQuerySort, traverseQueryPopulate, traverseQueryFields } =
-  traversals;
-
 const sanitizePasswords = (schema: Model) => async (entity: Data) => {
   if (!schema) {
     throw new Error('Missing schema in sanitizePasswords');

packages/core/utils/src/traverse/index.ts

@@ -1,2 +1,5 @@
 export { default as factory } from './factory';
-export { default as traversals } from './traversals';
+export { default as traverseQueryFilters } from './query-filters';
+export { default as traverseQuerySort } from './query-sort';
+export { default as traverseQueryPopulate } from './query-populate';
+export { default as traverseQueryFields } from './query-fields';

packages/core/utils/src/traverse/query-fields.ts

@@ -1,6 +1,6 @@
 import { curry, isArray, isString, eq, trim, constant } from 'lodash/fp';
 
-import traverseFactory from '../factory';
+import traverseFactory from './factory';
 
 const isStringArray = (value: unknown): value is string[] =>
   isArray(value) && value.every(isString);

packages/core/utils/src/traverse/query-filters.ts

@@ -1,6 +1,6 @@
 import { curry, isObject, isEmpty, isArray, isNil, cloneDeep, omit } from 'lodash/fp';
 
-import traverseFactory from '../factory';
+import traverseFactory from './factory';
 
 const isObj = (value: unknown): value is Record<string, unknown> => isObject(value);
 

packages/core/utils/src/traverse/query-populate.ts

@@ -13,9 +13,9 @@ import {
   omit,
 } from 'lodash/fp';
 
-import traverseFactory from '../factory';
-import { Attribute } from '../../types';
-import { isMorphToRelationalAttribute } from '../../content-types';
+import traverseFactory from './factory';
+import { Attribute } from '../types';
+import { isMorphToRelationalAttribute } from '../content-types';
 
 const isKeyword = (keyword: string) => {
   return ({ key, attribute }: { key: string; attribute: Attribute }) => {

packages/core/utils/src/traverse/query-sort.ts

@@ -13,7 +13,7 @@ import {
   cloneDeep,
 } from 'lodash/fp';
 
-import traverseFactory from '../factory';
+import traverseFactory from './factory';
 
 const ORDERS = { asc: 'asc', desc: 'desc' };
 const ORDER_VALUES = Object.values(ORDERS);

packages/core/utils/src/traverse/traversals/index.ts

@@ -1,11 +0,0 @@
-import traverseQueryFilters from './query-filters';
-import traverseQuerySort from './query-sort';
-import traverseQueryPopulate from './query-populate';
-import traverseQueryFields from './query-fields';
-
-export default {
-  traverseQueryFilters,
-  traverseQuerySort,
-  traverseQueryPopulate,
-  traverseQueryFields,
-};

packages/core/utils/src/validate/index.ts

@@ -8,12 +8,10 @@ import * as visitors from './visitors';
 import * as validators from './validators';
 import traverseEntity, { Data } from '../traverse-entity';
 
-import traversals from '../traverse/traversals';
+import { traverseQueryFilters, traverseQuerySort } from '../traverse';
 
 import { Model } from '../types';
 
-const { traverseQueryFilters, traverseQuerySort } = traversals;
-
 export interface Options {
   auth?: unknown;
 }

packages/core/utils/src/validate/validators.ts

@@ -4,7 +4,7 @@ import { pipeAsync } from '../async';
 import traverseEntity, { Data } from '../traverse-entity';
 import { isScalarAttribute } from '../content-types';
 
-import traversals from '../traverse/traversals';
+import { traverseQueryFilters, traverseQuerySort, traverseQueryFields } from '../traverse';
 
 import { throwPassword, throwPrivate, throwDynamicZones, throwMorphToRelations } from './visitors';
 import { isOperator } from '../operators';
@@ -12,8 +12,6 @@ import { isOperator } from '../operators';
 import type { Model } from '../types';
 import { throwInvalidParam } from './utils';
 
-const { traverseQueryFilters, traverseQuerySort, traverseQueryFields } = traversals;
-
 const throwPasswords = (schema: Model) => async (entity: Data) => {
   if (!schema) {
     throw new Error('Missing schema in throwPasswords');