@nocobase/plugin-flow-engine 2.1.0-alpha.2 → 2.1.0-alpha.20

package/dist/server/plugin.d.ts

@@ -8,7 +8,6 @@
  */
 import PluginUISchemaStorageServer from './server';
 export declare class PluginFlowEngineServer extends PluginUISchemaStorageServer {
-    private globalContext;
     afterAdd(): Promise<void>;
     beforeLoad(): Promise<void>;
     getDatabaseByDataSourceKey(dataSourceKey?: string): import("@nocobase/database").default;

package/dist/server/plugin.js

@@ -41,13 +41,10 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_utils = require("@nocobase/utils");
-var import_server2 = __toESM(require("./server"));
-var import_contexts = require("./template/contexts");
-var import_resolver = require("./template/resolver");
-var import_registry = require("./variables/registry");
-var import_utils2 = require("./variables/utils");
-class PluginFlowEngineServer extends import_server2.default {
-  globalContext;
+var import_flow_surfaces = require("./flow-surfaces");
+var import_server = __toESM(require("./server"));
+var import_resolve = require("./variables/resolve");
+class PluginFlowEngineServer extends import_server.default {
   async afterAdd() {
   }
   async beforeLoad() {
@@ -62,12 +59,11 @@ class PluginFlowEngineServer extends import_server2.default {
     return cm.db;
   }
   async load() {
-    var _a, _b;
     await super.load();
+    (0, import_flow_surfaces.registerFlowSurfacesResource)(this);
     this.app.auditManager.registerAction("flowSql:save");
     this.app.auditManager.registerAction("flowModels:save");
     this.app.auditManager.registerAction("flowModels:duplicate");
-    this.globalContext = new import_contexts.GlobalContext((_b = (_a = this.app.environment) == null ? void 0 : _a.getVariables) == null ? void 0 : _b.call(_a));
     this.app.acl.allow("flowSql", "runById", "loggedIn");
     this.app.acl.allow("flowSql", "getBind", "loggedIn");
     this.app.acl.allow("variables", "resolve", "loggedIn");
@@ -77,28 +73,12 @@ class PluginFlowEngineServer extends import_server2.default {
       actions: {
         // 解析 JSON 模板中的 ctx 变量
         resolve: async (ctx, next) => {
-          var _a2, _b2;
-          const raw = ((_b2 = (_a2 = ctx.action) == null ? void 0 : _a2.params) == null ? void 0 : _b2.values) ?? {};
+          var _a, _b;
+          const raw = ((_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) ?? {};
           const values = typeof (raw == null ? void 0 : raw.values) !== "undefined" ? raw.values : raw;
           if (Array.isArray(values == null ? void 0 : values.batch)) {
             const batchItems = values.batch;
-            await (0, import_utils2.prefetchRecordsForResolve)(
-              ctx,
-              batchItems.map((it) => ({
-                template: it.template,
-                contextParams: it.contextParams || {}
-              }))
-            );
-            const results = [];
-            for (const item of batchItems) {
-              const template2 = (item == null ? void 0 : item.template) ?? {};
-              const contextParams2 = (item == null ? void 0 : item.contextParams) || {};
-              const requestCtx2 = new import_contexts.HttpRequestContext(ctx);
-              requestCtx2.delegate(this.globalContext);
-              await import_registry.variables.attachUsedVariables(requestCtx2, ctx, template2, contextParams2);
-              const resolved2 = await (0, import_resolver.resolveJsonTemplate)(template2, requestCtx2);
-              results.push({ id: item == null ? void 0 : item.id, data: resolved2 });
-            }
+            const results = await (0, import_resolve.resolveVariablesBatch)(ctx, batchItems);
             ctx.body = { results };
             await next();
             return;
@@ -111,12 +91,7 @@ class PluginFlowEngineServer extends import_server2.default {
           }
           const template = values.template;
           const contextParams = (values == null ? void 0 : values.contextParams) || {};
-          await (0, import_utils2.prefetchRecordsForResolve)(ctx, [{ template, contextParams }]);
-          const requestCtx = new import_contexts.HttpRequestContext(ctx);
-          requestCtx.delegate(this.globalContext);
-          await import_registry.variables.attachUsedVariables(requestCtx, ctx, template, contextParams);
-          const resolved = await (0, import_resolver.resolveJsonTemplate)(template, requestCtx);
-          ctx.body = resolved;
+          ctx.body = await (0, import_resolve.resolveVariablesTemplate)(ctx, template, contextParams);
           await next();
         }
       }

package/dist/server/repository.js

@@ -793,11 +793,6 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
         transaction: transaction2
       });
       if (oldParentUid !== null && oldParentUid !== parentUid) {
-        await this.database.emitAsync("uiSchemaMove", savedNode, {
-          transaction: transaction2,
-          oldParentUid,
-          parentUid
-        });
         if (options.removeParentsIfNoChildren) {
           await this.recursivelyRemoveIfNoChildren({
             transaction: transaction2,

package/dist/server/variables/resolve.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 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 type { ResourcerContext } from '@nocobase/resourcer';
+import { JSONValue } from '../template/resolver';
+type ResolveBatchItem = {
+    id?: string | number;
+    template: JSONValue;
+    contextParams?: Record<string, unknown>;
+};
+export declare function resolveVariablesTemplate(ctx: ResourcerContext, template: JSONValue, contextParams?: Record<string, unknown>): Promise<any>;
+export declare function resolveVariablesBatch(ctx: ResourcerContext, items: ResolveBatchItem[]): Promise<{
+    id?: string | number;
+    data: unknown;
+}[]>;
+export {};

package/dist/server/variables/resolve.js

@@ -0,0 +1,79 @@
+/**
+ * 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 resolve_exports = {};
+__export(resolve_exports, {
+  resolveVariablesBatch: () => resolveVariablesBatch,
+  resolveVariablesTemplate: () => resolveVariablesTemplate
+});
+module.exports = __toCommonJS(resolve_exports);
+var import_contexts = require("../template/contexts");
+var import_resolver = require("../template/resolver");
+var import_registry = require("./registry");
+var import_utils = require("./utils");
+const GLOBAL_CONTEXT_KEY = Symbol.for("nocobase.flow-engine.variables.global-context");
+function getGlobalContext(ctx) {
+  var _a, _b;
+  const app = ctx.app;
+  if (!app[GLOBAL_CONTEXT_KEY]) {
+    app[GLOBAL_CONTEXT_KEY] = new import_contexts.GlobalContext((_b = (_a = app.environment) == null ? void 0 : _a.getVariables) == null ? void 0 : _b.call(_a));
+  }
+  return app[GLOBAL_CONTEXT_KEY];
+}
+async function resolveVariablesTemplate(ctx, template, contextParams = {}) {
+  await (0, import_utils.prefetchRecordsForResolve)(ctx, [{ template, contextParams }]);
+  return resolveVariablesTemplateWithPrefetchedRecords(ctx, template, contextParams);
+}
+async function resolveVariablesTemplateWithPrefetchedRecords(ctx, template, contextParams = {}) {
+  const requestCtx = new import_contexts.HttpRequestContext(ctx);
+  requestCtx.delegate(getGlobalContext(ctx));
+  await import_registry.variables.attachUsedVariables(requestCtx, ctx, template, contextParams);
+  return (0, import_resolver.resolveJsonTemplate)(template, requestCtx);
+}
+async function resolveVariablesBatch(ctx, items) {
+  await (0, import_utils.prefetchRecordsForResolve)(
+    ctx,
+    items.map((item) => ({
+      template: (item == null ? void 0 : item.template) ?? {},
+      contextParams: (item == null ? void 0 : item.contextParams) || {}
+    }))
+  );
+  const results = [];
+  for (const item of items) {
+    const data = await resolveVariablesTemplateWithPrefetchedRecords(
+      ctx,
+      (item == null ? void 0 : item.template) ?? {},
+      (item == null ? void 0 : item.contextParams) || {}
+    );
+    results.push({ id: item == null ? void 0 : item.id, data });
+  }
+  return results;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolveVariablesBatch,
+  resolveVariablesTemplate
+});