@nocobase/server 1.2.33-alpha → 1.2.35-alpha

package/lib/app-supervisor.js

@@ -36,10 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var app_supervisor_exports = {};
 __export(app_supervisor_exports, {
   AppSupervisor: () => AppSupervisor

package/lib/application.js

@@ -279,8 +279,7 @@ const _Application = class _Application extends import_koa.default {
    */
   callback() {
     const fn = (0, import_koa_compose.default)(this.middleware.nodes);
-    if (!this.listenerCount("error"))
-      this.on("error", this.onerror);
+    if (!this.listenerCount("error")) this.on("error", this.onerror);
     return (req, res) => {
       const ctx = this.createContext(req, res);
       return this.handleRequest(ctx, fn);
@@ -456,25 +455,25 @@ const _Application = class _Application extends import_koa.default {
     });
     return {
       beforeLoad: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.log.debug("run core migrations(beforeLoad)");
           const migrator = this.db.createMigrator({ migrations: migrations.beforeLoad });
           await migrator.up();
-        }
+        }, "up")
       },
       afterSync: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.log.debug("run core migrations(afterSync)");
           const migrator = this.db.createMigrator({ migrations: migrations.afterSync });
           await migrator.up();
-        }
+        }, "up")
       },
       afterLoad: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.log.debug("run core migrations(afterLoad)");
           const migrator = this.db.createMigrator({ migrations: migrations.afterLoad });
           await migrator.up();
-        }
+        }, "up")
       }
     };
   }

package/lib/gateway/errors.js

