@payloadcms/richtext-lexical 4.0.0-internal.e16cf59 → 4.0.0-internal.fa345ef

package/dist/features/blocks/premade/CodeBlock/Component/index.css

@@ -0,0 +1,171 @@
+@layer payload-default {
+  .payload-richtext-code-block.collapsible--collapsed {
+    .rah-static {
+      height: unset !important;
+      max-height: 150px !important;
+      position: relative;
+      border-radius: var(--radius-medium);
+
+      &::after {
+        content: '';
+        pointer-events: none;
+        background: linear-gradient(
+          to bottom,
+          transparent 0%,
+          var(--color-bg) 90%,
+          var(--color-bg) 100%
+        );
+        position: absolute;
+        height: 100px;
+        top: 50px;
+        inset-inline-start: 0;
+        inset-inline-end: 0;
+      }
+
+      > div {
+        display: unset !important;
+      }
+    }
+  }
+
+  .payload-richtext-code-block {
+    .collapsible__toggle-wrap {
+      background: var(--color-bg);
+      border: none;
+      border-radius: var(--radius-medium);
+      height: auto;
+      padding: var(--spacer-1) var(--spacer-2-5);
+      overflow: visible;
+
+      &:not(.toggle-disabled):hover {
+        background: var(--color-bg);
+      }
+    }
+
+    .collapsible__header-wrap {
+      overflow: visible;
+      padding: 0;
+    }
+
+    .popup__caret {
+      display: none;
+    }
+
+    .collapsible__content {
+      padding: 0;
+      border: none;
+    }
+
+    .LexicalEditorTheme__block__block-header {
+      overflow: visible;
+    }
+
+    .code-editor,
+    .monaco-editor,
+    .overflow-guard {
+      border-width: 0;
+      border-radius: 0 0 var(--radius-medium) var(--radius-medium);
+      background: var(--color-bg);
+    }
+
+    .popup-button {
+      padding: 0 0 0 var(--spacer-1);
+    }
+
+    .copy-to-clipboard,
+    .code-block-collapse-button,
+    .popup-button,
+    .LexicalEditorTheme__block__removeButton.btn {
+      border-radius: var(--radius-medium);
+      color: var(--color-icon-secondary);
+      min-width: var(--spacer-4);
+      min-height: var(--spacer-4);
+      padding: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &:hover {
+        color: var(--color-icon);
+        background-color: var(--color-bg-transparent-hover);
+      }
+
+      &:active {
+        background-color: var(--color-bg-transparent-pressed);
+      }
+
+      &:focus-visible {
+        outline: var(--stroke-width-small) solid var(--color-border-brand-strong);
+        outline-offset: calc(var(--stroke-width-small) / -1);
+      }
+    }
+  }
+
+  .payload-richtext-code-block__pill {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: var(--spacer-4);
+    color: var(--color-icon-tertiary);
+  }
+
+  .payload-richtext-code-block__actions {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: var(--spacer-2);
+  }
+
+  .payload-richtext-code-block__language-selector {
+    pointer-events: all;
+  }
+
+  .payload-richtext-code-block__language-selector-button {
+    display: flex;
+    flex-direction: row;
+    width: max-content;
+    align-items: center;
+    color: var(--color-text-secondary);
+    font-size: var(--text-body-medium-font-size);
+    line-height: var(--text-body-medium-line-height);
+    padding-inline-start: var(--spacer-1);
+
+    & path {
+      fill-opacity: 1;
+    }
+
+    &:hover {
+      color: var(--color-text);
+
+      & path {
+        fill: var(--color-text);
+      }
+    }
+  }
+
+  .payload-richtext-code-block__chevron {
+    color: var(--color-icon-secondary);
+    width: var(--spacer-3);
+    height: var(--spacer-4);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+  }
+}
+
+/* Override the collapsible container to use a simple border wrapper */
+.payload-richtext-code-block {
+  border: var(--stroke-width-small) solid var(--color-border);
+  border-radius: var(--radius-medium);
+
+  &:focus-within {
+    outline: var(--stroke-width-small) solid var(--color-border-brand-strong);
+    outline-offset: calc(var(--stroke-width-small) / -1);
+  }
+}
+
+/* Add left padding to Monaco line numbers area */
+.payload-richtext-code-block .monaco-editor .margin {
+  padding-inline-start: var(--spacer-2);
+}

package/dist/features/blocks/server/graphQLPopulationPromise.d.ts

@@ -1,6 +1,5 @@
 import type { Block } from 'payload';
 import type { PopulationPromise } from '../../typesServer.js';
-import type { SerializedInlineBlockNode } from '../server/nodes/InlineBlocksNode.js';
-import type { SerializedBlockNode } from './nodes/BlocksNode.js';
+import type { SerializedBlockNode, SerializedInlineBlockNode } from './schema.js';
 export declare const blockPopulationPromiseHOC: (blocks: Block[]) => PopulationPromise<SerializedBlockNode | SerializedInlineBlockNode>;
 //# sourceMappingURL=graphQLPopulationPromise.d.ts.map

package/dist/features/blocks/server/graphQLPopulationPromise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphQLPopulationPromise.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/graphQLPopulationPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAA;AACpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAIhE,eAAO,MAAM,yBAAyB,WAC5B,KAAK,EAAE,KACd,iBAAiB,CAAC,mBAAmB,GAAG,yBAAyB,CAiDnE,CAAA"}
+{"version":3,"file":"graphQLPopulationPromise.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/graphQLPopulationPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAA;AAIjF,eAAO,MAAM,yBAAyB,GACpC,QAAQ,KAAK,EAAE,KACd,iBAAiB,CAAC,mBAAmB,GAAG,yBAAyB,CAiDnE,CAAA"}

