pqb 0.66.8 → 0.67.0

package/dist/postgres-js.mjs

@@ -1,6 +1,22 @@
 import postgres from "postgres";
 import { AdapterClass, noop, returnArg } from "pqb/internal";
 import { createDbWithAdapter } from "pqb";
+const intervalRegExp = /^\s*(?:([+-]?\d+)\s+years?)?\s*(?:([+-]?\d+)\s+mons?)?\s*(?:([+-]?\d+)\s+days?)?\s*(?:([+-])?(\d+):(\d\d):(\d\d(?:\.\d{1,6})?))?\s*$/;
+const parseInterval = (str) => {
+	const [, years, months, days, timeSign, hours, minutes, seconds] = intervalRegExp.exec(str) || [];
+	const timeMultiplier = timeSign === "-" ? -1 : 1;
+	const secondsFloat = Number(seconds) || 0;
+	const wholeSeconds = Math.floor(secondsFloat);
+	return {
+		years: years ? Number(years) : 0,
+		months: months ? Number(months) : 0,
+		days: days ? Number(days) : 0,
+		hours: hours ? timeMultiplier * Number(hours) : 0,
+		minutes: minutes ? timeMultiplier * Number(minutes) : 0,
+		seconds: timeMultiplier * wholeSeconds,
+		milliseconds: Math.round(timeMultiplier * (secondsFloat - wholeSeconds) * 1e6) / 1e3
+	};
+};
 const createDb = (options) => {
 	return createDbWithAdapter({
 		...options,
@@ -17,11 +33,19 @@ var PostgresJsResult = class {
 		this.fields = result.statement.columns;
 	}
 };
+var PostgresJsArraysResult = class {
+	constructor(result) {
+		this.rowCount = result.count;
+		this.rows = result;
+		this.fields = result.statement.columns;
+	}
+};
 const types = {
 	bytea: {
 		to: 17,
 		from: 17,
-		serialize: (x) => "\\x" + Buffer.from(x).toString("hex")
+		serialize: (x) => "\\x" + Buffer.from(x).toString("hex"),
+		parse: (x) => Buffer.from(x.slice(2), "hex")
 	},
 	dateAndTimestampAsStrings: {
 		to: 25,
@@ -35,23 +59,11 @@ const types = {
 	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
-			};
-		}
+		parse: parseInterval
 	},
 	json: {
 		to: 114,
 		from: [114, 3802],
-		serialize: returnArg,
 		parse: (x) => {
 			return JSON.parse(x);
 		}
@@ -93,8 +105,8 @@ const PostgresJsAdapter = {
 		let query = client.unsafe(text, values);
 		if (arraysMode) query = query.values();
 		const result = await query;
-		if (result.constructor === Array) return result.map((res) => new PostgresJsResult(res));
-		else return new PostgresJsResult(result);
+		if (result.constructor === Array) return result.map((res) => makePostgresJsResult(res, arraysMode));
+		else return makePostgresJsResult(result, arraysMode);
 	},
 	borrow(client) {
 		return client.reserve();
@@ -166,6 +178,9 @@ const PostgresJsAdapter = {
 		return client.end();
 	}
 };
+const makePostgresJsResult = (result, arraysMode) => {
+	return arraysMode ? new PostgresJsArraysResult(result) : new PostgresJsResult(result);
+};
 export { PostgresJsAdapter, createDb };
 
 //# sourceMappingURL=postgres-js.mjs.map

package/dist/postgres-js.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-js.mjs","names":[],"sources":["../src/adapters/postgres-js.ts"],"sourcesContent":["import postgres, { Row, RowList, TransactionSql } from 'postgres';\nimport {\n  AdapterConfigBase,\n  QueryResult,\n  QueryResultRow,\n  returnArg,\n  DbOptions,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbResult,\n  ColumnSchemaConfig,\n  AdapterClass,\n  DriverAdapter,\n  QuerySchema,\n  noop,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\n\nexport interface CreatePostgresJsDbOptions<\n  SchemaConfig extends ColumnSchemaConfig,\n  ColumnTypes,\n>\n  extends PostgresJsAdapterOptions, 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 AdapterClass({\n      driverAdapter: PostgresJsAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport interface PostgresJsAdapterOptions\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  extends postgres.Options<any>, Omit<AdapterConfigBase, 'searchPath' | 'ssl'> {\n  databaseURL?: string;\n  schema?: QuerySchema;\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\nconst types: Record<string, Partial<postgres.PostgresType>> = {\n  bytea: {\n    to: 17,\n    from: 17 as never,\n    serialize: (x) => '\\\\x' + Buffer.from(x).toString('hex'),\n    // omit parse, let bytea return a string, so it remains consistent with when it's selected via JSON\n  },\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 const PostgresJsAdapter: DriverAdapter = {\n  manualPool: false,\n\n  errorClass: postgres.PostgresError,\n  errorFields: {\n    message: 'message',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    schema: 'schema_name',\n    table: 'table_name',\n    constraint: 'constraint_name',\n    hint: 'hint',\n    position: 'position',\n    where: 'where',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(params: PostgresJsAdapterOptions): postgres.Sql {\n    const config: PostgresJsAdapterOptions = { ...params, types };\n\n    if (config.setConfig?.search_path) {\n      config.connection = {\n        ...config.connection,\n        search_path: config.setConfig.search_path,\n      };\n    }\n\n    let sql;\n    if (config.databaseURL) {\n      sql = postgres(config.databaseURL, config);\n    } else {\n      sql = postgres(config);\n    }\n\n    return sql;\n  },\n\n  async queryClient<T extends QueryResultRow = QueryResultRow>(\n    client: TransactionSql,\n    text: string,\n    values?: unknown[],\n    // SQL session state (role and setConfig) from async storage\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    let query = client.unsafe(text, values as never) as any;\n\n    if (arraysMode) query = query.values();\n\n    const result = await query;\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\n  borrow(client: postgres.Sql): Promise<postgres.ReservedSql> {\n    return client.reserve();\n  },\n\n  release(client: postgres.ReservedSql): void {\n    client.release();\n  },\n\n  begin<DriverClient, Result>(\n    client: postgres.Sql,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    let ok: boolean | undefined;\n    let result: unknown;\n\n    const fn = (sql: TransactionSql): Promise<Result> =>\n      cb(sql as DriverClient).then((res) => {\n        ok = true;\n        return (result = res);\n      });\n\n    return (options ? client.begin(options, fn) : client.begin(fn)).catch(\n      (err) => {\n        if (ok) return result;\n\n        throw err;\n      },\n    ) as never;\n  },\n\n  async savepoint<T>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    let result: T | undefined;\n    await client\n      .savepoint(name, async (savepointClient) => {\n        setClient(savepointClient);\n        result = await cb();\n      })\n      .finally(() => {\n        setClient(client);\n      });\n    return result as T;\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = client\n      .savepoint<void>(state.name, async (savepointClient) => {\n        try {\n          setClient(savepointClient);\n\n          const res = await this.queryClient<T>(\n            savepointClient,\n            text,\n            values,\n            arraysMode,\n          );\n          resultResolve(res);\n        } catch (err) {\n          resultReject(err);\n          throw err;\n        }\n\n        return promise;\n      })\n      .finally(() => {\n        setClient(client);\n      });\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(client: postgres.Sql): Promise<void> {\n    return client.end();\n  },\n};\n"],"mappings":"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"}
+{"version":3,"file":"postgres-js.mjs","names":[],"sources":["../src/adapters/driver-adapter-shared.ts","../src/adapters/postgres-js.ts"],"sourcesContent":["export interface PostgresInterval {\n  years: number;\n  months: number;\n  days: number;\n  hours: number;\n  minutes: number;\n  seconds: number;\n  milliseconds: number;\n}\n\nconst intervalRegExp =\n  /^\\s*(?:([+-]?\\d+)\\s+years?)?\\s*(?:([+-]?\\d+)\\s+mons?)?\\s*(?:([+-]?\\d+)\\s+days?)?\\s*(?:([+-])?(\\d+):(\\d\\d):(\\d\\d(?:\\.\\d{1,6})?))?\\s*$/;\n\nexport const parseInterval = (str: string): PostgresInterval => {\n  const [, years, months, days, timeSign, hours, minutes, seconds] =\n    intervalRegExp.exec(str) || [];\n  const timeMultiplier = timeSign === '-' ? -1 : 1;\n  const secondsFloat = Number(seconds) || 0;\n  const wholeSeconds = Math.floor(secondsFloat);\n\n  return {\n    years: years ? Number(years) : 0,\n    months: months ? Number(months) : 0,\n    days: days ? Number(days) : 0,\n    hours: hours ? timeMultiplier * Number(hours) : 0,\n    minutes: minutes ? timeMultiplier * Number(minutes) : 0,\n    seconds: timeMultiplier * wholeSeconds,\n    milliseconds:\n      Math.round(timeMultiplier * (secondsFloat - wholeSeconds) * 1000000) /\n      1000,\n  };\n};\n","import postgres, { Row, RowList, TransactionSql } from 'postgres';\nimport {\n  AdapterConfigBase,\n  QueryResult,\n  QueryResultRow,\n  returnArg,\n  DbOptions,\n  DefaultColumnTypes,\n  DefaultSchemaConfig,\n  DbResult,\n  ColumnSchemaConfig,\n  AdapterClass,\n  DriverAdapter,\n  QuerySchema,\n  noop,\n} from 'pqb/internal';\nimport { createDbWithAdapter } from 'pqb';\nimport { HackySavepointState } from './adapter';\nimport { parseInterval } from './driver-adapter-shared';\n\nexport interface CreatePostgresJsDbOptions<\n  SchemaConfig extends ColumnSchemaConfig,\n  ColumnTypes,\n>\n  extends PostgresJsAdapterOptions, 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 AdapterClass({\n      driverAdapter: PostgresJsAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport interface PostgresJsAdapterOptions\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  extends postgres.Options<any>, Omit<AdapterConfigBase, 'searchPath' | 'ssl'> {\n  databaseURL?: string;\n  schema?: QuerySchema;\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\nclass PostgresJsArraysResult<\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  R extends any[],\n> implements QueryResult<R> {\n  rowCount: number;\n  rows: R[];\n  fields: QueryResult['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\nconst types: Record<string, Partial<postgres.PostgresType>> = {\n  bytea: {\n    to: 17,\n    from: 17 as never,\n    serialize: (x) => '\\\\x' + Buffer.from(x).toString('hex'),\n    parse: (x: string) => Buffer.from(x.slice(2), 'hex'),\n  },\n  dateAndTimestampAsStrings: {\n    to: 25,\n    from: [1082, 1114, 1184],\n    parse: returnArg,\n  },\n  interval: {\n    from: [1186],\n    serialize: returnArg,\n    parse: parseInterval,\n  },\n  json: {\n    to: 114,\n    from: [114, 3802],\n    parse: (x) => {\n      return JSON.parse(x);\n    },\n  },\n};\n\nexport const PostgresJsAdapter: DriverAdapter = {\n  manualPool: false,\n\n  errorClass: postgres.PostgresError,\n  errorFields: {\n    message: 'message',\n    severity: 'severity',\n    code: 'code',\n    detail: 'detail',\n    schema: 'schema_name',\n    table: 'table_name',\n    constraint: 'constraint_name',\n    hint: 'hint',\n    position: 'position',\n    where: 'where',\n    file: 'file',\n    line: 'line',\n    routine: 'routine',\n  },\n\n  configure(params: PostgresJsAdapterOptions): postgres.Sql {\n    const config: PostgresJsAdapterOptions = {\n      ...params,\n      types,\n    };\n\n    if (config.setConfig?.search_path) {\n      config.connection = {\n        ...config.connection,\n        search_path: config.setConfig.search_path,\n      };\n    }\n\n    let sql;\n    if (config.databaseURL) {\n      sql = postgres(config.databaseURL, config);\n    } else {\n      sql = postgres(config);\n    }\n\n    return sql;\n  },\n\n  async queryClient<T = QueryResultRow>(\n    client: TransactionSql,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    let query = client.unsafe(text, values as never) as any;\n\n    if (arraysMode) query = query.values();\n\n    const result = await query;\n    if (result.constructor === Array) {\n      return (result as RawResult[]).map((res) =>\n        makePostgresJsResult(res, arraysMode),\n      ) as never;\n    } else {\n      return makePostgresJsResult(\n        result as RawResult,\n        arraysMode,\n      ) as QueryResult<T>;\n    }\n  },\n\n  borrow(client: postgres.Sql): Promise<postgres.ReservedSql> {\n    return client.reserve();\n  },\n\n  release(client: postgres.ReservedSql): void {\n    client.release();\n  },\n\n  begin<DriverClient, Result>(\n    client: postgres.Sql,\n    cb: (adapter: DriverClient) => Promise<Result>,\n    options?: string,\n  ): Promise<Result> {\n    let ok: boolean | undefined;\n    let result: unknown;\n\n    const fn = (sql: TransactionSql): Promise<Result> =>\n      cb(sql as DriverClient).then((res) => {\n        ok = true;\n        return (result = res);\n      });\n\n    return (options ? client.begin(options, fn) : client.begin(fn)).catch(\n      (err) => {\n        if (ok) return result;\n\n        throw err;\n      },\n    ) as never;\n  },\n\n  async savepoint<T>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    name: string,\n    cb: () => Promise<T>,\n  ): Promise<T> {\n    let result: T | undefined;\n    await client\n      .savepoint(name, async (savepointClient) => {\n        setClient(savepointClient);\n        result = await cb();\n      })\n      .finally(() => {\n        setClient(client);\n      });\n    return result as T;\n  },\n\n  async hackySavepoint<T extends QueryResultRow>(\n    client: postgres.TransactionSql,\n    setClient: (client: postgres.TransactionSql) => void,\n    state: HackySavepointState,\n    text: string,\n    values?: unknown[],\n    arraysMode?: boolean,\n  ): Promise<QueryResult<T>> {\n    let resolve: () => void;\n    let reject: (err: unknown) => void;\n    const promise = new Promise<void>((res, rej) => {\n      resolve = res;\n      reject = rej;\n    });\n\n    let resultResolve: (res: QueryResult<T>) => void;\n    let resultReject: (err: unknown) => void;\n    const resultPromise = new Promise<QueryResult<T>>((res, rej) => {\n      resultResolve = res;\n      resultReject = rej;\n    });\n\n    const savepointPromise = client\n      .savepoint<void>(state.name, async (savepointClient) => {\n        try {\n          setClient(savepointClient);\n\n          const res = await this.queryClient<T>(\n            savepointClient,\n            text,\n            values,\n            arraysMode,\n          );\n          resultResolve(res as QueryResult<T>);\n        } catch (err) {\n          resultReject(err);\n          throw err;\n        }\n\n        return promise;\n      })\n      .finally(() => {\n        setClient(client);\n      });\n\n    state.activeSavepoint = {\n      async release() {\n        resolve();\n        await savepointPromise;\n      },\n      async rollback(err) {\n        reject(err);\n        await savepointPromise.catch(noop);\n      },\n    };\n\n    return resultPromise;\n  },\n\n  close(client: postgres.Sql): Promise<void> {\n    return client.end();\n  },\n};\n\nconst makePostgresJsResult = (\n  result: RawResult,\n  arraysMode?: boolean,\n): QueryResult => {\n  return arraysMode\n    ? new PostgresJsArraysResult(result)\n    : new PostgresJsResult(result);\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.66.8",
+  "version": "0.67.0",
   "description": "Postgres query builder",
   "keywords": [
     "pg",
@@ -61,6 +61,16 @@
         "default": "./dist/postgres-js.mjs",
         "types": "./dist/postgres-js.d.ts"
       }
+    },
+    "./bun": {
+      "require": {
+        "default": "./dist/bun.js",
+        "types": "./dist/bun.d.ts"
+      },
+      "import": {
+        "default": "./dist/bun.mjs",
+        "types": "./dist/bun.d.ts"
+      }
     }
   },
   "dependencies": {
@@ -84,7 +94,9 @@
   },
   "scripts": {
     "test": "jest --watch --reporters default --verbose false",
+    "bun:test": "bun --bun jest --watch --reporters default --verbose false --runInBand",
     "check": "jest",
+    "bun:check": "bun --bun jest --runInBand",
     "check:coverage": "jest --coverage --coverageReporters json-summary",
     "types": "tsc",
     "build": "rimraf ./dist/ && rolldown -c ./rolldown.config.mjs",