@nesgarbo/node-jt400 6.0.3 → 6.0.4

package/dist-esm/lib/connection.types.d.ts

@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { BaseConnection, Close } from './baseConnection.types.js';
+import { BaseConnection, Param, Metadata, Close } from './baseConnection.types.js';
 import { Ifs } from './ifs/types.js';
 
 interface ProgramDefinitionOptions {
@@ -43,18 +43,26 @@ interface MessageFileHandlerOptions {
     path: string;
 }
 interface MessageFileReadOptions {
-    messageId: string[7];
+    messageId: string;
+}
+interface MessageQMessage {
+    text: string;
+    [key: string]: unknown;
 }
 interface MessageQ {
     sendInformational: (messageText: string) => Promise<void>;
-    read: (params?: MessageQReadOptions) => Promise<any> | Promise<null>;
+    read: (params?: MessageQReadOptions) => Promise<MessageQMessage | null>;
 }
 interface DataQOptions {
     name: string;
 }
+interface DataQReadResult {
+    data: string;
+    write: (data: string) => Promise<void>;
+}
 interface KeyedDataQ {
     write: (key: string, data: string) => void;
-    read: (params: DataQReadOptions | string) => Promise<any>;
+    read: (params: DataQReadOptions | string) => Promise<string | DataQReadResult>;
 }
 interface AS400Message {
     getText: () => Promise<string>;
@@ -62,14 +70,33 @@ interface AS400Message {
 interface MessageFileHandler {
     read: (params: MessageFileReadOptions) => Promise<AS400Message>;
 }
-type TransactionFun = (transaction: BaseConnection) => Promise<any>;
+type TransactionFun<T = unknown> = (transaction: BaseConnection) => Promise<T>;
+interface GetTablesParams {
+    catalog?: string;
+    schema: string;
+    table?: string;
+}
+type ColumnInfo = Metadata;
+interface PrimaryKeyInfo {
+    name: string;
+    [key: string]: unknown;
+}
 interface Connection extends BaseConnection {
-    pgm: (programName: string, paramsSchema: PgmParamType[], libraryName?: string) => any;
-    defineProgram: (options: ProgramDefinitionOptions) => any;
-    getTablesAsStream: (params: any) => Readable;
-    getColumns: (params: any) => any;
-    getPrimaryKeys: (params: any) => any;
-    transaction: (fn: TransactionFun) => Promise<any>;
+    pgm: (programName: string, paramsSchema: PgmParamType[], libraryName?: string) => (params: Record<string, Param>, timeout?: number) => Promise<unknown>;
+    defineProgram: (options: ProgramDefinitionOptions) => (params: Record<string, Param>, timeout?: number) => Promise<unknown>;
+    getTablesAsStream: (params: GetTablesParams) => Readable;
+    getColumns: (params: {
+        catalog?: string;
+        schema: string;
+        table: string;
+        columns?: string;
+    }) => Promise<ColumnInfo[]>;
+    getPrimaryKeys: (params: {
+        catalog?: string;
+        schema?: string;
+        table: string;
+    }) => Promise<PrimaryKeyInfo[]>;
+    transaction: <T = unknown>(fn: TransactionFun<T>) => Promise<T>;
     openMessageQ: (params: MessageQOptions) => Promise<MessageQ>;
     createKeyedDataQ: (params: DataQOptions) => KeyedDataQ;
     openMessageFile: (params: MessageFileHandlerOptions) => Promise<MessageFileHandler>;
@@ -77,4 +104,4 @@ interface Connection extends BaseConnection {
     close: Close;
 }
 
-export type { AS400Message, Connection, DataQOptions, DataQReadOptions, JustNameMessageQ, JustPathMessageQ, KeyedDataQ, MessageFileHandler, MessageFileHandlerOptions, MessageFileReadOptions, MessageQ, MessageQOptions, MessageQReadOptions, PgmParamStructType, PgmParamType, PgmParamType1, PgmParamType2, ProgramDefinitionOptions, TransactionFun };
+export type { AS400Message, ColumnInfo, Connection, DataQOptions, DataQReadOptions, DataQReadResult, GetTablesParams, JustNameMessageQ, JustPathMessageQ, KeyedDataQ, MessageFileHandler, MessageFileHandlerOptions, MessageFileReadOptions, MessageQ, MessageQMessage, MessageQOptions, MessageQReadOptions, PgmParamStructType, PgmParamType, PgmParamType1, PgmParamType2, PrimaryKeyInfo, ProgramDefinitionOptions, TransactionFun };

package/dist-esm/lib/handleError.d.ts

@@ -1,5 +1,3 @@
-declare function handleError(context: {
-    [key: string]: any;
-}): (err: any) => never;
+declare function handleError(context: Record<string, unknown>): (err: unknown) => never;
 
 export { handleError };

package/dist-esm/lib/handleError.js

@@ -1,7 +1,8 @@
 import { Oops } from "oops-error";
 function handleError(context) {
   return (err) => {
-    const errMsg = err.cause && err.cause.getMessageSync && err.cause.getMessageSync() || err.getMessageSync && err.getMessageSync() || err.message;
+    const e = err;
+    const errMsg = e.cause?.getMessageSync?.() ?? e.getMessageSync?.() ?? e.message ?? String(err);
     const start = errMsg.indexOf(": ");
     const end = errMsg.indexOf("\n");
     const message = start > 0 && end > 0 ? errMsg.slice(start + 2, end) : errMsg;
@@ -10,7 +11,7 @@ function handleError(context) {
       message,
       context,
       category,
-      cause: err
+      cause: err instanceof Error ? err : new Error(String(err))
     });
   };
 }

package/dist-esm/lib/handleError.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/handleError.ts"],"sourcesContent":["import { Oops } from 'oops-error'\n\nexport function handleError(context: { [key: string]: any }) {\n  return (err: any) => {\n    const errMsg =\n      (err.cause && err.cause.getMessageSync && err.cause.getMessageSync()) ||\n      (err.getMessageSync && err.getMessageSync()) ||\n      err.message\n    const start = errMsg.indexOf(': ')\n    const end = errMsg.indexOf('\\n')\n    const message = start > 0 && end > 0 ? errMsg.slice(start + 2, end) : errMsg\n    const category =\n      message.toLowerCase().includes('connection') ||\n      errMsg.includes('java.net.UnknownHostException')\n        ? 'OperationalError'\n        : 'ProgrammerError'\n    throw new Oops({\n      message,\n      context,\n      category,\n      cause: err,\n    })\n  }\n}\n"],"mappings":"AAAA,SAAS,YAAY;AAEd,SAAS,YAAY,SAAiC;AAC3D,SAAO,CAAC,QAAa;AACnB,UAAM,SACH,IAAI,SAAS,IAAI,MAAM,kBAAkB,IAAI,MAAM,eAAe,KAClE,IAAI,kBAAkB,IAAI,eAAe,KAC1C,IAAI;AACN,UAAM,QAAQ,OAAO,QAAQ,IAAI;AACjC,UAAM,MAAM,OAAO,QAAQ,IAAI;AAC/B,UAAM,UAAU,QAAQ,KAAK,MAAM,IAAI,OAAO,MAAM,QAAQ,GAAG,GAAG,IAAI;AACtE,UAAM,WACJ,QAAQ,YAAY,EAAE,SAAS,YAAY,KAC3C,OAAO,SAAS,+BAA+B,IAC3C,qBACA;AACN,UAAM,IAAI,KAAK;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/handleError.ts"],"sourcesContent":["import { Oops } from 'oops-error'\n\ntype JavaBridgeError = {\n  message?: string\n  cause?: { getMessageSync?: () => string }\n  getMessageSync?: () => string\n}\n\nexport function handleError(context: Record<string, unknown>) {\n  return (err: unknown) => {\n    const e = err as JavaBridgeError\n    const errMsg: string =\n      e.cause?.getMessageSync?.() ??\n      e.getMessageSync?.() ??\n      e.message ??\n      String(err)\n    const start = errMsg.indexOf(': ')\n    const end = errMsg.indexOf('\\n')\n    const message = start > 0 && end > 0 ? errMsg.slice(start + 2, end) : errMsg\n    const category =\n      message.toLowerCase().includes('connection') ||\n      errMsg.includes('java.net.UnknownHostException')\n        ? 'OperationalError'\n        : 'ProgrammerError'\n    throw new Oops({\n      message,\n      context,\n      category,\n      cause: err instanceof Error ? err : new Error(String(err)),\n    })\n  }\n}\n"],"mappings":"AAAA,SAAS,YAAY;AAQd,SAAS,YAAY,SAAkC;AAC5D,SAAO,CAAC,QAAiB;AACvB,UAAM,IAAI;AACV,UAAM,SACJ,EAAE,OAAO,iBAAiB,KAC1B,EAAE,iBAAiB,KACnB,EAAE,WACF,OAAO,GAAG;AACZ,UAAM,QAAQ,OAAO,QAAQ,IAAI;AACjC,UAAM,MAAM,OAAO,QAAQ,IAAI;AAC/B,UAAM,UAAU,QAAQ,KAAK,MAAM,IAAI,OAAO,MAAM,QAAQ,GAAG,GAAG,IAAI;AACtE,UAAM,WACJ,QAAQ,YAAY,EAAE,SAAS,YAAY,KAC3C,OAAO,SAAS,+BAA+B,IAC3C,qBACA;AACN,UAAM,IAAI,KAAK;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,eAAe,QAAQ,MAAM,IAAI,MAAM,OAAO,GAAG,CAAC;AAAA,IAC3D,CAAC;AAAA,EACH;AACF;","names":[]}

package/dist-esm/lib/ifs/read_stream.d.ts

@@ -1,8 +1,13 @@
+import { Readable } from 'stream';
 import { IfsReadStream as IfsReadStream$1 } from '../../java/JT400.js';
 
 type Opt = {
     ifsReadStream: Promise<IfsReadStream$1>;
 };
-declare function IfsReadStream(opt: Opt): void;
+declare class IfsReadStream extends Readable {
+    private readonly _ifsReadStream;
+    constructor(opt: Opt);
+    _read(): void;
+}
 
 export { IfsReadStream };

package/dist-esm/lib/ifs/read_stream.js

@@ -1,27 +1,28 @@
-import util from "util";
 import { Readable } from "stream";
-function IfsReadStream(opt) {
-  Readable.call(this, { objectMode: false });
-  this._ifsReadStream = opt.ifsReadStream;
+class IfsReadStream extends Readable {
+  _ifsReadStream;
+  constructor(opt) {
+    super({ objectMode: false });
+    this._ifsReadStream = opt.ifsReadStream;
+  }
+  _read() {
+    this._ifsReadStream.then(
+      (stream) => stream.read().then((res) => {
+        const raw = res;
+        if (raw == null) {
+          this.push(null);
+          return;
+        }
+        const buf = Buffer.isBuffer(raw) ? raw : raw instanceof Uint8Array ? Buffer.from(raw) : Buffer.from(raw);
+        if (buf.length === 0) {
+          this.push(null);
+          return;
+        }
+        this.push(buf);
+      })
+    ).catch((err) => this.emit("error", err));
+  }
 }
-util.inherits(IfsReadStream, Readable);
-IfsReadStream.prototype._read = function() {
-  const streamPromise = this._ifsReadStream;
-  streamPromise.then(
-    (stream) => stream.read().then((res) => {
-      if (res == null) {
-        this.push(null);
-        return;
-      }
-      const buf = Buffer.isBuffer(res) ? res : res instanceof Uint8Array ? Buffer.from(res) : Buffer.from(res);
-      if (buf.length === 0) {
-        this.push(null);
-        return;
-      }
-      this.push(buf);
-    })
-  ).catch((err) => this.emit("error", err));
-};
 export {
   IfsReadStream
 };

package/dist-esm/lib/ifs/read_stream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../ts-src/lib/ifs/read_stream.ts"],"sourcesContent":["import util from 'util'\nimport { Readable } from 'stream'\nimport { IfsReadStream as IfsReadStreamType } from '../../java/JT400.js'\n\ntype Opt = {\n  ifsReadStream: Promise<IfsReadStreamType>\n}\n\nexport function IfsReadStream(opt: Opt) {\n  Readable.call(this, { objectMode: false })\n  this._ifsReadStream = opt.ifsReadStream\n}\n\nutil.inherits(IfsReadStream, Readable)\n\nIfsReadStream.prototype._read = function () {\n  const streamPromise: Promise<IfsReadStreamType> = this._ifsReadStream\n  streamPromise\n    .then((stream) =>\n      stream.read().then((res: any) => {\n        // java-bridge convierte byte[] -> Buffer automáticamente\n        if (res == null) {\n          this.push(null) // EOF\n          return\n        }\n\n        const buf =\n          Buffer.isBuffer(res) ? res : res instanceof Uint8Array ? Buffer.from(res) : Buffer.from(res as any)\n\n        if (buf.length === 0) {\n          this.push(null) // EOF defensivo si llega vacío\n          return\n        }\n\n        this.push(buf)\n      }),\n    )\n    .catch((err: any) => this.emit('error', err))\n}\n"],"mappings":"AAAA,OAAO,UAAU;AACjB,SAAS,gBAAgB;AAOlB,SAAS,cAAc,KAAU;AACtC,WAAS,KAAK,MAAM,EAAE,YAAY,MAAM,CAAC;AACzC,OAAK,iBAAiB,IAAI;AAC5B;AAEA,KAAK,SAAS,eAAe,QAAQ;AAErC,cAAc,UAAU,QAAQ,WAAY;AAC1C,QAAM,gBAA4C,KAAK;AACvD,gBACG;AAAA,IAAK,CAAC,WACL,OAAO,KAAK,EAAE,KAAK,CAAC,QAAa;AAE/B,UAAI,OAAO,MAAM;AACf,aAAK,KAAK,IAAI;AACd;AAAA,MACF;AAEA,YAAM,MACJ,OAAO,SAAS,GAAG,IAAI,MAAM,eAAe,aAAa,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,GAAU;AAEpG,UAAI,IAAI,WAAW,GAAG;AACpB,aAAK,KAAK,IAAI;AACd;AAAA,MACF;AAEA,WAAK,KAAK,GAAG;AAAA,IACf,CAAC;AAAA,EACH,EACC,MAAM,CAAC,QAAa,KAAK,KAAK,SAAS,GAAG,CAAC;AAChD;","names":[]}
+{"version":3,"sources":["../../../ts-src/lib/ifs/read_stream.ts"],"sourcesContent":["import { Readable } from 'stream'\nimport { IfsReadStream as IfsReadStreamJava } from '../../java/JT400.js'\n\ntype Opt = {\n  ifsReadStream: Promise<IfsReadStreamJava>\n}\n\nexport class IfsReadStream extends Readable {\n  private readonly _ifsReadStream: Promise<IfsReadStreamJava>\n\n  constructor(opt: Opt) {\n    super({ objectMode: false })\n    this._ifsReadStream = opt.ifsReadStream\n  }\n\n  _read() {\n    this._ifsReadStream\n      .then((stream) =>\n        stream.read().then((res) => {\n          // Cast to unknown: java-bridge may return Buffer, Uint8Array, or raw byte[] depending on JVM version\n          const raw: unknown = res\n          if (raw == null) {\n            this.push(null)\n            return\n          }\n\n          const buf =\n            Buffer.isBuffer(raw)\n              ? raw\n              : raw instanceof Uint8Array\n                ? Buffer.from(raw)\n                : Buffer.from(raw as ArrayBuffer)\n\n          if (buf.length === 0) {\n            this.push(null)\n            return\n          }\n\n          this.push(buf)\n        }),\n      )\n      .catch((err: unknown) => this.emit('error', err))\n  }\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAOlB,MAAM,sBAAsB,SAAS;AAAA,EACzB;AAAA,EAEjB,YAAY,KAAU;AACpB,UAAM,EAAE,YAAY,MAAM,CAAC;AAC3B,SAAK,iBAAiB,IAAI;AAAA,EAC5B;AAAA,EAEA,QAAQ;AACN,SAAK,eACF;AAAA,MAAK,CAAC,WACL,OAAO,KAAK,EAAE,KAAK,CAAC,QAAQ;AAE1B,cAAM,MAAe;AACrB,YAAI,OAAO,MAAM;AACf,eAAK,KAAK,IAAI;AACd;AAAA,QACF;AAEA,cAAM,MACJ,OAAO,SAAS,GAAG,IACf,MACA,eAAe,aACb,OAAO,KAAK,GAAG,IACf,OAAO,KAAK,GAAkB;AAEtC,YAAI,IAAI,WAAW,GAAG;AACpB,eAAK,KAAK,IAAI;AACd;AAAA,QACF;AAEA,aAAK,KAAK,GAAG;AAAA,MACf,CAAC;AAAA,IACH,EACC,MAAM,CAAC,QAAiB,KAAK,KAAK,SAAS,GAAG,CAAC;AAAA,EACpD;AACF;","names":[]}

package/dist-esm/lib/ifs/write_stream.d.ts

@@ -1,8 +1,14 @@
+import { Writable } from 'stream';
 import { IfsWriteStream as IfsWriteStream$1 } from '../../java/JT400.js';
 
 type Opt = {
     ifsWriteStream: Promise<IfsWriteStream$1>;
 };
-declare function IfsWriteStream(opt: Opt): void;
+declare class IfsWriteStream extends Writable {
+    private readonly _ifsWriteStream;
+    constructor(opt: Opt);
+    _write(chunk: Buffer, _: BufferEncoding, next: (err?: Error | null) => void): void;
+    _final(done: (err?: Error | null) => void): void;
+}
 
 export { IfsWriteStream };

package/dist-esm/lib/ifs/write_stream.js

@@ -1,18 +1,17 @@
-import util from "util";
-import FlushWritable from "flushwritable";
-function IfsWriteStream(opt) {
-  FlushWritable.call(this, { objectMode: false });
-  this._ifsWriteStream = opt.ifsWriteStream;
+import { Writable } from "stream";
+class IfsWriteStream extends Writable {
+  _ifsWriteStream;
+  constructor(opt) {
+    super({ objectMode: false });
+    this._ifsWriteStream = opt.ifsWriteStream;
+  }
+  _write(chunk, _, next) {
+    this._ifsWriteStream.then((stream) => stream.write(chunk)).then(() => next()).catch((err) => next(err));
+  }
+  _final(done) {
+    this._ifsWriteStream.then((stream) => stream.flush()).then(() => done()).catch((err) => done(err));
+  }
 }
-util.inherits(IfsWriteStream, FlushWritable);
-IfsWriteStream.prototype._write = function(chunk, _, next) {
-  const writeStream = this._ifsWriteStream;
-  writeStream.then((stream) => stream.write(chunk)).then(() => next()).catch((err) => this.emit("error", err));
-};
-IfsWriteStream.prototype._flush = function(done) {
-  const writeStream = this._ifsWriteStream;
-  writeStream.then((stream) => stream.flush()).then(() => done()).catch((err) => done(err));
-};
 export {
   IfsWriteStream
 };

package/dist-esm/lib/ifs/write_stream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../ts-src/lib/ifs/write_stream.ts"],"sourcesContent":["import { IfsWriteStream as IfsWriteStreamType } from '../../java/JT400.js'\nimport util from 'util'\nimport FlushWritable from 'flushwritable'\n\ntype Opt = {\n  ifsWriteStream: Promise<IfsWriteStreamType>\n}\n\nexport function IfsWriteStream(opt: Opt) {\n  FlushWritable.call(this, { objectMode: false })\n  this._ifsWriteStream = opt.ifsWriteStream\n}\n\nutil.inherits(IfsWriteStream, FlushWritable)\n\nIfsWriteStream.prototype._write = function (\n  chunk: Buffer,\n  _: any,\n  next: (err?: any) => void,\n) {\n  const writeStream: Promise<IfsWriteStreamType> = this._ifsWriteStream\n  writeStream\n    .then((stream) => stream.write(chunk)) // Buffer -> byte[] (auto por java-bridge)\n    .then(() => next())\n    .catch((err) => this.emit('error', err))\n}\n\nIfsWriteStream.prototype._flush = function (done: (err?: any) => void) {\n  const writeStream: Promise<IfsWriteStreamType> = this._ifsWriteStream\n  writeStream\n    .then((stream) => stream.flush())\n    .then(() => done())\n    .catch((err) => done(err))\n}\n"],"mappings":"AACA,OAAO,UAAU;AACjB,OAAO,mBAAmB;AAMnB,SAAS,eAAe,KAAU;AACvC,gBAAc,KAAK,MAAM,EAAE,YAAY,MAAM,CAAC;AAC9C,OAAK,kBAAkB,IAAI;AAC7B;AAEA,KAAK,SAAS,gBAAgB,aAAa;AAE3C,eAAe,UAAU,SAAS,SAChC,OACA,GACA,MACA;AACA,QAAM,cAA2C,KAAK;AACtD,cACG,KAAK,CAAC,WAAW,OAAO,MAAM,KAAK,CAAC,EACpC,KAAK,MAAM,KAAK,CAAC,EACjB,MAAM,CAAC,QAAQ,KAAK,KAAK,SAAS,GAAG,CAAC;AAC3C;AAEA,eAAe,UAAU,SAAS,SAAU,MAA2B;AACrE,QAAM,cAA2C,KAAK;AACtD,cACG,KAAK,CAAC,WAAW,OAAO,MAAM,CAAC,EAC/B,KAAK,MAAM,KAAK,CAAC,EACjB,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC;AAC7B;","names":[]}
+{"version":3,"sources":["../../../ts-src/lib/ifs/write_stream.ts"],"sourcesContent":["import { Writable } from 'stream'\nimport { IfsWriteStream as IfsWriteStreamJava } from '../../java/JT400.js'\n\ntype Opt = {\n  ifsWriteStream: Promise<IfsWriteStreamJava>\n}\n\nexport class IfsWriteStream extends Writable {\n  private readonly _ifsWriteStream: Promise<IfsWriteStreamJava>\n\n  constructor(opt: Opt) {\n    super({ objectMode: false })\n    this._ifsWriteStream = opt.ifsWriteStream\n  }\n\n  _write(chunk: Buffer, _: BufferEncoding, next: (err?: Error | null) => void) {\n    this._ifsWriteStream\n      .then((stream) => stream.write(chunk))\n      .then(() => next())\n      .catch((err) => next(err))\n  }\n\n  _final(done: (err?: Error | null) => void) {\n    this._ifsWriteStream\n      .then((stream) => stream.flush())\n      .then(() => done())\n      .catch((err) => done(err))\n  }\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAOlB,MAAM,uBAAuB,SAAS;AAAA,EAC1B;AAAA,EAEjB,YAAY,KAAU;AACpB,UAAM,EAAE,YAAY,MAAM,CAAC;AAC3B,SAAK,kBAAkB,IAAI;AAAA,EAC7B;AAAA,EAEA,OAAO,OAAe,GAAmB,MAAoC;AAC3E,SAAK,gBACF,KAAK,CAAC,WAAW,OAAO,MAAM,KAAK,CAAC,EACpC,KAAK,MAAM,KAAK,CAAC,EACjB,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC;AAAA,EAC7B;AAAA,EAEA,OAAO,MAAoC;AACzC,SAAK,gBACF,KAAK,CAAC,WAAW,OAAO,MAAM,CAAC,EAC/B,KAAK,MAAM,KAAK,CAAC,EACjB,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC;AAAA,EAC7B;AACF;","names":[]}

package/dist-esm/lib/inMemoryConnection.d.ts

@@ -7,7 +7,7 @@ import './baseConnection.types.js';
 import './ifs/types.js';
 
 interface InMemoryConnection extends Connection {
-    mockPgm: (programName: string, fn: (input: any) => any) => InMemoryConnection;
+    mockPgm: (programName: string, fn: (input: Record<string, unknown>, timeout?: number) => unknown) => InMemoryConnection;
 }
 declare function createInMemoryConnection(jt400Factory: JavaBridge, logger: Logger): InMemoryConnection;
 

package/dist-esm/lib/inMemoryConnection.js

@@ -16,19 +16,19 @@ function createInMemoryConnection(jt400Factory, logger) {
       const mockFunc = pgmMockRegistry[opt.programName];
       if (mockFunc) {
         const res = mockFunc(params, timeout);
-        return res.then ? res : Promise.resolve(res);
+        return typeof res.then === "function" ? res : Promise.resolve(res);
       }
       return defaultFunc(params, timeout);
     };
   };
-  const inMemoryconnection = {
+  const inMemoryConnection = {
     ...instance,
     mockPgm(programName, func) {
       pgmMockRegistry[programName] = func;
-      return inMemoryconnection;
+      return inMemoryConnection;
     }
   };
-  return inMemoryconnection;
+  return inMemoryConnection;
 }
 export {
   createInMemoryConnection

package/dist-esm/lib/inMemoryConnection.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/inMemoryConnection.ts"],"sourcesContent":["import { JavaBridge } from '../java/index.js'\nimport { createConnection } from './connection.js'\nimport { Connection } from './connection.types.js'\nimport { createStandardInsertList } from './insertList.js'\nimport { Logger } from './logger.js'\n\nexport interface InMemoryConnection extends Connection {\n  mockPgm: (programName: string, fn: (input: any) => any) => InMemoryConnection\n}\n\nexport function createInMemoryConnection(\n  jt400Factory: JavaBridge,\n  logger: Logger,\n): InMemoryConnection {\n  const javaCon = jt400Factory.createInMemoryConnection()\n  const instance = createConnection({\n    connection: javaCon,\n    insertListFun: createStandardInsertList,\n    logger,\n    inMemory: true,\n  })\n  const pgmMockRegistry = {}\n\n  const defaultPgm = instance.defineProgram\n  instance.defineProgram = function (opt) {\n    const defaultFunc = defaultPgm(opt)\n    return function (params, timeout = 3) {\n      const mockFunc = pgmMockRegistry[opt.programName]\n\n      if (mockFunc) {\n        const res = mockFunc(params, timeout)\n        return res.then ? res : Promise.resolve(res)\n      }\n\n      return defaultFunc(params, timeout)\n    }\n  }\n  const inMemoryconnection: InMemoryConnection = {\n    ...instance,\n    mockPgm(programName, func) {\n      pgmMockRegistry[programName] = func\n      return inMemoryconnection\n    },\n  }\n  return inMemoryconnection\n}\n"],"mappings":"AACA,SAAS,wBAAwB;AAEjC,SAAS,gCAAgC;AAOlC,SAAS,yBACd,cACA,QACoB;AACpB,QAAM,UAAU,aAAa,yBAAyB;AACtD,QAAM,WAAW,iBAAiB;AAAA,IAChC,YAAY;AAAA,IACZ,eAAe;AAAA,IACf;AAAA,IACA,UAAU;AAAA,EACZ,CAAC;AACD,QAAM,kBAAkB,CAAC;AAEzB,QAAM,aAAa,SAAS;AAC5B,WAAS,gBAAgB,SAAU,KAAK;AACtC,UAAM,cAAc,WAAW,GAAG;AAClC,WAAO,SAAU,QAAQ,UAAU,GAAG;AACpC,YAAM,WAAW,gBAAgB,IAAI,WAAW;AAEhD,UAAI,UAAU;AACZ,cAAM,MAAM,SAAS,QAAQ,OAAO;AACpC,eAAO,IAAI,OAAO,MAAM,QAAQ,QAAQ,GAAG;AAAA,MAC7C;AAEA,aAAO,YAAY,QAAQ,OAAO;AAAA,IACpC;AAAA,EACF;AACA,QAAM,qBAAyC;AAAA,IAC7C,GAAG;AAAA,IACH,QAAQ,aAAa,MAAM;AACzB,sBAAgB,WAAW,IAAI;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/inMemoryConnection.ts"],"sourcesContent":["import { JavaBridge } from '../java/index.js'\nimport { createConnection } from './connection.js'\nimport { Connection } from './connection.types.js'\nimport { createStandardInsertList } from './insertList.js'\nimport { Logger } from './logger.js'\n\nexport interface InMemoryConnection extends Connection {\n  mockPgm: (programName: string, fn: (input: Record<string, unknown>, timeout?: number) => unknown) => InMemoryConnection\n}\n\nexport function createInMemoryConnection(\n  jt400Factory: JavaBridge,\n  logger: Logger,\n): InMemoryConnection {\n  const javaCon = jt400Factory.createInMemoryConnection()\n  const instance = createConnection({\n    connection: javaCon,\n    insertListFun: createStandardInsertList,\n    logger,\n    inMemory: true,\n  })\n  const pgmMockRegistry: Record<string, (input: Record<string, unknown>, timeout?: number) => unknown> = {}\n\n  const defaultPgm = instance.defineProgram\n  instance.defineProgram = function (opt) {\n    const defaultFunc = defaultPgm(opt)\n    return function (params, timeout = 3) {\n      const mockFunc = pgmMockRegistry[opt.programName]\n\n      if (mockFunc) {\n        const res = mockFunc(params, timeout)\n        return (typeof (res as Promise<unknown>).then === 'function')\n          ? (res as Promise<unknown>)\n          : Promise.resolve(res)\n      }\n\n      return defaultFunc(params, timeout)\n    }\n  }\n  const inMemoryConnection: InMemoryConnection = {\n    ...instance,\n    mockPgm(programName, func) {\n      pgmMockRegistry[programName] = func\n      return inMemoryConnection\n    },\n  }\n  return inMemoryConnection\n}\n"],"mappings":"AACA,SAAS,wBAAwB;AAEjC,SAAS,gCAAgC;AAOlC,SAAS,yBACd,cACA,QACoB;AACpB,QAAM,UAAU,aAAa,yBAAyB;AACtD,QAAM,WAAW,iBAAiB;AAAA,IAChC,YAAY;AAAA,IACZ,eAAe;AAAA,IACf;AAAA,IACA,UAAU;AAAA,EACZ,CAAC;AACD,QAAM,kBAAiG,CAAC;AAExG,QAAM,aAAa,SAAS;AAC5B,WAAS,gBAAgB,SAAU,KAAK;AACtC,UAAM,cAAc,WAAW,GAAG;AAClC,WAAO,SAAU,QAAQ,UAAU,GAAG;AACpC,YAAM,WAAW,gBAAgB,IAAI,WAAW;AAEhD,UAAI,UAAU;AACZ,cAAM,MAAM,SAAS,QAAQ,OAAO;AACpC,eAAQ,OAAQ,IAAyB,SAAS,aAC7C,MACD,QAAQ,QAAQ,GAAG;AAAA,MACzB;AAEA,aAAO,YAAY,QAAQ,OAAO;AAAA,IACpC;AAAA,EACF;AACA,QAAM,qBAAyC;AAAA,IAC7C,GAAG;AAAA,IACH,QAAQ,aAAa,MAAM;AACzB,sBAAgB,WAAW,IAAI;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AACA,SAAO;AACT;","names":[]}

package/dist-esm/lib/insertList.js

@@ -3,6 +3,10 @@ const createInsertListInOneStatment = (jt400) => (tableName, idColumn, list) =>
   if (!list || list.length === 0) {
     return Promise.resolve([]);
   }
+  const firstKeys = Object.keys(list[0]).join(",");
+  if (list.some((r) => Object.keys(r).join(",") !== firstKeys)) {
+    return Promise.reject(new Error("All records must have the same keys in the same order"));
+  }
   const sql = "SELECT " + idColumn + " FROM NEW TABLE(" + toInsertSql(tableName, list) + ")";
   const params = list.map(Object.values).reduce((arr, valueArr) => {
     return arr.concat(valueArr);
@@ -13,19 +17,14 @@ const createInsertListInOneStatment = (jt400) => (tableName, idColumn, list) =>
 };
 const createStandardInsertList = (jt400) => (tableName, _, list) => {
   const idList = [];
-  const pushToIdList = idList.push.bind(idList);
-  return list.map((record) => {
-    return {
-      sql: toInsertSql(tableName, [record]),
-      values: Object.values(record)
-    };
-  }).reduce((soFar, sqlObj) => {
-    return soFar.then(() => {
-      return jt400.insertAndGetId(sqlObj.sql, sqlObj.values);
-    }).then(pushToIdList);
-  }, Promise.resolve()).then(() => {
-    return idList;
-  });
+  return list.map((record) => ({
+    sql: toInsertSql(tableName, [record]),
+    values: Object.values(record)
+  })).reduce((soFar, sqlObj) => {
+    return soFar.then(() => jt400.insertAndGetId(sqlObj.sql, sqlObj.values)).then((id) => {
+      idList.push(id);
+    });
+  }, Promise.resolve()).then(() => idList);
 };
 export {
   createInsertListInOneStatment,

package/dist-esm/lib/insertList.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/insertList.ts"],"sourcesContent":["import { BaseConnection, InsertList } from './baseConnection.types.js'\nimport { toInsertSql } from './sqlutil.js'\n\nexport type CreateInsertList = (connection: BaseConnection) => InsertList\nexport const createInsertListInOneStatment: CreateInsertList =\n  (jt400) => (tableName, idColumn, list) => {\n    if (!list || list.length === 0) {\n      return Promise.resolve([])\n    }\n    const sql =\n      'SELECT ' +\n      idColumn +\n      ' FROM NEW TABLE(' +\n      toInsertSql(tableName, list) +\n      ')'\n    const params = list.map(Object.values).reduce((arr, valueArr) => {\n      return arr.concat(valueArr)\n    }, [])\n\n    return jt400.query<any>(sql, params).then((idList) => {\n      return idList.map((idObj) => idObj[idColumn.toUpperCase()])\n    })\n  }\n\nexport const createStandardInsertList: CreateInsertList =\n  (jt400) => (tableName, _, list) => {\n    const idList = []\n    const pushToIdList = idList.push.bind(idList)\n\n    return list\n      .map((record) => {\n        return {\n          sql: toInsertSql(tableName, [record]),\n          values: Object.values(record),\n        }\n      })\n      .reduce((soFar, sqlObj: any) => {\n        return soFar\n          .then(() => {\n            return jt400.insertAndGetId(sqlObj.sql, sqlObj.values)\n          })\n          .then(pushToIdList)\n      }, Promise.resolve())\n      .then(() => {\n        return idList\n      })\n  }\n"],"mappings":"AACA,SAAS,mBAAmB;AAGrB,MAAM,gCACX,CAAC,UAAU,CAAC,WAAW,UAAU,SAAS;AACxC,MAAI,CAAC,QAAQ,KAAK,WAAW,GAAG;AAC9B,WAAO,QAAQ,QAAQ,CAAC,CAAC;AAAA,EAC3B;AACA,QAAM,MACJ,YACA,WACA,qBACA,YAAY,WAAW,IAAI,IAC3B;AACF,QAAM,SAAS,KAAK,IAAI,OAAO,MAAM,EAAE,OAAO,CAAC,KAAK,aAAa;AAC/D,WAAO,IAAI,OAAO,QAAQ;AAAA,EAC5B,GAAG,CAAC,CAAC;AAEL,SAAO,MAAM,MAAW,KAAK,MAAM,EAAE,KAAK,CAAC,WAAW;AACpD,WAAO,OAAO,IAAI,CAAC,UAAU,MAAM,SAAS,YAAY,CAAC,CAAC;AAAA,EAC5D,CAAC;AACH;AAEK,MAAM,2BACX,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS;AACjC,QAAM,SAAS,CAAC;AAChB,QAAM,eAAe,OAAO,KAAK,KAAK,MAAM;AAE5C,SAAO,KACJ,IAAI,CAAC,WAAW;AACf,WAAO;AAAA,MACL,KAAK,YAAY,WAAW,CAAC,MAAM,CAAC;AAAA,MACpC,QAAQ,OAAO,OAAO,MAAM;AAAA,IAC9B;AAAA,EACF,CAAC,EACA,OAAO,CAAC,OAAO,WAAgB;AAC9B,WAAO,MACJ,KAAK,MAAM;AACV,aAAO,MAAM,eAAe,OAAO,KAAK,OAAO,MAAM;AAAA,IACvD,CAAC,EACA,KAAK,YAAY;AAAA,EACtB,GAAG,QAAQ,QAAQ,CAAC,EACnB,KAAK,MAAM;AACV,WAAO;AAAA,EACT,CAAC;AACL;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/insertList.ts"],"sourcesContent":["import { BaseConnection, InsertList, Param } from './baseConnection.types.js'\nimport { toInsertSql } from './sqlutil.js'\n\nexport type CreateInsertList = (connection: BaseConnection) => InsertList\nexport const createInsertListInOneStatment: CreateInsertList =\n  (jt400) => (tableName, idColumn, list) => {\n    if (!list || list.length === 0) {\n      return Promise.resolve([])\n    }\n    const firstKeys = Object.keys(list[0]).join(',')\n    if (list.some((r) => Object.keys(r).join(',') !== firstKeys)) {\n      return Promise.reject(new Error('All records must have the same keys in the same order'))\n    }\n    const sql =\n      'SELECT ' +\n      idColumn +\n      ' FROM NEW TABLE(' +\n      toInsertSql(tableName, list) +\n      ')'\n    const params = list.map(Object.values).reduce((arr: Param[], valueArr) => {\n      return arr.concat(valueArr as Param[])\n    }, [])\n\n    return jt400.query<Record<string, number>>(sql, params).then((idList) => {\n      return idList.map((idObj) => idObj[idColumn.toUpperCase()])\n    })\n  }\n\nexport const createStandardInsertList: CreateInsertList =\n  (jt400) => (tableName, _, list) => {\n    const idList: number[] = []\n\n    return list\n      .map((record) => ({\n        sql: toInsertSql(tableName, [record]),\n        values: Object.values(record) as Param[],\n      }))\n      .reduce<Promise<void>>((soFar, sqlObj) => {\n        return soFar\n          .then(() => jt400.insertAndGetId(sqlObj.sql, sqlObj.values))\n          .then((id) => { idList.push(id) })\n      }, Promise.resolve())\n      .then(() => idList)\n  }\n"],"mappings":"AACA,SAAS,mBAAmB;AAGrB,MAAM,gCACX,CAAC,UAAU,CAAC,WAAW,UAAU,SAAS;AACxC,MAAI,CAAC,QAAQ,KAAK,WAAW,GAAG;AAC9B,WAAO,QAAQ,QAAQ,CAAC,CAAC;AAAA,EAC3B;AACA,QAAM,YAAY,OAAO,KAAK,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG;AAC/C,MAAI,KAAK,KAAK,CAAC,MAAM,OAAO,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,SAAS,GAAG;AAC5D,WAAO,QAAQ,OAAO,IAAI,MAAM,uDAAuD,CAAC;AAAA,EAC1F;AACA,QAAM,MACJ,YACA,WACA,qBACA,YAAY,WAAW,IAAI,IAC3B;AACF,QAAM,SAAS,KAAK,IAAI,OAAO,MAAM,EAAE,OAAO,CAAC,KAAc,aAAa;AACxE,WAAO,IAAI,OAAO,QAAmB;AAAA,EACvC,GAAG,CAAC,CAAC;AAEL,SAAO,MAAM,MAA8B,KAAK,MAAM,EAAE,KAAK,CAAC,WAAW;AACvE,WAAO,OAAO,IAAI,CAAC,UAAU,MAAM,SAAS,YAAY,CAAC,CAAC;AAAA,EAC5D,CAAC;AACH;AAEK,MAAM,2BACX,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS;AACjC,QAAM,SAAmB,CAAC;AAE1B,SAAO,KACJ,IAAI,CAAC,YAAY;AAAA,IAChB,KAAK,YAAY,WAAW,CAAC,MAAM,CAAC;AAAA,IACpC,QAAQ,OAAO,OAAO,MAAM;AAAA,EAC9B,EAAE,EACD,OAAsB,CAAC,OAAO,WAAW;AACxC,WAAO,MACJ,KAAK,MAAM,MAAM,eAAe,OAAO,KAAK,OAAO,MAAM,CAAC,EAC1D,KAAK,CAAC,OAAO;AAAE,aAAO,KAAK,EAAE;AAAA,IAAE,CAAC;AAAA,EACrC,GAAG,QAAQ,QAAQ,CAAC,EACnB,KAAK,MAAM,MAAM;AACtB;","names":[]}

package/dist-esm/lib/jdbcstream.d.ts

@@ -1,3 +1,18 @@
-declare function JdbcStream(opt: any): void;
+import { Readable } from 'stream';
+import { ResultStream } from '../java/JT400.js';
+
+type Opt = {
+    jdbcStream?: ResultStream;
+    jdbcStreamPromise?: Promise<ResultStream>;
+};
+declare class JdbcStream extends Readable {
+    private _jdbcStream?;
+    private _jdbcStreamPromise?;
+    private _closed;
+    constructor(opt: Opt);
+    close(): void;
+    private _readFromStream;
+    _read(): void;
+}
 
 export { JdbcStream };

package/dist-esm/lib/jdbcstream.js

@@ -1,42 +1,37 @@
-import { inherits } from "util";
 import { Readable } from "stream";
-function JdbcStream(opt) {
-  Readable.call(this, { objectMode: false });
-  this._jdbcStream = opt.jdbcStream;
-  this._jdbcStreamPromise = opt.jdbcStreamPromise;
-}
-inherits(JdbcStream, Readable);
-function read(context) {
-  if (context._closed) {
-    context._jdbcStream.close().catch((err) => {
-      if (err) {
-        context.emit("error", err);
-      }
-    });
-    context.push(null);
-  } else {
-    context._jdbcStream.read().then((res) => {
-      context.push(res);
-    }).catch((err) => {
-      context.emit("error", err);
-    });
+class JdbcStream extends Readable {
+  _jdbcStream;
+  _jdbcStreamPromise;
+  _closed = false;
+  constructor(opt) {
+    super({ objectMode: false });
+    this._jdbcStream = opt.jdbcStream;
+    this._jdbcStreamPromise = opt.jdbcStreamPromise;
   }
-}
-JdbcStream.prototype.close = function() {
-  this._closed = true;
-};
-JdbcStream.prototype._read = function() {
-  if (!this._jdbcStream) {
-    this._jdbcStreamPromise.then((stream) => {
-      this._jdbcStream = stream;
-      read(this);
-    }).catch((err) => {
-      this.emit("error", err);
-    });
-  } else {
-    read(this);
+  close() {
+    this._closed = true;
   }
-};
+  _readFromStream(stream) {
+    if (this._closed) {
+      stream.close().catch((err) => {
+        if (err) this.emit("error", err);
+      });
+      this.push(null);
+    } else {
+      stream.read().then((res) => this.push(res)).catch((err) => this.emit("error", err));
+    }
+  }
+  _read() {
+    if (!this._jdbcStream) {
+      this._jdbcStreamPromise.then((stream) => {
+        this._jdbcStream = stream;
+        this._readFromStream(stream);
+      }).catch((err) => this.emit("error", err));
+    } else {
+      this._readFromStream(this._jdbcStream);
+    }
+  }
+}
 export {
   JdbcStream
 };

package/dist-esm/lib/jdbcstream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/jdbcstream.ts"],"sourcesContent":["import { inherits } from 'util'\nimport { Readable } from 'stream'\n\nexport function JdbcStream(opt) {\n  Readable.call(this, { objectMode: false })\n  this._jdbcStream = opt.jdbcStream\n  this._jdbcStreamPromise = opt.jdbcStreamPromise\n}\n\ninherits(JdbcStream, Readable)\n\nfunction read(context) {\n  if (context._closed) {\n    context._jdbcStream.close().catch((err) => {\n      if (err) {\n        context.emit('error', err)\n      }\n    })\n    context.push(null)\n  } else {\n    context._jdbcStream\n      .read()\n      .then((res) => {\n        context.push(res)\n      })\n      .catch((err) => {\n        context.emit('error', err)\n      })\n  }\n}\n\nJdbcStream.prototype.close = function () {\n  this._closed = true\n}\n\nJdbcStream.prototype._read = function () {\n  if (!this._jdbcStream) {\n    this._jdbcStreamPromise\n      .then((stream) => {\n        this._jdbcStream = stream\n        read(this)\n      })\n      .catch((err) => {\n        this.emit('error', err)\n      })\n  } else {\n    read(this)\n  }\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AAElB,SAAS,WAAW,KAAK;AAC9B,WAAS,KAAK,MAAM,EAAE,YAAY,MAAM,CAAC;AACzC,OAAK,cAAc,IAAI;AACvB,OAAK,qBAAqB,IAAI;AAChC;AAEA,SAAS,YAAY,QAAQ;AAE7B,SAAS,KAAK,SAAS;AACrB,MAAI,QAAQ,SAAS;AACnB,YAAQ,YAAY,MAAM,EAAE,MAAM,CAAC,QAAQ;AACzC,UAAI,KAAK;AACP,gBAAQ,KAAK,SAAS,GAAG;AAAA,MAC3B;AAAA,IACF,CAAC;AACD,YAAQ,KAAK,IAAI;AAAA,EACnB,OAAO;AACL,YAAQ,YACL,KAAK,EACL,KAAK,CAAC,QAAQ;AACb,cAAQ,KAAK,GAAG;AAAA,IAClB,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,cAAQ,KAAK,SAAS,GAAG;AAAA,IAC3B,CAAC;AAAA,EACL;AACF;AAEA,WAAW,UAAU,QAAQ,WAAY;AACvC,OAAK,UAAU;AACjB;AAEA,WAAW,UAAU,QAAQ,WAAY;AACvC,MAAI,CAAC,KAAK,aAAa;AACrB,SAAK,mBACF,KAAK,CAAC,WAAW;AAChB,WAAK,cAAc;AACnB,WAAK,IAAI;AAAA,IACX,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,WAAK,KAAK,SAAS,GAAG;AAAA,IACxB,CAAC;AAAA,EACL,OAAO;AACL,SAAK,IAAI;AAAA,EACX;AACF;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/jdbcstream.ts"],"sourcesContent":["import { Readable } from 'stream'\nimport { ResultStream } from '../java/JT400.js'\n\ntype Opt = {\n  jdbcStream?: ResultStream\n  jdbcStreamPromise?: Promise<ResultStream>\n}\n\nexport class JdbcStream extends Readable {\n  private _jdbcStream?: ResultStream\n  private _jdbcStreamPromise?: Promise<ResultStream>\n  private _closed = false\n\n  constructor(opt: Opt) {\n    super({ objectMode: false })\n    this._jdbcStream = opt.jdbcStream\n    this._jdbcStreamPromise = opt.jdbcStreamPromise\n  }\n\n  close() {\n    this._closed = true\n  }\n\n  private _readFromStream(stream: ResultStream) {\n    if (this._closed) {\n      stream.close().catch((err) => {\n        if (err) this.emit('error', err)\n      })\n      this.push(null)\n    } else {\n      stream\n        .read()\n        .then((res) => this.push(res))\n        .catch((err) => this.emit('error', err))\n    }\n  }\n\n  _read() {\n    if (!this._jdbcStream) {\n      this._jdbcStreamPromise!\n        .then((stream) => {\n          this._jdbcStream = stream\n          this._readFromStream(stream)\n        })\n        .catch((err) => this.emit('error', err))\n    } else {\n      this._readFromStream(this._jdbcStream)\n    }\n  }\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAQlB,MAAM,mBAAmB,SAAS;AAAA,EAC/B;AAAA,EACA;AAAA,EACA,UAAU;AAAA,EAElB,YAAY,KAAU;AACpB,UAAM,EAAE,YAAY,MAAM,CAAC;AAC3B,SAAK,cAAc,IAAI;AACvB,SAAK,qBAAqB,IAAI;AAAA,EAChC;AAAA,EAEA,QAAQ;AACN,SAAK,UAAU;AAAA,EACjB;AAAA,EAEQ,gBAAgB,QAAsB;AAC5C,QAAI,KAAK,SAAS;AAChB,aAAO,MAAM,EAAE,MAAM,CAAC,QAAQ;AAC5B,YAAI,IAAK,MAAK,KAAK,SAAS,GAAG;AAAA,MACjC,CAAC;AACD,WAAK,KAAK,IAAI;AAAA,IAChB,OAAO;AACL,aACG,KAAK,EACL,KAAK,CAAC,QAAQ,KAAK,KAAK,GAAG,CAAC,EAC5B,MAAM,CAAC,QAAQ,KAAK,KAAK,SAAS,GAAG,CAAC;AAAA,IAC3C;AAAA,EACF;AAAA,EAEA,QAAQ;AACN,QAAI,CAAC,KAAK,aAAa;AACrB,WAAK,mBACF,KAAK,CAAC,WAAW;AAChB,aAAK,cAAc;AACnB,aAAK,gBAAgB,MAAM;AAAA,MAC7B,CAAC,EACA,MAAM,CAAC,QAAQ,KAAK,KAAK,SAAS,GAAG,CAAC;AAAA,IAC3C,OAAO;AACL,WAAK,gBAAgB,KAAK,WAAW;AAAA,IACvC;AAAA,EACF;AACF;","names":[]}

package/dist-esm/lib/jdbcwritestream.d.ts

@@ -1,3 +1,6 @@
-declare function createJdbcWriteStream(batchUpdate: any, statement: any, bufferSize: any): any;
+import { Writable } from 'stream';
+import { BatchUpdate } from './baseConnection.types.js';
+
+declare function createJdbcWriteStream(batchUpdate: BatchUpdate, statement: string, bufferSize?: number): Writable;
 
 export { createJdbcWriteStream };

package/dist-esm/lib/jdbcwritestream.js

@@ -1,24 +1,21 @@
-import FlushWritable from "flushwritable";
-function createJdbcWriteStream(batchUpdate, statement, bufferSize) {
-  bufferSize = bufferSize || 100;
-  const ws = new FlushWritable({ objectMode: true });
+import { Writable } from "stream";
+function createJdbcWriteStream(batchUpdate, statement, bufferSize = 100) {
   let dataBuffer = [];
   function flush(done) {
     const d = dataBuffer;
     dataBuffer = [];
-    batchUpdate(statement, d).then(() => {
-      done();
-    }).catch(done);
+    batchUpdate(statement, d).then(() => done()).catch(done);
   }
-  ws._write = function(chunck, _, next) {
-    dataBuffer.push(chunck);
+  const ws = new Writable({ objectMode: true });
+  ws._write = function(chunk, _, next) {
+    dataBuffer.push(chunk);
     if (dataBuffer.length >= bufferSize) {
       flush(next);
     } else {
       next();
     }
   };
-  ws._flush = function(done) {
+  ws._final = function(done) {
     if (dataBuffer.length) {
       flush(done);
     } else {

package/dist-esm/lib/jdbcwritestream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/jdbcwritestream.ts"],"sourcesContent":["import FlushWritable from 'flushwritable'\n\nexport function createJdbcWriteStream(batchUpdate, statement, bufferSize) {\n  bufferSize = bufferSize || 100\n  const ws = new FlushWritable({ objectMode: true })\n  let dataBuffer: any[] = []\n\n  function flush(done) {\n    const d = dataBuffer\n    dataBuffer = []\n    batchUpdate(statement, d)\n      .then(() => {\n        done()\n      })\n      .catch(done)\n  }\n\n  ws._write = function (chunck, _, next) {\n    dataBuffer.push(chunck)\n    if (dataBuffer.length >= bufferSize) {\n      flush(next)\n    } else {\n      next()\n    }\n  }\n\n  ws._flush = function (done) {\n    if (dataBuffer.length) {\n      flush(done)\n    } else {\n      done()\n    }\n  }\n\n  return ws\n}\n"],"mappings":"AAAA,OAAO,mBAAmB;AAEnB,SAAS,sBAAsB,aAAa,WAAW,YAAY;AACxE,eAAa,cAAc;AAC3B,QAAM,KAAK,IAAI,cAAc,EAAE,YAAY,KAAK,CAAC;AACjD,MAAI,aAAoB,CAAC;AAEzB,WAAS,MAAM,MAAM;AACnB,UAAM,IAAI;AACV,iBAAa,CAAC;AACd,gBAAY,WAAW,CAAC,EACrB,KAAK,MAAM;AACV,WAAK;AAAA,IACP,CAAC,EACA,MAAM,IAAI;AAAA,EACf;AAEA,KAAG,SAAS,SAAU,QAAQ,GAAG,MAAM;AACrC,eAAW,KAAK,MAAM;AACtB,QAAI,WAAW,UAAU,YAAY;AACnC,YAAM,IAAI;AAAA,IACZ,OAAO;AACL,WAAK;AAAA,IACP;AAAA,EACF;AAEA,KAAG,SAAS,SAAU,MAAM;AAC1B,QAAI,WAAW,QAAQ;AACrB,YAAM,IAAI;AAAA,IACZ,OAAO;AACL,WAAK;AAAA,IACP;AAAA,EACF;AAEA,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/jdbcwritestream.ts"],"sourcesContent":["import { Writable } from 'stream'\nimport { BatchUpdate, Param } from './baseConnection.types.js'\n\nexport function createJdbcWriteStream(\n  batchUpdate: BatchUpdate,\n  statement: string,\n  bufferSize: number = 100,\n): Writable {\n  let dataBuffer: Param[][] = []\n\n  function flush(done: (err?: Error | null) => void) {\n    const d = dataBuffer\n    dataBuffer = []\n    batchUpdate(statement, d)\n      .then(() => done())\n      .catch(done)\n  }\n\n  const ws = new Writable({ objectMode: true })\n\n  ws._write = function (chunk: Param[], _: string, next: (err?: Error | null) => void) {\n    dataBuffer.push(chunk)\n    if (dataBuffer.length >= bufferSize) {\n      flush(next)\n    } else {\n      next()\n    }\n  }\n\n  ws._final = function (done: (err?: Error | null) => void) {\n    if (dataBuffer.length) {\n      flush(done)\n    } else {\n      done()\n    }\n  }\n\n  return ws\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAGlB,SAAS,sBACd,aACA,WACA,aAAqB,KACX;AACV,MAAI,aAAwB,CAAC;AAE7B,WAAS,MAAM,MAAoC;AACjD,UAAM,IAAI;AACV,iBAAa,CAAC;AACd,gBAAY,WAAW,CAAC,EACrB,KAAK,MAAM,KAAK,CAAC,EACjB,MAAM,IAAI;AAAA,EACf;AAEA,QAAM,KAAK,IAAI,SAAS,EAAE,YAAY,KAAK,CAAC;AAE5C,KAAG,SAAS,SAAU,OAAgB,GAAW,MAAoC;AACnF,eAAW,KAAK,KAAK;AACrB,QAAI,WAAW,UAAU,YAAY;AACnC,YAAM,IAAI;AAAA,IACZ,OAAO;AACL,WAAK;AAAA,IACP;AAAA,EACF;AAEA,KAAG,SAAS,SAAU,MAAoC;AACxD,QAAI,WAAW,QAAQ;AACrB,YAAM,IAAI;AAAA,IACZ,OAAO;AACL,WAAK;AAAA,IACP;AAAA,EACF;AAEA,SAAO;AACT;","names":[]}

package/dist-esm/lib/logger.d.ts

@@ -1,8 +1,8 @@
 interface Logger {
-    debug: (message: any, ...args: any[]) => void;
-    info: (message: any, ...args: any[]) => void;
-    warn: (message: any, ...args: any[]) => void;
-    error: (message: any, ...args: any[]) => void;
+    debug: (message: unknown, ...args: unknown[]) => void;
+    info: (message: unknown, ...args: unknown[]) => void;
+    warn: (message: unknown, ...args: unknown[]) => void;
+    error: (message: unknown, ...args: unknown[]) => void;
 }
 declare const createDefaultLogger: () => Logger;
 

package/dist-esm/lib/logger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/logger.ts"],"sourcesContent":["export interface Logger {\n  debug: (message: any, ...args: any[]) => void\n  info: (message: any, ...args: any[]) => void\n  warn: (message: any, ...args: any[]) => void\n  error: (message: any, ...args: any[]) => void\n}\n\nexport const createDefaultLogger = (): Logger => {\n  // Default logger that does nothing\n  return {\n    debug: () => {},\n    info: () => {},\n    warn: () => {},\n    error: () => {},\n  }\n}\n"],"mappings":"AAOO,MAAM,sBAAsB,MAAc;AAE/C,SAAO;AAAA,IACL,OAAO,MAAM;AAAA,IAAC;AAAA,IACd,MAAM,MAAM;AAAA,IAAC;AAAA,IACb,MAAM,MAAM;AAAA,IAAC;AAAA,IACb,OAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AACF;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/logger.ts"],"sourcesContent":["export interface Logger {\n  debug: (message: unknown, ...args: unknown[]) => void\n  info: (message: unknown, ...args: unknown[]) => void\n  warn: (message: unknown, ...args: unknown[]) => void\n  error: (message: unknown, ...args: unknown[]) => void\n}\n\nexport const createDefaultLogger = (): Logger => {\n  // Default logger that does nothing\n  return {\n    debug: () => {},\n    info: () => {},\n    warn: () => {},\n    error: () => {},\n  }\n}\n"],"mappings":"AAOO,MAAM,sBAAsB,MAAc;AAE/C,SAAO;AAAA,IACL,OAAO,MAAM;AAAA,IAAC;AAAA,IACd,MAAM,MAAM;AAAA,IAAC;AAAA,IACb,MAAM,MAAM;AAAA,IAAC;AAAA,IACb,OAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AACF;","names":[]}

package/dist-esm/lib/sqlutil.d.ts

@@ -1,3 +1,6 @@
-declare function toInsertSql(tableName: string, records: any[]): string;
+import { Param } from './baseConnection.types.js';
+import 'stream';
+
+declare function toInsertSql(tableName: string, records: Record<string, Param>[]): string;
 
 export { toInsertSql };

package/dist-esm/lib/sqlutil.js

@@ -3,6 +3,7 @@ function recordToValues(record) {
   return "(" + str + ")";
 }
 function toInsertSql(tableName, records) {
+  if (!records.length) throw new Error("toInsertSql requires at least one record");
   const first = records[0];
   const keys = Object.keys(first);
   const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES${records.map(recordToValues).join(", ")}`;

package/dist-esm/lib/sqlutil.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/sqlutil.ts"],"sourcesContent":["function recordToValues(record) {\n  const str = Object.keys(record)\n    .map(() => '?')\n    .join(', ')\n  return '(' + str + ')'\n}\n\n/**\n * Returns insert statement for records\n */\nexport function toInsertSql(tableName: string, records: any[]): string {\n  const first = records[0]\n  const keys = Object.keys(first)\n  const sql = `INSERT INTO ${tableName} (${keys.join(', ')}) VALUES${records\n    .map(recordToValues)\n    .join(', ')}`\n  return sql\n}\n"],"mappings":"AAAA,SAAS,eAAe,QAAQ;AAC9B,QAAM,MAAM,OAAO,KAAK,MAAM,EAC3B,IAAI,MAAM,GAAG,EACb,KAAK,IAAI;AACZ,SAAO,MAAM,MAAM;AACrB;AAKO,SAAS,YAAY,WAAmB,SAAwB;AACrE,QAAM,QAAQ,QAAQ,CAAC;AACvB,QAAM,OAAO,OAAO,KAAK,KAAK;AAC9B,QAAM,MAAM,eAAe,SAAS,KAAK,KAAK,KAAK,IAAI,CAAC,WAAW,QAChE,IAAI,cAAc,EAClB,KAAK,IAAI,CAAC;AACb,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/sqlutil.ts"],"sourcesContent":["import { Param } from './baseConnection.types.js'\n\nfunction recordToValues(record: Record<string, Param>): string {\n  const str = Object.keys(record)\n    .map(() => '?')\n    .join(', ')\n  return '(' + str + ')'\n}\n\nexport function toInsertSql(tableName: string, records: Record<string, Param>[]): string {\n  if (!records.length) throw new Error('toInsertSql requires at least one record')\n  const first = records[0]\n  const keys = Object.keys(first)\n  const sql = `INSERT INTO ${tableName} (${keys.join(', ')}) VALUES${records\n    .map(recordToValues)\n    .join(', ')}`\n  return sql\n}\n"],"mappings":"AAEA,SAAS,eAAe,QAAuC;AAC7D,QAAM,MAAM,OAAO,KAAK,MAAM,EAC3B,IAAI,MAAM,GAAG,EACb,KAAK,IAAI;AACZ,SAAO,MAAM,MAAM;AACrB;AAEO,SAAS,YAAY,WAAmB,SAA0C;AACvF,MAAI,CAAC,QAAQ,OAAQ,OAAM,IAAI,MAAM,0CAA0C;AAC/E,QAAM,QAAQ,QAAQ,CAAC;AACvB,QAAM,OAAO,OAAO,KAAK,KAAK;AAC9B,QAAM,MAAM,eAAe,SAAS,KAAK,KAAK,KAAK,IAAI,CAAC,WAAW,QAChE,IAAI,cAAc,EAClB,KAAK,IAAI,CAAC;AACb,SAAO;AACT;","names":[]}

package/dist-esm/lib/streamTransformers.d.ts

@@ -1,5 +1,6 @@
 import { Transform } from 'stream';
+import { Metadata } from './baseConnection.types.js';
 
-declare function arrayToObject(metadata: any): Transform;
+declare function arrayToObject(metadata: Metadata[]): Transform;
 
 export { arrayToObject };

package/dist-esm/lib/streamTransformers.js

@@ -21,7 +21,7 @@ function arrayToObject(metadata) {
         }
         callback(null, obj);
       } catch (err) {
-        callback(err);
+        callback(err instanceof Error ? err : new Error(String(err)));
       }
     }
   });

package/dist-esm/lib/streamTransformers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/streamTransformers.ts"],"sourcesContent":["import { Transform } from 'stream'\n\nexport function arrayToObject(metadata) {\n  const columnNames = metadata.map((md) => md.name)\n\n  const transformer = new Transform({\n    objectMode: true,\n    transform(chunk, _, callback) {\n      try {\n        if (!Array.isArray(chunk)) {\n          return callback(new Error('Expected an array chunk as input'))\n        }\n\n        if (chunk.length !== columnNames.length) {\n          return callback(\n            new Error(\n              `Array chunk length ${chunk.length} does not match columns length ${columnNames.length}`,\n            ),\n          )\n        }\n\n        const obj = {}\n        for (let i = 0; i < columnNames.length; i++) {\n          obj[columnNames[i]] = chunk[i]\n        }\n\n        callback(null, obj)\n      } catch (err) {\n        callback(err)\n      }\n    },\n  })\n\n  return transformer\n}\n"],"mappings":"AAAA,SAAS,iBAAiB;AAEnB,SAAS,cAAc,UAAU;AACtC,QAAM,cAAc,SAAS,IAAI,CAAC,OAAO,GAAG,IAAI;AAEhD,QAAM,cAAc,IAAI,UAAU;AAAA,IAChC,YAAY;AAAA,IACZ,UAAU,OAAO,GAAG,UAAU;AAC5B,UAAI;AACF,YAAI,CAAC,MAAM,QAAQ,KAAK,GAAG;AACzB,iBAAO,SAAS,IAAI,MAAM,kCAAkC,CAAC;AAAA,QAC/D;AAEA,YAAI,MAAM,WAAW,YAAY,QAAQ;AACvC,iBAAO;AAAA,YACL,IAAI;AAAA,cACF,sBAAsB,MAAM,MAAM,kCAAkC,YAAY,MAAM;AAAA,YACxF;AAAA,UACF;AAAA,QACF;AAEA,cAAM,MAAM,CAAC;AACb,iBAAS,IAAI,GAAG,IAAI,YAAY,QAAQ,KAAK;AAC3C,cAAI,YAAY,CAAC,CAAC,IAAI,MAAM,CAAC;AAAA,QAC/B;AAEA,iBAAS,MAAM,GAAG;AAAA,MACpB,SAAS,KAAK;AACZ,iBAAS,GAAG;AAAA,MACd;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/streamTransformers.ts"],"sourcesContent":["import { Transform } from 'stream'\nimport { Metadata } from './baseConnection.types.js'\n\nexport function arrayToObject(metadata: Metadata[]) {\n  const columnNames = metadata.map((md) => md.name)\n\n  const transformer = new Transform({\n    objectMode: true,\n    transform(chunk, _, callback) {\n      try {\n        if (!Array.isArray(chunk)) {\n          return callback(new Error('Expected an array chunk as input'))\n        }\n\n        if (chunk.length !== columnNames.length) {\n          return callback(\n            new Error(\n              `Array chunk length ${chunk.length} does not match columns length ${columnNames.length}`,\n            ),\n          )\n        }\n\n        const obj = {}\n        for (let i = 0; i < columnNames.length; i++) {\n          obj[columnNames[i]] = chunk[i]\n        }\n\n        callback(null, obj)\n      } catch (err) {\n        callback(err instanceof Error ? err : new Error(String(err)))\n      }\n    },\n  })\n\n  return transformer\n}\n"],"mappings":"AAAA,SAAS,iBAAiB;AAGnB,SAAS,cAAc,UAAsB;AAClD,QAAM,cAAc,SAAS,IAAI,CAAC,OAAO,GAAG,IAAI;AAEhD,QAAM,cAAc,IAAI,UAAU;AAAA,IAChC,YAAY;AAAA,IACZ,UAAU,OAAO,GAAG,UAAU;AAC5B,UAAI;AACF,YAAI,CAAC,MAAM,QAAQ,KAAK,GAAG;AACzB,iBAAO,SAAS,IAAI,MAAM,kCAAkC,CAAC;AAAA,QAC/D;AAEA,YAAI,MAAM,WAAW,YAAY,QAAQ;AACvC,iBAAO;AAAA,YACL,IAAI;AAAA,cACF,sBAAsB,MAAM,MAAM,kCAAkC,YAAY,MAAM;AAAA,YACxF;AAAA,UACF;AAAA,QACF;AAEA,cAAM,MAAM,CAAC;AACb,iBAAS,IAAI,GAAG,IAAI,YAAY,QAAQ,KAAK;AAC3C,cAAI,YAAY,CAAC,CAAC,IAAI,MAAM,CAAC;AAAA,QAC/B;AAEA,iBAAS,MAAM,GAAG;AAAA,MACpB,SAAS,KAAK;AACZ,iBAAS,eAAe,QAAQ,MAAM,IAAI,MAAM,OAAO,GAAG,CAAC,CAAC;AAAA,MAC9D;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO;AACT;","names":[]}