@nocobase/plugin-file-manager 1.6.0-alpha.9 → 1.6.0-beta.2

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.9",
+  "@nocobase/client": "1.6.0-beta.2",
   "react": "18.2.0",
   "antd": "5.12.8",
   "@ant-design/icons": "5.2.6",
@@ -18,10 +18,10 @@ module.exports = {
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/database": "1.6.0-alpha.9",
-  "@nocobase/server": "1.6.0-alpha.9",
-  "@nocobase/utils": "1.6.0-alpha.9",
-  "@nocobase/test": "1.6.0-alpha.9",
-  "@nocobase/actions": "1.6.0-alpha.9",
-  "multer": "1.4.4"
+  "@nocobase/database": "1.6.0-beta.2",
+  "multer": "1.4.4",
+  "@nocobase/server": "1.6.0-beta.2",
+  "@nocobase/utils": "1.6.0-beta.2",
+  "@nocobase/test": "1.6.0-beta.2",
+  "@nocobase/actions": "1.6.0-beta.2"
 };

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.474.0","scripts":{"build":"concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'","build:cjs":"tsc -p tsconfig.cjs.json","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 test:unit","test:e2e":"yarn test:e2e:node && yarn test:e2e:browser","test:e2e:browser":"ts-mocha test/**/*.browser.ispec.ts && karma start karma.conf.js","test:e2e:node":"jest --c jest.config.e2e.js","test:unit":"ts-mocha test/unit/**/*.spec.ts"},"main":"./dist-cjs/index.js","types":"./dist-types/index.d.ts","module":"./dist-es/index.js","sideEffects":false,"dependencies":{"@aws-crypto/sha1-browser":"3.0.0","@aws-crypto/sha256-browser":"3.0.0","@aws-crypto/sha256-js":"3.0.0","@aws-sdk/client-sts":"3.474.0","@aws-sdk/core":"3.474.0","@aws-sdk/credential-provider-node":"3.474.0","@aws-sdk/middleware-bucket-endpoint":"3.470.0","@aws-sdk/middleware-expect-continue":"3.468.0","@aws-sdk/middleware-flexible-checksums":"3.468.0","@aws-sdk/middleware-host-header":"3.468.0","@aws-sdk/middleware-location-constraint":"3.468.0","@aws-sdk/middleware-logger":"3.468.0","@aws-sdk/middleware-recursion-detection":"3.468.0","@aws-sdk/middleware-sdk-s3":"3.474.0","@aws-sdk/middleware-signing":"3.468.0","@aws-sdk/middleware-ssec":"3.468.0","@aws-sdk/middleware-user-agent":"3.470.0","@aws-sdk/region-config-resolver":"3.470.0","@aws-sdk/signature-v4-multi-region":"3.474.0","@aws-sdk/types":"3.468.0","@aws-sdk/util-endpoints":"3.470.0","@aws-sdk/util-user-agent-browser":"3.468.0","@aws-sdk/util-user-agent-node":"3.470.0","@aws-sdk/xml-builder":"3.472.0","@smithy/config-resolver":"^2.0.21","@smithy/eventstream-serde-browser":"^2.0.15","@smithy/eventstream-serde-config-resolver":"^2.0.15","@smithy/eventstream-serde-node":"^2.0.15","@smithy/fetch-http-handler":"^2.3.1","@smithy/hash-blob-browser":"^2.0.16","@smithy/hash-node":"^2.0.17","@smithy/hash-stream-node":"^2.0.17","@smithy/invalid-dependency":"^2.0.15","@smithy/md5-js":"^2.0.17","@smithy/middleware-content-length":"^2.0.17","@smithy/middleware-endpoint":"^2.2.3","@smithy/middleware-retry":"^2.0.24","@smithy/middleware-serde":"^2.0.15","@smithy/middleware-stack":"^2.0.9","@smithy/node-config-provider":"^2.1.8","@smithy/node-http-handler":"^2.2.1","@smithy/protocol-http":"^3.0.11","@smithy/smithy-client":"^2.1.18","@smithy/types":"^2.7.0","@smithy/url-parser":"^2.0.15","@smithy/util-base64":"^2.0.1","@smithy/util-body-length-browser":"^2.0.1","@smithy/util-body-length-node":"^2.1.0","@smithy/util-defaults-mode-browser":"^2.0.22","@smithy/util-defaults-mode-node":"^2.0.29","@smithy/util-endpoints":"^1.0.7","@smithy/util-retry":"^2.0.8","@smithy/util-stream":"^2.0.23","@smithy/util-utf8":"^2.0.2","@smithy/util-waiter":"^2.0.15","fast-xml-parser":"4.2.5","tslib":"^2.5.0"},"devDependencies":{"@smithy/service-client-documentation-generator":"^2.0.0","@tsconfig/node14":"1.0.3","@types/chai":"^4.2.11","@types/mocha":"^8.0.4","@types/node":"^14.14.31","concurrently":"7.0.0","downlevel-dts":"0.10.1","rimraf":"3.0.2","typescript":"~4.9.5"},"engines":{"node":">=14.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-01-06T05:52:42.210Z"}
+{"name":"@aws-sdk/client-s3","description":"AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native","version":"3.474.0","scripts":{"build":"concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'","build:cjs":"tsc -p tsconfig.cjs.json","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 test:unit","test:e2e":"yarn test:e2e:node && yarn test:e2e:browser","test:e2e:browser":"ts-mocha test/**/*.browser.ispec.ts && karma start karma.conf.js","test:e2e:node":"jest --c jest.config.e2e.js","test:unit":"ts-mocha test/unit/**/*.spec.ts"},"main":"./dist-cjs/index.js","types":"./dist-types/index.d.ts","module":"./dist-es/index.js","sideEffects":false,"dependencies":{"@aws-crypto/sha1-browser":"3.0.0","@aws-crypto/sha256-browser":"3.0.0","@aws-crypto/sha256-js":"3.0.0","@aws-sdk/client-sts":"3.474.0","@aws-sdk/core":"3.474.0","@aws-sdk/credential-provider-node":"3.474.0","@aws-sdk/middleware-bucket-endpoint":"3.470.0","@aws-sdk/middleware-expect-continue":"3.468.0","@aws-sdk/middleware-flexible-checksums":"3.468.0","@aws-sdk/middleware-host-header":"3.468.0","@aws-sdk/middleware-location-constraint":"3.468.0","@aws-sdk/middleware-logger":"3.468.0","@aws-sdk/middleware-recursion-detection":"3.468.0","@aws-sdk/middleware-sdk-s3":"3.474.0","@aws-sdk/middleware-signing":"3.468.0","@aws-sdk/middleware-ssec":"3.468.0","@aws-sdk/middleware-user-agent":"3.470.0","@aws-sdk/region-config-resolver":"3.470.0","@aws-sdk/signature-v4-multi-region":"3.474.0","@aws-sdk/types":"3.468.0","@aws-sdk/util-endpoints":"3.470.0","@aws-sdk/util-user-agent-browser":"3.468.0","@aws-sdk/util-user-agent-node":"3.470.0","@aws-sdk/xml-builder":"3.472.0","@smithy/config-resolver":"^2.0.21","@smithy/eventstream-serde-browser":"^2.0.15","@smithy/eventstream-serde-config-resolver":"^2.0.15","@smithy/eventstream-serde-node":"^2.0.15","@smithy/fetch-http-handler":"^2.3.1","@smithy/hash-blob-browser":"^2.0.16","@smithy/hash-node":"^2.0.17","@smithy/hash-stream-node":"^2.0.17","@smithy/invalid-dependency":"^2.0.15","@smithy/md5-js":"^2.0.17","@smithy/middleware-content-length":"^2.0.17","@smithy/middleware-endpoint":"^2.2.3","@smithy/middleware-retry":"^2.0.24","@smithy/middleware-serde":"^2.0.15","@smithy/middleware-stack":"^2.0.9","@smithy/node-config-provider":"^2.1.8","@smithy/node-http-handler":"^2.2.1","@smithy/protocol-http":"^3.0.11","@smithy/smithy-client":"^2.1.18","@smithy/types":"^2.7.0","@smithy/url-parser":"^2.0.15","@smithy/util-base64":"^2.0.1","@smithy/util-body-length-browser":"^2.0.1","@smithy/util-body-length-node":"^2.1.0","@smithy/util-defaults-mode-browser":"^2.0.22","@smithy/util-defaults-mode-node":"^2.0.29","@smithy/util-endpoints":"^1.0.7","@smithy/util-retry":"^2.0.8","@smithy/util-stream":"^2.0.23","@smithy/util-utf8":"^2.0.2","@smithy/util-waiter":"^2.0.15","fast-xml-parser":"4.2.5","tslib":"^2.5.0"},"devDependencies":{"@smithy/service-client-documentation-generator":"^2.0.0","@tsconfig/node14":"1.0.3","@types/chai":"^4.2.11","@types/mocha":"^8.0.4","@types/node":"^14.14.31","concurrently":"7.0.0","downlevel-dts":"0.10.1","rimraf":"3.0.2","typescript":"~4.9.5"},"engines":{"node":">=14.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-02-07T03:21:18.751Z"}

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-01-06T05:52:32.658Z"}
+{"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-02-07T03:21:08.667Z"}

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-01-06T05:52:37.650Z"}
+{"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-02-07T03:21:14.014Z"}

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-01-06T05:52:37.555Z"}
+{"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-02-07T03:21:13.909Z"}

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-01-06T05:52:50.128Z"}
+{"_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-02-07T03:21:27.483Z"}

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-01-06T05:52:46.477Z"}
+{"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-02-07T03:21:23.485Z"}

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

@@ -9,4 +9,3 @@
 import { Context, Next } from '@nocobase/actions';
 export declare function getFileData(ctx: Context): any;
 export declare function createMiddleware(ctx: Context, next: Next): Promise<any>;
-export declare function destroyMiddleware(ctx: Context, next: Next): Promise<any>;

package/dist/server/actions/attachments.js

@@ -37,7 +37,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var attachments_exports = {};
 __export(attachments_exports, {
   createMiddleware: () => createMiddleware,
-  destroyMiddleware: () => destroyMiddleware,
   getFileData: () => getFileData
 });
 module.exports = __toCommonJS(attachments_exports);
@@ -140,64 +139,8 @@ async function createMiddleware(ctx, next) {
     await next();
   }
 }
