+point, some collisions in _** or *__ cases (bold + italic). Headings working as paired recursive

index.js

@@ -8,15 +8,15 @@ const syntax = {
         paired: true,
         recursive: true,
         startRegexp: /\*\*\S.*/,
-        endRegexp:   /\S\*\*\W/,
+        endRegexp:   /\*\*\W/,
         content: {
             start: {
                 point: 'start',
                 offset: 2
             },
             end: {
-                point: 'end',
-                offset: 1
+                point: 'start',
+                offset: 0
             }
         },
         begin: 0,
@@ -29,15 +29,15 @@ const syntax = {
         paired: true,
         recursive: true,
         startRegexp:  /\s__\S.*/,
-        endRegexp:    /\S__\s/,
+        endRegexp:    /__\W/,
         content: {
             start: {
                 point: 'start',
                 offset: 3
             },
             end: {
-                point: 'end',
-                offset: 1
+                point: 'start',
+                offset: 0
             }
         },
         begin: 1,
@@ -50,14 +50,14 @@ const syntax = {
         paired: true,
         recursive: true,
         startRegexp: /\*\S.*/,
-        endRegexp:   /\S\*\s/,
+        endRegexp:   /\S\*\W/,
         content: {
             start: {
                 point: 'start',
-                offset: 2
+                offset: 1
             },
             end: {
-                point: 'end',
+                point: 'start',
                 offset: 1
             }
         },
@@ -71,14 +71,14 @@ const syntax = {
         paired: true,
         recursive: true,
         startRegexp:  /\s_\S.*/,
-        endRegexp:   /\S_\s/,
+        endRegexp:   /\S_\W/,
         content: {
             start: {
                 point: 'start',
                 offset: 2
             },
             end: {
-                point: 'end',
+                point: 'start',
                 offset: 1
             }
         },
@@ -117,7 +117,7 @@ const syntax = {
         content: {
             start: {
                 point: 'end',
-                offset: 1
+                offset: 0
             },
             end: {
                 point: 'start',
@@ -126,8 +126,8 @@ const syntax = {
         },
         begin: 1,
         forward: {
-            point: 'endEnd', //start, startEnd, end, endEnd
-            offset: -1
+            point: 'end', //start, startEnd, end, endEnd
+            offset: 0
         }
     }
 }
@@ -148,12 +148,6 @@ function findNearest(md, mdTags, offset=0){
     return [nearest, nearestMatch]
 }
 
-function cutNode(md, match, tagName, {paired, recursive, startRegexp, endRegexp, content: {start, end}, begin, forward}){
-    //if (paired){
-        //md.match()
-    //}
-}
-
 
 //node:
 //{
@@ -175,17 +169,19 @@ function buildAST(md, mdTags=syntax, offset=0, tree={tag: 'root'}, stack=[]){
     currentNode.children  = currentNode.children || []
     const { children }     = currentNode
 
-    const { endRegexp, content: {end: {offset: offsetEnd} }, forward } = mdTags[currentNode.tag]
+    const { endRegexp, content: {end: {offset: offsetEnd, point} }, forward } = mdTags[currentNode.tag]
 
     while(offset < md.length){
         const [nearest, nearestMatch] = findNearest(md, mdTags, offset)
         const endMatch = md.offsetMatch(offset, endRegexp)
         if (endMatch) {
             if (!nearest || endMatch.index <= nearestMatch.index){
-                currentNode.endContent = offset + endMatch.index + offsetEnd
+                currentNode.endContent = offset + endMatch.index + offsetEnd + (point === 'end' ? endMatch[0].length : 0)
                 children.push(md.slice(offset, currentNode.endContent))
-                offset += endMatch.index + endMatch[0].length + forward.offset
+                offset += endMatch.index + forward.offset + (forward.point === 'endEnd' ? endMatch[0].length : 0)
+                console.log(currentNode.tag, forward.point === 'endEnd' ? endMatch[0].length : 0)
                 currentNode.endOffset = offset
+                currentNode.endMatch  = endMatch
                 return currentNode
             }
         }
@@ -196,9 +192,9 @@ function buildAST(md, mdTags=syntax, offset=0, tree={tag: 'root'}, stack=[]){
                 offset += nearestMatch.index
             }
             else {
-                const newNode = {tag: nearest, startOffset: offset, parent: currentNode}
+                const newNode = {tag: nearest, startOffset: offset, parent: currentNode, startMatch: nearestMatch}
                 children.push(newNode)
-                buildAST(md, mdTags, offset + start.offset, tree, [...stack, newNode])
+                buildAST(md, mdTags, offset + start.offset + (start.point === 'end' ? nearestMatch[0].length : 0), tree, [...stack, newNode])
                 offset = newNode.endOffset
             }
         }
@@ -210,6 +206,12 @@ function buildAST(md, mdTags=syntax, offset=0, tree={tag: 'root'}, stack=[]){
     return currentNode
 }
 
-debugger;
-console.log(buildAST("I just **love _bold text_ adddd**. hahaha").children[1])
+const md = 
+`
+# heading1
+какой-то _текст_
+# heading2
+а тут **шо** цикавого?)))
+`;
+console.log( buildAST(md).children)