@nitrogenbuilder/connector-payload 1.2.1 → 1.2.3

package/dist/editor/NitrogenEditorAssetsRoute.js

@@ -1,10 +1,31 @@
+import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
+import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { NextResponse } from "next/server";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const ASSETS_DIR = path.resolve(__dirname, "..", "editor-assets");
+// Next bundles npm packages into server chunks, so in a production build
+// __dirname points into .next/server and the relative lookup fails. Resolve
+// the installed package on disk through Node's resolver instead (works from
+// inside a bundle because createRequire resolves against the host app's real
+// node_modules), and keep the relative path as a fallback for unbundled /
+// linked-dev execution where the package specifier may not resolve.
+function resolveAssetsDir() {
+    try {
+        const nodeRequire = createRequire(import.meta.url);
+        const pkgRoot = path.dirname(nodeRequire.resolve("@nitrogenbuilder/connector-payload/package.json"));
+        const dir = path.join(pkgRoot, "dist", "editor-assets");
+        if (existsSync(dir))
+            return dir;
+    }
+    catch {
+        // fall through to the relative fallback
+    }
+    return path.resolve(__dirname, "..", "editor-assets");
+}
+const ASSETS_DIR = resolveAssetsDir();
 function getContentType(filePath) {
     switch (path.extname(filePath).toLowerCase()) {
         case ".css":

package/dist/endpoints/batch.js

@@ -29,10 +29,10 @@ function requestSignature(batchReq) {
         .map((k) => [k, params[k]]));
     return JSON.stringify({ endpoint: batchReq.endpoint, params: sortedParams });
 }
-async function resolveRelationshipIds(payload, collection, values) {
+async function resolveRelationshipIds(payload, collection, values, includeDirectIds = false) {
     if (values.length === 0)
         return [];
-    const [slugMatches, titleMatches] = await Promise.all([
+    const [slugMatches, titleMatches, idMatches] = await Promise.all([
         payload.find({
             collection,
             where: {
@@ -51,8 +51,19 @@ async function resolveRelationshipIds(payload, collection, values) {
             depth: 0,
             pagination: false,
         }),
+        includeDirectIds
+            ? payload.find({
+                collection,
+                where: {
+                    id: { in: values },
+                },
+                limit: values.length,
+                depth: 0,
+                pagination: false,
+            })
+            : Promise.resolve({ docs: [] }),
     ]);
-    return [...slugMatches.docs, ...titleMatches.docs].map((doc) => doc.id);
+    return [...slugMatches.docs, ...titleMatches.docs, ...idMatches.docs].map((doc) => doc.id);
 }
 async function resolveAllRelationshipIds(payload, collection) {
     const result = await payload.find({
@@ -63,8 +74,8 @@ async function resolveAllRelationshipIds(payload, collection) {
     });
     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);
+async function applyRelationshipFilter({ payload, results, key, where, field, collection, includeValues, excludeValues = [], includeDirectIds = false, }) {
+    const includeIds = await resolveRelationshipIds(payload, collection, includeValues, includeDirectIds);
     if (includeValues.length > 0) {
         if (includeIds.length === 0) {
             results[key] = {
@@ -265,21 +276,17 @@ export const batchEndpoints = [
                     const authors = toArray(params.authors);
                     if (authors.length > 0) {
                         if (collectionSlug === "posts") {
-                            const authorIds = await resolveRelationshipIds(payload, "author", authors);
-                            const authorFilters = [];
-                            if (authorIds.length > 0) {
-                                authorFilters.push({
-                                    wpAuthors: { in: Array.from(new Set(authorIds)) },
-                                });
-                            }
-                            authorFilters.push({
-                                wpAuthorName: { in: authors },
-                            });
-                            if (authorFilters.length === 1) {
-                                Object.assign(where, authorFilters[0]);
-                            }
-                            else {
-                                where.or = [...(where.or ?? []), ...authorFilters];
+                            if (!(await applyRelationshipFilter({
+                                payload,
+                                results,
+                                key,
+                                where,
+                                field: "contentAuthors",
+                                collection: "author",
+                                includeValues: authors,
+                                includeDirectIds: true,
+                            }))) {
+                                return;
                             }
                         }
                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",
@@ -23,13 +23,15 @@
       "types": "./dist/editor/NitrogenEditorAssetsRoute.d.ts",
       "default": "./dist/editor/NitrogenEditorAssetsRoute.js"
     },
-    "./components/*": "./dist/components/*"
+    "./components/*": "./dist/components/*",
+    "./package.json": "./package.json"
   },
   "files": [
     "dist"
   ],
   "scripts": {
     "build": "tsc && node ./scripts/copy-editor-assets.mjs",
+    "test": "pnpm build && node --test tests/*.test.mjs",
     "typecheck": "tsc --noEmit",
     "prepublishOnly": "pnpm build"
   },
@@ -55,4 +57,4 @@
     "@nitrogenbuilder/client-core": "link:../monogen/packages/client-core",
     "@nitrogenbuilder/types": "link:../monogen/packages/types"
   }
-}
+}