🐛 Fix(type): some type error

Author: Molunerfinn

.vscode/settings.json

@@ -27,5 +27,6 @@
         "uploaders",
         "upyun",
         "weibo"
-    ]
+    ],
+    "typescript.tsdk": "node_modules\\typescript\\lib"
 }

package.json

@@ -12,7 +12,7 @@
   },
   "scripts": {
     "start": "node ./bin/picgo",
-    "lint": "eslint src/**/*.ts",
+    "lint": "eslint src/**/*.ts && npm run build",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc -p . && npm run copy",
     "copy": "copyfiles -f src/utils/clipboard/* dist/src/utils/clipboard",
@@ -53,15 +53,19 @@
     "@commitlint/cli": "^7.5.2",
     "@picgo/bump-version": "^1.0.1",
     "@types/cross-spawn": "^6.0.0",
+    "@types/ejs": "^3.0.5",
     "@types/fs-extra": "^5.0.4",
+    "@types/globby": "^9.1.0",
     "@types/image-size": "^0.0.29",
     "@types/inquirer": "^0.0.42",
     "@types/lowdb": "^1.0.4",
     "@types/md5": "^2.1.32",
     "@types/mime-types": "^2.1.0",
+    "@types/minimatch": "^3.0.3",
     "@types/node": "^10.5.2",
     "@types/request-promise-native": "^1.0.15",
     "@types/resolve": "^0.0.8",
+    "@types/rimraf": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "3",
     "@typescript-eslint/parser": "^3.2.0",
     "babel-eslint": "^10.1.0",

src/core/Lifecycle.ts

@@ -1,11 +1,10 @@
 import { EventEmitter } from 'events'
 import PicGo from './PicGo'
-import { IPlugin, Undefinable } from '../utils/interfaces'
+import { IPlugin, Undefinable } from 'src/types'
 import { handleUrlEncode } from '../utils/common'
 import LifecyclePlugins from '../lib/LifecyclePlugins'
 
 class Lifecycle extends EventEmitter {
-  configPath: string
   ctx: PicGo
 
   constructor (ctx: PicGo) {

src/core/PicGo.ts

@@ -10,26 +10,26 @@ import uploaders from '../plugins/uploader'
 import transformers from '../plugins/transformer'
 import PluginLoader from '../lib/PluginLoader'
 import { get, set, unset } from 'lodash'
-import { IHelper, IImgInfo, IConfig } from '../utils/interfaces'
+import { IHelper, IImgInfo, IConfig, IPicGo, IStringKeyMap } from 'src/types'
 import getClipboardImage from '../utils/getClipboardImage'
 import Request from '../lib/Request'
 import DB from '../utils/db'
 import PluginHandler from '../lib/PluginHandler'
 
-class PicGo extends EventEmitter {
-  private config: IConfig
-  private lifecycle: Lifecycle
-  private db: DB
+class PicGo extends EventEmitter implements IPicGo {
+  private config!: IConfig
+  private lifecycle!: Lifecycle
+  private db!: DB
   configPath: string
-  baseDir: string
-  helper: IHelper
+  baseDir!: string
+  helper!: IHelper
   log: Logger
   cmd: Commander
   output: IImgInfo[]
   input: any[]
-  pluginLoader: PluginLoader
+  pluginLoader!: PluginLoader
   pluginHandler: PluginHandler
-  Request: Request
+  Request!: Request
 
   constructor (configPath: string = '') {
     super()
@@ -127,7 +127,7 @@ class PicGo extends EventEmitter {
 
   // set config for ctx but will not be saved to db
   // it's more lightweight
-  setConfig (config: object): void {
+  setConfig (config: IStringKeyMap<any>): void {
     Object.keys(config).forEach((name: string) => {
       set(this.config, name, config[name])
     })
@@ -139,10 +139,10 @@ class PicGo extends EventEmitter {
     unset(this.getConfig(key), propName)
   }
 
-  async upload (input?: any[]): Promise<string | Error> {
+  async upload (input?: any[]): Promise<IImgInfo[] | Error> {
     if (this.configPath === '') {
       this.log.error('The configuration file only supports JSON format.')
-      return ''
+      return []
     }
     // upload from clipboard
     if (input === undefined || input.length === 0) {
@@ -163,17 +163,17 @@ class PicGo extends EventEmitter {
             }
           })
           await this.lifecycle.start([imgPath])
+          return this.output
         }
       } catch (e) {
         this.log.error(e)
         this.emit('failed', e)
         throw e
       }
-      return ''
     } else {
       // upload from path
       await this.lifecycle.start(input)
-      return ''
+      return this.output
     }
   }
 }

src/lib/Commander.ts

@@ -1,7 +1,7 @@
 import PicGo from '../core/PicGo'
 import program, { CommanderStatic } from 'commander'
 import inquirer, { Inquirer } from 'inquirer'
-import { IPlugin } from '../utils/interfaces'
+import { IPlugin } from 'src/types'
 import commanders from '../plugins/commander'
 import pkg from '../../package.json'
 

src/lib/LifecyclePlugins.ts

@@ -1,4 +1,4 @@
-import { IPlugin } from '../utils/interfaces'
+import { IPlugin } from 'src/types'
 
 class LifecyclePlugins {
   static currentPlugin: string | null

src/lib/Logger.ts

@@ -9,8 +9,9 @@ import {
   ILogArgvType,
   ILogArgvTypeWithError,
   IConfig,
-  Undefinable
-} from '../utils/interfaces'
+  Undefinable,
+  ILogColor
+} from 'src/types'
 
 class Logger {
   private readonly level = {
@@ -21,8 +22,8 @@ class Logger {
   }
 
   private readonly ctx: PicGo
-  private logLevel: string
-  private logPath: string
+  private logLevel!: string
+  private logPath!: string
   constructor (ctx: PicGo) {
     this.ctx = ctx
   }
@@ -31,7 +32,7 @@ class Logger {
     // if configPath is invalid then this.ctx.config === undefined
     // if not then check config.silent
     if (this.ctx.getConfig<IConfig>() === undefined || !this.ctx.getConfig<Undefinable<string>>('silent')) {
-      const logHeader = chalk[this.level[type]](`[PicGo ${type.toUpperCase()}]:`)
+      const logHeader = chalk[this.level[type] as ILogColor](`[PicGo ${type.toUpperCase()}]:`)
       console.log(logHeader, ...msg)
       this.logLevel = this.ctx.getConfig('settings.logLevel')
       const logPath = this.checkLogPathChange()

src/lib/PluginHandler.ts

@@ -1,6 +1,6 @@
 import PicGo from '../core/PicGo'
 import spawn from 'cross-spawn'
-import { IResult, IProcessEnv, Undefinable } from '../utils/interfaces'
+import { IResult, IProcessEnv, Undefinable } from 'src/types'
 
 class PluginHandler {
   // Thanks to feflow -> https://github.com/feflow/feflow/blob/master/lib/internal/install/plugin.js

src/lib/Request.ts

@@ -1,10 +1,10 @@
 import PicGo from '../core/PicGo'
 import request, { RequestPromiseOptions, RequestPromiseAPI } from 'request-promise-native'
-import { Undefinable } from '../utils/interfaces'
+import { Undefinable } from 'src/types'
 
 class Request {
   ctx: PicGo
-  request: RequestPromiseAPI
+  request!: RequestPromiseAPI
   constructor (ctx: PicGo) {
     this.ctx = ctx
     this.init()

src/plugins/commander/config.ts

@@ -1,5 +1,5 @@
 import PicGo from '../../core/PicGo'
-import { IPlugin } from '../../utils/interfaces'
+import { IPlugin } from 'src/types'
 
 const config: IPlugin = {
   handle: (ctx: PicGo) => {