Refactor: improve fileEqual impl

Build/lib/create-file.test.ts

@@ -39,6 +39,12 @@ describe('fileEqual', () => {
     false
   ));
 
+  it('comment less', () => test(
+    ['# A', '# B', 'B'],
+    ['# A', 'B'],
+    false
+  ));
+
   it('larger', () => test(
     ['A', 'B'],
     ['A', 'B', 'C'],
@@ -51,9 +57,15 @@ describe('fileEqual', () => {
     false
   ));
 
-  it('eol', () => test(
+  it('eol more', () => test(
     ['A', 'B'],
     ['A', 'B', ''],
-    true
+    false
+  ));
+
+  it('eol less', () => test(
+    ['A', 'B', ''],
+    ['A', 'B'],
+    false
   ));
 });

Build/lib/create-file.ts

@@ -11,75 +11,46 @@ export async function fileEqual(linesA: string[], source: AsyncIterable<string>
     return false;
   }
 
-  const linesABound = linesA.length - 1;
+  const maxIndexA = linesA.length - 1;
-
   let index = -1;
 
-  let aLen = 0;
-  let bLen = 0;
-
   for await (const lineB of source) {
     index++;
 
-    if (index > linesABound) {
+    if (index > maxIndexA) {
-      return (index === linesA.length && lineB.length === 0);
+      return false;
     }
 
     const lineA = linesA[index];
-    aLen = lineA.length;
-    bLen = lineB.length;
 
-    if (aLen === 0) {
+    const lineAIsComment = isCommentLine(lineA);
-      if (bLen === 0) {
+    const lineBIsComment = isCommentLine(lineB);
-        // both lines are empty, check next line
+
-        continue;
+    if (lineAIsComment !== lineBIsComment) {
-      }
-      // lineA is empty but lineB is not
-      return false;
-    }
-    // now lineA can not be empty
-    if (bLen === 0) {
-      // lineB is empty but lineA is not
       return false;
     }
 
-    // now both lines can not be empty
+    // Now both line are either both comment or both not comment
-
+    // We only need to compare one of them
-    const firstCharA = lineA.charCodeAt(0);
+    if (lineAIsComment) {
-    const firstCharB = lineB.charCodeAt(0);
-
-    if (firstCharA !== firstCharB) {
-      return false;
-    }
-
-    // now firstCharA is equal to firstCharB, we only need to check the first char
-    if (firstCharA === 35 /* # */) {
       continue;
     }
-    // adguard conf
-    if (firstCharA === 33 /* ! */) {
-      continue;
-    }
-
-    if (
-      firstCharA === 47 /* / */
-      && lineA[1] === '/' && lineB[1] === '/'
-      && lineA[3] === '#' && lineB[3] === '#'
-    ) {
-      continue;
-    }
-
-    if (aLen !== bLen) {
-      return false;
-    }
 
     if (lineA !== lineB) {
       return false;
     }
   }
 
-  // The file becomes larger
+  return index === maxIndexA;
-  return !(index < linesABound);
+}
+
+export function isCommentLine(line: string): boolean {
+  const firstChar = line.charCodeAt(0);
+  return (
+    firstChar === 35 // #
+    || firstChar === 33 // !
+    || (firstChar === 47 && line[1] === '/' && line[3] === '#') // //##
+  );
 }
 
 export async function compareAndWriteFile(span: Span, linesA: string[], filePath: string) {