@nocobase/plugin-flow-engine 2.0.0-beta.20 → 2.0.0-beta.21

package/dist/externalVersion.js

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

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":"2026-02-05T04:38:23.535Z"}
+{"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":"2026-02-07T03:52:51.226Z"}

package/dist/server/repository.d.ts

@@ -8,7 +8,7 @@
  */
 import { Cache } from '@nocobase/cache';
 import { Repository, Transaction, Transactionable } from '@nocobase/database';
-import { ChildOptions, SchemaNode } from './dao/ui_schema_node_dao';
+import { ChildOptions, SchemaNode, TargetPosition } from './dao/ui_schema_node_dao';
 export interface GetJsonSchemaOptions {
     includeAsyncNode?: boolean;
     readFromCache?: boolean;
@@ -18,6 +18,13 @@ export interface GetPropertiesOptions {
     readFromCache?: boolean;
     transaction?: Transaction;
 }
+export type FlowModelAttachPosition = 'first' | 'last' | TargetPosition;
+export interface FlowModelAttachOptions {
+    parentId: string;
+    subKey: string;
+    subType: 'array' | 'object';
+    position?: FlowModelAttachPosition;
+}
 type BreakRemoveOnType = {
     [key: string]: any;
 };
@@ -114,6 +121,7 @@ export declare class FlowModelRepository extends Repository {
     findModelByParentId(parentUid: string, options?: GetJsonSchemaOptions & {
         subKey?: string;
     }): Promise<any>;
+    attach(uid: string, attachOptions: FlowModelAttachOptions, options?: Transactionable): Promise<any>;
     move(options: any): Promise<any>;
 }
 export default FlowModelRepository;

package/dist/server/repository.js

@@ -1248,6 +1248,141 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
     }
     return null;
   }
