@payloadcms/richtext-lexical 4.0.0-internal.b6f3b9a → 4.0.0-internal.b8a92d2

package/dist/features/relationship/server/index.js

@@ -1,22 +1,30 @@
 import { populate } from '../../../populateGraphQL/populate.js';
 import { createServerFeature } from '../../../utilities/createServerFeature.js';
 import { createNode } from '../../typeUtilities.js';
+import { filterEnabledRelationshipCollections } from '../shared/filterEnabledRelationshipCollections.js';
 import { relationshipPopulationPromiseHOC } from './graphQLPopulationPromise.js';
 import { i18n } from './i18n.js';
 import { RelationshipServerNode } from './nodes/RelationshipNode.js';
 import { createRelationshipNodeJSONSchema } from './schema.js';
 export const RelationshipFeature = createServerFeature({
   feature: ({
-    props
+    config,
+    props: unsanitizedProps
   }) => {
-    // we don't need to pass maxDepth to the client, it's only used on the server
-    const {
-      maxDepth,
-      ...clientFeatureProps
-    } = props ?? {};
+    const props = {
+      ...unsanitizedProps,
+      enabledCollectionSlugs: filterEnabledRelationshipCollections(config.collections, {
+        ...unsanitizedProps,
+        uploads: false
+      }).map(({
+        slug
+      }) => slug)
+    };
     return {
       ClientFeature: '@payloadcms/richtext-lexical/client#RelationshipFeatureClient',
-      clientFeatureProps,
+      clientFeatureProps: {
+        enabledCollectionSlugs: props.enabledCollectionSlugs
+      },
       i18n,
       nodes: [createNode({
         graphQLPopulationPromises: [relationshipPopulationPromiseHOC(props)],
@@ -32,7 +40,7 @@ export const RelationshipFeature = createServerFeature({
             req,
             showHiddenFields
           }) => {
-            if (!node?.value) {
+            if (!node?.value || !props.enabledCollectionSlugs.includes(node.relationTo)) {
               return node;
             }
             const collection = req.payload.collections[node?.relationTo];
@@ -42,7 +50,7 @@ export const RelationshipFeature = createServerFeature({
             // @ts-expect-error
             const id = node?.value?.id || node?.value // for backwards-compatibility
 ;
-            const populateDepth = maxDepth !== undefined && maxDepth < depth ? maxDepth : depth;
+            const populateDepth = props.maxDepth !== undefined && props.maxDepth < depth ? props.maxDepth : depth;
             populationPromises.push(populate({
               id,
               collectionSlug: collection.config.slug,
@@ -60,8 +68,17 @@ export const RelationshipFeature = createServerFeature({
           }]
         },
         jsonSchema: createRelationshipNodeJSONSchema(props),
-        node: RelationshipServerNode
-      })]
+        node: RelationshipServerNode,
+        validations: [({
+          node,
+          validation: {
+            options: {
+              req
+            }
+          }
+        }) => props.enabledCollectionSlugs.includes(node.relationTo) ? true : req.t('validation:invalidSelection')]
+      })],
+      sanitizedServerFeatureProps: props
     };
   },
   key: 'relationship'

package/dist/features/relationship/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["populate","createServerFeature","createNode","relationshipPopulationPromiseHOC","i18n","RelationshipServerNode","createRelationshipNodeJSONSchema","RelationshipFeature","feature","props","maxDepth","clientFeatureProps","ClientFeature","nodes","graphQLPopulationPromises","hooks","afterRead","currentDepth","depth","draft","node","overrideAccess","populateArg","populationPromises","req","showHiddenFields","value","collection","payload","collections","relationTo","id","populateDepth","undefined","push","collectionSlug","config","slug","data","key","select","defaultPopulate","jsonSchema"],"sources":["../../../../src/features/relationship/server/index.ts"],"sourcesContent":["import type { CollectionSlug } from 'payload'\n\nimport { populate } from '../../../populateGraphQL/populate.js'\nimport { createServerFeature } from '../../../utilities/createServerFeature.js'\nimport { createNode } from '../../typeUtilities.js'\nimport { relationshipPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { RelationshipServerNode } from './nodes/RelationshipNode.js'\nimport { createRelationshipNodeJSONSchema } from './schema.js'\n\nexport type { RelationshipData, SerializedRelationshipNode } from './schema.js'\n\nexport type ExclusiveRelationshipFeatureProps =\n  | {\n      /**\n       * The collections that should be disabled. Overrides the `enableRichTextRelationship` property in the collection config.\n       * When this property is set, `enabledCollections` will not be available.\n       **/\n      disabledCollections?: CollectionSlug[]\n\n      // Ensures that enabledCollections is not available when disabledCollections is set\n      enabledCollections?: never\n    }\n  | {\n      // Ensures that disabledCollections is not available when enabledCollections is set\n      disabledCollections?: never\n\n      /**\n       * The collections that should be enabled. Overrides the `enableRichTextRelationship` property in the collection config\n       * When this property is set, `disabledCollections` will not be available.\n       **/\n      enabledCollections?: CollectionSlug[]\n    }\n\nexport type RelationshipFeatureProps = {\n  /**\n   * Sets a maximum population depth for this relationship, regardless of the remaining depth when the respective field is reached.\n   * This behaves exactly like the maxDepth properties of relationship and upload fields.\n   *\n   * {@link https://payloadcms.com/docs/getting-started/concepts#field-level-max-depth}\n   */\n  maxDepth?: number\n} & ExclusiveRelationshipFeatureProps\n\nexport const RelationshipFeature = createServerFeature<\n  RelationshipFeatureProps,\n  RelationshipFeatureProps,\n  ExclusiveRelationshipFeatureProps\n>({\n  feature: ({ props }) => {\n    // we don't need to pass maxDepth to the client, it's only used on the server\n    const { maxDepth, ...clientFeatureProps } = props ?? {}\n    return {\n      ClientFeature: '@payloadcms/richtext-lexical/client#RelationshipFeatureClient',\n      clientFeatureProps,\n      i18n,\n      nodes: [\n        createNode({\n          graphQLPopulationPromises: [relationshipPopulationPromiseHOC(props)],\n          hooks: {\n            afterRead: [\n              ({\n                currentDepth,\n                depth,\n                draft,\n                node,\n                overrideAccess,\n                populateArg,\n                populationPromises,\n                req,\n                showHiddenFields,\n              }) => {\n                if (!node?.value) {\n                  return node\n                }\n                const collection = req.payload.collections[node?.relationTo]\n\n                if (!collection) {\n                  return node\n                }\n                // @ts-expect-error\n                const id = node?.value?.id || node?.value // for backwards-compatibility\n\n                const populateDepth = maxDepth !== undefined && maxDepth < depth ? maxDepth : depth\n\n                populationPromises.push(\n                  populate({\n                    id,\n                    collectionSlug: collection.config.slug,\n                    currentDepth,\n                    data: node,\n                    depth: populateDepth,\n                    draft,\n                    key: 'value',\n                    overrideAccess,\n                    req,\n                    select:\n                      populateArg?.[collection.config.slug] ?? collection.config.defaultPopulate,\n                    showHiddenFields,\n                  }),\n                )\n\n                return node\n              },\n            ],\n          },\n          jsonSchema: createRelationshipNodeJSONSchema(props),\n          node: RelationshipServerNode,\n        }),\n      ],\n    }\n  },\n  key: 'relationship',\n})\n"],"mappings":"AAEA,SAASA,QAAQ,QAAQ;AACzB,SAASC,mBAAmB,QAAQ;AACpC,SAASC,UAAU,QAAQ;AAC3B,SAASC,gCAAgC,QAAQ;AACjD,SAASC,IAAI,QAAQ;AACrB,SAASC,sBAAsB,QAAQ;AACvC,SAASC,gCAAgC,QAAQ;AAoCjD,OAAO,MAAMC,mBAAA,GAAsBN,mBAAA,CAIjC;EACAO,OAAA,EAASA,CAAC;IAAEC;EAAK,CAAE;IACjB;IACA,MAAM;MAAEC,QAAQ;MAAE,GAAGC;IAAA,CAAoB,GAAGF,KAAA,IAAS,CAAC;IACtD,OAAO;MACLG,aAAA,EAAe;MACfD,kBAAA;MACAP,IAAA;MACAS,KAAA,EAAO,CACLX,UAAA,CAAW;QACTY,yBAAA,EAA2B,CAACX,gCAAA,CAAiCM,KAAA,EAAO;QACpEM,KAAA,EAAO;UACLC,SAAA,EAAW,CACT,CAAC;YACCC,YAAY;YACZC,KAAK;YACLC,KAAK;YACLC,IAAI;YACJC,cAAc;YACdC,WAAW;YACXC,kBAAkB;YAClBC,GAAG;YACHC;UAAgB,CACjB;YACC,IAAI,CAACL,IAAA,EAAMM,KAAA,EAAO;cAChB,OAAON,IAAA;YACT;YACA,MAAMO,UAAA,GAAaH,GAAA,CAAII,OAAO,CAACC,WAAW,CAACT,IAAA,EAAMU,UAAA,CAAW;YAE5D,IAAI,CAACH,UAAA,EAAY;cACf,OAAOP,IAAA;YACT;YACA;YACA,MAAMW,EAAA,GAAKX,IAAA,EAAMM,KAAA,EAAOK,EAAA,IAAMX,IAAA,EAAMM,KAAA,CAAM;AAAA;YAE1C,MAAMM,aAAA,GAAgBtB,QAAA,KAAauB,SAAA,IAAavB,QAAA,GAAWQ,KAAA,GAAQR,QAAA,GAAWQ,KAAA;YAE9EK,kBAAA,CAAmBW,IAAI,CACrBlC,QAAA,CAAS;cACP+B,EAAA;cACAI,cAAA,EAAgBR,UAAA,CAAWS,MAAM,CAACC,IAAI;cACtCpB,YAAA;cACAqB,IAAA,EAAMlB,IAAA;cACNF,KAAA,EAAOc,aAAA;cACPb,KAAA;cACAoB,GAAA,EAAK;cACLlB,cAAA;cACAG,GAAA;cACAgB,MAAA,EACElB,WAAA,GAAcK,UAAA,CAAWS,MAAM,CAACC,IAAI,CAAC,IAAIV,UAAA,CAAWS,MAAM,CAACK,eAAe;cAC5EhB;YACF;YAGF,OAAOL,IAAA;UACT;QAEJ;QACAsB,UAAA,EAAYpC,gCAAA,CAAiCG,KAAA;QAC7CW,IAAA,EAAMf;MACR;IAEJ;EACF;EACAkC,GAAA,EAAK;AACP","ignoreList":[]}
+{"version":3,"file":"index.js","names":["populate","createServerFeature","createNode","filterEnabledRelationshipCollections","relationshipPopulationPromiseHOC","i18n","RelationshipServerNode","createRelationshipNodeJSONSchema","RelationshipFeature","feature","config","props","unsanitizedProps","enabledCollectionSlugs","collections","uploads","map","slug","ClientFeature","clientFeatureProps","nodes","graphQLPopulationPromises","hooks","afterRead","currentDepth","depth","draft","node","overrideAccess","populateArg","populationPromises","req","showHiddenFields","value","includes","relationTo","collection","payload","id","populateDepth","maxDepth","undefined","push","collectionSlug","data","key","select","defaultPopulate","jsonSchema","validations","validation","options","t","sanitizedServerFeatureProps"],"sources":["../../../../src/features/relationship/server/index.ts"],"sourcesContent":["import type { CollectionSlug } from 'payload'\n\nimport { populate } from '../../../populateGraphQL/populate.js'\nimport { createServerFeature } from '../../../utilities/createServerFeature.js'\nimport { createNode } from '../../typeUtilities.js'\nimport { filterEnabledRelationshipCollections } from '../shared/filterEnabledRelationshipCollections.js'\nimport { relationshipPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { RelationshipServerNode } from './nodes/RelationshipNode.js'\nimport { createRelationshipNodeJSONSchema } from './schema.js'\n\nexport type { RelationshipData, SerializedRelationshipNode } from './schema.js'\n\nexport type ExclusiveRelationshipFeatureProps =\n  | {\n      /**\n       * The collections that should be disabled. Overrides the `enableRichTextRelationship` property in the collection config.\n       * When this property is set, `enabledCollections` will not be available.\n       **/\n      disabledCollections?: CollectionSlug[]\n\n      // Ensures that enabledCollections is not available when disabledCollections is set\n      enabledCollections?: never\n    }\n  | {\n      // Ensures that disabledCollections is not available when enabledCollections is set\n      disabledCollections?: never\n\n      /**\n       * The collections that should be enabled. Overrides the `enableRichTextRelationship` property in the collection config\n       * When this property is set, `disabledCollections` will not be available.\n       **/\n      enabledCollections?: CollectionSlug[]\n    }\n\nexport type RelationshipFeatureProps = {\n  /**\n   * Sets a maximum population depth for this relationship, regardless of the remaining depth when the respective field is reached.\n   * This behaves exactly like the maxDepth properties of relationship and upload fields.\n   *\n   * {@link https://payloadcms.com/docs/getting-started/concepts#field-level-max-depth}\n   */\n  maxDepth?: number\n} & ExclusiveRelationshipFeatureProps\n\nexport type RelationshipFeatureServerProps = {\n  /** Collection policy resolved during feature initialization. */\n  enabledCollectionSlugs: CollectionSlug[]\n} & RelationshipFeatureProps\n\nexport type RelationshipFeatureClientProps = {\n  enabledCollectionSlugs: CollectionSlug[]\n}\n\nexport const RelationshipFeature = createServerFeature<\n  RelationshipFeatureProps,\n  RelationshipFeatureServerProps,\n  RelationshipFeatureClientProps\n>({\n  feature: ({ config, props: unsanitizedProps }) => {\n    const props: RelationshipFeatureServerProps = {\n      ...unsanitizedProps,\n      enabledCollectionSlugs: filterEnabledRelationshipCollections(config.collections, {\n        ...unsanitizedProps,\n        uploads: false,\n      }).map(({ slug }) => slug),\n    }\n\n    return {\n      ClientFeature: '@payloadcms/richtext-lexical/client#RelationshipFeatureClient',\n      clientFeatureProps: {\n        enabledCollectionSlugs: props.enabledCollectionSlugs,\n      },\n      i18n,\n      nodes: [\n        createNode({\n          graphQLPopulationPromises: [relationshipPopulationPromiseHOC(props)],\n          hooks: {\n            afterRead: [\n              ({\n                currentDepth,\n                depth,\n                draft,\n                node,\n                overrideAccess,\n                populateArg,\n                populationPromises,\n                req,\n                showHiddenFields,\n              }) => {\n                if (!node?.value || !props.enabledCollectionSlugs.includes(node.relationTo)) {\n                  return node\n                }\n                const collection = req.payload.collections[node?.relationTo]\n\n                if (!collection) {\n                  return node\n                }\n                // @ts-expect-error\n                const id = node?.value?.id || node?.value // for backwards-compatibility\n\n                const populateDepth =\n                  props.maxDepth !== undefined && props.maxDepth < depth ? props.maxDepth : depth\n\n                populationPromises.push(\n                  populate({\n                    id,\n                    collectionSlug: collection.config.slug,\n                    currentDepth,\n                    data: node,\n                    depth: populateDepth,\n                    draft,\n                    key: 'value',\n                    overrideAccess,\n                    req,\n                    select:\n                      populateArg?.[collection.config.slug] ?? collection.config.defaultPopulate,\n                    showHiddenFields,\n                  }),\n                )\n\n                return node\n              },\n            ],\n          },\n          jsonSchema: createRelationshipNodeJSONSchema(props),\n          node: RelationshipServerNode,\n          validations: [\n            ({\n              node,\n              validation: {\n                options: { req },\n              },\n            }) =>\n              props.enabledCollectionSlugs.includes(node.relationTo)\n                ? true\n                : req.t('validation:invalidSelection'),\n          ],\n        }),\n      ],\n      sanitizedServerFeatureProps: props,\n    }\n  },\n  key: 'relationship',\n})\n"],"mappings":"AAEA,SAASA,QAAQ,QAAQ;AACzB,SAASC,mBAAmB,QAAQ;AACpC,SAASC,UAAU,QAAQ;AAC3B,SAASC,oCAAoC,QAAQ;AACrD,SAASC,gCAAgC,QAAQ;AACjD,SAASC,IAAI,QAAQ;AACrB,SAASC,sBAAsB,QAAQ;AACvC,SAASC,gCAAgC,QAAQ;AA6CjD,OAAO,MAAMC,mBAAA,GAAsBP,mBAAA,CAIjC;EACAQ,OAAA,EAASA,CAAC;IAAEC,MAAM;IAAEC,KAAA,EAAOC;EAAgB,CAAE;IAC3C,MAAMD,KAAA,GAAwC;MAC5C,GAAGC,gBAAgB;MACnBC,sBAAA,EAAwBV,oCAAA,CAAqCO,MAAA,CAAOI,WAAW,EAAE;QAC/E,GAAGF,gBAAgB;QACnBG,OAAA,EAAS;MACX,GAAGC,GAAG,CAAC,CAAC;QAAEC;MAAI,CAAE,KAAKA,IAAA;IACvB;IAEA,OAAO;MACLC,aAAA,EAAe;MACfC,kBAAA,EAAoB;QAClBN,sBAAA,EAAwBF,KAAA,CAAME;MAChC;MACAR,IAAA;MACAe,KAAA,EAAO,CACLlB,UAAA,CAAW;QACTmB,yBAAA,EAA2B,CAACjB,gCAAA,CAAiCO,KAAA,EAAO;QACpEW,KAAA,EAAO;UACLC,SAAA,EAAW,CACT,CAAC;YACCC,YAAY;YACZC,KAAK;YACLC,KAAK;YACLC,IAAI;YACJC,cAAc;YACdC,WAAW;YACXC,kBAAkB;YAClBC,GAAG;YACHC;UAAgB,CACjB;YACC,IAAI,CAACL,IAAA,EAAMM,KAAA,IAAS,CAACtB,KAAA,CAAME,sBAAsB,CAACqB,QAAQ,CAACP,IAAA,CAAKQ,UAAU,GAAG;cAC3E,OAAOR,IAAA;YACT;YACA,MAAMS,UAAA,GAAaL,GAAA,CAAIM,OAAO,CAACvB,WAAW,CAACa,IAAA,EAAMQ,UAAA,CAAW;YAE5D,IAAI,CAACC,UAAA,EAAY;cACf,OAAOT,IAAA;YACT;YACA;YACA,MAAMW,EAAA,GAAKX,IAAA,EAAMM,KAAA,EAAOK,EAAA,IAAMX,IAAA,EAAMM,KAAA,CAAM;AAAA;YAE1C,MAAMM,aAAA,GACJ5B,KAAA,CAAM6B,QAAQ,KAAKC,SAAA,IAAa9B,KAAA,CAAM6B,QAAQ,GAAGf,KAAA,GAAQd,KAAA,CAAM6B,QAAQ,GAAGf,KAAA;YAE5EK,kBAAA,CAAmBY,IAAI,CACrB1C,QAAA,CAAS;cACPsC,EAAA;cACAK,cAAA,EAAgBP,UAAA,CAAW1B,MAAM,CAACO,IAAI;cACtCO,YAAA;cACAoB,IAAA,EAAMjB,IAAA;cACNF,KAAA,EAAOc,aAAA;cACPb,KAAA;cACAmB,GAAA,EAAK;cACLjB,cAAA;cACAG,GAAA;cACAe,MAAA,EACEjB,WAAA,GAAcO,UAAA,CAAW1B,MAAM,CAACO,IAAI,CAAC,IAAImB,UAAA,CAAW1B,MAAM,CAACqC,eAAe;cAC5Ef;YACF;YAGF,OAAOL,IAAA;UACT;QAEJ;QACAqB,UAAA,EAAYzC,gCAAA,CAAiCI,KAAA;QAC7CgB,IAAA,EAAMrB,sBAAA;QACN2C,WAAA,EAAa,CACX,CAAC;UACCtB,IAAI;UACJuB,UAAA,EAAY;YACVC,OAAA,EAAS;cAAEpB;YAAG;UAAE;QACjB,CACF,KACCpB,KAAA,CAAME,sBAAsB,CAACqB,QAAQ,CAACP,IAAA,CAAKQ,UAAU,IACjD,OACAJ,GAAA,CAAIqB,CAAC,CAAC;MAEhB,GACD;MACDC,2BAAA,EAA6B1C;IAC/B;EACF;EACAkC,GAAA,EAAK;AACP","ignoreList":[]}

package/dist/features/relationship/server/schema.d.ts

@@ -1,7 +1,7 @@
 import type { CollectionSlug, DataFromCollectionSlug, IDTypeForCollectionSlug, UploadCollectionSlug } from 'payload';
 import type { LexicalElementFormat } from '../../../types/nodeTypes.js';
 import type { JSONSchemaFn } from '../../typesServer.js';
-import type { RelationshipFeatureProps } from './index.js';
+import type { RelationshipFeatureServerProps } from './index.js';
 export type RelationshipData = {
     [TCollectionSlug in CollectionSlug]: {
         relationTo: TCollectionSlug;
@@ -24,5 +24,5 @@ export type SerializedRelationshipNode<TSlugs extends CollectionSlug = NonUpload
     type: 'relationship';
     version: number;
 };
-export declare const createRelationshipNodeJSONSchema: (props: RelationshipFeatureProps | undefined) => JSONSchemaFn;
+export declare const createRelationshipNodeJSONSchema: (props: RelationshipFeatureServerProps) => JSONSchemaFn;
 //# sourceMappingURL=schema.d.ts.map

package/dist/features/relationship/server/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/features/relationship/server/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAK1D,MAAM,MAAM,gBAAgB,GAAG;KAC5B,eAAe,IAAI,cAAc,GAAG;QACnC,UAAU,EAAE,eAAe,CAAA;QAC3B,KAAK,EAAE,sBAAsB,CAAC,eAAe,CAAC,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAA;KAC1F;CACF,CAAC,cAAc,CAAC,CAAA;AAEjB;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC,SAAS;IAC5F,KAAK;CACN,GACG,cAAc,GACd,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAA;AAEjD,MAAM,MAAM,0BAA0B,CAAC,MAAM,SAAS,cAAc,GAAG,uBAAuB,IAAI;KAC/F,KAAK,IAAI,MAAM,GAAG;QACjB,UAAU,EAAE,KAAK,CAAA;QACjB,KAAK,EAAE,sBAAsB,CAAC,KAAK,CAAC,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;KACtE;CACF,CAAC,MAAM,CAAC,GAAG;IACV,MAAM,EAAE,oBAAoB,CAAA;IAC5B,IAAI,EAAE,cAAc,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AA0BD,eAAO,MAAM,gCAAgC,UACnC,wBAAwB,GAAG,SAAS,KAAG,YAwD9C,CAAA"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/features/relationship/server/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAA;AAIhE,MAAM,MAAM,gBAAgB,GAAG;KAC5B,eAAe,IAAI,cAAc,GAAG;QACnC,UAAU,EAAE,eAAe,CAAA;QAC3B,KAAK,EAAE,sBAAsB,CAAC,eAAe,CAAC,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAA;KAC1F;CACF,CAAC,cAAc,CAAC,CAAA;AAEjB;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC,SAAS;IAC5F,KAAK;CACN,GACG,cAAc,GACd,OAAO,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAA;AAEjD,MAAM,MAAM,0BAA0B,CAAC,MAAM,SAAS,cAAc,GAAG,uBAAuB,IAAI;KAC/F,KAAK,IAAI,MAAM,GAAG;QACjB,UAAU,EAAE,KAAK,CAAA;QACjB,KAAK,EAAE,sBAAsB,CAAC,KAAK,CAAC,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAA;KACtE;CACF,CAAC,MAAM,CAAC,GAAG;IACV,MAAM,EAAE,oBAAoB,CAAA;IAC5B,IAAI,EAAE,cAAc,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AA0BD,eAAO,MAAM,gCAAgC,UACnC,8BAA8B,KAAG,YAiDxC,CAAA"}

package/dist/features/relationship/server/schema.js

@@ -1,5 +1,4 @@
 import { formatSchema, versionSchema } from '../../../types/jsonSchemaHelpers.js';
-import { filterEnabledRelationshipCollections } from '../shared/filterEnabledRelationshipCollections.js';
 /** MUST stay byte-for-byte in sync with the runtime `SerializedRelationshipNode` declared above. */
 const SERIALIZED_RELATIONSHIP_NODE_TS = `export type SerializedRelationshipNode<TSlugs extends keyof Config['collections']> = {
   type: 'relationship';
@@ -24,19 +23,15 @@ const SERIALIZED_RELATIONSHIP_NODE_INPUT_TS = `export type SerializedRelationshi
 }[TSlugs];`;
 export const createRelationshipNodeJSONSchema = props => ({
   collectionIDFieldTypes,
-  config,
   typeStringDefinitions,
   variant
 }) => {
   const isInput = variant === 'input';
   typeStringDefinitions.add(isInput ? SERIALIZED_RELATIONSHIP_NODE_INPUT_TS : SERIALIZED_RELATIONSHIP_NODE_TS);
-  const enabledCollections = config?.collections ? filterEnabledRelationshipCollections(config.collections, {
-    disabledCollections: props?.disabledCollections,
-    enabledCollections: props?.enabledCollections,
-    uploads: false
-  }) : [];
-  const variants = enabledCollections.map(collection => {
-    const slug = collection.slug;
+  const {
+    enabledCollectionSlugs
+  } = props;
+  const variants = enabledCollectionSlugs.map(slug => {
     const idType = collectionIDFieldTypes[slug] ?? 'string';
     return {
       type: 'object',
@@ -82,7 +77,7 @@ export const createRelationshipNodeJSONSchema = props => ({
       required: ['type', 'version']
     };
   } else {
-    const slugUnion = enabledCollections.map(c => `'${c.slug}'`).join(' | ');
+    const slugUnion = enabledCollectionSlugs.map(slug => `'${slug}'`).join(' | ');
     const baseSchema = variants.length === 1 ? variants[0] : {
       oneOf: variants
     };

package/dist/features/relationship/server/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","names":["formatSchema","versionSchema","filterEnabledRelationshipCollections","SERIALIZED_RELATIONSHIP_NODE_TS","SERIALIZED_RELATIONSHIP_NODE_INPUT_TS","createRelationshipNodeJSONSchema","props","collectionIDFieldTypes","config","typeStringDefinitions","variant","isInput","add","enabledCollections","collections","disabledCollections","uploads","variants","map","collection","slug","idType","type","additionalProperties","properties","const","format","relationTo","value","description","oneOf","$ref","version","required","schema","length","slugUnion","c","join","baseSchema","tsName","tsType"],"sources":["../../../../src/features/relationship/server/schema.ts"],"sourcesContent":["import type { JSONSchema4 } from 'json-schema'\nimport type {\n  CollectionSlug,\n  DataFromCollectionSlug,\n  IDTypeForCollectionSlug,\n  UploadCollectionSlug,\n} from 'payload'\n\nimport type { LexicalElementFormat } from '../../../types/nodeTypes.js'\nimport type { JSONSchemaFn } from '../../typesServer.js'\nimport type { RelationshipFeatureProps } from './index.js'\n\nimport { formatSchema, versionSchema } from '../../../types/jsonSchemaHelpers.js'\nimport { filterEnabledRelationshipCollections } from '../shared/filterEnabledRelationshipCollections.js'\n\nexport type RelationshipData = {\n  [TCollectionSlug in CollectionSlug]: {\n    relationTo: TCollectionSlug\n    value: DataFromCollectionSlug<TCollectionSlug> | IDTypeForCollectionSlug<TCollectionSlug>\n  }\n}[CollectionSlug]\n\n/**\n * Exclude upload collection slugs. This matches runtime behavior, as well as the json schema.\n */\nexport type NonUploadCollectionSlug = [Exclude<CollectionSlug, UploadCollectionSlug>] extends [\n  never,\n]\n  ? CollectionSlug\n  : Exclude<CollectionSlug, UploadCollectionSlug>\n\nexport type SerializedRelationshipNode<TSlugs extends CollectionSlug = NonUploadCollectionSlug> = {\n  [TSlug in TSlugs]: {\n    relationTo: TSlug\n    value: DataFromCollectionSlug<TSlug> | IDTypeForCollectionSlug<TSlug>\n  }\n}[TSlugs] & {\n  format: LexicalElementFormat\n  type: 'relationship'\n  version: number\n}\n\n/** MUST stay byte-for-byte in sync with the runtime `SerializedRelationshipNode` declared above. */\nconst SERIALIZED_RELATIONSHIP_NODE_TS = `export type SerializedRelationshipNode<TSlugs extends keyof Config['collections']> = {\n  type: 'relationship';\n  format: LexicalElementFormat;\n  version: number;\n} & {\n  [TSlug in TSlugs]: {\n    relationTo: TSlug;\n    value: Config['collections'][TSlug]['id'] | Config['collections'][TSlug];\n  };\n}[TSlugs];`\n\n/** Input variant of `SerializedRelationshipNode`: `value` is ID-only (you only ever write an ID). */\nconst SERIALIZED_RELATIONSHIP_NODE_INPUT_TS = `export type SerializedRelationshipNodeInput<TSlugs extends keyof Config['collections']> = {\n  type: 'relationship';\n  format: LexicalElementFormat;\n  version: number;\n} & {\n  [TSlug in TSlugs]: {\n    relationTo: TSlug;\n    value: Config['collections'][TSlug]['id'];\n  };\n}[TSlugs];`\n\nexport const createRelationshipNodeJSONSchema =\n  (props: RelationshipFeatureProps | undefined): JSONSchemaFn =>\n  ({ collectionIDFieldTypes, config, typeStringDefinitions, variant }) => {\n    const isInput = variant === 'input'\n    typeStringDefinitions.add(\n      isInput ? SERIALIZED_RELATIONSHIP_NODE_INPUT_TS : SERIALIZED_RELATIONSHIP_NODE_TS,\n    )\n    const enabledCollections = config?.collections\n      ? filterEnabledRelationshipCollections(config.collections, {\n          disabledCollections: props?.disabledCollections,\n          enabledCollections: props?.enabledCollections,\n          uploads: false,\n        })\n      : []\n\n    const variants: JSONSchema4[] = enabledCollections.map((collection) => {\n      const slug = collection.slug\n      const idType: 'number' | 'string' = collectionIDFieldTypes[slug] ?? 'string'\n      return {\n        type: 'object',\n        additionalProperties: false,\n        properties: {\n          type: { type: 'string', const: 'relationship' },\n          format: formatSchema,\n          relationTo: { type: 'string', const: slug },\n          value: isInput\n            ? { type: idType, description: 'The related document ID.' }\n            : {\n                description:\n                  'The related document by ID (string or number). Populated to the full document when read at depth > 0.',\n                oneOf: [{ type: idType }, { $ref: `#/$defs/${slug}` }],\n              },\n          version: versionSchema,\n        },\n        required: ['format', 'relationTo', 'type', 'value', 'version'],\n      }\n    })\n\n    let schema: JSONSchema4\n    if (variants.length === 0) {\n      schema = {\n        type: 'object',\n        additionalProperties: true,\n        properties: {\n          type: { type: 'string', const: 'relationship' },\n          version: versionSchema,\n        },\n        required: ['type', 'version'],\n      }\n    } else {\n      const slugUnion = enabledCollections.map((c) => `'${c.slug}'`).join(' | ')\n      const baseSchema: JSONSchema4 = variants.length === 1 ? variants[0]! : { oneOf: variants }\n      const tsName = isInput ? 'SerializedRelationshipNodeInput' : 'SerializedRelationshipNode'\n      schema = { ...baseSchema, tsType: `${tsName}<${slugUnion}>` }\n    }\n\n    return schema\n  }\n"],"mappings":"AAYA,SAASA,YAAY,EAAEC,aAAa,QAAQ;AAC5C,SAASC,oCAAoC,QAAQ;AA6BrD;AACA,MAAMC,+BAAA,GAAkC;;;;;;;;;WAS7B;AAEX;AACA,MAAMC,qCAAA,GAAwC;;;;;;;;;WASnC;AAEX,OAAO,MAAMC,gCAAA,GACVC,KAAA,IACD,CAAC;EAAEC,sBAAsB;EAAEC,MAAM;EAAEC,qBAAqB;EAAEC;AAAO,CAAE;EACjE,MAAMC,OAAA,GAAUD,OAAA,KAAY;EAC5BD,qBAAA,CAAsBG,GAAG,CACvBD,OAAA,GAAUP,qCAAA,GAAwCD,+BAAA;EAEpD,MAAMU,kBAAA,GAAqBL,MAAA,EAAQM,WAAA,GAC/BZ,oCAAA,CAAqCM,MAAA,CAAOM,WAAW,EAAE;IACvDC,mBAAA,EAAqBT,KAAA,EAAOS,mBAAA;IAC5BF,kBAAA,EAAoBP,KAAA,EAAOO,kBAAA;IAC3BG,OAAA,EAAS;EACX,KACA,EAAE;EAEN,MAAMC,QAAA,GAA0BJ,kBAAA,CAAmBK,GAAG,CAAEC,UAAA;IACtD,MAAMC,IAAA,GAAOD,UAAA,CAAWC,IAAI;IAC5B,MAAMC,MAAA,GAA8Bd,sBAAsB,CAACa,IAAA,CAAK,IAAI;IACpE,OAAO;MACLE,IAAA,EAAM;MACNC,oBAAA,EAAsB;MACtBC,UAAA,EAAY;QACVF,IAAA,EAAM;UAAEA,IAAA,EAAM;UAAUG,KAAA,EAAO;QAAe;QAC9CC,MAAA,EAAQ1B,YAAA;QACR2B,UAAA,EAAY;UAAEL,IAAA,EAAM;UAAUG,KAAA,EAAOL;QAAK;QAC1CQ,KAAA,EAAOjB,OAAA,GACH;UAAEW,IAAA,EAAMD,MAAA;UAAQQ,WAAA,EAAa;QAA2B,IACxD;UACEA,WAAA,EACE;UACFC,KAAA,EAAO,CAAC;YAAER,IAAA,EAAMD;UAAO,GAAG;YAAEU,IAAA,EAAM,WAAWX,IAAA;UAAO;QACtD;QACJY,OAAA,EAAS/B;MACX;MACAgC,QAAA,EAAU,CAAC,UAAU,cAAc,QAAQ,SAAS;IACtD;EACF;EAEA,IAAIC,MAAA;EACJ,IAAIjB,QAAA,CAASkB,MAAM,KAAK,GAAG;IACzBD,MAAA,GAAS;MACPZ,IAAA,EAAM;MACNC,oBAAA,EAAsB;MACtBC,UAAA,EAAY;QACVF,IAAA,EAAM;UAAEA,IAAA,EAAM;UAAUG,KAAA,EAAO;QAAe;QAC9CO,OAAA,EAAS/B;MACX;MACAgC,QAAA,EAAU,CAAC,QAAQ;IACrB;EACF,OAAO;IACL,MAAMG,SAAA,GAAYvB,kBAAA,CAAmBK,GAAG,CAAEmB,CAAA,IAAM,IAAIA,CAAA,CAAEjB,IAAI,GAAG,EAAEkB,IAAI,CAAC;IACpE,MAAMC,UAAA,GAA0BtB,QAAA,CAASkB,MAAM,KAAK,IAAIlB,QAAQ,CAAC,EAAE,GAAI;MAAEa,KAAA,EAAOb;IAAS;IACzF,MAAMuB,MAAA,GAAS7B,OAAA,GAAU,oCAAoC;IAC7DuB,MAAA,GAAS;MAAE,GAAGK,UAAU;MAAEE,MAAA,EAAQ,GAAGD,MAAA,IAAUJ,SAAA;IAAa;EAC9D;EAEA,OAAOF,MAAA;AACT","ignoreList":[]}
+{"version":3,"file":"schema.js","names":["formatSchema","versionSchema","SERIALIZED_RELATIONSHIP_NODE_TS","SERIALIZED_RELATIONSHIP_NODE_INPUT_TS","createRelationshipNodeJSONSchema","props","collectionIDFieldTypes","typeStringDefinitions","variant","isInput","add","enabledCollectionSlugs","variants","map","slug","idType","type","additionalProperties","properties","const","format","relationTo","value","description","oneOf","$ref","version","required","schema","length","slugUnion","join","baseSchema","tsName","tsType"],"sources":["../../../../src/features/relationship/server/schema.ts"],"sourcesContent":["import type { JSONSchema4 } from 'json-schema'\nimport type {\n  CollectionSlug,\n  DataFromCollectionSlug,\n  IDTypeForCollectionSlug,\n  UploadCollectionSlug,\n} from 'payload'\n\nimport type { LexicalElementFormat } from '../../../types/nodeTypes.js'\nimport type { JSONSchemaFn } from '../../typesServer.js'\nimport type { RelationshipFeatureServerProps } from './index.js'\n\nimport { formatSchema, versionSchema } from '../../../types/jsonSchemaHelpers.js'\n\nexport type RelationshipData = {\n  [TCollectionSlug in CollectionSlug]: {\n    relationTo: TCollectionSlug\n    value: DataFromCollectionSlug<TCollectionSlug> | IDTypeForCollectionSlug<TCollectionSlug>\n  }\n}[CollectionSlug]\n\n/**\n * Exclude upload collection slugs. This matches runtime behavior, as well as the json schema.\n */\nexport type NonUploadCollectionSlug = [Exclude<CollectionSlug, UploadCollectionSlug>] extends [\n  never,\n]\n  ? CollectionSlug\n  : Exclude<CollectionSlug, UploadCollectionSlug>\n\nexport type SerializedRelationshipNode<TSlugs extends CollectionSlug = NonUploadCollectionSlug> = {\n  [TSlug in TSlugs]: {\n    relationTo: TSlug\n    value: DataFromCollectionSlug<TSlug> | IDTypeForCollectionSlug<TSlug>\n  }\n}[TSlugs] & {\n  format: LexicalElementFormat\n  type: 'relationship'\n  version: number\n}\n\n/** MUST stay byte-for-byte in sync with the runtime `SerializedRelationshipNode` declared above. */\nconst SERIALIZED_RELATIONSHIP_NODE_TS = `export type SerializedRelationshipNode<TSlugs extends keyof Config['collections']> = {\n  type: 'relationship';\n  format: LexicalElementFormat;\n  version: number;\n} & {\n  [TSlug in TSlugs]: {\n    relationTo: TSlug;\n    value: Config['collections'][TSlug]['id'] | Config['collections'][TSlug];\n  };\n}[TSlugs];`\n\n/** Input variant of `SerializedRelationshipNode`: `value` is ID-only (you only ever write an ID). */\nconst SERIALIZED_RELATIONSHIP_NODE_INPUT_TS = `export type SerializedRelationshipNodeInput<TSlugs extends keyof Config['collections']> = {\n  type: 'relationship';\n  format: LexicalElementFormat;\n  version: number;\n} & {\n  [TSlug in TSlugs]: {\n    relationTo: TSlug;\n    value: Config['collections'][TSlug]['id'];\n  };\n}[TSlugs];`\n\nexport const createRelationshipNodeJSONSchema =\n  (props: RelationshipFeatureServerProps): JSONSchemaFn =>\n  ({ collectionIDFieldTypes, typeStringDefinitions, variant }) => {\n    const isInput = variant === 'input'\n    typeStringDefinitions.add(\n      isInput ? SERIALIZED_RELATIONSHIP_NODE_INPUT_TS : SERIALIZED_RELATIONSHIP_NODE_TS,\n    )\n    const { enabledCollectionSlugs } = props\n\n    const variants: JSONSchema4[] = enabledCollectionSlugs.map((slug) => {\n      const idType: 'number' | 'string' = collectionIDFieldTypes[slug] ?? 'string'\n      return {\n        type: 'object',\n        additionalProperties: false,\n        properties: {\n          type: { type: 'string', const: 'relationship' },\n          format: formatSchema,\n          relationTo: { type: 'string', const: slug },\n          value: isInput\n            ? { type: idType, description: 'The related document ID.' }\n            : {\n                description:\n                  'The related document by ID (string or number). Populated to the full document when read at depth > 0.',\n                oneOf: [{ type: idType }, { $ref: `#/$defs/${slug}` }],\n              },\n          version: versionSchema,\n        },\n        required: ['format', 'relationTo', 'type', 'value', 'version'],\n      }\n    })\n\n    let schema: JSONSchema4\n    if (variants.length === 0) {\n      schema = {\n        type: 'object',\n        additionalProperties: true,\n        properties: {\n          type: { type: 'string', const: 'relationship' },\n          version: versionSchema,\n        },\n        required: ['type', 'version'],\n      }\n    } else {\n      const slugUnion = enabledCollectionSlugs.map((slug) => `'${slug}'`).join(' | ')\n      const baseSchema: JSONSchema4 = variants.length === 1 ? variants[0]! : { oneOf: variants }\n      const tsName = isInput ? 'SerializedRelationshipNodeInput' : 'SerializedRelationshipNode'\n      schema = { ...baseSchema, tsType: `${tsName}<${slugUnion}>` }\n    }\n\n    return schema\n  }\n"],"mappings":"AAYA,SAASA,YAAY,EAAEC,aAAa,QAAQ;AA6B5C;AACA,MAAMC,+BAAA,GAAkC;;;;;;;;;WAS7B;AAEX;AACA,MAAMC,qCAAA,GAAwC;;;;;;;;;WASnC;AAEX,OAAO,MAAMC,gCAAA,GACVC,KAAA,IACD,CAAC;EAAEC,sBAAsB;EAAEC,qBAAqB;EAAEC;AAAO,CAAE;EACzD,MAAMC,OAAA,GAAUD,OAAA,KAAY;EAC5BD,qBAAA,CAAsBG,GAAG,CACvBD,OAAA,GAAUN,qCAAA,GAAwCD,+BAAA;EAEpD,MAAM;IAAES;EAAsB,CAAE,GAAGN,KAAA;EAEnC,MAAMO,QAAA,GAA0BD,sBAAA,CAAuBE,GAAG,CAAEC,IAAA;IAC1D,MAAMC,MAAA,GAA8BT,sBAAsB,CAACQ,IAAA,CAAK,IAAI;IACpE,OAAO;MACLE,IAAA,EAAM;MACNC,oBAAA,EAAsB;MACtBC,UAAA,EAAY;QACVF,IAAA,EAAM;UAAEA,IAAA,EAAM;UAAUG,KAAA,EAAO;QAAe;QAC9CC,MAAA,EAAQpB,YAAA;QACRqB,UAAA,EAAY;UAAEL,IAAA,EAAM;UAAUG,KAAA,EAAOL;QAAK;QAC1CQ,KAAA,EAAOb,OAAA,GACH;UAAEO,IAAA,EAAMD,MAAA;UAAQQ,WAAA,EAAa;QAA2B,IACxD;UACEA,WAAA,EACE;UACFC,KAAA,EAAO,CAAC;YAAER,IAAA,EAAMD;UAAO,GAAG;YAAEU,IAAA,EAAM,WAAWX,IAAA;UAAO;QACtD;QACJY,OAAA,EAASzB;MACX;MACA0B,QAAA,EAAU,CAAC,UAAU,cAAc,QAAQ,SAAS;IACtD;EACF;EAEA,IAAIC,MAAA;EACJ,IAAIhB,QAAA,CAASiB,MAAM,KAAK,GAAG;IACzBD,MAAA,GAAS;MACPZ,IAAA,EAAM;MACNC,oBAAA,EAAsB;MACtBC,UAAA,EAAY;QACVF,IAAA,EAAM;UAAEA,IAAA,EAAM;UAAUG,KAAA,EAAO;QAAe;QAC9CO,OAAA,EAASzB;MACX;MACA0B,QAAA,EAAU,CAAC,QAAQ;IACrB;EACF,OAAO;IACL,MAAMG,SAAA,GAAYnB,sBAAA,CAAuBE,GAAG,CAAEC,IAAA,IAAS,IAAIA,IAAA,GAAO,EAAEiB,IAAI,CAAC;IACzE,MAAMC,UAAA,GAA0BpB,QAAA,CAASiB,MAAM,KAAK,IAAIjB,QAAQ,CAAC,EAAE,GAAI;MAAEY,KAAA,EAAOZ;IAAS;IACzF,MAAMqB,MAAA,GAASxB,OAAA,GAAU,oCAAoC;IAC7DmB,MAAA,GAAS;MAAE,GAAGI,UAAU;MAAEE,MAAA,EAAQ,GAAGD,MAAA,IAAUH,SAAA;IAAa;EAC9D;EAEA,OAAOF,MAAA;AACT","ignoreList":[]}

package/dist/features/relationship/shared/filterEnabledRelationshipCollections.d.ts

@@ -12,12 +12,7 @@ export type FilterEnabledRelationshipCollectionsOptions = {
     enabledCollections?: readonly string[];
     /** When `true`, only upload-enabled collections; when `false`, only non-upload ones. */
     uploads: boolean;
-    /**
-     * Slugs the current user can see, supplied by the client at runtime.
-     * Server-side type generation passes `undefined` to skip the check.
-     */
-    visibleSlugs?: readonly string[];
 };
-export declare const filterEnabledRelationshipCollections: <TCollection extends CollectionLike>(collections: readonly TCollection[], { disabledCollections, enabledCollections, uploads, visibleSlugs, }: FilterEnabledRelationshipCollectionsOptions) => TCollection[];
+export declare const filterEnabledRelationshipCollections: <TCollection extends CollectionLike>(collections: readonly TCollection[], { disabledCollections, enabledCollections, uploads }: FilterEnabledRelationshipCollectionsOptions) => TCollection[];
 export {};
 //# sourceMappingURL=filterEnabledRelationshipCollections.d.ts.map

package/dist/features/relationship/shared/filterEnabledRelationshipCollections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterEnabledRelationshipCollections.d.ts","sourceRoot":"","sources":["../../../../src/features/relationship/shared/filterEnabledRelationshipCollections.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,EAAE;QACN,0BAA0B,CAAC,EAAE,OAAO,CAAA;KACrC,CAAA;IACD,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,2CAA2C,GAAG;IACxD,2DAA2D;IAC3D,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,0DAA0D;IAC1D,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,wFAAwF;IACxF,OAAO,EAAE,OAAO,CAAA;IAChB;;;OAGG;IACH,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,oCAAoC,GAAI,WAAW,SAAS,cAAc,eACxE,SAAS,WAAW,EAAE,uEAMhC,2CAA2C,KAC7C,WAAW,EA4Bb,CAAA"}
+{"version":3,"file":"filterEnabledRelationshipCollections.d.ts","sourceRoot":"","sources":["../../../../src/features/relationship/shared/filterEnabledRelationshipCollections.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,KAAK,CAAC,EAAE;QACN,0BAA0B,CAAC,EAAE,OAAO,CAAA;KACrC,CAAA;IACD,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,2CAA2C,GAAG;IACxD,2DAA2D;IAC3D,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,0DAA0D;IAC1D,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,wFAAwF;IACxF,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oCAAoC,GAAI,WAAW,SAAS,cAAc,eACxE,SAAS,WAAW,EAAE,wDACmB,2CAA2C,KAChG,WAAW,EAwBb,CAAA"}

package/dist/features/relationship/shared/filterEnabledRelationshipCollections.js

@@ -1,8 +1,7 @@
 export const filterEnabledRelationshipCollections = (collections, {
   disabledCollections,
   enabledCollections,
-  uploads,
-  visibleSlugs
+  uploads
 }) => {
   const whitelistSet = enabledCollections?.length ? new Set(enabledCollections) : null;
   const blacklistSet = disabledCollections?.length ? new Set(disabledCollections) : null;
@@ -12,9 +11,6 @@ export const filterEnabledRelationshipCollections = (collections, {
       admin,
       upload
     } = collection;
-    if (visibleSlugs && !visibleSlugs.includes(slug)) {
-      return false;
-    }
     if (uploads) {
       if (!admin?.enableRichTextRelationship || !upload) {
         return false;

package/dist/features/relationship/shared/filterEnabledRelationshipCollections.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterEnabledRelationshipCollections.js","names":["filterEnabledRelationshipCollections","collections","disabledCollections","enabledCollections","uploads","visibleSlugs","whitelistSet","length","Set","blacklistSet","filter","collection","slug","admin","upload","includes","enableRichTextRelationship","has"],"sources":["../../../../src/features/relationship/shared/filterEnabledRelationshipCollections.ts"],"sourcesContent":["type CollectionLike = {\n  admin?: {\n    enableRichTextRelationship?: boolean\n  }\n  slug: string\n  upload?: unknown\n}\n\nexport type FilterEnabledRelationshipCollectionsOptions = {\n  /** `disabledCollections` feature prop — slug blacklist. */\n  disabledCollections?: readonly string[]\n  /** `enabledCollections` feature prop — slug whitelist. */\n  enabledCollections?: readonly string[]\n  /** When `true`, only upload-enabled collections; when `false`, only non-upload ones. */\n  uploads: boolean\n  /**\n   * Slugs the current user can see, supplied by the client at runtime.\n   * Server-side type generation passes `undefined` to skip the check.\n   */\n  visibleSlugs?: readonly string[]\n}\n\nexport const filterEnabledRelationshipCollections = <TCollection extends CollectionLike>(\n  collections: readonly TCollection[],\n  {\n    disabledCollections,\n    enabledCollections,\n    uploads,\n    visibleSlugs,\n  }: FilterEnabledRelationshipCollectionsOptions,\n): TCollection[] => {\n  const whitelistSet = enabledCollections?.length ? new Set(enabledCollections) : null\n  const blacklistSet = disabledCollections?.length ? new Set(disabledCollections) : null\n\n  return collections.filter((collection) => {\n    const { slug, admin, upload } = collection\n\n    if (visibleSlugs && !visibleSlugs.includes(slug)) {\n      return false\n    }\n\n    if (uploads) {\n      if (!admin?.enableRichTextRelationship || !upload) {\n        return false\n      }\n    } else if (upload || !admin?.enableRichTextRelationship) {\n      return false\n    }\n\n    if (whitelistSet && !whitelistSet.has(slug)) {\n      return false\n    }\n    if (blacklistSet && blacklistSet.has(slug)) {\n      return false\n    }\n\n    return true\n  })\n}\n"],"mappings":"AAsBA,OAAO,MAAMA,oCAAA,GAAuCA,CAClDC,WAAA,EACA;EACEC,mBAAmB;EACnBC,kBAAkB;EAClBC,OAAO;EACPC;AAAY,CACgC;EAE9C,MAAMC,YAAA,GAAeH,kBAAA,EAAoBI,MAAA,GAAS,IAAIC,GAAA,CAAIL,kBAAA,IAAsB;EAChF,MAAMM,YAAA,GAAeP,mBAAA,EAAqBK,MAAA,GAAS,IAAIC,GAAA,CAAIN,mBAAA,IAAuB;EAElF,OAAOD,WAAA,CAAYS,MAAM,CAAEC,UAAA;IACzB,MAAM;MAAEC,IAAI;MAAEC,KAAK;MAAEC;IAAM,CAAE,GAAGH,UAAA;IAEhC,IAAIN,YAAA,IAAgB,CAACA,YAAA,CAAaU,QAAQ,CAACH,IAAA,GAAO;MAChD,OAAO;IACT;IAEA,IAAIR,OAAA,EAAS;MACX,IAAI,CAACS,KAAA,EAAOG,0BAAA,IAA8B,CAACF,MAAA,EAAQ;QACjD,OAAO;MACT;IACF,OAAO,IAAIA,MAAA,IAAU,CAACD,KAAA,EAAOG,0BAAA,EAA4B;MACvD,OAAO;IACT;IAEA,IAAIV,YAAA,IAAgB,CAACA,YAAA,CAAaW,GAAG,CAACL,IAAA,GAAO;MAC3C,OAAO;IACT;IACA,IAAIH,YAAA,IAAgBA,YAAA,CAAaQ,GAAG,CAACL,IAAA,GAAO;MAC1C,OAAO;IACT;IAEA,OAAO;EACT;AACF","ignoreList":[]}
+{"version":3,"file":"filterEnabledRelationshipCollections.js","names":["filterEnabledRelationshipCollections","collections","disabledCollections","enabledCollections","uploads","whitelistSet","length","Set","blacklistSet","filter","collection","slug","admin","upload","enableRichTextRelationship","has"],"sources":["../../../../src/features/relationship/shared/filterEnabledRelationshipCollections.ts"],"sourcesContent":["type CollectionLike = {\n  admin?: {\n    enableRichTextRelationship?: boolean\n  }\n  slug: string\n  upload?: unknown\n}\n\nexport type FilterEnabledRelationshipCollectionsOptions = {\n  /** `disabledCollections` feature prop — slug blacklist. */\n  disabledCollections?: readonly string[]\n  /** `enabledCollections` feature prop — slug whitelist. */\n  enabledCollections?: readonly string[]\n  /** When `true`, only upload-enabled collections; when `false`, only non-upload ones. */\n  uploads: boolean\n}\n\nexport const filterEnabledRelationshipCollections = <TCollection extends CollectionLike>(\n  collections: readonly TCollection[],\n  { disabledCollections, enabledCollections, uploads }: FilterEnabledRelationshipCollectionsOptions,\n): TCollection[] => {\n  const whitelistSet = enabledCollections?.length ? new Set(enabledCollections) : null\n  const blacklistSet = disabledCollections?.length ? new Set(disabledCollections) : null\n\n  return collections.filter((collection) => {\n    const { slug, admin, upload } = collection\n\n    if (uploads) {\n      if (!admin?.enableRichTextRelationship || !upload) {\n        return false\n      }\n    } else if (upload || !admin?.enableRichTextRelationship) {\n      return false\n    }\n\n    if (whitelistSet && !whitelistSet.has(slug)) {\n      return false\n    }\n    if (blacklistSet && blacklistSet.has(slug)) {\n      return false\n    }\n\n    return true\n  })\n}\n"],"mappings":"AAiBA,OAAO,MAAMA,oCAAA,GAAuCA,CAClDC,WAAA,EACA;EAAEC,mBAAmB;EAAEC,kBAAkB;EAAEC;AAAO,CAA+C;EAEjG,MAAMC,YAAA,GAAeF,kBAAA,EAAoBG,MAAA,GAAS,IAAIC,GAAA,CAAIJ,kBAAA,IAAsB;EAChF,MAAMK,YAAA,GAAeN,mBAAA,EAAqBI,MAAA,GAAS,IAAIC,GAAA,CAAIL,mBAAA,IAAuB;EAElF,OAAOD,WAAA,CAAYQ,MAAM,CAAEC,UAAA;IACzB,MAAM;MAAEC,IAAI;MAAEC,KAAK;MAAEC;IAAM,CAAE,GAAGH,UAAA;IAEhC,IAAIN,OAAA,EAAS;MACX,IAAI,CAACQ,KAAA,EAAOE,0BAAA,IAA8B,CAACD,MAAA,EAAQ;QACjD,OAAO;MACT;IACF,OAAO,IAAIA,MAAA,IAAU,CAACD,KAAA,EAAOE,0BAAA,EAA4B;MACvD,OAAO;IACT;IAEA,IAAIT,YAAA,IAAgB,CAACA,YAAA,CAAaU,GAAG,CAACJ,IAAA,GAAO;MAC3C,OAAO;IACT;IACA,IAAIH,YAAA,IAAgBA,YAAA,CAAaO,GAAG,CAACJ,IAAA,GAAO;MAC1C,OAAO;IACT;IAEA,OAAO;EACT;AACF","ignoreList":[]}

package/dist/features/table/client/plugins/TableActionMenuPlugin/computeSelectionCount.d.ts

@@ -0,0 +1,8 @@
+import type { TableSelection } from '@lexical/table';
+export declare function $computeSelectionCount({ selection }: {
+    selection: TableSelection;
+}): {
+    columns: number;
+    rows: number;
+};
+//# sourceMappingURL=computeSelectionCount.d.ts.map

package/dist/features/table/client/plugins/TableActionMenuPlugin/computeSelectionCount.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeSelectionCount.d.ts","sourceRoot":"","sources":["../../../../../../src/features/table/client/plugins/TableActionMenuPlugin/computeSelectionCount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIpD,wBAAgB,sBAAsB,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG;IACpF,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,CAUA"}

package/dist/features/table/client/plugins/TableActionMenuPlugin/computeSelectionCount.js

@@ -0,0 +1,19 @@
+import { $computeTableCellRectBoundary, $computeTableMap, $getNodeTriplet } from '@lexical/table';
+export function $computeSelectionCount({
+  selection
+}) {
+  const [anchorCell,, table] = $getNodeTriplet(selection.anchor);
+  const [focusCell] = $getNodeTriplet(selection.focus);
+  const [map, anchor, focus] = $computeTableMap(table, anchorCell, focusCell);
+  const {
+    maxColumn,
+    maxRow,
+    minColumn,
+    minRow
+  } = $computeTableCellRectBoundary(map, anchor, focus);
+  return {
+    columns: maxColumn - minColumn + 1,
+    rows: maxRow - minRow + 1
+  };
+}
+//# sourceMappingURL=computeSelectionCount.js.map

package/dist/features/table/client/plugins/TableActionMenuPlugin/computeSelectionCount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeSelectionCount.js","names":["$computeTableCellRectBoundary","$computeTableMap","$getNodeTriplet","$computeSelectionCount","selection","anchorCell","table","anchor","focusCell","focus","map","maxColumn","maxRow","minColumn","minRow","columns","rows"],"sources":["../../../../../../src/features/table/client/plugins/TableActionMenuPlugin/computeSelectionCount.ts"],"sourcesContent":["import type { TableSelection } from '@lexical/table'\n\nimport { $computeTableCellRectBoundary, $computeTableMap, $getNodeTriplet } from '@lexical/table'\n\nexport function $computeSelectionCount({ selection }: { selection: TableSelection }): {\n  columns: number\n  rows: number\n} {\n  const [anchorCell, , table] = $getNodeTriplet(selection.anchor)\n  const [focusCell] = $getNodeTriplet(selection.focus)\n  const [map, anchor, focus] = $computeTableMap(table, anchorCell, focusCell)\n  const { maxColumn, maxRow, minColumn, minRow } = $computeTableCellRectBoundary(map, anchor, focus)\n\n  return {\n    columns: maxColumn - minColumn + 1,\n    rows: maxRow - minRow + 1,\n  }\n}\n"],"mappings":"AAEA,SAASA,6BAA6B,EAAEC,gBAAgB,EAAEC,eAAe,QAAQ;AAEjF,OAAO,SAASC,uBAAuB;EAAEC;AAAS,CAAiC;EAIjF,MAAM,CAACC,UAAA,GAAcC,KAAA,CAAM,GAAGJ,eAAA,CAAgBE,SAAA,CAAUG,MAAM;EAC9D,MAAM,CAACC,SAAA,CAAU,GAAGN,eAAA,CAAgBE,SAAA,CAAUK,KAAK;EACnD,MAAM,CAACC,GAAA,EAAKH,MAAA,EAAQE,KAAA,CAAM,GAAGR,gBAAA,CAAiBK,KAAA,EAAOD,UAAA,EAAYG,SAAA;EACjE,MAAM;IAAEG,SAAS;IAAEC,MAAM;IAAEC,SAAS;IAAEC;EAAM,CAAE,GAAGd,6BAAA,CAA8BU,GAAA,EAAKH,MAAA,EAAQE,KAAA;EAE5F,OAAO;IACLM,OAAA,EAASJ,SAAA,GAAYE,SAAA,GAAY;IACjCG,IAAA,EAAMJ,MAAA,GAASE,MAAA,GAAS;EAC1B;AACF","ignoreList":[]}

package/dist/features/table/client/plugins/TableActionMenuPlugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/features/table/client/plugins/TableActionMenuPlugin/index.tsx"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AAE3E,OAAO,aAAa,CAAA;AA6oBpB,eAAO,MAAM,qBAAqB,EAAE,yBAQnC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/features/table/client/plugins/TableActionMenuPlugin/index.tsx"],"names":[],"mappings":"AA8CA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AAE3E,OAAO,aAAa,CAAA;AAqmBpB,eAAO,MAAM,qBAAqB,EAAE,yBAQnC,CAAA"}

package/dist/features/table/client/plugins/TableActionMenuPlugin/index.js

@@ -4,7 +4,7 @@ import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
 import { useLexicalEditable } from '@lexical/react/useLexicalEditable';
-import { $computeTableMapSkipCellCheck, $deleteTableColumnAtSelection, $deleteTableRowAtSelection, $getNodeTriplet, $getTableCellNodeFromLexicalNode, $getTableColumnIndexFromTableCellNode, $getTableNodeFromLexicalNodeOrThrow, $getTableRowIndexFromTableCellNode, $insertTableColumnAtSelection, $insertTableRowAtSelection, $isTableCellNode, $isTableSelection, $mergeCells, $unmergeCell, getTableElement, getTableObserverFromTableElement, TableCellHeaderStates, TableCellNode } from '@lexical/table';
+import { $computeTableMap, $deleteTableColumnAtSelection, $deleteTableRowAtSelection, $getNodeTriplet, $getTableCellNodeFromLexicalNode, $getTableNodeFromLexicalNodeOrThrow, $getTableRowIndexFromTableCellNode, $insertTableColumnAtSelection, $insertTableRowAtSelection, $isTableCellNode, $isTableSelection, $mergeCells, $setTableColumnIsHeader, $setTableRowIsHeader, $unmergeCell, getTableElement, getTableObserverFromTableElement, TableCellHeaderStates, TableCellNode } from '@lexical/table';
 import { mergeRegister } from '@lexical/utils';
 import { useScrollInfo } from '@payloadcms/ui';
 import { $getSelection, $isElementNode, $isRangeSelection, $isTextNode, $setSelection, COMMAND_PRIORITY_CRITICAL, getDOMSelection, isDOMNode, SELECTION_CHANGE_COMMAND } from 'lexical';
@@ -13,13 +13,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import './index.css';
 import { MeatballsIcon } from '../../../../../lexical/ui/icons/Meatballs/index.js';
-function computeSelectionCount(selection) {
-  const selectionShape = selection.getShape();
-  return {
-    columns: selectionShape.toX - selectionShape.fromX + 1,
-    rows: selectionShape.toY - selectionShape.fromY + 1
-  };
-}
+import { $computeSelectionCount } from './computeSelectionCount.js';
 function $canUnmerge() {
   const selection = $getSelection();
   if ($isRangeSelection(selection) && !selection.isCollapsed() || $isTableSelection(selection) && !selection.anchor.is(selection.focus) || !$isRangeSelection(selection) && !$isTableSelection(selection)) {
@@ -74,9 +68,12 @@ function TableActionMenu({
       const selection = $getSelection();
       // Merge cells
       if ($isTableSelection(selection)) {
-        const currentSelectionCounts = computeSelectionCount(selection);
-        updateSelectionCounts(computeSelectionCount(selection));
-        setCanMergeCells(currentSelectionCounts.columns > 1 || currentSelectionCounts.rows > 1);
+        const currentSelectionCounts = $computeSelectionCount({
+          selection
+        });
+        updateSelectionCounts(currentSelectionCounts);
+        const isCollapsedTableSelection = selection.anchor.is(selection.focus);
+        setCanMergeCells(!isCollapsedTableSelection && (currentSelectionCounts.columns > 1 || currentSelectionCounts.rows > 1));
       }
       // Unmerge cell
       setCanUnmergeCell($canUnmerge());
@@ -152,6 +149,7 @@ function TableActionMenu({
     editor.update(() => {
       $unmergeCell();
     });
+    clearTableSelection();
   };
   const insertTableRowAtSelection = useCallback(shouldInsertAfter => {
     editor.update(() => {
@@ -192,22 +190,9 @@ function TableActionMenu({
   const toggleTableRowIsHeader = useCallback(() => {
     editor.update(() => {
       const tableNode_1 = $getTableNodeFromLexicalNodeOrThrow(tableCellNode);
-      const tableRowIndex = $getTableRowIndexFromTableCellNode(tableCellNode);
-      const [gridMap] = $computeTableMapSkipCellCheck(tableNode_1, null, null);
-      const rowCells = new Set();
-      const newStyle = tableCellNode.getHeaderStyles() ^ TableCellHeaderStates.ROW;
-      if (gridMap[tableRowIndex]) {
-        for (let col = 0; col < gridMap[tableRowIndex].length; col++) {
-          const mapCell = gridMap[tableRowIndex][col];
-          if (!mapCell?.cell) {
-            continue;
-          }
-          if (!rowCells.has(mapCell.cell)) {
-            rowCells.add(mapCell.cell);
-            mapCell.cell.setHeaderStyles(newStyle, TableCellHeaderStates.ROW);
-          }
-        }
-      }
+      const rowIndex = $getTableRowIndexFromTableCellNode(tableCellNode);
+      const isHeader = !tableCellNode.hasHeaderState(TableCellHeaderStates.ROW);
+      $setTableRowIsHeader(tableNode_1, rowIndex, isHeader);
       clearTableSelection();
       onClose();
     });
@@ -215,22 +200,10 @@ function TableActionMenu({
   const toggleTableColumnIsHeader = useCallback(() => {
     editor.update(() => {
       const tableNode_2 = $getTableNodeFromLexicalNodeOrThrow(tableCellNode);
-      const tableColumnIndex = $getTableColumnIndexFromTableCellNode(tableCellNode);
-      const [gridMap_0] = $computeTableMapSkipCellCheck(tableNode_2, null, null);
-      const columnCells = new Set();
-      const newStyle_0 = tableCellNode.getHeaderStyles() ^ TableCellHeaderStates.COLUMN;
-      if (gridMap_0) {
-        for (let row = 0; row < gridMap_0.length; row++) {
-          const mapCell_0 = gridMap_0?.[row]?.[tableColumnIndex];
-          if (!mapCell_0?.cell) {
-            continue;
-          }
-          if (!columnCells.has(mapCell_0.cell)) {
-            columnCells.add(mapCell_0.cell);
-            mapCell_0.cell.setHeaderStyles(newStyle_0, TableCellHeaderStates.COLUMN);
-          }
-        }
-      }
+      // Merged cells can make the grid column differ from the cell's index in its row.
+      const [, cellMap] = $computeTableMap(tableNode_2, tableCellNode, tableCellNode);
+      const isHeader_0 = !tableCellNode.hasHeaderState(TableCellHeaderStates.COLUMN);
+      $setTableColumnIsHeader(tableNode_2, cellMap.startColumn, isHeader_0);
       clearTableSelection();
       onClose();
     });