@nocobase/actions 2.3.0-beta.4 → 2.3.0-beta.5

package/lib/actions/compound-action.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 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 { Context } from '..';
+type CompoundActionName = 'firstOrCreate' | 'updateOrCreate';
+export declare function compoundAction(actionName: CompoundActionName): (ctx: Context, next: any) => Promise<void>;
+export {};

package/lib/actions/compound-action.js

@@ -0,0 +1,181 @@
+/**
+ * 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 __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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 __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 compound_action_exports = {};
+__export(compound_action_exports, {
+  compoundAction: () => compoundAction
+});
+module.exports = __toCommonJS(compound_action_exports);
+var import_database = require("@nocobase/database");
+var import_lodash = __toESM(require("lodash"));
+var import_utils = require("../utils");
+const findParamKeys = ["fields", "appends", "except", "filter", "targetCollection"];
+const createParamKeys = ["values", "whitelist", "blacklist", "updateAssociationValues", "targetCollection"];
+const updateParamKeys = [
+  "values",
+  "whitelist",
+  "blacklist",
+  "filter",
+  "updateAssociationValues",
+  "forceUpdate",
+  "targetCollection"
+];
+function getTargetCollection(repository) {
+  return repository.targetCollection || repository.collection;
+}
+__name(getTargetCollection, "getTargetCollection");
+function getCompoundActionRepository(ctx) {
+  return ctx.getCurrentRepository ? ctx.getCurrentRepository() : (0, import_utils.getRepositoryFromParams)(ctx);
+}
+__name(getCompoundActionRepository, "getCompoundActionRepository");
+async function withCurrentTransaction(ctx, callback) {
+  const database = ctx.database ?? ctx.db;
+  if (!(database == null ? void 0 : database.sequelize)) {
+    return callback();
+  }
+  return database.sequelize.transaction(callback);
+}
+__name(withCurrentTransaction, "withCurrentTransaction");
+async function applyActualActionPermission(ctx, actionName, originalParams) {
+  var _a;
+  if (((_a = ctx.permission) == null ? void 0 : _a.deferred) !== true || !["firstOrCreate", "updateOrCreate"].includes(ctx.action.actionName)) {
+    ctx.throw(403, "No permissions");
+  }
+  const { resourceName } = ctx.permission;
+  const can = ctx.can({
+    resource: resourceName,
+    action: actionName,
+    rawResourceName: ctx.action.resourceName
+  });
+  if (!can || typeof can !== "object") {
+    ctx.throw(403, "No permissions");
+  }
+  const resolved = await ctx.acl.resolveActionParams(ctx, {
+    actionName,
+    params: originalParams,
+    resourceName: ctx.action.resourceName,
+    useCurrentRepository: true
+  });
+  ctx.action.params = resolved.mergedParams;
+  ctx.permission.can = can;
+  ctx.permission.parsedParams = resolved.parsedParams;
+  ctx.permission.rawParams = resolved.rawParams;
+  ctx.permission.mergedParams = import_lodash.default.cloneDeep(resolved.mergedParams);
+  ctx.permission.actualActionName = actionName;
+  ctx.permission.deferred = false;
+}
+__name(applyActualActionPermission, "applyActualActionPermission");
+function compoundAction(actionName) {
+  return /* @__PURE__ */ __name(async function compoundActionHandler(ctx, next) {
+    var _a;
+    const repository = getCompoundActionRepository(ctx);
+    if (!ctx.acl) {
+      const compoundParams = {
+        filterKeys: ctx.action.params.filterKeys,
+        values: ctx.action.params.values,
+        whitelist: ctx.action.params.whitelist,
+        blacklist: ctx.action.params.blacklist,
+        updateAssociationValues: ctx.action.params.updateAssociationValues,
+        targetCollection: ctx.action.params.targetCollection,
+        context: ctx
+      };
+      ctx.body = actionName === "firstOrCreate" ? await repository.firstOrCreate(compoundParams) : await repository.updateOrCreate(compoundParams);
+      ctx.status = 200;
+      await next();
+      return;
+    }
+    if (((_a = ctx.permission) == null ? void 0 : _a.deferred) !== true || ctx.action.actionName !== actionName) {
+      ctx.throw(403, "No permissions");
+    }
+    const originalParams = import_lodash.default.cloneDeep(ctx.action.params);
+    const { filterKeys, values } = originalParams;
+    const filter = import_database.Repository.valuesToFilter(values, filterKeys);
+    ctx.body = await withCurrentTransaction(ctx, async (transaction) => {
+      const instance = await repository.findOne({ filter, transaction, context: ctx });
+      if (!instance) {
+        await applyActualActionPermission(ctx, "create", originalParams);
+        return repository.create({
+          values: ctx.action.params.values,
+          ...import_lodash.default.pick(
+            ctx.action.params,
+            createParamKeys.filter((key) => key !== "values")
+          ),
+          transaction,
+          context: ctx
+        });
+      }
+      const targetCollection = getTargetCollection(repository);
+      const targetKey = targetCollection.filterTargetKey || targetCollection.model.primaryKeyAttribute;
+      const filterByTk = instance.get(targetKey);
+      if (actionName === "firstOrCreate") {
+        await applyActualActionPermission(ctx, "get", originalParams);
+        const result2 = await repository.findOne({
+          ...import_lodash.default.pick(ctx.action.params, findParamKeys),
+          filterByTk,
+          transaction,
+          context: ctx
+        });
+        if (!result2) {
+          ctx.throw(403, "No permissions");
+        }
+        return result2;
+      }
+      await applyActualActionPermission(ctx, "update", originalParams);
+      const result = await repository.update({
+        values: ctx.action.params.values,
+        ...import_lodash.default.pick(
+          ctx.action.params,
+          updateParamKeys.filter((key) => key !== "values")
+        ),
+        filterByTk,
+        transaction,
+        context: ctx
+      });
+      if (!result || Array.isArray(result) && result.length === 0) {
+        ctx.throw(403, "No permissions");
+      }
+      return result;
+    });
+    ctx.status = 200;
+    await next();
+  }, "compoundActionHandler");
+}
+__name(compoundAction, "compoundAction");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  compoundAction
+});

