@nocobase/plugin-client 2.1.0-beta.33 → 2.1.0-beta.35

package/dist/externalVersion.js

@@ -10,13 +10,13 @@
 module.exports = {
   "react": "18.2.0",
   "react-i18next": "11.18.6",
-  "@nocobase/client": "2.1.0-beta.33",
+  "@nocobase/client": "2.1.0-beta.35",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "@formily/react": "2.3.7",
-  "@nocobase/utils": "2.1.0-beta.33",
+  "@nocobase/utils": "2.1.0-beta.35",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.0-beta.33",
-  "@nocobase/client-v2": "2.1.0-beta.33",
-  "@nocobase/server": "2.1.0-beta.33"
+  "@nocobase/database": "2.1.0-beta.35",
+  "@nocobase/client-v2": "2.1.0-beta.35",
+  "@nocobase/server": "2.1.0-beta.35"
 };

package/dist/node_modules/cronstrue/package.json

@@ -1 +1 @@
-{"name":"cronstrue","title":"cRonstrue","version":"2.47.0","description":"Convert cron expressions into human readable descriptions","author":"Brady Holt","license":"MIT","bugs":{"url":"https://github.com/bradymholt/cronstrue/issues"},"homepage":"https://github.com/bradymholt/cronstrue","keywords":["cron","cronjob","crontab","schedule","parser","cron expression","cron description","pretty cron","cron for humans","cron translated","cron english","cron schedule","cron english","cron schedule"],"main":"dist/cronstrue.js","bin":{"cronstrue":"bin/cli.js"},"typings":"dist/cronstrue.d.ts","files":["dist/","locales/","i18n.js","i18n.d.ts"],"repository":{"type":"git","url":"git+https://github.com/bradymholt/cronstrue.git"},"publishConfig":{"access":"public"},"prettier":{"printWidth":120},"devDependencies":{"@types/chai":"^4.2.11","@types/mocha":"^8.0.0","chai":"^4.2.0","handlebars":"^4.7.6","marked":"^4.0.10","mocha":"^10.1.0","pixl-xml":"^1.0.13","prettier":"^2.1.1","terser-webpack-plugin":"^5.3.1","ts-loader":"^9.2.6","ts-node":"^10.5.0","typescript":"^4.6.2","webpack":"^5.69.1","webpack-cli":"^4.9.2","xml2js":"^0.5.0"},"scripts":{"start":"npm run build","build":"npx tsc -p ./src --emitDeclarationOnly","test":"npx mocha --reporter spec --require ts-node/register \"./test/**/*.ts\"","prepublishOnly":"rm -rf ./dist && ./node_modules/webpack-cli/bin/cli.js && git add -A"},"dependencies":{},"_lastModified":"2026-05-15T15:53:48.192Z"}
+{"name":"cronstrue","title":"cRonstrue","version":"2.47.0","description":"Convert cron expressions into human readable descriptions","author":"Brady Holt","license":"MIT","bugs":{"url":"https://github.com/bradymholt/cronstrue/issues"},"homepage":"https://github.com/bradymholt/cronstrue","keywords":["cron","cronjob","crontab","schedule","parser","cron expression","cron description","pretty cron","cron for humans","cron translated","cron english","cron schedule","cron english","cron schedule"],"main":"dist/cronstrue.js","bin":{"cronstrue":"bin/cli.js"},"typings":"dist/cronstrue.d.ts","files":["dist/","locales/","i18n.js","i18n.d.ts"],"repository":{"type":"git","url":"git+https://github.com/bradymholt/cronstrue.git"},"publishConfig":{"access":"public"},"prettier":{"printWidth":120},"devDependencies":{"@types/chai":"^4.2.11","@types/mocha":"^8.0.0","chai":"^4.2.0","handlebars":"^4.7.6","marked":"^4.0.10","mocha":"^10.1.0","pixl-xml":"^1.0.13","prettier":"^2.1.1","terser-webpack-plugin":"^5.3.1","ts-loader":"^9.2.6","ts-node":"^10.5.0","typescript":"^4.6.2","webpack":"^5.69.1","webpack-cli":"^4.9.2","xml2js":"^0.5.0"},"scripts":{"start":"npm run build","build":"npx tsc -p ./src --emitDeclarationOnly","test":"npx mocha --reporter spec --require ts-node/register \"./test/**/*.ts\"","prepublishOnly":"rm -rf ./dist && ./node_modules/webpack-cli/bin/cli.js && git add -A"},"dependencies":{},"_lastModified":"2026-05-19T16:48:48.419Z"}

package/dist/server/migrations/202605121200-clean-orphan-flow-route-models.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/202605121200-clean-orphan-flow-route-models.js

