@nitrogenbuilder/connector-payload 0.1.53 → 1.1.0

package/dist/endpoints/component-inventory.js

@@ -203,7 +203,7 @@ export function createComponentInventoryEndpoints(args) {
                 const authError = requireAuth(req);
                 if (authError)
                     return authError;
-                const result = await reindexAllComponentInventory(req.payload, args.collections, args.componentManifest);
+                const result = await reindexAllComponentInventory(req.payload, args.collections, args.componentManifest, req);
                 return Response.json({
                     success: true,
                     ...result,

package/dist/index.js

@@ -57,7 +57,8 @@ export const nitrogenConnectorPlugin = (options = {}) => (incomingConfig) => {
     const createAfterChangeHook = (collectionSlug) => {
         return async ({ doc, req }) => {
             if (doc) {
-                await reindexDocumentUsage(req.payload, collectionSlug, doc, collectionSlug === 'nitrogen-templates' ? 'template' : 'document');
+                // Pass `req` so inventory writes join the caller's transaction.
+                await reindexDocumentUsage(req.payload, collectionSlug, doc, collectionSlug === 'nitrogen-templates' ? 'template' : 'document', req);
             }
             return doc;
         };
@@ -66,7 +67,7 @@ export const nitrogenConnectorPlugin = (options = {}) => (incomingConfig) => {
         return async ({ doc, id, req, }) => {
             const sourceId = doc?.id ?? id;
             if (sourceId !== undefined) {
-                await deleteDocumentUsage(req.payload, collectionSlug, sourceId);
+                await deleteDocumentUsage(req.payload, collectionSlug, sourceId, req);
             }
             return doc;
         };

package/dist/inventory/indexing.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentManifestEntry } from '@nitrogenbuilder/types';
-import type { Payload, Where } from 'payload';
+import type { Payload, PayloadRequest, Where } from 'payload';
 import type { NitrogenInventorySourceDoc } from '../types.js';
 import { type NitrogenComponentManifestInput } from './manifest.js';
 export declare const NITROGEN_COMPONENT_CATALOG_COLLECTION = "nitrogen-component-catalog";
@@ -23,9 +23,9 @@ export declare function findAllDocs<T extends object>(payload: Payload, collecti
     limit?: number;
     select?: Record<string, true>;
     where?: Where;
-}): Promise<T[]>;
-export declare function syncComponentCatalog(payload: Payload, manifestInput?: NitrogenComponentManifestInput): Promise<ComponentManifestEntry[]>;
-export declare function reindexDocumentUsage(payload: Payload, sourceCollection: string, doc: NitrogenInventorySourceDoc, sourceType?: 'document' | 'template'): Promise<number>;
-export declare function deleteDocumentUsage(payload: Payload, sourceCollection: string, sourceDocumentId: string | number): Promise<void>;
-export declare function reindexAllComponentInventory(payload: Payload, collections: string[], manifestInput?: NitrogenComponentManifestInput): Promise<ReindexResult>;
+}, req?: PayloadRequest): Promise<T[]>;
+export declare function syncComponentCatalog(payload: Payload, manifestInput?: NitrogenComponentManifestInput, req?: PayloadRequest): Promise<ComponentManifestEntry[]>;
+export declare function reindexDocumentUsage(payload: Payload, sourceCollection: string, doc: NitrogenInventorySourceDoc, sourceType?: 'document' | 'template', req?: PayloadRequest): Promise<number>;
+export declare function deleteDocumentUsage(payload: Payload, sourceCollection: string, sourceDocumentId: string | number, req?: PayloadRequest): Promise<void>;
+export declare function reindexAllComponentInventory(payload: Payload, collections: string[], manifestInput?: NitrogenComponentManifestInput, req?: PayloadRequest): Promise<ReindexResult>;
 export {};

package/dist/inventory/indexing.js

@@ -62,7 +62,7 @@ export function extractComponentUsageRecords(modules) {
     collectUsageFromTree(modules, 'modules', results);
     return results;
 }
-export async function findAllDocs(payload, collection, options) {
+export async function findAllDocs(payload, collection, options, req) {
     const docs = [];
     let page = 1;
     let hasNextPage = true;
@@ -74,6 +74,7 @@ export async function findAllDocs(payload, collection, options) {
             page,
             overrideAccess: true,
             pagination: true,
+            req,
             select: options?.select,
             where: options?.where,
         });
@@ -83,16 +84,17 @@ export async function findAllDocs(payload, collection, options) {
     }
     return docs;
 }
-async function deleteUsageDocs(payload, docs) {
+async function deleteUsageDocs(payload, docs, req) {
     for (const doc of docs) {
         await payload.delete({
             collection: NITROGEN_COMPONENT_USAGE_COLLECTION,
             id: doc.id,
             overrideAccess: true,
+            req,
         });
     }
 }
-async function findUsageDocsForSource(payload, sourceCollection, sourceDocumentId) {
+async function findUsageDocsForSource(payload, sourceCollection, sourceDocumentId, req) {
     return findAllDocs(payload, NITROGEN_COMPONENT_USAGE_COLLECTION, {
         limit: 100,
         select: {
@@ -112,15 +114,16 @@ async function findUsageDocsForSource(payload, sourceCollection, sourceDocumentI
                 },
             ],
         },
-    });
+    }, req);
 }
-async function createUsageDocs(payload, sourceCollection, sourceType, doc) {
+async function createUsageDocs(payload, sourceCollection, sourceType, doc, req) {
     const sourceDocumentId = String(doc.id);
     const usageRecords = extractComponentUsageRecords(doc.nitrogenData);
     for (const record of usageRecords) {
         await payload.create({
             collection: NITROGEN_COMPONENT_USAGE_COLLECTION,
             overrideAccess: true,
+            req,
             data: {
                 usageKey: `${sourceCollection}:${sourceDocumentId}:${record.moduleId}:${record.modulePath}:${record.componentName}`,
                 componentName: record.componentName,
@@ -141,10 +144,10 @@ async function createUsageDocs(payload, sourceCollection, sourceType, doc) {
     }
     return usageRecords.length;
 }
-export async function syncComponentCatalog(payload, manifestInput) {
+export async function syncComponentCatalog(payload, manifestInput, req) {
     const manifest = await resolveComponentManifest(manifestInput);
     const entries = manifest.components || [];
-    const existingDocs = await findAllDocs(payload, NITROGEN_COMPONENT_CATALOG_COLLECTION);
+    const existingDocs = await findAllDocs(payload, NITROGEN_COMPONENT_CATALOG_COLLECTION, undefined, req);
     const existingByName = new Map(existingDocs.map((doc) => [doc.componentName, doc]));
     const nextNames = new Set(entries.map((entry) => entry.name));
     for (const entry of entries) {
@@ -153,7 +156,8 @@ export async function syncComponentCatalog(payload, manifestInput) {
             componentName: entry.name,
             scope: entry.scope || '',
             sidebarCategory: entry.sidebarCategory || '',
-            icon: entry.icon || '',
+            // Icons are no longer carried on the manifest entry; they're assigned in
+            // the editor (Settings > Component Icons) and stored in NitrogenSettings.
             definition: entry,
             source: manifest.source || '',
         };
@@ -163,6 +167,7 @@ export async function syncComponentCatalog(payload, manifestInput) {
                 id: existing.id,
                 data,
                 overrideAccess: true,
+                req,
             });
         }
         else {
@@ -170,6 +175,7 @@ export async function syncComponentCatalog(payload, manifestInput) {
                 collection: NITROGEN_COMPONENT_CATALOG_COLLECTION,
                 data,
                 overrideAccess: true,
+                req,
             });
         }
     }
@@ -179,30 +185,31 @@ export async function syncComponentCatalog(payload, manifestInput) {
                 collection: NITROGEN_COMPONENT_CATALOG_COLLECTION,
                 id: existing.id,
                 overrideAccess: true,
+                req,
             });
         }
     }
     return entries;
 }
-export async function reindexDocumentUsage(payload, sourceCollection, doc, sourceType = 'document') {
+export async function reindexDocumentUsage(payload, sourceCollection, doc, sourceType = 'document', req) {
     const sourceDocumentId = String(doc.id);
-    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, sourceDocumentId);
-    await deleteUsageDocs(payload, docsForSource);
-    return createUsageDocs(payload, sourceCollection, sourceType, doc);
+    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, sourceDocumentId, req);
+    await deleteUsageDocs(payload, docsForSource, req);
+    return createUsageDocs(payload, sourceCollection, sourceType, doc, req);
 }
