@erfanium/drizzle-orm 0.1.0 → 1.0.1

package/pg-core/primary-keys.d.cts

@@ -1,6 +1,6 @@
-import { entityKind } from "../entity.cjs";
-import type { AnyPgColumn, PgColumn } from "./columns/index.cjs";
-import { PgTable } from "./table.cjs";
+import { entityKind } from '../entity.cjs';
+import type { AnyPgColumn, PgColumn } from './columns/index.cjs';
+import { PgTable } from './table.cjs';
 export declare function primaryKey<TTableName extends string, TColumn extends AnyPgColumn<{
     tableName: TTableName;
 }>, TColumns extends AnyPgColumn<{
@@ -25,6 +25,7 @@ export declare class PrimaryKey {
     static readonly [entityKind]: string;
     readonly columns: AnyPgColumn<{}>[];
     readonly name?: string;
+    readonly isNameExplicit: boolean;
     constructor(table: PgTable, columns: AnyPgColumn<{}>[], name?: string);
     getName(): string;
 }

package/pg-core/primary-keys.d.ts

@@ -1,6 +1,6 @@
-import { entityKind } from "../entity.js";
-import type { AnyPgColumn, PgColumn } from "./columns/index.js";
-import { PgTable } from "./table.js";
+import { entityKind } from '../entity.js';
+import type { AnyPgColumn, PgColumn } from './columns/index.js';
+import { PgTable } from './table.js';
 export declare function primaryKey<TTableName extends string, TColumn extends AnyPgColumn<{
     tableName: TTableName;
 }>, TColumns extends AnyPgColumn<{
@@ -25,6 +25,7 @@ export declare class PrimaryKey {
     static readonly [entityKind]: string;
     readonly columns: AnyPgColumn<{}>[];
     readonly name?: string;
+    readonly isNameExplicit: boolean;
     constructor(table: PgTable, columns: AnyPgColumn<{}>[], name?: string);
     getName(): string;
 }

package/pg-core/primary-keys.js

@@ -1,42 +1,42 @@
-import { entityKind } from "../entity.js";
 import { PgTable } from "./table.js";
+import { entityKind } from "../entity.js";
+
+//#region src/pg-core/primary-keys.ts
 function primaryKey(...config) {
-  if (config[0].columns) {
-    return new PrimaryKeyBuilder(config[0].columns, config[0].name);
-  }
-  return new PrimaryKeyBuilder(config);
-}
-class PrimaryKeyBuilder {
-  static [entityKind] = "PgPrimaryKeyBuilder";
-  /** @internal */
-  columns;
-  /** @internal */
-  name;
-  constructor(columns, name) {
-    this.columns = columns;
-    this.name = name;
-  }
-  /** @internal */
-  build(table) {
-    return new PrimaryKey(table, this.columns, this.name);
-  }
+	if (config[0].columns) return new PrimaryKeyBuilder(config[0].columns, config[0].name);
+	return new PrimaryKeyBuilder(config);
 }
-class PrimaryKey {
-  constructor(table, columns, name) {
-    this.table = table;
-    this.columns = columns;
-    this.name = name;
-  }
-  static [entityKind] = "PgPrimaryKey";
-  columns;
-  name;
-  getName() {
-    return this.name ?? `${this.table[PgTable.Symbol.Name]}_${this.columns.map((column) => column.name).join("_")}_pk`;
-  }
-}
-export {
-  PrimaryKey,
-  PrimaryKeyBuilder,
-  primaryKey
+var PrimaryKeyBuilder = class {
+	static [entityKind] = "PgPrimaryKeyBuilder";
+	/** @internal */
+	columns;
+	/** @internal */
+	name;
+	constructor(columns, name) {
+		this.columns = columns;
+		this.name = name;
+	}
+	/** @internal */
+	build(table) {
+		return new PrimaryKey(table, this.columns, this.name);
+	}
+};
+var PrimaryKey = class {
+	static [entityKind] = "PgPrimaryKey";
+	columns;
+	name;
+	isNameExplicit;
+	constructor(table, columns, name) {
+		this.table = table;
+		this.columns = columns;
+		this.name = name;
+		this.isNameExplicit = !!name;
+	}
+	getName() {
+		return this.name ?? `${this.table[PgTable.Symbol.Name]}_${this.columns.map((column) => column.name).join("_")}_pk`;
+	}
 };
+
+//#endregion
+export { PrimaryKey, PrimaryKeyBuilder, primaryKey };
 //# sourceMappingURL=primary-keys.js.map

package/pg-core/primary-keys.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pg-core/primary-keys.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type { AnyPgColumn, PgColumn } from './columns/index.ts';\nimport { PgTable } from './table.ts';\n\nexport function primaryKey<\n\tTTableName extends string,\n\tTColumn extends AnyPgColumn<{ tableName: TTableName }>,\n\tTColumns extends AnyPgColumn<{ tableName: TTableName }>[],\n>(config: { name?: string; columns: [TColumn, ...TColumns] }): PrimaryKeyBuilder;\n/**\n * @deprecated: Please use primaryKey({ columns: [] }) instead of this function\n * @param columns\n */\nexport function primaryKey<\n\tTTableName extends string,\n\tTColumns extends AnyPgColumn<{ tableName: TTableName }>[],\n>(...columns: TColumns): PrimaryKeyBuilder;\nexport function primaryKey(...config: any) {\n\tif (config[0].columns) {\n\t\treturn new PrimaryKeyBuilder(config[0].columns, config[0].name);\n\t}\n\treturn new PrimaryKeyBuilder(config);\n}\n\nexport class PrimaryKeyBuilder {\n\tstatic readonly [entityKind]: string = 'PgPrimaryKeyBuilder';\n\n\t/** @internal */\n\tcolumns: PgColumn[];\n\n\t/** @internal */\n\tname?: string;\n\n\tconstructor(\n\t\tcolumns: PgColumn[],\n\t\tname?: string,\n\t) {\n\t\tthis.columns = columns;\n\t\tthis.name = name;\n\t}\n\n\t/** @internal */\n\tbuild(table: PgTable): PrimaryKey {\n\t\treturn new PrimaryKey(table, this.columns, this.name);\n\t}\n}\n\nexport class PrimaryKey {\n\tstatic readonly [entityKind]: string = 'PgPrimaryKey';\n\n\treadonly columns: AnyPgColumn<{}>[];\n\treadonly name?: string;\n\n\tconstructor(readonly table: PgTable, columns: AnyPgColumn<{}>[], name?: string) {\n\t\tthis.columns = columns;\n\t\tthis.name = name;\n\t}\n\n\tgetName(): string {\n\t\treturn this.name ?? `${this.table[PgTable.Symbol.Name]}_${this.columns.map((column) => column.name).join('_')}_pk`;\n\t}\n}\n"],"mappings":"AAAA,SAAS,kBAAkB;AAE3B,SAAS,eAAe;AAejB,SAAS,cAAc,QAAa;AAC1C,MAAI,OAAO,CAAC,EAAE,SAAS;AACtB,WAAO,IAAI,kBAAkB,OAAO,CAAC,EAAE,SAAS,OAAO,CAAC,EAAE,IAAI;AAAA,EAC/D;AACA,SAAO,IAAI,kBAAkB,MAAM;AACpC;AAEO,MAAM,kBAAkB;AAAA,EAC9B,QAAiB,UAAU,IAAY;AAAA;AAAA,EAGvC;AAAA;AAAA,EAGA;AAAA,EAEA,YACC,SACA,MACC;AACD,SAAK,UAAU;AACf,SAAK,OAAO;AAAA,EACb;AAAA;AAAA,EAGA,MAAM,OAA4B;AACjC,WAAO,IAAI,WAAW,OAAO,KAAK,SAAS,KAAK,IAAI;AAAA,EACrD;AACD;AAEO,MAAM,WAAW;AAAA,EAMvB,YAAqB,OAAgB,SAA4B,MAAe;AAA3D;AACpB,SAAK,UAAU;AACf,SAAK,OAAO;AAAA,EACb;AAAA,EARA,QAAiB,UAAU,IAAY;AAAA,EAE9B;AAAA,EACA;AAAA,EAOT,UAAkB;AACjB,WAAO,KAAK,QAAQ,GAAG,KAAK,MAAM,QAAQ,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,WAAW,OAAO,IAAI,EAAE,KAAK,GAAG,CAAC;AAAA,EAC9G;AACD;","names":[]}
+{"version":3,"file":"primary-keys.js","names":[],"sources":["../../src/pg-core/primary-keys.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport type { AnyPgColumn, PgColumn } from './columns/index.ts';\nimport { PgTable } from './table.ts';\n\nexport function primaryKey<\n\tTTableName extends string,\n\tTColumn extends AnyPgColumn<{ tableName: TTableName }>,\n\tTColumns extends AnyPgColumn<{ tableName: TTableName }>[],\n>(config: { name?: string; columns: [TColumn, ...TColumns] }): PrimaryKeyBuilder;\n/**\n * @deprecated: Please use primaryKey({ columns: [] }) instead of this function\n * @param columns\n */\nexport function primaryKey<\n\tTTableName extends string,\n\tTColumns extends AnyPgColumn<{ tableName: TTableName }>[],\n>(...columns: TColumns): PrimaryKeyBuilder;\nexport function primaryKey(...config: any) {\n\tif (config[0].columns) {\n\t\treturn new PrimaryKeyBuilder(config[0].columns, config[0].name);\n\t}\n\treturn new PrimaryKeyBuilder(config);\n}\n\nexport class PrimaryKeyBuilder {\n\tstatic readonly [entityKind]: string = 'PgPrimaryKeyBuilder';\n\n\t/** @internal */\n\tcolumns: PgColumn[];\n\n\t/** @internal */\n\tname?: string;\n\n\tconstructor(\n\t\tcolumns: PgColumn[],\n\t\tname?: string,\n\t) {\n\t\tthis.columns = columns;\n\t\tthis.name = name;\n\t}\n\n\t/** @internal */\n\tbuild(table: PgTable): PrimaryKey {\n\t\treturn new PrimaryKey(table, this.columns, this.name);\n\t}\n}\n\nexport class PrimaryKey {\n\tstatic readonly [entityKind]: string = 'PgPrimaryKey';\n\n\treadonly columns: AnyPgColumn<{}>[];\n\treadonly name?: string;\n\treadonly isNameExplicit: boolean;\n\n\tconstructor(readonly table: PgTable, columns: AnyPgColumn<{}>[], name?: string) {\n\t\tthis.columns = columns;\n\t\tthis.name = name;\n\t\tthis.isNameExplicit = !!name;\n\t}\n\n\tgetName(): string {\n\t\treturn this.name ?? `${this.table[PgTable.Symbol.Name]}_${this.columns.map((column) => column.name).join('_')}_pk`;\n\t}\n}\n"],"mappings":";;;;AAiBA,SAAgB,WAAW,GAAG,QAAa;AAC1C,KAAI,OAAO,GAAG,QACb,QAAO,IAAI,kBAAkB,OAAO,GAAG,SAAS,OAAO,GAAG,KAAK;AAEhE,QAAO,IAAI,kBAAkB,OAAO;;AAGrC,IAAa,oBAAb,MAA+B;CAC9B,QAAiB,cAAsB;;CAGvC;;CAGA;CAEA,YACC,SACA,MACC;AACD,OAAK,UAAU;AACf,OAAK,OAAO;;;CAIb,MAAM,OAA4B;AACjC,SAAO,IAAI,WAAW,OAAO,KAAK,SAAS,KAAK,KAAK;;;AAIvD,IAAa,aAAb,MAAwB;CACvB,QAAiB,cAAsB;CAEvC,AAAS;CACT,AAAS;CACT,AAAS;CAET,YAAY,AAAS,OAAgB,SAA4B,MAAe;EAA3D;AACpB,OAAK,UAAU;AACf,OAAK,OAAO;AACZ,OAAK,iBAAiB,CAAC,CAAC;;CAGzB,UAAkB;AACjB,SAAO,KAAK,QAAQ,GAAG,KAAK,MAAM,QAAQ,OAAO,MAAM,GAAG,KAAK,QAAQ,KAAK,WAAW,OAAO,KAAK,CAAC,KAAK,IAAI,CAAC"}

package/pg-core/query-builders/count.cjs

@@ -1,79 +1,35 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_runtime = require('../../_virtual/_rolldown/runtime.cjs');
+let __entity_ts = require("../../entity.cjs");
+let __sql_sql_ts = require("../../sql/sql.cjs");
+
+//#region src/pg-core/query-builders/count.ts
+var PgCountBuilder = class PgCountBuilder extends __sql_sql_ts.SQL {
+	static [__entity_ts.entityKind] = "PgCountBuilder";
+	dialect;
+	static buildCount(source, filters, parens) {
+		const query = __sql_sql_ts.sql`select count(*) from ${source}${__sql_sql_ts.sql` where ${filters}`.if(filters)}`;
+		return parens ? __sql_sql_ts.sql`(${query})` : query;
+	}
+	constructor(countConfig) {
+		super(PgCountBuilder.buildCount(countConfig.source, countConfig.filters, true).queryChunks);
+		this.countConfig = countConfig;
+		this.dialect = countConfig.dialect;
+		this.mapWith((e) => {
+			if (typeof e === "number") return e;
+			return Number(e ?? 0);
+		});
+	}
+	executableSql;
+	build() {
+		if (!this.executableSql) {
+			const { source, filters } = this.countConfig;
+			this.executableSql = PgCountBuilder.buildCount(source, filters);
+		}
+		return this.dialect.sqlToQuery(this.executableSql);
+	}
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var count_exports = {};
-__export(count_exports, {
-  PgCountBuilder: () => PgCountBuilder
-});
-module.exports = __toCommonJS(count_exports);
-var import_entity = require("../../entity.cjs");
-var import_sql = require("../../sql/sql.cjs");
-class PgCountBuilder extends import_sql.SQL {
-  constructor(params) {
-    super(PgCountBuilder.buildEmbeddedCount(params.source, params.filters).queryChunks);
-    this.params = params;
-    this.mapWith(Number);
-    this.session = params.session;
-    this.sql = PgCountBuilder.buildCount(
-      params.source,
-      params.filters
-    );
-  }
-  sql;
-  token;
-  static [import_entity.entityKind] = "PgCountBuilder";
-  [Symbol.toStringTag] = "PgCountBuilder";
-  session;
-  static buildEmbeddedCount(source, filters) {
-    return import_sql.sql`(select count(*) from ${source}${import_sql.sql.raw(" where ").if(filters)}${filters})`;
-  }
-  static buildCount(source, filters) {
-    return import_sql.sql`select count(*) as count from ${source}${import_sql.sql.raw(" where ").if(filters)}${filters};`;
-  }
-  /** @intrnal */
-  setToken(token) {
-    this.token = token;
-    return this;
-  }
-  then(onfulfilled, onrejected) {
-    return Promise.resolve(this.session.count(this.sql, this.token)).then(
-      onfulfilled,
-      onrejected
-    );
-  }
-  catch(onRejected) {
-    return this.then(void 0, onRejected);
-  }
-  finally(onFinally) {
-    return this.then(
-      (value) => {
-        onFinally?.();
-        return value;
-      },
-      (reason) => {
-        onFinally?.();
-        throw reason;
-      }
-    );
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  PgCountBuilder
-});
+
+//#endregion
+exports.PgCountBuilder = PgCountBuilder;
 //# sourceMappingURL=count.cjs.map

package/pg-core/query-builders/count.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/pg-core/query-builders/count.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport { SQL, sql, type SQLWrapper } from '~/sql/sql.ts';\nimport type { NeonAuthToken } from '~/utils.ts';\nimport type { PgSession } from '../session.ts';\nimport type { PgTable } from '../table.ts';\n\nexport class PgCountBuilder<\n\tTSession extends PgSession<any, any, any>,\n> extends SQL<number> implements Promise<number>, SQLWrapper {\n\tprivate sql: SQL<number>;\n\tprivate token?: NeonAuthToken;\n\n\tstatic override readonly [entityKind] = 'PgCountBuilder';\n\t[Symbol.toStringTag] = 'PgCountBuilder';\n\n\tprivate session: TSession;\n\n\tprivate static buildEmbeddedCount(\n\t\tsource: PgTable | SQL | SQLWrapper,\n\t\tfilters?: SQL<unknown>,\n\t): SQL<number> {\n\t\treturn sql<number>`(select count(*) from ${source}${sql.raw(' where ').if(filters)}${filters})`;\n\t}\n\n\tprivate static buildCount(\n\t\tsource: PgTable | SQL | SQLWrapper,\n\t\tfilters?: SQL<unknown>,\n\t): SQL<number> {\n\t\treturn sql<number>`select count(*) as count from ${source}${sql.raw(' where ').if(filters)}${filters};`;\n\t}\n\n\tconstructor(\n\t\treadonly params: {\n\t\t\tsource: PgTable | SQL | SQLWrapper;\n\t\t\tfilters?: SQL<unknown>;\n\t\t\tsession: TSession;\n\t\t},\n\t) {\n\t\tsuper(PgCountBuilder.buildEmbeddedCount(params.source, params.filters).queryChunks);\n\n\t\tthis.mapWith(Number);\n\n\t\tthis.session = params.session;\n\n\t\tthis.sql = PgCountBuilder.buildCount(\n\t\t\tparams.source,\n\t\t\tparams.filters,\n\t\t);\n\t}\n\n\t/** @intrnal */\n\tsetToken(token?: NeonAuthToken) {\n\t\tthis.token = token;\n\t\treturn this;\n\t}\n\n\tthen<TResult1 = number, TResult2 = never>(\n\t\tonfulfilled?: ((value: number) => TResult1 | PromiseLike<TResult1>) | null | undefined,\n\t\tonrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined,\n\t): Promise<TResult1 | TResult2> {\n\t\treturn Promise.resolve(this.session.count(this.sql, this.token))\n\t\t\t.then(\n\t\t\t\tonfulfilled,\n\t\t\t\tonrejected,\n\t\t\t);\n\t}\n\n\tcatch(\n\t\tonRejected?: ((reason: any) => any) | null | undefined,\n\t): Promise<number> {\n\t\treturn this.then(undefined, onRejected);\n\t}\n\n\tfinally(onFinally?: (() => void) | null | undefined): Promise<number> {\n\t\treturn this.then(\n\t\t\t(value) => {\n\t\t\t\tonFinally?.();\n\t\t\t\treturn value;\n\t\t\t},\n\t\t\t(reason) => {\n\t\t\t\tonFinally?.();\n\t\t\t\tthrow reason;\n\t\t\t},\n\t\t);\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA2B;AAC3B,iBAA0C;AAKnC,MAAM,uBAEH,eAAmD;AAAA,EAuB5D,YACU,QAKR;AACD,UAAM,eAAe,mBAAmB,OAAO,QAAQ,OAAO,OAAO,EAAE,WAAW;AANzE;AAQT,SAAK,QAAQ,MAAM;AAEnB,SAAK,UAAU,OAAO;AAEtB,SAAK,MAAM,eAAe;AAAA,MACzB,OAAO;AAAA,MACP,OAAO;AAAA,IACR;AAAA,EACD;AAAA,EAvCQ;AAAA,EACA;AAAA,EAER,QAA0B,wBAAU,IAAI;AAAA,EACxC,CAAC,OAAO,WAAW,IAAI;AAAA,EAEf;AAAA,EAER,OAAe,mBACd,QACA,SACc;AACd,WAAO,uCAAoC,MAAM,GAAG,eAAI,IAAI,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO;AAAA,EAC7F;AAAA,EAEA,OAAe,WACd,QACA,SACc;AACd,WAAO,+CAA4C,MAAM,GAAG,eAAI,IAAI,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO;AAAA,EACrG;AAAA;AAAA,EAsBA,SAAS,OAAuB;AAC/B,SAAK,QAAQ;AACb,WAAO;AAAA,EACR;AAAA,EAEA,KACC,aACA,YAC+B;AAC/B,WAAO,QAAQ,QAAQ,KAAK,QAAQ,MAAM,KAAK,KAAK,KAAK,KAAK,CAAC,EAC7D;AAAA,MACA;AAAA,MACA;AAAA,IACD;AAAA,EACF;AAAA,EAEA,MACC,YACkB;AAClB,WAAO,KAAK,KAAK,QAAW,UAAU;AAAA,EACvC;AAAA,EAEA,QAAQ,WAA8D;AACrE,WAAO,KAAK;AAAA,MACX,CAAC,UAAU;AACV,oBAAY;AACZ,eAAO;AAAA,MACR;AAAA,MACA,CAAC,WAAW;AACX,oBAAY;AACZ,cAAM;AAAA,MACP;AAAA,IACD;AAAA,EACD;AACD;","names":[]}
+{"version":3,"file":"count.cjs","names":["SQL","entityKind"],"sources":["../../../src/pg-core/query-builders/count.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport { type Query, SQL, sql, type SQLWrapper } from '~/sql/sql.ts';\nimport type { PgDialect } from '../dialect.ts';\nimport type { PgTable } from '../table.ts';\nimport type { PgViewBase } from '../view-base.ts';\n\nexport class PgCountBuilder extends SQL<number> implements SQLWrapper<number> {\n\tstatic override readonly [entityKind]: string = 'PgCountBuilder';\n\n\tprivate dialect: PgDialect;\n\n\tprivate static buildCount(\n\t\tsource: PgTable | PgViewBase | SQL | SQLWrapper,\n\t\tfilters?: SQL<unknown>,\n\t\tparens?: boolean,\n\t): SQL<number> {\n\t\tconst where = sql` where ${filters}`.if(filters);\n\t\tconst query = sql<number>`select count(*) from ${source}${where}`;\n\n\t\treturn parens ? sql`(${query})` : query;\n\t}\n\n\tconstructor(\n\t\tprotected countConfig: {\n\t\t\tsource: PgTable | PgViewBase | SQL | SQLWrapper;\n\t\t\tfilters?: SQL<unknown>;\n\t\t\tdialect: PgDialect;\n\t\t},\n\t) {\n\t\tsuper(PgCountBuilder.buildCount(countConfig.source, countConfig.filters, true).queryChunks);\n\t\tthis.dialect = countConfig.dialect;\n\t\tthis.mapWith((e) => {\n\t\t\tif (typeof e === 'number') return e;\n\n\t\t\treturn Number(e ?? 0);\n\t\t});\n\t}\n\n\tprivate executableSql: SQL<number> | undefined;\n\tprotected build(): Query {\n\t\tif (!this.executableSql) {\n\t\t\tconst { source, filters } = this.countConfig;\n\t\t\tthis.executableSql = PgCountBuilder.buildCount(source, filters);\n\t\t}\n\n\t\treturn this.dialect.sqlToQuery(this.executableSql);\n\t}\n}\n"],"mappings":";;;;;;AAMA,IAAa,iBAAb,MAAa,uBAAuBA,iBAA0C;CAC7E,QAA0BC,0BAAsB;CAEhD,AAAQ;CAER,OAAe,WACd,QACA,SACA,QACc;EAEd,MAAM,QAAQ,gBAAW,wBAAwB,SADnC,gBAAG,UAAU,UAAU,GAAG,QAAQ;AAGhD,SAAO,SAAS,gBAAG,IAAI,MAAM,KAAK;;CAGnC,YACC,AAAU,aAKT;AACD,QAAM,eAAe,WAAW,YAAY,QAAQ,YAAY,SAAS,KAAK,CAAC,YAAY;EANjF;AAOV,OAAK,UAAU,YAAY;AAC3B,OAAK,SAAS,MAAM;AACnB,OAAI,OAAO,MAAM,SAAU,QAAO;AAElC,UAAO,OAAO,KAAK,EAAE;IACpB;;CAGH,AAAQ;CACR,AAAU,QAAe;AACxB,MAAI,CAAC,KAAK,eAAe;GACxB,MAAM,EAAE,QAAQ,YAAY,KAAK;AACjC,QAAK,gBAAgB,eAAe,WAAW,QAAQ,QAAQ;;AAGhE,SAAO,KAAK,QAAQ,WAAW,KAAK,cAAc"}

package/pg-core/query-builders/count.d.cts

@@ -1,29 +1,22 @@
-import { entityKind } from "../../entity.cjs";
-import { SQL, type SQLWrapper } from "../../sql/sql.cjs";
-import type { NeonAuthToken } from "../../utils.cjs";
-import type { PgSession } from "../session.cjs";
-import type { PgTable } from "../table.cjs";
-export declare class PgCountBuilder<TSession extends PgSession<any, any, any>> extends SQL<number> implements Promise<number>, SQLWrapper {
-    readonly params: {
-        source: PgTable | SQL | SQLWrapper;
+import { entityKind } from '../../entity.cjs';
+import { type Query, SQL, type SQLWrapper } from '../../sql/sql.cjs';
+import type { PgDialect } from '../dialect.cjs';
+import type { PgTable } from '../table.cjs';
+import type { PgViewBase } from '../view-base.cjs';
+export declare class PgCountBuilder extends SQL<number> implements SQLWrapper<number> {
+    protected countConfig: {
+        source: PgTable | PgViewBase | SQL | SQLWrapper;
         filters?: SQL<unknown>;
-        session: TSession;
+        dialect: PgDialect;
     };
-    private sql;
-    private token?;
-    static readonly [entityKind] = "PgCountBuilder";
-    [Symbol.toStringTag]: string;
-    private session;
-    private static buildEmbeddedCount;
+    static readonly [entityKind]: string;
+    private dialect;
     private static buildCount;
-    constructor(params: {
-        source: PgTable | SQL | SQLWrapper;
+    constructor(countConfig: {
+        source: PgTable | PgViewBase | SQL | SQLWrapper;
         filters?: SQL<unknown>;
-        session: TSession;
+        dialect: PgDialect;
     });
-    /** @intrnal */
-    setToken(token?: NeonAuthToken): this;
-    then<TResult1 = number, TResult2 = never>(onfulfilled?: ((value: number) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined): Promise<TResult1 | TResult2>;
-    catch(onRejected?: ((reason: any) => any) | null | undefined): Promise<number>;
-    finally(onFinally?: (() => void) | null | undefined): Promise<number>;
+    private executableSql;
+    protected build(): Query;
 }

package/pg-core/query-builders/count.d.ts

@@ -1,29 +1,22 @@
-import { entityKind } from "../../entity.js";
-import { SQL, type SQLWrapper } from "../../sql/sql.js";
-import type { NeonAuthToken } from "../../utils.js";
-import type { PgSession } from "../session.js";
-import type { PgTable } from "../table.js";
-export declare class PgCountBuilder<TSession extends PgSession<any, any, any>> extends SQL<number> implements Promise<number>, SQLWrapper {
-    readonly params: {
-        source: PgTable | SQL | SQLWrapper;
+import { entityKind } from '../../entity.js';
+import { type Query, SQL, type SQLWrapper } from '../../sql/sql.js';
+import type { PgDialect } from '../dialect.js';
+import type { PgTable } from '../table.js';
+import type { PgViewBase } from '../view-base.js';
+export declare class PgCountBuilder extends SQL<number> implements SQLWrapper<number> {
+    protected countConfig: {
+        source: PgTable | PgViewBase | SQL | SQLWrapper;
         filters?: SQL<unknown>;
-        session: TSession;
+        dialect: PgDialect;
     };
-    private sql;
-    private token?;
-    static readonly [entityKind] = "PgCountBuilder";
-    [Symbol.toStringTag]: string;
-    private session;
-    private static buildEmbeddedCount;
+    static readonly [entityKind]: string;
+    private dialect;
     private static buildCount;
-    constructor(params: {
-        source: PgTable | SQL | SQLWrapper;
+    constructor(countConfig: {
+        source: PgTable | PgViewBase | SQL | SQLWrapper;
         filters?: SQL<unknown>;
-        session: TSession;
+        dialect: PgDialect;
     });
-    /** @intrnal */
-    setToken(token?: NeonAuthToken): this;
-    then<TResult1 = number, TResult2 = never>(onfulfilled?: ((value: number) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined): Promise<TResult1 | TResult2>;
-    catch(onRejected?: ((reason: any) => any) | null | undefined): Promise<number>;
-    finally(onFinally?: (() => void) | null | undefined): Promise<number>;
+    private executableSql;
+    protected build(): Query;
 }

package/pg-core/query-builders/count.js

@@ -1,55 +1,33 @@
 import { entityKind } from "../../entity.js";
 import { SQL, sql } from "../../sql/sql.js";
-class PgCountBuilder extends SQL {
-  constructor(params) {
-    super(PgCountBuilder.buildEmbeddedCount(params.source, params.filters).queryChunks);
-    this.params = params;
-    this.mapWith(Number);
-    this.session = params.session;
-    this.sql = PgCountBuilder.buildCount(
-      params.source,
-      params.filters
-    );
-  }
-  sql;
-  token;
-  static [entityKind] = "PgCountBuilder";
-  [Symbol.toStringTag] = "PgCountBuilder";
-  session;
-  static buildEmbeddedCount(source, filters) {
-    return sql`(select count(*) from ${source}${sql.raw(" where ").if(filters)}${filters})`;
-  }
-  static buildCount(source, filters) {
-    return sql`select count(*) as count from ${source}${sql.raw(" where ").if(filters)}${filters};`;
-  }
-  /** @intrnal */
-  setToken(token) {
-    this.token = token;
-    return this;
-  }
-  then(onfulfilled, onrejected) {
-    return Promise.resolve(this.session.count(this.sql, this.token)).then(
-      onfulfilled,
-      onrejected
-    );
-  }
-  catch(onRejected) {
-    return this.then(void 0, onRejected);
-  }
-  finally(onFinally) {
-    return this.then(
-      (value) => {
-        onFinally?.();
-        return value;
-      },
-      (reason) => {
-        onFinally?.();
-        throw reason;
-      }
-    );
-  }
-}
-export {
-  PgCountBuilder
+
+//#region src/pg-core/query-builders/count.ts
+var PgCountBuilder = class PgCountBuilder extends SQL {
+	static [entityKind] = "PgCountBuilder";
+	dialect;
+	static buildCount(source, filters, parens) {
+		const query = sql`select count(*) from ${source}${sql` where ${filters}`.if(filters)}`;
+		return parens ? sql`(${query})` : query;
+	}
+	constructor(countConfig) {
+		super(PgCountBuilder.buildCount(countConfig.source, countConfig.filters, true).queryChunks);
+		this.countConfig = countConfig;
+		this.dialect = countConfig.dialect;
+		this.mapWith((e) => {
+			if (typeof e === "number") return e;
+			return Number(e ?? 0);
+		});
+	}
+	executableSql;
+	build() {
+		if (!this.executableSql) {
+			const { source, filters } = this.countConfig;
+			this.executableSql = PgCountBuilder.buildCount(source, filters);
+		}
+		return this.dialect.sqlToQuery(this.executableSql);
+	}
 };
+
+//#endregion
+export { PgCountBuilder };
 //# sourceMappingURL=count.js.map

package/pg-core/query-builders/count.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/pg-core/query-builders/count.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport { SQL, sql, type SQLWrapper } from '~/sql/sql.ts';\nimport type { NeonAuthToken } from '~/utils.ts';\nimport type { PgSession } from '../session.ts';\nimport type { PgTable } from '../table.ts';\n\nexport class PgCountBuilder<\n\tTSession extends PgSession<any, any, any>,\n> extends SQL<number> implements Promise<number>, SQLWrapper {\n\tprivate sql: SQL<number>;\n\tprivate token?: NeonAuthToken;\n\n\tstatic override readonly [entityKind] = 'PgCountBuilder';\n\t[Symbol.toStringTag] = 'PgCountBuilder';\n\n\tprivate session: TSession;\n\n\tprivate static buildEmbeddedCount(\n\t\tsource: PgTable | SQL | SQLWrapper,\n\t\tfilters?: SQL<unknown>,\n\t): SQL<number> {\n\t\treturn sql<number>`(select count(*) from ${source}${sql.raw(' where ').if(filters)}${filters})`;\n\t}\n\n\tprivate static buildCount(\n\t\tsource: PgTable | SQL | SQLWrapper,\n\t\tfilters?: SQL<unknown>,\n\t): SQL<number> {\n\t\treturn sql<number>`select count(*) as count from ${source}${sql.raw(' where ').if(filters)}${filters};`;\n\t}\n\n\tconstructor(\n\t\treadonly params: {\n\t\t\tsource: PgTable | SQL | SQLWrapper;\n\t\t\tfilters?: SQL<unknown>;\n\t\t\tsession: TSession;\n\t\t},\n\t) {\n\t\tsuper(PgCountBuilder.buildEmbeddedCount(params.source, params.filters).queryChunks);\n\n\t\tthis.mapWith(Number);\n\n\t\tthis.session = params.session;\n\n\t\tthis.sql = PgCountBuilder.buildCount(\n\t\t\tparams.source,\n\t\t\tparams.filters,\n\t\t);\n\t}\n\n\t/** @intrnal */\n\tsetToken(token?: NeonAuthToken) {\n\t\tthis.token = token;\n\t\treturn this;\n\t}\n\n\tthen<TResult1 = number, TResult2 = never>(\n\t\tonfulfilled?: ((value: number) => TResult1 | PromiseLike<TResult1>) | null | undefined,\n\t\tonrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined,\n\t): Promise<TResult1 | TResult2> {\n\t\treturn Promise.resolve(this.session.count(this.sql, this.token))\n\t\t\t.then(\n\t\t\t\tonfulfilled,\n\t\t\t\tonrejected,\n\t\t\t);\n\t}\n\n\tcatch(\n\t\tonRejected?: ((reason: any) => any) | null | undefined,\n\t): Promise<number> {\n\t\treturn this.then(undefined, onRejected);\n\t}\n\n\tfinally(onFinally?: (() => void) | null | undefined): Promise<number> {\n\t\treturn this.then(\n\t\t\t(value) => {\n\t\t\t\tonFinally?.();\n\t\t\t\treturn value;\n\t\t\t},\n\t\t\t(reason) => {\n\t\t\t\tonFinally?.();\n\t\t\t\tthrow reason;\n\t\t\t},\n\t\t);\n\t}\n}\n"],"mappings":"AAAA,SAAS,kBAAkB;AAC3B,SAAS,KAAK,WAA4B;AAKnC,MAAM,uBAEH,IAAmD;AAAA,EAuB5D,YACU,QAKR;AACD,UAAM,eAAe,mBAAmB,OAAO,QAAQ,OAAO,OAAO,EAAE,WAAW;AANzE;AAQT,SAAK,QAAQ,MAAM;AAEnB,SAAK,UAAU,OAAO;AAEtB,SAAK,MAAM,eAAe;AAAA,MACzB,OAAO;AAAA,MACP,OAAO;AAAA,IACR;AAAA,EACD;AAAA,EAvCQ;AAAA,EACA;AAAA,EAER,QAA0B,UAAU,IAAI;AAAA,EACxC,CAAC,OAAO,WAAW,IAAI;AAAA,EAEf;AAAA,EAER,OAAe,mBACd,QACA,SACc;AACd,WAAO,4BAAoC,MAAM,GAAG,IAAI,IAAI,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO;AAAA,EAC7F;AAAA,EAEA,OAAe,WACd,QACA,SACc;AACd,WAAO,oCAA4C,MAAM,GAAG,IAAI,IAAI,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO;AAAA,EACrG;AAAA;AAAA,EAsBA,SAAS,OAAuB;AAC/B,SAAK,QAAQ;AACb,WAAO;AAAA,EACR;AAAA,EAEA,KACC,aACA,YAC+B;AAC/B,WAAO,QAAQ,QAAQ,KAAK,QAAQ,MAAM,KAAK,KAAK,KAAK,KAAK,CAAC,EAC7D;AAAA,MACA;AAAA,MACA;AAAA,IACD;AAAA,EACF;AAAA,EAEA,MACC,YACkB;AAClB,WAAO,KAAK,KAAK,QAAW,UAAU;AAAA,EACvC;AAAA,EAEA,QAAQ,WAA8D;AACrE,WAAO,KAAK;AAAA,MACX,CAAC,UAAU;AACV,oBAAY;AACZ,eAAO;AAAA,MACR;AAAA,MACA,CAAC,WAAW;AACX,oBAAY;AACZ,cAAM;AAAA,MACP;AAAA,IACD;AAAA,EACD;AACD;","names":[]}
+{"version":3,"file":"count.js","names":[],"sources":["../../../src/pg-core/query-builders/count.ts"],"sourcesContent":["import { entityKind } from '~/entity.ts';\nimport { type Query, SQL, sql, type SQLWrapper } from '~/sql/sql.ts';\nimport type { PgDialect } from '../dialect.ts';\nimport type { PgTable } from '../table.ts';\nimport type { PgViewBase } from '../view-base.ts';\n\nexport class PgCountBuilder extends SQL<number> implements SQLWrapper<number> {\n\tstatic override readonly [entityKind]: string = 'PgCountBuilder';\n\n\tprivate dialect: PgDialect;\n\n\tprivate static buildCount(\n\t\tsource: PgTable | PgViewBase | SQL | SQLWrapper,\n\t\tfilters?: SQL<unknown>,\n\t\tparens?: boolean,\n\t): SQL<number> {\n\t\tconst where = sql` where ${filters}`.if(filters);\n\t\tconst query = sql<number>`select count(*) from ${source}${where}`;\n\n\t\treturn parens ? sql`(${query})` : query;\n\t}\n\n\tconstructor(\n\t\tprotected countConfig: {\n\t\t\tsource: PgTable | PgViewBase | SQL | SQLWrapper;\n\t\t\tfilters?: SQL<unknown>;\n\t\t\tdialect: PgDialect;\n\t\t},\n\t) {\n\t\tsuper(PgCountBuilder.buildCount(countConfig.source, countConfig.filters, true).queryChunks);\n\t\tthis.dialect = countConfig.dialect;\n\t\tthis.mapWith((e) => {\n\t\t\tif (typeof e === 'number') return e;\n\n\t\t\treturn Number(e ?? 0);\n\t\t});\n\t}\n\n\tprivate executableSql: SQL<number> | undefined;\n\tprotected build(): Query {\n\t\tif (!this.executableSql) {\n\t\t\tconst { source, filters } = this.countConfig;\n\t\t\tthis.executableSql = PgCountBuilder.buildCount(source, filters);\n\t\t}\n\n\t\treturn this.dialect.sqlToQuery(this.executableSql);\n\t}\n}\n"],"mappings":";;;;AAMA,IAAa,iBAAb,MAAa,uBAAuB,IAA0C;CAC7E,QAA0B,cAAsB;CAEhD,AAAQ;CAER,OAAe,WACd,QACA,SACA,QACc;EAEd,MAAM,QAAQ,GAAW,wBAAwB,SADnC,GAAG,UAAU,UAAU,GAAG,QAAQ;AAGhD,SAAO,SAAS,GAAG,IAAI,MAAM,KAAK;;CAGnC,YACC,AAAU,aAKT;AACD,QAAM,eAAe,WAAW,YAAY,QAAQ,YAAY,SAAS,KAAK,CAAC,YAAY;EANjF;AAOV,OAAK,UAAU,YAAY;AAC3B,OAAK,SAAS,MAAM;AACnB,OAAI,OAAO,MAAM,SAAU,QAAO;AAElC,UAAO,OAAO,KAAK,EAAE;IACpB;;CAGH,AAAQ;CACR,AAAU,QAAe;AACxB,MAAI,CAAC,KAAK,eAAe;GACxB,MAAM,EAAE,QAAQ,YAAY,KAAK;AACjC,QAAK,gBAAgB,eAAe,WAAW,QAAQ,QAAQ;;AAGhE,SAAO,KAAK,QAAQ,WAAW,KAAK,cAAc"}