@mvriu5/payload-ai 1.2.0 → 1.3.2

package/dist/payload/schemaContext.js

@@ -44,26 +44,30 @@ const getLocaleConfigs = (req)=>{
 };
 const getSerializableOptions = (options)=>{
     if (!Array.isArray(options)) return undefined;
-    const serializedOptions = options.map((option)=>{
+    const serializedOptions = options.flatMap((option)=>{
         if (typeof option === "string") {
-            return {
-                label: option,
-                value: option
-            };
+            return [
+                {
+                    label: option,
+                    value: option
+                }
+            ];
         }
-        if (!isRecord(option)) return null;
+        if (!isRecord(option)) return [];
         const label = "label" in option ? getSerializableLabel(option.label) : undefined;
         const value = "value" in option && typeof option.value === "string" ? option.value : undefined;
-        if (!label && !value) return null;
-        return {
-            ...label ? {
-                label
-            } : {},
-            ...value ? {
-                value
-            } : {}
-        };
-    }).filter(Boolean);
+        if (!label && !value) return [];
+        return [
+            {
+                ...label ? {
+                    label
+                } : {},
+                ...value ? {
+                    value
+                } : {}
+            }
+        ];
+    });
     return serializedOptions.length > 0 ? serializedOptions : undefined;
 };
 const toNormalizeCollectionConfig = (config)=>{
@@ -288,8 +292,76 @@ export const getMentionContext = async ({ blockContexts, collectionSlugs, collec
     const context = [];
     const seen = new Set();
     const localeConfigs = getLocaleConfigs(req);
-    const selectedLocales = (mentions.filter((mention)=>mention.type === "locale" && mention.slug).map((mention)=>mention.slug) || []).filter((locale, index, array)=>array.indexOf(locale) === index);
+    const localeConfigsByCode = new Map(localeConfigs.map((locale)=>[
+            locale.code,
+            locale
+        ]));
+    const collectionSlugSet = new Set(collectionSlugs);
+    const globalSlugSet = new Set(globalSlugs);
+    const collectionConfigsBySlug = new Map(req.payload.config.collections.map((collection)=>[
+            collection.slug,
+            collection
+        ]));
+    const globalConfigsBySlug = new Map(req.payload.config.globals?.map((global)=>[
+            global.slug,
+            global
+        ]));
+    const blockContextsBySlug = new Map();
+    for (const block of blockContexts){
+        const blocks = blockContextsBySlug.get(block.slug) || [];
+        blocks.push(block);
+        blockContextsBySlug.set(block.slug, blocks);
+    }
+    const selectedLocales = [];
+    const selectedLocaleSet = new Set();
+    for (const mention of mentions){
+        if (mention.type !== "locale" || !mention.slug || selectedLocaleSet.has(mention.slug)) continue;
+        selectedLocaleSet.add(mention.slug);
+        selectedLocales.push(mention.slug);
+    }
     const activeLocale = selectedLocales.at(-1);
+    const mentionDocResults = await Promise.all(mentions.slice(0, 8).map(async (mention)=>{
+        if (mention.type === "global" && mention.slug) {
+            const slug = mention.slug;
+            if (!globalSlugSet.has(slug)) return null;
+            const globalConfig = globalConfigsBySlug.get(slug);
+            if (!globalConfig) return null;
+            return {
+                doc: await req.payload.findGlobal({
+                    depth: 2,
+                    ...activeLocale ? {
+                        locale: activeLocale
+                    } : {},
+                    overrideAccess: false,
+                    req,
+                    slug: slug
+                }).catch(()=>null),
+                key: `global:${slug}`
+            };
+        }
+        if (mention.type === "doc" && mention.collection && mention.id) {
+            const slug = mention.collection;
+            if (isInternalCollection(slug) || !collectionSlugSet.has(slug)) return null;
+            return {
+                doc: await req.payload.findByID({
+                    collection: slug,
+                    depth: 2,
+                    id: mention.id,
+                    ...activeLocale ? {
+                        locale: activeLocale
+                    } : {},
+                    overrideAccess: false,
+                    req
+                }).catch(()=>null),
+                key: `doc:${slug}:${mention.id}`
+            };
+        }
+        return null;
+    }));
+    const docsByMentionKey = new Map();
+    for (const result of mentionDocResults){
+        if (result) docsByMentionKey.set(result.key, result.doc);
+    }
     if (localeConfigs.length > 0) {
         context.push({
             activeLocale,
@@ -301,7 +373,7 @@ export const getMentionContext = async ({ blockContexts, collectionSlugs, collec
     }
     for (const mention of mentions.slice(0, 8)){
         if (mention.type === "locale" && mention.slug) {
-            const locale = localeConfigs.find((item)=>item.code === mention.slug);
+            const locale = localeConfigsByCode.get(mention.slug);
             if (!locale) continue;
             const key = `locale:${locale.code}`;
             if (seen.has(key)) continue;
@@ -314,8 +386,8 @@ export const getMentionContext = async ({ blockContexts, collectionSlugs, collec
         if (mention.type === "collection" && mention.slug) {
             const slug = mention.slug;
             const key = `collection:${slug}`;
-            if (seen.has(key) || isInternalCollection(slug) || !collectionSlugs.includes(slug)) continue;
-            const collectionConfig = req.payload.config.collections.find((collection)=>collection.slug === slug);
+            if (seen.has(key) || isInternalCollection(slug) || !collectionSlugSet.has(slug)) continue;
+            const collectionConfig = collectionConfigsBySlug.get(slug);
             if (!collectionConfig) continue;
             seen.add(key);
             context.push(describeCollectionLikeConfig({
@@ -327,18 +399,10 @@ export const getMentionContext = async ({ blockContexts, collectionSlugs, collec
         if (mention.type === "global" && mention.slug) {
             const slug = mention.slug;
             const key = `global:${slug}`;
-            if (seen.has(key) || !globalSlugs.includes(slug)) continue;
-            const globalConfig = req.payload.config.globals?.find((global)=>global.slug === slug);
+            if (seen.has(key) || !globalSlugSet.has(slug)) continue;
+            const globalConfig = globalConfigsBySlug.get(slug);
             if (!globalConfig) continue;
-            const globalDoc = await req.payload.findGlobal({
-                depth: 2,
-                ...activeLocale ? {
-                    locale: activeLocale
-                } : {},
-                overrideAccess: false,
-                req,
-                slug: slug
-            }).catch(()=>null);
+            const globalDoc = docsByMentionKey.get(key) ?? null;
             seen.add(key);
             context.push({
                 ...describeCollectionLikeConfig({
@@ -349,7 +413,7 @@ export const getMentionContext = async ({ blockContexts, collectionSlugs, collec
             });
         }
         if (mention.type === "block" && mention.slug) {
-            const matchingBlocks = blockContexts.filter((block)=>block.slug === mention.slug && (!mention.parent || block.parent === mention.parent));
+            const matchingBlocks = (blockContextsBySlug.get(mention.slug) || []).filter((block)=>!mention.parent || block.parent === mention.parent);
             for (const block of matchingBlocks){
                 const key = `block:${block.parent}:${block.slug}`;
                 if (seen.has(key)) continue;
@@ -363,17 +427,8 @@ export const getMentionContext = async ({ blockContexts, collectionSlugs, collec
         if (mention.type === "doc" && mention.collection && mention.id) {
             const slug = mention.collection;
             const key = `doc:${slug}:${mention.id}`;
-            if (seen.has(key) || isInternalCollection(slug) || !collectionSlugs.includes(slug)) continue;
-            const doc = await req.payload.findByID({
-                collection: slug,
-                depth: 2,
-                id: mention.id,
-                ...activeLocale ? {
-                    locale: activeLocale
-                } : {},
-                overrideAccess: false,
-                req
-            }).catch(()=>null);
+            if (seen.has(key) || isInternalCollection(slug) || !collectionSlugSet.has(slug)) continue;
+            const doc = docsByMentionKey.get(key);
             if (!doc) continue;
             seen.add(key);
             context.push({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mvriu5/payload-ai",
-    "version": "1.2.0",
+    "version": "1.3.2",
     "description": "AI assistant plugin for Payload CMS with provider selection, CMS mentions, and signed action proposals.",
     "keywords": [
         "payload",
@@ -63,7 +63,7 @@
         "test:e2e:headed": "playwright test --headed",
         "test:handlers": "vitest run tests/handlers",
         "test:unit": "vitest run tests/unit",
-        "setup:hooks": "git config core.hooksPath .githooks"
+        "knip": "knip"
     },
     "devDependencies": {
         "@ai-sdk/anthropic": "^3.0.81",
@@ -71,21 +71,21 @@
         "@ai-sdk/mistral": "^3.0.37",
         "@ai-sdk/openai": "^3.0.67",
         "@openrouter/ai-sdk-provider": "^2.9.1",
-        "@playwright/test": "^1.56.1",
         "@payloadcms/db-postgres": "3.84.1",
         "@payloadcms/next": "3.84.1",
         "@payloadcms/richtext-lexical": "3.84.1",
         "@payloadcms/ui": "3.84.1",
+        "@playwright/test": "^1.56.1",
         "@swc/cli": "0.8.1",
         "@types/node": "25.9.3",
         "@types/react": "19.2.17",
         "@types/react-dom": "19.2.3",
         "copyfiles": "2.4.1",
-        "cross-env": "^7.0.3",
+        "cross-env": "^10.1.0",
         "eslint": "^10.5.0",
-        "graphql": "^16.8.1",
+        "graphql": "^17.0.1",
         "jsdom": "^29.1.1",
-        "knip": "^6.16.1",
+        "knip": "^6.18.0",
         "next": "16.2.9",
         "payload": "3.84.1",
         "prettier": "^3.8.4",