mirror of
https://github.com/directus/directus.git
synced 2026-04-25 03:00:53 -04:00
* Step 1 * Step 2 * False sense of confidence * Couple more before dinner * Update schema package * Update format-title * Upgrade specs file * Close * Replace ts-node-dev with tsx, and various others * Replace lodash with lodash-es * Add lodash-es types * Update knex import * More fun is had * FSE * Consolidate repos * Various tweaks and fixes * Fix specs * Remove dependency on knex-schema-inspector * Fix wrong imports of inspector * Move shared exceptions to new package * Move constants to separate module * Move types to new types package * Use directus/types * I believe this is no longer needed * [WIP] Start moving utils to esm * ESMify Shared * Move shared utils to @directus/utils * Use @directus/utils instead of @directus/shared/utils * It runs! * Use correct schemaoverview type * Fix imports * Fix the thing * Start on new update-checker lib * Use new update-check package * Swap out directus/shared in app * Pushing through the last bits now * Dangerously make extensions SDK ESM * Use @directus/types in tests * Copy util function to test * Fix linter config * Add missing import * Hot takes * Fix build * Curse these default exports * No tests in constants * Add tests * Remove tests from types * Add tests for exceptions * Fix test * Fix app tests * Fix import in test * Fix various tests * Fix specs export * Some more tests * Remove broken integration tests These were broken beyond repair.. They were also written before we really knew what we we're doing with tests, so I think it's better to say goodbye and start over with these * Regenerate lockfile * Fix imports from merge * I create my own problems * Make sharp play nice * Add vitest config * Install missing blackbox dep * Consts shouldn't be in types tsk tsk tsk tsk * Fix type/const usage in extensions-sdk * cursed.default * Reduce circular deps * Fix circular dep in items service * vvv * Trigger testing for all vendors * Add workaround for rollup * Prepend the file protocol for the ESM loader to be compatible with Windows "WARN: Only URLs with a scheme in: file and data are supported by the default ESM loader. On Windows, absolute paths must be valid file:// URLs. Received protocol 'c:'" * Fix postgres * Schema package updates Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> * Resolve cjs/mjs extensions * Clean-up eslint config * fixed extension concatination * using string interpolation for consistency * Revert MySQL optimisation * Revert testing for all vendors * Replace tsx with esbuild-kit/esm-loader Is a bit faster and we can rely on the built-in `watch` and `inspect` functionalities of Node.js Note: The possibility to watch other files (.env in our case) might be added in the future, see https://github.com/nodejs/node/issues/45467 * Use exact version for esbuild-kit/esm-loader * Fix import --------- Co-authored-by: ian <licitdev@gmail.com> Co-authored-by: Brainslug <tim@brainslug.nl> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
101 lines
3.1 KiB
TypeScript
101 lines
3.1 KiB
TypeScript
import type { Relation, SchemaOverview } from '@directus/types';
|
|
import { InvalidQueryException } from '../exceptions/index.js';
|
|
import { getRelationInfo } from './get-relation-info.js';
|
|
|
|
export type AliasMap = { [key: string]: { alias: string; collection: string } };
|
|
|
|
export type ColPathProps = {
|
|
path: string[];
|
|
collection: string;
|
|
aliasMap: AliasMap;
|
|
relations: Relation[];
|
|
schema?: SchemaOverview;
|
|
};
|
|
|
|
export type ColPathResult = {
|
|
columnPath: string;
|
|
targetCollection: string;
|
|
addNestedPkField: string | undefined;
|
|
};
|
|
|
|
/**
|
|
* Converts a Directus field list path to the correct SQL names based on the constructed alias map.
|
|
* For example: ['author', 'role', 'name'] -> 'ljnsv.name'
|
|
* Also returns the target collection of the column: 'directus_roles'
|
|
* If the last filter path is an alias field, a nested PK is appended to the path
|
|
*/
|
|
export function getColumnPath({ path, collection, aliasMap, relations, schema }: ColPathProps) {
|
|
return followRelation(path);
|
|
|
|
function followRelation(
|
|
pathParts: string[],
|
|
parentCollection: string = collection,
|
|
parentFields?: string,
|
|
addNestedPkField?: string
|
|
): ColPathResult {
|
|
/**
|
|
* For A2M fields, the path can contain an optional collection scope <field>:<scope>
|
|
*/
|
|
const pathRoot = pathParts[0]!.split(':')[0];
|
|
const { relation, relationType } = getRelationInfo(relations, parentCollection, pathRoot!);
|
|
|
|
if (!relation) {
|
|
throw new InvalidQueryException(`"${parentCollection}.${pathRoot}" is not a relational field`);
|
|
}
|
|
|
|
const alias = parentFields ? aliasMap[`${parentFields}.${pathParts[0]}`]?.alias : aliasMap[pathParts[0]!]?.alias;
|
|
const remainingParts = pathParts.slice(1);
|
|
|
|
let parent: string;
|
|
|
|
if (relationType === 'a2o') {
|
|
const pathScope = pathParts[0]!.split(':')[1];
|
|
|
|
if (!pathScope) {
|
|
throw new InvalidQueryException(`You have to provide a collection scope when sorting on a many-to-any item`);
|
|
}
|
|
|
|
parent = pathScope;
|
|
} else if (relationType === 'm2o') {
|
|
parent = relation.related_collection!;
|
|
} else {
|
|
parent = relation.collection;
|
|
}
|
|
|
|
// Top level alias field
|
|
if (schema && !((remainingParts[0] ?? parent).includes('(') && (remainingParts[0] ?? parent).includes(')'))) {
|
|
if (remainingParts.length === 0) {
|
|
remainingParts.push(schema.collections[parent]!.primary);
|
|
addNestedPkField = schema.collections[parent]!.primary;
|
|
}
|
|
// Nested level alias field
|
|
else if (
|
|
remainingParts.length === 1 &&
|
|
schema.collections[parent]!.fields[remainingParts[0]!]!.type === 'alias'
|
|
) {
|
|
remainingParts.push(schema.collections[relation!.related_collection!]!.primary);
|
|
addNestedPkField = schema.collections[relation!.related_collection!]!.primary;
|
|
}
|
|
}
|
|
|
|
if (remainingParts.length === 1) {
|
|
return {
|
|
columnPath: `${alias || parent}.${remainingParts[0]}`,
|
|
targetCollection: parent,
|
|
addNestedPkField,
|
|
};
|
|
}
|
|
|
|
if (remainingParts.length) {
|
|
return followRelation(
|
|
remainingParts,
|
|
parent,
|
|
`${parentFields ? parentFields + '.' : ''}${pathParts[0]}`,
|
|
addNestedPkField
|
|
);
|
|
}
|
|
|
|
return { columnPath: '', targetCollection: '', addNestedPkField };
|
|
}
|
|
}
|