@faasjs/knex 0.0.2-beta.400 → 0.0.2-beta.403

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, DeployData, Next, MountData, UseifyPlugin } from '@faasjs/func';
+import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
 import { Knex as Knex$1 } from 'knex';
 
 declare type KnexConfig = {
@@ -14,6 +14,7 @@ declare class Knex implements Plugin {
     config: Knex$1.Config;
     adapter: Knex$1;
     query: Knex$1;
+    private logger;
     /**
      * 创建插件实例
      * @param config {object} 配置
@@ -23,6 +24,7 @@ declare class Knex implements Plugin {
     constructor(config?: KnexConfig);
     onDeploy(data: DeployData, next: Next): Promise<void>;
     onMount(data: MountData, next: Next): Promise<void>;
+    onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
     raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
     transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: any): Promise<TResult>;
     schema(): Knex$1.SchemaBuilder;

package/dist/index.js

@@ -67,6 +67,7 @@ var Knex = class {
   }
   async onMount(data, next) {
     var _a;
+    this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
       this.adapter = global.FaasJS_Knex[this.name].adapter;
@@ -114,31 +115,35 @@ var Knex = class {
         (v) => parseFloat(v)
       ));
     }
-    this.adapter.on("query", ({
+    this.query = this.adapter;
+    this.query.on("query", ({
       sql,
       __knexQueryUid,
       bindings
     }) => {
-      data.logger.time(`Knex${__knexQueryUid}`);
-      data.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
+      this.logger.time(`Knex${__knexQueryUid}`);
+      this.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
     }).on("query-response", (response, {
       sql,
       __knexQueryUid,
       bindings
     }) => {
-      data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
+      this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
     }).on("query-error", (_, {
       __knexQueryUid,
       sql,
       bindings
     }) => {
-      data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
+      this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
     });
-    this.query = this.adapter;
     data.logger.debug("[%s] connected", this.name);
     global.FaasJS_Knex[this.name] = this;
     await next();
   }
+  async onInvoke(data, next) {
+    this.logger = data.logger;
+    await next();
+  }
   async raw(sql, bindings = []) {
     if (!this.adapter)
       throw Error("[Knex] Client not initialized.");

package/dist/index.mjs

@@ -43,6 +43,7 @@ var Knex = class {
   }
   async onMount(data, next) {
     var _a;
+    this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
       this.adapter = global.FaasJS_Knex[this.name].adapter;
@@ -90,31 +91,35 @@ var Knex = class {
         (v) => parseFloat(v)
       ));
     }
-    this.adapter.on("query", ({
+    this.query = this.adapter;
+    this.query.on("query", ({
       sql,
       __knexQueryUid,
       bindings
     }) => {
-      data.logger.time(`Knex${__knexQueryUid}`);
-      data.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
+      this.logger.time(`Knex${__knexQueryUid}`);
+      this.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
     }).on("query-response", (response, {
       sql,
       __knexQueryUid,
       bindings
     }) => {
-      data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
+      this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
     }).on("query-error", (_, {
       __knexQueryUid,
       sql,
       bindings
     }) => {
-      data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
+      this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
     });
-    this.query = this.adapter;
     data.logger.debug("[%s] connected", this.name);
     global.FaasJS_Knex[this.name] = this;
     await next();
   }
+  async onInvoke(data, next) {
+    this.logger = data.logger;
+    await next();
+  }
   async raw(sql, bindings = []) {
     if (!this.adapter)
       throw Error("[Knex] Client not initialized.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "0.0.2-beta.400",
+  "version": "0.0.2-beta.403",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,9 +22,9 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/deep_merge": "^0.0.2-beta.400",
-    "@faasjs/func": "^0.0.2-beta.400",
-    "@faasjs/logger": "^0.0.2-beta.400",
+    "@faasjs/deep_merge": "^0.0.2-beta.403",
+    "@faasjs/func": "^0.0.2-beta.403",
+    "@faasjs/logger": "^0.0.2-beta.403",
     "knex": "*"
   },
   "devDependencies": {