fix(npm-dist-tag): Improve robustness

lerna · Jan 5, 2019 · 63a7a89 · 63a7a89
1 parent 6c0d1d8
commit 63a7a89
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/utils/npm-dist-tag/__tests__/npm-dist-tag.test.js b/utils/npm-dist-tag/__tests__/npm-dist-tag.test.js
@@ -29,7 +29,7 @@ describe("npmDistTag.add()", () => {
       "added-tag": "1.0.1",
     });
     expect(fetch).toHaveBeenLastCalledWith(
-      "-/package/@scope%2fsome-pkg/dist-tags/added-tag",
+      "/-/package/@scope%2fsome-pkg/dist-tags/added-tag",
       expect.figgyPudding({
         method: "PUT",
         body: JSON.stringify("1.0.1"),
@@ -92,7 +92,7 @@ describe("npmDistTag.remove()", () => {
 
     expect(tags).not.toHaveProperty("removed-tag");
     expect(fetch).toHaveBeenLastCalledWith(
-      "-/package/@scope%2fsome-pkg/dist-tags/removed-tag",
+      "/-/package/@scope%2fsome-pkg/dist-tags/removed-tag",
       expect.figgyPudding({
         method: "DELETE",
       })
@@ -118,6 +118,7 @@ describe("npmDistTag.list()", () => {
       Promise.resolve({
         latest: "1.0.0",
         "other-tag": "1.0.1",
+        _etag: "should-be-removed",
       })
     );
 
@@ -129,12 +130,25 @@ describe("npmDistTag.list()", () => {
       "other-tag": "1.0.1",
     });
     expect(fetch.json).toHaveBeenLastCalledWith(
-      "-/package/@scope%2fsome-pkg/dist-tags",
+      "/-/package/@scope%2fsome-pkg/dist-tags",
       expect.figgyPudding({
+        "prefer-online": true,
         spec: expect.objectContaining({
           name: "@scope/some-pkg",
         }),
       })
     );
   });
+
+  it("handles disastrous results gracefully", async () => {
+    fetch.json.mockImplementationOnce(() =>
+      // i mean, wut
+      Promise.resolve(null)
+    );
+
+    const opts = new Map(baseOptions);
+    const tags = await npmDistTag.list("@scope/some-pkg", opts);
+
+    expect(tags).toEqual({});
+  });
 });
diff --git a/utils/npm-dist-tag/npm-dist-tag.js b/utils/npm-dist-tag/npm-dist-tag.js
@@ -40,7 +40,7 @@ function add(spec, tag, _opts) {
       return tags;
     }
 
-    const uri = `-/package/${opts.spec.escapedName}/dist-tags/${cleanTag}`;
+    const uri = `/-/package/${opts.spec.escapedName}/dist-tags/${encodeURIComponent(cleanTag)}`;
     const payload = opts.concat({
       method: "PUT",
       body: JSON.stringify(version),
@@ -49,6 +49,7 @@ function add(spec, tag, _opts) {
         // so we manually set the required content-type
         "content-type": "application/json",
       },
+      spec: opts.spec,
     });
 
     // success returns HTTP 204, thus no JSON to parse
@@ -78,7 +79,7 @@ function remove(spec, tag, _opts) {
       return tags;
     }
 
-    const uri = `-/package/${opts.spec.escapedName}/dist-tags/${tag}`;
+    const uri = `/-/package/${opts.spec.escapedName}/dist-tags/${encodeURIComponent(tag)}`;
     const payload = opts.concat({
       method: "DELETE",
     });
@@ -104,7 +105,20 @@ function list(spec, _opts) {
 }
 
 function fetchTags(opts) {
-  const uri = `-/package/${opts.spec.escapedName}/dist-tags`;
-
-  return fetch.json(uri, opts);
+  return fetch
+    .json(
+      `/-/package/${opts.spec.escapedName}/dist-tags`,
+      opts.concat({
+        "prefer-online": true,
+        spec: opts.spec,
+      })
+    )
+    .then(data => {
+      if (data && typeof data === "object") {
+        // eslint-disable-next-line no-param-reassign, no-underscore-dangle
+        delete data._etag;
+      }
+
+      return data || {};
+    });
 }