feat(dist-tag): Wrap options in figgy-pudding

utils/npm-dist-tag/__tests__/npm-dist-tag.test.js

@@ -8,6 +8,8 @@ const fetch = require("libnpm/fetch");
 // file under test
 const npmDistTag = require("..");
 
+expect.extend(require("@lerna-test/figgy-pudding-matchers"));
+
 const stubLog = {
   verbose: jest.fn(),
   info: jest.fn(),
@@ -28,7 +30,7 @@ describe("npmDistTag.add()", () => {
     });
     expect(fetch).toHaveBeenLastCalledWith(
       "-/package/@scope%2fsome-pkg/dist-tags/added-tag",
-      expect.objectContaining({
+      expect.figgyPudding({
         method: "PUT",
         body: JSON.stringify("1.0.1"),
         headers: {
@@ -91,7 +93,7 @@ describe("npmDistTag.remove()", () => {
     expect(tags).not.toHaveProperty("removed-tag");
     expect(fetch).toHaveBeenLastCalledWith(
       "-/package/@scope%2fsome-pkg/dist-tags/removed-tag",
-      expect.objectContaining({
+      expect.figgyPudding({
         method: "DELETE",
       })
     );
@@ -128,7 +130,7 @@ describe("npmDistTag.list()", () => {
     });
     expect(fetch.json).toHaveBeenLastCalledWith(
       "-/package/@scope%2fsome-pkg/dist-tags",
-      expect.objectContaining({
+      expect.figgyPudding({
         spec: expect.objectContaining({
           name: "@scope/some-pkg",
         }),

utils/npm-dist-tag/npm-dist-tag.js

@@ -2,19 +2,32 @@
 
 const npa = require("libnpm/parse-arg");
 const fetch = require("libnpm/fetch");
-const RegistryConfig = require("npm-registry-fetch/config");
+const figgyPudding = require("figgy-pudding");
 
 exports.add = add;
 exports.remove = remove;
 exports.list = list;
 
-function add(spec, tag, _opts) {
-  // tag is not in the pudding spec, handle separately
-  const cleanTag = (tag || _opts.get("tag")).trim();
+const DistTagConfig = figgyPudding(
+  {
+    log: {},
+    spec: {},
+    tag: {},
+  },
+  {
+    other() {
+      // open it up for the sake of tests
+      return true;
+    },
+  }
+);
 
-  const opts = RegistryConfig(_opts, {
+function add(spec, tag, _opts) {
+  const opts = DistTagConfig(_opts, {
     spec: npa(spec),
+    tag,
   });
+  const cleanTag = opts.tag.trim();
 
   const { name, rawSpec: version } = opts.spec;
 
@@ -38,7 +51,7 @@ function add(spec, tag, _opts) {
     });
 
     // success returns HTTP 204, thus no JSON to parse
-    return fetch(uri, payload.toJSON()).then(() => {
+    return fetch(uri, payload).then(() => {
       opts.log.verbose("dist-tag", `added "${cleanTag}" to ${name}@${version}`);
 
       // eslint-disable-next-line no-param-reassign
@@ -50,7 +63,7 @@ function add(spec, tag, _opts) {
 }
 
 function remove(spec, tag, _opts) {
-  const opts = RegistryConfig(_opts, {
+  const opts = DistTagConfig(_opts, {
     spec: npa(spec),
   });
 
@@ -70,7 +83,7 @@ function remove(spec, tag, _opts) {
     });
 
     // the delete properly returns a 204, so no json to parse
-    return fetch(uri, payload.toJSON()).then(() => {
+    return fetch(uri, payload).then(() => {
       opts.log.verbose("dist-tag", `removed "${tag}" from ${opts.spec.name}@${version}`);
 
       // eslint-disable-next-line no-param-reassign
@@ -82,7 +95,7 @@ function remove(spec, tag, _opts) {
 }
 
 function list(spec, _opts) {
-  const opts = RegistryConfig(_opts, {
+  const opts = DistTagConfig(_opts, {
     spec: npa(spec),
   });
 
@@ -92,5 +105,5 @@ function list(spec, _opts) {
 function fetchTags(opts) {
   const uri = `-/package/${opts.spec.escapedName}/dist-tags`;
 
-  return fetch.json(uri, opts.toJSON());
+  return fetch.json(uri, opts);
 }

utils/npm-dist-tag/package.json

@@ -31,7 +31,7 @@
     "test": "echo \"Run tests from root\" && exit 1"
   },
   "dependencies": {
-    "libnpm": "^2.0.1",
-    "npm-registry-fetch": "^3.8.0"
+    "figgy-pudding": "^3.5.1",
+    "libnpm": "^2.0.1"
   }
 }