@nocobase/server 1.3.49-beta → 1.3.51

package/lib/application.d.ts

@@ -165,6 +165,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     private _sqlLogger;
     protected _logger: SystemLogger;
     constructor(options: ApplicationOptions);
+    private static staticCommands;
+    static addCommand(callback: (app: Application) => void): void;
     /**
      * @experimental
      */
@@ -243,6 +245,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @deprecated
      */
     getVersion(): string;
+    getPackageVersion(): string;
     /**
      * This method is deprecated and should not be used.
      * Use {@link #this.pm.addPreset()} instead.

package/lib/application.js

@@ -13,6 +13,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -35,6 +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);
 var application_exports = {};
 __export(application_exports, {
   Application: () => Application,
@@ -122,6 +124,9 @@ const _Application = class _Application extends import_koa.default {
   requestLogger;
   _sqlLogger;
   _logger;
+  static addCommand(callback) {
+    this.staticCommands.push(callback);
+  }
   /**
    * @experimental
    */
@@ -272,6 +277,9 @@ const _Application = class _Application extends import_koa.default {
   getVersion() {
     return import_package.default.version;
   }
+  getPackageVersion() {
+    return import_package.default.version;
+  }
   /**
    * This method is deprecated and should not be used.
    * Use {@link #this.pm.addPreset()} instead.
@@ -844,6 +852,9 @@ const _Application = class _Application extends import_koa.default {
     }
     (0, import_commands.registerCli)(this);
     this._version = new import_application_version.ApplicationVersion(this);
+    for (const callback of _Application.staticCommands) {
+      callback(this);
+    }
   }
   createMainDataSource(options) {
     const mainDataSourceInstance = new import_main_data_source.MainDataSource({
@@ -887,6 +898,7 @@ const _Application = class _Application extends import_koa.default {
   }
 };
 __name(_Application, "Application");
+__publicField(_Application, "staticCommands", []);
 let Application = _Application;
 (0, import_utils.applyMixins)(Application, [import_utils.AsyncEmitter]);
 var application_default = Application;

package/lib/index.d.ts

@@ -6,13 +6,15 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+export * from './app-supervisor';
 export * from './application';
 export { Application as default } from './application';
+export * from './gateway';
 export * as middlewares from './middlewares';
 export * from './migration';
 export * from './plugin';
 export * from './plugin-manager';
-export * from './gateway';
-export * from './app-supervisor';
 export * from './sync-manager';
 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';

package/lib/index.js

@@ -38,29 +38,43 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX,
+  appendToBuiltInPlugins: () => import_findPackageNames.appendToBuiltInPlugins,
   default: () => import_application.Application,
-  middlewares: () => middlewares
+  findAllPlugins: () => import_findPackageNames.findAllPlugins,
+  findBuiltInPlugins: () => import_findPackageNames.findBuiltInPlugins,
+  findLocalPlugins: () => import_findPackageNames.findLocalPlugins,
+  middlewares: () => middlewares,
+  packageNameTrim: () => import_findPackageNames.packageNameTrim,
+  runPluginStaticImports: () => import_run_plugin_static_imports.runPluginStaticImports
 });
 module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./app-supervisor"), module.exports);
 __reExport(src_exports, require("./application"), module.exports);
 var import_application = require("./application");
+__reExport(src_exports, require("./gateway"), module.exports);
 var middlewares = __toESM(require("./middlewares"));
 __reExport(src_exports, require("./migration"), module.exports);
 __reExport(src_exports, require("./plugin"), module.exports);
 __reExport(src_exports, require("./plugin-manager"), module.exports);
-__reExport(src_exports, require("./gateway"), module.exports);
-__reExport(src_exports, require("./app-supervisor"), module.exports);
 __reExport(src_exports, require("./sync-manager"), module.exports);
+var import_findPackageNames = require("./plugin-manager/findPackageNames");
+var import_run_plugin_static_imports = require("./run-plugin-static-imports");
 const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   OFFICIAL_PLUGIN_PREFIX,
+  appendToBuiltInPlugins,
+  findAllPlugins,
+  findBuiltInPlugins,
+  findLocalPlugins,
   middlewares,
+  packageNameTrim,
+  runPluginStaticImports,
+  ...require("./app-supervisor"),
   ...require("./application"),
+  ...require("./gateway"),
   ...require("./migration"),
   ...require("./plugin"),
   ...require("./plugin-manager"),
-  ...require("./gateway"),
-  ...require("./app-supervisor"),
   ...require("./sync-manager")
 });

package/lib/plugin-manager/findPackageNames.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+declare function trim(packageNames: string[]): Promise<any[]>;
+export declare function findPackageNames(): Promise<any[]>;
+export declare function findBuiltInPlugins(): Promise<any[]>;
+export declare function findLocalPlugins(): Promise<any[]>;
+export declare function findAllPlugins(): Promise<any[]>;
+export declare const packageNameTrim: typeof trim;
+export declare function appendToBuiltInPlugins(nameOrPkg: string): Promise<void>;
+export {};

package/lib/plugin-manager/findPackageNames.js

@@ -0,0 +1,183 @@
+/**
+ * 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 __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 __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 findPackageNames_exports = {};
+__export(findPackageNames_exports, {
+  appendToBuiltInPlugins: () => appendToBuiltInPlugins,
+  findAllPlugins: () => findAllPlugins,
+  findBuiltInPlugins: () => findBuiltInPlugins,
+  findLocalPlugins: () => findLocalPlugins,
+  findPackageNames: () => findPackageNames,
+  packageNameTrim: () => packageNameTrim
+});
+module.exports = __toCommonJS(findPackageNames_exports);
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_lodash = __toESM(require("lodash"));
+var import_path = __toESM(require("path"));
+var import__ = require("./");
+function splitNames(name) {
+  return (name || "").split(",").filter(Boolean);
+}
+__name(splitNames, "splitNames");
+async function trim(packageNames) {
+  const nameOrPkgs = import_lodash.default.uniq(packageNames).filter(Boolean);
+  const names = [];
+  for (const nameOrPkg of nameOrPkgs) {
+    const { name, packageName } = await import__.PluginManager.parseName(nameOrPkg);
+    try {
+      await import__.PluginManager.getPackageJson(packageName);
+      names.push(name);
+    } catch (error) {
+    }
+  }
+  return names;
+}
+__name(trim, "trim");
+const excludes = [
+  "@nocobase/plugin-audit-logs",
+  "@nocobase/plugin-backup-restore",
+  "@nocobase/plugin-charts",
+  "@nocobase/plugin-disable-pm-add",
+  "@nocobase/plugin-mobile-client",
+  "@nocobase/plugin-mock-collections",
+  "@nocobase/plugin-multi-app-share-collection",
+  "@nocobase/plugin-notifications",
+  "@nocobase/plugin-snapshot-field",
+  "@nocobase/plugin-workflow-test"
+];
+async function findPackageNames() {
+  const patterns = [
+    "./packages/plugins/*/package.json",
+    "./packages/plugins/*/*/package.json",
+    "./packages/pro-plugins/*/*/package.json",
+    "./storage/plugins/*/package.json",
+    "./storage/plugins/*/*/package.json"
+  ];
+  try {
+    const packageJsonPaths = await (0, import_fast_glob.default)(patterns, {
+      cwd: process.cwd(),
+      absolute: true,
+      ignore: ["**/external-db-data-source/**"]
+    });
+    const packageNames = await Promise.all(
+      packageJsonPaths.map(async (packageJsonPath) => {
+        const packageJson = await import_fs_extra.default.readJson(packageJsonPath);
+        return packageJson.name;
+      })
+    );
+    const nocobasePlugins = await findNocobasePlugins();
+    const { APPEND_PRESET_BUILT_IN_PLUGINS = "", APPEND_PRESET_LOCAL_PLUGINS = "" } = process.env;
+    return trim(
+      packageNames.filter((pkg) => pkg && !excludes.includes(pkg)).concat(nocobasePlugins).concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS))
+    );
+  } catch (error) {
+    return [];
+  }
+}
+__name(findPackageNames, "findPackageNames");
+async function getPackageJson() {
+  const packageJson = await import_fs_extra.default.readJson(
+    import_path.default.resolve(process.env.NODE_MODULES_PATH, "@nocobase/preset-nocobase/package.json")
+  );
+  return packageJson;
+}
+__name(getPackageJson, "getPackageJson");
+async function findNocobasePlugins() {
+  try {
+    const packageJson = await getPackageJson();
+    const pluginNames = Object.keys(packageJson.dependencies).filter((name) => name.startsWith("@nocobase/plugin-"));
+    return trim(pluginNames.filter((pkg) => pkg && !excludes.includes(pkg)));
+  } catch (error) {
+    return [];
+  }
+}
+__name(findNocobasePlugins, "findNocobasePlugins");
+async function findBuiltInPlugins() {
+  const { APPEND_PRESET_BUILT_IN_PLUGINS = "" } = process.env;
+  try {
+    const packageJson = await getPackageJson();
+    return trim(packageJson.builtIn.concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)));
+  } catch (error) {
+    return [];
+  }
+}
+__name(findBuiltInPlugins, "findBuiltInPlugins");
+async function findLocalPlugins() {
+  const { APPEND_PRESET_LOCAL_PLUGINS = "" } = process.env;
+  const plugins1 = await findNocobasePlugins();
+  const plugins2 = await findPackageNames();
+  const builtInPlugins = await findBuiltInPlugins();
+  const packageJson = await getPackageJson();
+  const items = await trim(
+    import_lodash.default.difference(
+      plugins1.concat(plugins2).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS)),
+      builtInPlugins.concat(await trim(packageJson.deprecated))
+    )
+  );
+  return items;
+}
+__name(findLocalPlugins, "findLocalPlugins");
+async function findAllPlugins() {
+  const builtInPlugins = await findBuiltInPlugins();
+  const localPlugins = await findLocalPlugins();
+  return import_lodash.default.uniq(builtInPlugins.concat(localPlugins));
+}
+__name(findAllPlugins, "findAllPlugins");
+const packageNameTrim = trim;
+async function appendToBuiltInPlugins(nameOrPkg) {
+  const APPEND_PRESET_BUILT_IN_PLUGINS = process.env.APPEND_PRESET_BUILT_IN_PLUGINS || "";
+  const keys = APPEND_PRESET_BUILT_IN_PLUGINS.split(",");
+  const { name, packageName } = await import__.PluginManager.parseName(nameOrPkg);
+  if (keys.includes(packageName)) {
+    return;
+  }
+  if (keys.includes(name)) {
+    return;
+  }
+  process.env.APPEND_PRESET_BUILT_IN_PLUGINS += "," + nameOrPkg;
+}
+__name(appendToBuiltInPlugins, "appendToBuiltInPlugins");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  appendToBuiltInPlugins,
+  findAllPlugins,
+  findBuiltInPlugins,
+  findLocalPlugins,
+  findPackageNames,
+  packageNameTrim
+});

