piclist 2.0.4 → 2.1.0

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

@@ -0,0 +1,5 @@
+import { IPicGo } from '../../types';
+declare const configCmd: {
+    handle: (ctx: IPicGo) => void;
+};
+export default configCmd;

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

@@ -1,5 +1,5 @@
 import { IPicGo } from '../../types';
-export declare function formatPathHelper({ path, startSlash, endSlash, rootToEmpty }: {
+export declare function formatPathHelper({ path, startSlash, endSlash, rootToEmpty, }: {
     path?: string;
     startSlash?: boolean;
     endSlash?: boolean;

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 import { Command } from 'commander';
 import { Inquirer } from 'inquirer';
 import { FormatEnum, GravityEnum } from 'sharp';
+import type { ConfigManager } from '../utils/configManager';
 import { IRequestPromiseOptions } from './oldRequest';
 export interface IPicGo extends NodeJS.EventEmitter {
     configPath: string;
@@ -13,6 +14,7 @@ export interface IPicGo extends NodeJS.EventEmitter {
     processedInput: any[];
     pluginLoader: IPluginLoader;
     pluginHandler: IPluginHandler;
+    configManager: ConfigManager;
     /**
      * @deprecated will be removed in v1.5.0+
      */
@@ -139,6 +141,7 @@ export interface IImgInfo {
     height?: number;
     extname?: string;
     imgUrl?: string;
+    filePath?: string;
     [propName: string]: any;
 }
 export interface IPathTransformedImgInfo extends IImgInfo {
@@ -358,6 +361,19 @@ export interface IAwsS3PListUserConfig {
     disableBucketPrefixToURL?: boolean | string;
     options?: string;
 }
+/** Base config item with metadata */
+export interface IConfigItem {
+    _id: string;
+    _configName: string;
+    _createdAt: number;
+    _updatedAt: number;
+    [key: string]: any;
+}
+/** Multi-config structure for uploaders */
+export interface IUploaderConfigList {
+    configList: IConfigItem[];
+    defaultId: string;
+}
 /** PicGo 配置文件类型定义 */
 export interface IConfig {
     picBed: {
@@ -377,6 +393,8 @@ export interface IConfig {
         proxy?: string;
         [others: string]: any;
     };
+    /** Multi-config structure for uploaders (new format) */
+    uploader?: Record<string, IUploaderConfigList>;
     picgoPlugins: Record<string, boolean>;
     debug?: boolean;
     silent?: boolean;
@@ -540,49 +558,27 @@ export type availableConvertFormat = keyof FormatEnum;
 export type availableWatermarkPosition = keyof GravityEnum;
 export interface IBuildInWaterMarkOptions {
     isAddWatermark?: boolean;
-    isAddWatermarkMap?: {
-        [key: string]: boolean;
-    };
+    isAddWatermarkMap?: Record<string, boolean>;
     watermarkType?: 'text' | 'image';
-    watermarkTypeMap?: {
-        [key: string]: 'text' | 'image';
-    };
+    watermarkTypeMap?: Record<string, 'text' | 'image'>;
     isFullScreenWatermark?: boolean;
-    isFullScreenWatermarkMap?: {
-        [key: string]: boolean;
-    };
+    isFullScreenWatermarkMap?: Record<string, boolean>;
     watermarkDegree?: number;
-    watermarkDegreeMap?: {
-        [key: string]: number;
-    };
+    watermarkDegreeMap?: Record<string, number>;
     watermarkText?: string;
-    watermarkTextMap?: {
-        [key: string]: string;
-    };
+    watermarkTextMap?: Record<string, string>;
     watermarkFontPath?: string;
-    watermarkFontPathMap?: {
-        [key: string]: string;
-    };
+    watermarkFontPathMap?: Record<string, string>;
     watermarkScaleRatio?: number;
-    watermarkScaleRatioMap?: {
-        [key: string]: number;
-    };
+    watermarkScaleRatioMap?: Record<string, number>;
     watermarkColor?: string;
-    watermarkColorMap?: {
-        [key: string]: string;
-    };
+    watermarkColorMap?: Record<string, string>;
     watermarkImagePath?: string;
-    watermarkImagePathMap?: {
-        [key: string]: string;
-    };
+    watermarkImagePathMap?: Record<string, string>;
     watermarkPosition?: availableWatermarkPosition;
-    watermarkPositionMap?: {
-        [key: string]: availableWatermarkPosition;
-    };
+    watermarkPositionMap?: Record<string, availableWatermarkPosition>;
     watermarkImageOpacity?: number;
-    watermarkImageOpacityMap?: {
-        [key: string]: number;
-    };
+    watermarkImageOpacityMap?: Record<string, number>;
     [propName: string]: any;
 }
 export interface IBuildInWaterMarkOptionsTreated {
@@ -601,65 +597,35 @@ export interface IBuildInWaterMarkOptionsTreated {
 }
 export interface IBuildInCompressOptions {
     quality?: number;
-    qualityMap?: {
-        [key: string]: number;
-    };
+    qualityMap?: Record<string, number>;
     isConvert?: boolean;
-    isConvertMap?: {
-        [key: string]: boolean;
-    };
+    isConvertMap?: Record<string, boolean>;
     convertFormat?: availableConvertFormat;
-    convertFormatMap?: {
-        [key: string]: availableConvertFormat;
-    };
+    convertFormatMap?: Record<string, availableConvertFormat>;
     isReSize?: boolean;
-    isReSizeMap?: {
-        [key: string]: boolean;
-    };
+    isReSizeMap?: Record<string, boolean>;
     reSizeWidth?: number;
-    reSizeWidthMap?: {
-        [key: string]: number;
-    };
+    reSizeWidthMap?: Record<string, number>;
     reSizeHeight?: number;
-    reSizeHeightMap?: {
-        [key: string]: number;
-    };
+    reSizeHeightMap?: Record<string, number>;
     skipReSizeOfSmallImg?: boolean;
-    skipReSizeOfSmallImgMap?: {
-        [key: string]: boolean;
-    };
+    skipReSizeOfSmallImgMap?: Record<string, boolean>;
     isReSizeByPercent?: boolean;
-    isReSizeByPercentMap?: {
-        [key: string]: boolean;
-    };
+    isReSizeByPercentMap?: Record<string, boolean>;
     reSizePercent?: number;
-    reSizePercentMap?: {
-        [key: string]: number;
-    };
+    reSizePercentMap?: Record<string, number>;
     isRotate?: boolean;
-    isRotateMap?: {
-        [key: string]: boolean;
-    };
+    isRotateMap?: Record<string, boolean>;
     rotateDegree?: number;
-    rotateDegreeMap?: {
-        [key: string]: number;
-    };
+    rotateDegreeMap?: Record<string, number>;
     isRemoveExif?: boolean;
-    isRemoveExifMap?: {
-        [key: string]: boolean;
-    };
+    isRemoveExifMap?: Record<string, boolean>;
     isFlip?: boolean;
-    isFlipMap?: {
-        [key: string]: boolean;
-    };
+    isFlipMap?: Record<string, boolean>;
     isFlop?: boolean;
-    isFlopMap?: {
-        [key: string]: boolean;
-    };
+    isFlopMap?: Record<string, boolean>;
     formatConvertObj?: any;
-    formatConvertObjMap?: {
-        [key: string]: any;
-    };
+    formatConvertObjMap?: Record<string, any>;
     [propName: string]: any;
 }
 export interface IBuildInCompressOptionsTreated {

package/dist/utils/configManager.d.ts

@@ -0,0 +1,15 @@
+import { IConfigItem, IPicGo } from '../types';
+export declare class ConfigManager {
+    private readonly ctx;
+    constructor(ctx: IPicGo);
+    migrateToMultiConfig(uploaderName: string): void;
+    getCurrentUploaderConfig(uploaderName: string): IConfigItem | null;
+    getAllUploaderConfigs(uploaderName: string): IConfigItem[];
+    addUploaderConfig(uploaderName: string, configName: string, configData: any): IConfigItem;
+    updateUploaderConfig(uploaderName: string, configId: string, configData: any): boolean;
+    deleteUploaderConfig(uploaderName: string, configId: string): boolean;
+    setDefaultConfig(uploaderName: string, configId: string): boolean;
+    private syncConfigToPicBed;
+    getConfigByName(uploaderName: string, configName: string): IConfigItem | null;
+    renameConfig(uploaderName: string, configId: string, newName: string): boolean;
+}

package/dist/utils/db.d.ts

@@ -7,11 +7,14 @@ declare class DB {
     private readonly db;
     constructor(ctx: IPicGo);
     read(flush?: boolean): IJSON;
-    get(key?: string): any;
+    getSingle(key?: string): any;
+    get(key: string): any;
+    get(key: string[]): any[];
     set(key: string, value: any): void;
     has(key: string): boolean;
     unset(key: string, value: any): boolean;
     saveConfig(config: Partial<IConfig>): void;
     removeConfig(config: IConfig): void;
+    getConfigPath(): string;
 }
 export default DB;

package/eslint.config.js

@@ -1,47 +1,45 @@
-import eslint from '@eslint/js'
+import js from '@eslint/js'
 import { defineConfig } from 'eslint/config'
-import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
+import configPrettier from 'eslint-config-prettier'
+import jsonc from 'eslint-plugin-jsonc'
+import pluginPrettier from 'eslint-plugin-prettier/recommended'
 import simpleImportSort from 'eslint-plugin-simple-import-sort'
 import eslintPluginUnicorn from 'eslint-plugin-unicorn'
 import globals from 'globals'
+import jsoncParser from 'jsonc-eslint-parser'
 import tseslint from 'typescript-eslint'
-
 export default defineConfig(
   {
-    files: [
-      './src/*.{ts,tsx,cts,mts,js,cjs,mjs}',
-      './scripts/*.{ts,js,mjs}',
-      './test/*.{ts,js,mjs}',
-      './bin/picgo',
-      './bin/picgo-server'
-    ]
-  },
-  {
-    ignores: ['**/node_modules/**', '**/dist/**', '**/webpack.config.js', 'vitest.workspace.mjs']
+    ignores: ['**/node_modules/**', '**/dist/**', 'vitest.workspace.mjs'],
   },
-  eslint.configs.recommended,
+  js.configs.recommended,
   ...tseslint.configs.recommended,
   ...tseslint.configs.stylistic,
   {
+    files: [
+      'src/**/*.{ts,tsx,cts,mts,js,cjs,mjs}',
+      'scripts/**/*.{ts,js,mjs}',
+      'test/**/*.{ts,js,mjs}',
+      './bin/picgo',
+      './bin/picgo-server',
+      'eslint.config.js',
+      'rollup.config.js',
+    ],
+    languageOptions: {
+      parserOptions: {
+        warnOnUnsupportedTypeScriptVersion: false,
+      },
+      globals: globals.node,
+    },
     plugins: {
       'simple-import-sort': simpleImportSort,
-      unicorn: eslintPluginUnicorn
+      unicorn: eslintPluginUnicorn,
     },
     rules: {
+      'unicorn/prefer-node-protocol': 'error',
+      'unicorn/prefer-module': 'error',
       'simple-import-sort/imports': 'error',
-      'simple-import-sort/exports': 'error'
-    }
-  },
-  {
-    languageOptions: {
-      parserOptions: {
-        warnOnUnsupportedTypeScriptVersion: false
-      },
-      globals: globals.node
-    }
-  },
-  {
-    rules: {
+      'simple-import-sort/exports': 'error',
       eqeqeq: 'error',
       'no-caller': 'error',
       'no-constant-condition': ['error', { checkLoops: false }],
@@ -56,22 +54,18 @@ export default defineConfig(
       'prefer-const': 'error',
       'prefer-object-spread': 'error',
       'unicode-bom': ['error', 'never'],
-      // Enabled in eslint:recommended, but not applicable here
+      'no-console': 'off',
+      'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+      'no-unused-vars': 'off',
       'no-extra-boolean-cast': 'off',
       'no-case-declarations': 'off',
       'no-cond-assign': 'off',
       'no-control-regex': 'off',
       'no-inner-declarations': 'off',
       'no-empty': 'off',
-
       // @typescript-eslint/eslint-plugin
-      'no-unused-expressions': 'off',
       '@typescript-eslint/no-unused-expressions': 'off',
       '@typescript-eslint/ban-ts-comment': 'off',
-      '@typescript-eslint/class-literal-property-style': 'off',
-      '@typescript-eslint/consistent-indexed-object-style': 'off',
-      '@typescript-eslint/consistent-generic-constructors': 'off',
-      '@typescript-eslint/no-duplicate-enum-values': 'off',
       '@typescript-eslint/no-empty-function': 'off',
       '@typescript-eslint/no-namespace': 'off',
       '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
@@ -80,12 +74,46 @@ export default defineConfig(
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/no-empty-object-type': 'off', // {} is a totally useful and valid type.
       '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-unused-vars': 'off',
       '@typescript-eslint/no-inferrable-types': 'off',
       // Pending https://github.com/typescript-eslint/typescript-eslint/issues/4820
       '@typescript-eslint/prefer-optional-chain': 'off',
-      'unicorn/prefer-node-protocol': 'error'
-    }
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          args: 'all',
+          argsIgnorePattern: '^_',
+          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
+  ...jsonc.configs['flat/recommended-with-jsonc'],
+  {
+    files: ['**/*.json', '**/*.jsonc', '**/*.json5'],
+    languageOptions: {
+      parser: jsoncParser,
+    },
+    rules: {
+      'jsonc/array-bracket-spacing': ['error', 'never'],
+      'jsonc/comma-dangle': ['error', 'never'],
+      'jsonc/indent': ['error', 2],
+      'jsonc/no-comments': 'off',
+      'jsonc/quotes': ['error', 'double'],
+    },
+  },
+  {
+    files: ['src/i18n/**/*.json'],
+    rules: {
+      'jsonc/sort-keys': [
+        'error',
+        'asc', // 升序排列
+        {
+          caseSensitive: false,
+          natural: true,
+        },
+      ],
+    },
   },
   {
     files: ['**/*.mjs', '**/*.mts'],
@@ -97,9 +125,10 @@ export default defineConfig(
         { name: '__dirname' },
         { name: 'require' },
         { name: 'module' },
-        { name: 'exports' }
-      ]
-    }
+        { name: 'exports' },
+      ],
+    },
   },
-  eslintPluginPrettierRecommended
+  configPrettier,
+  pluginPrettier,
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "Modified PicGo core, A tool for picture uploading",
   "author": {
     "name": "Kuingsmile",
@@ -54,7 +54,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
+    "@eslint/js": "^9.39.2",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -72,57 +72,57 @@
     "@types/resolve": "^1.20.6",
     "@types/text-to-svg": "^3.1.4",
     "@types/tunnel": "^0.0.7",
-    "@typescript-eslint/eslint-plugin": "^8.46.3",
-    "@typescript-eslint/parser": "^8.46.3",
     "cross-env": "^10.1.0",
     "dpdm": "^3.14.0",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-jsonc": "^2.21.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unicorn": "^62.0.0",
     "husky": "^9.1.7",
+    "jsonc-eslint-parser": "^2.4.2",
     "node-bump-version": "^2.0.0",
-    "prettier": "^3.6.2",
-    "rollup": "^4.53.1",
+    "prettier": "^3.7.4",
+    "rimraf": "^6.1.2",
+    "rollup": "^4.55.1",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-string": "^3.0.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.46.3",
-    "rimraf": "^6.1.0"
+    "typescript-eslint": "^8.52.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.931.0",
-    "@aws-sdk/lib-storage": "3.931.0",
-    "@aws-sdk/s3-request-presigner": "3.931.0",
-    "@piclist/store": "^3.0.0",
+    "@aws-sdk/client-s3": "3.965.0",
+    "@aws-sdk/lib-storage": "3.965.0",
+    "@aws-sdk/s3-request-presigner": "3.965.0",
     "@piclist/i18n": "^2.0.0",
-    "@smithy/node-http-handler": "4.4.5",
+    "@piclist/store": "^3.0.1",
+    "@smithy/node-http-handler": "4.4.7",
     "axios": "^1.13.2",
-    "chalk": "^5.4.1",
+    "chalk": "^5.6.2",
     "commander": "^8.1.0",
     "cross-spawn": "^7.0.6",
     "dayjs": "^1.11.19",
-    "file-type": "21.1.0",
-    "form-data": "^4.0.4",
-    "fs-extra": "^11.3.2",
+    "file-type": "21.3.0",
+    "form-data": "^4.0.5",
+    "fs-extra": "^11.3.3",
     "heic-convert": "^2.1.0",
     "hpagent": "1.2.0",
     "image-size": "^2.0.2",
     "inquirer": "^6.0.0",
     "is-wsl": "^3.1.0",
     "js-yaml": "^4.1.1",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "^4.17.22",
     "mime": "4.1.0",
     "minimist": "^1.2.8",
     "multer": "^2.0.2",
     "node-ssh-no-cpu-features": "^2.0.0",
     "qiniu": "7.14.0",
     "resolve": "^1.22.11",
-    "sharp": "^0.34.4",
+    "sharp": "^0.34.5",
     "text-to-svg": "^3.1.5",
     "tunnel": "^0.0.6",
-    "uuid": "^11.1.0",
+    "uuid": "^13.0.0",
     "webdav": "^5.8.0"
   },
   "repository": {

package/renovate.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"]
+}

package/rollup.config.js

@@ -26,28 +26,28 @@ const commonOptions = {
   // See https://github.com/rollup/rollup/issues/3684#issuecomment-926558056
   external: [
     ...Object.keys(pkg.dependencies).map(packageName => new RegExp(`^${packageName}(/.*)?`)),
-    ...builtinModules.map(moduleName => new RegExp(`^(node:)?${moduleName}(/.*)?`))
+    ...builtinModules.map(moduleName => new RegExp(`^(node:)?${moduleName}(/.*)?`)),
   ],
   plugins: [
     typescript({
-      tsconfig: './tsconfig.json'
+      tsconfig: './tsconfig.json',
     }),
     copy({
-      targets: [{ src: 'assets', dest: 'dist' }]
+      targets: [{ src: 'assets', dest: 'dist' }],
     }),
     // terser(),
     commonjs(),
     string({
       // Required to be specified
-      include: ['**/*.applescript', '**/*.ps1', '**/*.sh']
+      include: ['**/*.applescript', '**/*.ps1', '**/*.sh'],
     }),
     json(),
     replace({
       'process.env.PICGO_VERSION': JSON.stringify(pkg.version),
-      preventAssignment: true
-    })
+      preventAssignment: true,
+    }),
   ],
-  input
+  input,
 }
 
 const isDev = process.env.NODE_ENV === 'development'
@@ -64,10 +64,10 @@ const nodeEsm = {
       file: 'dist/index.js',
       format: 'esm',
       banner,
-      sourcemap
-    }
+      sourcemap,
+    },
   ],
-  ...commonOptions
+  ...commonOptions,
 }
 
 const bundles = []