mirror of
https://github.com/directus/directus.git
synced 2026-02-12 18:25:02 -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>
158 lines
5.3 KiB
TypeScript
158 lines
5.3 KiB
TypeScript
import Joi from 'joi';
|
|
import { InvalidPayloadException } from '../exceptions/invalid-payload.js';
|
|
import type { SnapshotDiffWithHash, SnapshotWithHash } from '../types/snapshot.js';
|
|
import { DiffKind } from '../types/snapshot.js';
|
|
|
|
const deepDiffSchema = Joi.object({
|
|
kind: Joi.string()
|
|
.valid(...Object.values(DiffKind))
|
|
.required(),
|
|
path: Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.number())),
|
|
lhs: Joi.any().when('kind', { is: [DiffKind.NEW, DiffKind.ARRAY], then: Joi.optional(), otherwise: Joi.required() }),
|
|
rhs: Joi.any().when('kind', {
|
|
is: [DiffKind.DELETE, DiffKind.ARRAY],
|
|
then: Joi.optional(),
|
|
otherwise: Joi.required(),
|
|
}),
|
|
index: Joi.number().when('kind', { is: DiffKind.ARRAY, then: Joi.required() }),
|
|
item: Joi.link('#deepdiff').when('kind', { is: DiffKind.ARRAY, then: Joi.required() }),
|
|
}).id('deepdiff');
|
|
|
|
const applyJoiSchema = Joi.object({
|
|
hash: Joi.string().required(),
|
|
diff: Joi.object({
|
|
collections: Joi.array()
|
|
.items(
|
|
Joi.object({
|
|
collection: Joi.string().required(),
|
|
diff: Joi.array().items(deepDiffSchema).required(),
|
|
})
|
|
)
|
|
.required(),
|
|
fields: Joi.array()
|
|
.items(
|
|
Joi.object({
|
|
collection: Joi.string().required(),
|
|
field: Joi.string().required(),
|
|
diff: Joi.array().items(deepDiffSchema).required(),
|
|
})
|
|
)
|
|
.required(),
|
|
relations: Joi.array()
|
|
.items(
|
|
Joi.object({
|
|
collection: Joi.string().required(),
|
|
field: Joi.string().required(),
|
|
related_collection: Joi.string().allow(null),
|
|
diff: Joi.array().items(deepDiffSchema).required(),
|
|
})
|
|
)
|
|
.required(),
|
|
}).required(),
|
|
});
|
|
|
|
/**
|
|
* Validates the diff against the current schema snapshot.
|
|
*
|
|
* @returns True if the diff can be applied (valid & not empty).
|
|
*/
|
|
export function validateApplyDiff(applyDiff: SnapshotDiffWithHash, currentSnapshotWithHash: SnapshotWithHash) {
|
|
const { error } = applyJoiSchema.validate(applyDiff);
|
|
if (error) throw new InvalidPayloadException(error.message);
|
|
|
|
// No changes to apply
|
|
if (
|
|
applyDiff.diff.collections.length === 0 &&
|
|
applyDiff.diff.fields.length === 0 &&
|
|
applyDiff.diff.relations.length === 0
|
|
) {
|
|
return false;
|
|
}
|
|
|
|
// Diff can be applied due to matching hash
|
|
if (applyDiff.hash === currentSnapshotWithHash.hash) return true;
|
|
|
|
for (const diffCollection of applyDiff.diff.collections) {
|
|
const collection = diffCollection.collection;
|
|
|
|
if (diffCollection.diff[0]?.kind === DiffKind.NEW) {
|
|
const existingCollection = currentSnapshotWithHash.collections.find(
|
|
(c) => c.collection === diffCollection.collection
|
|
);
|
|
|
|
if (existingCollection) {
|
|
throw new InvalidPayloadException(
|
|
`Provided diff is trying to create collection "${collection}" but it already exists. Please generate a new diff and try again.`
|
|
);
|
|
}
|
|
} else if (diffCollection.diff[0]?.kind === DiffKind.DELETE) {
|
|
const existingCollection = currentSnapshotWithHash.collections.find(
|
|
(c) => c.collection === diffCollection.collection
|
|
);
|
|
|
|
if (!existingCollection) {
|
|
throw new InvalidPayloadException(
|
|
`Provided diff is trying to delete collection "${collection}" but it does not exist. Please generate a new diff and try again.`
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
for (const diffField of applyDiff.diff.fields) {
|
|
const field = `${diffField.collection}.${diffField.field}`;
|
|
|
|
if (diffField.diff[0]?.kind === DiffKind.NEW) {
|
|
const existingField = currentSnapshotWithHash.fields.find(
|
|
(f) => f.collection === diffField.collection && f.field === diffField.field
|
|
);
|
|
|
|
if (existingField) {
|
|
throw new InvalidPayloadException(
|
|
`Provided diff is trying to create field "${field}" but it already exists. Please generate a new diff and try again.`
|
|
);
|
|
}
|
|
} else if (diffField.diff[0]?.kind === DiffKind.DELETE) {
|
|
const existingField = currentSnapshotWithHash.fields.find(
|
|
(f) => f.collection === diffField.collection && f.field === diffField.field
|
|
);
|
|
|
|
if (!existingField) {
|
|
throw new InvalidPayloadException(
|
|
`Provided diff is trying to delete field "${field}" but it does not exist. Please generate a new diff and try again.`
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
for (const diffRelation of applyDiff.diff.relations) {
|
|
let relation = `${diffRelation.collection}.${diffRelation.field}`;
|
|
if (diffRelation.related_collection) relation += `-> ${diffRelation.related_collection}`;
|
|
|
|
if (diffRelation.diff[0]?.kind === DiffKind.NEW) {
|
|
const existingRelation = currentSnapshotWithHash.relations.find(
|
|
(r) => r.collection === diffRelation.collection && r.field === diffRelation.field
|
|
);
|
|
|
|
if (existingRelation) {
|
|
throw new InvalidPayloadException(
|
|
`Provided diff is trying to create relation "${relation}" but it already exists. Please generate a new diff and try again.`
|
|
);
|
|
}
|
|
} else if (diffRelation.diff[0]?.kind === DiffKind.DELETE) {
|
|
const existingRelation = currentSnapshotWithHash.relations.find(
|
|
(r) => r.collection === diffRelation.collection && r.field === diffRelation.field
|
|
);
|
|
|
|
if (!existingRelation) {
|
|
throw new InvalidPayloadException(
|
|
`Provided diff is trying to delete relation "${relation}" but it does not exist. Please generate a new diff and try again.`
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
throw new InvalidPayloadException(
|
|
`Provided hash does not match the current instance's schema hash, indicating the schema has changed after this diff was generated. Please generate a new diff and try again.`
|
|
);
|
|
}
|