@directus/api 21.0.0-rc.0 → 21.0.0

package/dist/database/get-ast-from-query/lib/parse-fields.js

@@ -1,190 +0,0 @@
-import { REGEX_BETWEEN_PARENS } from '@directus/constants';
-import { isEmpty } from 'lodash-es';
-import { fetchPermissions } from '../../../permissions/lib/fetch-permissions.js';
-import { fetchPolicies } from '../../../permissions/lib/fetch-policies.js';
-import { getRelationType } from '../../../utils/get-relation-type.js';
-import { getDeepQuery } from '../utils/get-deep-query.js';
-import { getRelatedCollection } from '../utils/get-related-collection.js';
-import { getRelation } from '../utils/get-relation.js';
-import { convertWildcards } from './convert-wildcards.js';
-export async function parseFields(options, context) {
-    let { fields } = options;
-    if (!fields)
-        return [];
-    fields = await convertWildcards({
-        fields,
-        parentCollection: options.parentCollection,
-        query: options.query,
-        accountability: options.accountability,
-    }, context);
-    if (!fields || !Array.isArray(fields))
-        return [];
-    const children = [];
-    const policies = options.accountability && options.accountability.admin === false
-        ? await fetchPolicies(options.accountability, context)
-        : null;
-    const relationalStructure = Object.create(null);
-    for (const fieldKey of fields) {
-        let name = fieldKey;
-        if (options.query.alias) {
-            // check for field alias (is one of the key)
-            if (name in options.query.alias) {
-                name = options.query.alias[fieldKey];
-            }
-        }
-        const isRelational = name.includes('.') ||
-            // We'll always treat top level o2m fields as a related item. This is an alias field, otherwise it won't return
-            // anything
-            !!context.schema.relations.find((relation) => relation.related_collection === options.parentCollection && relation.meta?.one_field === name);
-        if (isRelational) {
-            // field is relational
-            const parts = fieldKey.split('.');
-            let rootField = parts[0];
-            let collectionScope = null;
-            // a2o related collection scoped field selector `fields=sections.section_id:headings.title`
-            if (rootField.includes(':')) {
-                const [key, scope] = rootField.split(':');
-                rootField = key;
-                collectionScope = scope;
-            }
-            if (rootField in relationalStructure === false) {
-                if (collectionScope) {
-                    relationalStructure[rootField] = { [collectionScope]: [] };
-                }
-                else {
-                    relationalStructure[rootField] = [];
-                }
-            }
-            if (parts.length > 1) {
-                const childKey = parts.slice(1).join('.');
-                if (collectionScope) {
-                    if (collectionScope in relationalStructure[rootField] === false) {
-                        relationalStructure[rootField][collectionScope] = [];
-                    }
-                    relationalStructure[rootField][collectionScope].push(childKey);
-                }
-                else {
-                    relationalStructure[rootField].push(childKey);
-                }
-            }
-        }
-        else {
-            if (name.includes('(') && name.includes(')')) {
-                const columnName = name.match(REGEX_BETWEEN_PARENS)[1];
-                const foundField = context.schema.collections[options.parentCollection].fields[columnName];
-                if (foundField && foundField.type === 'alias') {
-                    const foundRelation = context.schema.relations.find((relation) => relation.related_collection === options.parentCollection && relation.meta?.one_field === columnName);
-                    if (foundRelation) {
-                        children.push({
-                            type: 'functionField',
-                            name,
-                            fieldKey,
-                            query: {},
-                            relatedCollection: foundRelation.collection,
-                            whenCase: [],
-                            cases: [],
-                        });
-                        continue;
-                    }
-                }
-            }
-            children.push({ type: 'field', name, fieldKey, whenCase: [] });
-        }
-    }
-    for (const [fieldKey, nestedFields] of Object.entries(relationalStructure)) {
-        let fieldName = fieldKey;
-        if (options.query.alias && fieldKey in options.query.alias) {
-            fieldName = options.query.alias[fieldKey];
-        }
-        const relatedCollection = getRelatedCollection(context.schema, options.parentCollection, fieldName);
-        const relation = getRelation(context.schema, options.parentCollection, fieldName);
-        if (!relation)
-            continue;
-        const relationType = getRelationType({
-            relation,
-            collection: options.parentCollection,
-            field: fieldName,
-        });
-        if (!relationType)
-            continue;
-        let child = null;
-        if (relationType === 'a2o') {
-            const allowedCollections = relation.meta.one_allowed_collections;
-            child = {
-                type: 'a2o',
-                names: allowedCollections,
-                children: {},
-                query: {},
-                relatedKey: {},
-                parentKey: context.schema.collections[options.parentCollection].primary,
-                fieldKey: fieldKey,
-                relation: relation,
-                cases: {},
-                whenCase: [],
-            };
-            for (const relatedCollection of allowedCollections) {
-                child.children[relatedCollection] = await parseFields({
-                    parentCollection: relatedCollection,
-                    fields: Array.isArray(nestedFields)
-                        ? nestedFields
-                        : nestedFields[relatedCollection] || [],
-                    query: options.query,
-                    deep: options.deep?.[`${fieldKey}:${relatedCollection}`],
-                    accountability: options.accountability,
-                }, context);
-                child.query[relatedCollection] = getDeepQuery(options.deep?.[`${fieldKey}:${relatedCollection}`] || {});
-                child.relatedKey[relatedCollection] = context.schema.collections[relatedCollection].primary;
-            }
-        }
-        else if (relatedCollection) {
-            if (options.accountability && options.accountability.admin === false && policies) {
-                const permissions = await fetchPermissions({
-                    action: 'read',
-                    collections: [relatedCollection],
-                    policies: policies,
-                    accountability: options.accountability,
-                }, context);
-                // Skip related collection if no permissions
-                if (permissions.length === 0) {
-                    continue;
-                }
-            }
-            // update query alias for children parseFields
-            const deepAlias = getDeepQuery(options.deep?.[fieldKey] || {})?.['alias'];
-            if (!isEmpty(deepAlias))
-                options.query.alias = deepAlias;
-            child = {
-                type: relationType,
-                name: relatedCollection,
-                fieldKey: fieldKey,
-                parentKey: context.schema.collections[options.parentCollection].primary,
-                relatedKey: context.schema.collections[relatedCollection].primary,
-                relation: relation,
-                query: getDeepQuery(options.deep?.[fieldKey] || {}),
-                children: await parseFields({
-                    parentCollection: relatedCollection,
-                    fields: nestedFields,
-                    query: options.query,
-                    deep: options.deep?.[fieldKey] || {},
-                    accountability: options.accountability,
-                }, context),
-                cases: [],
-                whenCase: [],
-            };
-            if (relationType === 'o2m' && !child.query.sort) {
-                child.query.sort = [relation.meta?.sort_field || context.schema.collections[relation.collection].primary];
-            }
-        }
-        if (child) {
-            children.push(child);
-        }
-    }
-    // Deduplicate any children fields that are included both as a regular field, and as a nested m2o field
-    const nestedCollectionNodes = children.filter((childNode) => childNode.type !== 'field');
-    return children.filter((childNode) => {
-        const existsAsNestedRelational = !!nestedCollectionNodes.find((nestedCollectionNode) => childNode.fieldKey === nestedCollectionNode.fieldKey);
-        if (childNode.type === 'field' && existsAsNestedRelational)
-            return false;
-        return true;
-    });
-}

