@faasjs/knex 2.9.0 → 3.0.0-canary.2

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Plugin, MountData, Next, InvokeData, UseifyPlugin } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 import knex, { Knex as Knex$1 } from 'knex';
 export { Knex as OriginKnex } from 'knex';
@@ -34,7 +34,6 @@ declare class Knex implements Plugin {
     query: Knex$1;
     logger: Logger;
     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>>;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Plugin, MountData, Next, InvokeData, UseifyPlugin } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 import knex, { Knex as Knex$1 } from 'knex';
 export { Knex as OriginKnex } from 'knex';
@@ -34,7 +34,6 @@ declare class Knex implements Plugin {
     query: Knex$1;
     logger: Logger;
     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>>;

package/dist/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var func = require('@faasjs/func');
-var logger = require('@faasjs/logger');
 var deep_merge = require('@faasjs/deep_merge');
 var knex = require('knex');
 var crypto = require('crypto');
@@ -22,9 +21,13 @@ if (!global.FaasJS_Knex) {
   global.FaasJS_Knex = {};
 }
 var Knex = class {
+  type = Name;
+  name = Name;
+  config;
+  adapter;
+  query;
+  logger;
   constructor(config) {
-    this.type = Name;
-    this.name = Name;
     if (config) {
       this.name = config.name || this.type;
       this.config = config.config || /* @__PURE__ */ Object.create(null);
@@ -33,17 +36,7 @@ var Knex = class {
       this.config = /* @__PURE__ */ Object.create(null);
     }
   }
-  async onDeploy(data, next) {
-    const client = data.config.plugins[this.name].config.client;
-    if (!client) throw Error("[Knex] client required.");
-    data.dependencies["@faasjs/knex"] = "*";
-    if (client === "sqlite3") data.dependencies["better-sqlite3"] = "*";
-    else data.dependencies[client] = "*";
-    new logger.Logger(this.name).debug(`add dependencies: ${client}`);
-    await next();
-  }
   async onMount(data, next) {
-    var _a, _b;
     this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
@@ -66,7 +59,7 @@ var Knex = class {
             this.config.connection[key.replace("connection_", "")] = value;
           } else this.config[key] = value;
       }
-    if ((_b = (_a = data.config.plugins) == null ? void 0 : _a[this.name]) == null ? void 0 : _b.config)
+    if (data.config.plugins?.[this.name]?.config)
       this.config = deep_merge.deepMerge(
         data.config.plugins[this.name].config,
         this.config
@@ -156,7 +149,7 @@ var Knex = class {
    */
   async transaction(scope, config, options) {
     if (!this.adapter) throw Error(`[${this.name}] Client not initialized.`);
-    if (options == null ? void 0 : options.trx) return scope(options.trx);
+    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);
@@ -206,7 +199,7 @@ var Knex = class {
   }
 };
 function useKnex(config) {
-  const name = (config == null ? void 0 : config.name) || Name;
+  const name = config?.name || Name;
   if (global.FaasJS_Knex[name]) return func.usePlugin(global.FaasJS_Knex[name]);
   return func.usePlugin(new Knex(config));
 }

package/dist/index.mjs

@@ -1,5 +1,4 @@
 import { usePlugin } from '@faasjs/func';
-import { Logger } from '@faasjs/logger';
 import { deepMerge } from '@faasjs/deep_merge';
 import knex from 'knex';
 import { randomUUID } from 'node:crypto';
@@ -16,9 +15,13 @@ if (!global.FaasJS_Knex) {
   global.FaasJS_Knex = {};
 }
 var Knex = class {
+  type = Name;
+  name = Name;
+  config;
+  adapter;
+  query;
+  logger;
   constructor(config) {
-    this.type = Name;
-    this.name = Name;
     if (config) {
       this.name = config.name || this.type;
       this.config = config.config || /* @__PURE__ */ Object.create(null);
@@ -27,17 +30,7 @@ var Knex = class {
       this.config = /* @__PURE__ */ Object.create(null);
     }
   }
-  async onDeploy(data, next) {
-    const client = data.config.plugins[this.name].config.client;
-    if (!client) throw Error("[Knex] client required.");
-    data.dependencies["@faasjs/knex"] = "*";
-    if (client === "sqlite3") data.dependencies["better-sqlite3"] = "*";
-    else data.dependencies[client] = "*";
-    new Logger(this.name).debug(`add dependencies: ${client}`);
-    await next();
-  }
   async onMount(data, next) {
-    var _a, _b;
     this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
@@ -60,7 +53,7 @@ var Knex = class {
             this.config.connection[key.replace("connection_", "")] = value;
           } else this.config[key] = value;
       }
-    if ((_b = (_a = data.config.plugins) == null ? void 0 : _a[this.name]) == null ? void 0 : _b.config)
+    if (data.config.plugins?.[this.name]?.config)
       this.config = deepMerge(
         data.config.plugins[this.name].config,
         this.config
@@ -150,7 +143,7 @@ var Knex = class {
    */
   async transaction(scope, config, options) {
     if (!this.adapter) throw Error(`[${this.name}] Client not initialized.`);
-    if (options == null ? void 0 : options.trx) return scope(options.trx);
+    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);
@@ -200,7 +193,7 @@ var Knex = class {
   }
 };
 function useKnex(config) {
-  const name = (config == null ? void 0 : config.name) || Name;
+  const name = config?.name || Name;
   if (global.FaasJS_Knex[name]) return usePlugin(global.FaasJS_Knex[name]);
   return usePlugin(new Knex(config));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "2.9.0",
+  "version": "3.0.0-canary.2",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,9 +34,9 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "2.9.0",
-    "@faasjs/func": "2.9.0",
-    "@faasjs/logger": "2.9.0"
+    "@faasjs/deep_merge": "3.0.0-canary.2",
+    "@faasjs/func": "3.0.0-canary.2",
+    "@faasjs/logger": "3.0.0-canary.2"
   },
   "peerDependencies": {
     "knex": "*"
@@ -52,7 +52,7 @@
     "tsd": "*"
   },
   "engines": {
-    "npm": ">=9.0.0",
-    "node": ">=18.0.0"
+    "node": ">=22.0.0",
+    "npm": ">=10.0.0"
   }
 }