@nocobase/plugin-flow-engine 2.0.0-alpha.59 → 2.0.0-alpha.60

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.59",
+  "@nocobase/client": "2.0.0-alpha.60",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.0.0-alpha.59",
-  "@nocobase/data-source-manager": "2.0.0-alpha.59",
-  "@nocobase/resourcer": "2.0.0-alpha.59",
-  "@nocobase/server": "2.0.0-alpha.59",
-  "@nocobase/utils": "2.0.0-alpha.59",
-  "@nocobase/cache": "2.0.0-alpha.59",
-  "@nocobase/plugin-localization": "2.0.0-alpha.59",
-  "@nocobase/actions": "2.0.0-alpha.59"
+  "@nocobase/database": "2.0.0-alpha.60",
+  "@nocobase/data-source-manager": "2.0.0-alpha.60",
+  "@nocobase/resourcer": "2.0.0-alpha.60",
+  "@nocobase/server": "2.0.0-alpha.60",
+  "@nocobase/utils": "2.0.0-alpha.60",
+  "@nocobase/cache": "2.0.0-alpha.60",
+  "@nocobase/plugin-localization": "2.0.0-alpha.60",
+  "@nocobase/actions": "2.0.0-alpha.60"
 };

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2025-12-25T01:56:46.812Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2025-12-31T15:58:42.095Z"}

package/dist/server/repository.d.ts

@@ -72,6 +72,7 @@ export declare class FlowModelRepository extends Repository {
     remove(uid: string, options?: Transactionable & removeParentOptions): Promise<void>;
     insertAdjacent(position: 'beforeBegin' | 'afterBegin' | 'beforeEnd' | 'afterEnd', target: string, schema: any, options?: InsertAdjacentOptions): Promise<any>;
     duplicate(modelUid: string, options?: Transactionable): Promise<any>;
+    private dedupeNodesForDuplicate;
     private replaceStepParamsModelUids;
     insert(schema: any, options?: Transactionable): Promise<any>;
     insertNewSchema(schema: any, options?: Transactionable & {

package/dist/server/repository.js

@@ -430,10 +430,11 @@ const _FlowModelRepository = class _FlowModelRepository extends import_database.
     return result;
   }
   async duplicate(modelUid, options) {
-    const nodes = await this.findNodesById(modelUid, { ...options, includeAsyncNode: true });
+    let nodes = await this.findNodesById(modelUid, { ...options, includeAsyncNode: true });
     if (!(nodes == null ? void 0 : nodes.length)) {
       return null;
     }
+    nodes = this.dedupeNodesForDuplicate(nodes, modelUid);
     const uidMap = {};
     for (const n of nodes) {
       uidMap[n["uid"]] = (0, import_utils.uid)();
@@ -479,6 +480,51 @@ const _FlowModelRepository = class _FlowModelRepository extends import_database.
     }
     return this.findModelById(uidMap[modelUid], { ...options });
   }
+  dedupeNodesForDuplicate(nodes, rootUid) {
+    if (!Array.isArray(nodes) || nodes.length <= 1) {
+      return nodes;
+    }
+    const rowsByUid = import_lodash.default.groupBy(nodes, "uid");
+    const uniqueUids = Object.keys(rowsByUid);
+    if (uniqueUids.length === nodes.length) {
+      return nodes;
+    }
+    const uidsInSubtree = new Set(uniqueUids);
+    const rootDepthByUid = /* @__PURE__ */ new Map();
+    for (const uid2 of uniqueUids) {
+      const rows = rowsByUid[uid2] || [];
+      const depths = rows.map((row) => Number((row == null ? void 0 : row.depth) ?? 0));
+      rootDepthByUid.set(uid2, depths.length ? Math.min(...depths) : 0);
+    }
+    const pickRowForUid = (uid2, rows) => {
+      if (!(rows == null ? void 0 : rows.length)) return null;
+      if (rows.length === 1) return rows[0];
+      if (uid2 === rootUid) return rows[0];
+      let bestRow = rows[0];
+      let bestParentRootDepth = -1;
+      for (const row of rows) {
+        const parentUid = row == null ? void 0 : row.parent;
+        if (!parentUid || !uidsInSubtree.has(parentUid)) {
+          continue;
+        }
+        const parentRootDepth = rootDepthByUid.get(parentUid) ?? -1;
+        if (parentRootDepth > bestParentRootDepth) {
+          bestParentRootDepth = parentRootDepth;
+          bestRow = row;
+        }
+      }
+      return bestRow;
+    };
+    const uidsInQueryOrder = [];
+    const seenUidsInQueryOrder = /* @__PURE__ */ new Set();
+    for (const row of nodes) {
+      const uid2 = row == null ? void 0 : row.uid;
+      if (!uid2 || seenUidsInQueryOrder.has(uid2)) continue;
+      seenUidsInQueryOrder.add(uid2);
+      uidsInQueryOrder.push(uid2);
+    }
+    return uidsInQueryOrder.map((uid2) => pickRowForUid(uid2, rowsByUid[uid2])).filter(Boolean);
+  }
   replaceStepParamsModelUids(options, uidMap) {
     const opts = options && typeof options === "object" ? options : {};
     const replaceUidString = (v) => typeof v === "string" && uidMap[v] ? uidMap[v] : v;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-alpha.59",
+  "version": "2.0.0-alpha.60",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "ca9fca2a826b17735c6287bebf877b2da9a00e24"
+  "gitHead": "9113d61ce85b60b7ba3d0e5ca64182d92a15ece4"
 }