chore(refactor): simplify logic for checking equal diffs

Author: lukekarrys

lib/util/json-diff.js

@@ -4,11 +4,10 @@ const { diff } = require('just-diff')
 
 const j = (obj, replacer = null) => JSON.stringify(obj, replacer, 2)
 
-const jsonDiff = (s1, s2, DELETE) => {
-  // DELETE is a special string that will be the value of updated if it exists
-  // but should be deleted
-
-  const ops = diff(s1, s2).map(({ op, path, value }) => {
+// DELETE is a special string that will be the value of updated if it exists
+// but should be deleted
+const jsonDiff = (s1, s2, DELETE) => diff(s1, s2)
+  .map(({ op, path, value }) => {
     // there could be cases where a whole object is reported
     // as missing and the expected value does not need to show
     // special DELETED values so filter those out here
@@ -26,13 +25,9 @@ const jsonDiff = (s1, s2, DELETE) => {
     } else if (op === 'add' && value !== DELETE) {
       return AD
     }
-  }).filter(Boolean).sort((a, b) => a.localeCompare(b))
-
-  if (!ops.length) {
-    return true
-  }
-
-  return ops.join('\n')
-}
+  })
+  .filter(Boolean)
+  .sort((a, b) => a.localeCompare(b))
+  .join('\n')
 
 module.exports = jsonDiff

lib/util/parser.js

@@ -77,7 +77,7 @@ class Base {
     // create a patch and strip out the filename. if it ends up an empty string
     // then return true since the files are equal
     return Diff.createPatch('', t.replace(/\r\n/g, '\n'), s.replace(/\r\n/g, '\n'))
-      .split('\n').slice(4).join('\n').trim() || true
+      .split('\n').slice(4).join('\n')
   }
 
   diff (t, s) {
@@ -142,9 +142,10 @@ class Base {
       ].join('\n')
     }
 
-    // individual diff methods are responsible for formatting or returning
-    // true if the are equal
-    return this.diff(target, source)
+    // individual diff methods are responsible for returning a string
+    // representing the diff. an empty trimmed string means no diff
+    const diffRes = this.diff(target, source).trim()
+    return diffRes || true
   }
 }