@nocobase/server 2.1.0-beta.9 → 2.2.0-beta.1

package/lib/locale/locale.js

@@ -41,8 +41,8 @@ __export(locale_exports, {
 });
 module.exports = __toCommonJS(locale_exports);
 var import_utils = require("@nocobase/utils");
+var import_constants = require("../constants");
 var import_resource = require("./resource");
-var import__ = require("..");
 var import_deepmerge = __toESM(require("deepmerge"));
 const _Locale = class _Locale {
   app;
@@ -52,6 +52,7 @@ const _Locale = class _Locale {
   resourceCached = /* @__PURE__ */ new Map();
   i18nInstances = /* @__PURE__ */ new Map();
   resourceStorers = new import_utils.Registry();
+  sources = new import_utils.Registry();
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
@@ -92,6 +93,25 @@ const _Locale = class _Locale {
   registerResourceStorer(name, storer) {
     this.resourceStorers.register(name, storer);
   }
+  registerSource(name, source) {
+    this.sources.register(name, source);
+  }
+  async syncSources(ctx, types) {
+    const resources = { client: {} };
+    const sources = Array.from(this.sources.getKeys());
+    const syncSources = sources.filter((source) => types.includes(source) && this.sources.get(source).sync);
+    const promises = syncSources.map((source) => this.sources.get(source).sync(ctx));
+    const results = await Promise.all(promises);
+    return results.reduce((result, resource) => {
+      Object.entries(resource).forEach(([module2, texts]) => {
+        result[module2] = {
+          ...result[module2] || {},
+          ...texts
+        };
+      });
+      return result;
+    }, resources);
+  }
   async get(lang) {
     const defaults = {
       resources: await this.getCacheResources(lang)
@@ -124,7 +144,7 @@ const _Locale = class _Locale {
     }
     return await this.wrapCache(`resources:${lang}`, () => this.getResources(lang));
   }
-  async getResources(lang) {
+  async getBuiltInResources(lang) {
     var _a;
     const resources = {};
     const names = this.app.pm.getPlugins().keys();
@@ -141,13 +161,17 @@ const _Locale = class _Locale {
         const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
-          if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {
-            resources[packageName.substring(import__.OFFICIAL_PLUGIN_PREFIX.length)] = { ...res };
+          if (packageName.includes(import_constants.OFFICIAL_PLUGIN_PREFIX)) {
+            resources[packageName.substring(import_constants.OFFICIAL_PLUGIN_PREFIX.length)] = { ...res };
           }
         }
       } catch (err) {
       }
     }
+    return resources;
+  }
+  async getResources(lang) {
+    const resources = await this.getBuiltInResources(lang);
     const storers = this.resourceStorers.getValues();
     for (const storer of storers) {
       const custom = await storer.getResources(lang);
@@ -156,7 +180,7 @@ const _Locale = class _Locale {
         const resource = resources[module2];
         const customResource = custom[key];
         resources[module2] = resource ? (0, import_deepmerge.default)(resource, customResource) : customResource;
-        const pkgName = `${import__.OFFICIAL_PLUGIN_PREFIX}${module2}`;
+        const pkgName = `${import_constants.OFFICIAL_PLUGIN_PREFIX}${module2}`;
         if (resources[pkgName]) {
           resources[pkgName] = { ...resources[module2] };
         }

package/lib/main-data-source.js

@@ -96,6 +96,7 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
         const results = await this.tables2Collections(toAddTables);
         const values = results.map((result) => ({
           ...result,
+          from: "dbsync",
           underscored: false
         }));
         await repo.create({ values, context: ctx });
@@ -115,14 +116,16 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
         ...filter
       }
     });
-    const collections = loadedCollections.filter((collection) => {
-      var _a;
-      return ((_a = collection.options) == null ? void 0 : _a.from) !== "db2cm";
-    });
+    const collections = loadedCollections.filter(
+      (collection) => {
+        var _a;
+        return !["db2cm", "dbsync"].includes((_a = collection.options) == null ? void 0 : _a.from);
+      }
+    );
     const loadedData = {};
     for (const collection of collections) {
       const c = db.getCollection(collection.name);
-      loadedData[c.tableName()] = {
+      loadedData[c.model.tableName] = {
         ...collection.toJSON(),
         fields: collection.fields.map((field) => {
           const f = c.getField(field.name);
@@ -155,7 +158,11 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
       ctx.log.error(err);
     }
     const toLoadCollections = this.mergeWithLoadedCollections(collections, loadedCollections);
+    const currentSchema = process.env.COLLECTION_MANAGER_SCHEMA || db.options.schema || "public";
     for (const values of toLoadCollections) {
+      if (values.schema === currentSchema) {
+        delete values.schema;
+      }
       const existsFields = loadedCollections[values.tableName].fields;
       const deletedFields = existsFields.filter((field) => !values.fields.find((f) => f.name === field.name));
       await db.sequelize.transaction(async (transaction) => {

package/lib/plugin-manager/constants.js

@@ -38,7 +38,7 @@ module.exports = __toCommonJS(constants_exports);
 const APP_NAME = "nocobase";
 const DEFAULT_PLUGIN_STORAGE_PATH = "storage/plugins";
 const DEFAULT_PLUGIN_PATH = "packages/plugins/";
-const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
+const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-").split(",");
 const requireRegex = /require\s*\(['"`](.*?)['"`]\)/g;
 const importRegex = /^import(?:['"\s]*([\w*${}\s,]+)from\s*)?['"\s]['"\s](.*[@\w_-]+)['"\s].*/gm;
 const EXTERNAL = [

package/lib/plugin-manager/deps.js

@@ -44,7 +44,7 @@ const deps = {
   mathjs: "15.x",
   winston: "3.x",
   "winston-daily-rotate-file": "4.x",
-  koa: "2.x",
+  koa: "3.x",
   "@koa/cors": "5.x",
   "@koa/router": "13.x",
   multer: "1.x",
@@ -76,6 +76,7 @@ const deps = {
   lodash: "4.x",
   "china-division": "2.x",
   cronstrue: "2.x",
-  "@nocobase/license-kit": "0.3.x"
+  "@nocobase/license-kit": "0.3.x",
+  joi: "17.x"
 };
 var deps_default = deps;

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

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

package/lib/plugin-manager/findPackageNames.js

@@ -45,24 +45,17 @@ __export(findPackageNames_exports, {
   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_plugin_package = require("../../../utils/plugin-package");
 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);
+    const { name, packageName } = await (0, import_plugin_package.parsePluginName)(nameOrPkg, {
+      nodeModulesPath: process.env.NODE_MODULES_PATH
+    });
+    if (await (0, import_plugin_package.resolvePluginPackagePath)(packageName)) {
       names.push(name);
-    } catch (error) {
     }
   }
   return names;
@@ -81,75 +74,57 @@ const excludes = [
   "@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 packages = await (0, import_plugin_package.discoverPluginPackages)({
+      nodeModulesPath: process.env.NODE_MODULES_PATH
     });
-    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))
-    );
+    return trim(packages.filter((pkg) => !excludes.includes(pkg.packageName)).map((pkg) => pkg.packageName));
   } 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")
-  );
+  const packageJson = await (0, import_plugin_package.getPresetNocoBasePackageJson)({
+    nodeModulesPath: process.env.NODE_MODULES_PATH
+  });
+  if (!packageJson) {
+    throw new Error("Cannot find @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)));
+    return trim((packageJson.builtIn || []).concat((0, import_plugin_package.splitPluginNames)(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(
+  const packages = await (0, import_plugin_package.discoverPluginPackages)({
+    nodeModulesPath: process.env.NODE_MODULES_PATH
+  });
+  const builtInPackageNames = await Promise.all(
+    (packageJson.builtIn || []).concat((0, import_plugin_package.splitPluginNames)(process.env.APPEND_PRESET_BUILT_IN_PLUGINS || "")).map(
+      async (nameOrPkg) => (await (0, import_plugin_package.parsePluginName)(nameOrPkg, { nodeModulesPath: process.env.NODE_MODULES_PATH })).packageName
+    )
+  );
+  const deprecatedPackageNames = await Promise.all(
+    (packageJson.deprecated || []).map(
+      async (nameOrPkg) => (await (0, import_plugin_package.parsePluginName)(nameOrPkg, { nodeModulesPath: process.env.NODE_MODULES_PATH })).packageName
+    )
+  );
+  return trim(
     import_lodash.default.difference(
-      plugins1.concat(plugins2).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS)),
-      builtInPlugins.concat(await trim(packageJson.deprecated))
+      packages.filter((pkg) => !excludes.includes(pkg.packageName)).map((pkg) => pkg.packageName),
+      import_lodash.default.uniq(builtInPackageNames.concat(deprecatedPackageNames))
     )
   );
-  return items;
 }
 __name(findLocalPlugins, "findLocalPlugins");
 async function findAllPlugins() {
@@ -161,8 +136,10 @@ __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);
+  const keys = (0, import_plugin_package.splitPluginNames)(APPEND_PRESET_BUILT_IN_PLUGINS);
+  const { name, packageName } = await (0, import_plugin_package.parsePluginName)(nameOrPkg, {
+    nodeModulesPath: process.env.NODE_MODULES_PATH
+  });
   if (keys.includes(packageName)) {
     return;
   }

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

@@ -32,6 +32,7 @@ module.exports = __toCommonJS(collection_exports);
 var import_database = require("@nocobase/database");
 var collection_default = (0, import_database.defineCollection)({
   name: "applicationPlugins",
+  dataCategory: "system",
   dumpRules: "required",
   migrationRules: ["overwrite", "schema-only"],
   repository: "PluginManagerRepository",

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

@@ -6,6 +6,16 @@
  * 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 type PluginClientLane = 'client' | 'client-v2';
+export declare class PackageUrls {
+    static items: Record<string, string | undefined>;
+    static clear(): void;
+    static getCacheKey(packageName: string, lane: PluginClientLane): string;
+    static get(packageName: string, lane?: PluginClientLane): Promise<string>;
+    static getAppDevUrl(packageName: string, lane: PluginClientLane): string;
+    static hasClientEntry(packageName: string, lane: PluginClientLane): Promise<boolean>;
+    static fetch(packageName: string, lane?: PluginClientLane): Promise<string>;
+}
 declare const _default: {
     name: string;
     actions: {
@@ -15,8 +25,9 @@ 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>;
     };
 };