npm - @gravity-ui/markdown-editor - Versions diffs - 15.37.0 → 15.38.0 - Mend

@gravity-ui/markdown-editor 15.37.0 → 15.38.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (129) hide show

package/build/cjs/extensions/markdown/Heading/index.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Heading = exports.HeadingAction = exports.headingType = exports.headingNodeName = void 0;
-const prosemirror_commands_1 = require("prosemirror-commands");
 const keymap_1 = require("../../../utils/keymap.js");
 const HeadingSpecs_1 = require("./HeadingSpecs/index.js");
 const actions_1 = require("./actions.js");
@@ -16,22 +15,21 @@ Object.defineProperty(exports, "HeadingAction", { enumerable: true, get: functio
 const Heading = (builder, opts) => {
     builder.use(HeadingSpecs_1.HeadingSpecs, opts);
     builder
-        .addKeymap(({ schema }) => {
+        .addKeymap(() => {
         const { h1Key, h2Key, h3Key, h4Key, h5Key, h6Key } = opts ?? {};
-        const cmd4lvl = (level) => (0, prosemirror_commands_1.setBlockType)((0, HeadingSpecs_1.headingType)(schema), { [const_1.headingLevelAttr]: level });
         const bindings = { Backspace: commands_1.resetHeading };
         if (h1Key)
-            bindings[h1Key] = (0, keymap_1.withLogAction)('heading1', cmd4lvl(1));
+            bindings[h1Key] = (0, keymap_1.withLogAction)('heading1', (0, commands_1.toHeading)(1));
         if (h2Key)
-            bindings[h2Key] = (0, keymap_1.withLogAction)('heading2', cmd4lvl(2));
+            bindings[h2Key] = (0, keymap_1.withLogAction)('heading2', (0, commands_1.toHeading)(2));
         if (h3Key)
-            bindings[h3Key] = (0, keymap_1.withLogAction)('heading3', cmd4lvl(3));
+            bindings[h3Key] = (0, keymap_1.withLogAction)('heading3', (0, commands_1.toHeading)(3));
         if (h4Key)
-            bindings[h4Key] = (0, keymap_1.withLogAction)('heading4', cmd4lvl(4));
+            bindings[h4Key] = (0, keymap_1.withLogAction)('heading4', (0, commands_1.toHeading)(4));
         if (h5Key)
-            bindings[h5Key] = (0, keymap_1.withLogAction)('heading5', cmd4lvl(5));
+            bindings[h5Key] = (0, keymap_1.withLogAction)('heading5', (0, commands_1.toHeading)(5));
         if (h6Key)
-            bindings[h6Key] = (0, keymap_1.withLogAction)('heading6', cmd4lvl(6));
+            bindings[h6Key] = (0, keymap_1.withLogAction)('heading6', (0, commands_1.toHeading)(6));
         return bindings;
     })
         .addInputRules(({ schema }) => ({ rules: [(0, utils_1.headingRule)((0, HeadingSpecs_1.headingType)(schema), 6)] }));

package/build/cjs/extensions/markdown/Heading/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"../../../../../src","sources":["extensions/markdown/Heading/index.ts"],"names":[],"mappings":";;;~~AAAA,+DAAkD;AAGlD~~,qDAAoD;AAEpD,0DAAmF;AACnF,0CAAwC;AACxC,~~4CAAwC~~;~~AACxC~~,~~sCAA2E~~;~~AAC3E~~,sCAAoC;AAEpC,wDAA4D;AAApD,+GAAA,eAAe,OAAA;AAAE,2GAAA,WAAW,OAAA;AACpC,oCAAsC;AAA9B,sGAAA,aAAa,OAAA;AAWd,MAAM,OAAO,GAAkC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IACpE,OAAO,CAAC,GAAG,CAAC,2BAAY,EAAE,IAAI,CAAC,CAAC;IAEhC,OAAO;SACF,SAAS,CAAC,~~CAAC~~,~~EAAC,MAAM,EAAC,~~EAAE~~,EAAE~~;~~QACpB~~,MAAM,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,GAAG,IAAI,IAAI,EAAE,CAAC;~~QAC9D~~,MAAM,~~OAAO,GAAG,CAAC,KAAmB,EAAE,EAAE,CACpC,IAAA,mCAAY,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,EAAC,CAAC,wBAAgB,CAAC,EAAE,KAAK,EAAC,CAAC,CAAC;QAEnE,MAAM,~~QAAQ,GAAW,EAAC,SAAS,EAAE,uBAAY,EAAC,CAAC;QACnD,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,~~OAAO~~,~~CAAC~~,CAAC,CAAC,CAAC,CAAC;~~QACnE~~,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,~~OAAO~~,~~CAAC~~,CAAC,CAAC,CAAC,CAAC;~~QACnE~~,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,~~OAAO~~,~~CAAC~~,CAAC,CAAC,CAAC,CAAC;~~QACnE~~,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,~~OAAO~~,~~CAAC~~,CAAC,CAAC,CAAC,CAAC;~~QACnE~~,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,~~OAAO~~,~~CAAC~~,CAAC,CAAC,CAAC,CAAC;~~QACnE~~,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,~~OAAO~~,~~CAAC~~,CAAC,CAAC,CAAC,CAAC;~~QACnE~~,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;SACD,aAAa,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,KAAK,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;IAEnF,OAAO;SACF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC,CAAC;~~AA3BW~~,QAAA,OAAO,~~WA2BlB~~","sourcesContent":["import ~~{setBlockType} from 'prosemirror-commands';\n\nimport~~ type {Action, ExtensionAuto, Keymap} from '../../../core';\nimport {withLogAction} from '../../../utils/keymap';\n\nimport {HeadingSpecs, type HeadingSpecsOptions, headingType} from './HeadingSpecs';\nimport {headingAction} from './actions';\nimport {resetHeading} from './commands';\nimport {HeadingAction~~, type HeadingLevel, headingLevelAttr~~} from './const';\nimport {headingRule} from './utils';\n\nexport {headingNodeName, headingType} from './HeadingSpecs';\nexport {HeadingAction} from './const';\n\nexport type HeadingOptions = HeadingSpecsOptions & {\n h1Key?: string \| null;\n h2Key?: string \| null;\n h3Key?: string \| null;\n h4Key?: string \| null;\n h5Key?: string \| null;\n h6Key?: string \| null;\n};\n\nexport const Heading: ExtensionAuto<HeadingOptions> = (builder, opts) => {\n builder.use(HeadingSpecs, opts);\n\n builder\n .addKeymap((~~{schema}~~) => {\n const {h1Key, h2Key, h3Key, h4Key, h5Key, h6Key} = opts ?? {};\n ~~const cmd4lvl = (level: HeadingLevel) =>\n setBlockType(headingType(schema), {[headingLevelAttr]: level});\n~~\n const bindings: Keymap = {Backspace: resetHeading};\n if (h1Key) bindings[h1Key] = withLogAction('heading1', ~~cmd4lvl~~(1));\n if (h2Key) bindings[h2Key] = withLogAction('heading2', ~~cmd4lvl~~(2));\n if (h3Key) bindings[h3Key] = withLogAction('heading3', ~~cmd4lvl~~(3));\n if (h4Key) bindings[h4Key] = withLogAction('heading4', ~~cmd4lvl~~(4));\n if (h5Key) bindings[h5Key] = withLogAction('heading5', ~~cmd4lvl~~(5));\n if (h6Key) bindings[h6Key] = withLogAction('heading6', ~~cmd4lvl~~(6));\n return bindings;\n })\n .addInputRules(({schema}) => ({rules: [headingRule(headingType(schema), 6)]}));\n\n builder\n .addAction(HeadingAction.ToH1, ({schema}) => headingAction(headingType(schema), 1))\n .addAction(HeadingAction.ToH2, ({schema}) => headingAction(headingType(schema), 2))\n .addAction(HeadingAction.ToH3, ({schema}) => headingAction(headingType(schema), 3))\n .addAction(HeadingAction.ToH4, ({schema}) => headingAction(headingType(schema), 4))\n .addAction(HeadingAction.ToH5, ({schema}) => headingAction(headingType(schema), 5))\n .addAction(HeadingAction.ToH6, ({schema}) => headingAction(headingType(schema), 6));\n};\n\ndeclare global {\n namespace WysiwygEditor {\n interface Actions {\n [HeadingAction.ToH1]: Action;\n [HeadingAction.ToH2]: Action;\n [HeadingAction.ToH3]: Action;\n [HeadingAction.ToH4]: Action;\n [HeadingAction.ToH5]: Action;\n [HeadingAction.ToH6]: Action;\n }\n }\n}\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"../../../../../src","sources":["extensions/markdown/Heading/index.ts"],"names":[],"mappings":";;;AACA,qDAAoD;AAEpD,0DAAmF;AACnF,0CAAwC;AACxC,4CAAmD;AACnD,sCAAsC;AACtC,sCAAoC;AAEpC,wDAA4D;AAApD,+GAAA,eAAe,OAAA;AAAE,2GAAA,WAAW,OAAA;AACpC,oCAAsC;AAA9B,sGAAA,aAAa,OAAA;AAWd,MAAM,OAAO,GAAkC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IACpE,OAAO,CAAC,GAAG,CAAC,2BAAY,EAAE,IAAI,CAAC,CAAC;IAEhC,OAAO;SACF,SAAS,CAAC,GAAG,EAAE;QACZ,MAAM,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QAE9D,MAAM,QAAQ,GAAW,EAAC,SAAS,EAAE,uBAAY,EAAC,CAAC;QACnD,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,IAAA,oBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,IAAA,oBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,IAAA,oBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,IAAA,oBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,IAAA,oBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,UAAU,EAAE,IAAA,oBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;SACD,aAAa,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,KAAK,EAAE,CAAC,IAAA,mBAAW,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;IAEnF,OAAO;SACF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SAClF,SAAS,CAAC,qBAAa,CAAC,IAAI,EAAE,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC,CAAC;AAzBW,QAAA,OAAO,WAyBlB","sourcesContent":["import type {Action, ExtensionAuto, Keymap} from '../../../core';\nimport {withLogAction} from '../../../utils/keymap';\n\nimport {HeadingSpecs, type HeadingSpecsOptions, headingType} from './HeadingSpecs';\nimport {headingAction} from './actions';\nimport {resetHeading, toHeading} from './commands';\nimport {HeadingAction} from './const';\nimport {headingRule} from './utils';\n\nexport {headingNodeName, headingType} from './HeadingSpecs';\nexport {HeadingAction} from './const';\n\nexport type HeadingOptions = HeadingSpecsOptions & {\n h1Key?: string \| null;\n h2Key?: string \| null;\n h3Key?: string \| null;\n h4Key?: string \| null;\n h5Key?: string \| null;\n h6Key?: string \| null;\n};\n\nexport const Heading: ExtensionAuto<HeadingOptions> = (builder, opts) => {\n builder.use(HeadingSpecs, opts);\n\n builder\n .addKeymap(() => {\n const {h1Key, h2Key, h3Key, h4Key, h5Key, h6Key} = opts ?? {};\n\n const bindings: Keymap = {Backspace: resetHeading};\n if (h1Key) bindings[h1Key] = withLogAction('heading1', toHeading(1));\n if (h2Key) bindings[h2Key] = withLogAction('heading2', toHeading(2));\n if (h3Key) bindings[h3Key] = withLogAction('heading3', toHeading(3));\n if (h4Key) bindings[h4Key] = withLogAction('heading4', toHeading(4));\n if (h5Key) bindings[h5Key] = withLogAction('heading5', toHeading(5));\n if (h6Key) bindings[h6Key] = withLogAction('heading6', toHeading(6));\n return bindings;\n })\n .addInputRules(({schema}) => ({rules: [headingRule(headingType(schema), 6)]}));\n\n builder\n .addAction(HeadingAction.ToH1, ({schema}) => headingAction(headingType(schema), 1))\n .addAction(HeadingAction.ToH2, ({schema}) => headingAction(headingType(schema), 2))\n .addAction(HeadingAction.ToH3, ({schema}) => headingAction(headingType(schema), 3))\n .addAction(HeadingAction.ToH4, ({schema}) => headingAction(headingType(schema), 4))\n .addAction(HeadingAction.ToH5, ({schema}) => headingAction(headingType(schema), 5))\n .addAction(HeadingAction.ToH6, ({schema}) => headingAction(headingType(schema), 6));\n};\n\ndeclare global {\n namespace WysiwygEditor {\n interface Actions {\n [HeadingAction.ToH1]: Action;\n [HeadingAction.ToH2]: Action;\n [HeadingAction.ToH3]: Action;\n [HeadingAction.ToH4]: Action;\n [HeadingAction.ToH5]: Action;\n [HeadingAction.ToH6]: Action;\n }\n }\n}\n"]}

package/build/cjs/extensions/markdown/Lists/index.js CHANGED Viewed

@@ -39,6 +39,7 @@ const Lists = (builder, opts) => {
         Backspace: commands_1.joinPrevList,
     }), builder.Priority.Low);
     builder.use(inputrules_1.ListsInputRulesExtension, { bulletListInputRule: opts?.ulInputRules });
+    // Order matters: merge must run before collapse (see CollapseListsPlugin.ts)
     builder.addPlugin(MergeListsPlugin_1.mergeListsPlugin);
     builder.addPlugin(CollapseListsPlugin_1.collapseListsPlugin);
     builder

package/build/cjs/extensions/markdown/Lists/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"../../../../../src","sources":["extensions/markdown/Lists/index.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AAGpE,qDAAoD;AAEpD,sDAAgE;AAChE,0CAAkC;AAClC,4CAA6F;AAC7F,sCAAmC;AACnC,gDAAmF;AACnF,0EAAkE;AAClE,oEAA4D;AAE5D,oDAAyE;AAAjE,sGAAA,QAAQ,OAAA;AAAE,uGAAA,SAAS,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,oGAAA,MAAM,OAAA;AAQ5C,MAAM,KAAK,GAAgC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAChE,OAAO,CAAC,GAAG,CAAC,uBAAU,CAAC,CAAC;IAExB,OAAO,CAAC,SAAS,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE;QAC3B,MAAM,EAAC,KAAK,EAAE,KAAK,EAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAW,EAAE,CAAC;QAC5B,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,IAAA,iBAAM,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjF,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,aAAa,EAAE,IAAA,iBAAM,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAElF,OAAO;YACH,GAAG,EAAE,IAAA,mCAAwB,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YAC7C,WAAW,EAAE,IAAA,sCAAY,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YACzC,SAAS,EAAE,IAAA,4BAAiB,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YAE5C,OAAO,EAAE,IAAA,sCAAY,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YACrC,OAAO,EAAE,IAAA,mCAAwB,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YAEjD,GAAG,QAAQ;SACd,CAAC;IACN,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1B,OAAO,CAAC,SAAS,CACb,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,CAAC;QACX,KAAK,EAAE,IAAA,uCAAa,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;QACpC,SAAS,EAAE,uBAAY;KAC1B,CAAC,EACF,OAAO,CAAC,QAAQ,CAAC,GAAG,CACvB,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,qCAAwB,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAE,YAAY,EAAC,CAAC,CAAC;IAEjF,OAAO,CAAC,SAAS,CAAC,mCAAgB,CAAC,CAAC;~~IAEpC~~,OAAO,CAAC,SAAS,CAAC,yCAAmB,CAAC,CAAC;IAEvC,OAAO;SACF,SAAS,CAAC,kBAAU,CAAC,YAAY,EAAE,iBAAO,CAAC,YAAY,CAAC;SACxD,SAAS,CAAC,kBAAU,CAAC,aAAa,EAAE,iBAAO,CAAC,aAAa,CAAC;SAC1D,SAAS,CAAC,kBAAU,CAAC,YAAY,EAAE,iBAAO,CAAC,YAAY,CAAC;SACxD,SAAS,CAAC,kBAAU,CAAC,YAAY,EAAE,iBAAO,CAAC,YAAY,CAAC,CAAC;AAClE,CAAC,CAAC;AAxCW,QAAA,KAAK,SAwChB","sourcesContent":["import {liftListItem, splitListItem} from 'prosemirror-schema-list';\n\nimport type {Action, ExtensionAuto, Keymap} from '../../../core';\nimport {withLogAction} from '../../../utils/keymap';\n\nimport {ListsSpecs, blType, liType, olType} from './ListsSpecs';\nimport {actions} from './actions';\nimport {joinPrevList, liftEmptyListItem, sinkOnlySelectedListItem, toList} from './commands';\nimport {ListAction} from './const';\nimport {ListsInputRulesExtension, type ListsInputRulesOptions} from './inputrules';\nimport {collapseListsPlugin} from './plugins/CollapseListsPlugin';\nimport {mergeListsPlugin} from './plugins/MergeListsPlugin';\n\nexport {ListNode, ListsAttr, blType, liType, olType} from './ListsSpecs';\n\nexport type ListsOptions = {\n ulKey?: string \| null;\n olKey?: string \| null;\n ulInputRules?: ListsInputRulesOptions['bulletListInputRule'];\n};\n\nexport const Lists: ExtensionAuto<ListsOptions> = (builder, opts) => {\n builder.use(ListsSpecs);\n\n builder.addKeymap(({schema}) => {\n const {ulKey, olKey} = opts ?? {};\n const bindings: Keymap = {};\n if (ulKey) bindings[ulKey] = withLogAction('bulletList', toList(blType(schema)));\n if (olKey) bindings[olKey] = withLogAction('orderedList', toList(olType(schema)));\n\n return {\n Tab: sinkOnlySelectedListItem(liType(schema)),\n 'Shift-Tab': liftListItem(liType(schema)),\n Backspace: liftEmptyListItem(liType(schema)),\n\n 'Mod-[': liftListItem(liType(schema)),\n 'Mod-]': sinkOnlySelectedListItem(liType(schema)),\n\n ...bindings,\n };\n }, builder.Priority.High);\n\n builder.addKeymap(\n ({schema}) => ({\n Enter: splitListItem(liType(schema)),\n Backspace: joinPrevList,\n }),\n builder.Priority.Low,\n );\n\n builder.use(ListsInputRulesExtension, {bulletListInputRule: opts?.ulInputRules});\n\n builder.addPlugin(mergeListsPlugin);\n\n builder.addPlugin(collapseListsPlugin);\n\n builder\n .addAction(ListAction.ToBulletList, actions.toBulletList)\n .addAction(ListAction.ToOrderedList, actions.toOrderedList)\n .addAction(ListAction.SinkListItem, actions.sinkListItem)\n .addAction(ListAction.LiftListItem, actions.liftListItem);\n};\n\ndeclare global {\n namespace WysiwygEditor {\n interface Actions {\n [ListAction.ToBulletList]: Action;\n [ListAction.ToOrderedList]: Action;\n [ListAction.SinkListItem]: Action;\n [ListAction.LiftListItem]: Action;\n }\n }\n}\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"../../../../../src","sources":["extensions/markdown/Lists/index.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AAGpE,qDAAoD;AAEpD,sDAAgE;AAChE,0CAAkC;AAClC,4CAA6F;AAC7F,sCAAmC;AACnC,gDAAmF;AACnF,0EAAkE;AAClE,oEAA4D;AAE5D,oDAAyE;AAAjE,sGAAA,QAAQ,OAAA;AAAE,uGAAA,SAAS,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,oGAAA,MAAM,OAAA;AAQ5C,MAAM,KAAK,GAAgC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;IAChE,OAAO,CAAC,GAAG,CAAC,uBAAU,CAAC,CAAC;IAExB,OAAO,CAAC,SAAS,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE;QAC3B,MAAM,EAAC,KAAK,EAAE,KAAK,EAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAW,EAAE,CAAC;QAC5B,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,IAAA,iBAAM,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjF,IAAI,KAAK;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAa,EAAC,aAAa,EAAE,IAAA,iBAAM,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAElF,OAAO;YACH,GAAG,EAAE,IAAA,mCAAwB,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YAC7C,WAAW,EAAE,IAAA,sCAAY,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YACzC,SAAS,EAAE,IAAA,4BAAiB,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YAE5C,OAAO,EAAE,IAAA,sCAAY,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YACrC,OAAO,EAAE,IAAA,mCAAwB,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;YAEjD,GAAG,QAAQ;SACd,CAAC;IACN,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1B,OAAO,CAAC,SAAS,CACb,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,CAAC;QACX,KAAK,EAAE,IAAA,uCAAa,EAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC;QACpC,SAAS,EAAE,uBAAY;KAC1B,CAAC,EACF,OAAO,CAAC,QAAQ,CAAC,GAAG,CACvB,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,qCAAwB,EAAE,EAAC,mBAAmB,EAAE,IAAI,EAAE,YAAY,EAAC,CAAC,CAAC;IAEjF,6EAA6E;IAC7E,OAAO,CAAC,SAAS,CAAC,mCAAgB,CAAC,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC,yCAAmB,CAAC,CAAC;IAEvC,OAAO;SACF,SAAS,CAAC,kBAAU,CAAC,YAAY,EAAE,iBAAO,CAAC,YAAY,CAAC;SACxD,SAAS,CAAC,kBAAU,CAAC,aAAa,EAAE,iBAAO,CAAC,aAAa,CAAC;SAC1D,SAAS,CAAC,kBAAU,CAAC,YAAY,EAAE,iBAAO,CAAC,YAAY,CAAC;SACxD,SAAS,CAAC,kBAAU,CAAC,YAAY,EAAE,iBAAO,CAAC,YAAY,CAAC,CAAC;AAClE,CAAC,CAAC;AAxCW,QAAA,KAAK,SAwChB","sourcesContent":["import {liftListItem, splitListItem} from 'prosemirror-schema-list';\n\nimport type {Action, ExtensionAuto, Keymap} from '../../../core';\nimport {withLogAction} from '../../../utils/keymap';\n\nimport {ListsSpecs, blType, liType, olType} from './ListsSpecs';\nimport {actions} from './actions';\nimport {joinPrevList, liftEmptyListItem, sinkOnlySelectedListItem, toList} from './commands';\nimport {ListAction} from './const';\nimport {ListsInputRulesExtension, type ListsInputRulesOptions} from './inputrules';\nimport {collapseListsPlugin} from './plugins/CollapseListsPlugin';\nimport {mergeListsPlugin} from './plugins/MergeListsPlugin';\n\nexport {ListNode, ListsAttr, blType, liType, olType} from './ListsSpecs';\n\nexport type ListsOptions = {\n ulKey?: string \| null;\n olKey?: string \| null;\n ulInputRules?: ListsInputRulesOptions['bulletListInputRule'];\n};\n\nexport const Lists: ExtensionAuto<ListsOptions> = (builder, opts) => {\n builder.use(ListsSpecs);\n\n builder.addKeymap(({schema}) => {\n const {ulKey, olKey} = opts ?? {};\n const bindings: Keymap = {};\n if (ulKey) bindings[ulKey] = withLogAction('bulletList', toList(blType(schema)));\n if (olKey) bindings[olKey] = withLogAction('orderedList', toList(olType(schema)));\n\n return {\n Tab: sinkOnlySelectedListItem(liType(schema)),\n 'Shift-Tab': liftListItem(liType(schema)),\n Backspace: liftEmptyListItem(liType(schema)),\n\n 'Mod-[': liftListItem(liType(schema)),\n 'Mod-]': sinkOnlySelectedListItem(liType(schema)),\n\n ...bindings,\n };\n }, builder.Priority.High);\n\n builder.addKeymap(\n ({schema}) => ({\n Enter: splitListItem(liType(schema)),\n Backspace: joinPrevList,\n }),\n builder.Priority.Low,\n );\n\n builder.use(ListsInputRulesExtension, {bulletListInputRule: opts?.ulInputRules});\n\n // Order matters: merge must run before collapse (see CollapseListsPlugin.ts)\n builder.addPlugin(mergeListsPlugin);\n builder.addPlugin(collapseListsPlugin);\n\n builder\n .addAction(ListAction.ToBulletList, actions.toBulletList)\n .addAction(ListAction.ToOrderedList, actions.toOrderedList)\n .addAction(ListAction.SinkListItem, actions.sinkListItem)\n .addAction(ListAction.LiftListItem, actions.liftListItem);\n};\n\ndeclare global {\n namespace WysiwygEditor {\n interface Actions {\n [ListAction.ToBulletList]: Action;\n [ListAction.ToOrderedList]: Action;\n [ListAction.SinkListItem]: Action;\n [ListAction.LiftListItem]: Action;\n }\n }\n}\n"]}

package/build/cjs/extensions/markdown/Lists/plugins/CollapseListsPlugin.d.ts CHANGED Viewed

@@ -1,4 +1,16 @@
 import { Plugin, type Transaction } from 'prosemirror-state';
-import { findChildren } from 'prosemirror-utils';
+/**
+ * Collapses redundant nested lists inside list items
+ *
+ * Converts structures where a list item starts with
+ * a nested list into a flat list structure
+ *
+ * IMPORTANT: must be registered AFTER MergeListsPlugin.
+ * Collapsing may create adjacent lists that require merging
+ */
 export declare const collapseListsPlugin: () => Plugin<any>;
-export declare function collapseEmptyListItems(tr: Transaction, nodes: ReturnType<typeof findChildren>): number;
+/**
+ * Finds list items with redundant nesting, collapses them recursively,
+ * and applies replacements in reverse document order
+ */
+export declare function collapseAllNestedListItems(tr: Transaction): number | null;

package/build/cjs/extensions/markdown/Lists/plugins/CollapseListsPlugin.js CHANGED Viewed

@@ -1,76 +1,122 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collapseListsPlugin = void 0;
-exports.collapseEmptyListItems = collapseEmptyListItems;
+exports.collapseAllNestedListItems = collapseAllNestedListItems;
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_state_1 = require("prosemirror-state");
 // @ts-ignore // TODO: fix cjs build
 const prosemirror_utils_1 = require("prosemirror-utils");
-const utils_1 = require("../../../../utils/index.js");
-const utils_2 = require("../utils.js");
+const utils_1 = require("../utils.js");
+const MAX_COLLAPSE_DEPTH = 100;
+/**
+ * Collapses redundant nested lists inside list items
+ *
+ * Converts structures where a list item starts with
+ * a nested list into a flat list structure
+ *
+ * IMPORTANT: must be registered AFTER MergeListsPlugin.
+ * Collapsing may create adjacent lists that require merging
+ */
 const collapseListsPlugin = () => new prosemirror_state_1.Plugin({
     appendTransaction(trs, oldState, newState) {
+        // early exit if document unchanged
         const docChanged = trs.some((tr) => tr.docChanged);
-        if (!docChanged)
+        if (!docChanged) {
             return null;
-        const hasParentList = (0, prosemirror_utils_1.hasParentNode)(utils_2.isListNode)(newState.selection) ||
-            (0, prosemirror_utils_1.hasParentNode)(utils_2.isListNode)(oldState.selection);
-        if (!hasParentList)
+        }
+        // early exit if not inside a list
+        const hasParentList = (0, prosemirror_utils_1.hasParentNode)(utils_1.isListNode)(newState.selection) ||
+            (0, prosemirror_utils_1.hasParentNode)(utils_1.isListNode)(oldState.selection);
+        if (!hasParentList) {
             return null;
+        }
         const { tr } = newState;
-        let prevStepsCount = -1;
-        let currentStepsCount = 0;
-        // execute until there are no nested lists.
-        while (prevStepsCount !== currentStepsCount) {
-            const listNodes = (0, prosemirror_utils_1.findChildren)(tr.doc, utils_2.isListNode, true);
-            prevStepsCount = currentStepsCount;
-            currentStepsCount = collapseEmptyListItems(tr, listNodes);
+        // collapse of redundant nested lists
+        const lastCollapsePos = collapseAllNestedListItems(tr);
+        // restore cursor position
+        if (lastCollapsePos !== null) {
+            const clampedPos = Math.min(lastCollapsePos, tr.doc.content.size);
+            tr.setSelection(prosemirror_state_1.Selection.near(tr.doc.resolve(clampedPos)));
         }
         return tr.docChanged ? tr : null;
     },
 });
 exports.collapseListsPlugin = collapseListsPlugin;
-function collapseEmptyListItems(tr, nodes) {
-    const stepsCountBefore = tr.steps.length;
-    // TODO: fix cjs build
-    nodes.reverse().forEach((list) => {
-        const listNode = list.node;
-        const listPos = list.pos;
-        const childrenOfList = (0, utils_1.getChildrenOfNode)(listNode).reverse();
-        childrenOfList.forEach(({ node: itemNode, offset }) => {
-            if ((0, utils_2.isListItemNode)(itemNode)) {
-                const { firstChild } = itemNode;
-                const listItemNodePos = listPos + 1 + offset;
-                // if the first child of a list element is a list,
-                // then collapse is required
-                if (firstChild && (0, utils_2.isListNode)(firstChild)) {
-                    const nestedList = firstChild.content;
-                    // nodes at the same level as the list
-                    const remainingNodes = itemNode.content.content.slice(1);
-                    const listItems = remainingNodes.length
-                        ? nestedList.append(prosemirror_model_1.Fragment.from((0, utils_2.liType)(tr.doc.type.schema).create(null, remainingNodes)))
-                        : nestedList;
-                    const mappedStart = tr.mapping.map(listItemNodePos);
-                    const mappedEnd = tr.mapping.map(listItemNodePos + itemNode.nodeSize);
-                    tr.replaceWith(mappedStart, mappedEnd, listItems);
-                    const closestTextNodePos = findClosestTextNodePos(tr.doc, mappedStart + nestedList.size);
-                    if (closestTextNodePos) {
-                        tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, closestTextNodePos));
-                    }
-                }
-            }
+/**
+ * Finds list items with redundant nesting, collapses them recursively,
+ * and applies replacements in reverse document order
+ */
+function collapseAllNestedListItems(tr) {
+    const replacements = [];
+    const schema = tr.doc.type.schema;
+    // skipUntil prevents re-processing children that were already collapsed
+    // by the recursive call in collapseListItemContent
+    let skipUntil = -1;
+    tr.doc.descendants((node, pos) => {
+        if (pos < skipUntil || node.isTextblock) {
+            return false;
+        }
+        if (!(0, utils_1.isListItemNode)(node)) {
+            return true;
+        }
+        const { firstChild } = node;
+        if (!firstChild || !(0, utils_1.isListNode)(firstChild)) {
+            return true;
+        }
+        const collapsedContent = collapseListItemContent(node, schema, 0);
+        if (collapsedContent === null) {
+            return true;
+        }
+        replacements.push({
+            from: pos,
+            to: pos + node.nodeSize,
+            content: collapsedContent,
         });
+        skipUntil = pos + node.nodeSize;
+        return false;
     });
-    return tr.steps.length - stepsCountBefore;
+    if (replacements.length === 0) {
+        return null;
+    }
+    // apply from end to start so earlier positions stay valid
+    for (let i = replacements.length - 1; i >= 0; i--) {
+        const { from, to, content } = replacements[i];
+        tr.replaceWith(from, to, content);
+    }
+    // map the original end of the last replacement to its post-edit position
+    const last = replacements[replacements.length - 1];
+    return tr.mapping.map(last.to);
 }
-function findClosestTextNodePos(doc, pos) {
-    while (pos < doc.content.size) {
-        const node = doc.nodeAt(pos);
-        if (node && node.isText) {
-            return pos;
+/**
+ * Recursively collapses a list item with redundant nesting
+ * into a Fragment of flat list items
+ *
+ * A redundantly nested list item has a list as its first child
+ * (instead of a paragraph)
+ */
+function collapseListItemContent(itemNode, schema, depth) {
+    const { firstChild } = itemNode;
+    if (!firstChild || !(0, utils_1.isListNode)(firstChild)) {
+        return null;
+    }
+    if (depth >= MAX_COLLAPSE_DEPTH) {
+        return null;
+    }
+    // .slice(1) = all children except firstChild
+    const remaining = itemNode.content.content.slice(1);
+    let result = prosemirror_model_1.Fragment.empty;
+    firstChild.forEach((child) => {
+        if ((0, utils_1.isListItemNode)(child)) {
+            const collapsed = collapseListItemContent(child, schema, depth + 1);
+            result = result.append(collapsed ?? prosemirror_model_1.Fragment.from(child));
+        }
+        else {
+            result = result.append(prosemirror_model_1.Fragment.from(child));
         }
-        pos++;
+    });
+    if (remaining.length) {
+        result = result.append(prosemirror_model_1.Fragment.from((0, utils_1.liType)(schema).create(null, remaining)));
     }
-    return null;
+    return result;
 }
 //# sourceMappingURL=CollapseListsPlugin.js.map

package/build/cjs/extensions/markdown/Lists/plugins/CollapseListsPlugin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CollapseListsPlugin.js","sourceRoot":"../../../../../../src","sources":["extensions/markdown/Lists/plugins/CollapseListsPlugin.ts"],"names":[],"mappings":";;;~~AAkCA~~,~~wDAkDC~~;~~AApFD~~,~~yDAAsD~~;~~AACtD~~,~~yDAA0E~~;~~AAC1E~~,oCAAoC;AACpC,~~yDAA8D~~;~~AAE9D~~,~~sDAAoD~~;~~AACpD~~,~~uCAA4D~~;~~AAErD~~,MAAM,mBAAmB,GAAG,GAAG,EAAE,CACpC,IAAI,0BAAM,CAAC;IACP,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ;QACrC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;~~YAAE~~,OAAO,IAAI,CAAC;~~QAE7B~~,MAAM,aAAa,GACf,IAAA,iCAAa,EAAC,kBAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC7C,IAAA,iCAAa,EAAC,kBAAU,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa;~~YAAE~~,OAAO,IAAI,CAAC;~~QAEhC~~,MAAM,EAAC,EAAE,EAAC,GAAG,QAAQ,CAAC;~~QACtB~~,~~IAAI~~,~~cAAc~~,GAAG,~~CAAC~~,CAAC,~~CAAC;QACxB~~,~~IAAI,iBAAiB,GAAG,~~CAAC,CAAC;~~QAE1B~~,~~2CAA2C~~;~~QAC3C~~,~~OAAO~~,~~cAAc~~,KAAK,~~iBAAiB~~,EAAE,CAAC;~~YAC1C~~,MAAM,~~SAAS~~,GAAG,~~IAAA~~,~~gCAAY~~,~~EAAC~~,EAAE,CAAC,GAAG,~~EAAE~~,~~kBAAU~~,~~EAAE~~,IAAI,CAAC,CAAC;~~YACzD~~,~~cAAc~~,~~GAAG~~,~~iBAAiB~~,CAAC~~;YACnC~~,~~iBAAiB~~,~~GAAG~~,~~sBAAsB~~,CAAC,EAAE,~~EAAE~~,~~SAAS~~,CAAC,CAAC;~~QAC9D~~,CAAC;QAED,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;CACJ,CAAC,CAAC;~~AAxBM~~,QAAA,mBAAmB,~~uBAwBzB~~;~~AAEP~~,SAAgB,~~sBAAsB~~,~~CAClC~~,EAAe,~~EACf~~,~~KAAsC~~;~~IAEtC~~,MAAM,~~gBAAgB~~,GAAG,EAAE,CAAC,~~KAAK~~,CAAC,MAAM,CAAC;~~IACzC~~,~~sBAAsB~~;~~IACtB~~,~~KAAK~~,CAAC,~~OAAO~~,EAAE,CAAC,~~OAAO~~,CAAC,CAAC,~~IAA+B~~,EAAE,EAAE;~~QACxD~~,~~MAAM~~,~~QAAQ~~,GAAG,IAAI,CAAC,~~IAAI~~,CAAC;~~QAC3B~~,~~MAAM,~~OAAO,~~GAAG~~,~~IAAI,~~CAAC,~~GAAG,~~CAAC;~~QACzB~~,~~MAAM~~,~~cAAc~~,~~GAAG,~~IAAA,~~yBAAiB~~,EAAC,~~QAAQ~~,CAAC,CAAC,OAAO,~~EAAE~~,CAAC;~~QAE7D~~,~~cAAc,~~CAAC,~~OAAO~~,~~CAAC~~,~~CAAC~~,EAAC,IAAI,~~EAAE~~,~~QAAQ~~,~~EAAE~~,~~MAAM~~,~~EAAC~~,~~EAAE~~,~~EAAE;YAChD,IAAI,~~IAAA,~~sBAAc~~,EAAC,~~QAAQ~~,CAAC,EAAE,CAAC;~~gBAC3B~~,~~MAAM~~,~~EAAC~~,~~UAAU~~,~~EAAC,GAAG,QAAQ,~~CAAC;~~gBAC9B~~,MAAM,~~eAAe~~,GAAG,~~OAAO~~,~~GAAG,~~CAAC,~~GAAG~~,MAAM,CAAC~~;gBAE7C~~,~~kDAAkD;gBAClD~~,~~4BAA4B~~;~~gBAC5B~~,IAAI,~~UAAU~~,IAAI,~~IAAA~~,~~kBAAU~~,~~EAAC~~,~~UAAU~~,CAAC,~~EAAE~~,CAAC;~~oBACvC~~,~~MAAM~~,~~UAAU~~,GAAG,~~UAAU~~,CAAC,OAAO,~~CAAC~~;~~oBAEtC~~,~~sCAAsC~~;~~oBACtC~~,~~MAAM~~,~~cAAc~~,GAAG,~~QAAQ~~,CAAC,~~OAAO~~,CAAC,OAAO,~~CAAC,~~KAAK,CAAC,CAAC,CAAC,CAAC;~~oBAEzD~~,MAAM,~~SAAS~~,~~GAAG~~,~~cAAc~~,CAAC,~~MAAM~~;~~wBACnC~~,CAAC,CAAC,~~UAAU~~,CAAC,MAAM,~~CACb~~,~~4BAAQ~~,CAAC,IAAI,~~CACT~~,~~IAAA~~,~~cAAM~~,~~EAAC~~,EAAE,CAAC,~~GAAG~~,~~CAAC~~,IAAI,CAAC,~~MAAM~~,CAAC,CAAC,~~MAAM~~,CAAC,IAAI,EAAE,~~cAAc~~,~~CAAC~~,~~CAC1D~~,~~CACJ;wBACH,~~CAAC,CAAC,~~UAAU,~~CAAC;~~oBAEjB~~,MAAM,~~WAAW~~,GAAG,~~EAAE~~,CAAC,~~OAAO~~,CAAC,GAAG,CAAC,~~eAAe,~~CAAC,CAAC;~~oBACpD~~,~~MAAM~~,~~SAAS,GAAG,~~EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,~~eAAe~~,~~GAAG~~,~~QAAQ~~,CAAC,~~QAAQ,~~CAAC,CAAC;~~oBAEtE~~,~~EAAE~~,~~CAAC~~,~~WAAW,~~CAAC,~~WAAW~~,EAAE,~~SAAS~~,EAAE,~~SAAS,CAAC,CAAC~~;~~oBAElD~~,MAAM,~~kBAAkB~~,GAAG,~~sBAAsB~~,~~CAC7C~~,~~EAAE~~,CAAC,~~GAAG~~,~~EACN~~,~~WAAW~~,~~GAAG~~,UAAU,CAAC,IAAI,~~CAChC~~,CAAC;~~oBACF~~,IAAI,kBAAkB,EAAE,CAAC;~~wBACrB~~,~~EAAE~~,CAAC,~~YAAY,~~CAAC,~~iCAAa~~,~~CAAC,~~MAAM,CAAC,~~EAAE~~,CAAC,~~GAAG~~,~~EAAE~~,~~kBAAkB~~,CAAC,CAAC,CAAC~~;oBACtE~~,CAAC;~~gBACL~~,CAAC~~;YACL~~,CAAC;~~QACL~~,CAAC,CAAC,CAAC;~~IACP~~,~~CAAC~~,CAAC,CAAC;~~IAEH~~,~~OAAO~~,~~EAAE~~,CAAC,KAAK,~~CAAC~~,MAAM,GAAG,~~gBAAgB~~,CAAC~~;AAC9C~~,CAAC;~~AAED~~,~~SAAS~~,~~sBAAsB~~,CAAC,~~GAAS~~,~~EAAE~~,~~GAAW;IAClD~~,~~OAAO~~,~~GAAG~~,~~GAAG~~,~~GAAG~~,CAAC,~~OAAO~~,CAAC,~~IAAI~~,~~EAAE~~,CAAC;~~QAC5B~~,MAAM,~~IAAI,~~GAAG,~~GAAG~~,CAAC,MAAM,CAAC,~~GAAG~~,CAAC,CAAC;~~QAC7B~~,~~IAAI~~,~~IAAI~~,~~IAAI~~,IAAI,CAAC,MAAM,EAAE,CAAC;~~YACtB~~,~~OAAO~~,GAAG,CAAC~~;QACf~~,CAAC~~;QACD~~,~~GAAG~~,EAAE,CAAC;~~IACV~~,CAAC;~~IACD~~,OAAO,~~IAAI~~,CAAC;~~AAChB~~,CAAC","sourcesContent":["import {Fragment, type Node} from 'prosemirror-model';\nimport {Plugin, ~~TextSelection~~, type Transaction} from 'prosemirror-state';\n// @ts-ignore // TODO: fix cjs build\nimport {~~findChildren,~~ hasParentNode} from 'prosemirror-utils';\n\nimport {~~getChildrenOfNode} from '../../../../utils';\nimport {~~isListItemNode, isListNode, liType} from '../utils';\n\nexport const collapseListsPlugin = () =>\n new Plugin({\n appendTransaction(trs, oldState, newState) {\n const docChanged = trs.some((tr) => tr.docChanged);\n if (!docChanged) return null;\n\n const hasParentList =\n hasParentNode(isListNode)(newState.selection) \|\|\n hasParentNode(isListNode)(oldState.selection);\n if (!hasParentList) return null;\n\n const {tr} = newState;\n ~~let~~ ~~prevStepsCount~~ = ~~-1;\~~n ~~let~~ ~~currentStepsCount~~ = 0;\n\n // ~~execute~~ ~~until~~ ~~there are no nested lists.\~~n ~~while~~ (~~prevStepsCount~~ !== ~~currentStepsCount~~) {\n const ~~listNodes~~ = ~~findChildren~~(tr.doc~~, isListNode, true~~);\n ~~prevStepsCount = currentStepsCount;\n currentStepsCount = collapseEmptyListItems~~(tr~~, listNodes~~);\n }\n\n return tr.docChanged ? tr : null;\n },\n });\n\~~nexport~~ ~~function~~ ~~collapseEmptyListItems(~~\n tr: ~~Transaction,\~~n ~~nodes~~: ~~ReturnType<typeof~~ ~~findChildren>,\~~n): number {\n const ~~stepsCountBefore~~ = tr.~~steps~~.~~length~~;\n // ~~TODO:~~ ~~fix~~ ~~cjs~~ ~~build~~\n ~~nodes~~.~~reverse()~~.~~forEach~~((~~list: {~~node: ~~Node;~~ pos~~: number}~~) => {\n ~~const~~ ~~listNode~~ = ~~list~~.node;\n const ~~listPos~~ = ~~list.pos~~;\n ~~const~~ ~~childrenOfList~~ = ~~getChildrenOfNode~~(~~listNode~~)~~.reverse(~~);\n\n ~~childrenOfList.forEach~~(({node: ~~itemNode~~, ~~offset}~~) => {\n if (~~isListItemNode(itemNode))~~ {\n ~~const~~ ~~{firstChild}~~ = ~~itemNode~~;\n ~~const~~ ~~listItemNodePos~~ = ~~listPos~~ + 1 ~~+ offset~~;\n\n // if ~~the~~ ~~first~~ ~~child~~ of a ~~list~~ ~~element~~ is a ~~list,\n //~~ ~~then~~ ~~collapse~~ is ~~required~~\n if (~~firstChild~~ && ~~isListNode(firstChild~~)) {\n const ~~nestedList~~ = ~~firstChild~~.content;\n\n // ~~nodes~~ at the ~~same~~ ~~level~~ as the ~~list~~\n const ~~remainingNodes~~ = ~~itemNode~~.~~content~~.~~content~~.~~slice~~(1);\n\n ~~const~~ ~~listItems~~ = ~~remainingNodes.length~~\n ? ~~nestedList.append(\n~~ Fragment~~.from(\n liType(tr.doc.type.schema).create(null,~~ ~~remainingNodes),\n ),\n )~~\n : ~~nestedList;\~~n~~\n const~~ ~~mappedStart~~ = ~~tr.mapping.map(listItemNodePos);\~~n ~~const~~ ~~mappedEnd~~ ~~= tr.mapping.map~~(~~listItemNodePos~~ + ~~itemNode.nodeSize~~)~~;\n~~\n ~~tr.replaceWith~~(~~mappedStart~~, ~~mappedEnd~~, ~~listItems~~)~~;\n~~\n const ~~closestTextNodePos~~ = ~~findClosestTextNodePos(\n tr.doc,\n mappedStart + nestedList.size,\n )~~;\n if (~~closestTextNodePos~~) {\n ~~tr.setSelection(TextSelection.create(tr.doc,~~ ~~closestTextNodePos))~~;\n }\n }\n ~~}\n~~ });\n }~~);\~~n\n ~~return~~ tr.~~steps.length~~ - ~~stepsCountBefore~~;\n}\n~~\nfunction~~ ~~findClosestTextNodePos(doc:~~ ~~Node,~~ ~~pos: number~~): ~~number~~ ~~\| null~~ {\n ~~while~~ (~~pos < doc.content.size~~) {\n const ~~node~~ = ~~doc.nodeAt~~(~~pos~~);\n if (~~node~~ && ~~node~~.~~isText~~) {\n ~~return~~ ~~pos~~;\n }\n ~~pos++;\~~n }\n return ~~null~~;\n}\n"]}
1	+ {"version":3,"file":"CollapseListsPlugin.js","sourceRoot":"../../../../../../src","sources":["extensions/markdown/Lists/plugins/CollapseListsPlugin.ts"],"names":[],"mappings":"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","sourcesContent":["import {Fragment, type Node, type Schema} from 'prosemirror-model';\nimport {Plugin, Selection, type Transaction} from 'prosemirror-state';\n// @ts-ignore // TODO: fix cjs build\nimport {hasParentNode} from 'prosemirror-utils';\n\nimport {isListItemNode, isListNode, liType} from '../utils';\n\nconst MAX_COLLAPSE_DEPTH = 100;\n\n/*\n Collapses redundant nested lists inside list items\n \n Converts structures where a list item starts with\n * a nested list into a flat list structure\n \n IMPORTANT: must be registered AFTER MergeListsPlugin.\n * Collapsing may create adjacent lists that require merging\n /\nexport const collapseListsPlugin = () =>\n new Plugin({\n appendTransaction(trs, oldState, newState) {\n // early exit if document unchanged\n const docChanged = trs.some((tr) => tr.docChanged);\n if (!docChanged) {\n return null;\n }\n\n // early exit if not inside a list\n const hasParentList =\n hasParentNode(isListNode)(newState.selection) \|\|\n hasParentNode(isListNode)(oldState.selection);\n if (!hasParentList) {\n return null;\n }\n\n const {tr} = newState;\n\n // collapse of redundant nested lists\n const lastCollapsePos = collapseAllNestedListItems(tr);\n\n // restore cursor position\n if (lastCollapsePos !== null) {\n const clampedPos = Math.min(lastCollapsePos, tr.doc.content.size);\n tr.setSelection(Selection.near(tr.doc.resolve(clampedPos)));\n }\n\n return tr.docChanged ? tr : null;\n },\n });\n\ninterface Replacement {\n from: number;\n to: number;\n content: Fragment;\n}\n\n/\n Finds list items with redundant nesting, collapses them recursively,\n * and applies replacements in reverse document order\n /\nexport function collapseAllNestedListItems(tr: Transaction): number \| null {\n const replacements: Replacement[] = [];\n const schema = tr.doc.type.schema;\n\n // skipUntil prevents re-processing children that were already collapsed\n // by the recursive call in collapseListItemContent\n let skipUntil = -1;\n\n tr.doc.descendants((node, pos) => {\n if (pos < skipUntil \|\| node.isTextblock) {\n return false;\n }\n\n if (!isListItemNode(node)) {\n return true;\n }\n\n const {firstChild} = node;\n if (!firstChild \|\| !isListNode(firstChild)) {\n return true;\n }\n\n const collapsedContent = collapseListItemContent(node, schema, 0);\n if (collapsedContent === null) {\n return true;\n }\n\n replacements.push({\n from: pos,\n to: pos + node.nodeSize,\n content: collapsedContent,\n });\n skipUntil = pos + node.nodeSize;\n\n return false;\n });\n\n if (replacements.length === 0) {\n return null;\n }\n\n // apply from end to start so earlier positions stay valid\n for (let i = replacements.length - 1; i >= 0; i--) {\n const {from, to, content} = replacements[i];\n tr.replaceWith(from, to, content);\n }\n\n // map the original end of the last replacement to its post-edit position\n const last = replacements[replacements.length - 1];\n return tr.mapping.map(last.to);\n}\n\n/\n Recursively collapses a list item with redundant nesting\n * into a Fragment of flat list items\n \n A redundantly nested list item has a list as its first child\n * (instead of a paragraph)\n */\nfunction collapseListItemContent(itemNode: Node, schema: Schema, depth: number): Fragment \| null {\n const {firstChild} = itemNode;\n if (!firstChild \|\| !isListNode(firstChild)) {\n return null;\n }\n if (depth >= MAX_COLLAPSE_DEPTH) {\n return null;\n }\n\n // .slice(1) = all children except firstChild\n const remaining = itemNode.content.content.slice(1);\n\n let result = Fragment.empty;\n firstChild.forEach((child) => {\n if (isListItemNode(child)) {\n const collapsed = collapseListItemContent(child, schema, depth + 1);\n result = result.append(collapsed ?? Fragment.from(child));\n } else {\n result = result.append(Fragment.from(child));\n }\n });\n\n if (remaining.length) {\n result = result.append(Fragment.from(liType(schema).create(null, remaining)));\n }\n\n return result;\n}\n"]}

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ export type { HeadingLevel } from "../../../markdown/Heading/const.js";
 export { headingLevelAttr, headingNodeName } from "../../../markdown/Heading/HeadingSpecs/index.js";
 export declare const YfmHeadingAttr: {
     readonly Level: "level";
-    readonly Id: "id";
     readonly DataLine: "data-line";
+    readonly Id: "id";
     readonly Folding: "folded";
 };

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.js CHANGED Viewed

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "headingLevelAttr", { enumerable: true, get: func
 Object.defineProperty(exports, "headingNodeName", { enumerable: true, get: function () { return HeadingSpecs_2.headingNodeName; } });
 exports.YfmHeadingAttr = {
     Level: HeadingSpecs_1.headingLevelAttr,
+    DataLine: HeadingSpecs_1.headingLineNumberAttr,
     Id: 'id',
-    DataLine: 'data-line',
-    Folding: 'folded',
+    Folding: 'folded', // TODO: move to FoldingHeadingExtension
 };
 //# sourceMappingURL=const.js.map

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/const.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"const.js","sourceRoot":"../../../../../../src","sources":["extensions/yfm/YfmHeading/YfmHeadingSpecs/const.ts"],"names":[],"mappings":";;;AAAA,~~kFAAwE~~;~~AAGxE~~,gFAAyF;AAAjF,gHAAA,gBAAgB,OAAA;AAAE,+GAAA,eAAe,OAAA;AAE5B,QAAA,cAAc,GAAG;IAC1B,KAAK,EAAE,+BAAgB;IACvB,~~EAAE~~,EAAE,~~IAAI~~;~~IACR~~,~~QAAQ~~,EAAE,~~WAAW~~;~~IACrB~~,OAAO,EAAE,QAAQ;~~CACX~~,CAAC","sourcesContent":["import {headingLevelAttr} from '../../../markdown/Heading/HeadingSpecs';\nexport type {HeadingLevel} from '../../../markdown/Heading/const';\n\nexport {headingLevelAttr, headingNodeName} from '../../../markdown/Heading/HeadingSpecs';\n\nexport const YfmHeadingAttr = {\n Level: headingLevelAttr,\n Id: ~~'id'~~,\n ~~DataLine~~: '~~data-line~~',\n Folding: 'folded',\n} as const;\n"]}
1	+ {"version":3,"file":"const.js","sourceRoot":"../../../../../../src","sources":["extensions/yfm/YfmHeading/YfmHeadingSpecs/const.ts"],"names":[],"mappings":";;;AAAA,kFAA+F;AAG/F,gFAAyF;AAAjF,gHAAA,gBAAgB,OAAA;AAAE,+GAAA,eAAe,OAAA;AAE5B,QAAA,cAAc,GAAG;IAC1B,KAAK,EAAE,+BAAgB;IACvB,QAAQ,EAAE,oCAAqB;IAC/B,EAAE,EAAE,IAAI;IACR,OAAO,EAAE,QAAQ,EAAE,wCAAwC;CACrD,CAAC","sourcesContent":["import {headingLevelAttr, headingLineNumberAttr} from '../../../markdown/Heading/HeadingSpecs';\nexport type {HeadingLevel} from '../../../markdown/Heading/const';\n\nexport {headingLevelAttr, headingNodeName} from '../../../markdown/Heading/HeadingSpecs';\n\nexport const YfmHeadingAttr = {\n Level: headingLevelAttr,\n DataLine: headingLineNumberAttr,\n Id: 'id',\n Folding: 'folded', // TODO: move to FoldingHeadingExtension\n} as const;\n"]}

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/index.d.ts CHANGED Viewed

@@ -1,11 +1,7 @@
 import type { ExtensionAuto } from "../../../../core/index.js";
-import type { NodeSpec } from "../../../../pm/model.js";
+import { type HeadingSpecsOptions } from "../../../markdown/Heading/HeadingSpecs/index.js";
 export { YfmHeadingAttr } from "./const.js";
-export type YfmHeadingSpecsOptions = {
-    /**
-     * @deprecated: use placeholder option in BehaviorPreset instead.
-     */
-    headingPlaceholder?: NonNullable<NodeSpec['placeholder']>['content'];
-};
+export { renderYfmHeadingAttributes, renderYfmHeadingMarkup } from "./utils.js";
+export type YfmHeadingSpecsOptions = HeadingSpecsOptions & {};
 /** YfmHeading extension needs markdown-it-attrs plugin */
 export declare const YfmHeadingSpecs: ExtensionAuto<YfmHeadingSpecsOptions>;

package/build/cjs/extensions/yfm/YfmHeading/YfmHeadingSpecs/index.js CHANGED Viewed

@@ -1,108 +1,90 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.YfmHeadingSpecs = exports.YfmHeadingAttr = void 0;
+exports.YfmHeadingSpecs = exports.renderYfmHeadingMarkup = exports.renderYfmHeadingAttributes = exports.YfmHeadingAttr = void 0;
+const HeadingSpecs_1 = require("../../../markdown/Heading/HeadingSpecs/index.js");
 const const_1 = require("./const.js");
 const heading_ids_1 = require("./markdown/heading-ids.js");
 const utils_1 = require("./utils.js");
-const DEFAULT_PLACEHOLDER = (node) => 'Heading ' + node.attrs[const_1.YfmHeadingAttr.Level];
 var const_2 = require("./const.js");
 Object.defineProperty(exports, "YfmHeadingAttr", { enumerable: true, get: function () { return const_2.YfmHeadingAttr; } });
+var utils_2 = require("./utils.js");
+Object.defineProperty(exports, "renderYfmHeadingAttributes", { enumerable: true, get: function () { return utils_2.renderYfmHeadingAttributes; } });
+Object.defineProperty(exports, "renderYfmHeadingMarkup", { enumerable: true, get: function () { return utils_2.renderYfmHeadingMarkup; } });
 /** YfmHeading extension needs markdown-it-attrs plugin */
-const YfmHeadingSpecs = (builder, opts) => {
+const YfmHeadingSpecs = (builder, _opts) => {
     builder.configureMd((md) => md.use(heading_ids_1.headingIdsPlugin));
-    builder.addNode(const_1.headingNodeName, () => ({
-        spec: {
-            attrs: {
-                [const_1.YfmHeadingAttr.Id]: { default: '' },
-                [const_1.YfmHeadingAttr.Level]: { default: 1 },
-                [const_1.YfmHeadingAttr.DataLine]: { default: null },
-                [const_1.YfmHeadingAttr.Folding]: { default: null },
+    builder.overrideNodeSpec(const_1.headingNodeName, (prev) => ({
+        ...prev,
+        attrs: {
+            ...prev.attrs,
+            [const_1.YfmHeadingAttr.Id]: { default: '' },
+            [const_1.YfmHeadingAttr.Folding]: { default: null },
+        },
+        selectable: true,
+        parseDOM: [
+            { tag: 'h1', getAttrs: (0, utils_1.getNodeAttrs)(1), priority: 100, consuming: true },
+            { tag: 'h2', getAttrs: (0, utils_1.getNodeAttrs)(2), priority: 100, consuming: true },
+            { tag: 'h3', getAttrs: (0, utils_1.getNodeAttrs)(3), priority: 100, consuming: true },
+            { tag: 'h4', getAttrs: (0, utils_1.getNodeAttrs)(4), priority: 100, consuming: true },
+            { tag: 'h5', getAttrs: (0, utils_1.getNodeAttrs)(5), priority: 100, consuming: true },
+            { tag: 'h6', getAttrs: (0, utils_1.getNodeAttrs)(6), priority: 100, consuming: true },
+            {
+                // ignore anchor link inside headings
+                tag: 'a.yfm-anchor',
+                context: `${const_1.headingNodeName}/`,
+                skip: true,
+                ignore: true,
+                priority: 1000,
             },
-            content: '(text | inline)*',
-            group: 'block',
-            defining: true,
-            selectable: true,
-            parseDOM: [
-                { tag: 'h1', getAttrs: (0, utils_1.getNodeAttrs)(1), priority: 100, consuming: true },
-                { tag: 'h2', getAttrs: (0, utils_1.getNodeAttrs)(2), priority: 100, consuming: true },
-                { tag: 'h3', getAttrs: (0, utils_1.getNodeAttrs)(3), priority: 100, consuming: true },
-                { tag: 'h4', getAttrs: (0, utils_1.getNodeAttrs)(4), priority: 100, consuming: true },
-                { tag: 'h5', getAttrs: (0, utils_1.getNodeAttrs)(5), priority: 100, consuming: true },
-                { tag: 'h6', getAttrs: (0, utils_1.getNodeAttrs)(6), priority: 100, consuming: true },
+        ],
+        toDOM(node) {
+            const id = node.attrs[const_1.YfmHeadingAttr.Id];
+            const lineNumber = node.attrs[const_1.YfmHeadingAttr.DataLine];
+            const folding = node.attrs[const_1.YfmHeadingAttr.Folding];
+            return [
+                'h' + node.attrs[const_1.YfmHeadingAttr.Level],
                 {
-                    // ignore anchor link inside headings
-                    tag: 'a.yfm-anchor',
-                    context: `${const_1.headingNodeName}/`,
-                    skip: true,
-                    ignore: true,
-                    priority: 1000,
-                },
-            ],
-            toDOM(node) {
-                const id = node.attrs[const_1.YfmHeadingAttr.Id];
-                const lineNumber = node.attrs[const_1.YfmHeadingAttr.DataLine];
-                const folding = node.attrs[const_1.YfmHeadingAttr.Folding];
-                return [
-                    'h' + node.attrs[const_1.YfmHeadingAttr.Level],
-                    {
-                        id: id || null,
-                        [const_1.YfmHeadingAttr.DataLine]: lineNumber,
-                        [`data-${const_1.YfmHeadingAttr.Folding}`]: folding,
-                    },
-                    0,
-                    // [
-                    //     'a',
-                    //     {
-                    //         href: `#${node.attrs[YfmHeadingAttr.Id]}`,
-                    //         class: 'yfm-anchor',
-                    //         'aria-hidden': 'true',
-                    //         contenteditable: 'false',
-                    //     },
-                    // ],
-                    // ['span', 0],
-                ];
-            },
-            placeholder: {
-                content: builder.context.get('placeholder')?.heading ??
-                    opts.headingPlaceholder ??
-                    DEFAULT_PLACEHOLDER,
-                alwaysVisible: true,
-            },
-        },
-        fromMd: {
-            tokenSpec: {
-                name: const_1.headingNodeName,
-                type: 'block',
-                getAttrs: (token) => {
-                    if (token.type.endsWith('_close'))
-                        return {};
-                    const attrs = Object.fromEntries(token.attrs || []);
-                    // if (!attrs[YfmHeadingAttr.Id]) {
-                    //     // calculate id if it was not specified
-                    //     // tokens[index + 1] is child inline token
-                    //     attrs[YfmHeadingAttr.Id] = slugify(tokens[index + 1].content);
-                    // }
-                    // attrs have id only if it explicitly specified manually
-                    return {
-                        [const_1.YfmHeadingAttr.Level]: Number(token.tag.slice(1)),
-                        [const_1.YfmHeadingAttr.Folding]: token.meta?.folding === true ? true : null,
-                        ...attrs,
-                    };
+                    id: id || null,
+                    [const_1.YfmHeadingAttr.DataLine]: lineNumber,
+                    [`data-${const_1.YfmHeadingAttr.Folding}`]: folding,
                 },
-            },
+                0,
+                // [
+                //     'a',
+                //     {
+                //         href: `#${node.attrs[YfmHeadingAttr.Id]}`,
+                //         class: 'yfm-anchor',
+                //         'aria-hidden': 'true',
+                //         contenteditable: 'false',
+                //     },
+                // ],
+                // ['span', 0],
+            ];
         },
-        toMd: (state, node) => {
-            const folding = node.attrs[const_1.YfmHeadingAttr.Folding];
-            const level = node.attrs[const_1.YfmHeadingAttr.Level];
-            state.write(state.repeat('#', level) + (typeof folding === 'boolean' ? '+' : '') + ' ');
-            state.renderInline(node);
-            const anchor = node.attrs[const_1.YfmHeadingAttr.Id];
-            if (anchor /*&& anchor !== node.firstChild?.textContent*/) {
-                state.write(` {#${anchor}}`);
-            }
-            state.closeBlock(node);
+    }));
+    builder.overrideMarkdownTokenParserSpec(const_1.headingNodeName, (prev) => ({
+        ...prev,
+        getAttrs: (token) => {
+            if (token.type.endsWith('_close'))
+                return {};
+            const attrs = Object.fromEntries(token.attrs || []);
+            // if (!attrs[YfmHeadingAttr.Id]) {
+            //     // calculate id if it was not specified
+            //     // tokens[index + 1] is child inline token
+            //     attrs[YfmHeadingAttr.Id] = slugify(tokens[index + 1].content);
+            // }
+            // attrs have id only if it explicitly specified manually
+            return {
+                [const_1.YfmHeadingAttr.Level]: Number(token.tag.slice(1)),
+                [const_1.YfmHeadingAttr.Folding]: token.meta?.folding === true ? true : null,
+                ...attrs,
+            };
         },
     }));
+    builder.overrideNodeSerializerSpec(const_1.headingNodeName, () => (0, HeadingSpecs_1.headingToMarkdown)({
+        renderMarkup: utils_1.renderYfmHeadingMarkup,
+        renderAttributes: utils_1.renderYfmHeadingAttributes,
+    }));
 };
 exports.YfmHeadingSpecs = YfmHeadingSpecs;
 //# sourceMappingURL=index.js.map