piclist 1.8.9 → 1.8.11

package/dist/lib/Commander.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
-import { type Inquirer } from 'inquirer';
-import type { IPlugin, ICommander, IPicGo } from '../types';
+import { Inquirer } from 'inquirer';
+import { IPlugin, ICommander, IPicGo } from '../types';
 export declare class Commander implements ICommander {
     private readonly name;
     static currentPlugin: string | null;

package/dist/lib/LifecyclePlugins.d.ts

@@ -1,4 +1,4 @@
-import type { IPlugin, ILifecyclePlugins } from '../types';
+import { IPlugin, ILifecyclePlugins } from '../types';
 export declare class LifecyclePlugins implements ILifecyclePlugins {
     static currentPlugin: string | null;
     private readonly list;

package/dist/lib/Logger.d.ts

@@ -1,4 +1,4 @@
-import type { ILogArgvType, ILogArgvTypeWithError, ILogger, IPicGo } from '../types';
+import { ILogArgvType, ILogArgvTypeWithError, ILogger, IPicGo } from '../types';
 export declare class Logger implements ILogger {
     private readonly level;
     private readonly ctx;

package/dist/lib/PluginHandler.d.ts

@@ -1,4 +1,4 @@
-import type { IProcessEnv, IPluginHandler, IPluginHandlerOptions, IPicGo, IPluginHandlerResult } from '../types';
+import { IProcessEnv, IPluginHandler, IPluginHandlerOptions, IPicGo, IPluginHandlerResult } from '../types';
 export declare class PluginHandler implements IPluginHandler {
     private readonly ctx;
     constructor(ctx: IPicGo);

package/dist/lib/PluginLoader.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo, IPicGoPlugin, IPluginLoader, IPicGoPluginInterface } from '../types/index';
+import { IPicGo, IPicGoPlugin, IPluginLoader, IPicGoPluginInterface } from '../types/index';
 /**
  * Local plugin loader, file system is required
  */

package/dist/lib/Request.d.ts

@@ -7,6 +7,6 @@ export declare class Request implements IRequest {
     constructor(ctx: IPicGo);
     private init;
     private handleProxy;
-    request<T, U extends (IRequestConfig<U> extends IOldReqOptions ? IOldReqOptions : IRequestConfig<U> extends AxiosRequestConfig ? AxiosRequestConfig : never)>(options: U): Promise<IResponse<T, U>>;
+    request<T, U extends IRequestConfig<U> extends IOldReqOptions ? IOldReqOptions : IRequestConfig<U> extends AxiosRequestConfig ? AxiosRequestConfig : never>(options: U): Promise<IResponse<T, U>>;
 }
 export default Request;

package/dist/plugins/beforetransformer/compress.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo, IPluginConfig } from '../../types';
+import { IPicGo, IPluginConfig } from '../../types';
 declare const _default: {
     config: (ctx: IPicGo) => IPluginConfig[];
 };

package/dist/plugins/beforetransformer/watermark.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo, IPluginConfig } from '../../types';
+import { IPicGo, IPluginConfig } from '../../types';
 declare const _default: {
     config: (ctx: IPicGo) => IPluginConfig[];
 };

package/dist/plugins/beforeupload/buildInRename.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo, IPluginConfig } from '../../types';
+import { IPicGo, IPluginConfig } from '../../types';
 declare const _default: {
     config: (ctx: IPicGo) => IPluginConfig[];
 };

package/dist/plugins/commander/config.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const config: IPlugin;
 export default config;

package/dist/plugins/commander/i18n.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const i18n: IPlugin;
 export default i18n;

package/dist/plugins/commander/index.d.ts

@@ -1,3 +1,3 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 declare const _default: (ctx: IPicGo) => void;
 export default _default;

package/dist/plugins/commander/init.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const init: IPlugin;
 export default init;

package/dist/plugins/commander/pluginHandler.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const pluginHandler: IPlugin;
 export default pluginHandler;

package/dist/plugins/commander/proxy.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const proxy: IPlugin;
 export default proxy;

package/dist/plugins/commander/setting.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 declare const setting: {
     handle: (ctx: IPicGo) => void;
 };

package/dist/plugins/commander/upload.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const upload: IPlugin;
 export default upload;

package/dist/plugins/commander/use.d.ts

@@ -1,3 +1,3 @@
-import type { IPlugin } from '../../types';
+import { IPlugin } from '../../types';
 declare const use: IPlugin;
 export default use;

package/dist/plugins/transformer/base64.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 declare const _default: {
     handle: (ctx: IPicGo) => Promise<IPicGo>;
 };

package/dist/plugins/transformer/index.d.ts

@@ -1,3 +1,3 @@
-import type { IPicGoPlugin } from '../../types';
+import { IPicGoPlugin } from '../../types';
 declare const buildInTransformers: IPicGoPlugin;
 export default buildInTransformers;

