@nocobase/server 2.1.0-alpha.16 → 2.1.0-alpha.17

package/lib/app-supervisor/app-options-factory.d.ts

@@ -16,6 +16,7 @@ export declare const appOptionsFactory: (appName: string, mainApp: Application,
         migrator?: any;
         usingBigIntForId?: boolean;
         underscored?: boolean;
+        rawTimezone?: string;
         logger?: import("@nocobase/logger/lib/logger").Logger | import("@nocobase/logger/lib/logger").LoggerOptions;
         customHooks?: any;
         instanceId?: string;

package/lib/commands/pm.js

@@ -32,35 +32,12 @@ __export(pm_exports, {
 module.exports = __toCommonJS(pm_exports);
 var import_app_supervisor = require("../app-supervisor");
 var import_plugin_command_error = require("../errors/plugin-command-error");
-var import_plugin_manager = require("../plugin-manager");
-var import_findPackageNames = require("../plugin-manager/findPackageNames");
+var import_utils = require("../plugin-manager/utils");
 /* istanbul ignore file -- @preserve */
 var pm_default = /* @__PURE__ */ __name((app) => {
   const pm = app.command("pm");
   pm.command("list").action(async () => {
-    const plugins1 = await (0, import_findPackageNames.findBuiltInPlugins)();
-    const plugins2 = await (0, import_findPackageNames.findLocalPlugins)();
-    let enabledPlugins = [];
-    try {
-      enabledPlugins = (await app.pm.repository.find({
-        filter: {
-          enabled: true
-        }
-      })).map((item) => item.packageName);
-    } catch (error) {
-    }
-    const items = await Promise.all(
-      [...plugins1, ...plugins2].map(async (name) => {
-        const item = await import_plugin_manager.PluginManager.parseName(name);
-        const json = await import_plugin_manager.PluginManager.getPackageJson(item.packageName);
-        return {
-          displayName: json.displayName || name,
-          packageName: item.packageName,
-          enabled: enabledPlugins.includes(item.packageName),
-          description: json.description
-        };
-      })
-    );
+    const items = await (0, import_utils.pmListSummary)(app);
     console.log("--- BEGIN_PLUGIN_LIST_JSON ---");
     console.log(JSON.stringify(items));
     console.log("--- END_PLUGIN_LIST_JSON ---");

package/lib/plugin-manager/options/resource.d.ts

@@ -24,7 +24,7 @@ declare const _default: {
         enable(ctx: any, next: any): Promise<void>;
         disable(ctx: any, next: any): Promise<void>;
         remove(ctx: any, next: any): Promise<void>;
-        list(ctx: any, next: any): Promise<void>;
+        list(ctx: any, next: any): Promise<any>;
         listEnabled(ctx: any, next: any): Promise<void>;
         listEnabledV2(ctx: any, next: any): Promise<void>;
         get(ctx: any, next: any): Promise<void>;

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

@@ -48,6 +48,7 @@ var import_fs = __toESM(require("fs"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_crypto = __toESM(require("crypto"));
+var import_utils2 = require("../utils");
 var import_package = __toESM(require("../../../package.json"));
 const PLUGIN_CLIENT_ENTRY_FILES = {
   client: "dist/client/index.js",
@@ -240,6 +241,11 @@ var resource_default = {
       await next();
     },
     async list(ctx, next) {
+      const { mode } = ctx.action.params;
+      if (mode === "summary") {
+        ctx.body = await (0, import_utils2.pmListSummary)(ctx.app);
+        return next();
+      }
       const locale = ctx.getCurrentLocale();
       const pm = ctx.app.pm;
       const plugin = pm.get("nocobase");

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

@@ -9,6 +9,7 @@
 import { AxiosRequestConfig } from 'axios';
 import { PluginManagerRepository } from './plugin-manager-repository';
 import { PluginData } from './types';
+import Application from '../application';
 /**
  * get temp dir
  *
@@ -112,4 +113,10 @@ export declare function checkAndGetCompatible(packageName: string): Promise<{
     depsCompatible: DepCompatible[];
 }>;
 export declare function getPluginBasePath(packageName: string): Promise<string>;
+export declare function pmListSummary(app: Application): Promise<{
+    displayName: any;
+    packageName: any;
+    enabled: boolean;
+    description: any;
+}[]>;
 export {};

package/lib/plugin-manager/utils.js

@@ -65,6 +65,7 @@ __export(utils_exports, {
   getTempDir: () => getTempDir,
   isNotBuiltinModule: () => isNotBuiltinModule,
   isValidPackageName: () => isValidPackageName,
+  pmListSummary: () => pmListSummary,
   readJSONFileContent: () => readJSONFileContent,
   removePluginPackage: () => removePluginPackage,
   removeRequireCache: () => removeRequireCache,
@@ -88,6 +89,8 @@ var import_semver = __toESM(require("semver"));
 var import_clientStaticUtils = require("./clientStaticUtils");
 var import_constants = require("./constants");
 var import_deps = __toESM(require("./deps"));
+var import_findPackageNames = require("./findPackageNames");
+var import_plugin_manager = __toESM(require("./plugin-manager"));
 /* istanbul ignore next -- @preserve */
 async function getTempDir() {
   const temporaryDirectory = await import_fs_extra.default.realpath(import_os.default.tmpdir());
@@ -525,6 +528,33 @@ async function getPluginBasePath(packageName) {
   return import_path.default.dirname(import_path.default.dirname(file));
 }
 __name(getPluginBasePath, "getPluginBasePath");
+async function pmListSummary(app) {
+  const plugins1 = await (0, import_findPackageNames.findBuiltInPlugins)();
+  const plugins2 = await (0, import_findPackageNames.findLocalPlugins)();
+  let enabledPlugins = [];
+  try {
+    enabledPlugins = (await app.pm.repository.find({
+      filter: {
+        enabled: true
+      }
+    })).map((item) => item.packageName);
+  } catch (error) {
+  }
+  const items = await Promise.all(
+    [...plugins1, ...plugins2].map(async (name) => {
+      const item = await import_plugin_manager.default.parseName(name);
+      const json = await import_plugin_manager.default.getPackageJson(item.packageName);
+      return {
+        displayName: json.displayName || name,
+        packageName: item.packageName,
+        enabled: enabledPlugins.includes(item.packageName),
+        description: json.description
+      };
+    })
+  );
+  return items;
+}
+__name(pmListSummary, "pmListSummary");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkAndGetCompatible,
@@ -555,6 +585,7 @@ __name(getPluginBasePath, "getPluginBasePath");
   getTempDir,
   isNotBuiltinModule,
   isValidPackageName,
+  pmListSummary,
   readJSONFileContent,
   removePluginPackage,
   removeRequireCache,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.16",
+  "version": "2.1.0-alpha.17",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.0-alpha.16",
-    "@nocobase/actions": "2.1.0-alpha.16",
-    "@nocobase/ai": "2.1.0-alpha.16",
-    "@nocobase/auth": "2.1.0-alpha.16",
-    "@nocobase/cache": "2.1.0-alpha.16",
-    "@nocobase/data-source-manager": "2.1.0-alpha.16",
-    "@nocobase/database": "2.1.0-alpha.16",
-    "@nocobase/evaluators": "2.1.0-alpha.16",
-    "@nocobase/lock-manager": "2.1.0-alpha.16",
-    "@nocobase/logger": "2.1.0-alpha.16",
-    "@nocobase/resourcer": "2.1.0-alpha.16",
-    "@nocobase/sdk": "2.1.0-alpha.16",
-    "@nocobase/snowflake-id": "2.1.0-alpha.16",
-    "@nocobase/telemetry": "2.1.0-alpha.16",
-    "@nocobase/utils": "2.1.0-alpha.16",
+    "@nocobase/acl": "2.1.0-alpha.17",
+    "@nocobase/actions": "2.1.0-alpha.17",
+    "@nocobase/ai": "2.1.0-alpha.17",
+    "@nocobase/auth": "2.1.0-alpha.17",
+    "@nocobase/cache": "2.1.0-alpha.17",
+    "@nocobase/data-source-manager": "2.1.0-alpha.17",
+    "@nocobase/database": "2.1.0-alpha.17",
+    "@nocobase/evaluators": "2.1.0-alpha.17",
+    "@nocobase/lock-manager": "2.1.0-alpha.17",
+    "@nocobase/logger": "2.1.0-alpha.17",
+    "@nocobase/resourcer": "2.1.0-alpha.17",
+    "@nocobase/sdk": "2.1.0-alpha.17",
+    "@nocobase/snowflake-id": "2.1.0-alpha.17",
+    "@nocobase/telemetry": "2.1.0-alpha.17",
+    "@nocobase/utils": "2.1.0-alpha.17",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "14cf3dbdb9f0a9669602de4ad21a9464fa27c105"
+  "gitHead": "586cb00f56557e66168b9720d0e0193a1b752067"
 }