picgo-plugin-s3 1.5.0 → 1.5.2

package/README.md

@@ -70,6 +70,11 @@ picgo set uploader s3
 | `{sha1}` | 图片 SHA1 |
 | `{sha256}` | 图片 SHA256 |
 
+对于 MD5、SHA1、SHA256，支持这几种截断方式：
+
+- `{sha256:2}`：从第三个字符开始，例如 `abcd -> cd`
+- `{sha256:2,4}`：从第三个字符开始，截取长度为4，例如 `abcdefgh`
+
 ---
 
 #### 自定义输出 URL 模板 (`outputURLPattern`)
@@ -83,9 +88,9 @@ picgo set uploader s3
 | `{protocol}` | URL 协议 | `http` 或 `https` |
 | `{host}` | URL 域名 | `s3.amazonaws.com` |
 | `{port}` | URL 端口 | `80` |
-| `{dir}` | 上传目录 | `my-bucket/2024/12` |
-| `{file}` | 上传后的文件名 (含扩展名) | `4aa4f41e38817e5fd38ac870f40dbc70.jpg` |
-| `{path}` | 完整路径 (`{dir}/{file}`) | `my-bucket/2024/12/4aa4f41e38817e5fd38ac870f40dbc70.jpg` |
+| `{dir}` | 上传目录 | `xxx/2024/12` |
+| `{uploadedFileName}` | 上传后的文件名 (含扩展名) | `4aa4f41e38817e5fd38ac870f40dbc70.jpg` |
+| `{path}` | 完整路径 (`{dir}/{uploadedFileName}`) | `xxx/2024/12/4aa4f41e38817e5fd38ac870f40dbc70.jpg` |
 | `{fileName}` | **源**文件名 (含扩展名) | `test.jpg` |
 | `{extName}` | **源**文件扩展名 (不含 `.`) | `jpg` |
 | `{query}` | URL 查询参数 (不含 `?`) | `height=100&width=200` |
@@ -94,7 +99,7 @@ picgo set uploader s3
 
 ##### 正则替换
 
-每个变量都支持通过正则表达式进行替换。
+每个变量都支持通过正则表达式进行替换(正则替换表达式中间不能有空格)。
 
 **语法:**
 ```

package/dist/utils.js

@@ -67,7 +67,7 @@ class Generateor {
 }
 class FileNameGenerator extends Generateor {
     constructor(info) {
-        super(info.date);
+        super(info.uploadDate);
         this.info = info;
     }
     fullName() {
@@ -130,18 +130,24 @@ class FileNameGenerator extends Generateor {
             sha256: () => this.sha256(),
         };
         return Object.entries(formatters).reduce((result, [key, formatter]) => {
-            const simplePattern = new RegExp(`{${key}}`, 'g');
+            const rangePattern = new RegExp(`{${key}:(\\d+),(\\d+)}`, 'g');
             const truncatePattern = new RegExp(`{${key}:(\\d+)}`, 'g');
-            if (truncatePattern.test(result)) {
-                result = result.replace(truncatePattern, (match, length) => {
-                    const value = formatter();
-                    const truncateLength = parseInt(length, 10);
-                    return value.substring(0, truncateLength);
-                });
-            }
-            else {
-                result = result.replace(simplePattern, formatter());
-            }
+            const simplePattern = new RegExp(`{${key}}`, 'g');
+            // Replace range patterns: {key:start,length}
+            result = result.replace(rangePattern, (match, start, length) => {
+                const value = formatter();
+                const startPos = parseInt(start, 10);
+                const subLength = parseInt(length, 10);
+                return value.substring(startPos, startPos + subLength);
+            });
+            // Replace truncate patterns: {key:length}
+            result = result.replace(truncatePattern, (match, length) => {
+                const value = formatter();
+                const truncateLength = parseInt(length, 10);
+                return value.substring(0, truncateLength);
+            });
+            // Replace simple patterns: {key}
+            result = result.replace(simplePattern, formatter());
             return result;
         }, super.format(s));
     }
@@ -149,7 +155,7 @@ class FileNameGenerator extends Generateor {
 exports.FileNameGenerator = FileNameGenerator;
 class OutputURLGenerator extends Generateor {
     constructor(config, info) {
-        super(info.date);
+        super(info.uploadDate);
         this._config = config;
         this._info = info;
         // parse the url from storage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picgo-plugin-s3",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "picgo amazon s3 uploader",
   "main": "dist/index.js",
   "publishConfig": {
@@ -8,15 +8,9 @@
   },
   "type": "commonjs",
   "homepage": "https://github.com/wayjam/picgo-plugin-s3",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc -p .",
-    "dev": "tsc -w -p .",
-    "pub": "rm -rf dist/* && npm build && npm publish",
-    "push": "git push origin main && git push origin --tags",
-    "patch": "npm version patch -m 'bump version into v%s'",
-    "minor": "npm version minor -m 'bump version into v%s'",
-    "major": "npm version major -m 'bump version into v%s'"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/wayjam/picgo-plugin-s3.git"
   },
   "keywords": [
     "amazon-s3",
@@ -29,16 +23,18 @@
   "author": "WayJam So",
   "license": "MIT",
   "devDependencies": {
-    "@types/mime": "^3.0.4",
     "@eslint/js": "^9.16.0",
+    "@types/mime": "^3.0.4",
     "@types/node": "^22.10.1",
     "@typescript-eslint/eslint-plugin": "^8.17.0",
     "@typescript-eslint/parser": "^8.17.0",
+    "@vitest/ui": "^4.0.18",
     "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "prettier": "^3.4.2",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.2",
+    "vitest": "^4.0.18"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "~3.729.0",
@@ -50,13 +46,15 @@
     "mime": ">=3.0.0 <4.0.0",
     "picgo": "^1.5.8"
   },
-  "pnpm": {
-    "overrides": {
-      "got@<11.8.5": ">=11.8.5",
-      "ejs@<3.1.7": ">=3.1.7",
-      "http-cache-semantics@<4.1.1": ">=4.1.1",
-      "axios@>=0.8.1 <0.28.0": ">=0.28.0",
-      "ejs@<3.1.10": ">=3.1.10"
-    }
+  "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "build": "tsc -p .",
+    "dev": "tsc -w -p .",
+    "pub": "rm -rf dist/* && npm build && npm publish",
+    "push": "git push origin main && git push origin --tags",
+    "patch": "npm version patch -m 'bump version into v%s'",
+    "minor": "npm version minor -m 'bump version into v%s'",
+    "major": "npm version major -m 'bump version into v%s'"
   }
-}
+}