@tego/core 1.3.54-alpha.4 → 1.3.54-alpha.6

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

@@ -400,6 +400,24 @@ const _PluginManager = class _PluginManager {
       }
     }
     current = 0;
+    for (const [P, plugin] of this.getPlugins()) {
+      if (plugin.state.loaded) {
+        continue;
+      }
+      const name = plugin.name || P.name;
+      current += 1;
+      this.app.setMaintainingMessage(`loading collections for plugin [${name}], ${current}/${total}`);
+      if (!plugin.enabled) {
+        continue;
+      }
+      this.app.logger.debug(`load collections for plugin [${name}]`, {
+        submodule: "plugin-manager",
+        method: "load",
+        name
+      });
+      await plugin.loadCollections();
+    }
+    current = 0;
     for (const [P, plugin] of this.getPlugins()) {
       if (plugin.state.loaded) {
         continue;
@@ -412,7 +430,6 @@ const _PluginManager = class _PluginManager {
       }
       await this.app.emitAsync("beforeLoadPlugin", plugin, options);
       this.app.logger.debug(`load plugin [${name}] `, { submodule: "plugin-manager", method: "load", name });
-      await plugin.loadCollections();
       await plugin.load();
       plugin.state.loaded = true;
       await this.app.emitAsync("afterLoadPlugin", plugin, options);

package/lib/plugin.js

@@ -192,16 +192,31 @@ const _Plugin = class _Plugin {
       return;
     }
     const resolvedPath = (0, import_helper.resolveRequest)(this.options.packageName);
-    const directory = (0, import_node_path.resolve)(resolvedPath, "../../server/collections");
+    const possiblePaths = [
+      (0, import_node_path.resolve)(resolvedPath, "../server/collections"),
+      // src/index.ts -> src/server/collections
+      (0, import_node_path.resolve)(resolvedPath, "../../server/collections"),
+      // dist/index.js -> dist/../server/collections
+      (0, import_node_path.resolve)(resolvedPath, "../../src/server/collections")
+      // dist/index.js -> dist/../src/server/collections
+    ];
+    let directory = null;
+    for (const path of possiblePaths) {
+      if (await (0, import_utils.fsExists)(path)) {
+        directory = path;
+        break;
+      }
+    }
     this.app.logger.debug(`[Plugin.loadCollections] Loading collections for ${this.getName()}`, {
       submodule: "Plugin",
       method: "loadCollections",
       packageName: this.options.packageName,
       resolvedPath,
       collectionsDirectory: directory,
-      directoryExists: await (0, import_utils.fsExists)(directory)
+      directoryExists: !!directory,
+      triedPaths: possiblePaths
     });
-    if (await (0, import_utils.fsExists)(directory)) {
+    if (directory) {
       await this.db.import({
         directory,
         from: this.options.packageName
@@ -211,12 +226,15 @@ const _Plugin = class _Plugin {
         method: "loadCollections"
       });
     } else {
-      this.app.logger.warn(`[Plugin.loadCollections] Collections directory not found: ${directory}`, {
-        submodule: "Plugin",
-        method: "loadCollections",
-        packageName: this.options.packageName,
-        resolvedPath
-      });
+      this.app.logger.warn(
+        `[Plugin.loadCollections] Collections directory not found. Tried paths: ${possiblePaths.join(", ")}`,
+        {
+          submodule: "Plugin",
+          method: "loadCollections",
+          packageName: this.options.packageName,
+          resolvedPath
+        }
+      );
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tego/core",
-  "version": "1.3.54-alpha.4",
+  "version": "1.3.54-alpha.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -31,18 +31,18 @@
     "winston": "^3.17.0",
     "ws": "^8.18.3",
     "xpipe": "^1.0.8",
-    "@tachybase/actions": "1.3.54-alpha.4",
-    "@tachybase/auth": "1.3.54-alpha.4",
-    "@tachybase/acl": "1.3.54-alpha.4",
-    "@tachybase/cache": "1.3.54-alpha.4",
-    "@tachybase/database": "1.3.54-alpha.4",
-    "@tachybase/data-source": "1.3.54-alpha.4",
-    "@tachybase/globals": "1.3.54-alpha.4",
-    "@tachybase/loader": "1.3.54-alpha.4",
-    "@tachybase/di": "1.3.54-alpha.4",
-    "@tachybase/logger": "1.3.54-alpha.4",
-    "@tachybase/utils": "1.3.54-alpha.4",
-    "@tachybase/resourcer": "1.3.54-alpha.4"
+    "@tachybase/auth": "1.3.54-alpha.6",
+    "@tachybase/acl": "1.3.54-alpha.6",
+    "@tachybase/actions": "1.3.54-alpha.6",
+    "@tachybase/cache": "1.3.54-alpha.6",
+    "@tachybase/database": "1.3.54-alpha.6",
+    "@tachybase/data-source": "1.3.54-alpha.6",
+    "@tachybase/di": "1.3.54-alpha.6",
+    "@tachybase/loader": "1.3.54-alpha.6",
+    "@tachybase/logger": "1.3.54-alpha.6",
+    "@tachybase/utils": "1.3.54-alpha.6",
+    "@tachybase/globals": "1.3.54-alpha.6",
+    "@tachybase/resourcer": "1.3.54-alpha.6"
   },
   "devDependencies": {
     "@types/fs-extra": "11.0.4",