package/dist/database/get-ast-from-query/utils/get-deep-query.d.ts

@@ -1,14 +0,0 @@
-/**
- * Convert Deep query object to regular query object by ignoring all nested fields and returning the
- * `_` prefixed fields as top level query fields
- *
- * @example
- *
- * ```js
- * getDeepQuery({
- *   _sort: ['a']
- * });
- * // => { sort: ['a'] }
- * ```
- */
-export declare function getDeepQuery(query: Record<string, any>): Record<string, any>;

package/dist/database/get-ast-from-query/utils/get-deep-query.js

@@ -1,17 +0,0 @@
-import { mapKeys, omitBy } from 'lodash-es';
-/**
- * Convert Deep query object to regular query object by ignoring all nested fields and returning the
- * `_` prefixed fields as top level query fields
- *
- * @example
- *
- * ```js
- * getDeepQuery({
- *   _sort: ['a']
- * });
- * // => { sort: ['a'] }
- * ```
- */
-export function getDeepQuery(query) {
-    return mapKeys(omitBy(query, (_value, key) => key.startsWith('_') === false), (_value, key) => key.substring(1));
-}

package/dist/database/get-ast-from-query/utils/get-related-collection.d.ts

@@ -1,2 +0,0 @@
-import type { SchemaOverview } from '@directus/types';
-export declare function getRelatedCollection(schema: SchemaOverview, collection: string, field: string): string | null;

