@nocobase/plugin-file-manager 1.6.3 → 1.6.5

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.3",
+  "@nocobase/client": "1.6.5",
   "react": "18.2.0",
   "antd": "5.12.8",
   "@ant-design/icons": "5.6.1",
@@ -18,12 +18,12 @@ module.exports = {
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/database": "1.6.3",
   "multer": "1.4.4",
-  "@nocobase/server": "1.6.3",
-  "@nocobase/utils": "1.6.3",
-  "@nocobase/test": "1.6.3",
-  "@nocobase/actions": "1.6.3",
+  "@nocobase/server": "1.6.5",
+  "@nocobase/utils": "1.6.5",
+  "@nocobase/database": "1.6.5",
+  "@nocobase/test": "1.6.5",
+  "@nocobase/actions": "1.6.5",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-data-source-main": "1.6.3"
+  "@nocobase/plugin-data-source-main": "1.6.5"
 };

package/dist/node_modules/@aws-sdk/client-s3/package.json

@@ -1 +1 @@
-{"name":"@aws-sdk/client-s3","description":"AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native","version":"3.750.0","scripts":{"build":"concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'","build:cjs":"node ../../scripts/compilation/inline client-s3","build:es":"tsc -p tsconfig.es.json","build:include:deps":"lerna run --scope $npm_package_name --include-dependencies build","build:types":"tsc -p tsconfig.types.json","build:types:downlevel":"downlevel-dts dist-types dist-types/ts3.4","clean":"rimraf ./dist-* && rimraf *.tsbuildinfo","extract:docs":"api-extractor run --local","generate:client":"node ../../scripts/generate-clients/single-service --solo s3","test":"yarn g:vitest run","test:browser":"node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts","test:browser:watch":"node ./test/browser-build/esbuild && yarn g:vitest watch -c vitest.config.browser.ts","test:e2e":"yarn g:vitest run -c vitest.config.e2e.ts && yarn test:browser","test:e2e:watch":"yarn g:vitest watch -c vitest.config.e2e.ts","test:watch":"yarn g:vitest watch"},"main":"./dist-cjs/index.js","types":"./dist-types/index.d.ts","module":"./dist-es/index.js","sideEffects":false,"dependencies":{"@aws-crypto/sha1-browser":"5.2.0","@aws-crypto/sha256-browser":"5.2.0","@aws-crypto/sha256-js":"5.2.0","@aws-sdk/core":"3.750.0","@aws-sdk/credential-provider-node":"3.750.0","@aws-sdk/middleware-bucket-endpoint":"3.734.0","@aws-sdk/middleware-expect-continue":"3.734.0","@aws-sdk/middleware-flexible-checksums":"3.750.0","@aws-sdk/middleware-host-header":"3.734.0","@aws-sdk/middleware-location-constraint":"3.734.0","@aws-sdk/middleware-logger":"3.734.0","@aws-sdk/middleware-recursion-detection":"3.734.0","@aws-sdk/middleware-sdk-s3":"3.750.0","@aws-sdk/middleware-ssec":"3.734.0","@aws-sdk/middleware-user-agent":"3.750.0","@aws-sdk/region-config-resolver":"3.734.0","@aws-sdk/signature-v4-multi-region":"3.750.0","@aws-sdk/types":"3.734.0","@aws-sdk/util-endpoints":"3.743.0","@aws-sdk/util-user-agent-browser":"3.734.0","@aws-sdk/util-user-agent-node":"3.750.0","@aws-sdk/xml-builder":"3.734.0","@smithy/config-resolver":"^4.0.1","@smithy/core":"^3.1.4","@smithy/eventstream-serde-browser":"^4.0.1","@smithy/eventstream-serde-config-resolver":"^4.0.1","@smithy/eventstream-serde-node":"^4.0.1","@smithy/fetch-http-handler":"^5.0.1","@smithy/hash-blob-browser":"^4.0.1","@smithy/hash-node":"^4.0.1","@smithy/hash-stream-node":"^4.0.1","@smithy/invalid-dependency":"^4.0.1","@smithy/md5-js":"^4.0.1","@smithy/middleware-content-length":"^4.0.1","@smithy/middleware-endpoint":"^4.0.5","@smithy/middleware-retry":"^4.0.6","@smithy/middleware-serde":"^4.0.2","@smithy/middleware-stack":"^4.0.1","@smithy/node-config-provider":"^4.0.1","@smithy/node-http-handler":"^4.0.2","@smithy/protocol-http":"^5.0.1","@smithy/smithy-client":"^4.1.5","@smithy/types":"^4.1.0","@smithy/url-parser":"^4.0.1","@smithy/util-base64":"^4.0.0","@smithy/util-body-length-browser":"^4.0.0","@smithy/util-body-length-node":"^4.0.0","@smithy/util-defaults-mode-browser":"^4.0.6","@smithy/util-defaults-mode-node":"^4.0.6","@smithy/util-endpoints":"^3.0.1","@smithy/util-middleware":"^4.0.1","@smithy/util-retry":"^4.0.1","@smithy/util-stream":"^4.1.1","@smithy/util-utf8":"^4.0.0","@smithy/util-waiter":"^4.0.2","tslib":"^2.6.2"},"devDependencies":{"@aws-sdk/signature-v4-crt":"3.750.0","@tsconfig/node18":"18.2.4","@types/node":"^18.19.69","concurrently":"7.0.0","downlevel-dts":"0.10.1","rimraf":"3.0.2","typescript":"~5.2.2"},"engines":{"node":">=18.0.0"},"typesVersions":{"<4.0":{"dist-types/*":["dist-types/ts3.4/*"]}},"files":["dist-*/**"],"author":{"name":"AWS SDK for JavaScript Team","url":"https://aws.amazon.com/javascript/"},"license":"Apache-2.0","browser":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.browser"},"react-native":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.native"},"homepage":"https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-s3","repository":{"type":"git","url":"https://github.com/aws/aws-sdk-js-v3.git","directory":"clients/client-s3"},"_lastModified":"2025-03-13T23:00:26.192Z"}
+{"name":"@aws-sdk/client-s3","description":"AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native","version":"3.750.0","scripts":{"build":"concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'","build:cjs":"node ../../scripts/compilation/inline client-s3","build:es":"tsc -p tsconfig.es.json","build:include:deps":"lerna run --scope $npm_package_name --include-dependencies build","build:types":"tsc -p tsconfig.types.json","build:types:downlevel":"downlevel-dts dist-types dist-types/ts3.4","clean":"rimraf ./dist-* && rimraf *.tsbuildinfo","extract:docs":"api-extractor run --local","generate:client":"node ../../scripts/generate-clients/single-service --solo s3","test":"yarn g:vitest run","test:browser":"node ./test/browser-build/esbuild && yarn g:vitest run -c vitest.config.browser.ts","test:browser:watch":"node ./test/browser-build/esbuild && yarn g:vitest watch -c vitest.config.browser.ts","test:e2e":"yarn g:vitest run -c vitest.config.e2e.ts && yarn test:browser","test:e2e:watch":"yarn g:vitest watch -c vitest.config.e2e.ts","test:watch":"yarn g:vitest watch"},"main":"./dist-cjs/index.js","types":"./dist-types/index.d.ts","module":"./dist-es/index.js","sideEffects":false,"dependencies":{"@aws-crypto/sha1-browser":"5.2.0","@aws-crypto/sha256-browser":"5.2.0","@aws-crypto/sha256-js":"5.2.0","@aws-sdk/core":"3.750.0","@aws-sdk/credential-provider-node":"3.750.0","@aws-sdk/middleware-bucket-endpoint":"3.734.0","@aws-sdk/middleware-expect-continue":"3.734.0","@aws-sdk/middleware-flexible-checksums":"3.750.0","@aws-sdk/middleware-host-header":"3.734.0","@aws-sdk/middleware-location-constraint":"3.734.0","@aws-sdk/middleware-logger":"3.734.0","@aws-sdk/middleware-recursion-detection":"3.734.0","@aws-sdk/middleware-sdk-s3":"3.750.0","@aws-sdk/middleware-ssec":"3.734.0","@aws-sdk/middleware-user-agent":"3.750.0","@aws-sdk/region-config-resolver":"3.734.0","@aws-sdk/signature-v4-multi-region":"3.750.0","@aws-sdk/types":"3.734.0","@aws-sdk/util-endpoints":"3.743.0","@aws-sdk/util-user-agent-browser":"3.734.0","@aws-sdk/util-user-agent-node":"3.750.0","@aws-sdk/xml-builder":"3.734.0","@smithy/config-resolver":"^4.0.1","@smithy/core":"^3.1.4","@smithy/eventstream-serde-browser":"^4.0.1","@smithy/eventstream-serde-config-resolver":"^4.0.1","@smithy/eventstream-serde-node":"^4.0.1","@smithy/fetch-http-handler":"^5.0.1","@smithy/hash-blob-browser":"^4.0.1","@smithy/hash-node":"^4.0.1","@smithy/hash-stream-node":"^4.0.1","@smithy/invalid-dependency":"^4.0.1","@smithy/md5-js":"^4.0.1","@smithy/middleware-content-length":"^4.0.1","@smithy/middleware-endpoint":"^4.0.5","@smithy/middleware-retry":"^4.0.6","@smithy/middleware-serde":"^4.0.2","@smithy/middleware-stack":"^4.0.1","@smithy/node-config-provider":"^4.0.1","@smithy/node-http-handler":"^4.0.2","@smithy/protocol-http":"^5.0.1","@smithy/smithy-client":"^4.1.5","@smithy/types":"^4.1.0","@smithy/url-parser":"^4.0.1","@smithy/util-base64":"^4.0.0","@smithy/util-body-length-browser":"^4.0.0","@smithy/util-body-length-node":"^4.0.0","@smithy/util-defaults-mode-browser":"^4.0.6","@smithy/util-defaults-mode-node":"^4.0.6","@smithy/util-endpoints":"^3.0.1","@smithy/util-middleware":"^4.0.1","@smithy/util-retry":"^4.0.1","@smithy/util-stream":"^4.1.1","@smithy/util-utf8":"^4.0.0","@smithy/util-waiter":"^4.0.2","tslib":"^2.6.2"},"devDependencies":{"@aws-sdk/signature-v4-crt":"3.750.0","@tsconfig/node18":"18.2.4","@types/node":"^18.19.69","concurrently":"7.0.0","downlevel-dts":"0.10.1","rimraf":"3.0.2","typescript":"~5.2.2"},"engines":{"node":">=18.0.0"},"typesVersions":{"<4.0":{"dist-types/*":["dist-types/ts3.4/*"]}},"files":["dist-*/**"],"author":{"name":"AWS SDK for JavaScript Team","url":"https://aws.amazon.com/javascript/"},"license":"Apache-2.0","browser":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.browser"},"react-native":{"./dist-es/runtimeConfig":"./dist-es/runtimeConfig.native"},"homepage":"https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-s3","repository":{"type":"git","url":"https://github.com/aws/aws-sdk-js-v3.git","directory":"clients/client-s3"},"_lastModified":"2025-03-17T10:38:59.013Z"}

package/dist/node_modules/mime-match/package.json

@@ -1 +1 @@
-{"name":"mime-match","version":"1.0.2","description":"A simple function to check whether a mimetype matches the specified mimetype (with wildcard support)","main":"index.js","scripts":{"test":"node test.js","gendocs":"gendocs > README.md"},"repository":{"type":"git","url":"https://github.com/DamonOehlman/mime-match.git"},"keywords":["mime","wildcard"],"author":"Damon Oehlman <damon.oehlman@gmail.com>","license":"ISC","bugs":{"url":"https://github.com/DamonOehlman/mime-match/issues"},"homepage":"https://github.com/DamonOehlman/mime-match","dependencies":{"wildcard":"^1.1.0"},"devDependencies":{"tape":"^4.5.1"},"_lastModified":"2025-03-13T23:00:20.030Z"}
+{"name":"mime-match","version":"1.0.2","description":"A simple function to check whether a mimetype matches the specified mimetype (with wildcard support)","main":"index.js","scripts":{"test":"node test.js","gendocs":"gendocs > README.md"},"repository":{"type":"git","url":"https://github.com/DamonOehlman/mime-match.git"},"keywords":["mime","wildcard"],"author":"Damon Oehlman <damon.oehlman@gmail.com>","license":"ISC","bugs":{"url":"https://github.com/DamonOehlman/mime-match/issues"},"homepage":"https://github.com/DamonOehlman/mime-match","dependencies":{"wildcard":"^1.1.0"},"devDependencies":{"tape":"^4.5.1"},"_lastModified":"2025-03-17T10:38:52.980Z"}

package/dist/node_modules/mkdirp/package.json

@@ -1 +1 @@
-{"name":"mkdirp","description":"Recursively mkdir, like `mkdir -p`","version":"0.5.6","publishConfig":{"tag":"legacy"},"author":"James Halliday <mail@substack.net> (http://substack.net)","main":"index.js","keywords":["mkdir","directory"],"repository":{"type":"git","url":"https://github.com/substack/node-mkdirp.git"},"scripts":{"test":"tap test/*.js"},"dependencies":{"minimist":"^1.2.6"},"devDependencies":{"tap":"^16.0.1"},"bin":"bin/cmd.js","license":"MIT","files":["bin","index.js"],"_lastModified":"2025-03-13T23:00:24.751Z"}
+{"name":"mkdirp","description":"Recursively mkdir, like `mkdir -p`","version":"0.5.6","publishConfig":{"tag":"legacy"},"author":"James Halliday <mail@substack.net> (http://substack.net)","main":"index.js","keywords":["mkdir","directory"],"repository":{"type":"git","url":"https://github.com/substack/node-mkdirp.git"},"scripts":{"test":"tap test/*.js"},"dependencies":{"minimist":"^1.2.6"},"devDependencies":{"tap":"^16.0.1"},"bin":"bin/cmd.js","license":"MIT","files":["bin","index.js"],"_lastModified":"2025-03-17T10:38:57.620Z"}

package/dist/node_modules/multer-aliyun-oss/package.json

@@ -1 +1 @@
-{"name":"multer-aliyun-oss","version":"2.1.3","description":"Multer Storage for AliYun OSS","main":"index.js","scripts":{},"author":"AngusYoung","license":"ISC","repository":{"type":"git","url":"git+https://github.com/ay86/multer-aliyun-oss.git"},"keywords":["multer","storage","aliyun","oss"],"dependencies":{"ali-oss":"^6.1.0"},"_lastModified":"2025-03-13T23:00:24.671Z"}
+{"name":"multer-aliyun-oss","version":"2.1.3","description":"Multer Storage for AliYun OSS","main":"index.js","scripts":{},"author":"AngusYoung","license":"ISC","repository":{"type":"git","url":"git+https://github.com/ay86/multer-aliyun-oss.git"},"keywords":["multer","storage","aliyun","oss"],"dependencies":{"ali-oss":"^6.1.0"},"_lastModified":"2025-03-17T10:38:57.460Z"}

package/dist/node_modules/multer-cos/package.json

@@ -1 +1 @@
-{"_from":"multer-cos","_id":"multer-cos@1.0.2","_inBundle":false,"_integrity":"sha512-4F8P1VTCSNhiem+BFJFLe3Ixco6cIuAQ6j7U+PBRvdbBJRZgq5Q+vaDMMBWJ1HmPGOOP3AyKS5yk2f0nbFoqqA==","_location":"/multer-cos","_phantomChildren":{},"_requested":{"type":"tag","registry":true,"raw":"multer-cos","name":"multer-cos","escapedName":"multer-cos","rawSpec":"","saveSpec":null,"fetchSpec":"latest"},"_requiredBy":["#USER","/"],"_resolved":"https://registry.npmjs.org/multer-cos/-/multer-cos-1.0.2.tgz","_shasum":"95c7c06cdee1b9311675a895481f9d946de6dcf3","_spec":"multer-cos","_where":"/Users/lanbo/workplace/websocket","author":{"name":"lanbosm"},"bugs":{"url":"https://github.com/lanbosm/multer-COS/issues"},"bundleDependencies":false,"deprecated":false,"description":"Streaming multer storage engine for QCloud COS","devDependencies":{"cos-nodejs-sdk-v5":"^2.2.6","dotenv":"^5.0.1","multer":"^1.3.0"},"engines":{"node":">= 6.10.0"},"homepage":"https://github.com/lanbosm/multer-COS#readme","keywords":["express","multer","COS"],"license":"MIT","main":"index.js","name":"multer-cos","repository":{"type":"git","url":"git+ssh://git@github.com/lanbosm/multer-COS.git"},"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"version":"1.0.3","_lastModified":"2025-03-13T23:00:32.025Z"}
+{"_from":"multer-cos","_id":"multer-cos@1.0.2","_inBundle":false,"_integrity":"sha512-4F8P1VTCSNhiem+BFJFLe3Ixco6cIuAQ6j7U+PBRvdbBJRZgq5Q+vaDMMBWJ1HmPGOOP3AyKS5yk2f0nbFoqqA==","_location":"/multer-cos","_phantomChildren":{},"_requested":{"type":"tag","registry":true,"raw":"multer-cos","name":"multer-cos","escapedName":"multer-cos","rawSpec":"","saveSpec":null,"fetchSpec":"latest"},"_requiredBy":["#USER","/"],"_resolved":"https://registry.npmjs.org/multer-cos/-/multer-cos-1.0.2.tgz","_shasum":"95c7c06cdee1b9311675a895481f9d946de6dcf3","_spec":"multer-cos","_where":"/Users/lanbo/workplace/websocket","author":{"name":"lanbosm"},"bugs":{"url":"https://github.com/lanbosm/multer-COS/issues"},"bundleDependencies":false,"deprecated":false,"description":"Streaming multer storage engine for QCloud COS","devDependencies":{"cos-nodejs-sdk-v5":"^2.2.6","dotenv":"^5.0.1","multer":"^1.3.0"},"engines":{"node":">= 6.10.0"},"homepage":"https://github.com/lanbosm/multer-COS#readme","keywords":["express","multer","COS"],"license":"MIT","main":"index.js","name":"multer-cos","repository":{"type":"git","url":"git+ssh://git@github.com/lanbosm/multer-COS.git"},"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"version":"1.0.3","_lastModified":"2025-03-17T10:39:04.505Z"}

package/dist/node_modules/multer-s3/package.json

@@ -1 +1 @@
-{"name":"multer-s3","version":"3.0.1","description":"Streaming multer storage engine for AWS S3","main":"index.js","scripts":{"test":"standard && mocha test/basic.js"},"engines":{"node":">= 12.0.0"},"repository":{"type":"git","url":"git+https://github.com/badunk/multer-s3.git"},"keywords":["multer","s3","amazon","aws"],"author":"badunk","license":"MIT","bugs":{"url":"https://github.com/badunk/multer-s3/issues"},"homepage":"https://github.com/badunk/multer-s3#readme","dependencies":{"@aws-sdk/lib-storage":"^3.46.0","file-type":"^3.3.0","html-comment-regex":"^1.1.2","run-parallel":"^1.1.6"},"peerDependencies":{"@aws-sdk/client-s3":"^3.0.0"},"devDependencies":{"express":"^4.13.1","form-data":"^1.0.0-rc3","mocha":"^2.2.5","multer":"^1.1.0","on-finished":"^2.3.0","standard":"^5.4.1","xtend":"^4.0.1"},"_lastModified":"2025-03-13T23:00:27.856Z"}
+{"name":"multer-s3","version":"3.0.1","description":"Streaming multer storage engine for AWS S3","main":"index.js","scripts":{"test":"standard && mocha test/basic.js"},"engines":{"node":">= 12.0.0"},"repository":{"type":"git","url":"git+https://github.com/badunk/multer-s3.git"},"keywords":["multer","s3","amazon","aws"],"author":"badunk","license":"MIT","bugs":{"url":"https://github.com/badunk/multer-s3/issues"},"homepage":"https://github.com/badunk/multer-s3#readme","dependencies":{"@aws-sdk/lib-storage":"^3.46.0","file-type":"^3.3.0","html-comment-regex":"^1.1.2","run-parallel":"^1.1.6"},"peerDependencies":{"@aws-sdk/client-s3":"^3.0.0"},"devDependencies":{"express":"^4.13.1","form-data":"^1.0.0-rc3","mocha":"^2.2.5","multer":"^1.1.0","on-finished":"^2.3.0","standard":"^5.4.1","xtend":"^4.0.1"},"_lastModified":"2025-03-17T10:39:00.553Z"}

package/dist/node_modules/url-join/.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - "5"
+  - "4"
+  - "0.12"  

package/dist/node_modules/url-join/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015 José F. Romaniello
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/node_modules/url-join/bin/changelog

@@ -0,0 +1,28 @@
+#!/usr/bin/env node
+
+var changelog = require('conventional-changelog');
+var semver_regex = /\bv?(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?\b/ig;
+
+const commitPartial = ` - {{header}}
+
+{{~!-- commit hash --}} {{#if @root.linkReferences}}([{{hash}}]({{#if @root.host}}{{@root.host}}/{{/if}}{{#if @root.owner}}{{@root.owner}}/{{/if}}{{@root.repository}}/{{@root.commit}}/{{hash}})){{else}}{{hash~}}{{/if}}
+
+{{~!-- commit references --}}{{#if references}}, closes{{~#each references}} {{#if @root.linkReferences}}[{{#if this.owner}}{{this.owner}}/{{/if}}{{this.repository}}#{{this.issue}}]({{#if @root.host}}{{@root.host}}/{{/if}}{{#if this.repository}}{{#if this.owner}}{{this.owner}}/{{/if}}{{this.repository}}{{else}}{{#if @root.owner}}{{@root.owner}}/{{/if}}{{@root.repository}}{{/if}}/{{@root.issue}}/{{this.issue}}){{else}}{{#if this.owner}}{{this.owner}}/{{/if}}{{this.repository}}#{{this.issue}}{{/if}}{{/each}}{{/if}}
+`;
+
+const headerPartial = `## {{version}}{{#if title}} "{{title}}"{{/if}}{{#if date}} - {{date}}{{/if}}
+`;
+
+changelog({
+  releaseCount: 19,
+  // preset: 'jshint'
+}, null, null, null, {
+  transform: function (commit) {
+    if (commit.header && semver_regex.exec(commit.header)) {
+      return null;
+    }
+    return commit;
+  },
+  commitPartial: commitPartial,
+  headerPartial: headerPartial
+}).pipe(process.stdout);

package/dist/node_modules/url-join/lib/url-join.js

@@ -0,0 +1 @@
+(function(){var e={821:function(e){(function(r,i,t){if(true&&e.exports)e.exports=t();else if(typeof define==="function"&&define.amd)define(t);else i[r]=t()})("urljoin",this,(function(){function normalize(e){var r=[];if(e.length===0){return""}if(typeof e[0]!=="string"){throw new TypeError("Url must be a string. Received "+e[0])}if(e[0].match(/^[^/:]+:\/*$/)&&e.length>1){var i=e.shift();e[0]=i+e[0]}if(e[0].match(/^file:\/\/\//)){e[0]=e[0].replace(/^([^/:]+):\/*/,"$1:///")}else{e[0]=e[0].replace(/^([^/:]+):\/*/,"$1://")}for(var t=0;t<e.length;t++){var n=e[t];if(typeof n!=="string"){throw new TypeError("Url must be a string. Received "+n)}if(n===""){continue}if(t>0){n=n.replace(/^[\/]+/,"")}if(t<e.length-1){n=n.replace(/[\/]+$/,"")}else{n=n.replace(/[\/]+$/,"/")}r.push(n)}var f=r.join("/");f=f.replace(/\/(\?|&|#[^!])/g,"$1");var a=f.split("?");f=a.shift()+(a.length>0?"?":"")+a.join("&");return f}return function(){var e;if(typeof arguments[0]==="object"){e=arguments[0]}else{e=[].slice.call(arguments)}return normalize(e)}}))}};var r={};function __nccwpck_require__(i){var t=r[i];if(t!==undefined){return t.exports}var n=r[i]={exports:{}};var f=true;try{e[i].call(n.exports,n,n.exports,__nccwpck_require__);f=false}finally{if(f)delete r[i]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var i=__nccwpck_require__(821);module.exports=i})();

package/dist/node_modules/url-join/package.json

@@ -0,0 +1 @@
+{"name":"url-join","version":"4.0.1","description":"Join urls and normalize as in path.join.","main":"lib/url-join.js","scripts":{"test":"mocha --require should"},"repository":{"type":"git","url":"git://github.com/jfromaniello/url-join.git"},"keywords":["url","join"],"author":"José F. Romaniello <jfromaniello@gmail.com> (http://joseoncode.com)","license":"MIT","devDependencies":{"conventional-changelog":"^1.1.10","mocha":"^3.2.0","should":"~1.2.1"},"_lastModified":"2025-03-17T10:38:57.540Z"}

package/dist/node_modules/url-join/test/tests.js

@@ -0,0 +1,151 @@
+var urljoin = require('../lib/url-join');
+var assert = require('assert');
+
+describe('url join', function () {
+  it('should work for simple case', function () {
+    urljoin('http://www.google.com/', 'foo/bar', '?test=123')
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
+  it('should work for simple case with new syntax', function () {
+    urljoin(['http://www.google.com/', 'foo/bar', '?test=123'])
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
+  it('should work for hashbang urls', function () {
+    urljoin(['http://www.google.com', '#!', 'foo/bar', '?test=123'])
+      .should.eql('http://www.google.com/#!/foo/bar?test=123');
+  });
+
+  it('should be able to join protocol', function () {
+    urljoin('http:', 'www.google.com/', 'foo/bar', '?test=123')
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
+  it('should be able to join protocol with slashes', function () {
+    urljoin('http://', 'www.google.com/', 'foo/bar', '?test=123')
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
+  it('should remove extra slashes', function () {
+    urljoin('http:', 'www.google.com///', 'foo/bar', '?test=123')
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
+  it('should not remove extra slashes in an encoded URL', function () {
+    urljoin('http:', 'www.google.com///', 'foo/bar', '?url=http%3A//Ftest.com')
+      .should.eql('http://www.google.com/foo/bar?url=http%3A//Ftest.com');
+
+    urljoin('http://a.com/23d04b3/', '/b/c.html')
+      .should.eql('http://a.com/23d04b3/b/c.html')
+      .should.not.eql('http://a.com/23d04b3//b/c.html');
+  });
+
+  it('should support anchors in urls', function () {
+    urljoin('http:', 'www.google.com///', 'foo/bar', '?test=123', '#faaaaa')
+      .should.eql('http://www.google.com/foo/bar?test=123#faaaaa');
+  });
+
+  it('should support protocol-relative urls', function () {
+    urljoin('//www.google.com', 'foo/bar', '?test=123')
+      .should.eql('//www.google.com/foo/bar?test=123')
+  });
+
+  it('should support file protocol urls', function () {
+    urljoin('file:/', 'android_asset', 'foo/bar')
+      .should.eql('file://android_asset/foo/bar')
+
+    urljoin('file:', '/android_asset', 'foo/bar')
+      .should.eql('file://android_asset/foo/bar')
+  });
+
+  it('should support absolute file protocol urls', function () {
+    urljoin('file:', '///android_asset', 'foo/bar')
+      .should.eql('file:///android_asset/foo/bar')
+
+    urljoin('file:///', 'android_asset', 'foo/bar')
+      .should.eql('file:///android_asset/foo/bar')
+
+    urljoin('file:///', '//android_asset', 'foo/bar')
+      .should.eql('file:///android_asset/foo/bar')
+
+    urljoin('file:///android_asset', 'foo/bar')
+      .should.eql('file:///android_asset/foo/bar')
+  });
+
+  it('should merge multiple query params properly', function () {
+    urljoin('http:', 'www.google.com///', 'foo/bar', '?test=123', '?key=456')
+      .should.eql('http://www.google.com/foo/bar?test=123&key=456');
+
+    urljoin('http:', 'www.google.com///', 'foo/bar', '?test=123', '?boom=value', '&key=456')
+      .should.eql('http://www.google.com/foo/bar?test=123&boom=value&key=456');
+
+    urljoin('http://example.org/x', '?a=1', '?b=2', '?c=3', '?d=4')
+      .should.eql('http://example.org/x?a=1&b=2&c=3&d=4');
+  });
+
+  it('should merge slashes in paths correctly', function () {
+    urljoin('http://example.org', 'a//', 'b//', 'A//', 'B//')
+      .should.eql('http://example.org/a/b/A/B/');
+  });
+
+  it('should merge colons in paths correctly', function () {
+    urljoin('http://example.org/', ':foo:', 'bar')
+      .should.eql('http://example.org/:foo:/bar');
+  });
+
+  it('should merge just a simple path without URL correctly', function() {
+    urljoin('/', 'test')
+      .should.eql('/test');
+  });
+
+  it('should fail with segments that are not string', function() {
+    assert.throws(() => urljoin(true),
+                  /Url must be a string. Received true/);
+    assert.throws(() => urljoin('http://blabla.com/', 1),
+                  /Url must be a string. Received 1/);
+    assert.throws(() => urljoin('http://blabla.com/', undefined, 'test'),
+                  /Url must be a string. Received undefined/);
+    assert.throws(() => urljoin('http://blabla.com/', null, 'test'),
+                  /Url must be a string. Received null/);
+    assert.throws(() => urljoin('http://blabla.com/', { foo: 123 }, 'test'),
+                  /Url must be a string. Received \[object Object\]/);
+  });
+
+  it('should merge a path with colon properly', function(){
+    urljoin('/users/:userId', '/cars/:carId')
+      .should.eql('/users/:userId/cars/:carId');
+  });
+
+  it('should merge slashes in protocol correctly', function () {
+    urljoin('http://example.org', 'a')
+      .should.eql('http://example.org/a');
+    urljoin('http:', '//example.org', 'a')
+      .should.eql('http://example.org/a');
+    urljoin('http:///example.org', 'a')
+      .should.eql('http://example.org/a');
+    urljoin('file:///example.org', 'a')
+      .should.eql('file:///example.org/a');
+
+    urljoin('file:example.org', 'a')
+      .should.eql('file://example.org/a');
+
+    urljoin('file:/', 'example.org', 'a')
+      .should.eql('file://example.org/a');
+    urljoin('file:', '/example.org', 'a')
+      .should.eql('file://example.org/a');
+    urljoin('file:', '//example.org', 'a')
+      .should.eql('file://example.org/a');
+  });
+
+  it('should skip empty strings', function() {
+    urljoin('http://foobar.com', '', 'test')
+      .should.eql('http://foobar.com/test');
+    urljoin('', 'http://foobar.com', '', 'test')
+      .should.eql('http://foobar.com/test');
+  });
+
+  it('should return an empty string if no arguments are supplied', function() {
+    urljoin().should.eql('');
+  });
+});

package/dist/server/actions/attachments.d.ts

@@ -7,15 +7,5 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Context, Next } from '@nocobase/actions';
-export declare function getFileData(ctx: Context): {
-    title: string;
-    filename: string;
-    extname: string;
-    path: any;
-    size: any;
-    url: string;
-    mimetype: any;
-    meta: unknown;
-    storageId: any;
-};
+export declare function getFileData(ctx: Context): Promise<any>;
 export declare function createMiddleware(ctx: Context, next: Next): Promise<any>;

package/dist/server/actions/attachments.js

@@ -53,34 +53,35 @@ function getFileFilter(storage) {
     cb(null, result);
   };
 }
-function getFileData(ctx) {
+async function getFileData(ctx) {
   const { [import_constants.FILE_FIELD_NAME]: file, storage } = ctx;
   if (!file) {
     return ctx.throw(400, "file validation failed");
   }
-  const StorageType = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
+  const plugin = ctx.app.pm.get(import__.default);
+  const StorageType = plugin.storageTypes.get(storage.type);
   const { [StorageType.filenameKey || "filename"]: name } = file;
   const filename = import_path.default.basename(name);
   const extname = import_path.default.extname(filename);
   const path = (storage.path || "").replace(/^\/|\/$/g, "");
-  const baseUrl = storage.baseUrl.replace(/\/+$/, "");
-  const pathname = [path, filename].filter(Boolean).join("/");
-  const storageInstance = new StorageType(storage);
-  return {
+  let storageInstance = plugin.storagesCache.get(storage.id);
+  if (!storageInstance) {
+    await plugin.loadStorages();
+    storageInstance = plugin.storagesCache.get(storage.id);
+  }
+  const data = {
     title: Buffer.from(file.originalname, "latin1").toString("utf8").replace(extname, ""),
     filename,
     extname,
     // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path
     path,
     size: file.size,
-    // 直接缓存起来
-    url: `${baseUrl}/${pathname}`,
     mimetype: file.mimetype,
-    // @ts-ignore
     meta: ctx.request.body,
     storageId: storage.id,
     ...storageInstance.getFileData ? storageInstance.getFileData(file) : {}
   };
+  return data;
 }
 async function multipart(ctx, next) {
   const { storage } = ctx;
@@ -114,7 +115,7 @@ async function multipart(ctx, next) {
     ctx.logger.error(err);
     return ctx.throw(500, err);
   }
-  const values = getFileData(ctx);
+  const values = await getFileData(ctx);
   ctx.action.mergeParams({
     values
   });

package/dist/server/actions/index.js

@@ -49,4 +49,23 @@ function actions_default({ app }) {
   });
   app.resourcer.use(import_attachments.createMiddleware, { tag: "createMiddleware", after: "auth" });
   app.resourcer.registerActionHandler("upload", import_actions.default.create);
+  app.resourcer.use(
+    async (ctx, next) => {
+      var _a;
+      await next();
+      try {
+        const { resourceName, actionName } = ctx.action;
+        const collection = ctx.db.getCollection(resourceName);
+        if (((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) !== "file") {
+          return;
+        }
+        if (actionName === "create" || actionName === "upload") {
+          ctx.body = await ctx.body.reload();
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    { before: "dataWrapping" }
+  );
 }

package/dist/server/server.d.ts

@@ -29,17 +29,7 @@ export declare class PluginFileManagerServer extends Plugin {
     registerStorageType(type: string, Type: StorageClassType): void;
     createFileRecord(options: FileRecordOptions): Promise<any>;
     parseStorage(instance: any): any;
-    uploadFile(options: UploadFileOptions): Promise<{
-        title: string;
-        filename: string;
-        extname: string;
-        path: any;
-        size: any;
-        url: string;
-        mimetype: any;
-        meta: unknown;
-        storageId: any;
-    }>;
+    uploadFile(options: UploadFileOptions): Promise<any>;
     loadStorages(options?: {
         transaction: any;
     }): Promise<void>;
@@ -47,6 +37,6 @@ export declare class PluginFileManagerServer extends Plugin {
     handleSyncMessage(message: any): Promise<void>;
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
-    getFileURL(file: AttachmentModel): string | Promise<string>;
+    getFileURL(file: AttachmentModel, preview?: boolean): Promise<string>;
 }
 export default PluginFileManagerServer;

package/dist/server/server.js

@@ -43,9 +43,9 @@ module.exports = __toCommonJS(server_exports);
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
 var import_path = require("path");
+var import_database = require("@nocobase/database");
 var import_fs = __toESM(require("fs"));
 var import_constants = require("../constants");
-var import_FileModel = require("./FileModel");
 var import_actions = __toESM(require("./actions"));
 var import_attachments = require("./actions/attachments");
 var import_attachment_interface = require("./interfaces/attachment-interface");
@@ -149,7 +149,6 @@ class PluginFileManagerServer extends import_server.Plugin {
     for (const storage of storages) {
       this.storagesCache.set(storage.get("id"), this.parseStorage(storage));
     }
-    this.db["_fileStorages"] = this.storagesCache;
   }
   async install() {
     const defaultStorageType = this.storageTypes.get(DEFAULT_STORAGE_TYPE);
@@ -186,7 +185,7 @@ class PluginFileManagerServer extends import_server.Plugin {
     }
   }
   async beforeLoad() {
-    this.db.registerModels({ FileModel: import_FileModel.FileModel });
+    this.db.registerModels({ FileModel: import_database.Model });
     this.db.on("beforeDefineCollection", (options) => {
       if (options.template === "file") {
         options.model = "FileModel";
@@ -248,11 +247,37 @@ class PluginFileManagerServer extends import_server.Plugin {
     this.app.acl.addFixedParams("attachments", "create", ownMerger);
     this.app.acl.addFixedParams("attachments", "destroy", ownMerger);
     this.app.db.interfaceManager.registerInterfaceType("attachment", import_attachment_interface.AttachmentInterface);
+    this.db.on("afterFind", async (instances) => {
+      var _a, _b, _c;
+      if (!instances) {
+        return;
+      }
+      const records = Array.isArray(instances) ? instances : [instances];
+      const name = (_b = (_a = records[0]) == null ? void 0 : _a.constructor) == null ? void 0 : _b.name;
+      if (name) {
+        const collection = this.db.getCollection(name);
+        if ((collection == null ? void 0 : collection.name) === "attachments" || ((_c = collection == null ? void 0 : collection.options) == null ? void 0 : _c.template) === "file") {
+          for (const record of records) {
+            const url = await this.getFileURL(record);
+            const previewUrl = await this.getFileURL(record, true);
+            record.set("url", url);
+            record.set("preview", previewUrl);
+            record.dataValues.preview = previewUrl;
+          }
+        }
+      }
+    });
   }
-  getFileURL(file) {
+  async getFileURL(file, preview = false) {
+    if (!file.storageId) {
+      return file.url;
+    }
     const storage = this.storagesCache.get(file.storageId);
+    if (!storage) {
+      return file.url;
+    }
     const storageType = this.storageTypes.get(storage.type);
-    return new storageType(storage).getFileURL(file);
+    return new storageType(storage).getFileURL(file, preview ? storage.options.thumbnailRule : "");
   }
 }
 var server_default = PluginFileManagerServer;

package/dist/server/storages/index.d.ts

@@ -38,7 +38,7 @@ export declare abstract class StorageType {
     }): {
         [key: string]: any;
     };
-    getFileURL(file: AttachmentModel): string | Promise<string>;
+    getFileURL(file: AttachmentModel, preview?: boolean): string | Promise<string>;
 }
 export type StorageClassType = {
     new (storage: StorageModel): StorageType;

package/dist/server/storages/index.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,12 +25,22 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var storages_exports = {};
 __export(storages_exports, {
   StorageType: () => StorageType
 });
 module.exports = __toCommonJS(storages_exports);
+var import_utils = require("@nocobase/utils");
+var import_url_join = __toESM(require("url-join"));
 class StorageType {
   constructor(storage) {
     this.storage = storage;
@@ -37,8 +49,20 @@ class StorageType {
     return {};
   }
   static filenameKey;
-  getFileURL(file) {
-    return file.url;
+  getFileURL(file, preview) {
+    if (file.url && (0, import_utils.isURL)(file.url)) {
+      if (preview) {
+        return file.url + (this.storage.options.thumbnailRule || "");
+      }
+      return file.url;
+    }
+    const keys = [
+      this.storage.baseUrl,
+      file.path && encodeURI(file.path),
+      encodeURIComponent(file.filename),
+      preview && this.storage.options.thumbnailRule
+    ].filter(Boolean);
+    return (0, import_url_join.default)(keys);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/storages/local.d.ts

@@ -24,5 +24,5 @@ export default class extends StorageType {
     };
     make(): multer.StorageEngine;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
-    getFileURL(file: AttachmentModel): string;
+    getFileURL(file: AttachmentModel, preview?: boolean): Promise<any>;
 }

package/dist/server/storages/local.js

@@ -39,13 +39,16 @@ __export(local_exports, {
   default: () => local_default
 });
 module.exports = __toCommonJS(local_exports);
+var import_utils = require("@nocobase/utils");
 var import_promises = __toESM(require("fs/promises"));
 var import_mkdirp = __toESM(require("mkdirp"));
 var import_multer = __toESM(require("multer"));
 var import_path = __toESM(require("path"));
+var import_url_join = __toESM(require("url-join"));
 var import__ = require(".");
 var import_constants = require("../../constants");
-var import_utils = require("../utils");
+var import_utils2 = require("../utils");
+const DEFAULT_BASE_URL = "/storage/uploads";
 function getDocumentRoot(storage) {
   const { documentRoot = process.env.LOCAL_STORAGE_DEST || "storage/uploads" } = storage.options || {};
   return import_path.default.resolve(import_path.default.isAbsolute(documentRoot) ? documentRoot : import_path.default.join(process.cwd(), documentRoot));
@@ -56,7 +59,7 @@ class local_default extends import__.StorageType {
       title: "Local storage",
       type: import_constants.STORAGE_TYPE_LOCAL,
       name: `local`,
-      baseUrl: "/storage/uploads",
+      baseUrl: DEFAULT_BASE_URL,
       options: {
         documentRoot: "storage/uploads"
       },
@@ -72,7 +75,7 @@ class local_default extends import__.StorageType {
         const destPath = import_path.default.join(getDocumentRoot(this.storage), this.storage.path || "");
         (0, import_mkdirp.default)(destPath, (err) => cb(err, destPath));
       },
-      filename: import_utils.getFilename
+      filename: import_utils2.getFilename
     });
   }
   async delete(records) {
@@ -98,7 +101,11 @@ class local_default extends import__.StorageType {
     );
     return [count, undeleted];
   }
-  getFileURL(file) {
-    return process.env.APP_PUBLIC_PATH ? `${process.env.APP_PUBLIC_PATH.replace(/\/$/g, "")}${file.url}` : file.url;
+  async getFileURL(file, preview = false) {
+    const url = await super.getFileURL(file, preview);
+    if ((0, import_utils.isURL)(url)) {
+      return url;
+    }
+    return (0, import_url_join.default)(process.env.APP_PUBLIC_PATH, url);
   }
 }

package/dist/server/storages/s3.d.ts

@@ -22,5 +22,9 @@ export default class extends StorageType {
     };
     static filenameKey: string;
     make(): any;
+    calculateContentMD5(body: any): string;
+    deleteS3Objects(bucketName: string, objects: string[]): Promise<{
+        Deleted: any[];
+    }>;
     delete(records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
 }

package/dist/server/storages/s3.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,12 +25,22 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var s3_exports = {};
 __export(s3_exports, {
   default: () => s3_default
 });
 module.exports = __toCommonJS(s3_exports);
+var import_client_s3 = require("@aws-sdk/client-s3");
+var import_crypto = __toESM(require("crypto"));
 var import__ = require(".");
 var import_constants = require("../../constants");
 var import_utils = require("../utils");
@@ -49,7 +61,6 @@ class s3_default extends import__.StorageType {
   }
   static filenameKey = "key";
   make() {
-    const { S3Client } = require("@aws-sdk/client-s3");
     const multerS3 = require("multer-s3");
     const { accessKeyId, secretAccessKey, bucket, acl = "public-read", ...options } = this.storage.options;
     if (options.endpoint) {
@@ -57,7 +68,7 @@ class s3_default extends import__.StorageType {
     } else {
       options.endpoint = void 0;
     }
-    const s3 = new S3Client({
+    const s3 = new import_client_s3.S3Client({
       ...options,
       credentials: {
         accessKeyId,
@@ -78,16 +89,29 @@ class s3_default extends import__.StorageType {
       key: (0, import_utils.cloudFilenameGetter)(this.storage)
     });
   }
-  async delete(records) {
-    const { DeleteObjectsCommand } = require("@aws-sdk/client-s3");
+  calculateContentMD5(body) {
+    const hash = import_crypto.default.createHash("md5").update(body).digest("base64");
+    return hash;
+  }
+  async deleteS3Objects(bucketName, objects) {
     const { s3 } = this.make();
-    const { Deleted } = await s3.send(
-      new DeleteObjectsCommand({
-        Bucket: this.storage.options.bucket,
-        Delete: {
-          Objects: records.map((record) => ({ Key: (0, import_utils.getFileKey)(record) }))
-        }
-      })
+    const Deleted = [];
+    for (const Key of objects) {
+      const deleteCommand = new import_client_s3.DeleteObjectCommand({
+        Bucket: bucketName,
+        Key
+      });
+      await s3.send(deleteCommand);
+      Deleted.push({ Key });
+    }
+    return {
+      Deleted
+    };
+  }
+  async delete(records) {
+    const { Deleted } = await this.deleteS3Objects(
+      this.storage.options.bucket,
+      records.map((record) => (0, import_utils.getFileKey)(record))
     );
     return [Deleted.length, records.filter((record) => !Deleted.find((item) => item.Key === (0, import_utils.getFileKey)(record)))];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -10,7 +10,7 @@
   "homepage": "https://docs.nocobase.com/handbook/file-manager",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/file-manager",
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.750.0",
+    "@aws-sdk/client-s3": "3.750.0",
     "@formily/antd-v5": "1.x",
     "@formily/core": "2.x",
     "@formily/react": "2.x",
@@ -29,7 +29,8 @@
     "multer-s3": "^3.0.1",
     "react": "^18.2.0",
     "react-i18next": "^11.15.1",
-    "supertest": "^6.1.6"
+    "supertest": "^6.1.6",
+    "url-join": "4.0.1"
   },
   "peerDependencies": {
     "@nocobase/actions": "1.x",
@@ -43,5 +44,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "a5236dc36ff3493fee4ced9d99e1889e9de300cf"
+  "gitHead": "5b6c5b28eadaa9bc8e5d05952e433a9ccd056ae9"
 }

package/dist/server/FileModel.d.ts

@@ -1,12 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import { Model } from '@nocobase/database';
-export declare class FileModel extends Model {
-    toJSON(): any;
-}

package/dist/server/FileModel.js

@@ -1,58 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var FileModel_exports = {};
-__export(FileModel_exports, {
-  FileModel: () => FileModel
-});
-module.exports = __toCommonJS(FileModel_exports);
-var import_database = require("@nocobase/database");
-var import_constants = require("../constants");
-const currentStorage = [import_constants.STORAGE_TYPE_LOCAL, import_constants.STORAGE_TYPE_ALI_OSS, import_constants.STORAGE_TYPE_S3, import_constants.STORAGE_TYPE_TX_COS];
-class FileModel extends import_database.Model {
-  toJSON() {
-    var _a, _b, _c, _d, _e;
-    const json = super.toJSON();
-    const fileStorages = (_a = this.constructor["database"]) == null ? void 0 : _a["_fileStorages"];
-    if (json.storageId && fileStorages && fileStorages.has(json.storageId)) {
-      const storage = fileStorages.get(json.storageId);
-      if (currentStorage.includes(storage == null ? void 0 : storage.type) && ((_b = storage == null ? void 0 : storage.options) == null ? void 0 : _b.thumbnailRule)) {
-        json["preview"] = `${json["url"]}${((_c = storage == null ? void 0 : storage.options) == null ? void 0 : _c.thumbnailRule) || ""}`;
-      }
-      if ((_d = storage == null ? void 0 : storage.options) == null ? void 0 : _d.thumbnailRule) {
-        json["thumbnailRule"] = (_e = storage == null ? void 0 : storage.options) == null ? void 0 : _e.thumbnailRule;
-      }
-      if ((storage == null ? void 0 : storage.type) === "local" && process.env.APP_PUBLIC_PATH) {
-        json["url"] = process.env.APP_PUBLIC_PATH.replace(/\/$/g, "") + json.url;
-      }
-    }
-    return json;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  FileModel
-});