@directus/api 30.0.0 → 31.0.0

package/dist/utils/versioning/handle-version.js

@@ -1,7 +1,7 @@
 import { ForbiddenError } from '@directus/errors';
-import { deepMapResponse } from '../deep-map-response.js';
 import { transaction } from '../transaction.js';
-import { mergeVersionsRaw } from './merge-version-data.js';
+import { deepMapWithSchema } from './deep-map-with-schema.js';
+import { splitRecursive } from './split-recursive.js';
 export async function handleVersion(self, key, queryWithKey, opts) {
     const { VersionsService } = await import('../../services/versions.js');
     const { ItemsService } = await import('../../services/items.js');
@@ -15,19 +15,21 @@ export async function handleVersion(self, key, queryWithKey, opts) {
             accountability: self.accountability,
             knex: self.knex,
         });
-        const versionData = await versionsService.getVersionSaves(queryWithKey.version, self.collection, key);
-        if (!versionData || versionData.length === 0)
-            return [originalData[0]];
-        return [mergeVersionsRaw(originalData[0], versionData)];
+        const version = await versionsService.getVersionSave(queryWithKey.version, self.collection, key);
+        return Object.assign(originalData[0], version?.delta);
     }
-    let results = [];
+    let result;
     const versionsService = new VersionsService({
         schema: self.schema,
         accountability: self.accountability,
         knex: self.knex,
     });
     const createdIDs = {};
