@lemoncat7/dsh-partner 2.8.4 → 2.8.6

package/lib/client.js

@@ -12518,15 +12518,12 @@ function findAndReplace(tree, list2, options) {
         find.lastIndex = position2 + 1;
       } else {
         if (start !== position2) {
-          nodes.push({
-            type: "text",
-            value: node2.value.slice(start, position2)
-          });
+          add({ type: "text", value: node2.value.slice(start, position2) });
         }
         if (Array.isArray(value)) {
-          nodes.push(...value);
+          for (const child of value) add(child);
         } else if (value) {
-          nodes.push(value);
+          add(value);
         }
         start = position2 + match[0].length;
         change = true;
@@ -12538,20 +12535,28 @@ function findAndReplace(tree, list2, options) {
     }
     if (change) {
       if (start < node2.value.length) {
-        nodes.push({ type: "text", value: node2.value.slice(start) });
+        add({ type: "text", value: node2.value.slice(start) });
       }
       parent.children.splice(index2, 1, ...nodes);
     } else {
       nodes = [node2];
     }
     return index2 + nodes.length;
+    function add(child) {
+      const previous3 = nodes[nodes.length - 1];
+      if (previous3 && previous3.type === "text" && child.type === "text") {
+        previous3.value += child.value;
+      } else {
+        nodes.push(child);
+      }
+    }
   }
 }
 function toPairs(tupleOrList) {
-  const result = [];
   if (!Array.isArray(tupleOrList)) {
     throw new TypeError("Expected find and replace tuple or list of tuples");
   }
+  const result = [];
   const list2 = !tupleOrList[0] || Array.isArray(tupleOrList[0]) ? tupleOrList : [tupleOrList];
   let index2 = -1;
   while (++index2 < list2.length) {