-export async function deleteDocumentUsage(payload, sourceCollection, sourceDocumentId) {
-    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, String(sourceDocumentId));
-    await deleteUsageDocs(payload, docsForSource);
+export async function deleteDocumentUsage(payload, sourceCollection, sourceDocumentId, req) {
+    const docsForSource = await findUsageDocsForSource(payload, sourceCollection, String(sourceDocumentId), req);
+    await deleteUsageDocs(payload, docsForSource, req);
 }
-export async function reindexAllComponentInventory(payload, collections, manifestInput) {
-    const entries = await syncComponentCatalog(payload, manifestInput);
+export async function reindexAllComponentInventory(payload, collections, manifestInput, req) {
+    const entries = await syncComponentCatalog(payload, manifestInput, req);
     const usageDocs = await findAllDocs(payload, NITROGEN_COMPONENT_USAGE_COLLECTION, {
         limit: 200,
         select: {
             id: true,
         },
-    });
-    await deleteUsageDocs(payload, usageDocs);
+    }, req);
+    await deleteUsageDocs(payload, usageDocs, req);
     let documentCount = 0;
     let usageCount = 0;
     for (const collection of collections) {
@@ -216,10 +223,10 @@ export async function reindexAllComponentInventory(payload, collections, manifes
                 _status: true,
                 nitrogenData: true,
             },
-        });
+        }, req);
         for (const doc of docs) {
             documentCount += 1;
-            usageCount += await createUsageDocs(payload, collection, collection === 'nitrogen-templates' ? 'template' : 'document', doc);
+            usageCount += await createUsageDocs(payload, collection, collection === 'nitrogen-templates' ? 'template' : 'document', doc, req);
         }
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "0.1.53",
+  "version": "1.1.0",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",
@@ -55,4 +55,4 @@
     "@nitrogenbuilder/client-core": "link:../monogen/packages/client-core",
     "@nitrogenbuilder/types": "link:../monogen/packages/types"
   }
-}
+}