pqb 0.55.1 → 0.56.3

package/dist/postgres-js.js

@@ -0,0 +1,221 @@
+'use strict';
+
+var orchidCore = require('orchid-core');
+var postgres = require('postgres');
+var pqb = require('pqb');
+
+const createDb = (options) => {
+  return pqb.createDbWithAdapter({
+    ...options,
+    adapter: new PostgresJsAdapter(options)
+  });
+};
+class PostgresJsResult {
+  constructor(result) {
+    this.rowCount = result.count;
+    this.rows = result;
+    this.fields = result.statement.columns;
+  }
+}
+const wrapResult = (result) => {
+  if (result.constructor === Array) {
+    return result.map(
+      (res) => new PostgresJsResult(res)
+    );
+  } else {
+    return new PostgresJsResult(result);
+  }
+};
+const types = {
+  dateAndTimestampAsStrings: {
+    to: 25,
+    from: [1082, 1114, 1184],
+    parse: orchidCore.returnArg
+  },
+  interval: {
+    from: [1186],
+    serialize: orchidCore.returnArg,
+    parse(str) {
+      const [years, , months, , days, , time] = str.split(" ");
+      const [hours, minutes, seconds] = time.split(":");
+      return {
+        years: years ? Number(years) : 0,
+        months: months ? Number(months) : 0,
+        days: days ? Number(days) : 0,
+        hours: hours ? Number(hours) : 0,
+        minutes: minutes ? Number(minutes) : 0,
+        seconds: seconds ? Number(seconds) : 0
+      };
+    }
+  },
+  // overrides the built-in json type to not serialize it, because it incorrectly serializes
+  json: {
+    to: 114,
+    from: [114, 3802],
+    serialize: orchidCore.returnArg,
+    parse: (x) => {
+      return JSON.parse(x);
+    }
+  }
+};
+class PostgresJsAdapter {
+  constructor(config) {
+    this.errorClass = postgres.PostgresError;
+    this.config = { ...config, types };
+    this.schema = config.schema;
+    if (this.schema) {
+      this.config.connection = {
+        ...config.connection,
+        search_path: this.schema
+      };
+    }
+    if (this.config.databaseURL) {
+      const urlString = this.config.databaseURL;
+      const url = new URL(urlString);
+      const ssl = url.searchParams.get("ssl");
+      if (ssl === "false" || ssl === "true") {
+        this.config.ssl = ssl === "true";
+      }
+      const schema = url.searchParams.get("schema");
+      if (schema) {
+        this.schema = schema;
+        url.searchParams.delete("schema");
+        this.config.connection = {
+          ...config.connection,
+          search_path: schema
+        };
+      }
+      this.sql = postgres(url.toString(), this.config);
+    } else {
+      this.sql = postgres(this.config);
+    }
+    if (config.connectRetry) {
+      orchidCore.setConnectRetryConfig(
+        this,
+        config.connectRetry === true ? orchidCore.emptyObject : config.connectRetry
+      );
+      this.query = orchidCore.wrapAdapterFnWithConnectRetry(this, this.query);
+      this.arrays = orchidCore.wrapAdapterFnWithConnectRetry(this, this.arrays);
+    }
+  }
+  getURL() {
+    return this.config.databaseURL ? new URL(this.config.databaseURL) : void 0;
+  }
+  reconfigure(params) {
+    const url = this.getURL();
+    if (url) {
+      if ("database" in params) {
+        url.pathname = `/${params.database}`;
+      }
+      if (params.user !== void 0) {
+        url.username = params.user;
+      }
+      if (params.password !== void 0) {
+        url.password = params.password;
+      }
+      if (params.schema !== void 0) {
+        url.searchParams.set("schema", params.schema);
+      }
+      return new PostgresJsAdapter({
+        ...this.config,
+        databaseURL: url.toString()
+      });
+    } else {
+      return new PostgresJsAdapter({ ...this.config, ...params });
+    }
+  }
+  getDatabase() {
+    const url = this.getURL();
+    return url ? url.pathname.slice(1) : this.config.database;
+  }
+  getUser() {
+    const url = this.getURL();
+    return url ? url.username : this.config.user;
+  }
+  getSchema() {
+    return this.schema;
+  }
+  getHost() {
+    const url = this.getURL();
+    return url ? url.hostname : this.config.host;
+  }
+  query(text, values) {
+    return query(this.sql, text, values);
+  }
+  arrays(text, values) {
+    return arrays(this.sql, text, values);
+  }
+  async transaction(options, cb) {
+    return options ? this.sql.begin(
+      options,
+      (sql) => cb(new PostgresJsTransactionAdapter(this, sql))
+    ) : this.sql.begin(
+      (sql) => cb(new PostgresJsTransactionAdapter(this, sql))
+    );
+  }
+  close() {
+    return this.sql.end();
+  }
+  assignError(to, dbError) {
+    const from = dbError;
+    to.message = from.message;
+    to.severity = from.severity;
+    to.code = from.code;
+    to.detail = from.detail;
+    to.hint = from.hint;
+    to.position = from.position;
+    to.where = from.where;
+    to.file = from.file;
+    to.line = from.line;
+    to.routine = from.routine;
+  }
+}
+const query = (sql, text, values) => {
+  return sql.unsafe(text, values).then(wrapResult);
+};
+const arrays = (sql, text, values) => {
+  return sql.unsafe(text, values).values().then(wrapResult);
+};
+class PostgresJsTransactionAdapter {
+  constructor(adapter, sql) {
+    this.adapter = adapter;
+    this.sql = sql;
+    this.errorClass = postgres.PostgresError;
+  }
+  reconfigure(params) {
+    return this.adapter.reconfigure(params);
+  }
+  getDatabase() {
+    return this.adapter.getDatabase();
+  }
+  getUser() {
+    return this.adapter.getUser();
+  }
+  getSchema() {
+    return this.adapter.schema;
+  }
+  getHost() {
+    return this.adapter.getHost();
+  }
+  query(text, values) {
+    return query(this.sql, text, values);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  arrays(text, values) {
+    return arrays(this.sql, text, values);
+  }
+  async transaction(_options, cb) {
+    return await cb(this);
+  }
+  close() {
+    return this.sql.end();
+  }
+  assignError(to, from) {
+    return this.adapter.assignError(to, from);
+  }
+}
+
+exports.PostgresJsAdapter = PostgresJsAdapter;
+exports.PostgresJsTransactionAdapter = PostgresJsTransactionAdapter;
+exports.createDb = createDb;
+//# sourceMappingURL=postgres-js.js.map

package/dist/postgres-js.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"postgres-js.js","sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import {\n  AdapterBase,\n  AdapterConfigBase,\n  ColumnSchemaConfig,\n  emptyObject,\n  MaybeArray,\n  QueryArraysResult,\n  QueryError,\n  QueryResult,\n  QueryResultRow,\n  returnArg,\n  setConnectRetryConfig,\n  wrapAdapterFnWithConnectRetry,\n} from 'orchid-core';\nimport postgres, { Error, PostgresError, Row, RowList } from 'postgres';\nimport {\n  DbOptions,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  createDbWithAdapter,\n  DbResult,\n} from 'pqb';\n\nexport interface CreatePostgresJsDbOptions<\n  SchemaConfig extends ColumnSchemaConfig,\n  ColumnTypes,\n> extends PostgresJsAdapterOptions,\n    DbOptions<SchemaConfig, ColumnTypes> {}\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>(\n  options: CreatePostgresJsDbOptions<SchemaConfig, ColumnTypes>,\n): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    ...options,\n    adapter: new PostgresJsAdapter(options as never),\n  });\n};\n\nexport interface PostgresJsAdapterOptions\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  extends postgres.Options<any>,\n    AdapterConfigBase {\n  databaseURL?: string;\n  schema?: string;\n}\n\ntype RawResult = RowList<(Row & Iterable<Row>)[]>;\n\nclass PostgresJsResult<T extends QueryResultRow> implements QueryResult<T> {\n  rowCount: number;\n  rows: T[];\n  fields: QueryResult<T>['fields'];\n\n  constructor(result: RawResult) {\n    this.rowCount = result.count;\n    this.rows = result as never;\n    this.fields = result.statement.columns;\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst wrapResult = (result: MaybeArray<RawResult>): QueryArraysResult<any> => {\n  if (result.constructor === Array) {\n    return (result as RawResult[]).map(\n      (res) => new PostgresJsResult(res),\n    ) as never;\n  } else {\n    return new PostgresJsResult(result as RawResult);\n  }\n};\n\nconst types: Record<string, Partial<postgres.PostgresType>> = {\n  dateAndTimestampAsStrings: {\n    to: 25,\n    from: [1082, 1114, 1184],\n    parse: returnArg,\n  },\n  interval: {\n    from: [1186],\n    serialize: returnArg,\n    parse(str: string) {\n      const [years, , months, , days, , time] = str.split(' ');\n      const [hours, minutes, seconds] = time.split(':');\n\n      return {\n        years: years ? Number(years) : 0,\n        months: months ? Number(months) : 0,\n        days: days ? Number(days) : 0,\n        hours: hours ? Number(hours) : 0,\n        minutes: minutes ? Number(minutes) : 0,\n        seconds: seconds ? Number(seconds) : 0,\n      };\n    },\n  },\n  // overrides the built-in json type to not serialize it, because it incorrectly serializes\n  json: {\n    to: 114,\n    from: [114, 3802],\n    serialize: returnArg,\n    parse: (x) => {\n      return JSON.parse(x);\n    },\n  },\n};\n\nexport class PostgresJsAdapter implements AdapterBase {\n  sql: postgres.Sql;\n  schema?: string;\n  config: PostgresJsAdapterOptions;\n  errorClass = PostgresError;\n\n  constructor(config: PostgresJsAdapterOptions) {\n    this.config = { ...config, types };\n\n    this.schema = config.schema;\n    if (this.schema) {\n      this.config.connection = {\n        ...config.connection,\n        search_path: this.schema,\n      };\n    }\n\n    if (this.config.databaseURL) {\n      const urlString = this.config.databaseURL;\n      const url = new URL(urlString);\n\n      const ssl = url.searchParams.get('ssl');\n      if (ssl === 'false' || ssl === 'true') {\n        this.config.ssl = ssl === 'true';\n      }\n\n      const schema = url.searchParams.get('schema');\n      if (schema) {\n        this.schema = schema;\n        url.searchParams.delete('schema');\n        this.config.connection = {\n          ...config.connection,\n          search_path: schema,\n        };\n      }\n\n      this.sql = postgres(url.toString(), this.config);\n    } else {\n      this.sql = postgres(this.config);\n    }\n\n    if (config.connectRetry) {\n      setConnectRetryConfig(\n        this,\n        config.connectRetry === true ? emptyObject : config.connectRetry,\n      );\n\n      this.query = wrapAdapterFnWithConnectRetry(this, this.query);\n      this.arrays = wrapAdapterFnWithConnectRetry(this, this.arrays);\n    }\n  }\n\n  private getURL(): URL | undefined {\n    return this.config.databaseURL\n      ? new URL(this.config.databaseURL)\n      : undefined;\n  }\n\n  reconfigure(params: {\n    database?: string;\n    user?: string;\n    password?: string;\n    schema?: string;\n  }): AdapterBase {\n    const url = this.getURL();\n    if (url) {\n      if ('database' in params) {\n        url.pathname = `/${params.database}`;\n      }\n\n      if (params.user !== undefined) {\n        url.username = params.user;\n      }\n\n      if (params.password !== undefined) {\n        url.password = params.password;\n      }\n\n      if (params.schema !== undefined) {\n        url.searchParams.set('schema', params.schema);\n      }\n\n      return new PostgresJsAdapter({\n        ...this.config,\n        databaseURL: url.toString(),\n      });\n    } else {\n      return new PostgresJsAdapter({ ...this.config, ...params });\n    }\n  }\n\n  getDatabase(): string {\n    const url = this.getURL();\n    return url ? url.pathname.slice(1) : (this.config.database as string);\n  }\n\n  getUser(): string {\n    const url = this.getURL();\n    return url ? url.username : (this.config.user as string);\n  }\n\n  getSchema(): string | undefined {\n    return this.schema;\n  }\n\n  getHost(): string {\n    const url = this.getURL();\n    return url ? url.hostname : (this.config.host as string);\n  }\n\n  query<T extends QueryResultRow = QueryResultRow>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryResult<T>> {\n    return query(this.sql, text, values);\n  }\n\n  arrays<R extends any[] = any[]>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryArraysResult<R>> {\n    return arrays(this.sql, text, values);\n  }\n\n  async transaction<Result>(\n    options: string | undefined,\n    cb: (adapter: AdapterBase) => Promise<Result>,\n  ): Promise<Result> {\n    return (\n      options\n        ? this.sql.begin(options, (sql) =>\n            cb(new PostgresJsTransactionAdapter(this, sql)),\n          )\n        : this.sql.begin((sql) =>\n            cb(new PostgresJsTransactionAdapter(this, sql)),\n          )\n    ) as never;\n  }\n\n  close(): Promise<void> {\n    return this.sql.end();\n  }\n\n  assignError(to: QueryError, dbError: Error) {\n    const from = dbError as PostgresError;\n    to.message = from.message;\n    to.severity = from.severity;\n    to.code = from.code;\n    to.detail = from.detail;\n    to.hint = from.hint;\n    to.position = from.position;\n    to.where = from.where;\n    to.file = from.file;\n    to.line = from.line;\n    to.routine = from.routine;\n  }\n}\n\nconst query = <T extends QueryResultRow = QueryResultRow>(\n  sql: postgres.Sql,\n  text: string,\n  values?: unknown[],\n): Promise<QueryResult<T>> => {\n  return sql.unsafe(text, values as never).then(wrapResult);\n};\n\nconst arrays = <R extends any[] = any[]>(\n  sql: postgres.Sql,\n  text: string,\n  values?: unknown[],\n): Promise<QueryArraysResult<R>> => {\n  return sql\n    .unsafe(text, values as never)\n    .values()\n    .then(wrapResult);\n};\n\nexport class PostgresJsTransactionAdapter implements AdapterBase {\n  errorClass = PostgresError;\n\n  constructor(public adapter: PostgresJsAdapter, public sql: postgres.Sql) {}\n\n  reconfigure(params: {\n    database?: string;\n    user?: string;\n    password?: string;\n    schema?: string;\n  }): AdapterBase {\n    return this.adapter.reconfigure(params);\n  }\n\n  getDatabase(): string {\n    return this.adapter.getDatabase();\n  }\n\n  getUser(): string {\n    return this.adapter.getUser();\n  }\n\n  getSchema(): string | undefined {\n    return this.adapter.schema;\n  }\n\n  getHost(): string {\n    return this.adapter.getHost();\n  }\n\n  query<T extends QueryResultRow = QueryResultRow>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryResult<T>> {\n    return query(this.sql, text, values);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  arrays<R extends any[] = any[]>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryArraysResult<R>> {\n    return arrays(this.sql, text, values);\n  }\n\n  async transaction<Result>(\n    _options: string | undefined,\n    cb: (adapter: PostgresJsTransactionAdapter) => Promise<Result>,\n  ): Promise<Result> {\n    return await cb(this);\n  }\n\n  close(): Promise<void> {\n    return this.sql.end();\n  }\n\n  assignError(to: QueryError, from: Error) {\n    return this.adapter.assignError(to, from);\n  }\n}\n"],"names":["createDbWithAdapter","returnArg","PostgresError","setConnectRetryConfig","emptyObject","wrapAdapterFnWithConnectRetry"],"mappings":"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"}

