@faasjs/knex 3.1.0 → 3.1.1

package/dist/index.d.mts

@@ -27,7 +27,7 @@ type KnexConfig = {
     config?: Knex$1.Config;
 };
 declare class Knex implements Plugin {
-    readonly type: string;
+    readonly type = "knex";
     readonly name: string;
     config: Knex$1.Config;
     adapter: Knex$1;

package/dist/index.d.ts

@@ -27,7 +27,7 @@ type KnexConfig = {
     config?: Knex$1.Config;
 };
 declare class Knex implements Plugin {
-    readonly type: string;
+    readonly type = "knex";
     readonly name: string;
     config: Knex$1.Config;
     adapter: Knex$1;

package/dist/index.js

@@ -16,12 +16,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var originKnex = knex__default.default;
-var Name = "knex";
+var Name = "Knex";
 if (!global.FaasJS_Knex) {
   global.FaasJS_Knex = {};
 }
 var Knex = class {
-  type = Name;
+  type = "knex";
   name = Name;
   config;
   adapter;
@@ -29,10 +29,9 @@ var Knex = class {
   logger;
   constructor(config) {
     if (config) {
-      this.name = config.name || this.type;
+      this.name = config.name || this.name;
       this.config = config.config || /* @__PURE__ */ Object.create(null);
     } else {
-      this.name = this.type;
       this.config = /* @__PURE__ */ Object.create(null);
     }
   }
@@ -42,7 +41,7 @@ var Knex = class {
       this.config = global.FaasJS_Knex[this.name].config;
       this.adapter = global.FaasJS_Knex[this.name].adapter;
       this.query = this.adapter;
-      this.logger.debug("[%s] use exists adapter", this.name);
+      this.logger.debug("use exists adapter");
       await next();
       return;
     }
@@ -123,8 +122,7 @@ var Knex = class {
       if (!__knexQueryUid) return;
       this.logger.time(`Knex${this.name}${__knexQueryUid}`);
       this.logger.debug(
-        "[%s] [%s] query begin: %s %j",
-        this.name,
+        "[%s] query begin: %s %j",
         __knexQueryUid,
         sql,
         bindings
@@ -133,8 +131,7 @@ var Knex = class {
       if (!__knexQueryUid) return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
-        "[%s] [%s] query done: %s %j %j",
-        this.name,
+        "[%s] query done: %s %j %j",
         __knexQueryUid,
         sql,
         bindings,
@@ -144,14 +141,13 @@ var Knex = class {
       if (!__knexQueryUid) return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
-        "[%s] [%s] query failed: %s %j",
-        this.name,
+        "[%s] query failed: %s %j",
         __knexQueryUid,
         sql,
         bindings
       );
     });
-    data.logger.debug("[%s] connected", this.name);
+    data.logger.debug("connected");
     global.FaasJS_Knex[this.name] = this;
     await next();
   }
@@ -173,35 +169,21 @@ var Knex = class {
     if (options?.trx) return scope(options.trx);
     const trx = await this.adapter.transaction(config);
     const trxId = crypto.randomUUID();
-    this.logger.debug("[%s] [%s] transaction begin", this.name, trxId);
+    this.logger.debug("[%s] transaction begin", trxId);
     try {
       const result = await scope(trx);
       if (trx.isCompleted()) {
-        this.logger.debug(
-          "[%s] [%s] transaction has been finished in scope",
-          this.name,
-          trxId
-        );
+        this.logger.debug("[%s] transaction has been finished in scope", trxId);
         return result;
       }
-      this.logger.debug("[%s] [%s] transaction begin commit", this.name, trxId);
+      this.logger.debug("[%s] transaction begin commit", trxId);
       await trx.commit();
-      this.logger.debug(
-        "[%s] [%s] transaction committed: %j",
-        this.name,
-        trxId,
-        result
-      );
+      this.logger.debug("[%s] transaction committed: %j", trxId, result);
       trx.emit("commit");
       return result;
     } catch (error) {
       await trx.rollback(error);
-      this.logger.error(
-        "[%s] [%s] transaction rollback: %s",
-        this.name,
-        trxId,
-        error
-      );
+      this.logger.error("[%s] transaction rollback: %s", trxId, error);
       trx.emit("rollback", error);
       throw error;
     }

package/dist/index.mjs

@@ -10,12 +10,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var originKnex = knex;
-var Name = "knex";
+var Name = "Knex";
 if (!global.FaasJS_Knex) {
   global.FaasJS_Knex = {};
 }
 var Knex = class {
-  type = Name;
+  type = "knex";
   name = Name;
   config;
   adapter;
@@ -23,10 +23,9 @@ var Knex = class {
   logger;
   constructor(config) {
     if (config) {
-      this.name = config.name || this.type;
+      this.name = config.name || this.name;
       this.config = config.config || /* @__PURE__ */ Object.create(null);
     } else {
-      this.name = this.type;
       this.config = /* @__PURE__ */ Object.create(null);
     }
   }
@@ -36,7 +35,7 @@ var Knex = class {
       this.config = global.FaasJS_Knex[this.name].config;
       this.adapter = global.FaasJS_Knex[this.name].adapter;
       this.query = this.adapter;
-      this.logger.debug("[%s] use exists adapter", this.name);
+      this.logger.debug("use exists adapter");
       await next();
       return;
     }
@@ -117,8 +116,7 @@ var Knex = class {
       if (!__knexQueryUid) return;
       this.logger.time(`Knex${this.name}${__knexQueryUid}`);
       this.logger.debug(
-        "[%s] [%s] query begin: %s %j",
-        this.name,
+        "[%s] query begin: %s %j",
         __knexQueryUid,
         sql,
         bindings
@@ -127,8 +125,7 @@ var Knex = class {
       if (!__knexQueryUid) return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
-        "[%s] [%s] query done: %s %j %j",
-        this.name,
+        "[%s] query done: %s %j %j",
         __knexQueryUid,
         sql,
         bindings,
@@ -138,14 +135,13 @@ var Knex = class {
       if (!__knexQueryUid) return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
-        "[%s] [%s] query failed: %s %j",
-        this.name,
+        "[%s] query failed: %s %j",
         __knexQueryUid,
         sql,
         bindings
       );
     });
-    data.logger.debug("[%s] connected", this.name);
+    data.logger.debug("connected");
     global.FaasJS_Knex[this.name] = this;
     await next();
   }
@@ -167,35 +163,21 @@ var Knex = class {
     if (options?.trx) return scope(options.trx);
     const trx = await this.adapter.transaction(config);
     const trxId = randomUUID();
-    this.logger.debug("[%s] [%s] transaction begin", this.name, trxId);
+    this.logger.debug("[%s] transaction begin", trxId);
     try {
       const result = await scope(trx);
       if (trx.isCompleted()) {
-        this.logger.debug(
-          "[%s] [%s] transaction has been finished in scope",
-          this.name,
-          trxId
-        );
+        this.logger.debug("[%s] transaction has been finished in scope", trxId);
         return result;
       }
-      this.logger.debug("[%s] [%s] transaction begin commit", this.name, trxId);
+      this.logger.debug("[%s] transaction begin commit", trxId);
       await trx.commit();
-      this.logger.debug(
-        "[%s] [%s] transaction committed: %j",
-        this.name,
-        trxId,
-        result
-      );
+      this.logger.debug("[%s] transaction committed: %j", trxId, result);
       trx.emit("commit");
       return result;
     } catch (error) {
       await trx.rollback(error);
-      this.logger.error(
-        "[%s] [%s] transaction rollback: %s",
-        this.name,
-        trxId,
-        error
-      );
+      this.logger.error("[%s] transaction rollback: %s", trxId, error);
       trx.emit("rollback", error);
       throw error;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,9 +34,9 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "3.1.0",
-    "@faasjs/func": "3.1.0",
-    "@faasjs/logger": "3.1.0"
+    "@faasjs/deep_merge": "3.1.1",
+    "@faasjs/func": "3.1.1",
+    "@faasjs/logger": "3.1.1"
   },
   "peerDependencies": {
     "knex": "*"