chore: fix doc and demo

Author: zhanba

.github/workflows/tests.yml

@@ -21,13 +21,8 @@ five`;
 
 const docModified = doc.replace(/t/g, "T") + "\nSix";
 
-const diffResult = linesDiffComputers
-  .getDefault()
-  .computeDiff(doc, docModified, {
-    computeMoves: true,
-    ignoreTrimWhitespace: true,
-    maxComputationTimeMs: 100,
-  });
+const codiff = new Codiff();
+const result = codiff.computeDiff(doc, docmodified);
 ```
 
 diff result:
@@ -102,8 +97,9 @@ diff result:
       ]
     }
   ],
-  "moves": [],
-  "hitTimeout": false
+  "quitEarly": false,
+  "identical": false,
+  "moves": []
 }
 ```
 

README.md

@@ -1,5 +1,4 @@
 export * from "./documentDiffProvider.js";
-export * from "./defaultDocumentDiffProvider.js";
 export * from "./legacyLinesDiffComputer.js";
 export * from "./linesDiffComputer.js";
 export * from "./linesDiffComputers.js";

packages/codiff/src/diff/defaultDocumentDiffProvider.ts

@@ -1,2 +1,3 @@
 export * from "./common/index.js";
 export * from "./diff/index.js";
+export * from "./codiff.js";

packages/codiff/src/diff/index.ts

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import CodeMirror from "@uiw/react-codemirror";
 import "./App.css";
-import { linesDiffComputers } from "codiff";
+import { Codiff } from "codiff";
 import { Change, Chunk } from "@codemirror/merge";
 import { Text } from "@codemirror/state";
 import { generateSimilarCode } from "./util";
@@ -11,16 +11,12 @@ import { json } from "@codemirror/lang-json";
 const Original = CodeMirrorMerge.Original;
 const Modified = CodeMirrorMerge.Modified;
 
+const codiff = new Codiff();
+
 const overrideBuild = () => {
   const buildChunks = (a: Text, b: Text): readonly Chunk[] => {
     console.log("diff compute");
-    const result = linesDiffComputers
-      .getDefault()
-      .computeDiff(a.toJSON(), b.toJSON(), {
-        computeMoves: true,
-        ignoreTrimWhitespace: true,
-        maxComputationTimeMs: 100,
-      });
+    const result = codiff.computeDiff(a.toString(), b.toString());
     return result.changes.map<Chunk>((item) => {
       const getPosition = (text: Text, from: number, to: number) => {
         if (from === to) {
@@ -36,13 +32,13 @@ const overrideBuild = () => {
       const origin = getPosition(
         a,
         item.original.startLineNumber,
-        item.original.endLineNumberExclusive,
+        item.original.endLineNumberExclusive
       );
 
       const modified = getPosition(
         b,
         item.modified.startLineNumber,
-        item.modified.endLineNumberExclusive,
+        item.modified.endLineNumberExclusive
       );
 
       const nonNegative = (a: number) => {
@@ -55,25 +51,25 @@ const overrideBuild = () => {
             a.line(inner.originalRange.startLineNumber).from +
               inner.originalRange.startColumn -
               1 -
-              origin.from,
+              origin.from
           ),
           toA: nonNegative(
             a.line(inner.originalRange.endLineNumber).from +
               inner.originalRange.endColumn -
               1 -
-              origin.from,
+              origin.from
           ),
           fromB: nonNegative(
             b.line(inner.modifiedRange.startLineNumber).from +
               inner.modifiedRange.startColumn -
               1 -
-              modified.from,
+              modified.from
           ),
           toB: nonNegative(
             b.line(inner.modifiedRange.endLineNumber).from +
               inner.modifiedRange.endColumn -
               1 -
-              modified.from,
+              modified.from
           ),
         };
       });
@@ -83,7 +79,7 @@ const overrideBuild = () => {
         origin.from,
         origin.to + 1,
         modified.from,
-        modified.to + 1,
+        modified.to + 1
       );
       return chunk;
     });
@@ -118,21 +114,15 @@ function App() {
   const handleGenerate = () => {
     const { codeA: origin, codeB: modified } = generateSimilarCode(
       maxLine,
-      maxDiff,
+      maxDiff
     );
     setOrigin(origin);
     setModified(modified);
   };
 
   useEffect(() => {
     const start = performance.now();
-    const result = linesDiffComputers
-      .getDefault()
-      .computeDiff(origin.split("\n"), modified.split("\n"), {
-        computeMoves: true,
-        ignoreTrimWhitespace: true,
-        maxComputationTimeMs: 100,
-      });
+    const result = codiff.computeDiff(origin, modified);
     const end = performance.now();
     setDiffms((end - start).toFixed(3));
     setDiff(JSON.stringify(result, undefined, 2));