Merge pull request #13 from jalal246/dev

fix bug in dealing with empty json and invalid name
jalal246 · May 6, 2020 · 16ff422 · 16ff422
2 parents 7719552 + f830727
commit 16ff422
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 8 deletions.
diff --git a/src/getJsonByPath.js b/src/getJsonByPath.js
@@ -40,6 +40,8 @@ function getJsonByPath(...defaultPaths) {
   const pkgInfo = {};
   const unfoundJson = [];
 
+  let i = 0;
+
   const packagesJson = foundPaths
     .map((pkgPath) => {
       const pkgJson = resolve(pkgPath, "package.json");
@@ -48,27 +50,40 @@ function getJsonByPath(...defaultPaths) {
 
       if (!isValid) {
         unfoundJson.push(pkgJson);
+
         return null;
       }
 
       const json = fs.readFileSync(pkgJson, "utf8");
 
-      const { name, peerDependencies, dependencies, ...other } = JSON.parse(
-        json
-      );
+      if (!json) {
+        unfoundJson.push(pkgJson);
+
+        return null;
+      }
+
+      const parsed = JSON.parse(json);
+
+      if (parsed.constructor !== Object || Object.keys(parsed).length === 0) {
+        unfoundJson.push(pkgJson);
+
+        return null;
+      }
+
+      const { name, ...rest } = JSON.parse(json);
 
       /**
        * Add extracted extra info to pkgInfo and keep pkgJson as it is.
        */
-      pkgInfo[name] = {
+      pkgInfo[name || i] = {
         path: pkgPath,
       };
 
+      i += 1;
+
       return {
         name,
-        peerDependencies,
-        dependencies,
-        ...other,
+        ...rest,
       };
     })
     .filter(Boolean);

diff --git a/test/fixtures/empty-json/index.js b/test/fixtures/empty-json/index.js
diff --git a/test/fixtures/empty-json/package.json b/test/fixtures/empty-json/package.json
@@ -0,0 +1 @@
+{}
diff --git a/test/fixtures/invlaid-json/package.json b/test/fixtures/invlaid-json/package.json
@@ -0,0 +1 @@
+""
diff --git a/test/fixtures/json-without-obj/index.js b/test/fixtures/json-without-obj/index.js
diff --git a/test/fixtures/json-without-obj/package.json b/test/fixtures/json-without-obj/package.json
diff --git a/test/fixtures/no-json/index.js b/test/fixtures/no-json/index.js
diff --git a/test/getJsonByPath.test.js b/test/getJsonByPath.test.js
@@ -36,7 +36,7 @@ describe("getJsonByPath", () => {
     const { json, pkgInfo, unfoundJson } = getJsonByPath(...rootPath);
 
     expect(json.length).to.be.equal(6);
-    expect(unfoundJson.length).to.be.equal(1);
+    expect(unfoundJson.length).to.be.equal(4);
 
     json.forEach(({ name }) => {
       expect(name).to.be.an("string");