update

Author: nahtnam

index.js

@@ -1,6 +1,6 @@
 {
   "name": "json-diff-cli",
-  "version": "0.4.9",
+  "version": "0.5.0",
   "description": "json-diff-cli",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "chalk": "^1.1.3",
     "csvtojson": "^1.1.5",
     "easy-table": "^1.1.0",
-    "json-diff-core": "^0.1.6",
+    "json-diff-core": "^0.1.8",
     "yargs": "^8.0.1"
   },
   "release": {

package-lock.json

@@ -9,43 +9,44 @@ const parseCSV = (csvPath) => {
   const result = [];
   return new Promise((resolve, reject) => {
     csv({ noheader: false })
-    .fromFile(csvPath)
-    .on('json', (obj) => {
-      result.push(obj);
-    })
-    .on('done', (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(result);
-      }
-    });
+      .fromFile(csvPath)
+      .on('json', (obj) => {
+        result.push(obj);
+      })
+      .on('done', (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(result);
+        }
+      });
   });
 };
 
-const readFirstLine = csvPath => new Promise((resolve, reject) => {
-  const rs = fs.createReadStream(csvPath, { encoding: 'utf8' });
-  let acc = '';
-  let pos = 0;
-  let index;
-  rs.on('data', (chunk) => {
-    index = chunk.indexOf('\n');
-    acc += chunk;
-    if (index !== -1) {
-      rs.close();
-    } else {
-      pos += chunk.length;
-    }
-  })
-  .on('close', () => {
-    resolve(acc.slice(0, pos + index));
-  })
-  .on('error', (err) => {
-    reject(err);
+const readFirstLine = (csvPath) =>
+  new Promise((resolve, reject) => {
+    const rs = fs.createReadStream(csvPath, { encoding: 'utf8' });
+    let acc = '';
+    let pos = 0;
+    let index;
+    rs.on('data', (chunk) => {
+      index = chunk.indexOf('\n');
+      acc += chunk;
+      if (index !== -1) {
+        rs.close();
+      } else {
+        pos += chunk.length;
+      }
+    })
+      .on('close', () => {
+        resolve(acc.slice(0, pos + index));
+      })
+      .on('error', (err) => {
+        reject(err);
+      });
   });
-});
 
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const csvScript = async (args) => {
   const csvPath = args.path;
@@ -69,10 +70,35 @@ const csvScript = async (args) => {
     const url2 = row.url2;
     const method = row.method;
     const sortKey = row.sortKey;
-    const body = row.body;
+    let body = row.body;
     const timeout = args.timeout;
     const skipcertificate = row.skipCertificate || false;
     const expectedStatusCode = row.expectedStatusCode ? parseInt(row.expectedStatusCode, 10) : null;
+    let customDiff = row.customDiff || '{}';
+    let customCompare = row.customCompare || '{}';
+
+    try {
+      const parsedJSON = JSON.parse(body);
+      body = [];
+      Object.keys(parsedJSON).forEach((key) => {
+        const value = parsedJSON[key];
+        body.push(`${key}:${value}`);
+      });
+    } catch (err) {
+      // do nothing
+    }
+
+    try {
+      customDiff = JSON.parse(customDiff);
+    } catch (err) {
+      throw new Error('invalid json provided to customDiff');
+    }
+
+    try {
+      customCompare = JSON.parse(customCompare);
+    } catch (err) {
+      throw new Error('invalid json provided to customCompare');
+    }
 
     if (url1.charAt(0) === '#') {
       continue; // eslint-disable-line
@@ -129,6 +155,8 @@ const csvScript = async (args) => {
       expectedStatusCode,
       skipHeaders,
       ignore: ignores,
+      customDiff,
+      customCompare,
     };
 
     try {
@@ -209,6 +237,7 @@ const csvScript = async (args) => {
   }
 };
 
-module.exports = args => csvScript(args).catch((err) => {
-  console.log(chalk.red(err.toString()));
-});
+module.exports = (args) =>
+  csvScript(args).catch((err) => {
+    console.log(chalk.red(err.toString()));
+  });

package.json

@@ -7,7 +7,20 @@ const diffScript = async (args) => {
   const leftUrl = args.leftURL;
   const rightURL = args.rightURL;
 
-  const diff = await core.diffURLs(leftUrl, rightURL, args);
+  const expectedStatusCode = args.expectedStatusCode ? parseInt(args.expectedStatusCode, 10) : null;
+  let customCompare = args.customCompare || '{}';
+
+  try {
+    customCompare = JSON.parse(customCompare);
+  } catch (err) {
+    throw new Error('invalid json provided to customCompare');
+  }
+
+  const diff = await core.diffURLs(leftUrl, rightURL, {
+    ...args,
+    customCompare,
+    expectedStatusCode,
+  });
 
   if (args.diffheaders) {
     const headersDiff = await core.diffJSON(diff.leftHeaders, diff.rightHeaders);
@@ -60,9 +73,17 @@ const diffScript = async (args) => {
   }
   const output = t.toString();
 
-  console.log(output);
+  if (!args.quiet) {
+    console.log(output);
+  }
+
+  if (args.failOnDiff && (diff.differences.length > 1 || diff.differences[0].diff !== 'none')) {
+    process.exit(1);
+  }
 };
 
-module.exports = args => diffScript(args).catch((err) => {
-  console.log(chalk.red(err.toString()));
-});
+module.exports = (args) =>
+  diffScript(args).catch((err) => {
+    console.log(chalk.red(err.toString()));
+    process.exit(1);
+  });