@@ -47,12 +47,12 @@ var import_lodash = __toESM(require("lodash"));
 const errors = {
   APP_NOT_FOUND: {
     status: 404,
-    message: ({ appName }) => `application ${appName} not found`,
+    message: /* @__PURE__ */ __name(({ appName }) => `application ${appName} not found`, "message"),
     maintaining: true
   },
   APP_ERROR: {
     status: 503,
-    message: ({ app }) => {
+    message: /* @__PURE__ */ __name(({ app }) => {
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
       if (!error) {
         return "";
@@ -62,56 +62,56 @@ const errors = {
         message = `${message}: ${error.cause.message}`;
       }
       return message;
-    },
-    code: ({ app }) => {
+    }, "message"),
+    code: /* @__PURE__ */ __name(({ app }) => {
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
       return error["code"] || "APP_ERROR";
-    },
-    command: ({ app }) => app.getMaintaining().command,
+    }, "code"),
+    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command"),
     maintaining: true
   },
   APP_STARTING: {
     status: 503,
-    message: ({ app }) => app.maintainingMessage,
+    message: /* @__PURE__ */ __name(({ app }) => app.maintainingMessage, "message"),
     maintaining: true
   },
   APP_STOPPED: {
     status: 503,
-    message: ({ app }) => `application ${app.name} is stopped`,
+    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is stopped`, "message"),
     maintaining: true
   },
   APP_INITIALIZED: {
     status: 503,
-    message: ({ app }) => `application ${app.name} is initialized, waiting for command`,
+    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is initialized, waiting for command`, "message"),
     maintaining: true
   },
   APP_INITIALIZING: {
     status: 503,
-    message: ({ appName }) => `application ${appName} is initializing`,
+    message: /* @__PURE__ */ __name(({ appName }) => `application ${appName} is initializing`, "message"),
     maintaining: true
   },
   COMMAND_ERROR: {
     status: 503,
     maintaining: true,
-    message: ({ app }) => app.getMaintaining().error.message,
-    command: ({ app }) => app.getMaintaining().command
+    message: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().error.message, "message"),
+    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command")
   },
   COMMAND_END: {
     status: 503,
     maintaining: true,
-    message: ({ app }) => `${app.getMaintaining().command.name} running end`,
-    command: ({ app }) => app.getMaintaining().command
+    message: /* @__PURE__ */ __name(({ app }) => `${app.getMaintaining().command.name} running end`, "message"),
+    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command")
   },
   APP_COMMANDING: {
     status: 503,
     maintaining: true,
-    message: ({ app, message }) => message || app.maintainingMessage,
-    command: ({ app, command }) => command || app.getMaintaining().command
+    message: /* @__PURE__ */ __name(({ app, message }) => message || app.maintainingMessage, "message"),
+    command: /* @__PURE__ */ __name(({ app, command }) => command || app.getMaintaining().command, "command")
   },
   APP_RUNNING: {
     status: 200,
     maintaining: false,
-    message: ({ message, app }) => message || `application ${app.name} is running`
+    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${app.name} is running`, "message")
   },
   UNKNOWN_ERROR: {
     status: 500,

package/lib/gateway/index.js

@@ -36,10 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var gateway_exports = {};
 __export(gateway_exports, {
   Gateway: () => Gateway

package/lib/helper.js

@@ -162,7 +162,7 @@ const enablePerfHooks = /* @__PURE__ */ __name((app) => {
   app.resourcer.define({
     name: "perf",
     actions: {
-      view: async (ctx, next) => {
+      view: /* @__PURE__ */ __name(async (ctx, next) => {
         const result = {};
         const histograms = ctx.app.perfHistograms;
         const sortedHistograms = [...histograms.entries()].sort(([i, a], [j, b]) => b.mean - a.mean);
@@ -171,12 +171,12 @@ const enablePerfHooks = /* @__PURE__ */ __name((app) => {
         });
         ctx.body = result;
         await next();
-      },
-      reset: async (ctx, next) => {
+      }, "view"),
+      reset: /* @__PURE__ */ __name(async (ctx, next) => {
         const histograms = ctx.app.perfHistograms;
         histograms.forEach((histogram) => histogram.reset());
         await next();
-      }
+      }, "reset")
     }
   });
   app.acl.allow("perf", "*", "public");

package/lib/locale/locale.js

@@ -93,7 +93,7 @@ const _Locale = class _Locale {
   }
   async wrapCache(key, fn) {
     return await this.cache.wrapWithCondition(key, fn, {
-      isCacheable: (val) => !import_utils.lodash.isEmpty(val)
+      isCacheable: /* @__PURE__ */ __name((val) => !import_utils.lodash.isEmpty(val), "isCacheable")
     });
   }
   async loadResourcesByLang(lang) {

package/lib/main-data-source.js

@@ -39,9 +39,9 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
     this.collectionManager = this.createCollectionManager({
       collectionManager: {
         database,
-        collectionsFilter: (collection) => {
+        collectionsFilter: /* @__PURE__ */ __name((collection) => {
           return collection.options.loadedFromCollectionManager;
-        }
+        }, "collectionsFilter")
       }
     });
     if (options.useACL !== false) {

package/lib/middlewares/parse-variables.js

@@ -54,10 +54,8 @@ function getUser(ctx) {
 }
 __name(getUser, "getUser");
 function isNumeric(str) {
-  if (typeof str === "number")
-    return true;
-  if (typeof str != "string")
-    return false;
+  if (typeof str === "number") return true;
+  if (typeof str != "string") return false;
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
@@ -69,11 +67,11 @@ const parseVariables = /* @__PURE__ */ __name(async (ctx, next) => {
   ctx.action.params.filter = await (0, import_utils.parseFilter)(filter, {
     timezone: ctx.get("x-timezone"),
     now: (/* @__PURE__ */ new Date()).toISOString(),
-    getField: (path) => {
+    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: {
       // @deprecated
       $system: {

package/lib/plugin-manager/plugin-manager.js

@@ -36,10 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var plugin_manager_exports = {};
 __export(plugin_manager_exports, {
   AddPresetError: () => AddPresetError,
@@ -948,25 +945,25 @@ const _PluginManager = class _PluginManager {
     }
     return {
       beforeLoad: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.app.log.debug("run preset migrations(beforeLoad)");
           const migrator = this.app.db.createMigrator({ migrations: migrations.beforeLoad });
           await migrator.up();
-        }
+        }, "up")
       },
       afterSync: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.app.log.debug("run preset migrations(afterSync)");
           const migrator = this.app.db.createMigrator({ migrations: migrations.afterSync });
           await migrator.up();
-        }
+        }, "up")
       },
       afterLoad: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.app.log.debug("run preset migrations(afterLoad)");
           const migrator = this.app.db.createMigrator({ migrations: migrations.afterLoad });
           await migrator.up();
-        }
+        }, "up")
       }
     };
   }
@@ -993,25 +990,25 @@ const _PluginManager = class _PluginManager {
     }
     return {
       beforeLoad: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.app.log.debug("run others migrations(beforeLoad)");
           const migrator = this.app.db.createMigrator({ migrations: migrations.beforeLoad });
           await migrator.up();
-        }
+        }, "up")
       },
       afterSync: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.app.log.debug("run others migrations(afterSync)");
           const migrator = this.app.db.createMigrator({ migrations: migrations.afterSync });
           await migrator.up();
-        }
+        }, "up")
       },
       afterLoad: {
-        up: async () => {
+        up: /* @__PURE__ */ __name(async () => {
           this.app.log.debug("run others migrations(afterLoad)");
           const migrator = this.app.db.createMigrator({ migrations: migrations.afterLoad });
           await migrator.up();
-        }
+        }, "up")
       }
     };
   }

package/lib/plugin-manager/utils.js

@@ -355,8 +355,7 @@ async function updatePluginByCompressedFileUrl(options) {
 }
 __name(updatePluginByCompressedFileUrl, "updatePluginByCompressedFileUrl");
 async function getNewVersion(plugin) {
-  if (!(plugin.packageName && plugin.registry))
-    return false;
+  if (!(plugin.packageName && plugin.registry)) return false;
   const { version } = await getPluginInfoByNpm({
     packageName: plugin.packageName,
     registry: plugin.registry,
@@ -411,8 +410,7 @@ const isValidPackageName = /* @__PURE__ */ __name((str) => {
   return pattern.test(str);
 }, "isValidPackageName");
 function getPackageNameFromString(str) {
-  if (str.startsWith("."))
-    return null;
+  if (str.startsWith(".")) return null;
   const arr = str.split("/");
   let packageName;
   if (arr[0].startsWith("@")) {
@@ -494,8 +492,7 @@ async function getCompatible(packageName) {
 __name(getCompatible, "getCompatible");
 async function checkCompatible(packageName) {
   const compatible = await getCompatible(packageName);
-  if (!compatible)
-    return false;
+  if (!compatible) return false;
   return compatible.every((item) => item.result);
 }
 __name(checkCompatible, "checkCompatible");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.2.33-alpha",
+    "version": "1.2.35-alpha",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.2.33-alpha",
-        "@nocobase/actions": "1.2.33-alpha",
-        "@nocobase/auth": "1.2.33-alpha",
-        "@nocobase/cache": "1.2.33-alpha",
-        "@nocobase/data-source-manager": "1.2.33-alpha",
-        "@nocobase/database": "1.2.33-alpha",
-        "@nocobase/evaluators": "1.2.33-alpha",
-        "@nocobase/logger": "1.2.33-alpha",
-        "@nocobase/resourcer": "1.2.33-alpha",
-        "@nocobase/sdk": "1.2.33-alpha",
-        "@nocobase/telemetry": "1.2.33-alpha",
-        "@nocobase/utils": "1.2.33-alpha",
+        "@nocobase/acl": "1.2.35-alpha",
+        "@nocobase/actions": "1.2.35-alpha",
+        "@nocobase/auth": "1.2.35-alpha",
+        "@nocobase/cache": "1.2.35-alpha",
+        "@nocobase/data-source-manager": "1.2.35-alpha",
+        "@nocobase/database": "1.2.35-alpha",
+        "@nocobase/evaluators": "1.2.35-alpha",
+        "@nocobase/logger": "1.2.35-alpha",
+        "@nocobase/resourcer": "1.2.35-alpha",
+        "@nocobase/sdk": "1.2.35-alpha",
+        "@nocobase/telemetry": "1.2.35-alpha",
+        "@nocobase/utils": "1.2.35-alpha",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "b161f5e177c51d92fec745e81853c301689a9d6f"
+    "gitHead": "37a4edc27153f9346b3b08c25a407fb57c78b68e"
 }