@gmb/bitmark-parser-generator 5.20.0 → 5.21.0

package/dist/browser/cjs/index.d.cts

@@ -3515,6 +3515,11 @@ declare abstract class AstWalkerGenerator<AstType, R, Context = undefined> imple
     exit(node: NodeInfo, route: NodeInfo[], context: Context): void;
     leaf(node: NodeInfo, route: NodeInfo[], context: Context): void;
     protected getParentNode(route: NodeInfo[], nodesBack?: number): NodeInfo | undefined;
+    protected getSiblingNodes(route: NodeInfo[]): {
+        left?: unknown;
+        right?: unknown;
+    };
+    protected isEmptyParagraph(node: TextNode): boolean;
     protected abstract writeInlineDebug(key: string, state: {
         open?: boolean;
         close?: boolean;
@@ -3578,7 +3583,6 @@ declare class TextGenerator extends AstWalkerGenerator<TextAst, BreakscapedStrin
     private inParagraph;
     private inHeading;
     private inCodeBlock;
-    private exitedCodeBlock;
     private inBulletList;
     private inInline;
     private markDepth;
@@ -3692,7 +3696,7 @@ declare class TextGenerator extends AstWalkerGenerator<TextAst, BreakscapedStrin
      * @param start true if starting (before) the text, false if ending (after) the text
      */
     protected writeMarks(node: TextNode, stage: StageType): void | false;
-    protected writeParagraph(node: TextNode): void;
+    protected writeParagraph(node: TextNode, route: NodeInfo[]): void;
     protected writeHardBreak(_node: TextNode): void;
     protected writeHeading(node: HeadingTextNode): void;
     protected writeSection(node: SectionTextNode): void;

package/dist/browser/esm/index.d.ts

@@ -3515,6 +3515,11 @@ declare abstract class AstWalkerGenerator<AstType, R, Context = undefined> imple
     exit(node: NodeInfo, route: NodeInfo[], context: Context): void;
     leaf(node: NodeInfo, route: NodeInfo[], context: Context): void;
     protected getParentNode(route: NodeInfo[], nodesBack?: number): NodeInfo | undefined;
+    protected getSiblingNodes(route: NodeInfo[]): {
+        left?: unknown;
+        right?: unknown;
+    };
+    protected isEmptyParagraph(node: TextNode): boolean;
     protected abstract writeInlineDebug(key: string, state: {
         open?: boolean;
         close?: boolean;
@@ -3578,7 +3583,6 @@ declare class TextGenerator extends AstWalkerGenerator<TextAst, BreakscapedStrin
     private inParagraph;
     private inHeading;
     private inCodeBlock;
-    private exitedCodeBlock;
     private inBulletList;
     private inInline;
     private markDepth;
@@ -3692,7 +3696,7 @@ declare class TextGenerator extends AstWalkerGenerator<TextAst, BreakscapedStrin
      * @param start true if starting (before) the text, false if ending (after) the text
      */
     protected writeMarks(node: TextNode, stage: StageType): void | false;
-    protected writeParagraph(node: TextNode): void;
+    protected writeParagraph(node: TextNode, route: NodeInfo[]): void;
     protected writeHardBreak(_node: TextNode): void;
     protected writeHeading(node: HeadingTextNode): void;
     protected writeSection(node: SectionTextNode): void;

package/dist/browser/esm/index.js

@@ -11016,7 +11016,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "5.20.0",
+  "version": "5.21.0",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -12771,6 +12771,31 @@ var AstWalkerGenerator = class {
     }
     return void 0;
   }
+  getSiblingNodes(route) {
+    const parentNode = this.getParentNode(route);
+    if (!parentNode || !parentNode.value || !Array.isArray(parentNode.value)) {
+      return {};
+    }
+    const siblings = parentNode.value;
+    const index = siblings.findIndex((s) => s === route[route.length - 1]?.value);
+    if (index === -1) {
+      return {};
+    }
+    return {
+      left: index > 0 ? siblings[index - 1] : void 0,
+      right: index < siblings.length - 1 ? siblings[index + 1] : void 0
+    };
+  }
+  isEmptyParagraph(node) {
+    if (!node) return false;
+    if (node.type !== TextNodeType.paragraph) return false;
+    if (!node.content || !Array.isArray(node.content)) return true;
+    for (const contentNode of node.content) {
+      if (contentNode.type !== TextNodeType.text) return false;
+      if (contentNode.text && contentNode.text.trim() !== "") return false;
+    }
+    return true;
+  }
 };
 
 // src/generator/text/TextGenerator.ts
@@ -12896,7 +12921,6 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
     __publicField(this, "inParagraph", false);
     __publicField(this, "inHeading", false);
     __publicField(this, "inCodeBlock", false);
-    __publicField(this, "exitedCodeBlock", false);
     __publicField(this, "inBulletList", false);
     __publicField(this, "inInline", false);
     __publicField(this, "markDepth", 0);
@@ -12985,7 +13009,6 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
     this.inParagraph = false;
     this.inHeading = false;
     this.inCodeBlock = false;
-    this.exitedCodeBlock = false;
     this.inBulletList = false;
     this.inInline = false;
     this.markDepth = 0;
@@ -13051,7 +13074,7 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
     switch (node.type) {
       case TextNodeType.paragraph:
         this.inParagraph = true;
-        this.writeParagraph(node);
+        this.writeParagraph(node, route);
         break;
       case TextNodeType.hardBreak:
         this.writeHardBreak(node);
@@ -13108,7 +13131,6 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
         return false;
       default:
     }
-    this.exitedCodeBlock = false;
   }
   handleBetweenNode(node, _left, _right, _route) {
     switch (node.type) {
@@ -13142,7 +13164,6 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
         this.writeNL();
         this.writeNL();
         this.inCodeBlock = false;
-        this.exitedCodeBlock = true;
         break;
       case TextNodeType.noBulletList:
       case TextNodeType.bulletList:
@@ -13506,21 +13527,19 @@ var TextGenerator = class _TextGenerator extends AstWalkerGenerator {
       }
     }
   }
-  writeParagraph(node) {
+  writeParagraph(node, route) {
     if (this.textFormat === TextFormat2.bitmarkText) {
       if (this.inBulletList) return;
-      const nodeContentLength = node.content?.length ?? 0;
-      if (this.nodeIndex === 0) {
-        if (nodeContentLength === 1) {
-          const isTextNode = node.content?.[0].type === TextNodeType.text;
-          const text = node.content?.[0].text ?? "";
-          if (!isTextNode || text !== "") return;
-        }
-        if (nodeContentLength > 1) return;
+      const siblingNodes = this.getSiblingNodes(route);
+      const prevSiblingNodeType = siblingNodes.left?.type;
+      const inBody = this.textLocation === TextLocation2.body;
+      const isEmptyParagraph = this.isEmptyParagraph(node);
+      if (!inBody || !isEmptyParagraph && !(prevSiblingNodeType === TextNodeType.codeBlock || prevSiblingNodeType === TextNodeType.paragraph)) {
+        return;
       }
       this.write("|");
       this.writeNL();
-      if (this.exitedCodeBlock) {
+      if (prevSiblingNodeType === TextNodeType.codeBlock) {
         this.writeNL();
       }
     }