package/dist/plugins/transformer/path.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 declare const _default: {
     handle: (ctx: IPicGo) => Promise<IPicGo>;
 };

package/dist/plugins/uploader/aliyun.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/awss3plist.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/github.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/imgur.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/index.d.ts

@@ -1,3 +1,3 @@
-import type { IPicGoPlugin } from '../../types';
+import { IPicGoPlugin } from '../../types';
 declare const buildInUploaders: IPicGoPlugin;
 export default buildInUploaders;

package/dist/plugins/uploader/local.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/lsky.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export interface IMGTYPE {
     imgUrl?: string;
     type?: string;

package/dist/plugins/uploader/piclist.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/qiniu.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/s3/uploader.d.ts

@@ -1,4 +1,4 @@
-import type { IAwsS3PListUserConfig, IImgInfo } from '../../../types';
+import { IAwsS3PListUserConfig, IImgInfo } from '../../../types';
 export interface IUploadResult {
     index: number;
     key: string;

package/dist/plugins/uploader/s3/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { HttpsProxyAgent, HttpProxyAgent } from 'hpagent';
-import type { IImgInfo } from '../../../types';
+import { IImgInfo } from '../../../types';
 export declare function formatPath(info: IImgInfo, format?: string): string;
 export declare function extractInfo(info: IImgInfo): Promise<{
     body?: Buffer;

package/dist/plugins/uploader/sftp.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/smms.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/tcyun.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export interface ISignature {
     signature: string;
     appId: string;

package/dist/plugins/uploader/telegraph.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/upyun.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/webdav.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types';
+import { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/types/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import type { Command } from 'commander';
-import type { Inquirer } from 'inquirer';
-import type { FormatEnum, GravityEnum } from 'sharp';
-import type { IRequestPromiseOptions } from './oldRequest';
+import { Command } from 'commander';
+import { Inquirer } from 'inquirer';
+import { FormatEnum, GravityEnum } from 'sharp';
+import { IRequestPromiseOptions } from './oldRequest';
 export interface IPicGo extends NodeJS.EventEmitter {
     /**
      * picgo configPath
@@ -218,7 +218,7 @@ export interface IRequestLibOnlyOptions {
 }
 export type IRequestConfig<T> = T extends IRequestLibOnlyOptions ? IOldReqOptions : AxiosRequestConfig;
 export interface IRequest {
-    request: <T, U extends (IRequestConfig<U> extends IOldReqOptions ? IOldReqOptions : IRequestConfig<U> extends AxiosRequestConfig ? AxiosRequestConfig : never)>(config: U) => Promise<IResponse<T, U>>;
+    request: <T, U extends IRequestConfig<U> extends IOldReqOptions ? IOldReqOptions : IRequestConfig<U> extends AxiosRequestConfig ? AxiosRequestConfig : never>(config: U) => Promise<IResponse<T, U>>;
 }
 export type ILogColor = 'blue' | 'green' | 'yellow' | 'red';
 /**

package/dist/utils/common.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 import sharp from 'sharp';
 import crypto from 'crypto';
-import type { IImgSize, IPathTransformedImgInfo, IPluginNameType, ILogger, IPicGo, IBuildInCompressOptions, IBuildInWaterMarkOptions } from '../types';
+import { IImgSize, IPathTransformedImgInfo, IPluginNameType, ILogger, IPicGo, IBuildInCompressOptions, IBuildInWaterMarkOptions } from '../types';
 export declare function randomStringGenerator(length: number): string;
 export declare function renameFileNameWithTimestamp(oldName: string): string;
 export declare function renameFileNameWithRandomString(oldName: string, length?: number): string;

package/dist/utils/createContext.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo } from '../types';
+import { IPicGo } from '../types';
 /**
  * create an unique context for each upload process
  * @param ctx

package/dist/utils/db.d.ts

@@ -1,5 +1,5 @@
-import type { IConfig, IPicGo } from '../types';
-import type { IJSON } from '@picgo/store/dist/types';
+import { IConfig, IPicGo } from '../types';
+import { IJSON } from '@picgo/store/dist/types';
 declare class DB {
     private readonly ctx;
     private readonly db;

package/dist/utils/getClipboardImage.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo, IClipboardImage } from '../types';
+import { IPicGo, IClipboardImage } from '../types';
 export type Platform = 'darwin' | 'win32' | 'win10' | 'linux' | 'wsl';
 declare const getClipboardImage: (ctx: IPicGo) => Promise<IClipboardImage>;
 export default getClipboardImage;

package/dist/utils/initUtils.d.ts

@@ -1,4 +1,4 @@
-import type { IPicGo, IOptions } from '../types';
+import { IPicGo, IOptions } from '../types';
 /**
  * Generate template files to destination files.
  * @param {PicGo} ctx

package/dist/utils/interfaces.d.ts

@@ -1,8 +1,8 @@
 /** This file is deprecated */
 /// <reference types="node" />
-import type { PicGo } from '../core/PicGo';
-import type LifecyclePlugins from '../lib/LifecyclePlugins';
-import type { IWebdavPlistConfig } from '../types';
+import { PicGo } from '../core/PicGo';
+import { LifecyclePlugins } from '../lib/LifecyclePlugins';
+import { IWebdavPlistConfig } from '../types';
 /**
  * for plugin config
  */

package/dist/utils/sshClient.d.ts

@@ -1,16 +1,15 @@
-import { NodeSSH } from 'node-ssh-no-cpu-features';
-import type { ISftpPlistConfig } from '../types';
+import { ISftpPlistConfig } from '../types';
 declare class SSHClient {
-    private static _instance;
-    private static _client;
-    private _isConnected;
-    static get instance(): SSHClient;
-    static get client(): NodeSSH;
-    private changeWinStylePathToUnix;
-    connect(config: ISftpPlistConfig): Promise<boolean>;
-    upload(local: string, remote: string, config: ISftpPlistConfig): Promise<boolean>;
+    private static instance;
+    private client;
+    isConnected: boolean;
+    private constructor();
+    static getInstance(): SSHClient;
+    private static changeWinStylePathToUnix;
+    connect(config: ISftpPlistConfig): Promise<void>;
+    upload(local: string, remote: string, config: ISftpPlistConfig): Promise<void>;
     private mkdir;
-    chown(remote: string, user: string, group?: string): Promise<boolean>;
+    chown(remote: string, user: string, group?: string): Promise<void>;
     private exec;
     close(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "1.8.9",
+  "version": "1.8.11",
   "description": "Modified PicGo core, A tool for picture uploading",
   "author": {
     "name": "Kuingsmile",
@@ -25,11 +25,13 @@
     "start": "node ./bin/picgo",
     "server": "node ./bin/picgo-server",
     "lint": "eslint src/**/*.ts",
+    "lint:fix": "eslint src/**/*.ts --fix",
     "build": "cross-env NODE_ENV=production rimraf ./dist && rollup -c rollup.config.js",
     "dev": "cross-env NODE_ENV=development rollup -c rollup.config.js -w",
     "cz": "git-cz",
     "release": "bump-version",
-    "lint:dpdm": "dpdm -T --tsconfig ./tsconfig.json --no-tree --no-warning --exit-code circular:1 src/index.ts"
+    "lint:dpdm": "dpdm -T --tsconfig ./tsconfig.json --no-tree --no-warning --exit-code circular:1 src/index.ts",
+    "publish:npm": "cross-env NODE_ENV=production rimraf ./dist && rollup -c rollup.config.js && npm publish"
   },
   "keywords": [
     "picture",
@@ -85,15 +87,16 @@
     "cz-customizable": "^5.10.0",
     "dpdm": "^3.14.0",
     "eslint": "^8.57.0",
-    "eslint-config-standard-with-typescript": "^39.1.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.3.1",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-promise": "^6.2.0",
-    "eslint-plugin-standard": "^5.0.0",
     "husky": "^1.3.1",
     "node-bump-version": "^1.0.2",
     "pre-commit": "^1.2.2",
+    "prettier": "^3.3.2",
     "rollup": "^2.79.1",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-string": "^3.0.0",
@@ -112,7 +115,7 @@
     "chalk": "^2.4.1",
     "commander": "^8.1.0",
     "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.11",
     "download-git-repo": "^3.0.2",
     "ejs": "^2.6.1",
     "file-type": "16.2.0",
@@ -131,7 +134,7 @@
     "minimatch": "^3.0.4",
     "minimist": "^1.2.8",
     "multer": "^1.4.5-lts.1",
-    "node-ssh-no-cpu-features": "^1.0.1",
+    "node-ssh-no-cpu-features": "^2.0.0",
     "qiniu": "7.9.0",
     "resolve": "^1.8.1",
     "rimraf": "^5.0.1",

package/rollup.config.js

@@ -1,93 +1,93 @@
-import { terser } from 'rollup-plugin-terser'
-import pkg from './package.json'
-import typescript from 'rollup-plugin-typescript2'
-import commonjs from '@rollup/plugin-commonjs'
-import copy from 'rollup-plugin-copy'
-import { string } from 'rollup-plugin-string'
-import json from '@rollup/plugin-json'
-import builtins from 'builtins'
-import replace from '@rollup/plugin-replace'
-const version = process.env.VERSION || pkg.version
-const sourcemap = 'inline'
-const banner = `/*
- * piclist@${version}, https://github.com/Kuingsmile/PicList-Core
- * (c) 2022-${new Date().getFullYear()} Kuingsmile
- * Released under the MIT License.
- */`
-const input = './src/index.ts'
-
-const commonOptions = {
-  // Creating regex of the packages to make sure sub-paths of the
-  // packages such as `lowdb/adapters/FileSync` are also treated as external
-  // See https://github.com/rollup/rollup/issues/3684#issuecomment-926558056
-  external: [
-    ...Object.keys(pkg.dependencies),
-    ...builtins()
-  ].map(packageName => new RegExp(`^${packageName}(/.*)?`)),
-  plugins: [
-    typescript({
-      tsconfigOverride: {
-        compilerOptions: {
-          target: 'ES2017',
-          module: 'ES2015'
-        }
-      }
-    }),
-    copy({
-      targets: [
-        { src: 'assets', dest: 'dist' }
-      ]
-    }),
-    // terser(),
-    commonjs(),
-    string({
-      // Required to be specified
-      include: [
-        '**/*.applescript',
-        '**/*.ps1',
-        '**/*.sh'
-      ]
-    }),
-    json(),
-    replace({
-      'process.env.PICGO_VERSION': JSON.stringify(pkg.version),
-      preventAssignment: true
-    })
-  ],
-  input
-}
-
-const isDev = process.env.NODE_ENV === 'development'
-
-if (!isDev) {
-  commonOptions.plugins.push(terser())
-}
-
-/** @type import('rollup').RollupOptions */
-const nodeCjs = {
-  output: [{
-    file: 'dist/index.cjs.js',
-    format: 'cjs',
-    banner,
-    sourcemap
-  }],
-  ...commonOptions
-}
-
-const nodeEsm = {
-  output: [{
-    file: 'dist/index.esm.js',
-    format: 'esm',
-    banner,
-    sourcemap
-  }],
-  ...commonOptions
-}
-
-const bundles = []
-const env = process.env.BUNDLES || ''
-if (env.includes('cjs')) bundles.push(nodeCjs)
-if (env.includes('esm')) bundles.push(nodeEsm)
-if (bundles.length === 0) bundles.push(nodeCjs, nodeEsm)
-
-export default bundles
+import { terser } from 'rollup-plugin-terser'
+import pkg from './package.json'
+import typescript from 'rollup-plugin-typescript2'
+import commonjs from '@rollup/plugin-commonjs'
+import copy from 'rollup-plugin-copy'
+import { string } from 'rollup-plugin-string'
+import json from '@rollup/plugin-json'
+import builtins from 'builtins'
+import replace from '@rollup/plugin-replace'
+const version = process.env.VERSION || pkg.version
+const sourcemap = 'inline'
+const banner = `/*
+ * piclist@${version}, https://github.com/Kuingsmile/PicList-Core
+ * (c) 2022-${new Date().getFullYear()} Kuingsmile
+ * Released under the MIT License.
+ */`
+const input = './src/index.ts'
+
+const commonOptions = {
+  // Creating regex of the packages to make sure sub-paths of the
+  // packages such as `lowdb/adapters/FileSync` are also treated as external
+  // See https://github.com/rollup/rollup/issues/3684#issuecomment-926558056
+  external: [
+    ...Object.keys(pkg.dependencies),
+    ...builtins()
+  ].map(packageName => new RegExp(`^${packageName}(/.*)?`)),
+  plugins: [
+    typescript({
+      tsconfigOverride: {
+        compilerOptions: {
+          target: 'ES2017',
+          module: 'ES2015'
+        }
+      }
+    }),
+    copy({
+      targets: [
+        { src: 'assets', dest: 'dist' }
+      ]
+    }),
+    // terser(),
+    commonjs(),
+    string({
+      // Required to be specified
+      include: [
+        '**/*.applescript',
+        '**/*.ps1',
+        '**/*.sh'
+      ]
+    }),
+    json(),
+    replace({
+      'process.env.PICGO_VERSION': JSON.stringify(pkg.version),
+      preventAssignment: true
+    })
+  ],
+  input
+}
+
+const isDev = process.env.NODE_ENV === 'development'
+
+if (!isDev) {
+  commonOptions.plugins.push(terser())
+}
+
+/** @type import('rollup').RollupOptions */
+const nodeCjs = {
+  output: [{
+    file: 'dist/index.cjs.js',
+    format: 'cjs',
+    banner,
+    sourcemap
+  }],
+  ...commonOptions
+}
+
+const nodeEsm = {
+  output: [{
+    file: 'dist/index.esm.js',
+    format: 'esm',
+    banner,
+    sourcemap
+  }],
+  ...commonOptions
+}
+
+const bundles = []
+const env = process.env.BUNDLES || ''
+if (env.includes('cjs')) bundles.push(nodeCjs)
+if (env.includes('esm')) bundles.push(nodeEsm)
+if (bundles.length === 0) bundles.push(nodeCjs, nodeEsm)
+
+export default bundles