opencode-gbk-tools 0.1.2 → 0.1.3

package/dist/opencode-tools/gbk_edit.js

@@ -16320,6 +16320,20 @@ function assertNotBinary(buffer) {
     throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\u6309 GBK \u6587\u672C\u5904\u7406");
   }
 }
+function detectNewlineStyle(text) {
+  const crlfCount = (text.match(/\r\n/g) ?? []).length;
+  const lfCount = (text.match(/(^|[^\r])\n/g) ?? []).length;
+  if (crlfCount > 0 && lfCount === 0) {
+    return "crlf";
+  }
+  if (lfCount > 0 && crlfCount === 0) {
+    return "lf";
+  }
+  if (crlfCount > 0 && lfCount > 0) {
+    return "mixed";
+  }
+  return "none";
+}
 function applyLineRange(text, startLine, endLine) {
   if (startLine === void 0 && endLine === void 0) {
     return {
@@ -16401,6 +16415,84 @@ function resolveEditScope(text, input) {
     rangeEnd: anchored.rangeStart + lineRanged.rangeEnd
   };
 }
+function normalizeNewlines(text) {
+  return text.replace(/\r\n/g, "\n");
+}
+function trimRightSpaces(text) {
+  return text.replace(/[ \t]+$/g, "");
+}
+function splitNormalizedLines(text) {
+  return normalizeNewlines(text).split("\n");
+}
+function trimTrailingEmptyLines(lines) {
+  const result = [...lines];
+  while (result.length > 0 && trimRightSpaces(result[result.length - 1]) === "") {
+    result.pop();
+  }
+  return result;
+}
+function getNearestContext(content, oldString) {
+  const lines = content.split(/\r?\n/);
+  const oldLines = normalizeNewlines(oldString).split("\n").filter(Boolean);
+  const firstToken = oldLines[0] || oldString.trim();
+  for (let index = 0; index < lines.length; index += 1) {
+    if (lines[index].includes(firstToken)) {
+      return lines.slice(index, index + 4).join("\n");
+    }
+  }
+  return lines.slice(0, 4).join("\n");
+}
+function buildNoMatchMessage(content, oldString) {
+  return [
+    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\u3002",
+    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\u884C/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\u3002",
+    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFF1A",
+    getNearestContext(content, oldString)
+  ].join("\n");
+}
+function tryLooseBlockReplace(content, oldString, newString) {
+  const normalizedContent = normalizeNewlines(content);
+  const contentLines = splitNormalizedLines(content);
+  const oldLines = trimTrailingEmptyLines(splitNormalizedLines(oldString));
+  const newLines = splitNormalizedLines(newString);
+  if (oldLines.length === 0) {
+    return null;
+  }
+  for (let start = 0; start < contentLines.length; start += 1) {
+    let contentIndex = start;
+    let oldIndex = 0;
+    while (oldIndex < oldLines.length && contentIndex < contentLines.length) {
+      const expected = trimRightSpaces(oldLines[oldIndex]);
+      const actual = trimRightSpaces(contentLines[contentIndex]);
+      if (expected === actual) {
+        oldIndex += 1;
+        contentIndex += 1;
+        continue;
+      }
+      if (actual === "") {
+        contentIndex += 1;
+        continue;
+      }
+      if (expected === "") {
+        oldIndex += 1;
+        continue;
+      }
+      break;
+    }
+    if (oldIndex === oldLines.length) {
+      const replacedNormalized = [
+        ...contentLines.slice(0, start),
+        ...newLines,
+        ...contentLines.slice(contentIndex)
+      ].join("\n");
+      return {
+        occurrencesBefore: 1,
+        content: detectNewlineStyle(content) === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
+      };
+    }
+  }
+  return null;
+}
 function countOccurrences(text, target) {
   if (target.length === 0) {
     throw createGbkError("GBK_EMPTY_OLD_STRING", "oldString \u4E0D\u80FD\u4E3A\u7A7A");
@@ -16575,12 +16667,28 @@ async function replaceGbkFileText(input) {
   const current = await readWholeGbkTextFile(resolved);
   const scope = resolveEditScope(current.content, input);
   const occurrencesBefore = countOccurrences(scope.selectedText, input.oldString);
+  if (!replaceAll && occurrencesBefore === 0) {
+    const loose = tryLooseBlockReplace(scope.selectedText, input.oldString, input.newString);
+    if (loose !== null) {
+      const outputText2 = `${current.content.slice(0, scope.rangeStart)}${loose.content}${current.content.slice(scope.rangeEnd)}`;
+      const buffer2 = import_iconv_lite.default.encode(outputText2, current.encoding);
+      await fs2.writeFile(current.filePath, buffer2);
+      return {
+        filePath: current.filePath,
+        encoding: current.encoding,
+        replacements: 1,
+        occurrencesBefore: loose.occurrencesBefore,
+        bytesRead: current.bytesRead,
+        bytesWritten: buffer2.byteLength
+      };
+    }
+  }
   if (replaceAll) {
     if (occurrencesBefore === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+      throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, input.oldString));
     }
   } else if (occurrencesBefore === 0) {
-    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+    throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, input.oldString));
   } else if (occurrencesBefore > 1) {
     throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${input.oldString}`);
   }

package/dist/plugin/index.js

@@ -16466,6 +16466,84 @@ function resolveEditScope(text, input) {
     rangeEnd: anchored.rangeStart + lineRanged.rangeEnd
   };
 }
+function normalizeNewlines(text) {
+  return text.replace(/\r\n/g, "\n");
+}
+function trimRightSpaces(text) {
+  return text.replace(/[ \t]+$/g, "");
+}
+function splitNormalizedLines(text) {
+  return normalizeNewlines(text).split("\n");
+}
+function trimTrailingEmptyLines(lines) {
+  const result = [...lines];
+  while (result.length > 0 && trimRightSpaces(result[result.length - 1]) === "") {
+    result.pop();
+  }
+  return result;
+}
+function getNearestContext(content, oldString) {
+  const lines = content.split(/\r?\n/);
+  const oldLines = normalizeNewlines(oldString).split("\n").filter(Boolean);
+  const firstToken = oldLines[0] || oldString.trim();
+  for (let index = 0; index < lines.length; index += 1) {
+    if (lines[index].includes(firstToken)) {
+      return lines.slice(index, index + 4).join("\n");
+    }
+  }
+  return lines.slice(0, 4).join("\n");
+}
+function buildNoMatchMessage(content, oldString) {
+  return [
+    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\u3002",
+    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\u884C/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\u3002",
+    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFF1A",
+    getNearestContext(content, oldString)
+  ].join("\n");
+}
+function tryLooseBlockReplace(content, oldString, newString) {
+  const normalizedContent = normalizeNewlines(content);
+  const contentLines = splitNormalizedLines(content);
+  const oldLines = trimTrailingEmptyLines(splitNormalizedLines(oldString));
+  const newLines = splitNormalizedLines(newString);
+  if (oldLines.length === 0) {
+    return null;
+  }
+  for (let start = 0; start < contentLines.length; start += 1) {
+    let contentIndex = start;
+    let oldIndex = 0;
+    while (oldIndex < oldLines.length && contentIndex < contentLines.length) {
+      const expected = trimRightSpaces(oldLines[oldIndex]);
+      const actual = trimRightSpaces(contentLines[contentIndex]);
+      if (expected === actual) {
+        oldIndex += 1;
+        contentIndex += 1;
+        continue;
+      }
+      if (actual === "") {
+        contentIndex += 1;
+        continue;
+      }
+      if (expected === "") {
+        oldIndex += 1;
+        continue;
+      }
+      break;
+    }
+    if (oldIndex === oldLines.length) {
+      const replacedNormalized = [
+        ...contentLines.slice(0, start),
+        ...newLines,
+        ...contentLines.slice(contentIndex)
+      ].join("\n");
+      return {
+        occurrencesBefore: 1,
+        content: detectNewlineStyle(content) === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
+      };
+    }
+  }
+  return null;
+}
 function countOccurrences(text, target) {
   if (target.length === 0) {
     throw createGbkError("GBK_EMPTY_OLD_STRING", "oldString \u4E0D\u80FD\u4E3A\u7A7A");
@@ -16783,12 +16861,28 @@ async function replaceGbkFileText(input) {
   const current = await readWholeGbkTextFile(resolved);
   const scope = resolveEditScope(current.content, input);
   const occurrencesBefore = countOccurrences(scope.selectedText, input.oldString);
+  if (!replaceAll && occurrencesBefore === 0) {
+    const loose = tryLooseBlockReplace(scope.selectedText, input.oldString, input.newString);
+    if (loose !== null) {
+      const outputText2 = `${current.content.slice(0, scope.rangeStart)}${loose.content}${current.content.slice(scope.rangeEnd)}`;
+      const buffer2 = import_iconv_lite.default.encode(outputText2, current.encoding);
+      await fs2.writeFile(current.filePath, buffer2);
+      return {
+        filePath: current.filePath,
+        encoding: current.encoding,
+        replacements: 1,
+        occurrencesBefore: loose.occurrencesBefore,
+        bytesRead: current.bytesRead,
+        bytesWritten: buffer2.byteLength
+      };
+    }
+  }
   if (replaceAll) {
     if (occurrencesBefore === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+      throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, input.oldString));
     }
   } else if (occurrencesBefore === 0) {
-    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+    throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, input.oldString));
   } else if (occurrencesBefore > 1) {
     throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${input.oldString}`);
   }

package/dist/release-manifest.json

@@ -1,12 +1,12 @@
 {
   "manifestVersion": 1,
   "packageName": "opencode-gbk-tools",
-  "packageVersion": "0.1.2",
+  "packageVersion": "0.1.3",
   "artifacts": [
     {
       "relativePath": "tools/gbk_edit.js",
       "kind": "tool",
-      "expectedHash": "c90cdc75ece2c66d72750cb9243d20235a7dad82829e8f519a7c31f7432ef3ff",
+      "expectedHash": "c23a8f2fe0dea3f6099cf5ecc27eecc7f5acd85b5f5beb41da09418646a4225a",
       "hashAlgorithm": "sha256"
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gbk-tools",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "GBK/GB18030 custom tools and agent for OpenCode",
   "type": "module",
   "license": "MIT",