@nocobase/server 2.0.0-alpha.50 → 2.0.0-alpha.51

package/lib/commands/index.js

@@ -53,6 +53,7 @@ var import_start = __toESM(require("./start"));
 var import_stop = __toESM(require("./stop"));
 var import_upgrade = __toESM(require("./upgrade"));
 var import_console = __toESM(require("./console"));
+var import_repair = __toESM(require("./repair"));
 /* istanbul ignore file -- @preserve */
 function registerCli(app) {
   (0, import_console.default)(app);
@@ -68,6 +69,7 @@ function registerCli(app) {
   (0, import_destroy.default)(app);
   (0, import_start.default)(app);
   (0, import_refresh.default)(app);
+  (0, import_repair.default)(app);
   app.command("build").argument("[packages...]");
   app.command("clean");
   app.command("dev").usage("[options]").option("-p, --port [port]").option("--client").option("--server");

package/lib/commands/repair.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 Application from '../application';
+declare const _default: (app: Application) => void;
+export default _default;

package/lib/commands/repair.js

@@ -0,0 +1,43 @@
+/**
+ * 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 repair_exports = {};
+__export(repair_exports, {
+  default: () => repair_default
+});
+module.exports = __toCommonJS(repair_exports);
+var repair_default = /* @__PURE__ */ __name((app) => {
+  app.command("repair").auth().preload().action(async (options) => {
+    app.log.info("start repair data...");
+    const Collection = app.db.getCollection("collections");
+    if (Collection) {
+      await Collection.repository.setApp(app);
+      await Collection.repository.load();
+    }
+    await app.emitAsync("repair", options);
+  });
+}, "default");

package/lib/helper.d.ts

@@ -17,3 +17,362 @@ export declare const getCommandFullName: (command: Command) => string;
 export declare const tsxRerunning: () => Promise<void>;
 export declare const enablePerfHooks: (app: Application) => void;
 export declare function getBodyLimit(): string;
+export declare function createContextVariablesScope(ctx: any): {
+    timezone: any;
+    now: string;
+    getField: (path: any) => any;
+    vars: {
+        ctx: {
+            state: any;
+        };
+        $system: {
+            now: string;
+        };
+        $date: {
+            now: string;
+            today: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            yesterday: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            tomorrow: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            last7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+        };
+        $nDate: {
+            now: string;
+            today: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            yesterday: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            tomorrow: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextIsoWeek: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextMonth: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextQuarter: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            thisYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            lastYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            nextYear: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => any;
+            last7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next7Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next30Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            last90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+            next90Days: ({ now, timezone, field }: {
+                now?: any;
+                timezone?: string | number;
+                field?: {
+                    timezone?: string | number;
+                };
+            }) => (string | number)[];
+        };
+        $user: ({ fields }: {
+            fields: any;
+        }) => Promise<any>;
+        $nRole: any;
+    };
+};

package/lib/helper.js

@@ -38,6 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   createAppProxy: () => createAppProxy,
+  createContextVariablesScope: () => createContextVariablesScope,
   createI18n: () => createI18n,
   createResourcer: () => createResourcer,
   enablePerfHooks: () => enablePerfHooks,
@@ -193,9 +194,66 @@ function getBodyLimit() {
   return process.env.REQUEST_BODY_LIMIT || "10mb";
 }
 __name(getBodyLimit, "getBodyLimit");
+function getUser(ctx) {
+  return async ({ fields }) => {
+    var _a, _b;
+    const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
+    (_a = ctx.logger) == null ? void 0 : _a.info("filter-parse: ", { userFields });
+    if (!ctx.state.currentUser) {
+      return;
+    }
+    if (!userFields.length) {
+      return;
+    }
+    const user = await ctx.db.getRepository("users").findOne({
+      filterByTk: ctx.state.currentUser.id,
+      fields: userFields
+    });
+    (_b = ctx.logger) == null ? void 0 : _b.info("filter-parse: ", {
+      $user: user == null ? void 0 : user.toJSON()
+    });
+    return user;
+  };
+}
+__name(getUser, "getUser");
+function isNumeric(str) {
+  if (typeof str === "number") return true;
+  if (typeof str != "string") return false;
+  return !isNaN(str) && !isNaN(parseFloat(str));
+}
+__name(isNumeric, "isNumeric");
+function createContextVariablesScope(ctx) {
+  const state = JSON.parse(JSON.stringify(ctx.state));
+  return {
+    timezone: ctx.get("x-timezone"),
+    now: (/* @__PURE__ */ new Date()).toISOString(),
+    getField: /* @__PURE__ */ __name((path) => {
+      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
+      const { resourceName } = ctx.action;
+      return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
+    }, "getField"),
+    vars: {
+      ctx: {
+        state
+      },
+      // @deprecated
+      $system: {
+        now: (/* @__PURE__ */ new Date()).toISOString()
+      },
+      // @deprecated
+      $date: (0, import_utils.getDateVars)(),
+      // 新的命名方式，防止和 formily 内置变量冲突
+      $nDate: (0, import_utils.getDateVars)(),
+      $user: getUser(ctx),
+      $nRole: ctx.state.currentRole === "__union__" ? ctx.state.currentRoles : ctx.state.currentRole
+    }
+  };
+}
+__name(createContextVariablesScope, "createContextVariablesScope");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createAppProxy,
+  createContextVariablesScope,
   createI18n,
   createResourcer,
   enablePerfHooks,

package/lib/index.d.ts

@@ -25,3 +25,4 @@ export * from './main-data-source';
 export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 export { appendToBuiltInPlugins, findAllPlugins, findBuiltInPlugins, findLocalPlugins, packageNameTrim, } from './plugin-manager/findPackageNames';
 export { runPluginStaticImports } from './run-plugin-static-imports';
+export { createContextVariablesScope } from './helper';

package/lib/index.js

@@ -39,6 +39,7 @@ var src_exports = {};
 __export(src_exports, {
   OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins: () => import_findPackageNames.appendToBuiltInPlugins,
+  createContextVariablesScope: () => import_helper.createContextVariablesScope,
   default: () => import_application.Application,
   findAllPlugins: () => import_findPackageNames.findAllPlugins,
   findBuiltInPlugins: () => import_findPackageNames.findBuiltInPlugins,
@@ -66,11 +67,13 @@ __reExport(src_exports, require("./redis-connection-manager"), module.exports);
 __reExport(src_exports, require("./main-data-source"), module.exports);
 var import_findPackageNames = require("./plugin-manager/findPackageNames");
 var import_run_plugin_static_imports = require("./run-plugin-static-imports");
+var import_helper = require("./helper");
 const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins,
+  createContextVariablesScope,
   findAllPlugins,
   findBuiltInPlugins,
   findLocalPlugins,

package/lib/middlewares/parse-variables.js

@@ -31,64 +31,13 @@ __export(parse_variables_exports, {
 });
 module.exports = __toCommonJS(parse_variables_exports);
 var import_utils = require("@nocobase/utils");
-function getUser(ctx) {
-  return async ({ fields }) => {
-    var _a, _b;
-    const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
-    (_a = ctx.logger) == null ? void 0 : _a.info("filter-parse: ", { userFields });
-    if (!ctx.state.currentUser) {
-      return;
-    }
-    if (!userFields.length) {
-      return;
-    }
-    const user = await ctx.db.getRepository("users").findOne({
-      filterByTk: ctx.state.currentUser.id,
-      fields: userFields
-    });
-    (_b = ctx.logger) == null ? void 0 : _b.info("filter-parse: ", {
-      $user: user == null ? void 0 : user.toJSON()
-    });
-    return user;
-  };
-}
-__name(getUser, "getUser");
-function isNumeric(str) {
-  if (typeof str === "number") return true;
-  if (typeof str != "string") return false;
-  return !isNaN(str) && !isNaN(parseFloat(str));
-}
-__name(isNumeric, "isNumeric");
+var import_helper = require("../helper");
 async function parseVariables(ctx, next) {
   const filter = ctx.action.params.filter;
   if (!filter) {
     return next();
   }
-  const state = JSON.parse(JSON.stringify(ctx.state));
-  ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, {
-    timezone: ctx.get("x-timezone"),
-    now: (/* @__PURE__ */ new Date()).toISOString(),
-    getField: /* @__PURE__ */ __name((path) => {
-      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
-      const { resourceName } = ctx.action;
-      return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
-    }, "getField"),
-    vars: {
-      ctx: {
-        state
-      },
-      // @deprecated
-      $system: {
-        now: (/* @__PURE__ */ new Date()).toISOString()
-      },
-      // @deprecated
-      $date: (0, import_utils.getDateVars)(),
-      // 新的命名方式，防止和 formily 内置变量冲突
-      $nDate: (0, import_utils.getDateVars)(),
-      $user: getUser(ctx),
-      $nRole: ctx.state.currentRole === "__union__" ? ctx.state.currentRoles : ctx.state.currentRole
-    }
-  });
+  ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, (0, import_helper.createContextVariablesScope)(ctx));
   await next();
 }
 __name(parseVariables, "parseVariables");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.50",
+  "version": "2.0.0-alpha.51",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-alpha.50",
-    "@nocobase/actions": "2.0.0-alpha.50",
-    "@nocobase/auth": "2.0.0-alpha.50",
-    "@nocobase/cache": "2.0.0-alpha.50",
-    "@nocobase/data-source-manager": "2.0.0-alpha.50",
-    "@nocobase/database": "2.0.0-alpha.50",
-    "@nocobase/evaluators": "2.0.0-alpha.50",
-    "@nocobase/lock-manager": "2.0.0-alpha.50",
-    "@nocobase/logger": "2.0.0-alpha.50",
-    "@nocobase/resourcer": "2.0.0-alpha.50",
-    "@nocobase/sdk": "2.0.0-alpha.50",
-    "@nocobase/snowflake-id": "2.0.0-alpha.50",
-    "@nocobase/telemetry": "2.0.0-alpha.50",
-    "@nocobase/utils": "2.0.0-alpha.50",
+    "@nocobase/acl": "2.0.0-alpha.51",
+    "@nocobase/actions": "2.0.0-alpha.51",
+    "@nocobase/auth": "2.0.0-alpha.51",
+    "@nocobase/cache": "2.0.0-alpha.51",
+    "@nocobase/data-source-manager": "2.0.0-alpha.51",
+    "@nocobase/database": "2.0.0-alpha.51",
+    "@nocobase/evaluators": "2.0.0-alpha.51",
+    "@nocobase/lock-manager": "2.0.0-alpha.51",
+    "@nocobase/logger": "2.0.0-alpha.51",
+    "@nocobase/resourcer": "2.0.0-alpha.51",
+    "@nocobase/sdk": "2.0.0-alpha.51",
+    "@nocobase/snowflake-id": "2.0.0-alpha.51",
+    "@nocobase/telemetry": "2.0.0-alpha.51",
+    "@nocobase/utils": "2.0.0-alpha.51",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -60,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "a6eb64abf3632e116ad0b295a7f410270a1059d1"
+  "gitHead": "a1e34dd97f370d54f3d80a6b83ab7ddb9c72dc18"
 }