-async function destroyMiddleware(ctx, next) {
-  var _a;
-  const { resourceName, actionName, sourceId } = ctx.action;
-  const collection = ctx.db.getCollection(resourceName);
-  if (((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) !== "file" || actionName !== "destroy") {
-    return next();
-  }
-  const repository = ctx.db.getRepository(resourceName, sourceId);
-  const { filterByTk, filter } = ctx.action.params;
-  const records = await repository.find({
-    filterByTk,
-    filter,
-    context: ctx
-  });
-  const storageIds = new Set(records.map((record) => record.storageId));
-  const storageGroupedRecords = records.reduce((result, record) => {
-    const storageId = record.storageId;
-    if (!result[storageId]) {
-      result[storageId] = [];
-    }
-    result[storageId].push(record);
-    return result;
-  }, {});
-  const storages = await ctx.db.getRepository("storages").find({
-    filter: {
-      id: [...storageIds],
-      paranoid: {
-        $ne: true
-      }
-    }
-  });
-  let count = 0;
-  const undeleted = [];
-  await storages.reduce(
-    (promise, storage) => promise.then(async () => {
-      const storageConfig = ctx.app.pm.get(import__.default).storageTypes.get(storage.type);
-      const result = await storageConfig.delete(storage, storageGroupedRecords[storage.id]);
-      count += result[0];
-      undeleted.push(...result[1]);
-    }),
-    Promise.resolve()
-  );
-  if (undeleted.length) {
-    const ids = undeleted.map((record) => record.id);
-    ctx.action.mergeParams({
-      filter: {
-        id: {
-          $notIn: ids
-        }
-      }
-    });
-    ctx.logger.error("[file-manager] some of attachment files are not successfully deleted: ", { ids });
-  }
-  await next();
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMiddleware,
-  destroyMiddleware,
   getFileData
 });

