mirror of
https://github.com/directus/directus.git
synced 2026-02-12 10:05:16 -05:00
* Update `@directus/api` deps (minor)
@aws-sdk/client-ses 3.292.0 → 3.316.0
@godaddy/terminus 4.11.2 → 4.12.0
@rollup/plugin-alias 4.0.3 → 4.0.4
@rollup/plugin-node-resolve 15.0.1 → 15.0.2
@types/node 18.15.3 → 18.15.11
@vitest/coverage-c8 0.29.3 → 0.30.1
axios 1.3.4 → 1.3.6
fs-extra 11.1.0 → 11.1.1
helmet 6.0.1 → 6.1.5
ioredis 5.3.1 → 5.3.2
joi 17.8.4 → 17.9.1
liquidjs 10.6.1 → 10.7.0
marked 4.2.12 → 4.3.0
nanoid 3.3.4 → 3.3.6
rollup 3.19.1 → 3.20.6
sharp 0.31.3 → 0.32.0
vitest 0.29.3 → 0.30.1
vm2 3.9.16 → 3.9.17
* Update `@directus/api` deps (major)
@rollup/plugin-alias 4.0.4 → 5.0.0
@types/inquirer 8.2.6 → 9.0.3
@types/node 18.15.11 → 18.15.12
camelcase 6.3.0 → 7.0.1
chalk 4.1.2 → 5.2.0
commander 9.5.0 → 10.0.1
execa 5.1.1 → 7.1.1
icc 2.0.0 → 3.0.0
inquirer 8.2.5 → 9.1.5
~ldapjs 2.3.3 → 3.0.2~
nanoid 3.3.6 → 4.0.2
~openapi3-ts 3.2.0 → 4.1.1~
ora 5.4.1 → 6.3.0
strip-bom-stream 4.0.0 → 5.0.0
tedious 15.1.3 → 16.0.0
typescript 4.9.5 → 5.0.4
* Update `@directus/app` deps
@babel/core 7.21.3 → 7.21.4
@babel/preset-env 7.20.2 → 7.21.4
@fortawesome/fontawesome-svg-core 6.3.0 → 6.4.0
@fortawesome/free-brands-svg-icons 6.3.0 → 6.4.0
@fullcalendar/core 6.1.4 → 6.1.5
@fullcalendar/daygrid 6.1.4 → 6.1.5
@fullcalendar/interaction 6.1.4 → 6.1.5
@fullcalendar/list 6.1.4 → 6.1.5
@fullcalendar/timegrid 6.1.4 → 6.1.5
@pinia/testing 0.0.15 → 0.0.16
@popperjs/core 2.11.6 → 2.11.7
@storybook/addon-actions 7.0.0-rc.4 → 7.0.6
@storybook/addon-backgrounds 7.0.0-rc.4 → 7.0.6
@storybook/addon-docs 7.0.0-rc.4 → 7.0.6
@storybook/addon-essentials 7.0.0-rc.4 → 7.0.6
@storybook/addon-links 7.0.0-rc.4 → 7.0.6
@storybook/addon-mdx-gfm 7.0.0-rc.4 → 7.0.6
@storybook/addon-measure 7.0.0-rc.4 → 7.0.6
@storybook/addon-outline 7.0.0-rc.4 → 7.0.6
@storybook/client-api 7.0.0-rc.4 → 7.0.6
@storybook/client-logger 7.0.0-rc.4 → 7.0.6
@storybook/vue3 7.0.0-rc.4 → 7.0.6
@storybook/vue3-vite 7.0.0-rc.4 → 7.0.6
@types/diff 5.0.2 → 5.0.3
@types/dompurify 3.0.0 → 3.0.2
@types/lodash 4.14.191 → 4.14.194
@vitejs/plugin-vue 4.0.0 → 4.1.0
@vue/test-utils 2.3.1 → 2.3.2
apexcharts 3.37.1 → 3.39.0
axios 1.3.4 → 1.3.6
dompurify 3.0.1 → 3.0.2
happy-dom 8.9.0 → 9.8.4
marked 4.2.12 → 4.3.0
nanoid 4.0.1 → 4.0.2
pinia 2.0.33 → 2.0.34
sass 1.59.3 → 1.62.0
storybook 7.0.0-rc.4 → 7.0.6
typescript 4.9.5 → 5.0.4
vite 4.1.4 → 4.2.2
vitest 0.29.3 → 0.30.1
webpack 5.76.2 → 5.80.0
* Update root deps
* Update `@directus/composables` deps
* Update `@directus/constant` deps
* Update `create-directus-extension` deps
* Update `@directus/exceptions` deps
* tsconfig workaround: ignoreDeprecations
* Update `@directus/extensions-sdk` deps
* Update `@directus/schema` deps
* Update `@directus/storage` deps
* Update `@directus/storage-driver-azure` deps
* Update `@directus/storage-driver-cloudinary` deps
* Update `@directus/storage-driver-gcs` deps
* Update `@directus/storage-driver-local` deps
* Update `@directus/storage-driver-s3` deps
* Update `@directus/types` deps
* Update `@directus/update-check` deps
* Update `@directus/utils` deps
* tsconfig workaround in schema: ignoreDeprecations
* tsconfig workaround in remaining packages: ignoreDeprecations
* Update `tests-blackbox` deps
* Revert "tsconfig workaround: ignoreDeprecations"
This reverts commit 5d97da55e3.
* Revert tsconfig override
* Update tsconfig
* Fix imports in @directus/utils
* Fix imports in composables
* Fix imports in extensions-sdk
* Fix imports in @directus/api
* Move RateLimiterAbstract to types import as well
* Bump pnpm to 8.3.1
* Update `docs` deps
> [...] the @vueuse/head package will be deprecated. If you're setting up this package on a new project, you should use the @unhead/vue package directly [...]
* Remove obselete dep `concurrently` from extensions-sdk
Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
* New day, new updates
Also forgot to include minor updates of deps in `tests-blackbox` in previous
commit
* Fix `api` tests
---------
Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
310 lines
8.8 KiB
TypeScript
310 lines
8.8 KiB
TypeScript
import type { FieldFilter } from '@directus/types';
|
|
import type { AnySchema, StringSchema as BaseStringSchema, DateSchema, NumberSchema } from 'joi';
|
|
import BaseJoi from 'joi';
|
|
import { escapeRegExp, merge } from 'lodash-es';
|
|
|
|
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();
|
|
}
|