fix pkg check for list, revoke, fix unknown issue for entity provider

Author: reggi

lib/commands/trust/github.js

@@ -52,7 +52,7 @@ class TrustGitHub extends TrustCommand {
 
   validateEntity (entity) {
     if (entity.split('/').length !== 2) {
-      throw new Error(`${this.providerEntity} must be specified in the format owner/repository`)
+      throw new Error(`${this.constructor.providerEntity} must be specified in the format owner/repository`)
     }
   }
 

lib/commands/trust/gitlab.js

@@ -51,7 +51,7 @@ class TrustGitLab extends TrustCommand {
 
   validateEntity (entity) {
     if (entity.split('/').length < 2) {
-      throw new Error(`${this.providerEntity} must be specified in the format group/project or group/subgroup/project`)
+      throw new Error(`${this.constructor.providerEntity} must be specified in the format group/project or group/subgroup/project`)
     }
   }
 

lib/commands/trust/list.js

@@ -1,4 +1,3 @@
-const pkgJson = require('@npmcli/package-json')
 const { otplease } = require('../../utils/auth.js')
 const npmFetch = require('npm-registry-fetch')
 const npa = require('npm-package-arg')
@@ -30,9 +29,8 @@ class TrustList extends TrustCommand {
     return TrustCommand.bodyToOptions(body)
   }
 
-  async exec (args) {
-    const { content } = await pkgJson.normalize(this.npm.prefix)
-    const packageName = args[0] || content.name
+  async exec (positionalArgs) {
+    const packageName = positionalArgs[0] || (await this.optionalPkgJson()).name
     if (!packageName) {
       throw new Error('Package name must be specified either as an argument or in the package.json file')
     }

lib/commands/trust/revoke.js

@@ -1,6 +1,5 @@
 const globalDefinitions = require('@npmcli/config/lib/definitions/definitions.js')
 const Definition = require('@npmcli/config/lib/definitions/definition.js')
-const pkgJson = require('@npmcli/package-json')
 const { otplease } = require('../../utils/auth.js')
 const npmFetch = require('npm-registry-fetch')
 const npa = require('npm-package-arg')
@@ -27,8 +26,7 @@ class TrustRevoke extends TrustCommand {
 
   async exec (positionalArgs, flags) {
     const dryRun = this.config.get('dry-run')
-    const { content } = await pkgJson.normalize(this.npm.prefix)
-    const pkgName = positionalArgs[0] || content.name
+    const pkgName = positionalArgs[0] || (await this.optionalPkgJson()).name
     if (!pkgName) {
       throw new Error('Package name must be specified either as an argument or in the package.json file')
     }

test/lib/commands/trust/list.js

@@ -122,7 +122,7 @@ t.test('list without package name and no package.json', async t => {
 
   await t.rejects(
     npm.exec('trust', ['list']),
-    { message: /Could not read package\.json/ }
+    { message: /Package name must be specified either as an argument or in the package\.json file/ }
   )
 })
 

test/lib/commands/trust/revoke.js

@@ -84,7 +84,7 @@ t.test('revoke without package name and no package.json', async t => {
 
   await t.rejects(
     npm.exec('trust', ['revoke', '--id', 'test-id']),
-    { message: /Could not read package\.json/ }
+    { message: /Package name must be specified either as an argument or in the package\.json file/ }
   )
 })