mirror of
https://github.com/directus/directus.git
synced 2026-01-29 08:17:55 -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>
301 lines
8.8 KiB
TypeScript
301 lines
8.8 KiB
TypeScript
import BaseJoi, { AnySchema, StringSchema as BaseStringSchema, NumberSchema, DateSchema } from 'joi';
|
|
import { escapeRegExp, merge } from 'lodash-es';
|
|
import type { FieldFilter } from '@directus/types';
|
|
|
|
export interface StringSchema extends BaseStringSchema {
|
|
contains(substring: string): this;
|
|
ncontains(substring: string): this;
|
|
}
|
|
|
|
export const Joi: typeof BaseJoi = BaseJoi.extend({
|
|
type: 'string',
|
|
base: BaseJoi.string(),
|
|
messages: {
|
|
'string.contains': '{{#label}} must contain [{{#substring}}]',
|
|
'string.ncontains': "{{#label}} can't contain [{{#substring}}]",
|
|
},
|
|
rules: {
|
|
contains: {
|
|
args: [
|
|
{
|
|
name: 'substring',
|
|
ref: true,
|
|
assert: (val) => typeof val === 'string',
|
|
message: 'must be a string',
|
|
},
|
|
],
|
|
method(substring) {
|
|
return this.$_addRule({ name: 'contains', args: { substring } });
|
|
},
|
|
validate(value, helpers, { substring }) {
|
|
if (value.includes(substring) === false) {
|
|
return helpers.error('string.contains', { substring });
|
|
}
|
|
return value;
|
|
},
|
|
},
|
|
ncontains: {
|
|
args: [
|
|
{
|
|
name: 'substring',
|
|
ref: true,
|
|
assert: (val) => typeof val === 'string',
|
|
message: 'must be a string',
|
|
},
|
|
],
|
|
method(substring) {
|
|
return this.$_addRule({ name: 'ncontains', args: { substring } });
|
|
},
|
|
validate(value, helpers, { substring }) {
|
|
if (value.includes(substring) === true) {
|
|
return helpers.error('string.ncontains', { substring });
|
|
}
|
|
|
|
return value;
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
export type JoiOptions = {
|
|
requireAll?: boolean;
|
|
};
|
|
|
|
const defaults: JoiOptions = {
|
|
requireAll: false,
|
|
};
|
|
|
|
/**
|
|
* Generate a Joi schema from a filter object.
|
|
*
|
|
* @param {FieldFilter} filter - Field filter object. Note: does not support _and/_or filters.
|
|
* @param {JoiOptions} [options] - Options for the schema generation.
|
|
* @returns {AnySchema} Joi schema.
|
|
*/
|
|
|
|
export function generateJoi(filter: FieldFilter | null, options?: JoiOptions): AnySchema {
|
|
filter = filter || {};
|
|
|
|
options = merge({}, defaults, options);
|
|
|
|
const schema: Record<string, AnySchema> = {};
|
|
|
|
const key = Object.keys(filter)[0];
|
|
|
|
if (!key) {
|
|
throw new Error(`[generateJoi] Filter doesn't contain field key. Passed filter: ${JSON.stringify(filter)}`);
|
|
}
|
|
|
|
const value = Object.values(filter)[0];
|
|
|
|
if (!value) {
|
|
throw new Error(`[generateJoi] Filter doesn't contain filter rule. Passed filter: ${JSON.stringify(filter)}`);
|
|
}
|
|
|
|
if (Object.keys(value)[0]?.startsWith('_') === false) {
|
|
schema[key] = generateJoi(value as FieldFilter, options);
|
|
} else {
|
|
const operator = Object.keys(value)[0];
|
|
const compareValue = Object.values(value)[0];
|
|
|
|
const getAnySchema = () => schema[key] ?? Joi.any();
|
|
const getStringSchema = () => (schema[key] ?? Joi.string()) as StringSchema;
|
|
const getNumberSchema = () => (schema[key] ?? Joi.number()) as NumberSchema;
|
|
const getDateSchema = () => (schema[key] ?? Joi.date()) as DateSchema;
|
|
|
|
if (operator === '_eq') {
|
|
const numericValue =
|
|
compareValue === null || compareValue === '' || compareValue === true || compareValue === false
|
|
? NaN
|
|
: Number(compareValue);
|
|
if (isNaN(numericValue)) {
|
|
schema[key] = getAnySchema().equal(compareValue);
|
|
} else {
|
|
schema[key] = getAnySchema().equal(compareValue, numericValue);
|
|
}
|
|
}
|
|
|
|
if (operator === '_neq') {
|
|
const numericValue =
|
|
compareValue === null || compareValue === '' || compareValue === true || compareValue === false
|
|
? NaN
|
|
: Number(compareValue);
|
|
if (isNaN(numericValue)) {
|
|
schema[key] = getAnySchema().not(compareValue);
|
|
} else {
|
|
schema[key] = getAnySchema().not(compareValue, numericValue);
|
|
}
|
|
}
|
|
|
|
if (operator === '_contains') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().contains(compareValue);
|
|
}
|
|
}
|
|
|
|
if (operator === '_icontains') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().contains(compareValue);
|
|
}
|
|
}
|
|
|
|
if (operator === '_ncontains') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().ncontains(compareValue);
|
|
}
|
|
}
|
|
|
|
if (operator === '_starts_with') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().pattern(new RegExp(`^${escapeRegExp(compareValue)}.*`), {
|
|
name: 'starts_with',
|
|
});
|
|
}
|
|
}
|
|
|
|
if (operator === '_nstarts_with') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().pattern(new RegExp(`^${escapeRegExp(compareValue)}.*`), {
|
|
name: 'starts_with',
|
|
invert: true,
|
|
});
|
|
}
|
|
}
|
|
|
|
if (operator === '_ends_with') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().pattern(new RegExp(`.*${escapeRegExp(compareValue)}$`), {
|
|
name: 'ends_with',
|
|
});
|
|
}
|
|
}
|
|
|
|
if (operator === '_nends_with') {
|
|
if (compareValue === null || compareValue === undefined || typeof compareValue !== 'string') {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
schema[key] = getStringSchema().pattern(new RegExp(`.*${escapeRegExp(compareValue)}$`), {
|
|
name: 'ends_with',
|
|
invert: true,
|
|
});
|
|
}
|
|
}
|
|
|
|
if (operator === '_in') {
|
|
schema[key] = getAnySchema().equal(...(compareValue as (string | number)[]));
|
|
}
|
|
|
|
if (operator === '_nin') {
|
|
schema[key] = getAnySchema().not(...(compareValue as (string | number)[]));
|
|
}
|
|
|
|
if (operator === '_gt') {
|
|
const isDate = compareValue instanceof Date || Number.isNaN(Number(compareValue));
|
|
schema[key] = isDate
|
|
? getDateSchema().greater(compareValue as string | Date)
|
|
: getNumberSchema().greater(Number(compareValue));
|
|
}
|
|
|
|
if (operator === '_gte') {
|
|
const isDate = compareValue instanceof Date || Number.isNaN(Number(compareValue));
|
|
schema[key] = isDate
|
|
? getDateSchema().min(compareValue as string | Date)
|
|
: getNumberSchema().min(Number(compareValue));
|
|
}
|
|
|
|
if (operator === '_lt') {
|
|
const isDate = compareValue instanceof Date || Number.isNaN(Number(compareValue));
|
|
schema[key] = isDate
|
|
? getDateSchema().less(compareValue as string | Date)
|
|
: getNumberSchema().less(Number(compareValue));
|
|
}
|
|
|
|
if (operator === '_lte') {
|
|
const isDate = compareValue instanceof Date || Number.isNaN(Number(compareValue));
|
|
schema[key] = isDate
|
|
? getDateSchema().max(compareValue as string | Date)
|
|
: getNumberSchema().max(Number(compareValue));
|
|
}
|
|
|
|
if (operator === '_null') {
|
|
schema[key] = getAnySchema().valid(null);
|
|
}
|
|
|
|
if (operator === '_nnull') {
|
|
schema[key] = getAnySchema().invalid(null);
|
|
}
|
|
|
|
if (operator === '_empty') {
|
|
schema[key] = getAnySchema().valid('');
|
|
}
|
|
|
|
if (operator === '_nempty') {
|
|
schema[key] = getAnySchema().invalid('');
|
|
}
|
|
|
|
if (operator === '_between') {
|
|
if (
|
|
(compareValue as any).every((value: any) => {
|
|
const val = Number(value instanceof Date ? NaN : value);
|
|
return !Number.isNaN(val) && Math.abs(val) <= Number.MAX_SAFE_INTEGER;
|
|
})
|
|
) {
|
|
const values = compareValue as [number, number];
|
|
schema[key] = getNumberSchema().min(Number(values[0])).max(Number(values[1]));
|
|
} else {
|
|
const values = compareValue as [string, string];
|
|
schema[key] = getDateSchema().min(values[0]).max(values[1]);
|
|
}
|
|
}
|
|
|
|
if (operator === '_nbetween') {
|
|
if (
|
|
(compareValue as any).every((value: any) => {
|
|
const val = Number(value instanceof Date ? NaN : value);
|
|
return !Number.isNaN(val) && Math.abs(val) <= Number.MAX_SAFE_INTEGER;
|
|
})
|
|
) {
|
|
const values = compareValue as [number, number];
|
|
schema[key] = getNumberSchema().less(Number(values[0])).greater(Number(values[1]));
|
|
} else {
|
|
const values = compareValue as [string, string];
|
|
schema[key] = getDateSchema().less(values[0]).greater(values[1]);
|
|
}
|
|
}
|
|
|
|
if (operator === '_submitted') {
|
|
schema[key] = getAnySchema().required();
|
|
}
|
|
|
|
if (operator === '_regex') {
|
|
if (compareValue === null || compareValue === undefined) {
|
|
schema[key] = Joi.any().equal(true);
|
|
} else {
|
|
const wrapped =
|
|
typeof compareValue === 'string' ? compareValue.startsWith('/') && compareValue.endsWith('/') : false;
|
|
schema[key] = getStringSchema().regex(new RegExp(wrapped ? (compareValue as any).slice(1, -1) : compareValue));
|
|
}
|
|
}
|
|
}
|
|
|
|
schema[key] = schema[key] ?? Joi.any();
|
|
|
|
if (options.requireAll) {
|
|
schema[key] = schema[key]!.required();
|
|
}
|
|
|
|
return Joi.object(schema).unknown();
|
|
}
|