package/dist/server/actions/index.js

@@ -49,5 +49,4 @@ 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(import_attachments.destroyMiddleware);
 }

package/dist/server/index.d.ts

@@ -6,5 +6,8 @@
  * 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 { StorageEngine } from 'multer';
 export * from '../constants';
-export { default } from './server';
+export { AttachmentModel, default, IStorage, PluginFileManagerServer, StorageModel } from './server';
+export { StorageType } from './storages';
+export { StorageEngine };

package/dist/server/index.js

@@ -37,12 +37,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
+  AttachmentModel: () => import_server.AttachmentModel,
+  IStorage: () => import_server.IStorage,
+  PluginFileManagerServer: () => import_server.PluginFileManagerServer,
+  StorageEngine: () => import_multer.StorageEngine,
+  StorageModel: () => import_server.StorageModel,
+  StorageType: () => import_storages.StorageType,
   default: () => import_server.default
 });
 module.exports = __toCommonJS(server_exports);
+var import_multer = require("multer");
 __reExport(server_exports, require("../constants"), module.exports);
 var import_server = __toESM(require("./server"));
+var import_storages = require("./storages");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AttachmentModel,
+  IStorage,
+  PluginFileManagerServer,
+  StorageEngine,
+  StorageModel,
+  StorageType,
   ...require("../constants")
 });

package/dist/server/server.d.ts