-    const versionData = await versionsService.getVersionSaves(queryWithKey.version, self.collection, key);
+    const version = await versionsService.getVersionSave(queryWithKey.version, self.collection, key, false);
+    if (!version) {
+        throw new ForbiddenError();
+    }
+    const { delta } = version;
     await transaction(self.knex, async (trx) => {
         const itemsServiceAdmin = new ItemsService(self.collection, {
             schema: self.schema,
@@ -36,57 +38,59 @@ export async function handleVersion(self, key, queryWithKey, opts) {
             },
             knex: trx,
         });
-        await Promise.all((versionData ?? []).map((data) => {
-            return itemsServiceAdmin.updateOne(key, data, {
+        if (delta) {
+            const { rawDelta, defaultOverwrites } = splitRecursive(delta);
+            await itemsServiceAdmin.updateOne(key, rawDelta, {
                 emitEvents: false,
                 autoPurgeCache: false,
                 skipTracking: true,
+                overwriteDefaults: defaultOverwrites,
                 onItemCreate: (collection, pk) => {
                     if (collection in createdIDs === false)
                         createdIDs[collection] = [];
                     createdIDs[collection].push(pk);
                 },
             });
-        }));
+        }
         const itemsServiceUser = new ItemsService(self.collection, {
             schema: self.schema,
             accountability: self.accountability,
             knex: trx,
         });
-        results = await itemsServiceUser.readByQuery(queryWithKey, opts);
+        result = (await itemsServiceUser.readByQuery(queryWithKey, opts))[0];
         await trx.rollback();
     });
-    results = results.map((result) => {
-        return deepMapResponse(result, ([key, value], context) => {
-            if (context.relationType === 'm2o' || context.relationType === 'a2o') {
-                const ids = createdIDs[context.relation.related_collection];
-                const match = ids?.find((id) => String(id) === String(value));
-                if (match) {
-                    return [key, null];
-                }
-            }
-            else if (context.relationType === 'o2m' && Array.isArray(value)) {
-                const ids = createdIDs[context.relation.collection];
-                return [
-                    key,
-                    value.map((val) => {
-                        const match = ids?.find((id) => String(id) === String(val));
-                        if (match) {
-                            return null;
-                        }
-                        return val;
-                    }),
-                ];
+    if (!result) {
+        throw new ForbiddenError();
+    }
+    return deepMapWithSchema(result, ([key, value], context) => {
+        if (context.relationType === 'm2o' || context.relationType === 'a2o') {
+            const ids = createdIDs[context.relation.related_collection];
+            const match = ids?.find((id) => String(id) === String(value));
+            if (match) {
+                return [key, null];
             }
-            if (context.field.field === context.collection.primary) {
-                const ids = createdIDs[context.collection.collection];
-                const match = ids?.find((id) => String(id) === String(value));
-                if (match) {
-                    return [key, null];
-                }
+        }
+        else if (context.relationType === 'o2m' && Array.isArray(value)) {
+            const ids = createdIDs[context.relation.collection];
+            return [
+                key,
+                value.map((val) => {
+                    const match = ids?.find((id) => String(id) === String(val));
+                    if (match) {
+                        return null;
+                    }
+                    return val;
+                }),
+            ];
+        }
+        if (context.field.field === context.collection.primary) {
+            const ids = createdIDs[context.collection.collection];
+            const match = ids?.find((id) => String(id) === String(value));
+            if (match) {
+                return [key, null];
             }
-            return [key, value];
-        }, { collection: self.collection, schema: self.schema });
-    });
-    return results;
+        }
+        return [key, value];
+    }, { collection: self.collection, schema: self.schema });
 }

package/dist/utils/versioning/split-recursive.d.ts

@@ -0,0 +1,4 @@
+export declare function splitRecursive(object: unknown): {
+    rawDelta: Record<string, any>;
+    defaultOverwrites: Record<string, any> | undefined;
+};

package/dist/utils/versioning/split-recursive.js

@@ -0,0 +1,27 @@
+import { isPlainObject } from 'lodash-es';
+export function splitRecursive(object) {
+    if (isPlainObject(object) && typeof object === 'object' && object !== null) {
+        const { _user, _date, ...rest } = object;
+        const defaultOverwrites = { _user, _date };
+        for (const key in rest) {
+            const { rawDelta, defaultOverwrites: innerDefaultOverwrites } = splitRecursive(rest[key]);
+            rest[key] = rawDelta;
+            if (innerDefaultOverwrites)
+                defaultOverwrites[key] = innerDefaultOverwrites;
+        }
+        return { rawDelta: rest, defaultOverwrites };
+    }
+    else if (Array.isArray(object)) {
+        const rest = [];
+        const defaultOverwrites = [];
+        for (const key in object) {
+            const { rawDelta, defaultOverwrites: innerDefaultOverwrites } = splitRecursive(object[key]);
+            rest[key] = rawDelta;
+            if (innerDefaultOverwrites)
+                defaultOverwrites[key] = innerDefaultOverwrites;
+        }
+        object.map((value) => splitRecursive(value));
+        return { rawDelta: rest, defaultOverwrites };
+    }
+    return { rawDelta: object, defaultOverwrites: undefined };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "30.0.0",
+  "version": "31.0.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -61,6 +61,7 @@
     "@authenio/samlify-node-xmllint": "2.0.0",
     "@aws-sdk/client-sesv2": "3.864.0",
     "@godaddy/terminus": "4.12.1",
+    "@modelcontextprotocol/sdk": "1.17.1",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-node-resolve": "16.0.1",
     "@rollup/plugin-virtual": "3.0.2",
@@ -102,7 +103,7 @@
     "ioredis": "5.7.0",
     "ip-matching": "2.1.2",
     "isolated-vm": "5.0.3",
-    "joi": "17.13.3",
+    "joi": "18.0.1",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
@@ -139,8 +140,8 @@
     "proxy-addr": "2.0.7",
     "qs": "6.14.0",
     "rate-limiter-flexible": "7.2.0",
-    "rollup": "4.46.2",
     "rolldown": "1.0.0-beta.31",
+    "rollup": "4.46.2",
     "samlify": "2.10.1",
     "sanitize-html": "2.17.0",
     "sharp": "0.34.3",
@@ -153,30 +154,30 @@
     "ws": "8.18.3",
     "zod": "4.0.14",
     "zod-validation-error": "4.0.1",
-    "@directus/app": "13.14.0",
-    "@directus/constants": "13.0.2",
-    "@directus/env": "5.1.2",
-    "@directus/errors": "2.0.3",
-    "@directus/extensions-sdk": "16.0.1",
-    "@directus/extensions-registry": "3.0.10",
-    "@directus/format-title": "12.0.1",
-    "@directus/extensions": "3.0.10",
-    "@directus/memory": "3.0.8",
-    "@directus/pressure": "3.0.8",
+    "@directus/env": "5.2.0",
+    "@directus/app": "14.0.0",
+    "@directus/errors": "2.0.4",
+    "@directus/extensions": "3.0.11",
+    "@directus/constants": "13.0.3",
+    "@directus/extensions-registry": "3.0.11",
+    "@directus/extensions-sdk": "16.0.2",
+    "@directus/format-title": "12.1.0",
+    "@directus/memory": "3.0.9",
+    "@directus/pressure": "3.0.9",
+    "@directus/schema": "13.0.3",
+    "@directus/schema-builder": "0.0.6",
     "@directus/specs": "11.1.1",
-    "@directus/schema-builder": "0.0.5",
-    "@directus/storage": "12.0.1",
-    "@directus/storage-driver-azure": "12.0.8",
-    "@directus/schema": "13.0.2",
-    "@directus/storage-driver-cloudinary": "12.0.8",
-    "@directus/storage-driver-gcs": "12.0.8",
-    "@directus/storage-driver-s3": "12.0.8",
-    "@directus/storage-driver-supabase": "3.0.8",
-    "@directus/storage-driver-local": "12.0.1",
-    "@directus/utils": "13.0.9",
-    "@directus/system-data": "3.2.1",
-    "@directus/validation": "2.0.8",
-    "directus": "11.11.0"
+    "@directus/storage": "12.0.2",
+    "@directus/storage-driver-azure": "12.0.9",
+    "@directus/storage-driver-cloudinary": "12.0.9",
+    "@directus/storage-driver-gcs": "12.0.9",
+    "@directus/storage-driver-local": "12.0.2",
+    "@directus/storage-driver-s3": "12.0.9",
+    "@directus/storage-driver-supabase": "3.0.9",
+    "@directus/system-data": "3.3.0",
+    "@directus/utils": "13.0.10",
+    "directus": "11.12.0",
+    "@directus/validation": "2.0.9"
   },
   "devDependencies": {
     "@directus/tsconfig": "3.0.0",
@@ -220,8 +221,8 @@
     "knex-mock-client": "3.0.2",
     "typescript": "5.8.3",
     "vitest": "3.2.4",
-    "@directus/schema-builder": "0.0.5",
-    "@directus/types": "13.2.2"
+    "@directus/schema-builder": "0.0.6",
+    "@directus/types": "13.2.3"
   },
   "optionalDependencies": {
     "@keyv/redis": "3.0.1",
@@ -236,7 +237,7 @@
     "node": ">=22"
   },
   "scripts": {
-    "build": "rimraf ./dist && tsc --project tsconfig.prod.json && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",
+    "build": "rimraf ./dist && tsc --project tsconfig.prod.json && copyfiles \"src/**/*.{yaml,liquid,md}\" -u 1 dist",
     "cli": "NODE_ENV=development SERVE_APP=false tsx src/cli/run.ts",
     "dev": "NODE_ENV=development SERVE_APP=true tsx watch --ignore extensions --clear-screen=false src/start.ts",
     "test": "vitest run",