mirror of
https://github.com/directus/directus.git
synced 2026-01-27 18:18:09 -05: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>
363 lines
9.1 KiB
TypeScript
363 lines
9.1 KiB
TypeScript
/** @TODO replace with import from @directus/utils */
|
|
import { getFilterOperatorsForType } from '../../utils/get-filter-operators-for-type';
|
|
import type { ClientFilterOperator } from '@directus/types';
|
|
import { FilterValidator, FilterEmptyValidator } from '@query/filter';
|
|
import { GeneratedFilter } from '..';
|
|
|
|
export const type = 'dateTime';
|
|
export const filterOperatorList = getFilterOperatorsForType(type);
|
|
|
|
export const generateFilterForDataType = (filter: ClientFilterOperator, possibleValues: any): GeneratedFilter[] => {
|
|
if (!filterOperatorList.includes(filter)) {
|
|
throw new Error(`Invalid filter operator for ${type}: ${filter}`);
|
|
}
|
|
|
|
switch (filter) {
|
|
case 'eq':
|
|
case 'neq':
|
|
case 'lt':
|
|
case 'lte':
|
|
case 'gt':
|
|
case 'gte':
|
|
if (Array.isArray(possibleValues)) {
|
|
return possibleValues.map((value) => {
|
|
return {
|
|
operator: filter,
|
|
value: value,
|
|
filter: {
|
|
[`_${filter}`]: value,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
};
|
|
});
|
|
}
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: possibleValues,
|
|
filter: {
|
|
[`_${filter}`]: possibleValues,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
case 'between':
|
|
case 'nbetween':
|
|
if (Array.isArray(possibleValues)) {
|
|
// Check if other values outside of the range can be filtered
|
|
const sortedPossibleValues = [...possibleValues].sort();
|
|
const middleIndex = Math.floor(sortedPossibleValues.length / 2);
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: [sortedPossibleValues[0], sortedPossibleValues[middleIndex]],
|
|
filter: {
|
|
[`_${filter}`]: [sortedPossibleValues[0], sortedPossibleValues[middleIndex]],
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
}
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: [possibleValues, possibleValues],
|
|
filter: {
|
|
[`_${filter}`]: [possibleValues, possibleValues],
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
case 'null':
|
|
case 'nnull':
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: true,
|
|
filter: {
|
|
[`_${filter}`]: true,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
case 'in':
|
|
case 'nin':
|
|
if (Array.isArray(possibleValues)) {
|
|
// Check if other values outside of the range can be filtered
|
|
const middleIndex = Math.floor(possibleValues.length / 2);
|
|
const partialPossibleValues = possibleValues.slice(0, middleIndex);
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: partialPossibleValues,
|
|
filter: {
|
|
[`_${filter}`]: partialPossibleValues,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
}
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: [possibleValues],
|
|
filter: {
|
|
[`_${filter}`]: [possibleValues],
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
default:
|
|
throw new Error(`Unimplemented filter operator for ${type}: ${filter}`);
|
|
}
|
|
};
|
|
|
|
export const getValidatorFunction = (filter: ClientFilterOperator): FilterValidator => {
|
|
if (!filterOperatorList.includes(filter)) {
|
|
throw new Error(`Invalid filter operator for ${type}: ${filter}`);
|
|
}
|
|
|
|
switch (filter) {
|
|
case 'eq':
|
|
return _eq;
|
|
case 'neq':
|
|
return _neq;
|
|
case 'lt':
|
|
return _lt;
|
|
case 'lte':
|
|
return _lte;
|
|
case 'gt':
|
|
return _gt;
|
|
case 'gte':
|
|
return _gte;
|
|
case 'between':
|
|
return _between;
|
|
case 'nbetween':
|
|
return _nbetween;
|
|
case 'null':
|
|
return _null;
|
|
case 'nnull':
|
|
return _nnull;
|
|
case 'in':
|
|
return _in;
|
|
case 'nin':
|
|
return _nin;
|
|
default:
|
|
throw new Error(`Unimplemented filter operator for ${type}: ${filter}`);
|
|
}
|
|
};
|
|
|
|
const _eq = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
|
|
if (inputValue === possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _neq = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
|
|
if (inputValue !== possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _lt = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
|
|
if (inputValue < possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _lte = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
|
|
if (inputValue <= possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _gt = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
|
|
if (inputValue > possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _gte = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
|
|
if (inputValue >= possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _between = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = [parseDatetimeString(possibleValues[0]), parseDatetimeString(possibleValues[1])];
|
|
|
|
if (inputValue >= possibleValues[0] && inputValue <= possibleValues[1]) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _nbetween = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = [parseDatetimeString(possibleValues[0]), parseDatetimeString(possibleValues[1])];
|
|
|
|
if (inputValue < possibleValues[0] || inputValue > possibleValues[1]) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _null = (inputValue: any, _possibleValues: any): boolean => {
|
|
if (inputValue === undefined || inputValue === null) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _nnull = (inputValue: any, _possibleValues: any): boolean => {
|
|
if (inputValue !== undefined && inputValue !== null) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _in = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = possibleValues.map((v: any) => parseDatetimeString(v));
|
|
|
|
for (const value of possibleValues) {
|
|
if (inputValue === value) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
};
|
|
|
|
const _nin = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
possibleValues = possibleValues.map((v: any) => parseDatetimeString(v));
|
|
|
|
for (const value of possibleValues) {
|
|
if (inputValue === value) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
};
|
|
|
|
export const getEmptyAllowedFunction = (filter: ClientFilterOperator): FilterEmptyValidator => {
|
|
if (!filterOperatorList.includes(filter)) {
|
|
throw new Error(`Invalid filter operator for ${type}: ${filter}`);
|
|
}
|
|
|
|
switch (filter) {
|
|
case 'lt':
|
|
return empty_lt;
|
|
case 'gt':
|
|
return empty_gt;
|
|
case 'nbetween':
|
|
return empty_nbetween;
|
|
default:
|
|
return empty_invalid;
|
|
}
|
|
};
|
|
|
|
const empty_invalid = (_inputValue: any, _possibleValues: any): boolean => {
|
|
return false;
|
|
};
|
|
|
|
const empty_lt = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
|
|
if (Array.isArray(possibleValues)) {
|
|
for (const value of possibleValues) {
|
|
if (parseDatetimeString(value) < inputValue) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
} else {
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
return inputValue >= possibleValues;
|
|
}
|
|
};
|
|
|
|
const empty_gt = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = parseDatetimeString(inputValue);
|
|
|
|
if (Array.isArray(possibleValues)) {
|
|
for (const value of possibleValues) {
|
|
if (parseDatetimeString(value) > inputValue) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
} else {
|
|
possibleValues = parseDatetimeString(possibleValues);
|
|
return inputValue <= possibleValues;
|
|
}
|
|
};
|
|
|
|
const empty_nbetween = (inputValue: any, possibleValues: any): boolean => {
|
|
inputValue = [parseDatetimeString(inputValue[0]), parseDatetimeString(inputValue[1])];
|
|
|
|
if (Array.isArray(possibleValues)) {
|
|
for (let value of possibleValues) {
|
|
value = parseDatetimeString(value);
|
|
|
|
if (value < inputValue[0] || value > inputValue[1]) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
} else {
|
|
possibleValues = [parseDatetimeString(possibleValues[0]), parseDatetimeString(possibleValues[1])];
|
|
return inputValue[0] >= possibleValues && inputValue[1] <= possibleValues;
|
|
}
|
|
};
|
|
|
|
function parseDatetimeString(value: string) {
|
|
if (value.length === 8) {
|
|
return new Date(`1970-01-01T${value}Z`).getTime();
|
|
} else if (value.length === 10) {
|
|
return new Date(`${value}T00:00:00Z`).getTime();
|
|
} else {
|
|
return new Date(value).getTime();
|
|
}
|
|
}
|