Remove old config definitions and flattening logicisaacs/config-refactor

PR-URL: https://github.com/npm/cli/pull/2878
Credit: @isaacs
Close: #2878
Reviewed-by: @isaacs

2 files changed, 0 insertions, 1239 deletions

diff --git a/tap-snapshots/test-lib-utils-config.js-TAP.test.js b/tap-snapshots/test-lib-utils-config.js-TAP.test.js
deleted file mode 100644
index 39927e600..000000000
--- a/tap-snapshots/test-lib-utils-config.js-TAP.test.js
+++ /dev/null
@@ -1,1110 +0,0 @@
-/* IMPORTANT
- * This snapshot file is auto-generated, but designed for humans.
- * It should be checked into source control and tracked carefully.
- * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
- * Make sure to inspect the output below.  Do not ignore changes!
- */
-'use strict'
-exports[`test/lib/utils/config.js TAP no working network interfaces, on windows > must match snapshot 1`] = `
-Object {
-  "defaults": Object {
-    "_auth": null,
-    "access": null,
-    "all": false,
-    "allow-same-version": false,
-    "also": null,
-    "always-auth": false,
-    "audit": true,
-    "audit-level": null,
-    "auth-type": "legacy",
-    "before": null,
-    "bin-links": true,
-    "browser": null,
-    "ca": null,
-    "cache": "{CACHE DIR} npm-cache",
-    "cache-lock-retries": 10,
-    "cache-lock-stale": 60000,
-    "cache-lock-wait": 10000,
-    "cache-max": null,
-    "cache-min": 10,
-    "cafile": null,
-    "call": "",
-    "cert": null,
-    "ci-name": null,
-    "cidr": null,
-    "color": true,
-    "commit-hooks": true,
-    "depth": null,
-    "description": true,
-    "dev": false,
-    "diff": Array [],
-    "diff-dst-prefix": "",
-    "diff-ignore-all-space": false,
-    "diff-name-only": false,
-    "diff-no-prefix": false,
-    "diff-src-prefix": "",
-    "diff-text": false,
-    "diff-unified": null,
-    "dry-run": false,
-    "editor": "vim",
-    "engine-strict": false,
-    "fetch-retries": 2,
-    "fetch-retry-factor": 10,
-    "fetch-retry-maxtimeout": 60000,
-    "fetch-retry-mintimeout": 10000,
-    "fetch-timeout": 300000,
-    "force": false,
-    "foreground-script": false,
-    "format-package-lock": true,
-    "fund": true,
-    "git": "git",
-    "git-tag-version": true,
-    "global": false,
-    "global-style": false,
-    "heading": "npm",
-    "https-proxy": null,
-    "if-present": false,
-    "ignore-prepublish": false,
-    "ignore-scripts": false,
-    "include": Array [],
-    "include-staged": false,
-    "init-author-email": "",
-    "init-author-name": "",
-    "init-author-url": "",
-    "init-license": "ISC",
-    "init-module": "~/.npm-init.js",
-    "init-version": "1.0.0",
-    "init.author.email": "",
-    "init.author.name": "",
-    "init.author.url": "",
-    "init.license": "ISC",
-    "init.module": "~/.npm-init.js",
-    "init.version": "1.0.0",
-    "json": false,
-    "key": null,
-    "legacy-bundling": false,
-    "legacy-peer-deps": false,
-    "link": false,
-    "local-address": undefined,
-    "loglevel": "notice",
-    "logs-max": 10,
-    "long": false,
-    "maxsockets": 50,
-    "message": "%s",
-    "node-options": null,
-    "node-version": "v14.8.0",
-    "noproxy": null,
-    "npm-version": "7.0.0",
-    "offline": false,
-    "omit": Array [],
-    "only": null,
-    "optional": true,
-    "otp": null,
-    "package": Array [],
-    "package-lock": true,
-    "package-lock-only": false,
-    "parseable": false,
-    "prefer-offline": false,
-    "prefer-online": false,
-    "preid": "",
-    "production": false,
-    "progress": true,
-    "proxy": null,
-    "read-only": false,
-    "rebuild-bundle": true,
-    "registry": "https://registry.npmjs.org/",
-    "rollback": true,
-    "save": true,
-    "save-bundle": false,
-    "save-dev": false,
-    "save-exact": false,
-    "save-optional": false,
-    "save-prefix": "^",
-    "save-prod": false,
-    "scope": "",
-    "script-shell": null,
-    "scripts-prepend-node-path": "warn-only",
-    "searchexclude": null,
-    "searchlimit": 20,
-    "searchopts": "",
-    "searchstaleness": 900,
-    "shell": "cmd.exe",
-    "shrinkwrap": true,
-    "sign-git-commit": false,
-    "sign-git-tag": false,
-    "sso-poll-frequency": 500,
-    "sso-type": "oauth",
-    "strict-peer-deps": false,
-    "strict-ssl": true,
-    "tag": "latest",
-    "tag-version-prefix": "v",
-    "timing": false,
-    "tmp": "/tmp",
-    "umask": 0,
-    "unicode": true,
-    "update-notifier": true,
-    "usage": false,
-    "user-agent": "npm/{npm-version} node/{node-version} {platform} {arch} {ci}",
-    "userconfig": "~/.npmrc",
-    "version": false,
-    "versions": false,
-    "viewer": "browser",
-  },
-  "shorthands": Object {
-    "?": Array [
-      "--usage",
-    ],
-    "a": Array [
-      "--all",
-    ],
-    "B": Array [
-      "--save-bundle",
-    ],
-    "c": Array [
-      "--call",
-    ],
-    "C": Array [
-      "--prefix",
-    ],
-    "d": Array [
-      "--loglevel",
-      "info",
-    ],
-    "D": Array [
-      "--save-dev",
-    ],
-    "dd": Array [
-      "--loglevel",
-      "verbose",
-    ],
-    "ddd": Array [
-      "--loglevel",
-      "silly",
-    ],
-    "desc": Array [
-      "--description",
-    ],
-    "E": Array [
-      "--save-exact",
-    ],
-    "enjoy-by": Array [
-      "--before",
-    ],
-    "f": Array [
-      "--force",
-    ],
-    "g": Array [
-      "--global",
-    ],
-    "h": Array [
-      "--usage",
-    ],
-    "H": Array [
-      "--usage",
-    ],
-    "help": Array [
-      "--usage",
-    ],
-    "l": Array [
-      "--long",
-    ],
-    "local": Array [
-      "--no-global",
-    ],
-    "m": Array [
-      "--message",
-    ],
-    "n": Array [
-      "--no-yes",
-    ],
-    "no-desc": Array [
-      "--no-description",
-    ],
-    "no-reg": Array [
-      "--no-registry",
-    ],
-    "noreg": Array [
-      "--no-registry",
-    ],
-    "O": Array [
-      "--save-optional",
-    ],
-    "p": Array [
-      "--parseable",
-    ],
-    "P": Array [
-      "--save-prod",
-    ],
-    "porcelain": Array [
-      "--parseable",
-    ],
-    "q": Array [
-      "--loglevel",
-      "warn",
-    ],
-    "quiet": Array [
-      "--loglevel",
-      "warn",
-    ],
-    "readonly": Array [
-      "--read-only",
-    ],
-    "reg": Array [
-      "--registry",
-    ],
-    "s": Array [
-      "--loglevel",
-      "silent",
-    ],
-    "S": Array [
-      "--save",
-    ],
-    "silent": Array [
-      "--loglevel",
-      "silent",
-    ],
-    "v": Array [
-      "--version",
-    ],
-    "verbose": Array [
-      "--loglevel",
-      "verbose",
-    ],
-    "y": Array [
-      "--yes",
-    ],
-  },
-  "types": Object {
-    "_auth": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "access": Array [
-      null,
-      "restricted",
-      "public",
-    ],
-    "all": "{Boolean TYPE}",
-    "allow-same-version": "{Boolean TYPE}",
-    "also": Array [
-      null,
-      "dev",
-      "development",
-    ],
-    "always-auth": "{Boolean TYPE}",
-    "audit": "{Boolean TYPE}",
-    "audit-level": Array [
-      "low",
-      "moderate",
-      "high",
-      "critical",
-      "none",
-      null,
-    ],
-    "auth-type": Array [
-      "legacy",
-      "sso",
-      "saml",
-      "oauth",
-    ],
-    "before": Array [
-      null,
-      "{Date TYPE}",
-    ],
-    "bin-links": "{Boolean TYPE}",
-    "browser": Array [
-      null,
-      "{Boolean TYPE}",
-      "{String TYPE}",
-    ],
-    "ca": Array [
-      null,
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "cache": "{PATH MODULE}",
-    "cache-lock-retries": "{Number TYPE}",
-    "cache-lock-stale": "{Number TYPE}",
-    "cache-lock-wait": "{Number TYPE}",
-    "cache-max": "{Number TYPE}",
-    "cache-min": "{Number TYPE}",
-    "cafile": "{PATH MODULE}",
-    "call": "{String TYPE}",
-    "cert": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "ci-name": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "cidr": Array [
-      null,
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "color": Array [
-      "always",
-      "{Boolean TYPE}",
-    ],
-    "commit-hooks": "{Boolean TYPE}",
-    "depth": Array [
-      null,
-      "{Number TYPE}",
-    ],
-    "description": "{Boolean TYPE}",
-    "dev": "{Boolean TYPE}",
-    "diff": Array [
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "diff-dst-prefix": "{String TYPE}",
-    "diff-ignore-all-space": "{Boolean TYPE}",
-    "diff-name-only": "{Boolean TYPE}",
-    "diff-no-prefix": "{Boolean TYPE}",
-    "diff-src-prefix": "{String TYPE}",
-    "diff-text": "{Boolean TYPE}",
-    "diff-unified": Array [
-      null,
-      "{Number TYPE}",
-    ],
-    "dry-run": "{Boolean TYPE}",
-    "editor": "{String TYPE}",
-    "engine-strict": "{Boolean TYPE}",
-    "fetch-retries": "{Number TYPE}",
-    "fetch-retry-factor": "{Number TYPE}",
-    "fetch-retry-maxtimeout": "{Number TYPE}",
-    "fetch-retry-mintimeout": "{Number TYPE}",
-    "fetch-timeout": "{Number TYPE}",
-    "force": "{Boolean TYPE}",
-    "foreground-script": "{Boolean TYPE}",
-    "format-package-lock": "{Boolean TYPE}",
-    "fund": "{Boolean TYPE}",
-    "git": "{String TYPE}",
-    "git-tag-version": "{Boolean TYPE}",
-    "global": "{Boolean TYPE}",
-    "global-style": "{Boolean TYPE}",
-    "globalconfig": "{PATH MODULE}",
-    "heading": "{String TYPE}",
-    "https-proxy": Array [
-      null,
-      "{URL MODULE}",
-    ],
-    "if-present": "{Boolean TYPE}",
-    "ignore-prepublish": "{Boolean TYPE}",
-    "ignore-scripts": "{Boolean TYPE}",
-    "include": Array [
-      "{Array TYPE}",
-      "prod",
-      "dev",
-      "optional",
-      "peer",
-    ],
-    "include-staged": "{Boolean TYPE}",
-    "init-author-email": "{String TYPE}",
-    "init-author-name": "{String TYPE}",
-    "init-author-url": Array [
-      "",
-      "{URL MODULE}",
-    ],
-    "init-license": "{String TYPE}",
-    "init-module": "{PATH MODULE}",
-    "init-version": "{SEMVER MODULE}",
-    "init.author.email": "{String TYPE}",
-    "init.author.name": "{String TYPE}",
-    "init.author.url": Array [
-      "",
-      "{URL MODULE}",
-    ],
-    "init.license": "{String TYPE}",
-    "init.module": "{PATH MODULE}",
-    "init.version": "{SEMVER MODULE}",
-    "json": "{Boolean TYPE}",
-    "key": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "legacy-bundling": "{Boolean TYPE}",
-    "legacy-peer-deps": "{Boolean TYPE}",
-    "link": "{Boolean TYPE}",
-    "local-address": Array [
-      undefined,
-    ],
-    "loglevel": Array [
-      "silent",
-      "error",
-      "warn",
-      "notice",
-      "http",
-      "timing",
-      "info",
-      "verbose",
-      "silly",
-    ],
-    "logs-max": "{Number TYPE}",
-    "long": "{Boolean TYPE}",
-    "maxsockets": "{Number TYPE}",
-    "message": "{String TYPE}",
-    "node-options": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "node-version": Array [
-      null,
-      "{SEMVER MODULE}",
-    ],
-    "noproxy": Array [
-      null,
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "npm-version": "{SEMVER MODULE}",
-    "offline": "{Boolean TYPE}",
-    "omit": Array [
-      "{Array TYPE}",
-      "dev",
-      "optional",
-      "peer",
-    ],
-    "only": Array [
-      null,
-      "dev",
-      "development",
-      "prod",
-      "production",
-    ],
-    "optional": "{Boolean TYPE}",
-    "otp": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "package": Array [
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "package-lock": "{Boolean TYPE}",
-    "package-lock-only": "{Boolean TYPE}",
-    "parseable": "{Boolean TYPE}",
-    "prefer-offline": "{Boolean TYPE}",
-    "prefer-online": "{Boolean TYPE}",
-    "prefix": "{PATH MODULE}",
-    "preid": "{String TYPE}",
-    "production": "{Boolean TYPE}",
-    "progress": "{Boolean TYPE}",
-    "proxy": Array [
-      null,
-      false,
-      "{URL MODULE}",
-    ],
-    "read-only": "{Boolean TYPE}",
-    "rebuild-bundle": "{Boolean TYPE}",
-    "registry": Array [
-      null,
-      "{URL MODULE}",
-    ],
-    "rollback": "{Boolean TYPE}",
-    "save": "{Boolean TYPE}",
-    "save-bundle": "{Boolean TYPE}",
-    "save-dev": "{Boolean TYPE}",
-    "save-exact": "{Boolean TYPE}",
-    "save-optional": "{Boolean TYPE}",
-    "save-prefix": "{String TYPE}",
-    "save-prod": "{Boolean TYPE}",
-    "scope": "{String TYPE}",
-    "script-shell": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "scripts-prepend-node-path": Array [
-      "{Boolean TYPE}",
-      "auto",
-      "warn-only",
-    ],
-    "searchexclude": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "searchlimit": "{Number TYPE}",
-    "searchopts": "{String TYPE}",
-    "searchstaleness": "{Number TYPE}",
-    "shell": "{String TYPE}",
-    "shrinkwrap": "{Boolean TYPE}",
-    "sign-git-commit": "{Boolean TYPE}",
-    "sign-git-tag": "{Boolean TYPE}",
-    "sso-poll-frequency": "{Number TYPE}",
-    "sso-type": Array [
-      null,
-      "oauth",
-      "saml",
-    ],
-    "strict-peer-deps": "{Boolean TYPE}",
-    "strict-ssl": "{Boolean TYPE}",
-    "tag": "{String TYPE}",
-    "tag-version-prefix": "{String TYPE}",
-    "timing": "{Boolean TYPE}",
-    "tmp": "{PATH MODULE}",
-    "umask": "{Umask TYPE}",
-    "unicode": "{Boolean TYPE}",
-    "update-notifier": "{Boolean TYPE}",
-    "usage": "{Boolean TYPE}",
-    "user-agent": "{String TYPE}",
-    "userconfig": "{PATH MODULE}",
-    "version": "{Boolean TYPE}",
-    "versions": "{Boolean TYPE}",
-    "viewer": "{String TYPE}",
-  },
-}
-`
-
-exports[`test/lib/utils/config.js TAP working network interfaces, not windows > must match snapshot 1`] = `
-Object {
-  "defaults": Object {
-    "_auth": null,
-    "access": null,
-    "all": false,
-    "allow-same-version": false,
-    "also": null,
-    "always-auth": false,
-    "audit": true,
-    "audit-level": null,
-    "auth-type": "legacy",
-    "before": null,
-    "bin-links": true,
-    "browser": null,
-    "ca": null,
-    "cache": "{CACHE DIR} .npm",
-    "cache-lock-retries": 10,
-    "cache-lock-stale": 60000,
-    "cache-lock-wait": 10000,
-    "cache-max": null,
-    "cache-min": 10,
-    "cafile": null,
-    "call": "",
-    "cert": null,
-    "ci-name": null,
-    "cidr": null,
-    "color": true,
-    "commit-hooks": true,
-    "depth": null,
-    "description": true,
-    "dev": false,
-    "diff": Array [],
-    "diff-dst-prefix": "",
-    "diff-ignore-all-space": false,
-    "diff-name-only": false,
-    "diff-no-prefix": false,
-    "diff-src-prefix": "",
-    "diff-text": false,
-    "diff-unified": null,
-    "dry-run": false,
-    "editor": "vim",
-    "engine-strict": false,
-    "fetch-retries": 2,
-    "fetch-retry-factor": 10,
-    "fetch-retry-maxtimeout": 60000,
-    "fetch-retry-mintimeout": 10000,
-    "fetch-timeout": 300000,
-    "force": false,
-    "foreground-script": false,
-    "format-package-lock": true,
-    "fund": true,
-    "git": "git",
-    "git-tag-version": true,
-    "global": false,
-    "global-style": false,
-    "heading": "npm",
-    "https-proxy": null,
-    "if-present": false,
-    "ignore-prepublish": false,
-    "ignore-scripts": false,
-    "include": Array [],
-    "include-staged": false,
-    "init-author-email": "",
-    "init-author-name": "",
-    "init-author-url": "",
-    "init-license": "ISC",
-    "init-module": "~/.npm-init.js",
-    "init-version": "1.0.0",
-    "init.author.email": "",
-    "init.author.name": "",
-    "init.author.url": "",
-    "init.license": "ISC",
-    "init.module": "~/.npm-init.js",
-    "init.version": "1.0.0",
-    "json": false,
-    "key": null,
-    "legacy-bundling": false,
-    "legacy-peer-deps": false,
-    "link": false,
-    "local-address": undefined,
-    "loglevel": "notice",
-    "logs-max": 10,
-    "long": false,
-    "maxsockets": 50,
-    "message": "%s",
-    "node-options": null,
-    "node-version": "v14.8.0",
-    "noproxy": null,
-    "npm-version": "7.0.0",
-    "offline": false,
-    "omit": Array [],
-    "only": null,
-    "optional": true,
-    "otp": null,
-    "package": Array [],
-    "package-lock": true,
-    "package-lock-only": false,
-    "parseable": false,
-    "prefer-offline": false,
-    "prefer-online": false,
-    "preid": "",
-    "production": false,
-    "progress": true,
-    "proxy": null,
-    "read-only": false,
-    "rebuild-bundle": true,
-    "registry": "https://registry.npmjs.org/",
-    "rollback": true,
-    "save": true,
-    "save-bundle": false,
-    "save-dev": false,
-    "save-exact": false,
-    "save-optional": false,
-    "save-prefix": "^",
-    "save-prod": false,
-    "scope": "",
-    "script-shell": null,
-    "scripts-prepend-node-path": "warn-only",
-    "searchexclude": null,
-    "searchlimit": 20,
-    "searchopts": "",
-    "searchstaleness": 900,
-    "shell": "/usr/local/bin/bash",
-    "shrinkwrap": true,
-    "sign-git-commit": false,
-    "sign-git-tag": false,
-    "sso-poll-frequency": 500,
-    "sso-type": "oauth",
-    "strict-peer-deps": false,
-    "strict-ssl": true,
-    "tag": "latest",
-    "tag-version-prefix": "v",
-    "timing": false,
-    "tmp": "/tmp",
-    "umask": 0,
-    "unicode": true,
-    "update-notifier": true,
-    "usage": false,
-    "user-agent": "npm/{npm-version} node/{node-version} {platform} {arch} {ci}",
-    "userconfig": "~/.npmrc",
-    "version": false,
-    "versions": false,
-    "viewer": "man",
-  },
-  "shorthands": Object {
-    "?": Array [
-      "--usage",
-    ],
-    "a": Array [
-      "--all",
-    ],
-    "B": Array [
-      "--save-bundle",
-    ],
-    "c": Array [
-      "--call",
-    ],
-    "C": Array [
-      "--prefix",
-    ],
-    "d": Array [
-      "--loglevel",
-      "info",
-    ],
-    "D": Array [
-      "--save-dev",
-    ],
-    "dd": Array [
-      "--loglevel",
-      "verbose",
-    ],
-    "ddd": Array [
-      "--loglevel",
-      "silly",
-    ],
-    "desc": Array [
-      "--description",
-    ],
-    "E": Array [
-      "--save-exact",
-    ],
-    "enjoy-by": Array [
-      "--before",
-    ],
-    "f": Array [
-      "--force",
-    ],
-    "g": Array [
-      "--global",
-    ],
-    "h": Array [
-      "--usage",
-    ],
-    "H": Array [
-      "--usage",
-    ],
-    "help": Array [
-      "--usage",
-    ],
-    "l": Array [
-      "--long",
-    ],
-    "local": Array [
-      "--no-global",
-    ],
-    "m": Array [
-      "--message",
-    ],
-    "n": Array [
-      "--no-yes",
-    ],
-    "no-desc": Array [
-      "--no-description",
-    ],
-    "no-reg": Array [
-      "--no-registry",
-    ],
-    "noreg": Array [
-      "--no-registry",
-    ],
-    "O": Array [
-      "--save-optional",
-    ],
-    "p": Array [
-      "--parseable",
-    ],
-    "P": Array [
-      "--save-prod",
-    ],
-    "porcelain": Array [
-      "--parseable",
-    ],
-    "q": Array [
-      "--loglevel",
-      "warn",
-    ],
-    "quiet": Array [
-      "--loglevel",
-      "warn",
-    ],
-    "readonly": Array [
-      "--read-only",
-    ],
-    "reg": Array [
-      "--registry",
-    ],
-    "s": Array [
-      "--loglevel",
-      "silent",
-    ],
-    "S": Array [
-      "--save",
-    ],
-    "silent": Array [
-      "--loglevel",
-      "silent",
-    ],
-    "v": Array [
-      "--version",
-    ],
-    "verbose": Array [
-      "--loglevel",
-      "verbose",
-    ],
-    "y": Array [
-      "--yes",
-    ],
-  },
-  "types": Object {
-    "_auth": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "access": Array [
-      null,
-      "restricted",
-      "public",
-    ],
-    "all": "{Boolean TYPE}",
-    "allow-same-version": "{Boolean TYPE}",
-    "also": Array [
-      null,
-      "dev",
-      "development",
-    ],
-    "always-auth": "{Boolean TYPE}",
-    "audit": "{Boolean TYPE}",
-    "audit-level": Array [
-      "low",
-      "moderate",
-      "high",
-      "critical",
-      "none",
-      null,
-    ],
-    "auth-type": Array [
-      "legacy",
-      "sso",
-      "saml",
-      "oauth",
-    ],
-    "before": Array [
-      null,
-      "{Date TYPE}",
-    ],
-    "bin-links": "{Boolean TYPE}",
-    "browser": Array [
-      null,
-      "{Boolean TYPE}",
-      "{String TYPE}",
-    ],
-    "ca": Array [
-      null,
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "cache": "{PATH MODULE}",
-    "cache-lock-retries": "{Number TYPE}",
-    "cache-lock-stale": "{Number TYPE}",
-    "cache-lock-wait": "{Number TYPE}",
-    "cache-max": "{Number TYPE}",
-    "cache-min": "{Number TYPE}",
-    "cafile": "{PATH MODULE}",
-    "call": "{String TYPE}",
-    "cert": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "ci-name": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "cidr": Array [
-      null,
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "color": Array [
-      "always",
-      "{Boolean TYPE}",
-    ],
-    "commit-hooks": "{Boolean TYPE}",
-    "depth": Array [
-      null,
-      "{Number TYPE}",
-    ],
-    "description": "{Boolean TYPE}",
-    "dev": "{Boolean TYPE}",
-    "diff": Array [
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "diff-dst-prefix": "{String TYPE}",
-    "diff-ignore-all-space": "{Boolean TYPE}",
-    "diff-name-only": "{Boolean TYPE}",
-    "diff-no-prefix": "{Boolean TYPE}",
-    "diff-src-prefix": "{String TYPE}",
-    "diff-text": "{Boolean TYPE}",
-    "diff-unified": Array [
-      null,
-      "{Number TYPE}",
-    ],
-    "dry-run": "{Boolean TYPE}",
-    "editor": "{String TYPE}",
-    "engine-strict": "{Boolean TYPE}",
-    "fetch-retries": "{Number TYPE}",
-    "fetch-retry-factor": "{Number TYPE}",
-    "fetch-retry-maxtimeout": "{Number TYPE}",
-    "fetch-retry-mintimeout": "{Number TYPE}",
-    "fetch-timeout": "{Number TYPE}",
-    "force": "{Boolean TYPE}",
-    "foreground-script": "{Boolean TYPE}",
-    "format-package-lock": "{Boolean TYPE}",
-    "fund": "{Boolean TYPE}",
-    "git": "{String TYPE}",
-    "git-tag-version": "{Boolean TYPE}",
-    "global": "{Boolean TYPE}",
-    "global-style": "{Boolean TYPE}",
-    "globalconfig": "{PATH MODULE}",
-    "heading": "{String TYPE}",
-    "https-proxy": Array [
-      null,
-      "{URL MODULE}",
-    ],
-    "if-present": "{Boolean TYPE}",
-    "ignore-prepublish": "{Boolean TYPE}",
-    "ignore-scripts": "{Boolean TYPE}",
-    "include": Array [
-      "{Array TYPE}",
-      "prod",
-      "dev",
-      "optional",
-      "peer",
-    ],
-    "include-staged": "{Boolean TYPE}",
-    "init-author-email": "{String TYPE}",
-    "init-author-name": "{String TYPE}",
-    "init-author-url": Array [
-      "",
-      "{URL MODULE}",
-    ],
-    "init-license": "{String TYPE}",
-    "init-module": "{PATH MODULE}",
-    "init-version": "{SEMVER MODULE}",
-    "init.author.email": "{String TYPE}",
-    "init.author.name": "{String TYPE}",
-    "init.author.url": Array [
-      "",
-      "{URL MODULE}",
-    ],
-    "init.license": "{String TYPE}",
-    "init.module": "{PATH MODULE}",
-    "init.version": "{SEMVER MODULE}",
-    "json": "{Boolean TYPE}",
-    "key": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "legacy-bundling": "{Boolean TYPE}",
-    "legacy-peer-deps": "{Boolean TYPE}",
-    "link": "{Boolean TYPE}",
-    "local-address": Array [
-      undefined,
-      "127.0.0.1",
-      "no place like home",
-    ],
-    "loglevel": Array [
-      "silent",
-      "error",
-      "warn",
-      "notice",
-      "http",
-      "timing",
-      "info",
-      "verbose",
-      "silly",
-    ],
-    "logs-max": "{Number TYPE}",
-    "long": "{Boolean TYPE}",
-    "maxsockets": "{Number TYPE}",
-    "message": "{String TYPE}",
-    "node-options": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "node-version": Array [
-      null,
-      "{SEMVER MODULE}",
-    ],
-    "noproxy": Array [
-      null,
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "npm-version": "{SEMVER MODULE}",
-    "offline": "{Boolean TYPE}",
-    "omit": Array [
-      "{Array TYPE}",
-      "dev",
-      "optional",
-      "peer",
-    ],
-    "only": Array [
-      null,
-      "dev",
-      "development",
-      "prod",
-      "production",
-    ],
-    "optional": "{Boolean TYPE}",
-    "otp": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "package": Array [
-      "{String TYPE}",
-      "{Array TYPE}",
-    ],
-    "package-lock": "{Boolean TYPE}",
-    "package-lock-only": "{Boolean TYPE}",
-    "parseable": "{Boolean TYPE}",
-    "prefer-offline": "{Boolean TYPE}",
-    "prefer-online": "{Boolean TYPE}",
-    "prefix": "{PATH MODULE}",
-    "preid": "{String TYPE}",
-    "production": "{Boolean TYPE}",
-    "progress": "{Boolean TYPE}",
-    "proxy": Array [
-      null,
-      false,
-      "{URL MODULE}",
-    ],
-    "read-only": "{Boolean TYPE}",
-    "rebuild-bundle": "{Boolean TYPE}",
-    "registry": Array [
-      null,
-      "{URL MODULE}",
-    ],
-    "rollback": "{Boolean TYPE}",
-    "save": "{Boolean TYPE}",
-    "save-bundle": "{Boolean TYPE}",
-    "save-dev": "{Boolean TYPE}",
-    "save-exact": "{Boolean TYPE}",
-    "save-optional": "{Boolean TYPE}",
-    "save-prefix": "{String TYPE}",
-    "save-prod": "{Boolean TYPE}",
-    "scope": "{String TYPE}",
-    "script-shell": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "scripts-prepend-node-path": Array [
-      "{Boolean TYPE}",
-      "auto",
-      "warn-only",
-    ],
-    "searchexclude": Array [
-      null,
-      "{String TYPE}",
-    ],
-    "searchlimit": "{Number TYPE}",
-    "searchopts": "{String TYPE}",
-    "searchstaleness": "{Number TYPE}",
-    "shell": "{String TYPE}",
-    "shrinkwrap": "{Boolean TYPE}",
-    "sign-git-commit": "{Boolean TYPE}",
-    "sign-git-tag": "{Boolean TYPE}",
-    "sso-poll-frequency": "{Number TYPE}",
-    "sso-type": Array [
-      null,
-      "oauth",
-      "saml",
-    ],
-    "strict-peer-deps": "{Boolean TYPE}",
-    "strict-ssl": "{Boolean TYPE}",
-    "tag": "{String TYPE}",
-    "tag-version-prefix": "{String TYPE}",
-    "timing": "{Boolean TYPE}",
-    "tmp": "{PATH MODULE}",
-    "umask": "{Umask TYPE}",
-    "unicode": "{Boolean TYPE}",
-    "update-notifier": "{Boolean TYPE}",
-    "usage": "{Boolean TYPE}",
-    "user-agent": "{String TYPE}",
-    "userconfig": "{PATH MODULE}",
-    "version": "{Boolean TYPE}",
-    "versions": "{Boolean TYPE}",
-    "viewer": "{String TYPE}",
-  },
-}
-`
diff --git a/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js b/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js
deleted file mode 100644
index 47de89e97..000000000
--- a/tap-snapshots/test-lib-utils-flat-options.js-TAP.test.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/* IMPORTANT
- * This snapshot file is auto-generated, but designed for humans.
- * It should be checked into source control and tracked carefully.
- * Re-generate by setting TAP_SNAPSHOT=1 and running tests.
- * Make sure to inspect the output below.  Do not ignore changes!
- */
-'use strict'
-exports[`test/lib/utils/flat-options.js TAP basic > flat options 1`] = `
-Object {
-  "_auth": undefined,
-  "@scope:registry": "@scope:registry",
-  "//nerf.dart:_authToken": "//nerf.dart:_authToken",
-  "access": "access",
-  "all": undefined,
-  "allowSameVersion": "allow-same-version",
-  "alwaysAuth": "always-auth",
-  "audit": "audit",
-  "auditLevel": "audit-level",
-  "authType": "auth-type",
-  "before": "before",
-  "binLinks": "bin-links",
-  "browser": "browser",
-  "ca": "ca",
-  "cache": "cache/_cacache",
-  "cafile": "cafile",
-  "call": "call",
-  "cert": "cert",
-  "cidr": "cidr",
-  "color": true,
-  "commitHooks": "commit-hooks",
-  "defaultTag": "tag",
-  "depth": "depth",
-  "diff": undefined,
-  "diffDstPrefix": undefined,
-  "diffIgnoreAllSpace": undefined,
-  "diffNameOnly": undefined,
-  "diffNoPrefix": undefined,
-  "diffSrcPrefix": undefined,
-  "diffText": undefined,
-  "diffUnified": undefined,
-  "dmode": 511,
-  "dryRun": "dry-run",
-  "editor": "editor",
-  "engineStrict": "engine-strict",
-  "fmode": 438,
-  "force": "force",
-  "foregroundScripts": false,
-  "formatPackageLock": "format-package-lock",
-  "fund": "fund",
-  "git": "git",
-  "gitTagVersion": "git-tag-version",
-  "global": "global",
-  "globalPrefix": "/usr/local",
-  "globalStyle": "global-style",
-  "hashAlgorithm": "sha1",
-  "ignoreScripts": undefined,
-  "includeStaged": undefined,
-  "json": undefined,
-  "key": "key",
-  "legacyBundling": "legacy-bundling",
-  "legacyPeerDeps": undefined,
-  "localPrefix": "/path/to/npm/cli",
-  "log": Object {},
-  "long": undefined,
-  "message": "message",
-  "nodeBin": "/path/to/some/node",
-  "nodeVersion": "1.2.3",
-  "noProxy": "noproxy",
-  "npmBin": "/path/to/npm/bin.js",
-  "npmCommand": null,
-  "npmSession": "12345",
-  "npmVersion": "7.6.5",
-  "offline": "offline",
-  "omit": Array [],
-  "otp": "otp",
-  "package": "package",
-  "packageLock": true,
-  "packageLockOnly": "package-lock-only",
-  "parseable": undefined,
-  "preferDedupe": undefined,
-  "preferOffline": "prefer-offline",
-  "preferOnline": "prefer-online",
-  "prefix": "/path/to/npm/cli",
-  "preid": "preid",
-  "projectScope": "@npmcli",
-  "proxy": "proxy",
-  "readOnly": "read-only",
-  "rebuildBundle": "rebuild-bundle",
-  "registry": "registry",
-  "retry": Object {
-    "factor": "fetch-retry-factor",
-    "maxTimeout": "fetch-retry-maxtimeout",
-    "minTimeout": "fetch-retry-mintimeout",
-    "retries": "fetch-retries",
-  },
-  "save": "save",
-  "saveBundle": false,
-  "savePrefix": "",
-  "saveType": "peerOptional",
-  "scope": "",
-  "scriptShell": "script-shell",
-  "search": Object {
-    "description": "description",
-    "exclude": "searchexclude",
-    "limit": "searchlimit",
-    "opts": Null Object {
-      "from": "1",
-    },
-    "staleness": "searchstaleness",
-  },
-  "shell": undefined,
-  "signGitCommit": "sign-git-commit",
-  "signGitTag": "sign-git-tag",
-  "ssoPollFrequency": undefined,
-  "ssoType": undefined,
-  "strictPeerDeps": undefined,
-  "strictSSL": "strict-ssl",
-  "tag": "tag",
-  "tagVersionPrefix": "tag-version-prefix",
-  "timeout": "fetch-timeout",
-  "tmp": "/tmp",
-  "umask": 18,
-  "unicode": undefined,
-  "userAgent": "user-agent",
-  "viewer": "viewer",
-  "which": undefined,
-  "yes": undefined,
-}
-`