@@ -8,7 +8,7 @@
  */
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
-import { Transactionable } from '@nocobase/database';
+import { Model, Transactionable } from '@nocobase/database';
 import { IStorage, StorageModel } from './storages';
 export type * from './storages';
 export type FileRecordOptions = {
@@ -22,9 +22,11 @@ export type UploadFileOptions = {
     storageName?: string;
     documentRoot?: string;
 };
-export default class PluginFileManagerServer extends Plugin {
+export declare class PluginFileManagerServer extends Plugin {
     storageTypes: Registry<IStorage>;
     storagesCache: Map<number, StorageModel>;
+    afterDestroy: (record: Model, options: any) => Promise<void>;
+    registerStorageType(type: string, options: IStorage): void;
     createFileRecord(options: FileRecordOptions): Promise<any>;
     uploadFile(options: UploadFileOptions): Promise<any>;
     loadStorages(options?: {
@@ -35,3 +37,4 @@ export default class PluginFileManagerServer extends Plugin {
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
 }
+export default PluginFileManagerServer;

package/dist/server/server.js

@@ -36,7 +36,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  default: () => PluginFileManagerServer
+  PluginFileManagerServer: () => PluginFileManagerServer,
+  default: () => server_default
 });
 module.exports = __toCommonJS(server_exports);
 var import_server = require("@nocobase/server");
@@ -53,9 +54,36 @@ var import_local = __toESM(require("./storages/local"));
 var import_s3 = __toESM(require("./storages/s3"));
 var import_tx_cos = __toESM(require("./storages/tx-cos"));
 const DEFAULT_STORAGE_TYPE = import_constants.STORAGE_TYPE_LOCAL;
+class FileDeleteError extends Error {
+  data;
+  constructor(message, data) {
+    super(message);
+    this.name = "FileDeleteError";
+    this.data = data;
+  }
+}
 class PluginFileManagerServer extends import_server.Plugin {
   storageTypes = new import_utils.Registry();
   storagesCache = /* @__PURE__ */ new Map();
+  afterDestroy = async (record, options) => {
+    var _a;
+    const { collection } = record.constructor;
+    if (((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) !== "file" && collection.name !== "attachments") {
+      return;
+    }
+    const storage = this.storagesCache.get(record.get("storageId"));
+    if (storage == null ? void 0 : storage.paranoid) {
+      return;
+    }
+    const storageConfig = this.storageTypes.get(storage.type);
+    const result = await storageConfig.delete(storage, [record]);
+    if (!result[0]) {
+      throw new FileDeleteError("Failed to delete file", record);
+    }
+  };
+  registerStorageType(type, options) {
+    this.storageTypes.register(type, options);
+  }
   async createFileRecord(options) {
     const { values, storageName, collectionName, filePath, transaction } = options;
     const collection = this.db.getCollection(collectionName);
@@ -170,6 +198,7 @@ class PluginFileManagerServer extends import_server.Plugin {
     });
   }
   async load() {
+    this.db.on("afterDestroy", this.afterDestroy);
     this.storageTypes.register(import_constants.STORAGE_TYPE_LOCAL, new import_local.default());
     this.storageTypes.register(import_constants.STORAGE_TYPE_ALI_OSS, new import_ali_oss.default());
     this.storageTypes.register(import_constants.STORAGE_TYPE_S3, new import_s3.default());
@@ -210,9 +239,9 @@ class PluginFileManagerServer extends import_server.Plugin {
       }
     });
     (0, import_actions.default)(this);
-    this.app.acl.allow("attachments", "upload", "loggedIn");
-    this.app.acl.allow("attachments", "create", "loggedIn");
+    this.app.acl.allow("attachments", ["upload", "create"], "loggedIn");
     this.app.acl.allow("storages", "getBasicInfo", "loggedIn");
+    this.app.acl.appendStrategyResource("attachments");
     const defaultStorageName = this.storageTypes.get(DEFAULT_STORAGE_TYPE).defaults().name;
     this.app.acl.addFixedParams("storages", "destroy", () => {
       return {
@@ -232,3 +261,8 @@ class PluginFileManagerServer extends import_server.Plugin {
     this.app.db.interfaceManager.registerInterfaceType("attachment", import_attachment_interface.AttachmentInterface);
   }
 }
+var server_default = PluginFileManagerServer;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PluginFileManagerServer
+});

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

@@ -6,8 +6,8 @@
  * 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 { StorageEngine } from 'multer';
 import Application from '@nocobase/server';
+import { StorageEngine } from 'multer';
 export interface StorageModel {
     id?: number;
     title: string;
@@ -39,6 +39,6 @@ export interface IStorage {
 }
 export declare abstract class StorageType implements IStorage {
     abstract make(storage: StorageModel): StorageEngine;
-    abstract defaults(): StorageModel;
     abstract delete(storage: StorageModel, records: AttachmentModel[]): Promise<[number, AttachmentModel[]]>;
+    defaults(): StorageModel;
 }

package/dist/server/storages/index.js

@@ -30,6 +30,9 @@ __export(storages_exports, {
 });
 module.exports = __toCommonJS(storages_exports);
 class StorageType {
+  defaults() {
+    return {};
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.6.0-alpha.9",
+  "version": "1.6.0-beta.2",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -43,5 +43,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "c6136fc6c9a2daab33fb1a20716cd9768e9a147f"
+  "gitHead": "476ab2f424d86f585c8fba1459568c8aec49a5c6"
 }