package/lib/run-plugin-static-imports.d.ts

@@ -0,0 +1 @@
+export declare function runPluginStaticImports(): Promise<void>;

package/lib/run-plugin-static-imports.js

@@ -0,0 +1,52 @@
+/**
+ * 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 run_plugin_static_imports_exports = {};
+__export(run_plugin_static_imports_exports, {
+  runPluginStaticImports: () => runPluginStaticImports
+});
+module.exports = __toCommonJS(run_plugin_static_imports_exports);
+var import_server = require("@nocobase/server");
+async function runPluginStaticImports() {
+  const packages = await (0, import_server.findAllPlugins)();
+  for (const name of packages) {
+    const { packageName } = await import_server.PluginManager.parseName(name);
+    try {
+      const plugin = require(packageName);
+      if (plugin && plugin.staticImport) {
+        await plugin.staticImport();
+      }
+    } catch (error) {
+      continue;
+    }
+  }
+}
+__name(runPluginStaticImports, "runPluginStaticImports");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  runPluginStaticImports
+});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.3.49-beta",
+    "version": "1.3.51",
     "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.3.49-beta",
-        "@nocobase/actions": "1.3.49-beta",
-        "@nocobase/auth": "1.3.49-beta",
-        "@nocobase/cache": "1.3.49-beta",
-        "@nocobase/data-source-manager": "1.3.49-beta",
-        "@nocobase/database": "1.3.49-beta",
-        "@nocobase/evaluators": "1.3.49-beta",
-        "@nocobase/logger": "1.3.49-beta",
-        "@nocobase/resourcer": "1.3.49-beta",
-        "@nocobase/sdk": "1.3.49-beta",
-        "@nocobase/telemetry": "1.3.49-beta",
-        "@nocobase/utils": "1.3.49-beta",
+        "@nocobase/acl": "1.3.51",
+        "@nocobase/actions": "1.3.51",
+        "@nocobase/auth": "1.3.51",
+        "@nocobase/cache": "1.3.51",
+        "@nocobase/data-source-manager": "1.3.51",
+        "@nocobase/database": "1.3.51",
+        "@nocobase/evaluators": "1.3.51",
+        "@nocobase/logger": "1.3.51",
+        "@nocobase/resourcer": "1.3.51",
+        "@nocobase/sdk": "1.3.51",
+        "@nocobase/telemetry": "1.3.51",
+        "@nocobase/utils": "1.3.51",
         "@types/decompress": "4.2.7",
         "@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": "46dde74e2c220ae19bc275bb40be9ddf52485fa9"
+    "gitHead": "01f2b933a0681d99c5928d91d41f3f0c0ecae988"
 }