package/dist/database/get-ast-from-query/utils/get-related-collection.js

@@ -1,13 +0,0 @@
-import { getRelation } from './get-relation.js';
-export function getRelatedCollection(schema, collection, field) {
-    const relation = getRelation(schema, collection, field);
-    if (!relation)
-        return null;
-    if (relation.collection === collection && relation.field === field) {
-        return relation.related_collection || null;
-    }
-    if (relation.related_collection === collection && relation.meta?.one_field === field) {
-        return relation.collection || null;
-    }
-    return null;
-}

package/dist/database/get-ast-from-query/utils/get-relation.d.ts

@@ -1,2 +0,0 @@
-import type { SchemaOverview } from '@directus/types';
-export declare function getRelation(schema: SchemaOverview, collection: string, field: string): import("@directus/types").Relation | undefined;

package/dist/database/get-ast-from-query/utils/get-relation.js

@@ -1,7 +0,0 @@
-export function getRelation(schema, collection, field) {
-    const relation = schema.relations.find((relation) => {
-        return ((relation.collection === collection && relation.field === field) ||
-            (relation.related_collection === collection && relation.meta?.one_field === field));
-    });
-    return relation;
-}

package/dist/database/migrations/20240710A-permissions-policies.js

@@ -1,169 +0,0 @@
-import { randomUUID } from 'node:crypto';
-import { processChunk } from '@directus/utils';
-/**
- * The public role used to be `null`, we gotta create a single new policy for the permissions
- * previously attached to the public role (marked through `role = null`).
- */
-const PUBLIC_POLICY_ID = 'abf8a154-5b1c-4a46-ac9c-7300570f4f17';
-export async function up(knex) {
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // If the policies table already exists the migration has already run
-    if (await knex.schema.hasTable('directus_policies')) {
-        return;
-    }
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Create new policies table that mirrors previous Roles
-    await knex.schema.createTable('directus_policies', (table) => {
-        table.uuid('id').primary();
-        table.string('name', 100).notNullable();
-        table.string('icon', 64).notNullable().defaultTo('badge');
-        table.text('description');
-        table.text('ip_access');
-        table.boolean('enforce_tfa').defaultTo(false).notNullable();
-        table.boolean('admin_access').defaultTo(false).notNullable();
-        table.boolean('app_access').defaultTo(false).notNullable();
-    });
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Copy over all existing roles into new policies
-    const roles = await knex
-        .select('id', 'name', 'icon', 'description', 'ip_access', 'enforce_tfa', 'admin_access', 'app_access')
-        .from('directus_roles');
-    if (roles.length > 0) {
-        await processChunk(roles, 100, async (chunk) => {
-            await knex('directus_policies').insert(chunk);
-        });
-    }
-    await knex
-        .insert({
-        id: PUBLIC_POLICY_ID,
-        name: '$t:public_label',
-        icon: 'public',
-        description: '$t:public_description',
-        app_access: false,
-    })
-        .into('directus_policies');
-    // Change the admin policy description to $t:admin_policy_description
-    await knex('directus_policies')
-        .update({
-        description: '$t:admin_policy_description',
-    })
-        .where('description', 'LIKE', '$t:admin_description');
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Remove access control + add nesting to roles
-    await knex.schema.alterTable('directus_roles', (table) => {
-        table.dropColumn('ip_access');
-        table.dropColumn('enforce_tfa');
-        table.dropColumn('admin_access');
-        table.dropColumn('app_access');
-        table.uuid('parent').references('directus_roles.id');
-    });
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Link permissions to policies instead of roles
-    await knex.schema.alterTable('directus_permissions', (table) => {
-        table.uuid('policy').references('directus_policies.id').onDelete('CASCADE');
-        // Drop the foreign key constraint here in order to update `null` role to public policy ID
-        table.dropForeign('role');
-    });
-    await knex('directus_permissions')
-        .update({
-        role: PUBLIC_POLICY_ID,
-    })
-        .whereNull('role');
-    await knex('directus_permissions').update({
-        policy: knex.ref('role'),
-    });
-    await knex.schema.alterTable('directus_permissions', (table) => {
-        table.dropColumns('role');
-        table.dropNullable('policy');
-    });
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Setup junction table between roles/users and policies
-    // This could be a A2O style setup with a collection/item field rather than individual foreign
-    // keys, but we want to be able to show the reverse-relationship on the individual policies as
-    // well, which would require the O2A type to exist in Directus which currently doesn't.
-    // Shouldn't be the end of the world here, as we know we're only attaching policies to two other
-    // collections.
-    await knex.schema.createTable('directus_access', (table) => {
-        table.uuid('id').primary();
-        table.uuid('role').references('directus_roles.id').nullable().onDelete('CASCADE');
-        table.uuid('user').references('directus_users.id').nullable().onDelete('CASCADE');
-        table.uuid('policy').references('directus_policies.id').notNullable().onDelete('CASCADE');
-        table.integer('sort');
-    });
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Attach policies to existing roles for backwards compatibility
-    const policyAttachments = roles.map((role) => ({
-        id: randomUUID(),
-        role: role.id,
-        user: null,
-        policy: role.id,
-        sort: 1,
-    }));
-    await processChunk(policyAttachments, 100, async (chunk) => {
-        await knex('directus_access').insert(chunk);
-    });
-    await knex('directus_access').insert({
-        id: randomUUID(),
-        role: null,
-        user: null,
-        policy: PUBLIC_POLICY_ID,
-        sort: 1,
-    });
-}
-export async function down(knex) {
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Reinstate access control fields on directus roles + remove nesting
-    await knex.schema.alterTable('directus_roles', (table) => {
-        table.text('ip_access');
-        table.boolean('enforce_tfa').defaultTo(false).notNullable();
-        table.boolean('admin_access').defaultTo(false).notNullable();
-        table.boolean('app_access').defaultTo(true).notNullable();
-        table.dropForeign('parent');
-        table.dropColumn('parent');
-    });
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Copy policy access control rules back to roles
-    const policies = await knex
-        .select('id', 'ip_access', 'enforce_tfa', 'admin_access', 'app_access')
-        .from('directus_policies')
-        .whereNot({ id: PUBLIC_POLICY_ID });
-    for (const policy of policies) {
-        await knex('directus_roles')
-            .update({
-            ip_access: policy.ip_access,
-            enforce_tfa: policy.enforce_tfa,
-            admin_access: policy.admin_access,
-            app_access: policy.app_access,
-        })
-            .where({ id: policy.id });
-    }
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Drop all permissions that are only attached to a user
-    // TODO query all policies that are attached to a user and delete their permissions,
-    //  since we don't know were to put them now and it'll cause a foreign key problem
-    //  as soon as we reference directus_roles in directus_permissions again
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Drop policy attachments
-    await knex.schema.dropTable('directus_access');
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Reattach permissions to roles instead of policies
-    await knex.schema.alterTable('directus_permissions', (table) => {
-        table.uuid('role').nullable();
-    });
-    await knex('directus_permissions').update({
-        role: knex.ref('policy'),
-    });
-    await knex('directus_permissions')
-        .update({
-        role: null,
-    })
-        .where({ role: PUBLIC_POLICY_ID });
-    await knex.schema.alterTable('directus_permissions', (table) => {
-        table.uuid('role').references('directus_roles.id').alter();
-        table.dropForeign('policy');
-        table.dropColumn('policy');
-    });
-    /////////////////////////////////////////////////////////////////////////////////////////////////
-    // Drop policies table
-    await knex.schema.dropTable('directus_policies');
-}

