fix: npmClient for publish

Author: chengyu.chengyulia

src/built-in-plugins/command-publish/plugin/run-publish.ts

@@ -97,17 +97,21 @@ export const publish = async (options: PublishOption) => {
 };
 
 async function authPublish(packageNames: string[]) {
-  let name: string;
-  try {
-    const nameRet = execSync('tnpm whoami');
-    name = nameRet.toString().trim();
-  } catch (error) {
-    logFatal(error);
-  }
+  const getUserName = (npmClient = 'npm') => {
+    let name: string;
+    try {
+      const nameRet = execSync(`${npmClient} whoami`);
+      name = nameRet.toString().trim();
+    } catch (error) {
+      logFatal(error);
+    }
+    return name;
+  };
+
   const failedPkgSet = new Set<string>();
-  const checkOwner = (uName: string, pName: string) =>
+  const checkOwner = (uName: string, pName: string, npmClient?: string) =>
     new Promise((res, rej) => {
-      isOwner(uName, pName)
+      isOwner(uName, pName, npmClient)
         .then(v => {
           if (!v) {
             failedPkgSet.add(pName);
@@ -116,7 +120,14 @@ async function authPublish(packageNames: string[]) {
         })
         .catch(e => rej(e));
     });
-  const pkgsP = packageNames.map(p => checkOwner(name, p));
+
+  const pkgsP = packageNames.map(p => {
+    const packageConfig =
+      p === pri.projectPackageJson.name
+        ? pri.projectConfig
+        : pri.packages.find(eachPackage => eachPackage.packageJson.name === p)?.config;
+    return checkOwner(getUserName(packageConfig?.npmClient), p, packageConfig?.npmClient);
+  });
   await Promise.all(pkgsP);
   if (failedPkgSet.size > 0) {
     logFatal(`Permission error: need ownership to publish these packages. \n ${Array.from(failedPkgSet).join('\n')}`);

src/utils/npm.ts

@@ -16,24 +16,24 @@ export async function isExist(packageName: string) {
   }
 }
 
-export async function getOwners(packageName: string) {
+export async function getOwners(packageName: string, npmClient?: string) {
   let ownerStr = '';
 
   try {
-    ownerStr = await exec(`${globalState.sourceConfig.npmClient} owner ls ${packageName}`);
+    ownerStr = await exec(`${npmClient || globalState.sourceConfig.npmClient} owner ls ${packageName}`);
   } catch (error) {
     ownerStr = '';
   }
   return ownerStr.split('\n').filter(owner => owner !== '');
 }
 
-export async function isOwner(userName: string, packageName: string) {
+export async function isOwner(userName: string, packageName: string, npmClient?: string) {
   const npmIsExist = await isExist(packageName);
   if (!npmIsExist) {
     return true;
   }
 
-  const npmOwners = await getOwners(packageName);
+  const npmOwners = await getOwners(packageName, npmClient);
   if (
     !npmOwners.some(eachOwner => {
       return eachOwner.indexOf(userName) > -1;