@lakutata/cache 3.0.0-beta.5 → 3.0.0-beta.6

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

@@ -34,7 +34,21 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadDriver = loadDriver;
+const core_1 = require("@lakutata/core");
 const CacheDriverNotFoundException_js_1 = require("../exceptions/CacheDriverNotFoundException.js");
+/**
+ * The driver packages of the stores (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 = {
+    'pg': () => Promise.resolve().then(() => __importStar(require('pg'))),
+    'redis': () => Promise.resolve().then(() => __importStar(require('redis'))),
+    '@redis/client': () => Promise.resolve().then(() => __importStar(require('@redis/client'))),
+    'mysql2': () => Promise.resolve().then(() => __importStar(require('mysql2'))),
+    'sqlite3': () => Promise.resolve().then(() => __importStar(require('sqlite3'))),
+    'mongodb': () => Promise.resolve().then(() => __importStar(require('mongodb'))),
+    'memjs': () => Promise.resolve().then(() => __importStar(require('memjs')))
+};
 /**
  * Whether an error reports the package itself as missing
  * @param error
@@ -52,15 +66,22 @@ function isPackageMissing(error, packageName) {
  * @param packageNames
  */
 async function loadDriver(member, ...packageNames) {
+    let missing;
     for (const packageName of packageNames) {
         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 CacheDriverNotFoundException_js_1.CacheDriverNotFoundException('Package "{packageName}" is required for this driver. Run "npm install {packageName}".', { packageName: packageNames[0] });
+    //A bundled application has the packages installed when it was bundled
+    const exception = (0, core_1.isPackaged)() ?
+        new CacheDriverNotFoundException_js_1.CacheDriverNotFoundException('Package "{packageName}" is required for this driver, and was not installed when the application was bundled: install it in the project, then bundle the application again.', { packageName: packageNames[0] }) :
+        new CacheDriverNotFoundException_js_1.CacheDriverNotFoundException('Package "{packageName}" is required for this driver. Run "npm install {packageName}".', { packageName: packageNames[0] });
+    exception.cause = missing;
+    throw exception;
 }

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

@@ -1,4 +1,18 @@
+import { isPackaged } from '@lakutata/core';
 import { CacheDriverNotFoundException } from '../exceptions/CacheDriverNotFoundException.js';
+/**
+ * The driver packages of the stores (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 = {
+    'pg': () => import('pg'),
+    'redis': () => import('redis'),
+    '@redis/client': () => import('@redis/client'),
+    'mysql2': () => import('mysql2'),
+    'sqlite3': () => import('sqlite3'),
+    'mongodb': () => import('mongodb'),
+    'memjs': () => import('memjs')
+};
 /**
  * Whether an error reports the package itself as missing
  * @param error
@@ -16,15 +30,22 @@ function isPackageMissing(error, packageName) {
  * @param packageNames
  */
 export async function loadDriver(member, ...packageNames) {
+    let missing;
     for (const packageName of packageNames) {
         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 CacheDriverNotFoundException('Package "{packageName}" is required for this driver. Run "npm install {packageName}".', { packageName: packageNames[0] });
+    //A bundled application has the packages installed when it was bundled
+    const exception = isPackaged() ?
+        new CacheDriverNotFoundException('Package "{packageName}" is required for this driver, and was not installed when the application was bundled: install it in the project, then bundle the application again.', { packageName: packageNames[0] }) :
+        new CacheDriverNotFoundException('Package "{packageName}" is required for this driver. Run "npm install {packageName}".', { packageName: packageNames[0] });
+    exception.cause = missing;
+    throw exception;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/cache",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.6",
   "description": "The cache component of the lakutata framework (memory, file, Redis, Memcache, MongoDB, SQLite, PostgreSQL, MySQL stores).",
   "type": "module",
   "main": "./dist/cjs/exports/Cache.js",
@@ -30,8 +30,9 @@
     "test:stores": "npm run compile && CACHE_TEST_STORES=1 node --test --test-concurrency=1 \"dist/esm/tests/stores/*.spec.js\""
   },
   "peerDependencies": {
-    "@lakutata/core": "3.0.0-beta.5",
-    "@lakutata/utils": "3.0.0-beta.5",
+    "@lakutata/core": "3.0.0-beta.6",
+    "@lakutata/utils": "3.0.0-beta.6",
+    "@redis/client": "^1.5.0 || ^5.0.0",
     "memjs": "^1.3.2",
     "mongodb": ">=6.0.0",
     "mysql2": "^3.0.0",
@@ -40,6 +41,9 @@
     "sqlite3": "^5.0.0"
   },
   "peerDependenciesMeta": {
+    "@redis/client": {
+      "optional": true
+    },
     "memjs": {
       "optional": true
     },