package/dist/database/run-ast/lib/get-db-query.d.ts

@@ -1,4 +0,0 @@
-import type { Filter, Query, SchemaOverview } from '@directus/types';
-import type { Knex } from 'knex';
-import type { FieldNode, FunctionFieldNode, O2MNode } from '../../../types/ast.js';
-export declare function getDBQuery(schema: SchemaOverview, knex: Knex, table: string, fieldNodes: (FieldNode | FunctionFieldNode)[], o2mNodes: O2MNode[], query: Query, cases: Filter[]): Knex.QueryBuilder;

package/dist/database/run-ast/lib/get-db-query.js

@@ -1,208 +0,0 @@
-import { useEnv } from '@directus/env';
-import { cloneDeep } from 'lodash-es';
-import applyQuery, { applyLimit, applySort, generateAlias } from '../../../utils/apply-query.js';
-import { getCollectionFromAlias } from '../../../utils/get-collection-from-alias.js';
-import { getColumn } from '../../../utils/get-column.js';
-import { getHelpers } from '../../helpers/index.js';
-import { applyCaseWhen } from '../utils/apply-case-when.js';
-import { getColumnPreprocessor } from '../utils/get-column-pre-processor.js';
-import { getNodeAlias } from '../utils/get-field-alias.js';
-import { getInnerQueryColumnPreProcessor } from '../utils/get-inner-query-column-pre-processor.js';
-export function getDBQuery(schema, knex, table, fieldNodes, o2mNodes, query, cases) {
-    const aliasMap = Object.create(null);
-    const env = useEnv();
-    const preProcess = getColumnPreprocessor(knex, schema, table, cases, aliasMap);
-    const queryCopy = cloneDeep(query);
-    const helpers = getHelpers(knex);
-    const hasCaseWhen = o2mNodes.some((node) => node.whenCase && node.whenCase.length > 0) ||
-        fieldNodes.some((node) => node.whenCase && node.whenCase.length > 0);
-    queryCopy.limit = typeof queryCopy.limit === 'number' ? queryCopy.limit : Number(env['QUERY_LIMIT_DEFAULT']);
-    // Queries with aggregates and groupBy will not have duplicate result
-    if (queryCopy.aggregate || queryCopy.group) {
-        const flatQuery = knex.from(table).select(fieldNodes.map((node) => preProcess(node)));
-        return applyQuery(knex, table, flatQuery, queryCopy, schema, cases).query;
-    }
-    const primaryKey = schema.collections[table].primary;
-    let dbQuery = knex.from(table);
-    let sortRecords;
-    const innerQuerySortRecords = [];
-    let hasMultiRelationalSort;
-    if (queryCopy.sort) {
-        const sortResult = applySort(knex, schema, dbQuery, queryCopy, table, aliasMap, true);
-        if (sortResult) {
-            sortRecords = sortResult.sortRecords;
-            hasMultiRelationalSort = sortResult.hasMultiRelationalSort;
-        }
-    }
-    const { hasMultiRelationalFilter } = applyQuery(knex, table, dbQuery, queryCopy, schema, cases, {
-        aliasMap,
-        isInnerQuery: true,
-        hasMultiRelationalSort,
-    });
-    const needsInnerQuery = hasMultiRelationalSort || hasMultiRelationalFilter;
-    if (needsInnerQuery) {
-        dbQuery.select(`${table}.${primaryKey}`);
-        // Only add distinct if there are no case/when constructs, since otherwise we rely on group by
-        if (!hasCaseWhen)
-            dbQuery.distinct();
-    }
-    else {
-        dbQuery.select(fieldNodes.map((node) => preProcess(node)));
-        // Add flags for o2m fields with case/when to the let the DB to the partial item permissions
-        dbQuery.select(o2mNodes
-            .filter((node) => node.whenCase && node.whenCase.length > 0)
-            .map((node) => {
-            const columnCases = node.whenCase.map((index) => cases[index]);
-            return applyCaseWhen({
-                column: knex.raw(1),
-                columnCases,
-                aliasMap,
-                cases,
-                table,
-                alias: node.fieldKey,
-            }, { knex, schema });
-        }));
-    }
-    if (sortRecords) {
-        // Clears the order if any, eg: from MSSQL offset
-        dbQuery.clear('order');
-        if (needsInnerQuery) {
-            let orderByString = '';
-            const orderByFields = [];
-            sortRecords.map((sortRecord) => {
-                if (orderByString.length !== 0) {
-                    orderByString += ', ';
-                }
-                const sortAlias = `sort_${generateAlias()}`;
-                if (sortRecord.column.includes('.')) {
-                    const [alias, field] = sortRecord.column.split('.');
-                    const originalCollectionName = getCollectionFromAlias(alias, aliasMap);
-                    dbQuery.select(getColumn(knex, alias, field, sortAlias, schema, { originalCollectionName }));
-                    orderByString += `?? ${sortRecord.order}`;
-                    orderByFields.push(getColumn(knex, alias, field, false, schema, { originalCollectionName }));
-                }
-                else {
-                    dbQuery.select(getColumn(knex, table, sortRecord.column, sortAlias, schema));
-                    orderByString += `?? ${sortRecord.order}`;
-                    orderByFields.push(getColumn(knex, table, sortRecord.column, false, schema));
-                }
-                innerQuerySortRecords.push({ alias: sortAlias, order: sortRecord.order });
-            });
-            if (hasMultiRelationalSort) {
-                dbQuery = helpers.schema.applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields);
-                // Start order by with directus_row_number. The directus_row_number is derived from a window function that
-                // is ordered by the sort fields within every primary key partition. That ensures that the result with the
-                // row number = 1 is the top-most row of every partition, according to the selected sort fields.
-                // Since the only relevant result is the first row of this partition, adding the directus_row_number to the
-                // order by here ensures that all rows with a directus_row_number = 1 show up first in the inner query result,
-                // and are correctly truncated by the limit, but not earlier.
-                orderByString = `?? asc, ${orderByString}`;
-                orderByFields.unshift(knex.ref('directus_row_number'));
-            }
-            dbQuery.orderByRaw(orderByString, orderByFields);
-        }
-        else {
-            sortRecords.map((sortRecord) => {
-                if (sortRecord.column.includes('.')) {
-                    const [alias, field] = sortRecord.column.split('.');
-                    sortRecord.column = getColumn(knex, alias, field, false, schema, {
-                        originalCollectionName: getCollectionFromAlias(alias, aliasMap),
-                    });
-                }
-                else {
-                    sortRecord.column = getColumn(knex, table, sortRecord.column, false, schema);
-                }
-            });
-            dbQuery.orderBy(sortRecords);
-        }
-    }
-    if (!needsInnerQuery)
-        return dbQuery;
-    const innerCaseWhenAliasPrefix = generateAlias();
-    if (hasCaseWhen) {
-        /* If there are cases, we need to employ a trick in order to evaluate the case/when structure in the inner query,
-           while passing the result of the evaluation to the outer query. The case/when needs to be evaluated in the inner
-           query since only there all joined in tables, that might be required for the case/when, are available.
-
-           The problem is, that the resulting columns can not be directly selected in the inner query,
-           as a `SELECT DISTINCT` does not work for all datatypes in all vendors.
-
-           So instead of having an inner query which might look like this:
-
-           SELECT DISTINCT ...,
-             CASE WHEN <condition> THEN <actual-column> END AS <alias>
-
-             Another problem is that all not all rows with the same primary key are guaranteed to have the same value for
-             the columns with the case/when, so we to `or` those together, but counting the number of flags in a group by
-             operation. This way the flag is set to > 0 if any of the rows in the group allows access to the column.
-
-           The inner query only evaluates the condition and passes up or-ed flag, that is used in the wrapper query to select
-           the actual column:
-
-           SELECT ...,
-             COUNT (CASE WHEN <condition> THEN 1 END) AS <random-prefix>_<alias>
-             ...
-             GROUP BY <primary-key>
-
-            Then, in the wrapper query there is no need to evaluate the condition again, but instead rely on the flag:
-
-            SELECT ...,
-              CASE WHEN `inner`.<random-prefix>_<alias> > 0 THEN <actual-column> END AS <alias>
-         */
-        const innerPreprocess = getInnerQueryColumnPreProcessor(knex, schema, table, cases, aliasMap, innerCaseWhenAliasPrefix);
-        // To optimize the query we avoid having unnecessary columns in the inner query, that don't have a caseWhen, since
-        // they are selected in the outer query directly
-        dbQuery.select(fieldNodes.map(innerPreprocess).filter((x) => x !== null));
-        // In addition to the regular columns select a flag that indicates if a user has access to o2m related field
-        // based on the case/when of that field.
-        dbQuery.select(o2mNodes.map(innerPreprocess).filter((x) => x !== null));
-        const groupByFields = [knex.raw('??.??', [table, primaryKey])];
-        if (hasMultiRelationalSort) {
-            // Sort fields that are not directly in the table the primary key is from need to be included in the group
-            // by clause, otherwise this causes problems on some DBs
-            groupByFields.push(...innerQuerySortRecords.map(({ alias }) => knex.raw('??', alias)));
-        }
-        dbQuery.groupBy(groupByFields);
-    }
-    const wrapperQuery = knex
-        .from(table)
-        .innerJoin(knex.raw('??', dbQuery.as('inner')), `${table}.${primaryKey}`, `inner.${primaryKey}`);
-    if (!hasCaseWhen) {
-        // No need for case/when in the wrapper query, just select the preprocessed columns
-        wrapperQuery.select(fieldNodes.map((node) => preProcess(node)));
-    }
-    else {
-        // This applies a simplified case/when construct in the wrapper query, that only looks at flag > 1
-        // Distinguish between column with and without case/when and handle them differently
-        const plainColumns = fieldNodes.filter((fieldNode) => !fieldNode.whenCase || fieldNode.whenCase.length === 0);
-        const whenCaseColumns = fieldNodes.filter((fieldNode) => fieldNode.whenCase && fieldNode.whenCase.length > 0);
-        // Select the plain columns
-        wrapperQuery.select(plainColumns.map((node) => preProcess(node)));
-        // Select the case/when columns based on the flag from the inner query
-        wrapperQuery.select(whenCaseColumns.map((fieldNode) => {
-            const alias = getNodeAlias(fieldNode);
-            const innerAlias = `${innerCaseWhenAliasPrefix}_${alias}`;
-            // Preprocess the column without the case/when, since that is applied in a simpler fashion in the select
-            const column = preProcess({ ...fieldNode, whenCase: [] }, { noAlias: true });
-            return knex.raw(`CASE WHEN ??.?? > 0 THEN ?? END as ??`, ['inner', innerAlias, column, alias]);
-        }));
-        // Pass the flags of o2m fields up through the wrapper query
-        wrapperQuery.select(o2mNodes
-            .filter((node) => node.whenCase && node.whenCase.length > 0)
-            .map((node) => {
-            const alias = node.fieldKey;
-            const innerAlias = `${innerCaseWhenAliasPrefix}_${alias}`;
-            return knex.raw(`CASE WHEN ??.?? > 0 THEN 1 END as ??`, ['inner', innerAlias, alias]);
-        }));
-    }
-    if (sortRecords) {
-        innerQuerySortRecords.map((innerQuerySortRecord) => {
-            wrapperQuery.orderBy(`inner.${innerQuerySortRecord.alias}`, innerQuerySortRecord.order);
-        });
-        if (hasMultiRelationalSort) {
-            wrapperQuery.where('inner.directus_row_number', '=', 1);
-            applyLimit(knex, wrapperQuery, queryCopy.limit);
-        }
-    }
-    return wrapperQuery;
-}

package/dist/database/run-ast/lib/parse-current-level.d.ts

@@ -1,7 +0,0 @@
-import type { Query, SchemaOverview } from '@directus/types';
-import type { FieldNode, FunctionFieldNode, NestedCollectionNode } from '../../../types/ast.js';
-export declare function parseCurrentLevel(schema: SchemaOverview, collection: string, children: (NestedCollectionNode | FieldNode | FunctionFieldNode)[], query: Query): Promise<{
-    fieldNodes: FieldNode[];
-    nestedCollectionNodes: NestedCollectionNode[];
-    primaryKeyField: string;
-}>;