payload-nested-docs-page-tree 1.2.4 → 1.4.1

package/dist/utilities/status.js

@@ -50,11 +50,15 @@ export function getPageTreeBadgeLabel(args) {
     return t(getPageTreeDisplayStatusLabelKey(status));
 }
 export function withPageTreeDisplayStatuses(args) {
-    const { draftDocs, publishedIDs } = args;
+    const { currentDocs, draftDocs } = args;
+    const currentStatusByID = new Map(currentDocs.map((doc)=>[
+            String(doc.id ?? ''),
+            doc._status ?? null
+        ]));
     return draftDocs.map((doc)=>{
         const docID = String(doc.id ?? '');
-        const hasPublishedVersion = publishedIDs.has(docID);
-        const displayStatus = doc._status === 'draft' && hasPublishedVersion ? 'changed' : doc._status === 'draft' || doc._status === 'published' ? doc._status : undefined;
+        const currentStatus = currentStatusByID.get(docID);
+        const displayStatus = doc._status === 'draft' && currentStatus === 'published' ? 'changed' : doc._status === 'draft' || doc._status === 'published' ? doc._status : undefined;
         if (doc._displayStatus === displayStatus) {
             return doc;
         }

package/dist/utilities/status.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/status.ts"],"sourcesContent":["import type {\n  PageTreeSourceDoc,\n  NestedDocsPageTreePluginBadgeMap,\n  NestedDocsPageTreePluginBadgeStatus,\n} from '../types.js'\n\nexport type PageTreeDisplayStatus = 'changed' | 'draft' | 'published' | 'unknown'\n\nfunction isBadgeStatus(status: PageTreeDisplayStatus): status is NestedDocsPageTreePluginBadgeStatus {\n  return status === 'changed' || status === 'draft' || status === 'published'\n}\n\nexport function getPageTreeDisplayStatus(\n  doc: Pick<PageTreeSourceDoc, '_displayStatus' | '_status'>,\n): PageTreeDisplayStatus {\n  if (doc._displayStatus === 'changed') {\n    return 'changed'\n  }\n\n  if (doc._displayStatus === 'draft') {\n    return 'draft'\n  }\n\n  if (doc._displayStatus === 'published') {\n    return 'published'\n  }\n\n  if (doc._status === 'draft') {\n    return 'draft'\n  }\n\n  if (doc._status === 'published') {\n    return 'published'\n  }\n\n  return 'unknown'\n}\n\nexport function getPageTreeDisplayStatusLabelKey(status: PageTreeDisplayStatus):\n  | 'version:draft'\n  | 'version:changed'\n  | 'version:published'\n  | 'general:noValue' {\n  if (status === 'changed') {\n    return 'version:changed'\n  }\n\n  if (status === 'draft') {\n    return 'version:draft'\n  }\n\n  if (status === 'published') {\n    return 'version:published'\n  }\n\n  return 'general:noValue'\n}\n\nexport function getPageTreeBadgeColor(args: {\n  badgeColors: NestedDocsPageTreePluginBadgeMap\n  status: PageTreeDisplayStatus\n}): string | undefined {\n  const { badgeColors, status } = args\n\n  if (!isBadgeStatus(status)) {\n    return undefined\n  }\n\n  const badgeColor = badgeColors[status]\n\n  return typeof badgeColor === 'string' && badgeColor.trim().length > 0\n    ? badgeColor.trim()\n    : undefined\n}\n\nexport function getPageTreeBadgeLabel(args: {\n  badgeLabels: NestedDocsPageTreePluginBadgeMap\n  status: PageTreeDisplayStatus\n  t: (key: ReturnType<typeof getPageTreeDisplayStatusLabelKey>) => string\n}): string {\n  const { badgeLabels, status, t } = args\n\n  if (isBadgeStatus(status)) {\n    const badgeLabel = badgeLabels[status]\n\n    if (typeof badgeLabel === 'string' && badgeLabel.trim().length > 0) {\n      return badgeLabel.trim()\n    }\n  }\n\n  return t(getPageTreeDisplayStatusLabelKey(status))\n}\n\nexport function withPageTreeDisplayStatuses(args: {\n  draftDocs: PageTreeSourceDoc[]\n  publishedIDs: ReadonlySet<string>\n}): PageTreeSourceDoc[] {\n  const { draftDocs, publishedIDs } = args\n\n  return draftDocs.map((doc) => {\n    const docID = String(doc.id ?? '')\n    const hasPublishedVersion = publishedIDs.has(docID)\n    const displayStatus =\n      doc._status === 'draft' && hasPublishedVersion\n        ? 'changed'\n        : doc._status === 'draft' || doc._status === 'published'\n          ? doc._status\n          : undefined\n\n    if (doc._displayStatus === displayStatus) {\n      return doc\n    }\n\n    return {\n      ...doc,\n      _displayStatus: displayStatus,\n    }\n  })\n}\n"],"names":["isBadgeStatus","status","getPageTreeDisplayStatus","doc","_displayStatus","_status","getPageTreeDisplayStatusLabelKey","getPageTreeBadgeColor","args","badgeColors","undefined","badgeColor","trim","length","getPageTreeBadgeLabel","badgeLabels","t","badgeLabel","withPageTreeDisplayStatuses","draftDocs","publishedIDs","map","docID","String","id","hasPublishedVersion","has","displayStatus"],"mappings":"AAQA,SAASA,cAAcC,MAA6B;IAClD,OAAOA,WAAW,aAAaA,WAAW,WAAWA,WAAW;AAClE;AAEA,OAAO,SAASC,yBACdC,GAA0D;IAE1D,IAAIA,IAAIC,cAAc,KAAK,WAAW;QACpC,OAAO;IACT;IAEA,IAAID,IAAIC,cAAc,KAAK,SAAS;QAClC,OAAO;IACT;IAEA,IAAID,IAAIC,cAAc,KAAK,aAAa;QACtC,OAAO;IACT;IAEA,IAAID,IAAIE,OAAO,KAAK,SAAS;QAC3B,OAAO;IACT;IAEA,IAAIF,IAAIE,OAAO,KAAK,aAAa;QAC/B,OAAO;IACT;IAEA,OAAO;AACT;AAEA,OAAO,SAASC,iCAAiCL,MAA6B;IAK5E,IAAIA,WAAW,WAAW;QACxB,OAAO;IACT;IAEA,IAAIA,WAAW,SAAS;QACtB,OAAO;IACT;IAEA,IAAIA,WAAW,aAAa;QAC1B,OAAO;IACT;IAEA,OAAO;AACT;AAEA,OAAO,SAASM,sBAAsBC,IAGrC;IACC,MAAM,EAAEC,WAAW,EAAER,MAAM,EAAE,GAAGO;IAEhC,IAAI,CAACR,cAAcC,SAAS;QAC1B,OAAOS;IACT;IAEA,MAAMC,aAAaF,WAAW,CAACR,OAAO;IAEtC,OAAO,OAAOU,eAAe,YAAYA,WAAWC,IAAI,GAAGC,MAAM,GAAG,IAChEF,WAAWC,IAAI,KACfF;AACN;AAEA,OAAO,SAASI,sBAAsBN,IAIrC;IACC,MAAM,EAAEO,WAAW,EAAEd,MAAM,EAAEe,CAAC,EAAE,GAAGR;IAEnC,IAAIR,cAAcC,SAAS;QACzB,MAAMgB,aAAaF,WAAW,CAACd,OAAO;QAEtC,IAAI,OAAOgB,eAAe,YAAYA,WAAWL,IAAI,GAAGC,MAAM,GAAG,GAAG;YAClE,OAAOI,WAAWL,IAAI;QACxB;IACF;IAEA,OAAOI,EAAEV,iCAAiCL;AAC5C;AAEA,OAAO,SAASiB,4BAA4BV,IAG3C;IACC,MAAM,EAAEW,SAAS,EAAEC,YAAY,EAAE,GAAGZ;IAEpC,OAAOW,UAAUE,GAAG,CAAC,CAAClB;QACpB,MAAMmB,QAAQC,OAAOpB,IAAIqB,EAAE,IAAI;QAC/B,MAAMC,sBAAsBL,aAAaM,GAAG,CAACJ;QAC7C,MAAMK,gBACJxB,IAAIE,OAAO,KAAK,WAAWoB,sBACvB,YACAtB,IAAIE,OAAO,KAAK,WAAWF,IAAIE,OAAO,KAAK,cACzCF,IAAIE,OAAO,GACXK;QAER,IAAIP,IAAIC,cAAc,KAAKuB,eAAe;YACxC,OAAOxB;QACT;QAEA,OAAO;YACL,GAAGA,GAAG;YACNC,gBAAgBuB;QAClB;IACF;AACF"}
+{"version":3,"sources":["../../src/utilities/status.ts"],"sourcesContent":["import type {\n  PageTreeSourceDoc,\n  NestedDocsPageTreePluginBadgeMap,\n  NestedDocsPageTreePluginBadgeStatus,\n} from '../types.js'\n\nexport type PageTreeDisplayStatus = 'changed' | 'draft' | 'published' | 'unknown'\n\nfunction isBadgeStatus(status: PageTreeDisplayStatus): status is NestedDocsPageTreePluginBadgeStatus {\n  return status === 'changed' || status === 'draft' || status === 'published'\n}\n\nexport function getPageTreeDisplayStatus(\n  doc: Pick<PageTreeSourceDoc, '_displayStatus' | '_status'>,\n): PageTreeDisplayStatus {\n  if (doc._displayStatus === 'changed') {\n    return 'changed'\n  }\n\n  if (doc._displayStatus === 'draft') {\n    return 'draft'\n  }\n\n  if (doc._displayStatus === 'published') {\n    return 'published'\n  }\n\n  if (doc._status === 'draft') {\n    return 'draft'\n  }\n\n  if (doc._status === 'published') {\n    return 'published'\n  }\n\n  return 'unknown'\n}\n\nexport function getPageTreeDisplayStatusLabelKey(status: PageTreeDisplayStatus):\n  | 'version:draft'\n  | 'version:changed'\n  | 'version:published'\n  | 'general:noValue' {\n  if (status === 'changed') {\n    return 'version:changed'\n  }\n\n  if (status === 'draft') {\n    return 'version:draft'\n  }\n\n  if (status === 'published') {\n    return 'version:published'\n  }\n\n  return 'general:noValue'\n}\n\nexport function getPageTreeBadgeColor(args: {\n  badgeColors: NestedDocsPageTreePluginBadgeMap\n  status: PageTreeDisplayStatus\n}): string | undefined {\n  const { badgeColors, status } = args\n\n  if (!isBadgeStatus(status)) {\n    return undefined\n  }\n\n  const badgeColor = badgeColors[status]\n\n  return typeof badgeColor === 'string' && badgeColor.trim().length > 0\n    ? badgeColor.trim()\n    : undefined\n}\n\nexport function getPageTreeBadgeLabel(args: {\n  badgeLabels: NestedDocsPageTreePluginBadgeMap\n  status: PageTreeDisplayStatus\n  t: (key: ReturnType<typeof getPageTreeDisplayStatusLabelKey>) => string\n}): string {\n  const { badgeLabels, status, t } = args\n\n  if (isBadgeStatus(status)) {\n    const badgeLabel = badgeLabels[status]\n\n    if (typeof badgeLabel === 'string' && badgeLabel.trim().length > 0) {\n      return badgeLabel.trim()\n    }\n  }\n\n  return t(getPageTreeDisplayStatusLabelKey(status))\n}\n\nexport function withPageTreeDisplayStatuses(args: {\n  currentDocs: Pick<PageTreeSourceDoc, '_status' | 'id'>[]\n  draftDocs: PageTreeSourceDoc[]\n}): PageTreeSourceDoc[] {\n  const { currentDocs, draftDocs } = args\n  const currentStatusByID = new Map(\n    currentDocs.map((doc) => [String(doc.id ?? ''), doc._status ?? null]),\n  )\n\n  return draftDocs.map((doc) => {\n    const docID = String(doc.id ?? '')\n    const currentStatus = currentStatusByID.get(docID)\n    const displayStatus =\n      doc._status === 'draft' && currentStatus === 'published'\n        ? 'changed'\n        : doc._status === 'draft' || doc._status === 'published'\n          ? doc._status\n          : undefined\n\n    if (doc._displayStatus === displayStatus) {\n      return doc\n    }\n\n    return {\n      ...doc,\n      _displayStatus: displayStatus,\n    }\n  })\n}\n"],"names":["isBadgeStatus","status","getPageTreeDisplayStatus","doc","_displayStatus","_status","getPageTreeDisplayStatusLabelKey","getPageTreeBadgeColor","args","badgeColors","undefined","badgeColor","trim","length","getPageTreeBadgeLabel","badgeLabels","t","badgeLabel","withPageTreeDisplayStatuses","currentDocs","draftDocs","currentStatusByID","Map","map","String","id","docID","currentStatus","get","displayStatus"],"mappings":"AAQA,SAASA,cAAcC,MAA6B;IAClD,OAAOA,WAAW,aAAaA,WAAW,WAAWA,WAAW;AAClE;AAEA,OAAO,SAASC,yBACdC,GAA0D;IAE1D,IAAIA,IAAIC,cAAc,KAAK,WAAW;QACpC,OAAO;IACT;IAEA,IAAID,IAAIC,cAAc,KAAK,SAAS;QAClC,OAAO;IACT;IAEA,IAAID,IAAIC,cAAc,KAAK,aAAa;QACtC,OAAO;IACT;IAEA,IAAID,IAAIE,OAAO,KAAK,SAAS;QAC3B,OAAO;IACT;IAEA,IAAIF,IAAIE,OAAO,KAAK,aAAa;QAC/B,OAAO;IACT;IAEA,OAAO;AACT;AAEA,OAAO,SAASC,iCAAiCL,MAA6B;IAK5E,IAAIA,WAAW,WAAW;QACxB,OAAO;IACT;IAEA,IAAIA,WAAW,SAAS;QACtB,OAAO;IACT;IAEA,IAAIA,WAAW,aAAa;QAC1B,OAAO;IACT;IAEA,OAAO;AACT;AAEA,OAAO,SAASM,sBAAsBC,IAGrC;IACC,MAAM,EAAEC,WAAW,EAAER,MAAM,EAAE,GAAGO;IAEhC,IAAI,CAACR,cAAcC,SAAS;QAC1B,OAAOS;IACT;IAEA,MAAMC,aAAaF,WAAW,CAACR,OAAO;IAEtC,OAAO,OAAOU,eAAe,YAAYA,WAAWC,IAAI,GAAGC,MAAM,GAAG,IAChEF,WAAWC,IAAI,KACfF;AACN;AAEA,OAAO,SAASI,sBAAsBN,IAIrC;IACC,MAAM,EAAEO,WAAW,EAAEd,MAAM,EAAEe,CAAC,EAAE,GAAGR;IAEnC,IAAIR,cAAcC,SAAS;QACzB,MAAMgB,aAAaF,WAAW,CAACd,OAAO;QAEtC,IAAI,OAAOgB,eAAe,YAAYA,WAAWL,IAAI,GAAGC,MAAM,GAAG,GAAG;YAClE,OAAOI,WAAWL,IAAI;QACxB;IACF;IAEA,OAAOI,EAAEV,iCAAiCL;AAC5C;AAEA,OAAO,SAASiB,4BAA4BV,IAG3C;IACC,MAAM,EAAEW,WAAW,EAAEC,SAAS,EAAE,GAAGZ;IACnC,MAAMa,oBAAoB,IAAIC,IAC5BH,YAAYI,GAAG,CAAC,CAACpB,MAAQ;YAACqB,OAAOrB,IAAIsB,EAAE,IAAI;YAAKtB,IAAIE,OAAO,IAAI;SAAK;IAGtE,OAAOe,UAAUG,GAAG,CAAC,CAACpB;QACpB,MAAMuB,QAAQF,OAAOrB,IAAIsB,EAAE,IAAI;QAC/B,MAAME,gBAAgBN,kBAAkBO,GAAG,CAACF;QAC5C,MAAMG,gBACJ1B,IAAIE,OAAO,KAAK,WAAWsB,kBAAkB,cACzC,YACAxB,IAAIE,OAAO,KAAK,WAAWF,IAAIE,OAAO,KAAK,cACzCF,IAAIE,OAAO,GACXK;QAER,IAAIP,IAAIC,cAAc,KAAKyB,eAAe;YACxC,OAAO1B;QACT;QAEA,OAAO;YACL,GAAGA,GAAG;YACNC,gBAAgByB;QAClB;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-nested-docs-page-tree",
-  "version": "1.2.4",
+  "version": "1.4.1",
   "description": "Page tree plugin for Payload nested docs collections",
   "license": "MIT",
   "author": "WLF Studios",
@@ -45,14 +45,35 @@
     "README.md",
     "LICENSE"
   ],
+  "scripts": {
+    "build": "pnpm clean && pnpm build:types && pnpm build:swc && pnpm copyfiles && pnpm build:strip-tests",
+    "build:strip-tests": "rimraf \"dist/**/*.spec.*\"",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
+    "build:types": "tsc --project tsconfig.build.json",
+    "clean": "rimraf dist \"*.tsbuildinfo\"",
+    "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
+    "dev": "next dev dev --webpack",
+    "dev:generate-importmap": "pnpm dev:payload generate:importmap",
+    "dev:generate-types": "pnpm dev:payload generate:types",
+    "dev:payload": "cross-env PAYLOAD_CONFIG_PATH=./dev/payload.config.ts payload",
+    "generate:importmap": "pnpm dev:generate-importmap",
+    "generate:types": "pnpm dev:generate-types",
+    "lint": "eslint",
+    "lint:fix": "eslint ./src --fix",
+    "prepare": "pnpm clean && pnpm build",
+    "prepublishOnly": "pnpm clean && pnpm build",
+    "test": "pnpm test:int && pnpm test:e2e",
+    "test:e2e": "playwright test",
+    "test:int": "vitest"
+  },
   "devDependencies": {
     "@eslint/eslintrc": "^3.2.0",
-    "@payloadcms/db-mongodb": "3.84.1",
+    "@payloadcms/db-mongodb": "3.81.0",
     "@payloadcms/eslint-config": "3.9.0",
-    "@payloadcms/next": "3.84.1",
-    "@payloadcms/plugin-nested-docs": "3.84.1",
-    "@payloadcms/richtext-lexical": "3.84.1",
-    "@payloadcms/ui": "3.84.1",
+    "@payloadcms/next": "3.81.0",
+    "@payloadcms/plugin-nested-docs": "3.81.0",
+    "@payloadcms/richtext-lexical": "3.81.0",
+    "@payloadcms/ui": "3.81.0",
     "@playwright/test": "1.58.2",
     "@swc-node/register": "1.10.9",
     "@swc/cli": "0.6.0",
@@ -67,7 +88,8 @@
     "mongodb-memory-server": "10.1.4",
     "next": "16.2.3",
     "open": "^10.1.0",
-    "payload": "3.84.1",
+    "payload": "3.81.0",
+    "payload-cloudflare-build-status": "^1.0.0",
     "prettier": "^3.4.2",
     "qs-esm": "8.0.1",
     "react": "19.2.4",
@@ -80,36 +102,36 @@
     "vitest": "4.0.18"
   },
   "peerDependencies": {
-    "@payloadcms/plugin-nested-docs": "^3.84.1",
-    "payload": "^3.84.1"
+    "@payloadcms/plugin-nested-docs": "^3.81.0 || ^3.82.0",
+    "payload": "^3.81.0 || ^3.82.0"
   },
   "engines": {
-    "node": "^18.20.2 || >=20.9.0",
-    "pnpm": "^9 || ^10"
+    "node": "^18.20.2 || >=20.9.0"
   },
   "publishConfig": {
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "exports": {
+      ".": {
+        "import": "./dist/index.js",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "./client": {
+        "import": "./dist/exports/client.js",
+        "types": "./dist/exports/client.d.ts",
+        "default": "./dist/exports/client.js"
+      },
+      "./rsc": {
+        "import": "./dist/exports/rsc.js",
+        "types": "./dist/exports/rsc.d.ts",
+        "default": "./dist/exports/rsc.js"
+      }
+    },
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@dnd-kit/core": "^6.3.1"
-  },
-  "scripts": {
-    "build": "pnpm clean && pnpm build:types && pnpm build:swc && pnpm copyfiles && pnpm build:strip-tests",
-    "build:strip-tests": "rimraf \"dist/**/*.spec.*\"",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
-    "build:types": "tsc --project tsconfig.build.json",
-    "clean": "rimraf dist \"*.tsbuildinfo\"",
-    "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
-    "dev": "next dev dev --webpack",
-    "dev:generate-importmap": "pnpm dev:payload generate:importmap",
-    "dev:generate-types": "pnpm dev:payload generate:types",
-    "dev:payload": "cross-env PAYLOAD_CONFIG_PATH=./dev/payload.config.ts payload",
-    "generate:importmap": "pnpm dev:generate-importmap",
-    "generate:types": "pnpm dev:generate-types",
-    "lint": "eslint",
-    "lint:fix": "eslint ./src --fix",
-    "test": "pnpm test:int && pnpm test:e2e",
-    "test:e2e": "playwright test",
-    "test:int": "vitest"
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "10.0.0"
   }
-}
+}