@wbce-d9/api 12.7.0 → 12.7.1

package/dist/request/request-interceptor.d.ts

@@ -1,2 +1,2 @@
 import type { InternalAxiosRequestConfig } from 'axios';
-export declare const requestInterceptor: (config: InternalAxiosRequestConfig) => Promise<InternalAxiosRequestConfig<any>>;
+export declare const requestInterceptor: (config: InternalAxiosRequestConfig) => Promise<InternalAxiosRequestConfig<any, any>>;

package/dist/request/response-interceptor.d.ts

@@ -1,2 +1,2 @@
 import type { AxiosResponse } from 'axios';
-export declare const responseInterceptor: (config: AxiosResponse<any, any>) => Promise<AxiosResponse<any, any, {}>>;
+export declare const responseInterceptor: (config: AxiosResponse<any, any>) => Promise<AxiosResponse<any, any, {}, any>>;

package/dist/services/payload.js

@@ -478,6 +478,23 @@ export class PayloadService {
                 knex: this.knex,
                 schema: this.schema,
             });
+            const adminItemService = new ItemsService(relation.collection, {
+                knex: this.knex,
+                schema: this.schema,
+            });
+            const parentKey = parent || payload[currentPrimaryKeyField];
+            // Add the back-reference to the item, unless it is already linked to this parent.
+            const attachToParent = async (item) => {
+                const key = item[relatedPrimaryKeyField];
+                if (key) {
+                    // readMany rather than readOne: not found is not an error.
+                    const currentItems = await adminItemService.readMany([key], { fields: [relation.field] });
+                    if (currentItems.length > 0 && currentItems[0][relation.field] == parentKey) {
+                        return omit(item, relation.field);
+                    }
+                }
+                return { ...item, [relation.field]: parentKey };
+            };
             const recordsToUpsert = [];
             const savedPrimaryKeys = [];
             // Nested array of individual items
@@ -512,10 +529,8 @@ export class PayloadService {
                             [relatedPrimaryKeyField]: relatedRecord,
                         };
                     }
-                    recordsToUpsert.push({
-                        ...record,
-                        [relation.field]: parent || payload[currentPrimaryKeyField],
-                    });
+                    const attachedRecord = await attachToParent(record);
+                    recordsToUpsert.push(attachedRecord);
                 }
                 savedPrimaryKeys.push(...(await itemsService.upsertMany(recordsToUpsert, {
                     onRevisionCreate: (pk) => revisions.push(pk),
@@ -581,14 +596,14 @@ export class PayloadService {
                             }
                             return {
                                 ...record,
-                                [relation.field]: parent || payload[currentPrimaryKeyField],
+                                [relation.field]: parentKey,
                             };
                         });
                     }
                     else {
                         createPayload = alterations.create.map((item) => ({
                             ...item,
-                            [relation.field]: parent || payload[currentPrimaryKeyField],
+                            [relation.field]: parentKey,
                         }));
                     }
                     await itemsService.createMany(createPayload, {
@@ -601,10 +616,8 @@ export class PayloadService {
                 if (alterations.update) {
                     const primaryKeyField = this.schema.collections[relation.collection].primary;
                     for (const item of alterations.update) {
-                        await itemsService.updateOne(item[primaryKeyField], {
-                            ...item,
-                            [relation.field]: parent || payload[currentPrimaryKeyField],
-                        }, {
+                        const attachedItem = await attachToParent(item);
+                        await itemsService.updateOne(attachedItem[primaryKeyField], attachedItem, {
                             onRevisionCreate: (pk) => revisions.push(pk),
                             bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                             emitEvents: opts?.emitEvents,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "12.7.0",
+  "version": "12.7.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -66,7 +66,7 @@
     "@rollup/plugin-node-resolve": "15.0.2",
     "@rollup/plugin-virtual": "3.0.1",
     "@wbce-d9/format-title": "10.0.0",
-    "axios": "^1.18.0",
+    "axios": "^1.20.0",
     "chalk": "5.2.0",
     "commander": "10.0.1",
     "date-fns": "2.29.3",
@@ -144,20 +144,20 @@
     "tmp-promise": "3.0.3",
     "tsx": "3.12.6",
     "uuid-validate": "0.0.3",
-    "@wbce-d9/app": "11.2.0",
-    "@wbce-d9/extensions-sdk": "10.0.5",
+    "@wbce-d9/app": "11.3.0",
+    "@wbce-d9/constants": "10.0.0",
+    "@wbce-d9/extensions-sdk": "10.1.0",
+    "@wbce-d9/exceptions": "10.0.1",
     "@wbce-d9/schema": "10.0.0",
+    "@wbce-d9/storage": "10.0.0",
     "@wbce-d9/specs": "9.26.5",
-    "@wbce-d9/storage-driver-azure": "10.0.4",
-    "@wbce-d9/storage-driver-cloudinary": "10.0.5",
-    "@wbce-d9/storage-driver-local": "10.0.4",
-    "@wbce-d9/storage-driver-gcs": "10.0.4",
-    "@wbce-d9/storage-driver-s3": "10.0.4",
+    "@wbce-d9/storage-driver-cloudinary": "10.0.6",
+    "@wbce-d9/storage-driver-azure": "10.0.5",
+    "@wbce-d9/storage-driver-local": "10.0.5",
+    "@wbce-d9/utils": "10.0.5",
+    "@wbce-d9/storage-driver-s3": "10.0.5",
     "@wbce-d9/update-check": "10.0.4",
-    "@wbce-d9/storage": "10.0.0",
-    "@wbce-d9/utils": "10.0.4",
-    "@wbce-d9/constants": "10.0.0",
-    "@wbce-d9/exceptions": "10.0.1"
+    "@wbce-d9/storage-driver-gcs": "10.0.5"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",