@nocobase/server 2.1.0-alpha.4 → 2.1.0-alpha.45

package/lib/helper.js

@@ -239,14 +239,46 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function getFieldFromCollectionManager(ctx, resourceName, fieldPath) {
+  var _a;
+  const collectionManager = (_a = ctx.dataSource) == null ? void 0 : _a.collectionManager;
+  if (!(collectionManager == null ? void 0 : collectionManager.getCollection)) {
+    return;
+  }
+  const collection = collectionManager.getCollection(resourceName);
+  if (!(collection == null ? void 0 : collection.getField)) {
+    return;
+  }
+  const [firstName, ...others] = fieldPath.split(".");
+  let field = collection.getField(firstName);
+  if (!field || !others.length) {
+    return field;
+  }
+  let currentCollection = typeof field.targetCollection === "function" ? field.targetCollection() : field.targetCollection;
+  for (const name of others) {
+    if (!(currentCollection == null ? void 0 : currentCollection.getField)) {
+      return;
+    }
+    field = currentCollection.getField(name);
+    if (!field) {
+      return;
+    }
+    currentCollection = typeof field.targetCollection === "function" ? field.targetCollection() : field.targetCollection;
+  }
+  return field;
+}
+__name(getFieldFromCollectionManager, "getFieldFromCollectionManager");
 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;
+      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
+      if (!ctx.database) {
+        return getFieldFromCollectionManager(ctx, resourceName, fieldPath);
+      }
       return ctx.database.getFieldByPath(`${resourceName}.${fieldPath}`);
     }, "getField"),
     vars: {

package/lib/index.d.ts

@@ -20,9 +20,11 @@ export * from './plugin-manager';
 export * from './pub-sub-manager';
 export * from './event-queue';
 export * from './worker-id-allocator';
+export * from './worker-mode';
 export * from './redis-connection-manager';
 export * from './main-data-source';
-export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
+export * from './constants';
+export type { LocaleSource, LocaleSourceText } from './locale';
 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

@@ -37,7 +37,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins: () => import_findPackageNames.appendToBuiltInPlugins,
   createContextVariablesScope: () => import_helper.createContextVariablesScope,
   default: () => import_application.Application,
@@ -63,15 +62,15 @@ __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("./worker-id-allocator"), module.exports);
+__reExport(src_exports, require("./worker-mode"), module.exports);
 __reExport(src_exports, require("./redis-connection-manager"), module.exports);
 __reExport(src_exports, require("./main-data-source"), module.exports);
+__reExport(src_exports, require("./constants"), 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,
@@ -92,6 +91,8 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./pub-sub-manager"),
   ...require("./event-queue"),
   ...require("./worker-id-allocator"),
+  ...require("./worker-mode"),
   ...require("./redis-connection-manager"),
-  ...require("./main-data-source")
+  ...require("./main-data-source"),
+  ...require("./constants")
 });

package/lib/locale/locale.d.ts

@@ -15,6 +15,24 @@ export interface ResourceStorer {
     }>;
     reset?: () => Promise<void>;
 }
+export type LocaleSourceText = {
+    text: string;
+    module: string;
+};
+export type LocaleSource = {
+    title: string;
+    sync?: (ctx: any) => Promise<{
+        [module: string]: {
+            [text: string]: string;
+        };
+    }>;
+    namespace?: string;
+    collections?: {
+        collection: string;
+        fields?: string[];
+        getTexts?: (instance: any, options?: any) => LocaleSourceText[] | Promise<LocaleSourceText[]>;
+    }[];
+};
 export declare class Locale {
     app: Application;
     cache: Cache;
@@ -23,18 +41,24 @@ export declare class Locale {
     resourceCached: Map<any, any>;
     i18nInstances: Map<any, any>;
     resourceStorers: Registry<ResourceStorer>;
+    sources: Registry<LocaleSource>;
     constructor(app: Application);
     load(): Promise<void>;
     reset(): Promise<void>;
     reload(): Promise<void>;
     setLocaleFn(name: string, fn: (lang: string) => Promise<any>): void;
     registerResourceStorer(name: string, storer: ResourceStorer): void;
+    registerSource(name: string, source: LocaleSource): void;
+    syncSources(ctx: any, types: string[]): Promise<{
+        [module: string]: any;
+    }>;
     get(lang: string): Promise<{
         resources: any;
     }>;
     wrapCache(key: string, fn: () => any): Promise<any>;
     loadResourcesByLang(lang: string): Promise<void>;
     getCacheResources(lang: string): Promise<any>;
+    getBuiltInResources(lang: string): Promise<{}>;
     getResources(lang: string): Promise<{}>;
     getI18nInstance(lang: string): Promise<any>;
 }

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/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.js

@@ -46,6 +46,7 @@ __export(findPackageNames_exports, {
 });
 module.exports = __toCommonJS(findPackageNames_exports);
 var import_fast_glob = __toESM(require("fast-glob"));
+var import_utils = require("@nocobase/utils");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
@@ -81,12 +82,13 @@ const excludes = [
   "@nocobase/plugin-workflow-test"
 ];
 async function findPackageNames() {
+  const pluginStoragePath = (0, import_utils.resolvePluginStoragePath)();
   const patterns = [
     "./packages/plugins/*/package.json",
     "./packages/plugins/*/*/package.json",
     "./packages/pro-plugins/*/*/package.json",
-    "./storage/plugins/*/package.json",
-    "./storage/plugins/*/*/package.json"
+    import_path.default.join(pluginStoragePath, "*/package.json"),
+    import_path.default.join(pluginStoragePath, "*/*/package.json")
   ];
   try {
     const packageJsonPaths = await (0, import_fast_glob.default)(patterns, {

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>;
     };
 };