✨ Feature: change proxy\registry -> npmProxy

pmRegistry

Author: Molunerfinn

src/lib/Logger.ts

@@ -23,7 +23,7 @@ export class Logger implements ILogger {
   }
 
   private readonly ctx: IPicGo
-  private logLevel!: string
+  private logLevel!: string | string[]
   private logPath!: string
   constructor (ctx: IPicGo) {
     this.ctx = ctx

src/lib/PluginHandler.ts

@@ -204,8 +204,8 @@ export class PluginHandler implements IPluginHandler {
 
   private async execCommand (cmd: string, modules: string[], where: string, options: IPluginHandlerOptions = {}, env: IProcessEnv = {}): Promise<IResult> {
     // options first
-    const registry = options.registry || this.ctx.getConfig<Undefinable<string>>('settings.registry')
-    const proxy = options.proxy || this.ctx.getConfig<Undefinable<string>>('settings.proxy')
+    const registry = options.npmRegistry || this.ctx.getConfig<Undefinable<string>>('settings.npmRegistry')
+    const proxy = options.npmProxy || this.ctx.getConfig<Undefinable<string>>('settings.npmProxy')
     return await new Promise((resolve: any): void => {
       let args = [cmd].concat(modules).concat('--color=always').concat('--save')
       if (registry) {

src/plugins/commander/pluginHandler.ts

@@ -8,13 +8,13 @@ const pluginHandler: IPlugin = {
       .command('install <plugins...>')
       .description('install picgo plugin')
       .alias('add')
-      .option('-p, --proxy <proxy>', 'Add proxy for installing')
-      .option('-r, --registry <registry>', 'Choose a registry for installing')
+      .option('-p, --proxy <proxy>', 'Add proxy for installing plugins')
+      .option('-r, --registry <registry>', 'Choose a registry for installing plugins')
       .action((plugins: string[], program: any) => {
         const { proxy, registry } = program
         const options = {
-          proxy,
-          registry
+          npmProxy: proxy,
+          npmRegistry: registry
         }
         ctx.pluginHandler.install(plugins, options).catch((e) => { ctx.log.error(e) })
       })
@@ -28,13 +28,13 @@ const pluginHandler: IPlugin = {
     cmd.program
       .command('update <plugins...>')
       .description('update picgo plugin')
-      .option('-p, --proxy <proxy>', 'Add proxy for installing')
-      .option('-r, --registry <registry>', 'Choose a registry for installing')
+      .option('-p, --proxy <proxy>', 'Add proxy for installing plugins')
+      .option('-r, --registry <registry>', 'Choose a registry for installing plugins')
       .action((plugins: string[], program: any) => {
         const { proxy, registry } = program
         const options = {
-          proxy,
-          registry
+          npmProxy: proxy,
+          npmRegistry: registry
         }
         ctx.pluginHandler.update(plugins, options).catch((e: Error) => { ctx.log.error(e) })
       })

src/types/index.ts

@@ -388,12 +388,12 @@ export interface IConfig {
   debug?: boolean
   silent?: boolean
   settings?: {
-    logLevel?: string
+    logLevel?: string[]
     logPath?: string
     /** for npm */
-    registry?: string
+    npmRegistry?: string
     /** for npm */
-    proxy?: string
+    npmProxy?: string
     [others: string]: any
   }
   [configOptions: string]: any
@@ -437,8 +437,8 @@ export interface IPluginHandlerResult<T> {
 }
 
 export interface IPluginHandlerOptions {
-  proxy?: string
-  registry?: string
+  npmProxy?: string
+  npmRegistry?: string
 }
 
 /**