x-star-editor 0.2.5 → 0.2.6

package/dist/utils/markdown.js

@@ -190,10 +190,10 @@ export var editorRender = function editorRender(sourceCode) {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _node$position, _node$position$start, _node$position2, _node$position2$end;
+        var _node$position, _node$position2;
         var node = _step.value;
-        var startOffset = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : (_node$position$start = _node$position.start) === null || _node$position$start === void 0 ? void 0 : _node$position$start.offset;
-        var endOffset = (_node$position2 = node.position) === null || _node$position2 === void 0 ? void 0 : (_node$position2$end = _node$position2.end) === null || _node$position2$end === void 0 ? void 0 : _node$position2$end.offset;
+        var startOffset = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : _node$position.start.offset;
+        var endOffset = (_node$position2 = node.position) === null || _node$position2 === void 0 ? void 0 : _node$position2.end.offset;
         if (startOffset === undefined || endOffset === undefined) {
           continue;
         }
@@ -223,12 +223,12 @@ export var editorRender = function editorRender(sourceCode) {
         if (stack.length > 1) {
           pushElement(stack.length - 1);
         } else {
-          var _node$position3, _node$position3$start;
+          var _node$position3;
           // 如果栈大小为 1，说明为块级元素终点
           stack[0].element.append("\u200B");
           pushElement(0);
           // 记录行号，用于同步滚动
-          block.dataset.line = "".concat((_node$position3 = node.position) === null || _node$position3 === void 0 ? void 0 : (_node$position3$start = _node$position3.start) === null || _node$position3$start === void 0 ? void 0 : _node$position3$start.line);
+          block.dataset.line = "".concat((_node$position3 = node.position) === null || _node$position3 === void 0 ? void 0 : _node$position3.start.line);
           pushBlock();
           scanOffset++;
         }
@@ -394,10 +394,9 @@ var toMarkdownProcessor = unified().use(rehypeRemark, {
       return isMathNode(node) ? h(node, 'inlineMath', hastToText(node)) : defaultHandlers.span(h, node);
     },
     custom: function custom(h, node) {
-      var _node$properties, _node$properties2;
       return h(node, 'math', {
-        meta: (_node$properties = node.properties) === null || _node$properties === void 0 ? void 0 : _node$properties.meta
-      }, (_node$properties2 = node.properties) === null || _node$properties2 === void 0 ? void 0 : _node$properties2.value);
+        meta: node.properties.meta
+      }, node.properties.value);
     }
   }
 }).use(remarkMath).use(remarkGfm).use(remarkStringify).freeze();

package/dist/utils/rehype/rehype-line.js

