fix: fix npm api

Author: zdm

lib/package.js

@@ -613,13 +613,13 @@ export default class Package {
     }
 
     async runScript ( script, args ) {
-        return this.npm.api.runScript( script, { args } );
+        return this.npm.runScript( script, { args } );
     }
 
     async getOutdatedDependencies ( { all } = {} ) {
         if ( !this.dependencies.hasDependencies ) return result( 200 );
 
-        return this.npm.api.getOutdatedDependencies( { all } );
+        return this.npm.getOutdatedDependencies( { all } );
     }
 
     async updateDependencies ( { all, outdated, install, reinstall, commit, quiet, confirmInstall, outdatedDependencies, cache = {} } = {} ) {
@@ -836,7 +836,7 @@ export default class Package {
         // perform update
         process.stdout.write( "Updating dependencies ... " );
 
-        res = await this.npm.api.exec( "update" );
+        res = await this.npm.exec( "update" );
 
         if ( res.ok ) {
             console.log( ansi.ok( " OK " ) );
@@ -934,7 +934,7 @@ export default class Package {
             res = result( [ 200, "No tests to run" ] );
         }
         else {
-            res = await this.npm.api.runScript( "test", { log } );
+            res = await this.npm.runScript( "test", { log } );
         }
 
         if ( log ) {

lib/package/npm.js

@@ -5,27 +5,22 @@ import { TmpDir } from "#core/tmp";
 import { repeatAction } from "#core/utils";
 import Package from "#lib/package";
 
-export default class Npm {
+export default class Npm extends NpmApi {
     #pkg;
-    #api;
 
     constructor ( pkg ) {
-        this.#pkg = pkg;
-
-        this.#api = new NpmApi( {
-            "cwd": this.#pkg.root,
+        super( {
+            "cwd": pkg.root,
         } );
+
+        this.#pkg = pkg;
     }
 
     // properties
     get pkg () {
         return this.#pkg;
     }
 
-    get api () {
-        return this.#api;
-    }
-
     // public
     async publish ( { commitRef, accessStatus, repeatOnError } = {} ) {
         var res;
@@ -165,7 +160,7 @@ export default class Npm {
         if ( !commit?.isRelease ) return result( [ 400, "Git commit is not released" ] );
 
         // get package versions
-        res = await this.api.getPackageVersions( this.pkg.name );
+        res = await super.getPackageVersions( this.pkg.name );
         if ( !res.ok ) {
 
             // package not found
@@ -191,7 +186,7 @@ export default class Npm {
             : "" ) );
 
         // pack
-        res = await pkg.npm.api.pack( {
+        res = await pkg.npm.pack( {
             "executablesPatterns": pkg.cliConfig?.meta?.executables,
         } );
         if ( !res.ok ) throw res;
@@ -202,7 +197,7 @@ export default class Npm {
         }
 
         // publish
-        res = await pkg.npm.api.publish( {
+        res = await pkg.npm.publish( {
             "packPath": pack.path,
             accessStatus,
             "tag": commit.tags.has( "latest" )
@@ -226,7 +221,7 @@ export default class Npm {
 
         const tags = {};
 
-        res = await this.api.getPackageTags( this.pkg.name );
+        res = await super.getPackageTags( this.pkg.name );
         if ( !res.ok ) {
             if ( res.data?.error?.code === "E404" ) {
                 return result( [ 404, "Package not fouund" ] );
@@ -248,7 +243,7 @@ export default class Npm {
 
             // set
             if ( version && remoteTags[ tag ] !== version.version ) {
-                res = await this.api.setPackageTag( this.pkg.name, version.version, tag );
+                res = await super.setPackageTag( this.pkg.name, version.version, tag );
 
                 if ( !res.ok ) {
                     if ( res.data?.error?.code !== "E404" ) {
@@ -262,7 +257,7 @@ export default class Npm {
 
             // delete
             else if ( remoteTags[ tag ] && !version ) {
-                res = await this.api.deletePackageTag( this.pkg.name, tag );
+                res = await super.deletePackageTag( this.pkg.name, tag );
                 if ( !res.ok ) return res;
 
                 updated = true;
@@ -279,11 +274,11 @@ export default class Npm {
         var res,
             updated = false;
 
-        res = await this.api.getPackageAccessStatus( this.pkg.name );
+        res = await super.getPackageAccessStatus( this.pkg.name );
         if ( !res.ok ) return res;
 
         if ( res.data.accessStatus !== accessStatus ) {
-            res = await this.api.setPackageAccessStatus( this.pkg.name, accessStatus );
+            res = await super.setPackageAccessStatus( this.pkg.name, accessStatus );
             if ( !res.ok ) return res;
 
             updated = true;