package/dist/postgres-js.mjs

@@ -0,0 +1,217 @@
+import { setConnectRetryConfig, emptyObject, wrapAdapterFnWithConnectRetry, returnArg } from 'orchid-core';
+import postgres, { PostgresError } from 'postgres';
+import { createDbWithAdapter } from 'pqb';
+
+const createDb = (options) => {
+  return createDbWithAdapter({
+    ...options,
+    adapter: new PostgresJsAdapter(options)
+  });
+};
+class PostgresJsResult {
+  constructor(result) {
+    this.rowCount = result.count;
+    this.rows = result;
+    this.fields = result.statement.columns;
+  }
+}
+const wrapResult = (result) => {
+  if (result.constructor === Array) {
+    return result.map(
+      (res) => new PostgresJsResult(res)
+    );
+  } else {
+    return new PostgresJsResult(result);
+  }
+};
+const types = {
+  dateAndTimestampAsStrings: {
+    to: 25,
+    from: [1082, 1114, 1184],
+    parse: returnArg
+  },
+  interval: {
+    from: [1186],
+    serialize: returnArg,
+    parse(str) {
+      const [years, , months, , days, , time] = str.split(" ");
+      const [hours, minutes, seconds] = time.split(":");
+      return {
+        years: years ? Number(years) : 0,
+        months: months ? Number(months) : 0,
+        days: days ? Number(days) : 0,
+        hours: hours ? Number(hours) : 0,
+        minutes: minutes ? Number(minutes) : 0,
+        seconds: seconds ? Number(seconds) : 0
+      };
+    }
+  },
+  // overrides the built-in json type to not serialize it, because it incorrectly serializes
+  json: {
+    to: 114,
+    from: [114, 3802],
+    serialize: returnArg,
+    parse: (x) => {
+      return JSON.parse(x);
+    }
+  }
+};
+class PostgresJsAdapter {
+  constructor(config) {
+    this.errorClass = PostgresError;
+    this.config = { ...config, types };
+    this.schema = config.schema;
+    if (this.schema) {
+      this.config.connection = {
+        ...config.connection,
+        search_path: this.schema
+      };
+    }
+    if (this.config.databaseURL) {
+      const urlString = this.config.databaseURL;
+      const url = new URL(urlString);
+      const ssl = url.searchParams.get("ssl");
+      if (ssl === "false" || ssl === "true") {
+        this.config.ssl = ssl === "true";
+      }
+      const schema = url.searchParams.get("schema");
+      if (schema) {
+        this.schema = schema;
+        url.searchParams.delete("schema");
+        this.config.connection = {
+          ...config.connection,
+          search_path: schema
+        };
+      }
+      this.sql = postgres(url.toString(), this.config);
+    } else {
+      this.sql = postgres(this.config);
+    }
+    if (config.connectRetry) {
+      setConnectRetryConfig(
+        this,
+        config.connectRetry === true ? emptyObject : config.connectRetry
+      );
+      this.query = wrapAdapterFnWithConnectRetry(this, this.query);
+      this.arrays = wrapAdapterFnWithConnectRetry(this, this.arrays);
+    }
+  }
+  getURL() {
+    return this.config.databaseURL ? new URL(this.config.databaseURL) : void 0;
+  }
+  reconfigure(params) {
+    const url = this.getURL();
+    if (url) {
+      if ("database" in params) {
+        url.pathname = `/${params.database}`;
+      }
+      if (params.user !== void 0) {
+        url.username = params.user;
+      }
+      if (params.password !== void 0) {
+        url.password = params.password;
+      }
+      if (params.schema !== void 0) {
+        url.searchParams.set("schema", params.schema);
+      }
+      return new PostgresJsAdapter({
+        ...this.config,
+        databaseURL: url.toString()
+      });
+    } else {
+      return new PostgresJsAdapter({ ...this.config, ...params });
+    }
+  }
+  getDatabase() {
+    const url = this.getURL();
+    return url ? url.pathname.slice(1) : this.config.database;
+  }
+  getUser() {
+    const url = this.getURL();
+    return url ? url.username : this.config.user;
+  }
+  getSchema() {
+    return this.schema;
+  }
+  getHost() {
+    const url = this.getURL();
+    return url ? url.hostname : this.config.host;
+  }
+  query(text, values) {
+    return query(this.sql, text, values);
+  }
+  arrays(text, values) {
+    return arrays(this.sql, text, values);
+  }
+  async transaction(options, cb) {
+    return options ? this.sql.begin(
+      options,
+      (sql) => cb(new PostgresJsTransactionAdapter(this, sql))
+    ) : this.sql.begin(
+      (sql) => cb(new PostgresJsTransactionAdapter(this, sql))
+    );
+  }
+  close() {
+    return this.sql.end();
+  }
+  assignError(to, dbError) {
+    const from = dbError;
+    to.message = from.message;
+    to.severity = from.severity;
+    to.code = from.code;
+    to.detail = from.detail;
+    to.hint = from.hint;
+    to.position = from.position;
+    to.where = from.where;
+    to.file = from.file;
+    to.line = from.line;
+    to.routine = from.routine;
+  }
+}
+const query = (sql, text, values) => {
+  return sql.unsafe(text, values).then(wrapResult);
+};
+const arrays = (sql, text, values) => {
+  return sql.unsafe(text, values).values().then(wrapResult);
+};
+class PostgresJsTransactionAdapter {
+  constructor(adapter, sql) {
+    this.adapter = adapter;
+    this.sql = sql;
+    this.errorClass = PostgresError;
+  }
+  reconfigure(params) {
+    return this.adapter.reconfigure(params);
+  }
+  getDatabase() {
+    return this.adapter.getDatabase();
+  }
+  getUser() {
+    return this.adapter.getUser();
+  }
+  getSchema() {
+    return this.adapter.schema;
+  }
+  getHost() {
+    return this.adapter.getHost();
+  }
+  query(text, values) {
+    return query(this.sql, text, values);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  arrays(text, values) {
+    return arrays(this.sql, text, values);
+  }
+  async transaction(_options, cb) {
+    return await cb(this);
+  }
+  close() {
+    return this.sql.end();
+  }
+  assignError(to, from) {
+    return this.adapter.assignError(to, from);
+  }
+}
+
+export { PostgresJsAdapter, PostgresJsTransactionAdapter, createDb };
+//# sourceMappingURL=postgres-js.mjs.map

package/dist/postgres-js.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"postgres-js.mjs","sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import {\n  AdapterBase,\n  AdapterConfigBase,\n  ColumnSchemaConfig,\n  emptyObject,\n  MaybeArray,\n  QueryArraysResult,\n  QueryError,\n  QueryResult,\n  QueryResultRow,\n  returnArg,\n  setConnectRetryConfig,\n  wrapAdapterFnWithConnectRetry,\n} from 'orchid-core';\nimport postgres, { Error, PostgresError, Row, RowList } from 'postgres';\nimport {\n  DbOptions,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  createDbWithAdapter,\n  DbResult,\n} from 'pqb';\n\nexport interface CreatePostgresJsDbOptions<\n  SchemaConfig extends ColumnSchemaConfig,\n  ColumnTypes,\n> extends PostgresJsAdapterOptions,\n    DbOptions<SchemaConfig, ColumnTypes> {}\n\nexport const createDb = <\n  SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig,\n  ColumnTypes = DefaultColumnTypes<SchemaConfig>,\n>(\n  options: CreatePostgresJsDbOptions<SchemaConfig, ColumnTypes>,\n): DbResult<ColumnTypes> => {\n  return createDbWithAdapter({\n    ...options,\n    adapter: new PostgresJsAdapter(options as never),\n  });\n};\n\nexport interface PostgresJsAdapterOptions\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  extends postgres.Options<any>,\n    AdapterConfigBase {\n  databaseURL?: string;\n  schema?: string;\n}\n\ntype RawResult = RowList<(Row & Iterable<Row>)[]>;\n\nclass PostgresJsResult<T extends QueryResultRow> implements QueryResult<T> {\n  rowCount: number;\n  rows: T[];\n  fields: QueryResult<T>['fields'];\n\n  constructor(result: RawResult) {\n    this.rowCount = result.count;\n    this.rows = result as never;\n    this.fields = result.statement.columns;\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst wrapResult = (result: MaybeArray<RawResult>): QueryArraysResult<any> => {\n  if (result.constructor === Array) {\n    return (result as RawResult[]).map(\n      (res) => new PostgresJsResult(res),\n    ) as never;\n  } else {\n    return new PostgresJsResult(result as RawResult);\n  }\n};\n\nconst types: Record<string, Partial<postgres.PostgresType>> = {\n  dateAndTimestampAsStrings: {\n    to: 25,\n    from: [1082, 1114, 1184],\n    parse: returnArg,\n  },\n  interval: {\n    from: [1186],\n    serialize: returnArg,\n    parse(str: string) {\n      const [years, , months, , days, , time] = str.split(' ');\n      const [hours, minutes, seconds] = time.split(':');\n\n      return {\n        years: years ? Number(years) : 0,\n        months: months ? Number(months) : 0,\n        days: days ? Number(days) : 0,\n        hours: hours ? Number(hours) : 0,\n        minutes: minutes ? Number(minutes) : 0,\n        seconds: seconds ? Number(seconds) : 0,\n      };\n    },\n  },\n  // overrides the built-in json type to not serialize it, because it incorrectly serializes\n  json: {\n    to: 114,\n    from: [114, 3802],\n    serialize: returnArg,\n    parse: (x) => {\n      return JSON.parse(x);\n    },\n  },\n};\n\nexport class PostgresJsAdapter implements AdapterBase {\n  sql: postgres.Sql;\n  schema?: string;\n  config: PostgresJsAdapterOptions;\n  errorClass = PostgresError;\n\n  constructor(config: PostgresJsAdapterOptions) {\n    this.config = { ...config, types };\n\n    this.schema = config.schema;\n    if (this.schema) {\n      this.config.connection = {\n        ...config.connection,\n        search_path: this.schema,\n      };\n    }\n\n    if (this.config.databaseURL) {\n      const urlString = this.config.databaseURL;\n      const url = new URL(urlString);\n\n      const ssl = url.searchParams.get('ssl');\n      if (ssl === 'false' || ssl === 'true') {\n        this.config.ssl = ssl === 'true';\n      }\n\n      const schema = url.searchParams.get('schema');\n      if (schema) {\n        this.schema = schema;\n        url.searchParams.delete('schema');\n        this.config.connection = {\n          ...config.connection,\n          search_path: schema,\n        };\n      }\n\n      this.sql = postgres(url.toString(), this.config);\n    } else {\n      this.sql = postgres(this.config);\n    }\n\n    if (config.connectRetry) {\n      setConnectRetryConfig(\n        this,\n        config.connectRetry === true ? emptyObject : config.connectRetry,\n      );\n\n      this.query = wrapAdapterFnWithConnectRetry(this, this.query);\n      this.arrays = wrapAdapterFnWithConnectRetry(this, this.arrays);\n    }\n  }\n\n  private getURL(): URL | undefined {\n    return this.config.databaseURL\n      ? new URL(this.config.databaseURL)\n      : undefined;\n  }\n\n  reconfigure(params: {\n    database?: string;\n    user?: string;\n    password?: string;\n    schema?: string;\n  }): AdapterBase {\n    const url = this.getURL();\n    if (url) {\n      if ('database' in params) {\n        url.pathname = `/${params.database}`;\n      }\n\n      if (params.user !== undefined) {\n        url.username = params.user;\n      }\n\n      if (params.password !== undefined) {\n        url.password = params.password;\n      }\n\n      if (params.schema !== undefined) {\n        url.searchParams.set('schema', params.schema);\n      }\n\n      return new PostgresJsAdapter({\n        ...this.config,\n        databaseURL: url.toString(),\n      });\n    } else {\n      return new PostgresJsAdapter({ ...this.config, ...params });\n    }\n  }\n\n  getDatabase(): string {\n    const url = this.getURL();\n    return url ? url.pathname.slice(1) : (this.config.database as string);\n  }\n\n  getUser(): string {\n    const url = this.getURL();\n    return url ? url.username : (this.config.user as string);\n  }\n\n  getSchema(): string | undefined {\n    return this.schema;\n  }\n\n  getHost(): string {\n    const url = this.getURL();\n    return url ? url.hostname : (this.config.host as string);\n  }\n\n  query<T extends QueryResultRow = QueryResultRow>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryResult<T>> {\n    return query(this.sql, text, values);\n  }\n\n  arrays<R extends any[] = any[]>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryArraysResult<R>> {\n    return arrays(this.sql, text, values);\n  }\n\n  async transaction<Result>(\n    options: string | undefined,\n    cb: (adapter: AdapterBase) => Promise<Result>,\n  ): Promise<Result> {\n    return (\n      options\n        ? this.sql.begin(options, (sql) =>\n            cb(new PostgresJsTransactionAdapter(this, sql)),\n          )\n        : this.sql.begin((sql) =>\n            cb(new PostgresJsTransactionAdapter(this, sql)),\n          )\n    ) as never;\n  }\n\n  close(): Promise<void> {\n    return this.sql.end();\n  }\n\n  assignError(to: QueryError, dbError: Error) {\n    const from = dbError as PostgresError;\n    to.message = from.message;\n    to.severity = from.severity;\n    to.code = from.code;\n    to.detail = from.detail;\n    to.hint = from.hint;\n    to.position = from.position;\n    to.where = from.where;\n    to.file = from.file;\n    to.line = from.line;\n    to.routine = from.routine;\n  }\n}\n\nconst query = <T extends QueryResultRow = QueryResultRow>(\n  sql: postgres.Sql,\n  text: string,\n  values?: unknown[],\n): Promise<QueryResult<T>> => {\n  return sql.unsafe(text, values as never).then(wrapResult);\n};\n\nconst arrays = <R extends any[] = any[]>(\n  sql: postgres.Sql,\n  text: string,\n  values?: unknown[],\n): Promise<QueryArraysResult<R>> => {\n  return sql\n    .unsafe(text, values as never)\n    .values()\n    .then(wrapResult);\n};\n\nexport class PostgresJsTransactionAdapter implements AdapterBase {\n  errorClass = PostgresError;\n\n  constructor(public adapter: PostgresJsAdapter, public sql: postgres.Sql) {}\n\n  reconfigure(params: {\n    database?: string;\n    user?: string;\n    password?: string;\n    schema?: string;\n  }): AdapterBase {\n    return this.adapter.reconfigure(params);\n  }\n\n  getDatabase(): string {\n    return this.adapter.getDatabase();\n  }\n\n  getUser(): string {\n    return this.adapter.getUser();\n  }\n\n  getSchema(): string | undefined {\n    return this.adapter.schema;\n  }\n\n  getHost(): string {\n    return this.adapter.getHost();\n  }\n\n  query<T extends QueryResultRow = QueryResultRow>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryResult<T>> {\n    return query(this.sql, text, values);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  arrays<R extends any[] = any[]>(\n    text: string,\n    values?: unknown[],\n  ): Promise<QueryArraysResult<R>> {\n    return arrays(this.sql, text, values);\n  }\n\n  async transaction<Result>(\n    _options: string | undefined,\n    cb: (adapter: PostgresJsTransactionAdapter) => Promise<Result>,\n  ): Promise<Result> {\n    return await cb(this);\n  }\n\n  close(): Promise<void> {\n    return this.sql.end();\n  }\n\n  assignError(to: QueryError, from: Error) {\n    return this.adapter.assignError(to, from);\n  }\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.55.1",
+  "version": "0.56.3",
   "description": "Postgres query builder",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-and-query-builder.html",
   "repository": {
@@ -15,6 +15,16 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs",
       "types": "./dist/index.d.ts"
+    },
+    "./node-postgres": {
+      "require": "./dist/node-postgres.js",
+      "import": "./dist/node-postgres.mjs",
+      "types": "./dist/node-postgres.d.ts"
+    },
+    "./postgres-js": {
+      "require": "./dist/postgres-js.js",
+      "import": "./dist/postgres-js.mjs",
+      "types": "./dist/postgres-js.d.ts"
     }
   },
   "files": [
@@ -29,20 +39,29 @@
   "license": "ISC",
   "dependencies": {
     "@types/pg": ">=8",
-    "pg": ">=8",
-    "orchid-core": "0.28.1"
+    "orchid-core": "0.29.1"
   },
   "devDependencies": {
-    "bun-types": "1.0.5-canary.20231009T140142",
     "zod": "^3.25.42",
     "test-utils": "0.3.3"
   },
+  "peerDependencies": {
+    "pg": ">=8",
+    "postgres": ">=3"
+  },
+  "peerDependenciesMeta": {
+    "pg": {
+      "optional": true
+    },
+    "postgres": {
+      "optional": true
+    }
+  },
   "scripts": {
     "test": "jest --watch --verbose false",
     "check": "jest",
     "types": "tsc",
-    "bun:check": "cd ../../.. && bun test packages/qb/pqb/bun.test.ts",
-    "test:ci": "jest --coverage --coverageReporters json-summary && pnpm bun:check",
-    "build": "rimraf ./dist/ && rollup -c ../../../rollup.config.mjs"
+    "test:ci": "jest --coverage --coverageReporters json-summary",
+    "build": "rimraf ./dist/ && rollup -c ./rollup.config.mjs"
   }
 }