@@ -6,10 +6,10 @@ import { SKIP, visit } from 'unist-util-visit';
 var rehypeLine = function rehypeLine() {
   return function (root) {
     return visit(root, 'element', function (node) {
-      var _node$properties, _node$position, _node$position$start;
+      var _node$properties, _node$position;
       (_node$properties = node.properties) !== null && _node$properties !== void 0 ? _node$properties : node.properties = {};
       // 记录行号，用于同步滚动
-      node.properties['data-line'] = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : (_node$position$start = _node$position.start) === null || _node$position$start === void 0 ? void 0 : _node$position$start.line;
+      node.properties['data-line'] = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : _node$position.start.line;
       return SKIP;
     });
   };

package/dist/utils/rehype/rehype-math.js

@@ -1,5 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { SKIP, visit } from 'unist-util-visit';
+import { EXIT, SKIP, visit } from 'unist-util-visit';
 
 /**
  * 判断一个 Hast 节点是否属于行内代码或代码块
@@ -130,31 +130,39 @@ var parseMath = function parseMath(text) {
  */
 var rehypeMath = function rehypeMath() {
   return function (root) {
-    var _child$properties;
-    var child = root.children[root.children.length - 1];
-    if ((child === null || child === void 0 ? void 0 : child.type) !== 'element' || typeof ((_child$properties = child.properties) === null || _child$properties === void 0 ? void 0 : _child$properties.rawPositions) !== 'string') {
-      return;
-    }
-    root.children.pop();
+    var rawPositions = [];
+    var i = 0;
 
     // 获取 rehype-raw-positions 记录的 Raw 节点的位置信息
-    var rawPositions = child.properties.rawPositions.split(' ').map(function (offset) {
-      return parseInt(offset);
-    });
-    var i = 0;
+    visit(root, {
+      tagName: 'raw-positions'
+    }, function (node, index, parent) {
+      var _node$properties3;
+      if (typeof ((_node$properties3 = node.properties) === null || _node$properties3 === void 0 ? void 0 : _node$properties3.value) === 'string') {
+        rawPositions = node.properties.value.split(' ').map(function (offset) {
+          return parseInt(offset);
+        });
+      }
+      if (index !== null && parent) {
+        parent.children.splice(index);
+      }
+      return EXIT;
+    }, true);
+    if (rawPositions.length < 2) {
+      return;
+    }
     visit(root, function (node, index, parent) {
       if (isCodeNode(node) || isMathNode(node)) {
         return SKIP;
       }
       if (node.type === 'text' && index !== null && parent) {
-        var _node$position, _node$position$start, _node$position2, _node$position2$end;
-        var startOffset = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : (_node$position$start = _node$position.start) === null || _node$position$start === void 0 ? void 0 : _node$position$start.offset;
-        var endOffset = (_node$position2 = node.position) === null || _node$position2 === void 0 ? void 0 : (_node$position2$end = _node$position2.end) === null || _node$position2$end === void 0 ? void 0 : _node$position2$end.offset;
-        if (startOffset === undefined || endOffset === undefined) {
+        var _node$position;
+        var startOffset = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : _node$position.start.offset;
+        if (startOffset === undefined) {
           return;
         }
         for (; i < rawPositions.length - 1 && rawPositions[i + 1] <= startOffset; i += 2);
-        if (i < rawPositions.length - 1 && rawPositions[i] <= startOffset && rawPositions[i + 1] >= endOffset) {
+        if (i < rawPositions.length - 1 && rawPositions[i] <= startOffset) {
           var _parent$children;
           var result = parseMath(node.value);
           (_parent$children = parent.children).splice.apply(_parent$children, [index, 1].concat(_toConsumableArray(result)));

package/dist/utils/rehype/rehype-raw-positions.js

@@ -7,9 +7,9 @@ var rehypeRawPositions = function rehypeRawPositions() {
   return function (root) {
     var rawPositions = [];
     visit(root, 'raw', function (node) {
-      var _node$position, _node$position$start, _node$position2, _node$position2$end;
-      var startOffset = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : (_node$position$start = _node$position.start) === null || _node$position$start === void 0 ? void 0 : _node$position$start.offset;
-      var endOffset = (_node$position2 = node.position) === null || _node$position2 === void 0 ? void 0 : (_node$position2$end = _node$position2.end) === null || _node$position2$end === void 0 ? void 0 : _node$position2$end.offset;
+      var _node$position, _node$position2;
+      var startOffset = (_node$position = node.position) === null || _node$position === void 0 ? void 0 : _node$position.start.offset;
+      var endOffset = (_node$position2 = node.position) === null || _node$position2 === void 0 ? void 0 : _node$position2.end.offset;
       if (startOffset === undefined || endOffset === undefined) {
         return;
       }
@@ -19,9 +19,9 @@ var rehypeRawPositions = function rehypeRawPositions() {
     // 记录在新的 Hast 节点上，防止被 rehype-raw 删除
     root.children.push({
       type: 'element',
-      tagName: 'div',
+      tagName: 'raw-positions',
       properties: {
-        rawPositions: rawPositions.join(' ')
+        value: rawPositions.join(' ')
       },
       children: []
     });