package/dist/features/blocks/server/graphQLPopulationPromise.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphQLPopulationPromise.js","names":["recursivelyPopulateFieldsForGraphQL","blockPopulationPromiseHOC","blocks","blockPopulationPromise","context","currentDepth","depth","draft","editorPopulationPromises","field","fieldPromises","findMany","flattenLocales","node","overrideAccess","parentIsLocalized","populationPromises","req","showHiddenFields","blockFieldData","fields","block","find","slug","blockType","length","data","localized","siblingDoc"],"sources":["../../../../src/features/blocks/server/graphQLPopulationPromise.ts"],"sourcesContent":["import type { Block } from 'payload'\n\nimport type { PopulationPromise } from '../../typesServer.js'\nimport type { SerializedInlineBlockNode } from '../server/nodes/InlineBlocksNode.js'\nimport type { SerializedBlockNode } from './nodes/BlocksNode.js'\n\nimport { recursivelyPopulateFieldsForGraphQL } from '../../../populateGraphQL/recursivelyPopulateFieldsForGraphQL.js'\n\nexport const blockPopulationPromiseHOC = (\n  blocks: Block[],\n): PopulationPromise<SerializedBlockNode | SerializedInlineBlockNode> => {\n  const blockPopulationPromise: PopulationPromise<\n    SerializedBlockNode | SerializedInlineBlockNode\n  > = ({\n    context,\n    currentDepth,\n    depth,\n    draft,\n    editorPopulationPromises,\n    field,\n    fieldPromises,\n    findMany,\n    flattenLocales,\n    node,\n    overrideAccess,\n    parentIsLocalized,\n    populationPromises,\n    req,\n    showHiddenFields,\n  }) => {\n    const blockFieldData = node.fields\n\n    // find block used in this node\n    const block = blocks.find((block) => block.slug === blockFieldData.blockType)\n    if (!block || !block?.fields?.length || !blockFieldData) {\n      return\n    }\n\n    recursivelyPopulateFieldsForGraphQL({\n      context,\n      currentDepth,\n      data: blockFieldData,\n      depth,\n      draft,\n      editorPopulationPromises,\n      fieldPromises,\n      fields: block.fields,\n      findMany,\n      flattenLocales,\n      overrideAccess,\n      parentIsLocalized: parentIsLocalized || field.localized || false,\n      populationPromises,\n      req,\n      showHiddenFields,\n      siblingDoc: blockFieldData,\n    })\n  }\n\n  return blockPopulationPromise\n}\n"],"mappings":"AAMA,SAASA,mCAAmC,QAAQ;AAEpD,OAAO,MAAMC,yBAAA,GACXC,MAAA;EAEA,MAAMC,sBAAA,GAEFA,CAAC;IACHC,OAAO;IACPC,YAAY;IACZC,KAAK;IACLC,KAAK;IACLC,wBAAwB;IACxBC,KAAK;IACLC,aAAa;IACbC,QAAQ;IACRC,cAAc;IACdC,IAAI;IACJC,cAAc;IACdC,iBAAiB;IACjBC,kBAAkB;IAClBC,GAAG;IACHC;EAAgB,CACjB;IACC,MAAMC,cAAA,GAAiBN,IAAA,CAAKO,MAAM;IAElC;IACA,MAAMC,KAAA,GAAQnB,MAAA,CAAOoB,IAAI,CAAED,KAAA,IAAUA,KAAA,CAAME,IAAI,KAAKJ,cAAA,CAAeK,SAAS;IAC5E,IAAI,CAACH,KAAA,IAAS,CAACA,KAAA,EAAOD,MAAA,EAAQK,MAAA,IAAU,CAACN,cAAA,EAAgB;MACvD;IACF;IAEAnB,mCAAA,CAAoC;MAClCI,OAAA;MACAC,YAAA;MACAqB,IAAA,EAAMP,cAAA;MACNb,KAAA;MACAC,KAAA;MACAC,wBAAA;MACAE,aAAA;MACAU,MAAA,EAAQC,KAAA,CAAMD,MAAM;MACpBT,QAAA;MACAC,cAAA;MACAE,cAAA;MACAC,iBAAA,EAAmBA,iBAAA,IAAqBN,KAAA,CAAMkB,SAAS,IAAI;MAC3DX,kBAAA;MACAC,GAAA;MACAC,gBAAA;MACAU,UAAA,EAAYT;IACd;EACF;EAEA,OAAOhB,sBAAA;AACT","ignoreList":[]}
+{"version":3,"file":"graphQLPopulationPromise.js","names":["recursivelyPopulateFieldsForGraphQL","blockPopulationPromiseHOC","blocks","blockPopulationPromise","context","currentDepth","depth","draft","editorPopulationPromises","field","fieldPromises","findMany","flattenLocales","node","overrideAccess","parentIsLocalized","populationPromises","req","showHiddenFields","blockFieldData","fields","block","find","slug","blockType","length","data","localized","siblingDoc"],"sources":["../../../../src/features/blocks/server/graphQLPopulationPromise.ts"],"sourcesContent":["import type { Block } from 'payload'\n\nimport type { PopulationPromise } from '../../typesServer.js'\nimport type { SerializedBlockNode, SerializedInlineBlockNode } from './schema.js'\n\nimport { recursivelyPopulateFieldsForGraphQL } from '../../../populateGraphQL/recursivelyPopulateFieldsForGraphQL.js'\n\nexport const blockPopulationPromiseHOC = (\n  blocks: Block[],\n): PopulationPromise<SerializedBlockNode | SerializedInlineBlockNode> => {\n  const blockPopulationPromise: PopulationPromise<\n    SerializedBlockNode | SerializedInlineBlockNode\n  > = ({\n    context,\n    currentDepth,\n    depth,\n    draft,\n    editorPopulationPromises,\n    field,\n    fieldPromises,\n    findMany,\n    flattenLocales,\n    node,\n    overrideAccess,\n    parentIsLocalized,\n    populationPromises,\n    req,\n    showHiddenFields,\n  }) => {\n    const blockFieldData = node.fields\n\n    // find block used in this node\n    const block = blocks.find((block) => block.slug === blockFieldData.blockType)\n    if (!block || !block?.fields?.length || !blockFieldData) {\n      return\n    }\n\n    recursivelyPopulateFieldsForGraphQL({\n      context,\n      currentDepth,\n      data: blockFieldData,\n      depth,\n      draft,\n      editorPopulationPromises,\n      fieldPromises,\n      fields: block.fields,\n      findMany,\n      flattenLocales,\n      overrideAccess,\n      parentIsLocalized: parentIsLocalized || field.localized || false,\n      populationPromises,\n      req,\n      showHiddenFields,\n      siblingDoc: blockFieldData,\n    })\n  }\n\n  return blockPopulationPromise\n}\n"],"mappings":"AAKA,SAASA,mCAAmC,QAAQ;AAEpD,OAAO,MAAMC,yBAAA,GACXC,MAAA;EAEA,MAAMC,sBAAA,GAEFA,CAAC;IACHC,OAAO;IACPC,YAAY;IACZC,KAAK;IACLC,KAAK;IACLC,wBAAwB;IACxBC,KAAK;IACLC,aAAa;IACbC,QAAQ;IACRC,cAAc;IACdC,IAAI;IACJC,cAAc;IACdC,iBAAiB;IACjBC,kBAAkB;IAClBC,GAAG;IACHC;EAAgB,CACjB;IACC,MAAMC,cAAA,GAAiBN,IAAA,CAAKO,MAAM;IAElC;IACA,MAAMC,KAAA,GAAQnB,MAAA,CAAOoB,IAAI,CAAED,KAAA,IAAUA,KAAA,CAAME,IAAI,KAAKJ,cAAA,CAAeK,SAAS;IAC5E,IAAI,CAACH,KAAA,IAAS,CAACA,KAAA,EAAOD,MAAA,EAAQK,MAAA,IAAU,CAACN,cAAA,EAAgB;MACvD;IACF;IAEAnB,mCAAA,CAAoC;MAClCI,OAAA;MACAC,YAAA;MACAqB,IAAA,EAAMP,cAAA;MACNb,KAAA;MACAC,KAAA;MACAC,wBAAA;MACAE,aAAA;MACAU,MAAA,EAAQC,KAAA,CAAMD,MAAM;MACpBT,QAAA;MACAC,cAAA;MACAE,cAAA;MACAC,iBAAA,EAAmBA,iBAAA,IAAqBN,KAAA,CAAMkB,SAAS,IAAI;MAC3DX,kBAAA;MACAC,GAAA;MACAC,gBAAA;MACAU,UAAA,EAAYT;IACd;EACF;EAEA,OAAOhB,sBAAA;AACT","ignoreList":[]}

package/dist/features/blocks/server/index.d.ts

@@ -1,4 +1,5 @@
 import type { Block, BlockSlug, UIFieldClientProps, UIFieldServerProps } from 'payload';
+export type { BlockFields, BlockFieldsOptionalID, InlineBlockFields, SerializedBlockNode, SerializedInlineBlockNode, } from './schema.js';
 export type BlocksFeatureProps = {
     blocks?: (Block | BlockSlug)[] | Block[];
     inlineBlocks?: (Block | BlockSlug)[] | Block[];

package/dist/features/blocks/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EAEL,SAAS,EAIT,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,SAAS,CAAA;AAchB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,CAAA;IACxC,YAAY,CAAC,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,CAAA;CAC/C,CAAA;AAED,eAAO,MAAM,aAAa,iHA0PxB,CAAA;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AACxD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AAExD;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,kBAAkB,CAAA;AAC7D;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,kBAAkB,CAAA;AAE7D;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAA;AAC9D;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAA;AAE9D;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG,kBAAkB,CAAA;AACnE;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/blocks/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EAEL,SAAS,EAGT,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,SAAS,CAAA;AAehB,YAAY,EACV,WAAW,EACX,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,aAAa,CAAA;AAEpB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,CAAA;IACxC,YAAY,CAAC,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,CAAA;CAC/C,CAAA;AAED,eAAO,MAAM,aAAa,iHAiMxB,CAAA;AAEF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AACxD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AAExD;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,kBAAkB,CAAA;AAC7D;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG,kBAAkB,CAAA;AAE7D;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAA;AAC9D;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,CAAA;AAE9D;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG,kBAAkB,CAAA;AACnE;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG,kBAAkB,CAAA"}

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

@@ -1,4 +1,4 @@
-import { fieldsToJSONSchema, flattenAllFields, sanitizeFields } from 'payload';
+import { sanitizeFields } from 'payload';
 import { applyBaseFilterToFields } from '../../../utilities/applyBaseFilterToFields.js';
 import { createServerFeature } from '../../../utilities/createServerFeature.js';
 import { createNode } from '../../typeUtilities.js';
@@ -7,6 +7,7 @@ import { i18n } from './i18n.js';
 import { getBlockMarkdownTransformers } from './markdown/markdownTransformer.js';
 import { ServerBlockNode } from './nodes/BlocksNode.js';
 import { ServerInlineBlockNode } from './nodes/InlineBlocksNode.js';
+import { createBlockNodeJSONSchema, createInlineBlockNodeJSONSchema } from './schema.js';
 import { blockValidationHOC } from './validate.js';
 export const BlocksFeature = createServerFeature({
   feature: async ({
@@ -21,20 +22,18 @@ export const BlocksFeature = createServerFeature({
       fields: [{
         name: 'lexical_blocks',
         type: 'blocks',
-        blockReferences: _props.blocks ?? [],
-        blocks: []
+        blocks: _props.blocks ?? []
       }, {
         name: 'lexical_inline_blocks',
         type: 'blocks',
-        blockReferences: _props.inlineBlocks ?? [],
-        blocks: []
+        blocks: _props.inlineBlocks ?? []
       }],
       parentIsLocalized,
       requireFieldLevelRichTextEditor: isRoot,
       validRelationships
     });
     const blockConfigs = [];
-    for (const _block of sanitized[0].blockReferences ?? sanitized[0].blocks) {
+    for (const _block of sanitized[0].blocks) {
       const block = typeof _block === 'string' ? _config?.blocks?.find(b => b.slug === _block) : _block;
       if (!block) {
         throw new Error(`Block not found for slug: ${typeof _block === 'string' ? _block : _block?.slug}`);
@@ -46,7 +45,7 @@ export const BlocksFeature = createServerFeature({
       });
     }
     const inlineBlockConfigs = [];
-    for (const _block of sanitized[1].blockReferences ?? sanitized[1].blocks) {
+    for (const _block of sanitized[1].blocks) {
       const block = typeof _block === 'string' ? _config?.blocks?.find(b => b.slug === _block) : _block;
       if (!block) {
         throw new Error(`Block not found for slug: ${typeof _block === 'string' ? _block : _block?.slug}`);
@@ -59,55 +58,6 @@ export const BlocksFeature = createServerFeature({
     }
     return {
       ClientFeature: '@payloadcms/richtext-lexical/client#BlocksFeatureClient',
-      generatedTypes: {
-        modifyOutputSchema: ({
-          collectionIDFieldTypes,
-          config,
-          currentSchema,
-          field,
-          i18n,
-          interfaceNameDefinitions
-        }) => {
-          if (!blockConfigs?.length && !inlineBlockConfigs?.length) {
-            return currentSchema;
-          }
-          const fields = [];
-          if (blockConfigs?.length) {
-            fields.push({
-              name: field?.name + '_lexical_blocks',
-              type: 'blocks',
-              blocks: blockConfigs.map(block => {
-                return {
-                  ...block,
-                  flattenedFields: flattenAllFields({
-                    fields: block.fields
-                  })
-                };
-              })
-            });
-          }
-          if (inlineBlockConfigs?.length) {
-            fields.push({
-              name: field?.name + '_lexical_inline_blocks',
-              type: 'blocks',
-              blocks: inlineBlockConfigs.map(block => {
-                return {
-                  ...block,
-                  flattenedFields: flattenAllFields({
-                    fields: block.fields
-                  })
-                };
-              })
-            });
-          }
-          if (fields.length) {
-            // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.
-            // we don't actually use the JSON Schema itself in the generated types yet.
-            fieldsToJSONSchema(collectionIDFieldTypes, fields, interfaceNameDefinitions, config, i18n);
-          }
-          return currentSchema;
-        }
-      },
       generateSchemaMap: ({
         config
       }) => {
@@ -175,22 +125,23 @@ export const BlocksFeature = createServerFeature({
         inlineBlocks: inlineBlockConfigs
       }),
       nodes: [createNode({
+        jsonSchema: blockConfigs.length ? createBlockNodeJSONSchema(blockConfigs) : undefined,
         // @ts-expect-error - TODO: fix this
         getSubFields: ({
           node
         }) => {
           if (!node) {
-            if (blockConfigs?.length) {
-              return [{
-                name: 'lexical_blocks',
-                type: 'blocks',
-                blocks: blockConfigs
-              }];
+            if (!blockConfigs.length) {
+              return [];
             }
-            return [];
+            return [{
+              name: 'lexical_blocks',
+              type: 'blocks',
+              blocks: blockConfigs
+            }];
           }
           const blockType = node.fields.blockType;
-          const block = blockConfigs?.find(block => block.slug === blockType);
+          const block = blockConfigs.find(block => block.slug === blockType);
           return block?.fields;
         },
         getSubFieldsData: ({
@@ -202,22 +153,23 @@ export const BlocksFeature = createServerFeature({
         node: ServerBlockNode,
         validations: [blockValidationHOC(blockConfigs)]
       }), createNode({
+        jsonSchema: inlineBlockConfigs.length ? createInlineBlockNodeJSONSchema(inlineBlockConfigs) : undefined,
         // @ts-expect-error - TODO: fix this
         getSubFields: ({
           node
         }) => {
           if (!node) {
-            if (inlineBlockConfigs?.length) {
-              return [{
-                name: 'lexical_inline_blocks',
-                type: 'blocks',
-                blocks: inlineBlockConfigs
-              }];
+            if (!inlineBlockConfigs.length) {
+              return [];
             }
-            return [];
+            return [{
+              name: 'lexical_inline_blocks',
+              type: 'blocks',
+              blocks: inlineBlockConfigs
+            }];
           }
           const blockType = node.fields.blockType;
-          const block = inlineBlockConfigs?.find(block => block.slug === blockType);
+          const block = inlineBlockConfigs.find(block => block.slug === blockType);
           return block?.fields;
         },
         getSubFieldsData: ({

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["fieldsToJSONSchema","flattenAllFields","sanitizeFields","applyBaseFilterToFields","createServerFeature","createNode","blockPopulationPromiseHOC","i18n","getBlockMarkdownTransformers","ServerBlockNode","ServerInlineBlockNode","blockValidationHOC","BlocksFeature","feature","config","_config","isRoot","parentIsLocalized","props","_props","validRelationships","collections","map","c","slug","sanitized","fields","name","type","blockReferences","blocks","inlineBlocks","requireFieldLevelRichTextEditor","blockConfigs","_block","block","find","b","Error","push","inlineBlockConfigs","ClientFeature","generatedTypes","modifyOutputSchema","collectionIDFieldTypes","currentSchema","field","interfaceNameDefinitions","length","flattenedFields","generateSchemaMap","schemaMap","Map","blockFields","admin","components","unshift","Block","BlockLabel","Label","set","markdownTransformers","nodes","getSubFields","node","blockType","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"sources":["../../../../src/features/blocks/server/index.ts"],"sourcesContent":["import type {\n  Block,\n  BlocksField,\n  BlockSlug,\n  Config,\n  FieldSchemaMap,\n  FlattenedBlocksField,\n  UIFieldClientProps,\n  UIFieldServerProps,\n} from 'payload'\n\nimport { fieldsToJSONSchema, flattenAllFields, sanitizeFields } from 'payload'\n\nimport { applyBaseFilterToFields } from '../../../utilities/applyBaseFilterToFields.js'\nimport { createServerFeature } from '../../../utilities/createServerFeature.js'\nimport { createNode } from '../../typeUtilities.js'\nimport { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { getBlockMarkdownTransformers } from './markdown/markdownTransformer.js'\nimport { ServerBlockNode } from './nodes/BlocksNode.js'\nimport { ServerInlineBlockNode } from './nodes/InlineBlocksNode.js'\nimport { blockValidationHOC } from './validate.js'\n\nexport type BlocksFeatureProps = {\n  blocks?: (Block | BlockSlug)[] | Block[]\n  inlineBlocks?: (Block | BlockSlug)[] | Block[]\n}\n\nexport const BlocksFeature = createServerFeature<BlocksFeatureProps, BlocksFeatureProps>({\n  feature: async ({ config: _config, isRoot, parentIsLocalized, props: _props }) => {\n    const validRelationships = _config.collections.map((c) => c.slug) || []\n\n    const sanitized = await sanitizeFields({\n      config: _config as unknown as Config,\n      fields: [\n        {\n          name: 'lexical_blocks',\n          type: 'blocks',\n          blockReferences: _props.blocks ?? [],\n          blocks: [],\n        },\n        {\n          name: 'lexical_inline_blocks',\n          type: 'blocks',\n          blockReferences: _props.inlineBlocks ?? [],\n          blocks: [],\n        },\n      ],\n      parentIsLocalized,\n      requireFieldLevelRichTextEditor: isRoot,\n      validRelationships,\n    })\n\n    const blockConfigs: Block[] = []\n    for (const _block of (sanitized[0] as BlocksField).blockReferences ??\n      (sanitized[0] as BlocksField).blocks) {\n      const block =\n        typeof _block === 'string' ? _config?.blocks?.find((b) => b.slug === _block) : _block\n      if (!block) {\n        throw new Error(\n          `Block not found for slug: ${typeof _block === 'string' ? _block : _block?.slug}`,\n        )\n      }\n      // Apply baseFilter to relationship fields in the block\n      blockConfigs.push({\n        ...block,\n        fields: applyBaseFilterToFields(block.fields, _config),\n      })\n    }\n\n    const inlineBlockConfigs: Block[] = []\n    for (const _block of (sanitized[1] as BlocksField).blockReferences ??\n      (sanitized[1] as BlocksField).blocks) {\n      const block =\n        typeof _block === 'string' ? _config?.blocks?.find((b) => b.slug === _block) : _block\n      if (!block) {\n        throw new Error(\n          `Block not found for slug: ${typeof _block === 'string' ? _block : _block?.slug}`,\n        )\n      }\n      // Apply baseFilter to relationship fields in the block\n      inlineBlockConfigs.push({\n        ...block,\n        fields: applyBaseFilterToFields(block.fields, _config),\n      })\n    }\n\n    return {\n      ClientFeature: '@payloadcms/richtext-lexical/client#BlocksFeatureClient',\n      generatedTypes: {\n        modifyOutputSchema: ({\n          collectionIDFieldTypes,\n          config,\n          currentSchema,\n          field,\n          i18n,\n          interfaceNameDefinitions,\n        }) => {\n          if (!blockConfigs?.length && !inlineBlockConfigs?.length) {\n            return currentSchema\n          }\n\n          const fields: FlattenedBlocksField[] = []\n\n          if (blockConfigs?.length) {\n            fields.push({\n              name: field?.name + '_lexical_blocks',\n              type: 'blocks',\n              blocks: blockConfigs.map((block) => {\n                return {\n                  ...block,\n                  flattenedFields: flattenAllFields({ fields: block.fields }),\n                }\n              }),\n            })\n          }\n          if (inlineBlockConfigs?.length) {\n            fields.push({\n              name: field?.name + '_lexical_inline_blocks',\n              type: 'blocks',\n              blocks: inlineBlockConfigs.map((block) => {\n                return {\n                  ...block,\n                  flattenedFields: flattenAllFields({ fields: block.fields }),\n                }\n              }),\n            })\n          }\n\n          if (fields.length) {\n            // This is only done so that interfaceNameDefinitions sets those block's interfaceNames.\n            // we don't actually use the JSON Schema itself in the generated types yet.\n            fieldsToJSONSchema(\n              collectionIDFieldTypes,\n              fields,\n              interfaceNameDefinitions,\n              config,\n              i18n,\n            )\n          }\n\n          return currentSchema\n        },\n      },\n      generateSchemaMap: ({ config }) => {\n        /**\n         * Add sub-fields to the schemaMap. E.g. if you have an array field as part of the block, and it runs addRow, it will request these\n         * sub-fields from the component map. Thus, we need to put them in the component map here.\n         */\n        const schemaMap: FieldSchemaMap = new Map()\n\n        if (blockConfigs?.length) {\n          for (const block of blockConfigs) {\n            const blockFields = [...block.fields]\n\n            if (block?.admin?.components) {\n              blockFields.unshift({\n                name: `_components`,\n                type: 'ui',\n                admin: {\n                  components: {\n                    Block: block.admin?.components?.Block,\n                    BlockLabel: block.admin?.components?.Label,\n                  },\n                },\n              })\n            }\n            schemaMap.set(`lexical_blocks.${block.slug}.fields`, {\n              fields: blockFields,\n            })\n            schemaMap.set(`lexical_blocks.${block.slug}`, {\n              name: `lexical_blocks_${block.slug}`,\n              type: 'blocks',\n              blocks: [block],\n            })\n          }\n        }\n\n        if (inlineBlockConfigs?.length) {\n          // To generate block schemaMap which generates things like the componentMap for admin.Label\n          for (const block of inlineBlockConfigs) {\n            const blockFields = [...block.fields]\n\n            if (block?.admin?.components) {\n              blockFields.unshift({\n                name: `_components`,\n                type: 'ui',\n                admin: {\n                  components: {\n                    Block: block.admin?.components?.Block,\n                    BlockLabel: block.admin?.components?.Label,\n                  },\n                },\n              })\n            }\n\n            schemaMap.set(`lexical_inline_blocks.${block.slug}.fields`, {\n              fields: blockFields,\n            })\n\n            schemaMap.set(`lexical_inline_blocks.${block.slug}`, {\n              name: `lexical_inline_blocks_${block.slug}`,\n              type: 'blocks',\n              blocks: [block],\n            })\n          }\n        }\n\n        return schemaMap\n      },\n      i18n,\n      markdownTransformers: getBlockMarkdownTransformers({\n        blocks: blockConfigs,\n        inlineBlocks: inlineBlockConfigs,\n      }),\n\n      nodes: [\n        createNode({\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (blockConfigs?.length) {\n                return [\n                  {\n                    name: 'lexical_blocks',\n                    type: 'blocks',\n                    blocks: blockConfigs,\n                  },\n                ]\n              }\n              return []\n            }\n\n            const blockType = node.fields.blockType\n\n            const block = blockConfigs?.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(blockConfigs)],\n          node: ServerBlockNode,\n          validations: [blockValidationHOC(blockConfigs)],\n        }),\n        createNode({\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (inlineBlockConfigs?.length) {\n                return [\n                  {\n                    name: 'lexical_inline_blocks',\n                    type: 'blocks',\n                    blocks: inlineBlockConfigs,\n                  },\n                ]\n              }\n              return []\n            }\n\n            const blockType = node.fields.blockType\n\n            const block = inlineBlockConfigs?.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(inlineBlockConfigs)],\n          node: ServerInlineBlockNode,\n          validations: [blockValidationHOC(inlineBlockConfigs)],\n        }),\n      ],\n      sanitizedServerFeatureProps: _props,\n    }\n  },\n  key: 'blocks',\n})\n\n/**\n * Props for the client components provided to `admin.components.Block` of lexical blocks.\n */\nexport type LexicalBlockClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Block` of lexical blocks.\n */\nexport type LexicalBlockServerProps = UIFieldServerProps\n\n/**\n * Props for the client components provided to `admin.components.Label` of lexical blocks.\n */\nexport type LexicalBlockLabelClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Label` of lexical blocks.\n */\nexport type LexicalBlockLabelServerProps = UIFieldServerProps\n\n/**\n * Props for the client components provided to `admin.components.Block` of lexical inline blocks.\n */\nexport type LexicalInlineBlockClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Block` of lexical inline blocks.\n */\nexport type LexicalInlineBlockServerProps = UIFieldServerProps\n\n/**\n * Props for the client components provided to `admin.components.Label` of lexical inline blocks.\n */\nexport type LexicalInlineBlockLabelClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Label` of lexical inline blocks.\n */\nexport type LexicalInlineBlockLabelServerProps = UIFieldServerProps\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["sanitizeFields","applyBaseFilterToFields","createServerFeature","createNode","blockPopulationPromiseHOC","i18n","getBlockMarkdownTransformers","ServerBlockNode","ServerInlineBlockNode","createBlockNodeJSONSchema","createInlineBlockNodeJSONSchema","blockValidationHOC","BlocksFeature","feature","config","_config","isRoot","parentIsLocalized","props","_props","validRelationships","collections","map","c","slug","sanitized","fields","name","type","blocks","inlineBlocks","requireFieldLevelRichTextEditor","blockConfigs","_block","block","find","b","Error","push","inlineBlockConfigs","ClientFeature","generateSchemaMap","schemaMap","Map","length","blockFields","admin","components","unshift","Block","BlockLabel","Label","set","markdownTransformers","nodes","jsonSchema","undefined","getSubFields","node","blockType","getSubFieldsData","graphQLPopulationPromises","validations","sanitizedServerFeatureProps","key"],"sources":["../../../../src/features/blocks/server/index.ts"],"sourcesContent":["import type {\n  Block,\n  BlocksField,\n  BlockSlug,\n  Config,\n  FieldSchemaMap,\n  UIFieldClientProps,\n  UIFieldServerProps,\n} from 'payload'\n\nimport { sanitizeFields } from 'payload'\n\nimport { applyBaseFilterToFields } from '../../../utilities/applyBaseFilterToFields.js'\nimport { createServerFeature } from '../../../utilities/createServerFeature.js'\nimport { createNode } from '../../typeUtilities.js'\nimport { blockPopulationPromiseHOC } from './graphQLPopulationPromise.js'\nimport { i18n } from './i18n.js'\nimport { getBlockMarkdownTransformers } from './markdown/markdownTransformer.js'\nimport { ServerBlockNode } from './nodes/BlocksNode.js'\nimport { ServerInlineBlockNode } from './nodes/InlineBlocksNode.js'\nimport { createBlockNodeJSONSchema, createInlineBlockNodeJSONSchema } from './schema.js'\nimport { blockValidationHOC } from './validate.js'\n\nexport type {\n  BlockFields,\n  BlockFieldsOptionalID,\n  InlineBlockFields,\n  SerializedBlockNode,\n  SerializedInlineBlockNode,\n} from './schema.js'\n\nexport type BlocksFeatureProps = {\n  blocks?: (Block | BlockSlug)[] | Block[]\n  inlineBlocks?: (Block | BlockSlug)[] | Block[]\n}\n\nexport const BlocksFeature = createServerFeature<BlocksFeatureProps, BlocksFeatureProps>({\n  feature: async ({ config: _config, isRoot, parentIsLocalized, props: _props }) => {\n    const validRelationships = _config.collections.map((c) => c.slug) || []\n\n    const sanitized = await sanitizeFields({\n      config: _config as unknown as Config,\n      fields: [\n        {\n          name: 'lexical_blocks',\n          type: 'blocks',\n          blocks: _props.blocks ?? [],\n        },\n        {\n          name: 'lexical_inline_blocks',\n          type: 'blocks',\n          blocks: _props.inlineBlocks ?? [],\n        },\n      ],\n      parentIsLocalized,\n      requireFieldLevelRichTextEditor: isRoot,\n      validRelationships,\n    })\n\n    const blockConfigs: Block[] = []\n    for (const _block of (sanitized[0] as BlocksField).blocks) {\n      const block =\n        typeof _block === 'string' ? _config?.blocks?.find((b) => b.slug === _block) : _block\n      if (!block) {\n        throw new Error(\n          `Block not found for slug: ${typeof _block === 'string' ? _block : _block?.slug}`,\n        )\n      }\n      // Apply baseFilter to relationship fields in the block\n      blockConfigs.push({\n        ...block,\n        fields: applyBaseFilterToFields(block.fields, _config),\n      })\n    }\n\n    const inlineBlockConfigs: Block[] = []\n    for (const _block of (sanitized[1] as BlocksField).blocks) {\n      const block =\n        typeof _block === 'string' ? _config?.blocks?.find((b) => b.slug === _block) : _block\n      if (!block) {\n        throw new Error(\n          `Block not found for slug: ${typeof _block === 'string' ? _block : _block?.slug}`,\n        )\n      }\n      // Apply baseFilter to relationship fields in the block\n      inlineBlockConfigs.push({\n        ...block,\n        fields: applyBaseFilterToFields(block.fields, _config),\n      })\n    }\n\n    return {\n      ClientFeature: '@payloadcms/richtext-lexical/client#BlocksFeatureClient',\n      generateSchemaMap: ({ config }) => {\n        /**\n         * Add sub-fields to the schemaMap. E.g. if you have an array field as part of the block, and it runs addRow, it will request these\n         * sub-fields from the component map. Thus, we need to put them in the component map here.\n         */\n        const schemaMap: FieldSchemaMap = new Map()\n\n        if (blockConfigs?.length) {\n          for (const block of blockConfigs) {\n            const blockFields = [...block.fields]\n\n            if (block?.admin?.components) {\n              blockFields.unshift({\n                name: `_components`,\n                type: 'ui',\n                admin: {\n                  components: {\n                    Block: block.admin?.components?.Block,\n                    BlockLabel: block.admin?.components?.Label,\n                  },\n                },\n              })\n            }\n            schemaMap.set(`lexical_blocks.${block.slug}.fields`, {\n              fields: blockFields,\n            })\n            schemaMap.set(`lexical_blocks.${block.slug}`, {\n              name: `lexical_blocks_${block.slug}`,\n              type: 'blocks',\n              blocks: [block],\n            })\n          }\n        }\n\n        if (inlineBlockConfigs?.length) {\n          // To generate block schemaMap which generates things like the componentMap for admin.Label\n          for (const block of inlineBlockConfigs) {\n            const blockFields = [...block.fields]\n\n            if (block?.admin?.components) {\n              blockFields.unshift({\n                name: `_components`,\n                type: 'ui',\n                admin: {\n                  components: {\n                    Block: block.admin?.components?.Block,\n                    BlockLabel: block.admin?.components?.Label,\n                  },\n                },\n              })\n            }\n\n            schemaMap.set(`lexical_inline_blocks.${block.slug}.fields`, {\n              fields: blockFields,\n            })\n\n            schemaMap.set(`lexical_inline_blocks.${block.slug}`, {\n              name: `lexical_inline_blocks_${block.slug}`,\n              type: 'blocks',\n              blocks: [block],\n            })\n          }\n        }\n\n        return schemaMap\n      },\n      i18n,\n      markdownTransformers: getBlockMarkdownTransformers({\n        blocks: blockConfigs,\n        inlineBlocks: inlineBlockConfigs,\n      }),\n\n      nodes: [\n        createNode({\n          jsonSchema: blockConfigs.length ? createBlockNodeJSONSchema(blockConfigs) : undefined,\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (!blockConfigs.length) {\n                return []\n              }\n              return [\n                {\n                  name: 'lexical_blocks',\n                  type: 'blocks',\n                  blocks: blockConfigs,\n                },\n              ]\n            }\n\n            const blockType = node.fields.blockType\n            const block = blockConfigs.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(blockConfigs)],\n          node: ServerBlockNode,\n          validations: [blockValidationHOC(blockConfigs)],\n        }),\n        createNode({\n          jsonSchema: inlineBlockConfigs.length\n            ? createInlineBlockNodeJSONSchema(inlineBlockConfigs)\n            : undefined,\n          // @ts-expect-error - TODO: fix this\n          getSubFields: ({ node }) => {\n            if (!node) {\n              if (!inlineBlockConfigs.length) {\n                return []\n              }\n              return [\n                {\n                  name: 'lexical_inline_blocks',\n                  type: 'blocks',\n                  blocks: inlineBlockConfigs,\n                },\n              ]\n            }\n\n            const blockType = node.fields.blockType\n            const block = inlineBlockConfigs.find((block) => block.slug === blockType)\n            return block?.fields\n          },\n          getSubFieldsData: ({ node }) => {\n            return node?.fields\n          },\n          graphQLPopulationPromises: [blockPopulationPromiseHOC(inlineBlockConfigs)],\n          node: ServerInlineBlockNode,\n          validations: [blockValidationHOC(inlineBlockConfigs)],\n        }),\n      ],\n      sanitizedServerFeatureProps: _props,\n    }\n  },\n  key: 'blocks',\n})\n\n/**\n * Props for the client components provided to `admin.components.Block` of lexical blocks.\n */\nexport type LexicalBlockClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Block` of lexical blocks.\n */\nexport type LexicalBlockServerProps = UIFieldServerProps\n\n/**\n * Props for the client components provided to `admin.components.Label` of lexical blocks.\n */\nexport type LexicalBlockLabelClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Label` of lexical blocks.\n */\nexport type LexicalBlockLabelServerProps = UIFieldServerProps\n\n/**\n * Props for the client components provided to `admin.components.Block` of lexical inline blocks.\n */\nexport type LexicalInlineBlockClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Block` of lexical inline blocks.\n */\nexport type LexicalInlineBlockServerProps = UIFieldServerProps\n\n/**\n * Props for the client components provided to `admin.components.Label` of lexical inline blocks.\n */\nexport type LexicalInlineBlockLabelClientProps = UIFieldClientProps\n/**\n * Props for the server components provided to `admin.components.Label` of lexical inline blocks.\n */\nexport type LexicalInlineBlockLabelServerProps = UIFieldServerProps\n"],"mappings":"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","ignoreList":[]}

package/dist/features/blocks/server/markdown/markdownTransformer.d.ts

@@ -1,6 +1,6 @@
 import type { Block } from 'payload';
+import { type MultilineElementTransformer, type TextMatchTransformer, type Transformer } from '@lexical/markdown';
 import type { NodeWithHooks } from '../../../typesServer.js';
-import { type MultilineElementTransformer, type TextMatchTransformer, type Transformer } from '../../../../packages/@lexical/markdown/index.js';
 export declare function createTagRegexes(tagName: string): {
     regExpEnd: RegExp;
     regExpStart: RegExp;

package/dist/features/blocks/server/markdown/markdownTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdownTransformer.d.ts","sourceRoot":"","sources":["../../../../../src/features/blocks/server/markdown/markdownTransformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIpC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAG5D,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,oBAAoB,EACzB,KAAK,WAAW,EACjB,MAAM,iDAAiD,CAAA;AAaxD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;EAiB/C;AACD,eAAO,MAAM,4BAA4B,8BAGtC;IACD,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,YAAY,EAAE,KAAK,EAAE,CAAA;CACtB,KAAG,CAAC,CAAC,KAAK,EAAE;IACX,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IAC9B,eAAe,EAAE,WAAW,EAAE,CAAA;CAC/B,KAAK,2BAA2B,GAAG,oBAAoB,CAAC,EA+BxD,CAAA"}
+{"version":3,"file":"markdownTransformer.d.ts","sourceRoot":"","sources":["../../../../../src/features/blocks/server/markdown/markdownTransformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,oBAAoB,EACzB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAA;AAG1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAe5D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;EAiB/C;AACD,eAAO,MAAM,4BAA4B,GAAI,2BAG1C;IACD,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,YAAY,EAAE,KAAK,EAAE,CAAA;CACtB,KAAG,CAAC,CAAC,KAAK,EAAE;IACX,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,CAAA;IAC9B,eAAe,EAAE,WAAW,EAAE,CAAA;CAC/B,KAAK,2BAA2B,GAAG,oBAAoB,CAAC,EA+BxD,CAAA"}

package/dist/features/blocks/server/markdown/markdownTransformer.js

@@ -276,8 +276,8 @@ function getMarkdownTransformerForBlock(block, isInlineBlock) {
         return [false, startLineIndex];
       }
       const node = $createServerBlockNode({
-        blockType: block.slug,
-        ...blockFields
+        ...blockFields,
+        blockType: block.slug
       });
       if (node) {
         // Now handle beforeStartLine and afterEndLine. If those are not empty, we need to add them as text nodes before and after the block node.
@@ -351,8 +351,8 @@ function getMarkdownTransformerForBlock(block, isInlineBlock) {
           return false;
         }
         const node = $createServerBlockNode({
-          blockType: block.slug,
-          ...blockFields
+          ...blockFields,
+          blockType: block.slug
         });
         if (node) {
           rootNode.append(node);