@lakutata/mutex 3.0.0-beta.5 → 3.0.0

package/dist/cjs/mutex/lib/LoadDriver.js

@@ -34,7 +34,17 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadDriver = loadDriver;
+const core_1 = require("@lakutata/core");
 const MutexDriverNotFoundException_js_1 = require("../exceptions/MutexDriverNotFoundException.js");
+/**
+ * The client packages of the drivers (optional dependencies), imported by their names written out: the bundlers follow
+ * them (a name given at run time is not bundled, the bundle has no node_modules to load it from)
+ */
+const DRIVERS = {
+    'redis': () => Promise.resolve().then(() => __importStar(require('redis'))),
+    'pg': () => Promise.resolve().then(() => __importStar(require('pg'))),
+    'mysql2/promise': () => Promise.resolve().then(() => __importStar(require('mysql2/promise')))
+};
 /**
  * Whether an error reports the package itself as missing
  * @param error
@@ -52,13 +62,20 @@ function isPackageMissing(error, packageName) {
  * @param packageName
  */
 async function loadDriver(member, packageName) {
+    let missing;
     try {
-        const driver = await Promise.resolve(`${packageName}`).then(s => __importStar(require(s)));
+        const driver = await (DRIVERS[packageName] ?? (() => Promise.resolve(`${packageName}`).then(s => __importStar(require(s)))))();
         return (driver[member] === undefined && driver.default ? driver.default : driver);
     }
     catch (e) {
         if (!isPackageMissing(e, packageName))
             throw e;
+        missing = e;
     }
-    throw new MutexDriverNotFoundException_js_1.MutexDriverNotFoundException('Package "{packageName}" is required for this driver of the locks. Run "npm install {packageName}".', { packageName: packageName });
+    //A bundled application has the packages installed when it was bundled
+    const exception = (0, core_1.isPackaged)() ?
+        new MutexDriverNotFoundException_js_1.MutexDriverNotFoundException('Package "{packageName}" is required for this driver of the locks, and was not installed when the application was bundled: install it in the project, then bundle the application again.', { packageName: packageName }) :
+        new MutexDriverNotFoundException_js_1.MutexDriverNotFoundException('Package "{packageName}" is required for this driver of the locks. Run "npm install {packageName}".', { packageName: packageName });
+    exception.cause = missing;
+    throw exception;
 }

package/dist/esm/mutex/lib/LoadDriver.js

@@ -1,4 +1,14 @@
+import { isPackaged } from '@lakutata/core';
 import { MutexDriverNotFoundException } from '../exceptions/MutexDriverNotFoundException.js';
+/**
+ * The client packages of the drivers (optional dependencies), imported by their names written out: the bundlers follow
+ * them (a name given at run time is not bundled, the bundle has no node_modules to load it from)
+ */
+const DRIVERS = {
+    'redis': () => import('redis'),
+    'pg': () => import('pg'),
+    'mysql2/promise': () => import('mysql2/promise')
+};
 /**
  * Whether an error reports the package itself as missing
  * @param error
@@ -16,13 +26,20 @@ function isPackageMissing(error, packageName) {
  * @param packageName
  */
 export async function loadDriver(member, packageName) {
+    let missing;
     try {
-        const driver = await import(packageName);
+        const driver = await (DRIVERS[packageName] ?? (() => import(packageName)))();
         return (driver[member] === undefined && driver.default ? driver.default : driver);
     }
     catch (e) {
         if (!isPackageMissing(e, packageName))
             throw e;
+        missing = e;
     }
-    throw new MutexDriverNotFoundException('Package "{packageName}" is required for this driver of the locks. Run "npm install {packageName}".', { packageName: packageName });
+    //A bundled application has the packages installed when it was bundled
+    const exception = isPackaged() ?
+        new MutexDriverNotFoundException('Package "{packageName}" is required for this driver of the locks, and was not installed when the application was bundled: install it in the project, then bundle the application again.', { packageName: packageName }) :
+        new MutexDriverNotFoundException('Package "{packageName}" is required for this driver of the locks. Run "npm install {packageName}".', { packageName: packageName });
+    exception.cause = missing;
+    throw exception;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/mutex",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0",
   "description": "The locks of the lakutata framework: mutual exclusion between the instances and the processes of an application, over memory, files, Redis, PostgreSQL or MySQL, held by tokens, renewed while they are held.",
   "type": "module",
   "main": "./dist/cjs/exports/Mutex.js",
@@ -30,7 +30,7 @@
     "test:stores": "sh test-env/run.sh"
   },
   "peerDependencies": {
-    "@lakutata/core": "3.0.0-beta.5",
+    "@lakutata/core": "3.0.0",
     "mysql2": "^3.0.0",
     "pg": "^8.0.0",
     "redis": "^4.6.0 || ^5.0.0"