🐛 Fix: ts error

Author: Molunerfinn

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-},
+    "source.fixAll.eslint": "explicit"
+  },
 }

package.json

@@ -12,7 +12,8 @@
     "build": "tsc -p .",
     "dev": "tsc -w -p .",
     "cz": "git-cz",
-    "release": "bump-version"
+    "release": "bump-version",
+    "lint": "tsc --noEmit"
   },
   "keywords": [
     "picgo",
@@ -55,7 +56,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^2.7.0",
-    "picgo": "1.5.0-alpha.15",
+    "picgo": "1.5.11",
     "typescript": "^4.7.4"
   },
   "dependencies": {

pnpm-lock.yaml

@@ -16,7 +16,7 @@ const replaceAll = (content: string, originText: string, replaceText: string): s
 }
 const checkVersion = (ctx: PicGo, guiApi: any): void => {
   if (guiApi) {
-    const picgoVersion = ctx.GUI_VERSION || '1.0.0'
+    const picgoVersion = ctx.GUI_VERSION ?? '1.0.0'
     if (compare(picgoVersion, '2.3.0', '<')) {
       ctx.emit('notification', {
         title: 'PicGo version is lower than 2.3.0',
@@ -199,7 +199,7 @@ const config = (ctx: PicGo): IPluginConfig[] => {
         return $T('PIC_MIGRATER_CONFIG_TIPS')
       },
       type: 'input',
-      default: userConfig.include || '',
+      default: userConfig.include ?? '',
       required: false
     },
     {
@@ -211,7 +211,7 @@ const config = (ctx: PicGo): IPluginConfig[] => {
         return $T('PIC_MIGRATER_CONFIG_TIPS')
       },
       type: 'input',
-      default: userConfig.exclude || '',
+      default: userConfig.exclude ?? '',
       required: false
     },
     {
@@ -244,7 +244,7 @@ export = (ctx: PicGo) => {
               return
             }
             files = files.map((item) => path.resolve(item))
-            let inputFiles = []
+            let inputFiles: string[] = []
             for (const filePath of files) {
               // make sure filePath exists
               if (fs.existsSync(filePath)) {

src/index.ts

@@ -25,20 +25,20 @@ class FileHandler {
 
   getUrlListFromFileContent (file: string): void {
     const content = this.fileList[file] || ''
-    const markdownURLList = (content.match(/\!\[.*\]\(.*\)/g) || []).map((item: string) => {
+    const markdownURLList = (content.match(/\!\[.*\]\(.*\)/g) ?? []).map((item: string) => {
       const res = item.match(/\!\[.*\]\((.*?)( ".*")?\)/)
       if (res) {
         return res[1]
       }
       return null
-    }).filter(item => item)
-    const imageTagURLList = (content.match(/<img.*?(?:>|\/>)/gi) || []).map((item: string) => {
+    }).filter(item => item) as string[]
+    const imageTagURLList = (content.match(/<img.*?(?:>|\/>)/gi) ?? []).map((item: string) => {
       const res = item.match(/src=[\'\"]?([^\'\"]*)[\'\"]?/i)
       if (res) {
         return res[1]
       }
       return null
-    }).filter(item => item)
+    }).filter(item => item) as string[]
     const urls = markdownURLList.concat(imageTagURLList)
     this.urlList[file] = {}
     for (const url of urls) {

src/lib/FileHandler.ts

@@ -26,8 +26,8 @@ class Migrater {
       'picBed.transformer': 'base64'
     })
     this.ctx.output = [] // a bug before picgo v1.2.2
-    const include: string | null = this.ctx.getConfig('picgo-plugin-pic-migrater.include') || null
-    const exclude: string | null = this.ctx.getConfig('picgo-plugin-pic-migrater.exclude') || null
+    const include: string | null = this.ctx.getConfig('picgo-plugin-pic-migrater.include') ?? 'null'
+    const exclude: string | null = this.ctx.getConfig('picgo-plugin-pic-migrater.exclude') ?? 'null'
     const includesReg = new RegExp(include)
     const excludesReg = new RegExp(exclude)
 
@@ -42,11 +42,11 @@ class Migrater {
     }
 
     const toUploadURLs = this.urlArray.filter(url => ((!include || includesReg.test(url)) && (!exclude || !excludesReg.test(url)))).map(async url => {
-      return await new Promise<IImgInfo>(async (resolve, reject): Promise<void> => {
+      return await new Promise<IImgInfo | undefined>(async (resolve, reject): Promise<void> => {
         result.total += 1
 
         try {
-          let imgInfo: IImgInfo
+          let imgInfo: IImgInfo | undefined
           const isUrlPath = isUrl(url)
           if (isUrlPath) {
             imgInfo = await this.handlePicFromURL(url)
@@ -70,7 +70,7 @@ class Migrater {
     const toUploadImgs = await Promise.all(toUploadURLs).then(imgs => imgs.filter(img => img !== undefined))
 
     // upload
-    let output = []
+    let output: IImgInfo[] = []
     if (toUploadImgs && toUploadImgs.length > 0) {
       if (this.guiApi) {
         output = await this.guiApi.upload(toUploadImgs)
@@ -91,7 +91,7 @@ class Migrater {
     result.urls = output.filter(item => item.imgUrl && item.imgUrl !== item.origin).map(item => {
       return {
         original: item.origin,
-        new: item.imgUrl
+        new: item.imgUrl as string
       }
     })
     result.success = result.urls.length
@@ -166,7 +166,7 @@ class Migrater {
         fileName,
         width: imgSize.width,
         height: imgSize.height,
-        extname: `.${imgSize.type || 'png'}`,
+        extname: `.${imgSize.type ?? 'png'}`,
         origin: url
       }
     } catch (e) {

src/lib/Migrater.ts

@@ -7,11 +7,11 @@ interface IImgSizeInfo extends IImgSize {
 
 export const getImageSize = (buffer: Buffer): IImgSizeInfo => {
   try {
-    const size = sizeOf(buffer)
+    const size = sizeOf(buffer as Uint8Array)
     return {
       real: true,
-      width: size.width,
-      height: size.height,
+      width: size.width ?? 0,
+      height: size.height ?? 0,
       type: size.type
     }
   } catch (e) {

src/utils.ts

@@ -5,6 +5,7 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
+    "strictNullChecks": true,
     "sourceMap": false,
     "target": "es2017",
     "declaration": true,
@@ -30,4 +31,4 @@
   "include": [
     "./src/**/*"
   ]
-}
+}