@nocobase/flow-engine 2.2.0-alpha.1 → 2.2.0-alpha.2

package/lib/resources/baseRecordResource.js

@@ -44,7 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_apiResource = require("./apiResource");
 var import_filterItem = require("./filterItem");
 var import_flowResource = require("./flowResource");
-var import_viewEvents = require("../views/viewEvents");
+var import_dataSourceDirty = require("../utils/dataSourceDirty");
 const _BaseRecordResource = class _BaseRecordResource extends import_apiResource.APIResource {
   resourceName;
   sourceId = null;
@@ -151,22 +151,11 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
    * Used to coordinate "refresh on active" across view stacks.
    */
   markDataSourceDirty(resourceName) {
-    var _a, _b;
-    const engine = this.context.engine;
-    if (!engine) return;
-    const dataSourceKey = this.getDataSourceKey() || "main";
-    const resName = resourceName || this.getResourceName();
-    if (!resName) return;
-    const affectedResourceNames = /* @__PURE__ */ new Set([String(resName)]);
-    if (typeof resName === "string" && resName.includes(".")) {
-      affectedResourceNames.add(resName.split(".")[0]);
-    }
-    for (const name of affectedResourceNames) {
-      engine.markDataSourceDirty(dataSourceKey, name);
-    }
-    (_b = (_a = engine.emitter) == null ? void 0 : _a.emit) == null ? void 0 : _b.call(_a, import_viewEvents.DATA_SOURCE_DIRTY_EVENT, {
-      dataSourceKey,
-      resourceNames: Array.from(affectedResourceNames)
+    (0, import_dataSourceDirty.markDataSourceDirty)({
+      engine: this.context.engine,
+      dataSourceKey: this.getDataSourceKey(),
+      resourceName: resourceName || this.getResourceName(),
+      includePreviousEngines: true
     });
   }
   setSourceId(sourceId) {

package/lib/resources/multiRecordResource.js

@@ -42,6 +42,7 @@ __export(multiRecordResource_exports, {
 module.exports = __toCommonJS(multiRecordResource_exports);
 var import_reactive = require("@formily/reactive");
 var import_lodash = __toESM(require("lodash"));
+var import_dirtyAwareApiClient = require("../utils/dirtyAwareApiClient");
 var import_baseRecordResource = require("./baseRecordResource");
 const _MultiRecordResource = class _MultiRecordResource extends import_baseRecordResource.BaseRecordResource {
   _data = import_reactive.observable.ref([]);
@@ -130,7 +131,10 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   }
   async create(data, options) {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
-    const res = await this.runAction("create", config);
+    const res = await this.runAction("create", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
@@ -161,7 +165,10 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       this.updateActionOptions,
       options
     );
-    await this.runAction("update", config);
+    await this.runAction("update", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     this.emit("saved", data);
     await this.refresh();
@@ -182,7 +189,10 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       },
       options
     );
-    await this.runAction("destroy", config);
+    await this.runAction("destroy", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     const currentPage = this.getPage();
     const lastPage = Math.ceil((this.getCount() - import_lodash.default.castArray(filterByTk).length) / this.getPageSize());

package/lib/resources/singleRecordResource.js

@@ -41,6 +41,7 @@ __export(singleRecordResource_exports, {
 });
 module.exports = __toCommonJS(singleRecordResource_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_dirtyAwareApiClient = require("../utils/dirtyAwareApiClient");
 var import_baseRecordResource = require("./baseRecordResource");
 const _SingleRecordResource = class _SingleRecordResource extends import_baseRecordResource.BaseRecordResource {
   isNewRecord = false;
@@ -68,7 +69,8 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
     }
     const res = await this.runAction(actionName, {
       ...config,
-      data: result
+      data: result,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
     });
     this.markDataSourceDirty();
     this.emit("saved", data);
@@ -86,7 +88,10 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       },
       options
     );
-    await this.runAction("destroy", config);
+    await this.runAction("destroy", {
+      ...config,
+      [import_dirtyAwareApiClient.SKIP_DATA_SOURCE_DIRTY]: true
+    });
     this.markDataSourceDirty();
     this.setData(null);
   }

package/lib/runjs-context/helpers.js

@@ -71,18 +71,25 @@ function createJSRunnerWithVersion(options) {
     doc = {};
   }
   const deprecatedCtx = (0, import_flowContext.createRunJSDeprecationProxy)(runCtx, { doc });
-  const globals = { ctx: deprecatedCtx, ...(options == null ? void 0 : options.globals) || {} };
-  if (modelClass === "JSFieldModel" || modelClass === "JSBlockModel") {
-    if (typeof window !== "undefined") globals.window = window;
-    if (typeof document !== "undefined") globals.document = document;
+  const browserGlobals = {};
+  if (typeof window !== "undefined") {
+    browserGlobals.window = window;
+    if (typeof navigator !== "undefined") {
+      browserGlobals.navigator = navigator;
+    }
   }
+  if (typeof document !== "undefined") {
+    browserGlobals.document = document;
+  }
+  const globals = { ctx: deprecatedCtx, ...browserGlobals, ...(options == null ? void 0 : options.globals) || {} };
   const { timeoutMs } = options || {};
   return new import_JSRunner.JSRunner({ globals, timeoutMs });
 }
 __name(createJSRunnerWithVersion, "createJSRunnerWithVersion");
 function getRunJSScenesForModel(modelClass, version = "v1") {
   const meta = import_registry.RunJSContextRegistry.getMeta(version, modelClass);
-  return Array.isArray(meta == null ? void 0 : meta.scenes) ? [...meta.scenes] : [];
+  const scenes = meta == null ? void 0 : meta.scenes;
+  return Array.isArray(scenes) ? [...scenes] : [];
 }
 __name(getRunJSScenesForModel, "getRunJSScenesForModel");
 function getRunJSScenesForContext(ctx, { version = "v1" } = {}) {

package/lib/types.d.ts

@@ -500,6 +500,18 @@ export interface ToolbarItemConfig {
     /** 排序权重，数字越小越靠右（先添加的在右边） */
     sort?: number;
 }
+export interface DynamicFlowSource {
+    key: string;
+    label: React.ReactNode;
+    model: FlowModel;
+    sort?: number;
+}
+export interface DynamicFlowSourceProvider {
+    key: string;
+    sort?: number;
+    visible?: (model: FlowModel) => boolean;
+    getSources: (model: FlowModel) => DynamicFlowSource[] | Promise<DynamicFlowSource[]>;
+}
 export interface ApplyFlowCacheEntry {
     status: 'pending' | 'resolved' | 'rejected';
     promise: Promise<any>;

package/lib/utils/dataSourceDirty.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 { FlowEngine } from '../flowEngine';
+type MarkDataSourceDirtyOptions = {
+    engine?: FlowEngine;
+    dataSourceKey?: unknown;
+    resourceName?: unknown;
+    includePreviousEngines?: boolean;
+};
+export declare function getHeaderValue(headers: unknown, name: string): unknown;
+export declare function getDataSourceKeyFromHeaders(headers: unknown): string;
+export declare function getAffectedResourceNames(resourceName: unknown): string[];
+export declare function markDataSourceDirty(options: MarkDataSourceDirtyOptions): string[];
+export {};

package/lib/utils/dataSourceDirty.js

@@ -0,0 +1,139 @@
+/**
+ * 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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dataSourceDirty_exports = {};
+__export(dataSourceDirty_exports, {
+  getAffectedResourceNames: () => getAffectedResourceNames,
+  getDataSourceKeyFromHeaders: () => getDataSourceKeyFromHeaders,
+  getHeaderValue: () => getHeaderValue,
+  markDataSourceDirty: () => markDataSourceDirty
+});
+module.exports = __toCommonJS(dataSourceDirty_exports);
+var import_viewEvents = require("../views/viewEvents");
+function getHeaderValue(headers, name) {
+  if (!headers || typeof headers !== "object") {
+    return void 0;
+  }
+  const maybeHeaders = headers;
+  if (typeof maybeHeaders.get === "function") {
+    const value = maybeHeaders.get(name);
+    if (value != null && value !== "") {
+      return value;
+    }
+  }
+  const lowerName = name.toLowerCase();
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() === lowerName) {
+      return value;
+    }
+  }
+  return void 0;
+}
+__name(getHeaderValue, "getHeaderValue");
+function getDataSourceKeyFromHeaders(headers) {
+  const value = getHeaderValue(headers, "x-data-source");
+  if (Array.isArray(value)) {
+    return String(value[0] || "main");
+  }
+  return value == null || value === "" ? "main" : String(value);
+}
+__name(getDataSourceKeyFromHeaders, "getDataSourceKeyFromHeaders");
+function getAffectedResourceNames(resourceName) {
+  const name = String(resourceName || "").trim();
+  if (!name) {
+    return [];
+  }
+  const names = /* @__PURE__ */ new Set([name]);
+  if (name.includes(".")) {
+    names.add(name.split(".")[0]);
+  }
+  return Array.from(names);
+}
+__name(getAffectedResourceNames, "getAffectedResourceNames");
+function getDirtyTargetEngines(engine, includePreviousEngines) {
+  if (!includePreviousEngines) {
+    return [engine];
+  }
+  const engines = [];
+  const seen = /* @__PURE__ */ new Set();
+  let current = engine;
+  let guard = 0;
+  while (current && guard++ < 50) {
+    if (!seen.has(current)) {
+      engines.push(current);
+      seen.add(current);
+    }
+    current = current.previousEngine;
+  }
+  return engines;
+}
+__name(getDirtyTargetEngines, "getDirtyTargetEngines");
+function markDataSourceDirty(options) {
+  var _a, _b, _c, _d;
+  const { engine, resourceName, includePreviousEngines } = options;
+  if (!(engine == null ? void 0 : engine.markDataSourceDirty)) {
+    return [];
+  }
+  const resourceNames = getAffectedResourceNames(resourceName);
+  if (!resourceNames.length) {
+    return [];
+  }
+  const dataSourceKey = String(options.dataSourceKey || "main");
+  const targetEngines = getDirtyTargetEngines(engine, includePreviousEngines);
+  const beforeVersions = /* @__PURE__ */ new Map();
+  for (const targetEngine of targetEngines) {
+    const versions = /* @__PURE__ */ new Map();
+    beforeVersions.set(targetEngine, versions);
+    for (const name of resourceNames) {
+      versions.set(name, ((_a = targetEngine.getDataSourceDirtyVersion) == null ? void 0 : _a.call(targetEngine, dataSourceKey, name)) || 0);
+    }
+  }
+  for (const targetEngine of targetEngines) {
+    const versions = beforeVersions.get(targetEngine);
+    for (const name of resourceNames) {
+      const before = (versions == null ? void 0 : versions.get(name)) || 0;
+      const current = ((_b = targetEngine.getDataSourceDirtyVersion) == null ? void 0 : _b.call(targetEngine, dataSourceKey, name)) || 0;
+      if (current !== before) {
+        continue;
+      }
+      targetEngine.markDataSourceDirty(dataSourceKey, name);
+    }
+  }
+  (_d = (_c = engine.emitter) == null ? void 0 : _c.emit) == null ? void 0 : _d.call(_c, import_viewEvents.DATA_SOURCE_DIRTY_EVENT, {
+    dataSourceKey,
+    resourceNames
+  });
+  return resourceNames;
+}
+__name(markDataSourceDirty, "markDataSourceDirty");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAffectedResourceNames,
+  getDataSourceKeyFromHeaders,
+  getHeaderValue,
+  markDataSourceDirty
+});

package/lib/utils/dirtyAwareApiClient.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 { FlowContext } from '../flowContext';
+export declare const SKIP_DATA_SOURCE_DIRTY = "__nocobaseSkipDataSourceDirty";
+export declare function getDirtyAwareApiClient(value: unknown, context: FlowContext): unknown;