@nitrogenbuilder/connector-payload 0.1.31 → 0.1.33

package/dist/components/NitrogenEditButton.d.ts

@@ -1,3 +1,4 @@
 export declare const NitrogenEditButton: import("react").ComponentType<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenEditButtonRuntime.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const NitrogenEditButtonRuntime: React.FC<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenEditButtonRuntime.js

@@ -15,16 +15,44 @@ function getPreferredSiteUrl(data) {
     const fallbackUrl = isLocalAdmin ? data.frontendUrl : data.developmentUrl;
     return preferredUrl || fallbackUrl || '';
 }
-export const NitrogenEditButtonRuntime = ({ collection }) => {
+function normalizeRoutePattern(routePattern) {
+    if (!routePattern)
+        return undefined;
+    return routePattern.startsWith('/') ? routePattern : `/${routePattern}`;
+}
+function trimSlashes(value) {
+    return value.replace(/^\/+|\/+$/g, '');
+}
+function buildRelativePath(slug, routePattern, templateSlug) {
+    const normalizedRoutePattern = normalizeRoutePattern(routePattern);
+    if (normalizedRoutePattern) {
+        if (normalizedRoutePattern.includes('[...slug]')) {
+            return normalizedRoutePattern.replace('[...slug]', slug);
+        }
+        if (normalizedRoutePattern.includes('[slug]')) {
+            return normalizedRoutePattern.replace('[slug]', slug);
+        }
+        return normalizedRoutePattern.endsWith('/')
+            ? `${normalizedRoutePattern}${slug}`
+            : normalizedRoutePattern;
+    }
+    if (templateSlug) {
+        return `/${trimSlashes(templateSlug)}/${trimSlashes(slug)}`;
+    }
+    return `/${trimSlashes(slug)}`;
+}
+export const NitrogenEditButtonRuntime = ({ collection, routePattern }) => {
     const [id, setId] = useState(undefined);
     const [token, setToken] = useState(undefined);
     const [slug, setSlug] = useState(undefined);
     const [frontendUrl, setFrontendUrl] = useState(undefined);
     const [instanceUrl, setInstanceUrl] = useState(undefined);
     const [authorId, setAuthorId] = useState(undefined);
+    const [templateSlug, setTemplateSlug] = useState(undefined);
     useEffect(() => {
         const segments = window.location.pathname.split('/').filter(Boolean);
         const docId = segments.length >= 4 ? segments[3] : undefined;
+        const shouldResolveTemplateSlug = collection !== 'nitrogen-templates' && !routePattern;
         if (docId) {
             setId(docId);
             fetch(`/api/${collection}/${docId}`)
@@ -38,6 +66,29 @@ export const NitrogenEditButtonRuntime = ({ collection }) => {
                 console.error('Failed to fetch document:', err);
             });
         }
+        setTemplateSlug(undefined);
+        if (shouldResolveTemplateSlug) {
+            const params = new URLSearchParams();
+            params.set('where[associatedCollection][equals]', collection);
+            params.set('where[status][equals]', 'published');
+            params.set('limit', '1');
+            params.set('depth', '0');
+            fetch(`/api/nitrogen-templates?${params.toString()}`)
+                .then((res) => res.json())
+                .then((data) => {
+                const doc = Array.isArray(data?.docs) ? data.docs[0] : undefined;
+                if (typeof doc?.slug === 'string') {
+                    setTemplateSlug(doc.slug);
+                }
+                else {
+                    setTemplateSlug(null);
+                }
+            })
+                .catch((err) => {
+                console.error('Failed to fetch nitrogen template:', err);
+                setTemplateSlug(null);
+            });
+        }
         fetch('/api/users/me')
             .then((res) => res.json())
             .then((data) => {
@@ -65,7 +116,7 @@ export const NitrogenEditButtonRuntime = ({ collection }) => {
             .catch((err) => {
             console.error('Failed to fetch nitrogen settings:', err);
         });
-    }, [collection]);
+    }, [collection, routePattern]);
     if (!id || !token || !authorId)
         return null;
     const editorBase = instanceUrl ?? '';
@@ -73,13 +124,18 @@ export const NitrogenEditButtonRuntime = ({ collection }) => {
     const encodedAuthorId = encodeURIComponent(authorId);
     const developmentFlags = isDevelopmentMode ? '&development=true' : '';
     const editHref = `${editorBase}/nitrogen-editor?token=${encodeURIComponent(token)}&collection=${encodeURIComponent(collection)}&pageId=${id}&authorId=${encodedAuthorId}&author=${encodedAuthorId}${developmentFlags}`;
-    const viewHref = collection === 'nitrogen-templates'
-        ? `${frontendUrl}/nitrogen-templates/${slug}`
-        : `${frontendUrl}/${slug}`;
+    const viewRelativePath = collection === 'nitrogen-templates'
+        ? `/nitrogen-templates/${trimSlashes(slug || '')}`
+        : buildRelativePath(slug || '', routePattern, templateSlug ?? undefined);
+    const viewHref = `${frontendUrl}${viewRelativePath}`;
     const editButtonVars = isDevelopmentMode
         ? nitrogenEditDevButtonVars
         : nitrogenEditLiveButtonVars;
-    return (_jsxs("div", { style: nitrogenButtonGroupStyle, children: [slug && frontendUrl && (_jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: viewHref, extraButtonProps: {
+    return (_jsxs("div", { style: nitrogenButtonGroupStyle, children: [slug &&
+                frontendUrl &&
+                (collection === 'nitrogen-templates' ||
+                    routePattern ||
+                    templateSlug !== undefined) && (_jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: viewHref, extraButtonProps: {
                     style: nitrogenViewButtonVars,
                 }, children: collection === 'nitrogen-templates' ? 'View Template' : 'View Page' })), _jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: editHref, extraButtonProps: {
                     style: editButtonVars,

package/dist/components/NitrogenViewButton.d.ts

@@ -1,3 +1,4 @@
 export declare const NitrogenViewButton: import("react").ComponentType<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenViewButtonRuntime.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const NitrogenViewButtonRuntime: React.FC<{
     collection: string;
+    routePattern?: string;
 }>;

package/dist/components/NitrogenViewButtonRuntime.js

@@ -12,12 +12,40 @@ function getPreferredSiteUrl(data) {
     const fallbackUrl = isLocalAdmin ? data.frontendUrl : data.developmentUrl;
     return preferredUrl || fallbackUrl || '';
 }
-export const NitrogenViewButtonRuntime = ({ collection }) => {
+function normalizeRoutePattern(routePattern) {
+    if (!routePattern)
+        return undefined;
+    return routePattern.startsWith('/') ? routePattern : `/${routePattern}`;
+}
+function trimSlashes(value) {
+    return value.replace(/^\/+|\/+$/g, '');
+}
+function buildRelativePath(slug, routePattern, templateSlug) {
+    const normalizedRoutePattern = normalizeRoutePattern(routePattern);
+    if (normalizedRoutePattern) {
+        if (normalizedRoutePattern.includes('[...slug]')) {
+            return normalizedRoutePattern.replace('[...slug]', slug);
+        }
+        if (normalizedRoutePattern.includes('[slug]')) {
+            return normalizedRoutePattern.replace('[slug]', slug);
+        }
+        return normalizedRoutePattern.endsWith('/')
+            ? `${normalizedRoutePattern}${slug}`
+            : normalizedRoutePattern;
+    }
+    if (templateSlug) {
+        return `/${trimSlashes(templateSlug)}/${trimSlashes(slug)}`;
+    }
+    return `/${trimSlashes(slug)}`;
+}
+export const NitrogenViewButtonRuntime = ({ collection, routePattern }) => {
     const [slug, setSlug] = useState(undefined);
     const [siteUrl, setSiteUrl] = useState(undefined);
+    const [templateSlug, setTemplateSlug] = useState(undefined);
     useEffect(() => {
         const segments = window.location.pathname.split('/').filter(Boolean);
         const docId = segments.length >= 4 ? segments[3] : undefined;
+        const shouldResolveTemplateSlug = collection !== 'nitrogen-templates' && !routePattern;
         if (!docId)
             return;
         fetch(`/api/${collection}/${docId}`)
@@ -30,6 +58,29 @@ export const NitrogenViewButtonRuntime = ({ collection }) => {
             .catch((err) => {
             console.error('Failed to fetch document:', err);
         });
+        setTemplateSlug(undefined);
+        if (shouldResolveTemplateSlug) {
+            const params = new URLSearchParams();
+            params.set('where[associatedCollection][equals]', collection);
+            params.set('where[status][equals]', 'published');
+            params.set('limit', '1');
+            params.set('depth', '0');
+            fetch(`/api/nitrogen-templates?${params.toString()}`)
+                .then((res) => res.json())
+                .then((data) => {
+                const doc = Array.isArray(data?.docs) ? data.docs[0] : undefined;
+                if (typeof doc?.slug === 'string') {
+                    setTemplateSlug(doc.slug);
+                }
+                else {
+                    setTemplateSlug(null);
+                }
+            })
+                .catch((err) => {
+                console.error('Failed to fetch nitrogen template:', err);
+                setTemplateSlug(null);
+            });
+        }
         fetch('/api/globals/nitrogen-settings')
             .then((res) => res.json())
             .then((data) => {
@@ -41,11 +92,17 @@ export const NitrogenViewButtonRuntime = ({ collection }) => {
             .catch((err) => {
             console.error('Failed to fetch nitrogen settings:', err);
         });
-    }, [collection]);
+    }, [collection, routePattern]);
     if (!slug || !siteUrl) {
         return null;
     }
-    const href = `${siteUrl}/${slug}`;
+    if (collection !== 'nitrogen-templates' && !routePattern && templateSlug === undefined) {
+        return null;
+    }
+    const relativePath = collection === 'nitrogen-templates'
+        ? `/nitrogen-templates/${trimSlashes(slug)}`
+        : buildRelativePath(slug, routePattern, templateSlug ?? undefined);
+    const href = `${siteUrl}${relativePath}`;
     return (_jsx(Button, { buttonStyle: "primary", el: "anchor", margin: false, newTab: true, url: href, extraButtonProps: {
             style: nitrogenViewButtonVars,
         }, children: "View Page" }));

package/dist/endpoints/batch.js

@@ -2,9 +2,7 @@ import { buildPermalink, buildRelativePermalink, resolveCollection, } from "../c
 import { getNitrogenSettings, buildDynamicData, buildPageResponse, } from "./helpers";
 function toArray(value) {
     if (Array.isArray(value)) {
-        return value
-            .map((item) => String(item).trim())
-            .filter(Boolean);
+        return value.map((item) => String(item).trim()).filter(Boolean);
     }
     if (typeof value === "string") {
         return value
@@ -14,6 +12,12 @@ function toArray(value) {
     }
     return [];
 }
+function isTruthyParam(value) {
+    return value === true || value === "true" || value === "1" || value === 1;
+}
+function unique(values) {
+    return Array.from(new Set(values));
+}
 async function resolveRelationshipIds(payload, collection, values) {
     if (values.length === 0)
         return [];
@@ -39,6 +43,37 @@ async function resolveRelationshipIds(payload, collection, values) {
     ]);
     return [...slugMatches.docs, ...titleMatches.docs].map((doc) => doc.id);
 }
+async function resolveAllRelationshipIds(payload, collection) {
+    const result = await payload.find({
+        collection,
+        limit: 1000,
+        depth: 0,
+        pagination: false,
+    });
+    return result.docs.map((doc) => doc.id);
+}
+async function applyRelationshipFilter({ payload, results, key, where, field, collection, includeValues, excludeValues = [], }) {
+    const includeIds = await resolveRelationshipIds(payload, collection, includeValues);
+    if (includeValues.length > 0) {
+        if (includeIds.length === 0) {
+            results[key] = {
+                data: [],
+                total: 0,
+                totalPages: 0,
+            };
+            return false;
+        }
+        where[field] = { in: unique(includeIds) };
+    }
+    const excludeIds = await resolveRelationshipIds(payload, collection, excludeValues);
+    if (excludeIds.length > 0) {
+        where[field] = {
+            ...(where[field] ?? {}),
+            not_in: unique(excludeIds),
+        };
+    }
+    return true;
+}
 export const batchEndpoints = [
     // POST /api/nitrogen/v1/batch-data — Batch fetch multiple collections
     {
@@ -76,10 +111,7 @@ export const batchEndpoints = [
                     if (!statuses.includes("any")) {
                         where._status = { in: statuses };
                     }
-                    const slugs = [
-                        ...toArray(params.slug),
-                        ...toArray(params.slugs),
-                    ];
+                    const slugs = [...toArray(params.slug), ...toArray(params.slugs)];
                     if (slugs.length > 0) {
                         where.slug = { in: Array.from(new Set(slugs)) };
                     }
@@ -90,63 +122,117 @@ export const batchEndpoints = [
                     if (titles.length > 0) {
                         where.title = { in: Array.from(new Set(titles)) };
                     }
-                    const categoryIds = await resolveRelationshipIds(payload, "post-category", toArray(params.categories));
-                    if (toArray(params.categories).length > 0) {
-                        if (categoryIds.length === 0) {
-                            results[key] = {
-                                data: [],
-                                total: 0,
-                                totalPages: 0,
-                            };
-                            return;
-                        }
-                        where.categories = { in: Array.from(new Set(categoryIds)) };
+                    if (!(await applyRelationshipFilter({
+                        payload,
+                        results,
+                        key,
+                        where,
+                        field: "categories",
+                        collection: "post-category",
+                        includeValues: toArray(params.categories),
+                        excludeValues: toArray(params.categories_excluded),
+                    }))) {
+                        return;
                     }
-                    const excludedCategoryIds = await resolveRelationshipIds(payload, "post-category", toArray(params.categories_excluded));
-                    if (excludedCategoryIds.length > 0) {
-                        where.categories = {
-                            ...(where.categories ?? {}),
-                            not_in: Array.from(new Set(excludedCategoryIds)),
-                        };
+                    if (!(await applyRelationshipFilter({
+                        payload,
+                        results,
+                        key,
+                        where,
+                        field: "tags",
+                        collection: "tag",
+                        includeValues: toArray(params.tags),
+                        excludeValues: toArray(params.tags_excluded),
+                    }))) {
+                        return;
                     }
-                    const tagIds = await resolveRelationshipIds(payload, "tag", toArray(params.tags));
-                    if (toArray(params.tags).length > 0) {
-                        if (tagIds.length === 0) {
-                            results[key] = {
-                                data: [],
-                                total: 0,
-                                totalPages: 0,
-                            };
-                            return;
-                        }
-                        where.tags = { in: Array.from(new Set(tagIds)) };
+                    if (!(await applyRelationshipFilter({
+                        payload,
+                        results,
+                        key,
+                        where,
+                        field: "industryTags",
+                        collection: "industry-tag",
+                        includeValues: [
+                            ...toArray(params.industry_tags),
+                            ...toArray(params.industryTags),
+                        ],
+                        excludeValues: toArray(params.industry_tags_excluded),
+                    }))) {
+                        return;
                     }
-                    const excludedTagIds = await resolveRelationshipIds(payload, "tag", toArray(params.tags_excluded));
-                    if (excludedTagIds.length > 0) {
-                        where.tags = {
-                            ...(where.tags ?? {}),
-                            not_in: Array.from(new Set(excludedTagIds)),
-                        };
+                    if (!(await applyRelationshipFilter({
+                        payload,
+                        results,
+                        key,
+                        where,
+                        field: "productTags",
+                        collection: "product-tag",
+                        includeValues: [
+                            ...toArray(params.product_tags),
+                            ...toArray(params.productTags),
+                        ],
+                        excludeValues: toArray(params.product_tags_excluded),
+                    }))) {
+                        return;
                     }
-                    const featuredIds = await resolveRelationshipIds(payload, "featured-tag", toArray(params.featured));
-                    if (toArray(params.featured).length > 0) {
-                        if (featuredIds.length === 0) {
-                            results[key] = {
-                                data: [],
-                                total: 0,
-                                totalPages: 0,
-                            };
-                            return;
-                        }
-                        where.featuredTags = { in: Array.from(new Set(featuredIds)) };
+                    if (!(await applyRelationshipFilter({
+                        payload,
+                        results,
+                        key,
+                        where,
+                        field: "languageTags",
+                        collection: "language-tag",
+                        includeValues: [
+                            ...toArray(params.language_tags),
+                            ...toArray(params.languageTags),
+                        ],
+                        excludeValues: toArray(params.language_tags_excluded),
+                    }))) {
+                        return;
                     }
-                    const excludedFeaturedIds = await resolveRelationshipIds(payload, "featured-tag", toArray(params.featured_excluded));
-                    if (excludedFeaturedIds.length > 0) {
+                    if (!(await applyRelationshipFilter({
+                        payload,
+                        results,
+                        key,
+                        where,
+                        field: "featuredTags",
+                        collection: "featured-tag",
+                        includeValues: [
+                            ...toArray(params.featured),
+                            ...toArray(params.featured_tags),
+                            ...toArray(params.featuredTags),
+                        ],
+                        excludeValues: [
+                            ...toArray(params.featured_excluded),
+                            ...toArray(params.featured_tags_excluded),
+                        ],
+                    }))) {
+                        return;
+                    }
+                    if (isTruthyParam(params.featured_only)) {
+                        const featuredIds = await resolveAllRelationshipIds(payload, "featured-tag");
                         where.featuredTags = {
                             ...(where.featuredTags ?? {}),
-                            not_in: Array.from(new Set(excludedFeaturedIds)),
+                            in: unique(featuredIds),
                         };
                     }
+                    if (isTruthyParam(params.exclude_featured)) {
+                        const featuredIds = await resolveAllRelationshipIds(payload, "featured-tag");
+                        where.featuredTags = {
+                            ...(where.featuredTags ?? {}),
+                            not_in: unique(featuredIds),
+                        };
+                    }
+                    const search = String(params.q ?? params.search ?? "").trim();
+                    if (search) {
+                        where.or = [
+                            ...(where.or ?? []),
+                            { title: { contains: search } },
+                            { "meta.description": { contains: search } },
+                            { content: { contains: search } },
+                        ];
+                    }
                     const authors = toArray(params.authors);
                     if (authors.length > 0) {
                         if (collectionSlug === "posts") {

package/dist/index.js

@@ -120,7 +120,7 @@ export const nitrogenConnectorPlugin = (options = {}) => (incomingConfig) => {
                             ...beforeControls,
                             {
                                 path: "@nitrogenbuilder/connector-payload/components/NitrogenEditButton#NitrogenEditButton",
-                                clientProps: { collection: slug },
+                                clientProps: { collection: slug, routePattern },
                             },
                         ],
                     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",