+  async attach(uid2, attachOptions, options) {
+    const { transaction: transaction2 } = options || {};
+    const modelUid = String(uid2 || "").trim();
+    const parentId = String((attachOptions == null ? void 0 : attachOptions.parentId) || "").trim();
+    const subKey = String((attachOptions == null ? void 0 : attachOptions.subKey) || "").trim();
+    const subType = attachOptions == null ? void 0 : attachOptions.subType;
+    if (!modelUid || !parentId || !subKey || subType !== "array" && subType !== "object") {
+      throw new Error("flowModels:attach missing required params");
+    }
+    if (modelUid === parentId) {
+      throw new Error("flowModels:attach cannot attach model to itself");
+    }
+    const treeTable = this.flowModelTreePathTableName;
+    const modelInstance = await this.model.findByPk(modelUid, { transaction: transaction2 });
+    if (!modelInstance) {
+      throw new Error(`flowModels:attach uid '${modelUid}' not found`);
+    }
+    const parentInstance = await this.model.findByPk(parentId, { transaction: transaction2 });
+    if (!parentInstance) {
+      throw new Error(`flowModels:attach parentId '${parentId}' not found`);
+    }
+    const cycle = await this.database.sequelize.query(
+      `SELECT 1 as v
+       FROM ${treeTable}
+       WHERE ancestor = :ancestor AND descendant = :descendant AND depth > 0
+       LIMIT 1`,
+      {
+        type: "SELECT",
+        replacements: {
+          ancestor: modelUid,
+          descendant: parentId
+        },
+        transaction: transaction2
+      }
+    );
+    if (cycle == null ? void 0 : cycle.length) {
+      throw new Error("flowModels:attach cycle detected");
+    }
+    if (subType === "object") {
+      const conflict = await this.database.sequelize.query(
+        `SELECT TreeTable.descendant as uid
+         FROM ${treeTable} as TreeTable
+                  LEFT JOIN ${treeTable} as NodeInfo
+                            ON NodeInfo.descendant = TreeTable.descendant
+                                AND NodeInfo.depth = 0
+         WHERE TreeTable.depth = 1
+           AND TreeTable.ancestor = :ancestor
+           AND NodeInfo.type = :type
+           AND TreeTable.descendant != :uid
+         LIMIT 1`,
+        {
+          type: "SELECT",
+          replacements: {
+            ancestor: parentId,
+            type: subKey,
+            uid: modelUid
+          },
+          transaction: transaction2
+        }
+      );
+      if (conflict == null ? void 0 : conflict.length) {
+        throw new Error(`flowModels:attach subKey '${subKey}' already exists on parent '${parentId}'`);
+      }
+    }
+    const normalizePosition = (input) => {
+      if (!input) return "last";
+      if (input === "first" || input === "last") return input;
+      if (typeof input === "object") {
+        const p = input;
+        const type = p == null ? void 0 : p.type;
+        const target = String((p == null ? void 0 : p.target) || "").trim();
+        if ((type === "before" || type === "after") && target) {
+          return { type, target };
+        }
+      }
+      throw new Error("flowModels:attach invalid position");
+    };
+    const position = subType === "object" ? "last" : normalizePosition(attachOptions == null ? void 0 : attachOptions.position);
+    if (typeof position === "object") {
+      const target = String(position.target || "").trim();
+      if (target === modelUid) {
+        throw new Error("flowModels:attach position target cannot be itself");
+      }
+      const ok = await this.database.sequelize.query(
+        `SELECT 1 as v
+         FROM ${treeTable} as TreeTable
+                  LEFT JOIN ${treeTable} as NodeInfo
+                            ON NodeInfo.descendant = TreeTable.descendant
+                                AND NodeInfo.depth = 0
+         WHERE TreeTable.depth = 1
+           AND TreeTable.ancestor = :ancestor
+           AND TreeTable.descendant = :descendant
+           AND NodeInfo.type = :type
+         LIMIT 1`,
+        {
+          type: "SELECT",
+          replacements: {
+            ancestor: parentId,
+            descendant: target,
+            type: subKey
+          },
+          transaction: transaction2
+        }
+      );
+      if (!(ok == null ? void 0 : ok.length)) {
+        throw new Error("flowModels:attach position target is not a sibling under the same parent/subKey");
+      }
+    }
+    await this.clearXUidPathCache(modelUid, transaction2);
+    await modelInstance.update(
+      {
+        options: {
+          ...modelInstance.get("options"),
+          parentId,
+          parent: parentId,
+          subKey,
+          subType
+        }
+      },
+      { transaction: transaction2, hooks: false }
+    );
+    await this.insertSingleNode(
+      {
+        uid: modelUid,
+        name: modelUid,
+        childOptions: {
+          parentUid: parentId,
+          type: subKey,
+          position
+        }
+      },
+      { transaction: transaction2, removeParentsIfNoChildren: false }
+    );
+    return await this.findModelById(modelUid, { transaction: transaction2, includeAsyncNode: true });
+  }
   async move(options) {
     const { sourceId, targetId, position } = options;
     return await this.insertAdjacent(position === "after" ? "afterEnd" : "beforeBegin", targetId, {
@@ -1312,6 +1447,9 @@ __decorateClass([
 __decorateClass([
   transaction()
 ], _FlowModelRepository.prototype, "upsertModel", 1);
+__decorateClass([
+  transaction()
+], _FlowModelRepository.prototype, "attach", 1);
 let FlowModelRepository = _FlowModelRepository;
 var repository_default = FlowModelRepository;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/server.js

@@ -143,6 +143,18 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
           ctx.body = duplicated;
           await next();
         },
+        attach: async (ctx, next) => {
+          const { uid: uid2, parentId, subKey, subType, position } = ctx.action.params;
+          const repository = ctx.db.getRepository("flowModels");
+          const attached = await repository.attach(String(uid2 || "").trim(), {
+            parentId: String(parentId || "").trim(),
+            subKey: String(subKey || "").trim(),
+            subType,
+            position
+          });
+          ctx.body = attached;
+          await next();
+        },
         move: async (ctx, next) => {
           const { sourceId, targetId, position } = ctx.action.params;
           const repository = ctx.db.getRepository("flowModels");

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "f4ab788fc6c17915157617026dfbba6f0d78eaac"
+  "gitHead": "3ea30685d9592934ec578c0b5e8def60a7fcc3c2"
 }