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

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

@@ -19,9 +19,10 @@ export * from './plugin';
 export * from './plugin-manager';
 export * from './pub-sub-manager';
 export * from './event-queue';
-export * from './background-job-manager';
 export * from './worker-id-allocator';
 export * from './redis-connection-manager';
+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,
@@ -61,16 +62,18 @@ __reExport(src_exports, require("./plugin"), module.exports);
 __reExport(src_exports, require("./plugin-manager"), module.exports);
 __reExport(src_exports, require("./pub-sub-manager"), module.exports);
 __reExport(src_exports, require("./event-queue"), module.exports);
-__reExport(src_exports, require("./background-job-manager"), module.exports);
 __reExport(src_exports, require("./worker-id-allocator"), module.exports);
 __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,
@@ -88,7 +91,7 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./plugin-manager"),
   ...require("./pub-sub-manager"),
   ...require("./event-queue"),
-  ...require("./background-job-manager"),
   ...require("./worker-id-allocator"),
-  ...require("./redis-connection-manager")
+  ...require("./redis-connection-manager"),
+  ...require("./main-data-source")
 });

package/lib/locale/locale.js

@@ -138,7 +138,7 @@ const _Locale = class _Locale {
         if (!packageName) {
           continue;
         }
-        const res = (0, import_resource.getResource)(packageName, lang);
+        const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
           if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {

package/lib/locale/resource.js

@@ -40,7 +40,7 @@ __export(resource_exports, {
   getResource: () => getResource
 });
 module.exports = __toCommonJS(resource_exports);
-var import_utils = require("@nocobase/utils");
+var import_promises = __toESM(require("fs/promises"));
 const arr2obj = /* @__PURE__ */ __name((items) => {
   const obj = {};
   for (const item of items) {
@@ -48,7 +48,7 @@ const arr2obj = /* @__PURE__ */ __name((items) => {
   }
   return obj;
 }, "arr2obj");
-const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true) => {
+const getResource = /* @__PURE__ */ __name(async (packageName, lang, isPlugin = true) => {
   const resources = [];
   const prefixes = [isPlugin ? "dist" : "lib"];
   if (process.env.APP_ENV !== "production") {
@@ -70,13 +70,10 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
   }
   for (const prefix of prefixes) {
     try {
-      const file = `${packageName}/${prefix}/locale/${lang}`;
+      const file = `${packageName}/${prefix}/locale/${lang}.json`;
       const f = require.resolve(file);
-      if (process.env.APP_ENV !== "production") {
-        delete require.cache[f];
-      }
-      const resource = (0, import_utils.requireModule)(file);
-      resources.push(resource);
+      const resource = await import_promises.default.readFile(f, "utf8");
+      resources.push(JSON.parse(resource));
     } catch (error) {
     }
     if (resources.length) {
@@ -84,7 +81,7 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
     }
   }
   if (resources.length === 0 && lang.replace("-", "_") !== lang) {
-    return getResource(packageName, lang.replace("-", "_"));
+    return await getResource(packageName, lang.replace("-", "_"));
   }
   return arr2obj(resources);
 }, "getResource");

package/lib/main-data-source.d.ts

@@ -6,7 +6,18 @@
  * 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 { Context } from '@nocobase/actions';
 import { DataSourceOptions, SequelizeDataSource } from '@nocobase/data-source-manager';
+type MainDataSourceStatus = 'loaded' | 'loading';
 export declare class MainDataSource extends SequelizeDataSource {
+    status: MainDataSourceStatus;
     init(options?: DataSourceOptions): void;
+    readTables(): Promise<{
+        name: string;
+    }[]>;
+    private tables2Collections;
+    loadTables(ctx: Context, tables: string[]): Promise<void>;
+    private getLoadedCollections;
+    syncFieldsFromDatabase(ctx: any, collectionNames?: string[]): Promise<void>;
 }
+export {};