@bsb/base 9.0.0 → 9.0.1

package/lib/serviceBase/plugins.js

@@ -53,19 +53,107 @@ class SBPlugins {
     nodeModulesPluginDir;
     referencedPluginDir = null;
     devMode;
+    static MINOR_SELECTOR_REGEX = /^\d+\.\d+$/;
+    static EXACT_VERSION_REGEX = /^\d+\.\d+\.\d+$/;
+    static SEMVER_REGEX = /^(\d+)\.(\d+)\.(\d+)$/;
     constructor(cwd, devMode) {
         this.cwd = cwd;
         this.devMode = devMode;
         this.nodeModulesPluginDir = (0, node_path_1.join)(this.cwd, "./node_modules/");
-        if (typeof process.env.BSB_PLUGIN_DIR == "string" &&
-            process.env.BSB_PLUGIN_DIR.length > 3) {
-            if (!(0, node_fs_1.existsSync)(process.env.BSB_PLUGIN_DIR)) {
-                throw new Error(`Plugin directory ${process.env.BSB_PLUGIN_DIR} does not exist`);
+        const pluginDirEnv = process.env.BSB_PLUGINS_DIR ?? process.env.BSB_PLUGIN_DIR;
+        if (typeof pluginDirEnv == "string" &&
+            pluginDirEnv.length > 3) {
+            if (!(0, node_fs_1.existsSync)(pluginDirEnv)) {
+                throw new Error(`Plugin directory ${pluginDirEnv} does not exist`);
             }
-            this.referencedPluginDir = process.env.BSB_PLUGIN_DIR;
+            this.referencedPluginDir = pluginDirEnv;
         }
     }
-    async loadPlugin(log, npmPackage, plugin, name) {
+    parseSemver(version) {
+        const match = version.match(SBPlugins.SEMVER_REGEX);
+        if (!match)
+            return null;
+        return [Number(match[1]), Number(match[2]), Number(match[3])];
+    }
+    compareSemver(a, b) {
+        const pa = this.parseSemver(a);
+        const pb = this.parseSemver(b);
+        if (!pa || !pb)
+            return 0;
+        if (pa[0] !== pb[0])
+            return pa[0] - pb[0];
+        if (pa[1] !== pb[1])
+            return pa[1] - pb[1];
+        return pa[2] - pb[2];
+    }
+    listVersionsFromReferencedDir(npmPackage) {
+        if (!this.referencedPluginDir)
+            return [];
+        const packageRoot = (0, node_path_1.join)(this.referencedPluginDir, npmPackage);
+        if (!(0, node_fs_1.existsSync)(packageRoot))
+            return [];
+        const out = [];
+        // New hierarchical layout: /pkg/<major>/<minor>/<micro>/
+        for (const majorEntry of (0, node_fs_1.readdirSync)(packageRoot, { withFileTypes: true })) {
+            if (!majorEntry.isDirectory() || !/^\d+$/.test(majorEntry.name))
+                continue;
+            const majorPath = (0, node_path_1.join)(packageRoot, majorEntry.name);
+            for (const minorEntry of (0, node_fs_1.readdirSync)(majorPath, { withFileTypes: true })) {
+                if (!minorEntry.isDirectory() || !/^\d+$/.test(minorEntry.name))
+                    continue;
+                const minorPath = (0, node_path_1.join)(majorPath, minorEntry.name);
+                for (const microEntry of (0, node_fs_1.readdirSync)(minorPath, { withFileTypes: true })) {
+                    if (!microEntry.isDirectory() || !/^\d+$/.test(microEntry.name))
+                        continue;
+                    const pluginRoot = (0, node_path_1.join)(minorPath, microEntry.name);
+                    out.push({
+                        version: `${majorEntry.name}.${minorEntry.name}.${microEntry.name}`,
+                        packageCwd: pluginRoot,
+                        pluginRoot,
+                    });
+                }
+            }
+        }
+        // Legacy layout: /pkg/<major.minor.micro>/
+        for (const versionEntry of (0, node_fs_1.readdirSync)(packageRoot, { withFileTypes: true })) {
+            if (!versionEntry.isDirectory())
+                continue;
+            if (!SBPlugins.EXACT_VERSION_REGEX.test(versionEntry.name))
+                continue;
+            const pluginRoot = (0, node_path_1.join)(packageRoot, versionEntry.name);
+            out.push({
+                version: versionEntry.name,
+                packageCwd: pluginRoot,
+                pluginRoot,
+            });
+        }
+        const dedup = new Map();
+        for (const item of out) {
+            dedup.set(item.version, item);
+        }
+        return Array.from(dedup.values());
+    }
+    resolveVersionFromSelector(versions, requestedVersion) {
+        if (versions.length === 0)
+            return null;
+        const sorted = versions.slice().sort((a, b) => this.compareSemver(a.version, b.version));
+        if (requestedVersion == null || requestedVersion.length === 0) {
+            return sorted[sorted.length - 1];
+        }
+        if (SBPlugins.EXACT_VERSION_REGEX.test(requestedVersion)) {
+            return sorted.find((x) => x.version === requestedVersion) ?? null;
+        }
+        if (SBPlugins.MINOR_SELECTOR_REGEX.test(requestedVersion)) {
+            const [major, minor] = requestedVersion.split(".");
+            const matching = sorted.filter((x) => {
+                const parsed = this.parseSemver(x.version);
+                return parsed !== null && String(parsed[0]) === major && String(parsed[1]) === minor;
+            });
+            return matching.length > 0 ? matching[matching.length - 1] : null;
+        }
+        throw new Error(`Invalid plugin version selector "${requestedVersion}". Allowed formats: "major.minor" or "major.minor.micro".`);
+    }
+    async loadPlugin(log, npmPackage, plugin, name, requestedVersion) {
         const tTrace = internalTrace(`loadPlugin:${npmPackage}:${plugin}`);
         log.debug(tTrace, `Plugin {name} from {package} try load as {pluginName}`, {
             name: plugin,
@@ -75,7 +163,10 @@ class SBPlugins {
         const nodeModulesLib = npmPackage !== null;
         let pluginPath = "";
         let packageCwd = this.cwd;
-        let version = "1.0.0";
+        let version = (typeof requestedVersion === "string" &&
+            requestedVersion.length > 0)
+            ? requestedVersion
+            : "1.0.0";
         if (!nodeModulesLib) {
             // If no package is defined in the config, we will not look anywhere else except for the local plugins
             if (this.devMode) {
@@ -97,18 +188,27 @@ class SBPlugins {
         else {
             // If a package is defined in the config, we will look for the plugin in the BSB_PLUGIN_DIR env, followed by the node_modules directory. Local plugins are not used.
             if (this.referencedPluginDir) {
-                const T1packageCwd = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, version);
-                const T1pluginPath = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, version, "./lib/plugins/" + plugin);
-                if ((0, node_fs_1.existsSync)(T1pluginPath)) {
-                    pluginPath = T1pluginPath;
-                    packageCwd = T1packageCwd;
+                const availableVersions = this.listVersionsFromReferencedDir(npmPackage);
+                const resolved = this.resolveVersionFromSelector(availableVersions, requestedVersion ?? null);
+                if (resolved) {
+                    const versionedPluginPath = (0, node_path_1.join)(resolved.pluginRoot, "./lib/plugins/" + plugin);
+                    if ((0, node_fs_1.existsSync)(versionedPluginPath)) {
+                        pluginPath = versionedPluginPath;
+                        packageCwd = resolved.packageCwd;
+                        version = resolved.version;
+                    }
                 }
-                else {
+                if (pluginPath == "") {
                     const T2pluginPath = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, "latest", "./lib/plugins/" + plugin);
                     const T2packageCwd = (0, node_path_1.join)(this.referencedPluginDir, npmPackage, "latest");
                     if ((0, node_fs_1.existsSync)(T2pluginPath)) {
                         pluginPath = T2pluginPath;
                         packageCwd = T2packageCwd;
+                        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(T2packageCwd, "./package.json"))) {
+                            const packageJSON = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(T2packageCwd, "./package.json"), "utf-8")
+                                .toString());
+                            version = packageJSON.version ?? version;
+                        }
                     }
                 }
             }

package/lib/serviceBase/plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/serviceBase/plugins.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/serviceBase/plugins.ts"],"names":[],"mappings":"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"}

package/lib/serviceBase/services.js

@@ -85,7 +85,7 @@ class SBServices {
                 name: plugin,
                 package: plugins[plugin].package,
                 plugin: plugins[plugin].plugin,
-                version: "",
+                version: plugins[plugin].version ?? "",
             });
         }
         for (const activeService of this._activeServices) {
@@ -196,7 +196,7 @@ class SBServices {
             name: plugin.name,
             file: plugin.plugin,
         });
-        const newPlugin = await this.sbPlugins.loadPlugin(this.observableBackend, plugin.package ?? null, plugin.plugin, plugin.name);
+        const newPlugin = await this.sbPlugins.loadPlugin(this.observableBackend, plugin.package ?? null, plugin.plugin, plugin.name, plugin.version ?? null);
         if (newPlugin === null || !newPlugin.success) {
             this.observableBackend.error(tTrace, "Failed to import service plugin: {name} from ({package}){file}", {
                 package: plugin.package ?? "this project",

package/lib/serviceBase/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/serviceBase/services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/serviceBase/services.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsb/base",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "license": "(AGPL-3.0-only OR Commercial)",
   "author": {
     "name": "BetterCorp (PTY) Ltd",

package/lib/tests.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tests.js","sourceRoot":"","sources":["../src/tests.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;;;;;;;;;;;;;;;;AAEH,4DAA0C"}