@npmcli/config 7.1.0 → 8.0.0

package/lib/definitions/definitions.js

@@ -472,6 +472,28 @@ define('commit-hooks', {
   flatten,
 })
 
+define('cpu', {
+  default: null,
+  type: [null, String],
+  description: `
+    Override CPU architecture of native modules to install.
+    Acceptable values are same as \`cpu\` field of package.json,
+    which comes from \`process.arch\`.
+  `,
+  flatten,
+})
+
+define('os', {
+  default: null,
+  type: [null, String],
+  description: `
+    Override OS of native modules to install.
+    Acceptable values are same as \`os\` field of package.json,
+    which comes from \`process.platform\`.
+  `,
+  flatten,
+})
+
 define('depth', {
   default: null,
   defaultDescription: `
@@ -941,6 +963,7 @@ define('include-workspace-root', {
 
 define('init-author-email', {
   default: '',
+  hint: '<email>',
   type: String,
   description: `
     The value \`npm init\` should use by default for the package author's
@@ -950,6 +973,7 @@ define('init-author-email', {
 
 define('init-author-name', {
   default: '',
+  hint: '<name>',
   type: String,
   description: `
     The value \`npm init\` should use by default for the package author's name.
@@ -959,6 +983,7 @@ define('init-author-name', {
 define('init-author-url', {
   default: '',
   type: ['', url],
+  hint: '<url>',
   description: `
     The value \`npm init\` should use by default for the package author's homepage.
   `,
@@ -966,6 +991,7 @@ define('init-author-url', {
 
 define('init-license', {
   default: 'ISC',
+  hint: '<license>',
   type: String,
   description: `
     The value \`npm init\` should use by default for the package license.
@@ -975,6 +1001,7 @@ define('init-license', {
 define('init-module', {
   default: '~/.npm-init.js',
   type: path,
+  hint: '<module>',
   description: `
     A module that will be loaded by the \`npm init\` command.  See the
     documentation for the
@@ -986,6 +1013,7 @@ define('init-module', {
 define('init-version', {
   default: '1.0.0',
   type: semver,
+  hint: '<version>',
   description: `
     The value that \`npm init\` should use by default for the package
     version number, if not already set in package.json.
@@ -1185,6 +1213,33 @@ define('local-address', {
   flatten,
 })
 
+define('sbom-format', {
+  default: null,
+  type: [
+    'cyclonedx',
+    'spdx',
+  ],
+  description: `
+    SBOM format to use when generating SBOMs.
+  `,
+  flatten,
+})
+
+define('sbom-type', {
+  default: 'library',
+  type: [
+    'library',
+    'application',
+    'framework',
+  ],
+  description: `
+    The type of package described by the generated SBOM. For SPDX, this is the
+    value for the \`primaryPackagePurpose\` fieled. For CycloneDX, this is the
+    value for the \`type\` field.
+  `,
+  flatten,
+})
+
 define('location', {
   default: 'user',
   short: 'L',

package/lib/definitions/index.js

@@ -18,13 +18,6 @@ const flatten = (obj, flat = {}) => {
       flat[key] = val
     }
   }
-
-  // XXX make this the bin/npm-cli.js file explicitly instead
-  // otherwise using npm programmatically is a bit of a pain.
-  flat.npmBin = require.main ? require.main.filename
-    : /* istanbul ignore next - not configurable property */ undefined
-  flat.nodeBin = process.env.NODE || process.execPath
-
   return flat
 }
 

package/lib/index.js

@@ -115,6 +115,7 @@ class Config {
     this.defaults = defaults
 
     this.npmPath = npmPath
+    this.npmBin = join(this.npmPath, 'bin/npm-cli.js')
     this.argv = argv
     this.env = env
     this.execPath = execPath
@@ -231,6 +232,8 @@ class Config {
     for (const { data } of this.data.values()) {
       this.#flatten(data, this.#flatOptions)
     }
+    this.#flatOptions.nodeBin = this.execPath
+    this.#flatOptions.npmBin = this.npmBin
     process.emit('timeEnd', 'config:load:flatten')
 
     return this.#flatOptions

package/lib/set-envs.js

@@ -101,10 +101,7 @@ const setEnvs = (config) => {
   if (cliConf['node-options']) {
     env.NODE_OPTIONS = cliConf['node-options']
   }
-
-  if (require.main && require.main.filename) {
-    env.npm_execpath = require.main.filename
-  }
+  env.npm_execpath = config.npmBin
   env.NODE = env.npm_node_execpath = config.execPath
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/config",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "files": [
     "bin/",
     "lib/"
@@ -19,8 +19,8 @@
     "snap": "tap",
     "lint": "eslint \"**/*.js\"",
     "postlint": "template-oss-check",
-    "lintfix": "node ../.. run lint -- --fix",
-    "posttest": "node ../.. run lint",
+    "lintfix": "npm run lint -- --fix",
+    "posttest": "npm run lint",
     "template-oss-apply": "template-oss-apply --force"
   },
   "tap": {
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/mock-globals": "^1.0.0",
-    "@npmcli/template-oss": "4.18.0",
+    "@npmcli/template-oss": "4.19.0",
     "tap": "^16.3.8"
   },
   "dependencies": {
@@ -46,10 +46,12 @@
     "walk-up-path": "^3.0.1"
   },
   "engines": {
-    "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+    "node": "^16.14.0 || >=18.0.0"
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.18.0"
+    "version": "4.19.0",
+    "content": "../../scripts/template-oss/index.js",
+    "npm": "npm"
   }
 }