@nesgarbo/node-jt400 6.0.3 → 6.0.4

package/dist-esm/lib/baseConnection.js

@@ -9,6 +9,105 @@ function convertDateValues(v) {
 function paramsToJson(params) {
   return JSON.stringify((params || []).map(convertDateValues));
 }
+function buildStatementWrapper(st, ctx) {
+  let stream;
+  return {
+    prepare(sql) {
+      return st.prepare(sql);
+    },
+    isQuery() {
+      return st.isQuerySync();
+    },
+    async metadata() {
+      return st.getMetaData().then(JSON.parse);
+    },
+    async asArray() {
+      const startTime = ctx ? process.hrtime.bigint() : 0n;
+      return st.asArray().then(JSON.parse).then((result) => {
+        if (ctx) {
+          ctx.logger.info({
+            sql: ctx.sql,
+            state: "finished",
+            duration: Number(process.hrtime.bigint() - startTime),
+            parameterCount: ctx.params.length,
+            resultSize: result.length
+          }, "IBMI DB query executed");
+        }
+        return result;
+      });
+    },
+    asStream(options) {
+      const startTime = ctx ? process.hrtime.bigint() : 0n;
+      stream = new JdbcStream({
+        jdbcStream: st.asStreamSync(options?.bufferSize ?? 100)
+      });
+      if (ctx) {
+        stream.on("end", () => {
+          ctx.logger.info({
+            sql: ctx.sql,
+            state: "finished",
+            duration: Number(process.hrtime.bigint() - startTime),
+            parameterCount: ctx.params.length
+          }, "IBMI DB query as stream ended");
+        });
+      }
+      return stream;
+    },
+    asObjectStream(options) {
+      const startTime = ctx ? process.hrtime.bigint() : 0n;
+      return st.getMetaData().then(JSON.parse).then((metadata) => {
+        const transformArrayToObject = arrayToObject(metadata);
+        const parseJSON = parse("*");
+        stream = new JdbcStream({
+          jdbcStream: st.asStreamSync(options?.bufferSize ?? 100)
+        });
+        if (ctx) {
+          stream.on("end", () => {
+            ctx.logger.info({
+              sql: ctx.sql,
+              state: "finished",
+              duration: Number(process.hrtime.bigint() - startTime),
+              parameterCount: ctx.params.length
+            }, "IBMI DB query as object stream ended");
+          });
+        }
+        return stream.pipe(parseJSON).pipe(transformArrayToObject);
+      });
+    },
+    asIterable() {
+      const startTime = ctx ? process.hrtime.bigint() : 0n;
+      return {
+        [Symbol.asyncIterator]() {
+          return {
+            async next() {
+              return st.next().then(JSON.parse).then((value) => {
+                const done = !value;
+                if (done && ctx) {
+                  ctx.logger.info({
+                    sql: ctx.sql,
+                    state: "finished",
+                    duration: Number(process.hrtime.bigint() - startTime),
+                    parameterCount: ctx.params.length
+                  }, "IBMI DB query as iterable executed");
+                }
+                return { done, value };
+              });
+            }
+          };
+        }
+      };
+    },
+    updated() {
+      return st.updated();
+    },
+    close() {
+      if (stream) {
+        return stream.close();
+      }
+      return st.close();
+    }
+  };
+}
 const createBaseConnection = function(jdbcConnection, insertListFun, logger, inMemory) {
   const baseConnection = {
     async commit() {
@@ -27,57 +126,11 @@ const createBaseConnection = function(jdbcConnection, insertListFun, logger, inM
           "createStatement is not supported by this JDBCConnection"
         );
       }
-      return jdbcConnection.createStatement().then((st) => {
-        return {
-          prepare(sql) {
-            return st.prepare(sql);
-          },
-          isQuery() {
-            return st.isQuerySync();
-          },
-          async metadata() {
-            return st.getMetaData().then(JSON.parse);
-          },
-          async asArray() {
-            return st.asArray().then(JSON.parse);
-          },
-          asIterable() {
-            return {
-              [Symbol.asyncIterator]: async function* () {
-                while (true) {
-                  const row = await st.next().then(JSON.parse);
-                  if (!row) break;
-                  yield row;
-                }
-              }
-            };
-          },
-          asStream(options) {
-            return new JdbcStream({
-              jdbcStream: st.asStreamSync(options?.bufferSize ?? 100)
-            });
-          },
-          asObjectStream(options) {
-            return st.getMetaData().then(JSON.parse).then((metadata) => {
-              const transform = arrayToObject(metadata);
-              const stream = new JdbcStream({
-                jdbcStream: st.asStreamSync(options?.bufferSize ?? 100)
-              });
-              return stream.pipe(parse("*")).pipe(transform);
-            });
-          },
-          updated() {
-            return st.updated();
-          },
-          close() {
-            return st.close();
-          }
-        };
-      });
+      return jdbcConnection.createStatement().then((st) => buildStatementWrapper(st));
     },
     query(sql, params = [], options) {
       const jsonParams = paramsToJson(params);
-      const trim = options && options.trim !== void 0 ? options.trim : true;
+      const trim = options?.trim !== void 0 ? options.trim : true;
       logger.debug(
         { sql, state: "starting", parameterCount: params.length },
         "Executing IBMI DB query"
@@ -126,122 +179,7 @@ const createBaseConnection = function(jdbcConnection, insertListFun, logger, inM
         { sql, state: "starting", parameterCount: params.length },
         "Executing IBMI DB sql statement"
       );
-      return jdbcConnection.execute(sql, jsonParams).then((statement) => {
-        const isQuery = statement.isQuerySync();
-        let stream;
-        const stWrap = {
-          prepare(prepSql) {
-            return statement.prepare(prepSql);
-          },
-          isQuery() {
-            return isQuery;
-          },
-          metadata() {
-            return statement.getMetaData().then(JSON.parse);
-          },
-          asArray() {
-            const startTime = process.hrtime.bigint();
-            return statement.asArray().then(JSON.parse).then((result) => {
-              logger.info(
-                {
-                  sql,
-                  state: "finished",
-                  duration: Number(process.hrtime.bigint() - startTime),
-                  parameterCount: params.length,
-                  resultSize: result.length
-                },
-                "IBMI DB query executed"
-              );
-              return result;
-            });
-          },
-          asStream(options) {
-            const startTime = process.hrtime.bigint();
-            options = options || {};
-            stream = new JdbcStream({
-              jdbcStream: statement.asStreamSync(options.bufferSize || 100)
-            });
-            stream.on("end", () => {
-              logger.info(
-                {
-                  sql,
-                  state: "finished",
-                  duration: Number(process.hrtime.bigint() - startTime),
-                  parameterCount: params.length
-                },
-                "IBMI DB query as stream ended"
-              );
-            });
-            return stream;
-          },
-          asObjectStream(options) {
-            const startTime = process.hrtime.bigint();
-            options = options || {};
-            const parseJSON = parse("*");
-            return statement.getMetaData().then(JSON.parse).then((metadata) => {
-              const transformArrayToObject = arrayToObject(metadata);
-              stream = new JdbcStream({
-                jdbcStream: statement.asStreamSync(
-                  options.bufferSize || 100
-                )
-              });
-              stream.on("end", () => {
-                logger.info(
-                  {
-                    sql,
-                    state: "finished",
-                    duration: Number(process.hrtime.bigint() - startTime),
-                    parameterCount: params.length
-                  },
-                  "IBMI DB query as object stream ended"
-                );
-              });
-              return stream.pipe(parseJSON).pipe(transformArrayToObject);
-            });
-          },
-          asIterable() {
-            const startTime = process.hrtime.bigint();
-            return {
-              [Symbol.asyncIterator]() {
-                return {
-                  async next() {
-                    return statement.next().then(JSON.parse).then((value) => {
-                      const done = !value;
-                      if (done) {
-                        logger.info(
-                          {
-                            sql,
-                            state: "finished",
-                            duration: Number(
-                              process.hrtime.bigint() - startTime
-                            ),
-                            parameterCount: jsonParams.length
-                          },
-                          "IBMI DB query as iterable executed"
-                        );
-                      }
-                      return {
-                        done,
-                        value
-                      };
-                    });
-                  }
-                };
-              }
-            };
-          },
-          updated() {
-            return statement.updated();
-          },
-          close() {
-            if (stream) {
-              return stream.close();
-            }
-            return statement.close();
-          }
-        };
-        return stWrap;
-      }).catch(handleError({ sql, params }));
+      return jdbcConnection.execute(sql, jsonParams).then((st) => buildStatementWrapper(st, { sql, params, logger })).catch(handleError({ sql, params }));
     },
     update(sql, params = []) {
       const jsonParams = paramsToJson(params);
@@ -270,7 +208,7 @@ const createBaseConnection = function(jdbcConnection, insertListFun, logger, inM
       const stream = createJdbcWriteStream(
         baseConnection.batchUpdate,
         sql,
-        options && options.bufferSize
+        options?.bufferSize
       );
       stream.on("finish", () => {
         logger.info(
@@ -285,7 +223,10 @@ const createBaseConnection = function(jdbcConnection, insertListFun, logger, inM
       return stream;
     },
     batchUpdate(sql, paramsList) {
-      const params = (paramsList || []).map((row) => {
+      if (!paramsList || paramsList.length === 0) {
+        return Promise.resolve([]);
+      }
+      const params = paramsList.map((row) => {
         return row.map(convertDateValues);
       });
       const jsonParams = JSON.stringify(params);
@@ -332,6 +273,23 @@ const createBaseConnection = function(jdbcConnection, insertListFun, logger, inM
     insertList(tableName, idColumn, list) {
       return insertListFun(baseConnection)(tableName, idColumn, list);
     },
+    queryCursor(sql, params = []) {
+      const jsonParams = paramsToJson(params);
+      return (async function* () {
+        const st = await jdbcConnection.execute(sql, jsonParams).catch(handleError({ sql, params }));
+        try {
+          while (true) {
+            const json = await st.next();
+            if (!json) break;
+            const row = JSON.parse(json);
+            if (row === null || row === void 0) break;
+            yield row;
+          }
+        } finally {
+          await st.close();
+        }
+      })();
+    },
     isInMemory() {
       return inMemory;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/baseConnection.ts"],"sourcesContent":["import { parse } from 'JSONStream'\nimport { JDBCConnection } from '../java/JT400.js'\nimport { BaseConnection, Param } from './baseConnection.types.js'\nimport { handleError } from './handleError.js'\nimport { CreateInsertList } from './insertList.js'\nimport { JdbcStream } from './jdbcstream.js'\nimport { createJdbcWriteStream } from './jdbcwritestream.js'\nimport { Logger } from './logger.js'\nimport { arrayToObject } from './streamTransformers.js'\n\nfunction convertDateValues(v: any) {\n  return v instanceof Date\n    ? v.toISOString().replace('T', ' ').replace('Z', '')\n    : v\n}\n\nfunction paramsToJson(params: Param[]) {\n  return JSON.stringify((params || []).map(convertDateValues))\n}\n\nexport const createBaseConnection = function (\n  jdbcConnection: JDBCConnection,\n  insertListFun: CreateInsertList,\n  logger: Logger,\n  inMemory: boolean,\n): BaseConnection {\n  const baseConnection: BaseConnection = {\n    async commit() {\n      return jdbcConnection.commit().catch((err) => {\n        throw handleError({})(err)\n      })\n    },\n    async rollback() {\n      return jdbcConnection.rollback().catch((err) => {\n        throw handleError({})(err)\n      })\n    },\n    async createStatement() {\n      if (!jdbcConnection.createStatement) {\n        throw new Error(\n          'createStatement is not supported by this JDBCConnection',\n        )\n      }\n\n      return jdbcConnection.createStatement().then((st) => {\n        return {\n          prepare(sql: string) {\n            return st.prepare(sql)\n          },\n          isQuery() {\n            return st.isQuerySync()\n          },\n          async metadata() {\n            return st.getMetaData().then(JSON.parse)\n          },\n          async asArray() {\n            return st.asArray().then(JSON.parse)\n          },\n          asIterable() {\n            return {\n              [Symbol.asyncIterator]: async function * () {\n                while (true) {\n                  const row = await st.next().then(JSON.parse)\n                  if (!row) break\n                  yield row\n                }\n              },\n            }\n          },\n          asStream(options) {\n            return new JdbcStream({\n              jdbcStream: st.asStreamSync(options?.bufferSize ?? 100),\n            })\n          },\n          asObjectStream(options) {\n            return st\n              .getMetaData()\n              .then(JSON.parse)\n              .then((metadata) => {\n                const transform = arrayToObject(metadata)\n                const stream = new JdbcStream({\n                  jdbcStream: st.asStreamSync(options?.bufferSize ?? 100),\n                })\n                return stream.pipe(parse('*')).pipe(transform)\n              })\n          },\n          updated() {\n            return st.updated()\n          },\n          close() {\n            return st.close()\n          },\n        }\n      })\n    },\n    query(sql, params = [], options) {\n      const jsonParams = paramsToJson(params)\n\n      // Sending default options to java\n      const trim = options && options.trim !== undefined ? options.trim : true\n      logger.debug(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB query',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .query(sql, jsonParams, trim)\n        .then(JSON.parse)\n        .then((result: any[]) => {\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n              resultSize: result.length,\n            },\n            'IBMI DB query executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    createReadStream(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.debug(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB query as stream',\n      )\n      const startTime = process.hrtime.bigint()\n      const stream = new JdbcStream({\n        jdbcStreamPromise: jdbcConnection\n          .queryAsStream(sql, jsonParams, 100)\n          .catch(handleError({ sql, params })),\n      })\n      stream.on('end', () => {\n        logger.info(\n          {\n            sql,\n            state: 'finished',\n            duration: Number(process.hrtime.bigint() - startTime),\n            parameterCount: params.length,\n          },\n          'IBMI DB query as stream ended',\n        )\n      })\n      return stream\n    },\n\n    execute(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.debug(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB sql statement',\n      )\n\n      return jdbcConnection\n        .execute(sql, jsonParams)\n        .then((statement) => {\n          const isQuery = statement.isQuerySync()\n          let stream\n\n          const stWrap = {\n            prepare(prepSql: string) {\n              return statement.prepare(prepSql)\n            },\n            isQuery() {\n              return isQuery\n            },\n            metadata() {\n              return statement.getMetaData().then(JSON.parse)\n            },\n            asArray() {\n              const startTime = process.hrtime.bigint()\n              return statement\n                .asArray()\n                .then(JSON.parse)\n                .then((result: any[]) => {\n                  logger.info(\n                    {\n                      sql,\n                      state: 'finished',\n                      duration: Number(process.hrtime.bigint() - startTime),\n                      parameterCount: params.length,\n                      resultSize: result.length,\n                    },\n                    'IBMI DB query executed',\n                  )\n                  return result\n                })\n            },\n            asStream(options) {\n              const startTime = process.hrtime.bigint()\n              options = options || {}\n              stream = new JdbcStream({\n                jdbcStream: statement.asStreamSync(options.bufferSize || 100),\n              })\n              stream.on('end', () => {\n                logger.info(\n                  {\n                    sql,\n                    state: 'finished',\n                    duration: Number(process.hrtime.bigint() - startTime),\n                    parameterCount: params.length,\n                  },\n                  'IBMI DB query as stream ended',\n                )\n              })\n              return stream\n            },\n            asObjectStream(options) {\n              const startTime = process.hrtime.bigint()\n              options = options || {}\n              const parseJSON = parse('*')\n\n              return statement\n                .getMetaData()\n                .then(JSON.parse)\n                .then((metadata) => {\n                  const transformArrayToObject = arrayToObject(metadata)\n                  stream = new JdbcStream({\n                    jdbcStream: statement.asStreamSync(\n                      options.bufferSize || 100,\n                    ),\n                  })\n                  stream.on('end', () => {\n                    logger.info(\n                      {\n                        sql,\n                        state: 'finished',\n                        duration: Number(process.hrtime.bigint() - startTime),\n                        parameterCount: params.length,\n                      },\n                      'IBMI DB query as object stream ended',\n                    )\n                  })\n\n                  return stream.pipe(parseJSON).pipe(transformArrayToObject)\n                })\n            },\n            asIterable() {\n              const startTime = process.hrtime.bigint()\n              return {\n                [Symbol.asyncIterator]() {\n                  return {\n                    async next() {\n                      return statement\n                        .next()\n                        .then(JSON.parse)\n                        .then((value) => {\n                          const done = !value\n                          if (done) {\n                            logger.info(\n                              {\n                                sql,\n                                state: 'finished',\n                                duration: Number(\n                                  process.hrtime.bigint() - startTime,\n                                ),\n                                parameterCount: jsonParams.length,\n                              },\n                              'IBMI DB query as iterable executed',\n                            )\n                          }\n                          return {\n                            done,\n                            value,\n                          }\n                        })\n                    },\n                  }\n                },\n              }\n            },\n            updated() {\n              return statement.updated()\n            },\n            close() {\n              if (stream) {\n                return stream.close()\n              }\n              return statement.close()\n            },\n          }\n\n          return stWrap\n        })\n        .catch(handleError({ sql, params }))\n    },\n    update(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.info(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB update',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .update(sql, jsonParams)\n        .then((result) => {\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n              result,\n            },\n            'IBMI DB update executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    createWriteStream(sql, options) {\n      logger.debug({ sql, state: 'starting' }, 'Executing IBMI DB write stream')\n      const startTime = process.hrtime.bigint()\n      const stream = createJdbcWriteStream(\n        baseConnection.batchUpdate,\n        sql,\n        options && options.bufferSize,\n      )\n      stream.on('finish', () => {\n        logger.info(\n          {\n            sql,\n            state: 'finished',\n            duration: Number(process.hrtime.bigint() - startTime),\n          },\n          'IBMI DB write stream ended',\n        )\n      })\n      return stream\n    },\n\n    batchUpdate(sql, paramsList) {\n      const params = (paramsList || []).map((row) => {\n        return row.map(convertDateValues)\n      })\n\n      const jsonParams = JSON.stringify(params)\n      logger.info(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB batch update',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .batchUpdate(sql, jsonParams)\n        .then((res) => {\n          const result = Array.from(res)\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n              result,\n            },\n            'IBMI DB batch update executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    insertAndGetId(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.info(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB insert and get id',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .insertAndGetId(sql, jsonParams)\n        .then((result) => {\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n            },\n            'IBMI DB insert and get id executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    insertList(tableName, idColumn, list) {\n      return insertListFun(baseConnection)(tableName, idColumn, list)\n    },\n\n    isInMemory() {\n      return inMemory\n    },\n  }\n  return baseConnection\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../ts-src/lib/baseConnection.ts"],"sourcesContent":["import { parse } from 'JSONStream'\nimport { JDBCConnection, StatementWrap } from '../java/JT400.js'\nimport { BaseConnection, Param, Statement, StreamOptions } from './baseConnection.types.js'\nimport { handleError } from './handleError.js'\nimport { CreateInsertList } from './insertList.js'\nimport { JdbcStream } from './jdbcstream.js'\nimport { createJdbcWriteStream } from './jdbcwritestream.js'\nimport { Logger } from './logger.js'\nimport { arrayToObject } from './streamTransformers.js'\n\nfunction convertDateValues(v: Param): Param {\n  return v instanceof Date\n    ? v.toISOString().replace('T', ' ').replace('Z', '')\n    : v\n}\n\nfunction paramsToJson(params: Param[]) {\n  return JSON.stringify((params || []).map(convertDateValues))\n}\n\ntype LogContext = { sql: string; params: Param[]; logger: Logger }\n\nfunction buildStatementWrapper(st: StatementWrap, ctx?: LogContext): Statement {\n  let stream: JdbcStream | undefined\n\n  return {\n    prepare(sql: string) {\n      return st.prepare(sql)\n    },\n    isQuery() {\n      return st.isQuerySync()\n    },\n    async metadata() {\n      return st.getMetaData().then(JSON.parse)\n    },\n    async asArray() {\n      const startTime = ctx ? process.hrtime.bigint() : 0n\n      return st.asArray().then(JSON.parse).then((result: unknown[]) => {\n        if (ctx) {\n          ctx.logger.info({\n            sql: ctx.sql,\n            state: 'finished',\n            duration: Number(process.hrtime.bigint() - startTime),\n            parameterCount: ctx.params.length,\n            resultSize: result.length,\n          }, 'IBMI DB query executed')\n        }\n        return result as string[][]\n      })\n    },\n    asStream(options?: StreamOptions) {\n      const startTime = ctx ? process.hrtime.bigint() : 0n\n      stream = new JdbcStream({\n        jdbcStream: st.asStreamSync(options?.bufferSize ?? 100),\n      })\n      if (ctx) {\n        stream.on('end', () => {\n          ctx.logger.info({\n            sql: ctx.sql,\n            state: 'finished',\n            duration: Number(process.hrtime.bigint() - startTime),\n            parameterCount: ctx.params.length,\n          }, 'IBMI DB query as stream ended')\n        })\n      }\n      return stream\n    },\n    asObjectStream(options?: StreamOptions) {\n      const startTime = ctx ? process.hrtime.bigint() : 0n\n      return st.getMetaData().then(JSON.parse).then((metadata) => {\n        const transformArrayToObject = arrayToObject(metadata)\n        const parseJSON = parse('*')\n        stream = new JdbcStream({\n          jdbcStream: st.asStreamSync(options?.bufferSize ?? 100),\n        })\n        if (ctx) {\n          stream.on('end', () => {\n            ctx.logger.info({\n              sql: ctx.sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: ctx.params.length,\n            }, 'IBMI DB query as object stream ended')\n          })\n        }\n        return stream.pipe(parseJSON).pipe(transformArrayToObject)\n      })\n    },\n    asIterable() {\n      const startTime = ctx ? process.hrtime.bigint() : 0n\n      return {\n        [Symbol.asyncIterator]() {\n          return {\n            async next() {\n              return st.next().then(JSON.parse).then((value) => {\n                const done = !value\n                if (done && ctx) {\n                  ctx.logger.info({\n                    sql: ctx.sql,\n                    state: 'finished',\n                    duration: Number(process.hrtime.bigint() - startTime),\n                    parameterCount: ctx.params.length,\n                  }, 'IBMI DB query as iterable executed')\n                }\n                return { done, value }\n              })\n            },\n          }\n        },\n      }\n    },\n    updated() {\n      return st.updated()\n    },\n    close() {\n      if (stream) {\n        return stream.close()\n      }\n      return st.close()\n    },\n  }\n}\n\nexport const createBaseConnection = function (\n  jdbcConnection: JDBCConnection,\n  insertListFun: CreateInsertList,\n  logger: Logger,\n  inMemory: boolean,\n): BaseConnection {\n  const baseConnection: BaseConnection = {\n    async commit() {\n      return jdbcConnection.commit().catch((err) => {\n        throw handleError({})(err)\n      })\n    },\n    async rollback() {\n      return jdbcConnection.rollback().catch((err) => {\n        throw handleError({})(err)\n      })\n    },\n    async createStatement() {\n      if (!jdbcConnection.createStatement) {\n        throw new Error(\n          'createStatement is not supported by this JDBCConnection',\n        )\n      }\n      return jdbcConnection.createStatement().then((st) => buildStatementWrapper(st))\n    },\n    query(sql, params = [], options) {\n      const jsonParams = paramsToJson(params)\n      const trim = options?.trim !== undefined ? options.trim : true\n      logger.debug(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB query',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .query(sql, jsonParams, trim)\n        .then(JSON.parse)\n        .then((result: unknown[]) => {\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n              resultSize: result.length,\n            },\n            'IBMI DB query executed',\n          )\n          return result as never[]\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    createReadStream(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.debug(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB query as stream',\n      )\n      const startTime = process.hrtime.bigint()\n      const stream = new JdbcStream({\n        jdbcStreamPromise: jdbcConnection\n          .queryAsStream(sql, jsonParams, 100)\n          .catch(handleError({ sql, params })),\n      })\n      stream.on('end', () => {\n        logger.info(\n          {\n            sql,\n            state: 'finished',\n            duration: Number(process.hrtime.bigint() - startTime),\n            parameterCount: params.length,\n          },\n          'IBMI DB query as stream ended',\n        )\n      })\n      return stream\n    },\n\n    execute(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.debug(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB sql statement',\n      )\n      return jdbcConnection\n        .execute(sql, jsonParams)\n        .then((st) => buildStatementWrapper(st, { sql, params, logger }))\n        .catch(handleError({ sql, params }))\n    },\n\n    update(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.info(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB update',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .update(sql, jsonParams)\n        .then((result) => {\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n              result,\n            },\n            'IBMI DB update executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    createWriteStream(sql, options) {\n      logger.debug({ sql, state: 'starting' }, 'Executing IBMI DB write stream')\n      const startTime = process.hrtime.bigint()\n      const stream = createJdbcWriteStream(\n        baseConnection.batchUpdate,\n        sql,\n        options?.bufferSize,\n      )\n      stream.on('finish', () => {\n        logger.info(\n          {\n            sql,\n            state: 'finished',\n            duration: Number(process.hrtime.bigint() - startTime),\n          },\n          'IBMI DB write stream ended',\n        )\n      })\n      return stream\n    },\n\n    batchUpdate(sql, paramsList) {\n      if (!paramsList || paramsList.length === 0) {\n        return Promise.resolve([])\n      }\n      const params = paramsList.map((row) => {\n        return row.map(convertDateValues)\n      })\n\n      const jsonParams = JSON.stringify(params)\n      logger.info(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB batch update',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .batchUpdate(sql, jsonParams)\n        .then((res) => {\n          const result = Array.from(res)\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n              result,\n            },\n            'IBMI DB batch update executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    insertAndGetId(sql, params = []) {\n      const jsonParams = paramsToJson(params)\n      logger.info(\n        { sql, state: 'starting', parameterCount: params.length },\n        'Executing IBMI DB insert and get id',\n      )\n      const startTime = process.hrtime.bigint()\n      return jdbcConnection\n        .insertAndGetId(sql, jsonParams)\n        .then((result) => {\n          logger.info(\n            {\n              sql,\n              state: 'finished',\n              duration: Number(process.hrtime.bigint() - startTime),\n              parameterCount: params.length,\n            },\n            'IBMI DB insert and get id executed',\n          )\n          return result\n        })\n        .catch(handleError({ sql, params }))\n    },\n\n    insertList(tableName, idColumn, list) {\n      return insertListFun(baseConnection)(tableName, idColumn, list)\n    },\n\n    queryCursor<T>(sql: string, params: Param[] = []) {\n      const jsonParams = paramsToJson(params)\n      return (async function* () {\n        const st = await jdbcConnection\n          .execute(sql, jsonParams)\n          .catch(handleError({ sql, params }))\n        try {\n          while (true) {\n            const json = await st.next()\n            if (!json) break\n            const row: T = JSON.parse(json)\n            if (row === null || row === undefined) break\n            yield row\n          }\n        } finally {\n          await st.close()\n        }\n      })() as AsyncIterable<T>\n    },\n\n    isInMemory() {\n      return inMemory\n    },\n  }\n  return baseConnection\n}\n"],"mappings":"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","names":[]}

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

@@ -12,8 +12,8 @@ interface BLOB {
 type Param = string | number | Date | null | CLOB | BLOB;
 interface QueryOptions {
     trim?: boolean;
-    cursor?: boolean;
-    fetchSize?: number;
+}
+interface CursorOptions {
 }
 interface Metadata {
     name: string;
@@ -21,20 +21,23 @@ interface Metadata {
     precision: number;
     scale: number;
 }
+interface StreamOptions {
+    bufferSize?: number;
+}
 interface Statement {
     prepare: (sql: string) => Promise<void>;
     isQuery: () => boolean;
     metadata: () => Promise<Metadata[]>;
     asArray: () => Promise<string[][]>;
     asIterable: () => AsyncIterable<string[]>;
-    asStream: (options?: any) => Readable;
-    asObjectStream: (options?: any) => Promise<Readable>;
+    asStream: (options?: StreamOptions) => Readable;
+    asObjectStream: (options?: StreamOptions) => Promise<Readable>;
     updated: () => Promise<number>;
     close: Close;
 }
 type Execute = (sql: string, params?: Param[]) => Promise<Statement>;
 type Query = {
-    <T>(sql: string, params?: Param[] | undefined, options?: QueryOptions, callback?: (error: any, cursor: any) => void): Promise<T[]>;
+    <T>(sql: string, params?: Param[] | undefined, options?: QueryOptions): Promise<T[]>;
 };
 type Update = (sql: string, params?: Param[]) => Promise<number>;
 type CreateReadStream = (sql: string, params?: Param[]) => Readable;
@@ -45,7 +48,7 @@ interface WriteStreamOptions {
 type CreateWriteStream = (sql: string, options?: WriteStreamOptions) => Writable;
 type BatchUpdate = (sql: string, params?: Param[][]) => Promise<number[]>;
 type Close = () => void;
-type InsertList = (tableName: string, idColumn: string, rows: any[]) => Promise<number[]>;
+type InsertList = (tableName: string, idColumn: string, rows: Record<string, Param>[]) => Promise<number[]>;
 interface BaseConnection {
     query: Query;
     update: Update;
@@ -56,9 +59,10 @@ interface BaseConnection {
     createWriteStream: CreateWriteStream;
     batchUpdate: BatchUpdate;
     execute: Execute;
+    queryCursor: <T>(sql: string, params?: Param[], options?: CursorOptions) => AsyncIterable<T>;
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
     createStatement: () => Promise<Statement>;
 }
 
-export type { BLOB, BaseConnection, BatchUpdate, CLOB, Close, CreateReadStream, CreateWriteStream, Execute, InsertAndGetId, InsertList, Metadata, Param, Query, QueryOptions, Statement, Update, WriteStreamOptions };
+export type { BLOB, BaseConnection, BatchUpdate, CLOB, Close, CreateReadStream, CreateWriteStream, CursorOptions, Execute, InsertAndGetId, InsertList, Metadata, Param, Query, QueryOptions, Statement, StreamOptions, Update, WriteStreamOptions };

package/dist-esm/lib/baseConnection.types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/baseConnection.types.ts"],"sourcesContent":["import { Readable, Writable } from 'stream'\nexport { Readable, Writable }\n\nexport interface CLOB {\n  type: 'CLOB'\n  value: string\n}\n\nexport interface BLOB {\n  type: 'BLOB'\n  value: string\n}\n\nexport type Param = string | number | Date | null | CLOB | BLOB\n\nexport interface QueryOptions {\n  trim?: boolean,\n  cursor?: boolean,\n  fetchSize?: number\n}\n\nexport interface Metadata {\n  name: string\n  typeName: string\n  precision: number\n  scale: number\n}\nexport interface Statement {\n  prepare: (sql: string) => Promise<void>\n  isQuery: () => boolean\n  metadata: () => Promise<Metadata[]>\n  asArray: () => Promise<string[][]>\n  asIterable: () => AsyncIterable<string[]>\n  asStream: (options?: any) => Readable\n  asObjectStream: (options?: any) => Promise<Readable>\n  updated: () => Promise<number>\n  close: Close\n}\nexport type Execute = (sql: string, params?: Param[]) => Promise<Statement>\nexport type Query = {\n  <T>(\n    sql: string,\n    params?: Param[] | undefined,\n    options?: QueryOptions,\n    callback?: (error: any, cursor: any) => void,\n  ): Promise<T[]>\n}\nexport type Update = (sql: string, params?: Param[]) => Promise<number>\nexport type CreateReadStream = (sql: string, params?: Param[]) => Readable\nexport type InsertAndGetId = (sql: string, params?: Param[]) => Promise<number>\n\nexport interface WriteStreamOptions {\n  bufferSize: number\n}\n\nexport type CreateWriteStream = (\n  sql: string,\n  options?: WriteStreamOptions,\n) => Writable\nexport type BatchUpdate = (sql: string, params?: Param[][]) => Promise<number[]>\nexport type Close = () => void\nexport type InsertList = (\n  tableName: string,\n  idColumn: string,\n  rows: any[],\n) => Promise<number[]>\nexport interface BaseConnection {\n  query: Query\n  update: Update\n  isInMemory: () => boolean\n  createReadStream: CreateReadStream\n  insertAndGetId: InsertAndGetId\n  insertList: InsertList\n  createWriteStream: CreateWriteStream\n  batchUpdate: BatchUpdate\n  execute: Execute\n\n  commit: () => Promise<void>\n  rollback: () => Promise<void>\n  createStatement: () => Promise<Statement>\n}\n"],"mappings":"AAAA,SAAS,UAAU,gBAAgB;","names":[]}
+{"version":3,"sources":["../../ts-src/lib/baseConnection.types.ts"],"sourcesContent":["import { Readable, Writable } from 'stream'\nexport { Readable, Writable }\n\nexport interface CLOB {\n  type: 'CLOB'\n  value: string\n}\n\nexport interface BLOB {\n  type: 'BLOB'\n  value: string\n}\n\nexport type Param = string | number | Date | null | CLOB | BLOB\n\nexport interface QueryOptions {\n  trim?: boolean\n}\n\nexport interface CursorOptions {\n  // reserved for future options\n}\n\nexport interface Metadata {\n  name: string\n  typeName: string\n  precision: number\n  scale: number\n}\nexport interface StreamOptions {\n  bufferSize?: number\n}\n\nexport interface Statement {\n  prepare: (sql: string) => Promise<void>\n  isQuery: () => boolean\n  metadata: () => Promise<Metadata[]>\n  asArray: () => Promise<string[][]>\n  asIterable: () => AsyncIterable<string[]>\n  asStream: (options?: StreamOptions) => Readable\n  asObjectStream: (options?: StreamOptions) => Promise<Readable>\n  updated: () => Promise<number>\n  close: Close\n}\nexport type Execute = (sql: string, params?: Param[]) => Promise<Statement>\nexport type Query = {\n  <T>(\n    sql: string,\n    params?: Param[] | undefined,\n    options?: QueryOptions,\n  ): Promise<T[]>\n}\nexport type Update = (sql: string, params?: Param[]) => Promise<number>\nexport type CreateReadStream = (sql: string, params?: Param[]) => Readable\nexport type InsertAndGetId = (sql: string, params?: Param[]) => Promise<number>\n\nexport interface WriteStreamOptions {\n  bufferSize: number\n}\n\nexport type CreateWriteStream = (\n  sql: string,\n  options?: WriteStreamOptions,\n) => Writable\nexport type BatchUpdate = (sql: string, params?: Param[][]) => Promise<number[]>\nexport type Close = () => void\nexport type InsertList = (\n  tableName: string,\n  idColumn: string,\n  rows: Record<string, Param>[],\n) => Promise<number[]>\nexport interface BaseConnection {\n  query: Query\n  update: Update\n  isInMemory: () => boolean\n  createReadStream: CreateReadStream\n  insertAndGetId: InsertAndGetId\n  insertList: InsertList\n  createWriteStream: CreateWriteStream\n  batchUpdate: BatchUpdate\n  execute: Execute\n  queryCursor: <T>(sql: string, params?: Param[], options?: CursorOptions) => AsyncIterable<T>\n\n  commit: () => Promise<void>\n  rollback: () => Promise<void>\n  createStatement: () => Promise<Statement>\n}\n"],"mappings":"AAAA,SAAS,UAAU,gBAAgB;","names":[]}

package/dist-esm/lib/connection.js

@@ -60,15 +60,9 @@ function createConnection({
       const name = isJustNameMessageQ(opt) ? opt.name : opt.path;
       const dq = await connection.openMessageQ(name, hasPath);
       return {
-        // write (key, data) {
-        // 	dq.writeSync(key, data);
-        // },
-        read() {
-          let wait = -1;
-          if (arguments[0] === Object(arguments[0])) {
-            wait = arguments[0].wait || wait;
-          }
-          return dq.read(wait);
+        read(params) {
+          const wait = params?.wait ?? -1;
+          return dq.read(wait).then((json) => json ? JSON.parse(json) : null);
         },
         sendInformational(messageText) {
           return dq.sendInformational(messageText);
@@ -77,7 +71,7 @@ function createConnection({
     },
     createKeyedDataQ(opt) {
       const dq = connection.createKeyedDataQSync(opt.name);
-      const readRes = async function(key, wait, writeKeyLength) {
+      const readRes = async (key, wait, writeKeyLength) => {
         const res = await dq.readResponse(key, wait, writeKeyLength);
         const data = await res.getData();
         return {
@@ -89,17 +83,11 @@ function createConnection({
         write(key, data) {
           return dq.write(key, data);
         },
-        read() {
-          let wait = -1;
-          let key;
-          let writeKeyLength;
-          if (arguments[0] === Object(arguments[0])) {
-            key = arguments[0].key;
-            wait = arguments[0].wait || wait;
-            writeKeyLength = arguments[0].writeKeyLength;
-          } else {
-            key = arguments[0];
+        read(params) {
+          if (typeof params === "string") {
+            return dq.read(params, -1);
           }
+          const { key, wait = -1, writeKeyLength } = params;
           return writeKeyLength ? readRes(key, wait, writeKeyLength) : dq.read(key, wait);
         }
       };
@@ -107,9 +95,8 @@ function createConnection({
     async openMessageFile(opt) {
       const messageFile = await connection.openMessageFile(opt.path);
       return {
-        read() {
-          const messageId = arguments[0].messageId;
-          return messageFile.read(messageId);
+        read(params) {
+          return messageFile.read(params.messageId);
         }
       };
     },
@@ -128,12 +115,12 @@ function createConnection({
       };
     },
     pgm: deprecate(function(programName, paramsSchema, libraryName) {
-      return this.defineProgram({
+      return jt400.defineProgram({
         programName,
         paramsSchema,
         libraryName
       });
-    }, "pgm function is deprecated and will be removed in version 5.0. Please use defineProgram."),
+    }, "pgm function is deprecated and will be removed in version 7.0. Please use defineProgram."),
     close() {
       return connection.close();
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../ts-src/lib/connection.ts"],"sourcesContent":["import { deprecate } from 'util'\nimport { JT400 } from '../java/JT400.js'\nimport { createBaseConnection } from './baseConnection.js'\nimport {\n  Connection,\n  JustNameMessageQ,\n  MessageFileHandlerOptions,\n  MessageQOptions,\n  ProgramDefinitionOptions,\n} from './connection.types.js'\nimport { handleError } from './handleError.js'\nimport { ifs as createIfs } from './ifs/index.js'\nimport { CreateInsertList } from './insertList.js'\nimport { JdbcStream } from './jdbcstream.js'\nimport JSONStream from 'JSONStream'\nimport { Logger } from './logger.js'\n\nconst isJustNameMessageQ = function (\n  opt: MessageQOptions,\n): opt is JustNameMessageQ {\n  return (opt as JustNameMessageQ).name !== undefined\n}\n\nexport function createConnection({\n  connection,\n  insertListFun,\n  inMemory,\n  logger,\n}: {\n  connection: JT400\n  insertListFun: CreateInsertList\n  inMemory: boolean\n  logger: Logger\n}): Connection {\n  const baseConnection = createBaseConnection(\n    connection,\n    insertListFun,\n    logger,\n    inMemory,\n  )\n  const jt400: Connection = {\n    ...baseConnection,\n    async transaction(transactionFunction) {\n      const t = connection.createTransactionSync()\n      const transactionContext = createBaseConnection(\n        t,\n        insertListFun,\n        logger,\n        inMemory,\n      )\n\n      try {\n        const res = await transactionFunction(transactionContext)\n        await t.commit()\n        return res\n      } catch (err) {\n        await t.rollback()\n        throw err\n      } finally {\n        await t.end()\n      }\n    },\n    getTablesAsStream(opt) {\n      return new JdbcStream({\n        jdbcStream: connection.getTablesAsStreamSync(\n          opt.catalog,\n          opt.schema,\n          opt.table || '%',\n        ),\n      }).pipe(JSONStream.parse([true]))\n    },\n    getColumns(opt) {\n      return connection\n        .getColumns(opt.catalog, opt.schema, opt.table, opt.columns || '%')\n        .then(JSON.parse)\n    },\n    getPrimaryKeys(opt) {\n      return connection\n        .getPrimaryKeys(opt.catalog, opt.schema, opt.table)\n        .then(JSON.parse)\n    },\n    async openMessageQ(opt) {\n      const hasPath = !isJustNameMessageQ(opt)\n      const name = isJustNameMessageQ(opt) ? opt.name : opt.path\n      const dq = await connection.openMessageQ(name, hasPath)\n      return {\n        // write (key, data) {\n        // \tdq.writeSync(key, data);\n        // },\n        read() {\n          let wait = -1\n          if (arguments[0] === Object(arguments[0])) {\n            wait = arguments[0].wait || wait\n          }\n          return dq.read(wait)\n        },\n        sendInformational(messageText) {\n          return dq.sendInformational(messageText)\n        },\n      }\n    },\n    createKeyedDataQ(opt) {\n      const dq = connection.createKeyedDataQSync(opt.name)\n      const readRes = async function (key, wait, writeKeyLength) {\n        const res = await dq.readResponse(key, wait, writeKeyLength)\n        const data = await res.getData()\n        return {\n          data,\n          write: (data: string) => res.write(data),\n        }\n      }\n      return {\n        write(key, data) {\n          return dq.write(key, data)\n        },\n        read() {\n          let wait = -1\n          let key: string\n          let writeKeyLength\n          if (arguments[0] === Object(arguments[0])) {\n            key = arguments[0].key\n            wait = arguments[0].wait || wait\n            writeKeyLength = arguments[0].writeKeyLength\n          } else {\n            key = arguments[0]\n          }\n          return writeKeyLength\n            ? readRes(key, wait, writeKeyLength)\n            : dq.read(key, wait)\n        },\n      }\n    },\n    async openMessageFile(opt: MessageFileHandlerOptions) {\n      const messageFile = await connection.openMessageFile(opt.path)\n      return {\n        read() {\n          const messageId = arguments[0].messageId\n          return messageFile.read(messageId)\n        },\n      }\n    },\n    ifs() {\n      return createIfs(connection)\n    },\n    defineProgram(opt: ProgramDefinitionOptions) {\n      const pgm = connection.pgmSync(\n        opt.programName,\n        JSON.stringify(opt.paramsSchema),\n        opt.libraryName || '*LIBL',\n        opt.ccsid,\n      )\n      return function run(params, timeout = 3) {\n        return pgm\n          .run(JSON.stringify(params), timeout)\n          .then(JSON.parse)\n          .catch(handleError({ programName: opt.programName, params, timeout }))\n      }\n    },\n    pgm: deprecate(function (programName, paramsSchema, libraryName) {\n      return this.defineProgram({\n        programName,\n        paramsSchema,\n        libraryName,\n      })\n    }, 'pgm function is deprecated and will be removed in version 5.0. Please use defineProgram.'),\n    close() {\n      return connection.close()\n    },\n  }\n\n  return jt400\n}\n"],"mappings":"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","names":["data"]}
+{"version":3,"sources":["../../ts-src/lib/connection.ts"],"sourcesContent":["import { deprecate } from 'util'\nimport { JT400 } from '../java/JT400.js'\nimport { createBaseConnection } from './baseConnection.js'\nimport {\n  Connection,\n  DataQReadOptions,\n  JustNameMessageQ,\n  MessageFileHandlerOptions,\n  MessageFileReadOptions,\n  MessageQOptions,\n  MessageQReadOptions,\n  PgmParamType,\n  ProgramDefinitionOptions,\n} from './connection.types.js'\nimport { handleError } from './handleError.js'\nimport { ifs as createIfs } from './ifs/index.js'\nimport { CreateInsertList } from './insertList.js'\nimport { JdbcStream } from './jdbcstream.js'\nimport JSONStream from 'JSONStream'\nimport { Logger } from './logger.js'\n\nconst isJustNameMessageQ = function (\n  opt: MessageQOptions,\n): opt is JustNameMessageQ {\n  return (opt as JustNameMessageQ).name !== undefined\n}\n\nexport function createConnection({\n  connection,\n  insertListFun,\n  inMemory,\n  logger,\n}: {\n  connection: JT400\n  insertListFun: CreateInsertList\n  inMemory: boolean\n  logger: Logger\n}): Connection {\n  const baseConnection = createBaseConnection(\n    connection,\n    insertListFun,\n    logger,\n    inMemory,\n  )\n  const jt400: Connection = {\n    ...baseConnection,\n    async transaction(transactionFunction) {\n      const t = connection.createTransactionSync()\n      const transactionContext = createBaseConnection(\n        t,\n        insertListFun,\n        logger,\n        inMemory,\n      )\n\n      try {\n        const res = await transactionFunction(transactionContext)\n        await t.commit()\n        return res\n      } catch (err) {\n        await t.rollback()\n        throw err\n      } finally {\n        await t.end()\n      }\n    },\n    getTablesAsStream(opt) {\n      return new JdbcStream({\n        jdbcStream: connection.getTablesAsStreamSync(\n          opt.catalog,\n          opt.schema,\n          opt.table || '%',\n        ),\n      }).pipe(JSONStream.parse([true]))\n    },\n    getColumns(opt) {\n      return connection\n        .getColumns(opt.catalog, opt.schema, opt.table, opt.columns || '%')\n        .then(JSON.parse)\n    },\n    getPrimaryKeys(opt) {\n      return connection\n        .getPrimaryKeys(opt.catalog, opt.schema, opt.table)\n        .then(JSON.parse)\n    },\n    async openMessageQ(opt) {\n      const hasPath = !isJustNameMessageQ(opt)\n      const name = isJustNameMessageQ(opt) ? opt.name : opt.path\n      const dq = await connection.openMessageQ(name, hasPath)\n      return {\n        read(params?: MessageQReadOptions) {\n          const wait = params?.wait ?? -1\n          return dq.read(wait).then((json) => json ? JSON.parse(json) : null)\n        },\n        sendInformational(messageText) {\n          return dq.sendInformational(messageText)\n        },\n      }\n    },\n    createKeyedDataQ(opt) {\n      const dq = connection.createKeyedDataQSync(opt.name)\n      const readRes = async (key: string, wait: number, writeKeyLength: number) => {\n        const res = await dq.readResponse(key, wait, writeKeyLength)\n        const data = await res.getData()\n        return {\n          data,\n          write: (data: string) => res.write(data),\n        }\n      }\n      return {\n        write(key, data) {\n          return dq.write(key, data)\n        },\n        read(params: DataQReadOptions | string) {\n          if (typeof params === 'string') {\n            return dq.read(params, -1)\n          }\n          const { key, wait = -1, writeKeyLength } = params\n          return writeKeyLength\n            ? readRes(key, wait, writeKeyLength)\n            : dq.read(key, wait)\n        },\n      }\n    },\n    async openMessageFile(opt: MessageFileHandlerOptions) {\n      const messageFile = await connection.openMessageFile(opt.path)\n      return {\n        read(params: MessageFileReadOptions) {\n          return messageFile.read(params.messageId)\n        },\n      }\n    },\n    ifs() {\n      return createIfs(connection)\n    },\n    defineProgram(opt: ProgramDefinitionOptions) {\n      const pgm = connection.pgmSync(\n        opt.programName,\n        JSON.stringify(opt.paramsSchema),\n        opt.libraryName || '*LIBL',\n        opt.ccsid,\n      )\n      return function run(params, timeout = 3) {\n        return pgm\n          .run(JSON.stringify(params), timeout)\n          .then(JSON.parse)\n          .catch(handleError({ programName: opt.programName, params, timeout }))\n      }\n    },\n    pgm: deprecate(function (programName: string, paramsSchema: PgmParamType[], libraryName?: string) {\n      return jt400.defineProgram({\n        programName,\n        paramsSchema,\n        libraryName,\n      })\n    }, 'pgm function is deprecated and will be removed in version 7.0. Please use defineProgram.'),\n    close() {\n      return connection.close()\n    },\n  }\n\n  return jt400\n}\n"],"mappings":"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","names":["data"]}