@@ -0,0 +1,131 @@
+/**
+ * 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 __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var clean_orphan_flow_route_models_exports = {};
+__export(clean_orphan_flow_route_models_exports, {
+  default: () => clean_orphan_flow_route_models_default
+});
+module.exports = __toCommonJS(clean_orphan_flow_route_models_exports);
+var import_server = require("@nocobase/server");
+var _ = __toESM(require("lodash"));
+const parseOptions = (value) => {
+  if (!value) return {};
+  if (typeof value === "string") {
+    try {
+      return JSON.parse(value);
+    } catch (error) {
+      return {};
+    }
+  }
+  return value;
+};
+const isRouteModelOptions = (value) => {
+  var _a;
+  const options = parseOptions(value);
+  return (options == null ? void 0 : options.use) === "RouteModel" || ((_a = options == null ? void 0 : options.schema) == null ? void 0 : _a.use) === "RouteModel";
+};
+class clean_orphan_flow_route_models_default extends import_server.Migration {
+  on = "afterLoad";
+  async up() {
+    if (!this.db.hasCollection("desktopRoutes") || !this.db.hasCollection("flowModels") || !this.db.hasCollection("flowModelTreePath")) {
+      return;
+    }
+    await this.db.sequelize.transaction(async (transaction) => {
+      const desktopRoutesRepo = this.db.getRepository("desktopRoutes");
+      const flowRepo = this.db.getRepository("flowModels");
+      const treePathRepo = this.db.getRepository("flowModelTreePath");
+      const desktopRoutes = await desktopRoutesRepo.find({ fields: ["schemaUid"], transaction });
+      const routeSchemaUids = new Set(desktopRoutes.map((route) => route.get("schemaUid")).filter(Boolean));
+      const flowModels = await flowRepo.find({ fields: ["uid", "options"], transaction });
+      const routeModelUids = flowModels.filter((model) => isRouteModelOptions(model.get("options"))).map((model) => model.get("uid")).filter(Boolean);
+      if (routeModelUids.length) {
+        const childRouteModels = /* @__PURE__ */ new Set();
+        for (const chunk of _.chunk(routeModelUids, 500)) {
+          const parentPaths = await treePathRepo.find({
+            filter: {
+              descendant: {
+                $in: chunk
+              },
+              depth: 1
+            },
+            fields: ["descendant"],
+            transaction
+          });
+          for (const path of parentPaths) {
+            const descendant = path.get("descendant");
+            if (descendant) {
+              childRouteModels.add(descendant);
+            }
+          }
+        }
+        const orphanRouteModelUids = routeModelUids.filter(
+          (uid) => !routeSchemaUids.has(uid) && !childRouteModels.has(uid)
+        );
+        for (const uid of orphanRouteModelUids) {
+          await flowRepo.remove(uid, { transaction });
+        }
+      }
+      if (this.db.hasCollection("flowModelTemplateUsages")) {
+        const usageRepo = this.db.getRepository("flowModelTemplateUsages");
+        const usages = await usageRepo.find({ fields: ["modelUid"], transaction });
+        const usageModelUids = _.uniq(usages.map((usage) => usage.get("modelUid")).filter(Boolean));
+        for (const chunk of _.chunk(usageModelUids, 500)) {
+          const existingModels = await flowRepo.find({
+            fields: ["uid"],
+            filter: {
+              uid: {
+                $in: chunk
+              }
+            },
+            transaction
+          });
+          const existingUids = new Set(existingModels.map((model) => model.get("uid")).filter(Boolean));
+          const missingUids = chunk.filter((uid) => !existingUids.has(uid));
+          if (missingUids.length) {
+            await usageRepo.destroy({
+              filter: {
+                modelUid: {
+                  $in: missingUids
+                }
+              },
+              transaction
+            });
+          }
+        }
+      }
+    });
+  }
+}

package/dist/server/server.js

@@ -189,15 +189,48 @@ class PluginClientServer extends import_server.Plugin {
         instance.allowNewMenu === void 0 ? ["admin", "member"].includes(instance.name) : !!instance.allowNewMenu
       );
     });
-    this.db.on("desktopRoutes.afterDestroy", async (instance, { transaction }) => {
-      const r = this.db.getRepository("flowModels");
-      if (r) {
-        await r.destroy({
+    const collectDesktopRouteSchemaUids = async (instance, transaction) => {
+      const routeRepo = this.db.getRepository("desktopRoutes");
+      const schemaUids = /* @__PURE__ */ new Set();
+      const pendingIds = [];
+      const rootId = instance.get("id");
+      const rootSchemaUid = instance.get("schemaUid");
+      if (rootSchemaUid) {
+        schemaUids.add(rootSchemaUid);
+      }
+      if (rootId) {
+        pendingIds.push(rootId);
+      }
+      while (pendingIds.length) {
+        const routes = await routeRepo.find({
+          fields: ["id", "schemaUid"],
           filter: {
-            uid: instance.get("schemaUid")
+            parentId: {
+              $in: pendingIds.splice(0, pendingIds.length)
+            }
           },
           transaction
         });
+        for (const route of routes) {
+          const schemaUid = route.get("schemaUid");
+          const id = route.get("id");
+          if (schemaUid) {
+            schemaUids.add(schemaUid);
+          }
+          if (id) {
+            pendingIds.push(id);
+          }
+        }
+      }
+      return Array.from(schemaUids);
+    };
+    this.db.on("desktopRoutes.beforeDestroy", async (instance, { transaction }) => {
+      const r = this.db.getRepository("flowModels");
+      if (r == null ? void 0 : r.remove) {
+        const schemaUids = await collectDesktopRouteSchemaUids(instance, transaction);
+        for (const schemaUid of schemaUids) {
+          await r.remove(schemaUid, { transaction });
+        }
       }
     });
     this.db.on("desktopRoutes.afterCreate", async (instance, { transaction }) => {

package/package.json

@@ -6,7 +6,7 @@
   "description": "Provides a client interface for the NocoBase server",
   "description.ru-RU": "Предоставляет клиентский интерфейс для сервера NocoBase",
   "description.zh-CN": "为 NocoBase 服务端提供客户端界面",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.35",
   "main": "./dist/server/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -23,5 +23,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }