@nocobase/plugin-flow-engine 2.0.0-beta.9 → 2.1.0-beta.1

package/dist/node_modules/zod/v4/package.json

@@ -0,0 +1,6 @@
+{ 
+  "type": "module",
+  "main": "./index.cjs",
+  "module": "./index.js",
+  "types": "./index.d.cts" 
+}

package/dist/node_modules/zod/v4-mini/index.cjs

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../v4/mini/index.cjs"), exports);

package/dist/node_modules/zod/v4-mini/index.d.cts

@@ -0,0 +1 @@
+export * from "../v4/mini/index.cjs";

package/dist/node_modules/zod/v4-mini/index.d.ts

@@ -0,0 +1 @@
+export * from "../v4/mini/index.js";

package/dist/node_modules/zod/v4-mini/index.js

@@ -0,0 +1 @@
+export * from "../v4/mini/index.js";

package/dist/node_modules/zod/v4-mini/package.json

@@ -0,0 +1,6 @@
+{ 
+  "type": "module",
+  "main": "./index.cjs",
+  "module": "./index.js",
+  "types": "./index.d.cts" 
+}

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/dist/server/template/contexts.d.ts

@@ -57,7 +57,6 @@ export declare class ServerBaseContext {
  * 全局上下文：
  * - now/timestamp：时间值（不缓存）
  * - env：环境变量（仅暴露白名单前缀）
- * - date：日期快捷变量集合（包含前天等）
  */
 export declare class GlobalContext extends ServerBaseContext {
     constructor(env?: Record<string, any>);

package/dist/server/template/contexts.js

@@ -42,7 +42,6 @@ __export(contexts_exports, {
 });
 module.exports = __toCommonJS(contexts_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_utils = require("@nocobase/utils");
 class ServerBaseContext {
   _props = {};
   _methods = {};
@@ -154,10 +153,6 @@ class GlobalContext extends ServerBaseContext {
     this.defineProperty("now", { get: () => (/* @__PURE__ */ new Date()).toISOString(), cache: false });
     this.defineProperty("timestamp", { get: () => Date.now(), cache: false });
     if (env) this.defineProperty("env", { value: filterEnv(env) });
-    this.defineProperty("date", {
-      get: (_ctx) => buildDateVariables(),
-      cache: false
-    });
   }
 }
 class HttpRequestContext extends ServerBaseContext {
@@ -191,40 +186,6 @@ function filterEnv(env, allowedPrefixes = DEFAULT_ENV_PREFIXES) {
     return {};
   }
 }
-function buildDateVariables() {
-  const timezone = getServerTimezone();
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  const base = (0, import_utils.getDateVars)();
-  base.dayBeforeYesterday = (0, import_utils.toUnit)("day", -2);
-  const out = {};
-  for (const [key, val] of Object.entries(base)) {
-    try {
-      out[key] = typeof val === "function" ? val({ timezone, now }) : val;
-    } catch (_2) {
-    }
-  }
-  return out;
-}
-function getServerTimezone() {
-  var _a, _b;
-  const tzEnv = ((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.DB_TIMEZONE) || ((_b = process == null ? void 0 : process.env) == null ? void 0 : _b.TZ);
-  if (tzEnv) {
-    const m = tzEnv.match(/^([+-])(\d{1,2}):(\d{2})$/);
-    if (m) {
-      const sign2 = m[1];
-      const hh2 = m[2].padStart(2, "0");
-      const mm2 = m[3];
-      return `${sign2}${hh2}:${mm2}`;
-    }
-    return tzEnv;
-  }
-  const offsetMinutes = -(/* @__PURE__ */ new Date()).getTimezoneOffset();
-  const sign = offsetMinutes >= 0 ? "+" : "-";
-  const abs = Math.abs(offsetMinutes);
-  const hh = String(Math.floor(abs / 60)).padStart(2, "0");
-  const mm = String(abs % 60).padStart(2, "0");
-  return `${sign}${hh}:${mm}`;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   GlobalContext,

package/dist/server/template/resolver.js

@@ -78,14 +78,18 @@ async function replacePlaceholders(input, ctx) {
 async function evaluate(expr, ctx) {
   try {
     const raw = expr.trim();
-    const dotOnly = raw.match(/^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)*)$/);
+    const dotOnly = raw.match(
+      /^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)(?:\.([a-zA-Z_$][a-zA-Z0-9_$-]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$-]*)*))?$/
+    );
     if (dotOnly) {
-      const path = dotOnly[1];
-      const segs = path.split(".");
-      const first = segs.shift();
+      const first = dotOnly[1];
+      const rest = dotOnly[2];
       const base = await ctx[first];
-      if (!segs.length) return base;
-      return await asyncGetValuesByPath(base, segs.join("."));
+      if (!rest) return base;
+      const resolved = await asyncGetValuesByPath(base, rest);
+      if (typeof resolved !== "undefined" || !rest.includes("-")) {
+        return resolved;
+      }
     }
     const transformed = preprocessExpression(raw);
     const compartment = new Compartment({

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

@@ -0,0 +1,38 @@
+/**
+ * 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.
+ */
+type FilterTargetKey = string | string[] | undefined;
+/**
+ * 为了：
+ * - 关联加载/缓存：fields 模式下确保包含主键
+ * - filterByTk 为数组时：尽量包含 filterTargetKey，以便按输入顺序对齐结果
+ *
+ * 该函数只返回“建议追加”的 key 字段（不会决定是否追加，由调用方根据是否启用 fields 决定）。
+ */
+export declare function getExtraKeyFieldsForSelect(filterByTk: unknown, options: {
+    filterTargetKey?: FilterTargetKey;
+    pkAttr?: string;
+    pkIsValid?: boolean;
+    rawAttributes?: Record<string, unknown>;
+}): string[];
+export declare function mergeFieldsWithExtras(fields?: string[], extras?: string[]): string[] | undefined;
+/**
+ * 根据 filterByTk 类型（单值/数组）查询并返回 JSON 数据：
+ * - 单值：返回 object | undefined
+ * - 数组：返回 array（空数组时返回 []，不会退化为无条件查询）
+ */
+export declare function fetchRecordOrRecordsJson(repo: any, params: {
+    filterByTk: unknown;
+    preferFullRecord?: boolean;
+    fields?: string[];
+    appends?: string[];
+    filterTargetKey?: FilterTargetKey;
+    pkAttr?: string;
+    pkIsValid?: boolean;
+}): Promise<unknown>;
+export {};

package/dist/server/variables/records.js

@@ -0,0 +1,120 @@
+/**
+ * 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 records_exports = {};
+__export(records_exports, {
+  fetchRecordOrRecordsJson: () => fetchRecordOrRecordsJson,
+  getExtraKeyFieldsForSelect: () => getExtraKeyFieldsForSelect,
+  mergeFieldsWithExtras: () => mergeFieldsWithExtras
+});
+module.exports = __toCommonJS(records_exports);
+function uniqStrings(list) {
+  return Array.from(new Set(list));
+}
+function isPrimitiveTkArray(arr) {
+  return arr.every((v) => typeof v === "string" || typeof v === "number");
+}
+function getOrderKey(options) {
+  if (typeof options.filterTargetKey === "string") return options.filterTargetKey;
+  if (options.pkIsValid && options.pkAttr) return options.pkAttr;
+  return void 0;
+}
+function getExtraKeyFieldsForSelect(filterByTk, options) {
+  const extra = [];
+  if (options.pkIsValid && options.pkAttr) {
+    extra.push(options.pkAttr);
+  }
+  if (Array.isArray(filterByTk) && filterByTk.length > 0) {
+    const tkKeys = typeof options.filterTargetKey === "string" ? [options.filterTargetKey] : Array.isArray(options.filterTargetKey) ? options.filterTargetKey : [];
+    if (options.rawAttributes) {
+      for (const k of tkKeys) {
+        if (k && Object.prototype.hasOwnProperty.call(options.rawAttributes, k)) {
+          extra.push(k);
+        }
+      }
+    }
+  }
+  return uniqStrings(extra);
+}
+function mergeFieldsWithExtras(fields, extras = []) {
+  if (!Array.isArray(fields) || fields.length === 0 || extras.length === 0) return fields;
+  return uniqStrings([...fields, ...extras]);
+}
+function toJsonArray(rows) {
+  if (!Array.isArray(rows)) return [];
+  return rows.map((r) => (r == null ? void 0 : r.toJSON) ? r.toJSON() : r);
+}
+function reorderRecordsByFilterByTk(records, filterByTk, options) {
+  if (!Array.isArray(filterByTk) || filterByTk.length === 0) return records;
+  if (!isPrimitiveTkArray(filterByTk)) return records;
+  const orderKey = getOrderKey(options);
+  if (!orderKey) return records;
+  const map = /* @__PURE__ */ new Map();
+  for (const rec of records || []) {
+    const k = rec == null ? void 0 : rec[orderKey];
+    if (typeof k !== "undefined" && k !== null) {
+      map.set(String(k), rec);
+    }
+  }
+  const ordered = [];
+  const used = /* @__PURE__ */ new Set();
+  for (const tk of filterByTk) {
+    const k = String(tk);
+    const rec = map.get(k);
+    if (typeof rec !== "undefined") {
+      ordered.push(rec);
+      used.add(k);
+    }
+  }
+  for (const rec of records || []) {
+    const k = rec == null ? void 0 : rec[orderKey];
+    const ks = typeof k === "undefined" || k === null ? void 0 : String(k);
+    if (!ks || used.has(ks)) continue;
+    ordered.push(rec);
+  }
+  return ordered;
+}
+async function fetchRecordOrRecordsJson(repo, params) {
+  const { filterByTk, preferFullRecord, fields, appends } = params;
+  if (Array.isArray(filterByTk)) {
+    if (filterByTk.length === 0) return [];
+    const rows = await repo.find(
+      preferFullRecord ? { filterByTk } : { filterByTk, fields, appends }
+    );
+    const jsonArr = toJsonArray(rows);
+    return reorderRecordsByFilterByTk(jsonArr, filterByTk, params);
+  }
+  const rec = await repo.findOne(
+    preferFullRecord ? { filterByTk } : { filterByTk, fields, appends }
+  );
+  return rec ? rec.toJSON() : void 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchRecordOrRecordsJson,
+  getExtraKeyFieldsForSelect,
+  mergeFieldsWithExtras
+});