package/lib/actions/first-or-create.js

@@ -29,11 +29,8 @@ __export(first_or_create_exports, {
   firstOrCreate: () => firstOrCreate
 });
 module.exports = __toCommonJS(first_or_create_exports);
-var import_proxy_to_repository = require("./proxy-to-repository");
-const firstOrCreate = (0, import_proxy_to_repository.proxyToRepository)(
-  ["values", "filterKeys", "whitelist", "blacklist", "updateAssociationValues", "targetCollection"],
-  "firstOrCreate"
-);
+var import_compound_action = require("./compound-action");
+const firstOrCreate = (0, import_compound_action.compoundAction)("firstOrCreate");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   firstOrCreate

package/lib/actions/update-or-create.js

@@ -29,11 +29,8 @@ __export(update_or_create_exports, {
   updateOrCreate: () => updateOrCreate
 });
 module.exports = __toCommonJS(update_or_create_exports);
-var import_proxy_to_repository = require("./proxy-to-repository");
-const updateOrCreate = (0, import_proxy_to_repository.proxyToRepository)(
-  ["values", "filterKeys", "whitelist", "blacklist", "updateAssociationValues", "targetCollection"],
-  "updateOrCreate"
-);
+var import_compound_action = require("./compound-action");
+const updateOrCreate = (0, import_compound_action.compoundAction)("updateOrCreate");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   updateOrCreate

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@nocobase/actions",
-  "version": "2.3.0-beta.4",
+  "version": "2.3.0-beta.5",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "2.3.0-beta.4",
-    "@nocobase/database": "2.3.0-beta.4",
-    "@nocobase/resourcer": "2.3.0-beta.4"
+    "@nocobase/cache": "2.3.0-beta.5",
+    "@nocobase/database": "2.3.0-beta.5",
+    "@nocobase/resourcer": "2.3.0-beta.5"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/actions"
   },
-  "gitHead": "05824f2c4b69038dd621cb59095472aa411ca65a"
+  "gitHead": "7047516aba0d14965ddf457b64587103a871b923"
 }