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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/index.d.ts +3 -1
  2. package/dist/index.js +10 -6
  3. package/dist/index.mjs +10 -6
  4. package/package.json +4 -4
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Plugin, DeployData, Next, MountData, UseifyPlugin } from '@faasjs/func';
1
+ import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
2
2
  import { Knex as Knex$1 } from 'knex';
3
3
 
4
4
  declare type KnexConfig = {
@@ -14,6 +14,7 @@ declare class Knex implements Plugin {
14
14
  config: Knex$1.Config;
15
15
  adapter: Knex$1;
16
16
  query: Knex$1;
17
+ private logger;
17
18
  /**
18
19
  * 创建插件实例
19
20
  * @param config {object} 配置
@@ -23,6 +24,7 @@ declare class Knex implements Plugin {
23
24
  constructor(config?: KnexConfig);
24
25
  onDeploy(data: DeployData, next: Next): Promise<void>;
25
26
  onMount(data: MountData, next: Next): Promise<void>;
27
+ onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
26
28
  raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
27
29
  transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: any): Promise<TResult>;
28
30
  schema(): Knex$1.SchemaBuilder;
package/dist/index.js CHANGED
@@ -114,31 +114,35 @@ var Knex = class {
114
114
  (v) => parseFloat(v)
115
115
  ));
116
116
  }
117
- this.adapter.on("query", ({
117
+ this.query = this.adapter;
118
+ this.query.on("query", ({
118
119
  sql,
119
120
  __knexQueryUid,
120
121
  bindings
121
122
  }) => {
122
- data.logger.time(`Knex${__knexQueryUid}`);
123
- data.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
123
+ this.logger.time(`Knex${__knexQueryUid}`);
124
+ this.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
124
125
  }).on("query-response", (response, {
125
126
  sql,
126
127
  __knexQueryUid,
127
128
  bindings
128
129
  }) => {
129
- data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
130
+ this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
130
131
  }).on("query-error", (_, {
131
132
  __knexQueryUid,
132
133
  sql,
133
134
  bindings
134
135
  }) => {
135
- data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
136
+ this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
136
137
  });
137
- this.query = this.adapter;
138
138
  data.logger.debug("[%s] connected", this.name);
139
139
  global.FaasJS_Knex[this.name] = this;
140
140
  await next();
141
141
  }
142
+ async onInvoke(data, next) {
143
+ this.logger = data.logger;
144
+ await next();
145
+ }
142
146
  async raw(sql, bindings = []) {
143
147
  if (!this.adapter)
144
148
  throw Error("[Knex] Client not initialized.");
package/dist/index.mjs CHANGED
@@ -90,31 +90,35 @@ var Knex = class {
90
90
  (v) => parseFloat(v)
91
91
  ));
92
92
  }
93
- this.adapter.on("query", ({
93
+ this.query = this.adapter;
94
+ this.query.on("query", ({
94
95
  sql,
95
96
  __knexQueryUid,
96
97
  bindings
97
98
  }) => {
98
- data.logger.time(`Knex${__knexQueryUid}`);
99
- data.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
99
+ this.logger.time(`Knex${__knexQueryUid}`);
100
+ this.logger.debug("[%s] query begin: %s %j", this.name, sql, bindings);
100
101
  }).on("query-response", (response, {
101
102
  sql,
102
103
  __knexQueryUid,
103
104
  bindings
104
105
  }) => {
105
- data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
106
+ this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query done: %s %j %j", this.name, sql, bindings, response);
106
107
  }).on("query-error", (_, {
107
108
  __knexQueryUid,
108
109
  sql,
109
110
  bindings
110
111
  }) => {
111
- data.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
112
+ this.logger.timeEnd(`Knex${__knexQueryUid}`, "[%s] query failed: %s %j", this.name, sql, bindings);
112
113
  });
113
- this.query = this.adapter;
114
114
  data.logger.debug("[%s] connected", this.name);
115
115
  global.FaasJS_Knex[this.name] = this;
116
116
  await next();
117
117
  }
118
+ async onInvoke(data, next) {
119
+ this.logger = data.logger;
120
+ await next();
121
+ }
118
122
  async raw(sql, bindings = []) {
119
123
  if (!this.adapter)
120
124
  throw Error("[Knex] Client not initialized.");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@faasjs/knex",
3
- "version": "0.0.2-beta.400",
3
+ "version": "0.0.2-beta.401",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -22,9 +22,9 @@
22
22
  "dist"
23
23
  ],
24
24
  "peerDependencies": {
25
- "@faasjs/deep_merge": "^0.0.2-beta.400",
26
- "@faasjs/func": "^0.0.2-beta.400",
27
- "@faasjs/logger": "^0.0.2-beta.400",
25
+ "@faasjs/deep_merge": "^0.0.2-beta.401",
26
+ "@faasjs/func": "^0.0.2-beta.401",
27
+ "@faasjs/logger": "^0.0.2-beta.401",
28
28
  "knex": "*"
29
29
  },
30
30
  "devDependencies": {