@yanglaofish/fishtools 0.5.2 → 0.5.3

package/node_modules/nopt/lib/nopt-lib.js

@@ -1,4 +1,5 @@
 const abbrev = require('abbrev')
+const debug = require('./debug')
 const defaultTypeDefs = require('./type-defs')
 
 const hasOwn = (o, k) => Object.prototype.hasOwnProperty.call(o, k)
@@ -30,6 +31,8 @@ function nopt (args, {
   typeDefault,
   dynamicTypes,
 } = {}) {
+  debug(types, shorthands, args, typeDefs)
+
   const data = {}
   const argv = {
     remain: [],
@@ -86,6 +89,7 @@ function clean (data, {
       return
     }
     let val = data[k]
+    debug('val=%j', val)
     const isArray = Array.isArray(val)
     let [hasType, rawType] = getType(k, { types, dynamicTypes })
     let type = rawType
@@ -102,9 +106,12 @@ function clean (data, {
       type = [type]
     }
 
+    debug('val=%j', val)
+    debug('types=', type)
     val = val.map((v) => {
       // if it's an unknown value, then parse false/true/null/numbers/dates
       if (typeof v === 'string') {
+        debug('string %j', v)
         v = v.trim()
         if ((v === 'null' && ~type.indexOf(null))
             || (v === 'true' &&
@@ -112,9 +119,12 @@ function clean (data, {
             || (v === 'false' &&
                (~type.indexOf(false) || hasTypeDef(type, BooleanType)))) {
           v = JSON.parse(v)
+          debug('jsonable %j', v)
         } else if (hasTypeDef(type, NumberType) && !isNaN(v)) {
+          debug('convert to number', v)
           v = +v
         } else if (hasTypeDef(type, DateType) && !isNaN(Date.parse(v))) {
+          debug('convert to date', v)
           v = new Date(v)
         }
       }
@@ -138,24 +148,32 @@ function clean (data, {
 
       const d = {}
       d[k] = v
+      debug('prevalidated val', d, v, rawType)
       if (!validate(d, k, v, rawType, { typeDefs })) {
         if (invalidHandler) {
           invalidHandler(k, v, rawType, data)
+        } else if (invalidHandler !== false) {
+          debug('invalid: ' + k + '=' + v, rawType)
         }
         return remove
       }
+      debug('validated v', d, v, rawType)
       return d[k]
     }).filter((v) => v !== remove)
 
     // if we allow Array specifically, then an empty array is how we
     // express 'no value here', not null.  Allow it.
     if (!val.length && doesNotHaveTypeDef(type, ArrayType)) {
+      debug('VAL HAS NO LENGTH, DELETE IT', val, k, type.indexOf(ArrayType))
       delete data[k]
     } else if (isArray) {
+      debug(isArray, data[k], val)
       data[k] = val
     } else {
       data[k] = val[0]
     }
+
+    debug('k=%s val=%j', k, val, data[k])
   })
 }
 
@@ -181,21 +199,21 @@ function validate (data, k, val, type, { typeDefs } = {}) {
   }
 
   // Original comment:
-  // NaN is poisonous, it means that something is not allowed.
-
-  // New comment:
-  // Changing this to an isNaN check breaks a lot of tests.
-  // Something is being assumed here that is not actually what happens in practice.
-  // Fixing it is outside the scope of getting linting to pass in this repo.
-  // Leaving as-is for now.
+  // NaN is poisonous.  Means that something is not allowed.
+  // New comment: Changing this to an isNaN check breaks a lot of tests.
+  // Something is being assumed here that is not actually what happens in
+  // practice.  Fixing it is outside the scope of getting linting to pass in
+  // this repo. Leaving as-is for now.
   /* eslint-disable-next-line no-self-compare */
   if (type !== type) {
+    debug('Poison NaN', k, val, type)
     delete data[k]
     return false
   }
 
   // explicit list of values
   if (val === type) {
+    debug('Explicitly allowed %j', val)
     data[k] = val
     return true
   }
@@ -204,6 +222,7 @@ function validate (data, k, val, type, { typeDefs } = {}) {
   let ok = false
   const types = Object.keys(typeDefs)
   for (let i = 0, l = types.length; i < l; i++) {
+    debug('test type %j %j %j', k, val, types[i])
     const t = typeDefs[types[i]]
     if (t && (
       (type && type.name && t.type && t.type.name) ?
@@ -219,6 +238,7 @@ function validate (data, k, val, type, { typeDefs } = {}) {
       }
     }
   }
+  debug('OK? %j (%j %j %j)', ok, k, val, types[types.length - 1])
 
   if (!ok) {
     delete data[k]
@@ -238,11 +258,16 @@ function parse (args, data, remain, {
   const NumberType = typeDefs.Number?.type
   const ArrayType = typeDefs.Array?.type
   const BooleanType = typeDefs.Boolean?.type
+
+  debug('parse', args, data, remain)
+
   const abbrevs = abbrev(Object.keys(types))
+  debug('abbrevs=%j', abbrevs)
   const shortAbbr = abbrev(Object.keys(shorthands))
 
   for (let i = 0; i < args.length; i++) {
     let arg = args[i]
+    debug('arg', arg)
 
     if (arg.match(/^-{2,}$/)) {
       // done with keys.
@@ -264,6 +289,7 @@ function parse (args, data, remain, {
       // see if it's a shorthand
       // if so, splice and back up to re-parse it.
       const shRes = resolveShort(arg, shortAbbr, abbrevs, { shorthands, abbrevHandler })
+      debug('arg=%j shRes=%j', arg, shRes)
       if (shRes) {
         args.splice.apply(args, [i, 1].concat(shRes))
         if (arg !== shRes[0]) {
@@ -282,6 +308,8 @@ function parse (args, data, remain, {
       if (abbrevs[arg] && abbrevs[arg] !== arg) {
         if (abbrevHandler) {
           abbrevHandler(arg, abbrevs[arg])
+        } else if (abbrevHandler !== false) {
+          debug(`abbrev: ${arg} -> ${abbrevs[arg]}`)
         }
         arg = abbrevs[arg]
       }
@@ -324,6 +352,11 @@ function parse (args, data, remain, {
           } else {
             unknownHandler(arg)
           }
+        } else if (unknownHandler !== false) {
+          debug(`unknown: ${arg}`)
+          if (hangingLa) {
+            debug(`unknown: ${la} parsed as normal opt`)
+          }
         }
       }
 
@@ -409,6 +442,7 @@ const singleCharacters = (arg, shorthands) => {
       return l
     }, {})
     shorthands[SINGLES] = singles
+    debug('shorthand singles', singles)
   }
   const chrs = arg.split('').filter((c) => singles[c])
   return chrs.join('') === arg ? chrs : null
@@ -456,6 +490,8 @@ function resolveShort (arg, ...rest) {
   if (shortAbbr[arg]) {
     if (abbrevHandler) {
       abbrevHandler(arg, shortAbbr[arg])
+    } else if (abbrevHandler !== false) {
+      debug(`abbrev: ${arg} -> ${shortAbbr[arg]}`)
     }
     arg = shortAbbr[arg]
   }

package/node_modules/nopt/lib/nopt.js

@@ -1,8 +1,10 @@
 const lib = require('./nopt-lib')
 const defaultTypeDefs = require('./type-defs')
 
-// This is the version of nopt's API that requires setting typeDefs and invalidHandler on the required `nopt` object since it is a singleton.
-// To not do a breaking change an API that requires all options be passed in is located in `nopt-lib.js` and exported here as lib.
+// This is the version of nopt's API that requires setting typeDefs and invalidHandler
+// on the required `nopt` object since it is a singleton. To not do a breaking change
+// an API that requires all options be passed in is located in `nopt-lib.js` and
+// exported here as lib.
 // TODO(breaking): make API only work in non-singleton mode
 
 module.exports = exports = nopt

package/node_modules/nopt/lib/type-defs.js

@@ -1,7 +1,8 @@
-const os = require('node:os')
-const path = require('node:path')
-const { Stream } = require('node:stream')
-const { URL } = require('node:url')
+const url = require('url')
+const path = require('path')
+const Stream = require('stream').Stream
+const os = require('os')
+const debug = require('./debug')
 
 function validateString (data, k, val) {
   data[k] = String(val)
@@ -30,6 +31,7 @@ function validatePath (data, k, val) {
 }
 
 function validateNumber (data, k, val) {
+  debug('validate Number %j %j %j', k, val, isNaN(val))
   if (isNaN(val)) {
     return false
   }
@@ -38,6 +40,7 @@ function validateNumber (data, k, val) {
 
 function validateDate (data, k, val) {
   const s = Date.parse(val)
+  debug('validate Date %j %j %j', k, val, s)
   if (isNaN(s)) {
     return false
   }
@@ -60,11 +63,13 @@ function validateBoolean (data, k, val) {
 }
 
 function validateUrl (data, k, val) {
-  const parsed = URL.parse(String(val))
-  if (!parsed) {
+  // Changing this would be a breaking change in the npm cli
+  /* eslint-disable-next-line node/no-deprecated-api */
+  val = url.parse(String(val))
+  if (!val.host) {
     return false
   }
-  data[k] = parsed.href
+  data[k] = val.href
 }
 
 function validateStream (data, k, val) {
@@ -77,7 +82,7 @@ function validateStream (data, k, val) {
 module.exports = {
   String: { type: String, validate: validateString },
   Boolean: { type: Boolean, validate: validateBoolean },
-  url: { type: URL, validate: validateUrl },
+  url: { type: url, validate: validateUrl },
   Number: { type: Number, validate: validateNumber },
   path: { type: path, validate: validatePath },
   Stream: { type: Stream, validate: validateStream },

package/node_modules/nopt/package.json

@@ -1,20 +1,18 @@
 {
   "name": "nopt",
-  "version": "10.0.1",
+  "version": "9.0.0",
   "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.",
   "author": "GitHub Inc.",
   "main": "lib/nopt.js",
   "scripts": {
-    "test": "node --test './test/**/*.js'",
+    "test": "tap",
     "lint": "npm run eslint",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
     "lintfix": "npm run eslint -- --fix",
-    "snap": "node --test --test-update-snapshots './test/**/*.js'",
+    "snap": "tap",
     "posttest": "npm run lint",
-    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "test:node20": "node --test test",
-    "test:cover": "node --test --experimental-test-coverage --test-timeout=3000 --test-coverage-lines=100 --test-coverage-functions=100 --test-coverage-branches=100 './test/**/*.js'"
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "repository": {
     "type": "git",
@@ -25,26 +23,30 @@
   },
   "license": "ISC",
   "dependencies": {
-    "abbrev": "^5.0.0"
+    "abbrev": "^4.0.0"
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^7.0.0",
-    "@npmcli/template-oss": "5.1.0"
+    "@npmcli/eslint-config": "^5.0.0",
+    "@npmcli/template-oss": "4.27.1",
+    "tap": "^16.3.0"
+  },
+  "tap": {
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
   },
   "files": [
     "bin/",
     "lib/"
   ],
   "engines": {
-    "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "5.1.0",
-    "publish": true,
-    "testRunner": "node:test",
-    "latestCiVersion": 24,
-    "updateNpm": false
+    "version": "4.27.1",
+    "publish": true
   }
 }

package/node_modules/npm-bundled/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-bundled",
-  "version": "6.0.0",
+  "version": "5.0.0",
   "description": "list things in node_modules that are bundledDependencies, or transitive dependencies thereof",
   "main": "lib/index.js",
   "repository": {
@@ -10,8 +10,8 @@
   "author": "GitHub Inc.",
   "license": "ISC",
   "devDependencies": {
-    "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "5.1.0",
+    "@npmcli/eslint-config": "^5.0.0",
+    "@npmcli/template-oss": "4.27.1",
     "mutate-fs": "^2.1.1",
     "tap": "^16.3.0"
   },
@@ -30,14 +30,14 @@
     "lib/"
   ],
   "dependencies": {
-    "npm-normalize-package-bin": "^6.0.0"
+    "npm-normalize-package-bin": "^5.0.0"
   },
   "engines": {
-    "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "5.1.0",
+    "version": "4.27.1",
     "publish": true
   },
   "tap": {

package/node_modules/npm-install-checks/package.json

@@ -1,14 +1,14 @@
 {
   "name": "npm-install-checks",
-  "version": "9.0.0",
+  "version": "8.0.0",
   "description": "Check the engines and platform fields in package.json",
   "main": "lib/index.js",
   "dependencies": {
     "semver": "^7.1.1"
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "5.1.0",
+    "@npmcli/eslint-config": "^5.0.0",
+    "@npmcli/template-oss": "4.27.1",
     "tap": "^16.0.1"
   },
   "scripts": {
@@ -35,12 +35,12 @@
     "lib/"
   ],
   "engines": {
-    "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "5.1.0",
+    "version": "4.27.1",
     "publish": "true"
   },
   "tap": {

package/node_modules/npm-normalize-package-bin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-normalize-package-bin",
-  "version": "6.0.0",
+  "version": "5.0.0",
   "description": "Turn any flavor of allowable package.json bin into a normalized object",
   "main": "lib/index.js",
   "repository": {
@@ -10,33 +10,36 @@
   "author": "GitHub Inc.",
   "license": "ISC",
   "scripts": {
-    "test": "node --test './test/**/*.js'",
-    "snap": "node --test --test-update-snapshots './test/**/*.js'",
+    "test": "tap",
+    "snap": "tap",
     "lint": "npm run eslint",
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
     "lintfix": "npm run eslint -- --fix",
     "posttest": "npm run lint",
-    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
-    "test:node20": "node --test test",
-    "test:cover": "node --test --experimental-test-coverage --test-timeout=3000 --test-coverage-lines=100 --test-coverage-functions=100 --test-coverage-branches=100 './test/**/*.js'"
+    "eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "5.0.0"
+    "@npmcli/eslint-config": "^5.0.0",
+    "@npmcli/template-oss": "4.27.1",
+    "tap": "^16.3.0"
   },
   "files": [
     "bin/",
     "lib/"
   ],
   "engines": {
-    "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "5.0.0",
-    "publish": "true",
-    "testRunner": "node:test",
-    "latestCiVersion": 24
+    "version": "4.27.1",
+    "publish": "true"
+  },
+  "tap": {
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
   }
 }

package/node_modules/npm-package-arg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-package-arg",
-  "version": "14.0.0",
+  "version": "13.0.2",
   "description": "Parse the things that can be arguments to `npm install`",
   "main": "./lib/npa.js",
   "directories": {
@@ -11,14 +11,14 @@
     "lib/"
   ],
   "dependencies": {
-    "hosted-git-info": "^10.1.0",
-    "proc-log": "^7.0.0",
+    "hosted-git-info": "^9.0.0",
+    "proc-log": "^6.0.0",
     "semver": "^7.3.5",
-    "validate-npm-package-name": "^8.0.0"
+    "validate-npm-package-name": "^7.0.0"
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "5.1.0",
+    "@npmcli/template-oss": "4.28.0",
     "tap": "^16.0.1"
   },
   "scripts": {
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/npm/npm-package-arg",
   "engines": {
-    "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "tap": {
     "nyc-arg": [
@@ -54,7 +54,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "5.1.0",
+    "version": "4.28.0",
     "publish": true
   }
 }

package/node_modules/npm-packlist/README.md

@@ -30,9 +30,11 @@ arborist.loadActual().then((tree) => {
 This uses the following rules:
 
 1. If a `package.json` file is found, and it has a `files` list,
-   then ignore everything that isn't matched by `files`.  Always include the
-   root readme, license, licence and copying files, if they exist, as well
-   as the package.json file itself.
+   then ignore everything that isn't in `files`.  Always include the root
+   readme, license, licence and copying files, if they exist, as well
+   as the package.json file itself. Non-root readme, license, licence and
+   copying files are included by default, but can be excluded using the 
+   `files` list e.g. `"!readme"`.
 2. If there's no `package.json` file (or it has no `files` list), and
    there is a `.npmignore` file, then ignore all the files in the
    `.npmignore` file.
@@ -43,7 +45,7 @@ This uses the following rules:
    bundled dependency.  If it IS a bundled dependency, and it's a
    symbolic link, then the target of the link is included, not the
    symlink itself.
-5. Unless they're explicitly included (by being in a `files` list, or
+4. Unless they're explicitly included (by being in a `files` list, or
    a `!negated` rule in a relevant `.npmignore` or `.gitignore`),
    always ignore certain common cruft files:
 
@@ -56,65 +58,48 @@ This uses the following rules:
     6. Darwin's `.DS_Store` files because wtf are those even
     7. `npm-debug.log` files at the root of a project
 
-    You can explicitly re-include most of these with a negated ignore file rule.
-    A small set of files are always ignored regardless of `files` rules:
-    `.git`, `.npmrc`, and `node_modules`.
+    You can explicitly re-include any of these with a `files` list in
+    `package.json` or a negated ignore file rule.
 
 Only the `package.json` file in the very root of the project is ever
 inspected for a `files` list.  Below the top level of the root package,
 `package.json` is treated as just another file, and no package-specific
 semantics are applied.
 
-### Interpretation of the `files` list
+### Interaction between `package.json` and `.npmignore` rules
 
-Each entry in the `package.json` `files` list is interpreted as a glob
-pattern, expanded against the package root using node's built-in
-[`fs.globSync`](https://nodejs.org/api/fs.html#fsglobsyncpattern-options).
-Literal paths (`lib`, `src/index.js`) are valid globs and resolve to
-themselves; pattern entries (`dist-*`, `**/*.js`) resolve to every
-matching entry on disk; entries that match nothing are silently dropped.
+In previous versions of this library, the `files` list in `package.json`
+was used as an initial filter to drive further tree walking. That is no
+longer the case as of version 6.0.0.
 
-When an entry matches a directory, the directory and all of its contents
-are included.  This is a documented convenience: writing
-`"files": ["dist"]` does not require also writing `"dist/**"`.
+If you have a `package.json` file with a `files` array within, any top
+level `.npmignore` and `.gitignore` files *will be ignored*.
 
-A leading `!` makes the entry a negation, removing matches from the
-result.  Negations are evaluated in order, so a later positive entry
-can re-include something a previous negation excluded.
+If a _directory_ is listed in `files`, then any rules in nested `.npmignore` files within that directory will be honored.
 
-#### Pattern semantics are anchored to the package root
+For example, with this package.json:
 
-Glob patterns are evaluated as paths relative to the package root, not as
-basename-anywhere matchers.  In particular:
-
-* `"*.js"` matches `.js` files at the package root, not at every depth.
-  Use `"**/*.js"` to match at every depth.
-* `"!readme.md"` removes only the root `readme.md`.  Use
-  `"!**/readme.md"` to remove `readme.md` at every depth.
-
-Negations only exclude paths that exist on disk at packlist time: a `!path`
-entry that matches nothing is silently dropped, same as a positive entry
-that matches nothing.  A typo'd negation has no effect.
-
-#### Interaction with `.npmignore`
+```json
+{
+  "files": [ "dir" ]
+}
+```
 
-If a `package.json` `files` array is present, any **top-level**
-`.npmignore` and `.gitignore` files are ignored: the `files` array is
-the sole source of inclusion at the package root.
+a `.npmignore` file at `dir/.npmignore` (and any subsequent
+sub-directories) will be honored.  However, a `.npmignore` at the root
+level will be skipped.
 
-`.npmignore` files in subdirectories are still honored within their
-subtree.  For example, with this package.json:
+Additionally, with this package.json:
 
-```json
+```
 {
-  "files": [ "dir" ]
+  "files": ["dir/subdir"]
 }
 ```
 
-a `.npmignore` at `dir/.npmignore` (and any nested subdirectory) will
-be applied.  This means a file listed both in `files` and excluded by a
-nested `.npmignore` will be excluded from the tarball; if you need such
-a file to ship, remove the `.npmignore` rule.
+a `.npmignore` file at `dir/.npmignore` will be honored, as well as `dir/subdir/.npmignore`.
+
+Any specific file matched by an exact filename in the package.json `files` list will be included, and cannot be excluded, by any `.npmignore` files.
 
 ## API