orchid-orm 1.71.1 → 1.72.1

package/dist/bun.d.ts

@@ -0,0 +1,17 @@
+import * as _$pqb_internal0 from "pqb/internal";
+import { DbSharedOptions } from "pqb/internal";
+import * as _$pqb_bun0 from "pqb/bun";
+import { BunAdapterOptions, bunSchemaConfig } from "pqb/bun";
+import { OrchidORM, OrchidORMTables, OrchidOrmParam, TableClasses } from "orchid-orm";
+interface BunOrchidORMOptions extends BunAdapterOptions, DbSharedOptions {}
+declare const Adapter: _$pqb_internal0.DriverAdapter;
+declare const createDb: <SchemaConfig extends _$pqb_internal0.ColumnSchemaConfig = _$pqb_internal0.DefaultSchemaConfig, ColumnTypes = _$pqb_internal0.DefaultColumnTypes<SchemaConfig>>({
+  log,
+  ...options
+}: _$pqb_bun0.CreateBunDbOptions<SchemaConfig, ColumnTypes>) => _$pqb_internal0.DbResult<ColumnTypes>;
+declare const makeOrchidOrmDb: <T extends TableClasses>(orm: OrchidORMTables<T>, {
+  log,
+  ...options
+}: OrchidOrmParam<BunOrchidORMOptions>) => OrchidORM<T>;
+declare const orchidORM: <T extends TableClasses>(options: OrchidOrmParam<BunOrchidORMOptions>, tables: T) => OrchidORM<T>;
+export { Adapter, BunOrchidORMOptions, bunSchemaConfig, createDb, makeOrchidOrmDb, orchidORM };

package/dist/bun.js

@@ -0,0 +1,31 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let orchid_orm = require("orchid-orm");
+let pqb_bun = require("pqb/bun");
+let pqb_internal = require("pqb/internal");
+const Adapter = pqb_bun.BunAdapter;
+const createDb = pqb_bun.createDb;
+const makeOrchidOrmDb = (orm, { log, ...options }) => {
+	return (0, orchid_orm.makeOrchidOrmDbWithAdapter)(orm, {
+		...options,
+		log,
+		adapter: new pqb_internal.AdapterClass({
+			driverAdapter: pqb_bun.BunAdapter,
+			config: options
+		})
+	});
+};
+const orchidORM = (options, tables) => {
+	return makeOrchidOrmDb((0, orchid_orm.bundleOrchidORMTables)(tables), options);
+};
+exports.Adapter = Adapter;
+Object.defineProperty(exports, "bunSchemaConfig", {
+	enumerable: true,
+	get: function() {
+		return pqb_bun.bunSchemaConfig;
+	}
+});
+exports.createDb = createDb;
+exports.makeOrchidOrmDb = makeOrchidOrmDb;
+exports.orchidORM = orchidORM;
+
+//# sourceMappingURL=bun.js.map

package/dist/bun.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bun.js","names":["BunAdapter","cdb","AdapterClass"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<BunOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAeA,MAAa,UAAUA,QAAAA;AAEvB,MAAa,WAAWC,QAAAA;AAExB,MAAa,mBACX,KACA,EAAE,KAAK,GAAG,cACO;AACjB,SAAA,GAAA,WAAA,4BAAkC,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,QAAAA;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,iBAAA,GAAA,WAAA,uBAD2B,OAAO,EACb,QAAQ"}

package/dist/bun.mjs

@@ -0,0 +1,21 @@
+import { bundleOrchidORMTables, makeOrchidOrmDbWithAdapter } from "orchid-orm";
+import { BunAdapter, bunSchemaConfig, createDb as createDb$1 } from "pqb/bun";
+import { AdapterClass } from "pqb/internal";
+const Adapter = BunAdapter;
+const createDb = createDb$1;
+const makeOrchidOrmDb = (orm, { log, ...options }) => {
+	return makeOrchidOrmDbWithAdapter(orm, {
+		...options,
+		log,
+		adapter: new AdapterClass({
+			driverAdapter: BunAdapter,
+			config: options
+		})
+	});
+};
+const orchidORM = (options, tables) => {
+	return makeOrchidOrmDb(bundleOrchidORMTables(tables), options);
+};
+export { Adapter, bunSchemaConfig, createDb, makeOrchidOrmDb, orchidORM };
+
+//# sourceMappingURL=bun.mjs.map

package/dist/bun.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"bun.mjs","names":["cdb"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<BunOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAeA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBACX,KACA,EAAE,KAAK,GAAG,cACO;AACjB,QAAO,2BAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,gBADK,sBAAsB,OAAO,EACb,QAAQ"}

package/dist/index.d.ts

@@ -184,6 +184,13 @@ interface OrchidORMQueryHelper<Q extends Query, Args extends unknown[], Result>
   __result: Result;
 }
 interface OrchidORMTableHelper<T extends Query> {
+  /**
+   * Static table name from the table class.
+   */
+  table: T['table'];
+  /**
+   * Create a helper that binds to the DB-aware table query when used.
+   */
   makeHelper<Args extends unknown[], Result>(fn: (q: T, ...args: Args) => Result): OrchidORMQueryHelper<T, Args, Result>;
 }
 type OrchidORMTables<T extends TableClasses = TableClasses> = { [K in keyof T]: T[K] extends {
@@ -758,7 +765,7 @@ declare function createBaseTable<SchemaConfig extends ColumnSchemaConfig = Defau
   language,
   autoForeignKeys
 }?: {
-  schemaConfig?: SchemaConfig;
+  schemaConfig?: () => SchemaConfig;
   columnTypes?: ColumnTypes | ((t: DefaultColumnTypes<SchemaConfig>) => ColumnTypes);
   snakeCase?: boolean;
   filePath?: string;

package/dist/index.js

@@ -3,7 +3,8 @@ let pqb_internal = require("pqb/internal");
 let pqb = require("pqb");
 let node_async_hooks = require("node:async_hooks");
 function createBaseTable({ schemaConfig = pqb_internal.defaultSchemaConfig, columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs = "BaseTable", language, autoForeignKeys } = {}) {
-	const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg((0, pqb_internal.makeColumnTypes)(schemaConfig)) : columnTypesArg || (0, pqb_internal.makeColumnTypes)(schemaConfig);
+	const schema = schemaConfig();
+	const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg((0, pqb_internal.makeColumnTypes)(schema)) : columnTypesArg || (0, pqb_internal.makeColumnTypes)(schema);
 	const filePathOrStack = filePathArg || (0, pqb_internal.getStackTrace)();
 	let filePath;
 	const defaultColumns = {
@@ -33,27 +34,27 @@ function createBaseTable({ schemaConfig = pqb_internal.defaultSchemaConfig, colu
 		}
 		static inputSchema() {
 			this.instance();
-			return this._inputSchema === void 0 ? this._inputSchema = schemaConfig.inputSchema.call(this) : this._inputSchema;
+			return this._inputSchema === void 0 ? this._inputSchema = schema.inputSchema.call(this) : this._inputSchema;
 		}
 		static outputSchema() {
 			this.instance();
-			return this._outputSchema === void 0 ? this._outputSchema = schemaConfig.outputSchema.call(this) : this._outputSchema;
+			return this._outputSchema === void 0 ? this._outputSchema = schema.outputSchema.call(this) : this._outputSchema;
 		}
 		static querySchema() {
 			this.instance();
-			return this._querySchema === void 0 ? this._querySchema = schemaConfig.querySchema.call(this) : this._querySchema;
+			return this._querySchema === void 0 ? this._querySchema = schema.querySchema.call(this) : this._querySchema;
 		}
 		static createSchema() {
 			this.instance();
-			return this._createSchema === void 0 ? this._createSchema = schemaConfig.createSchema.call(this) : this._createSchema;
+			return this._createSchema === void 0 ? this._createSchema = schema.createSchema.call(this) : this._createSchema;
 		}
 		static updateSchema() {
 			this.instance();
-			return this._updateSchema === void 0 ? this._updateSchema = schemaConfig.updateSchema.call(this) : this._updateSchema;
+			return this._updateSchema === void 0 ? this._updateSchema = schema.updateSchema.call(this) : this._updateSchema;
 		}
 		static pkeySchema() {
 			this.instance();
-			return this._pkeySchema === void 0 ? this._pkeySchema = schemaConfig.pkeySchema.call(this) : this._pkeySchema;
+			return this._pkeySchema === void 0 ? this._pkeySchema = schema.pkeySchema.call(this) : this._pkeySchema;
 		}
 		static getFilePath() {
 			if (filePath) return filePath;
@@ -390,7 +391,7 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
 			for (let i = 0; i < len; i++) obj[primaryKeys[i]] = params[foreignKeys[i]];
 			return query.where(obj);
 		},
-		virtualColumn: new BelongsToVirtualColumn(pqb_internal.defaultSchemaConfig, relationName, state),
+		virtualColumn: new BelongsToVirtualColumn(pqb_internal.internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF((0, pqb_internal.getPrimaryKeys)(query), reverseJoin, (joiningQuery, baseQuery) => join(baseQuery, joiningQuery, primaryKeys, foreignKeys)),
 		reverseJoin
 	};
@@ -632,7 +633,7 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
 				...values
 			});
 		},
-		virtualColumn: new HasOneVirtualColumn(pqb_internal.defaultSchemaConfig, relationName, state),
+		virtualColumn: new HasOneVirtualColumn(pqb_internal.internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(relPKeys, reverseJoin, (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)),
 		reverseJoin,
 		modifyRelatedQuery(relationQuery) {
@@ -817,7 +818,7 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
 				...values
 			});
 		},
-		virtualColumn: new HasManyVirtualColumn(pqb_internal.defaultSchemaConfig, relationName, state),
+		virtualColumn: new HasManyVirtualColumn(pqb_internal.internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(relPKeys, reverseJoin, (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)),
 		reverseJoin,
 		modifyRelatedQuery(relationQuery) {
@@ -1057,7 +1058,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
 			});
 			return on ? (0, pqb_internal._queryDefaults)(q, on) : q;
 		},
-		virtualColumn: new HasAndBelongsToManyVirtualColumn(subQuery, pqb_internal.defaultSchemaConfig, relationName, state),
+		virtualColumn: new HasAndBelongsToManyVirtualColumn(subQuery, pqb_internal.internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF((0, pqb_internal.getPrimaryKeys)(query), reverseJoin, (joiningQuery, baseQuery) => joinQuery(joiningQuery, (0, pqb_internal.getQueryAs)(baseQuery), (0, pqb_internal.getQueryAs)(joiningQuery), {
 			...joiningQuery.q.joinedShapes,
 			[baseQuery.q.as || baseQuery.table]: baseQuery.q.shape
@@ -1419,13 +1420,16 @@ const assignTablesToOrm = (tables, result, adapter, qb, asyncStorage, commonOpti
 const bundleOrchidORMTables = (tables) => {
 	const result = {};
 	let dbAwareInstance;
-	for (const key in tables) result[key] = { makeHelper(arg) {
-		let fn;
-		return (...args) => {
-			if (!fn) fn = dbAwareInstance[key].makeHelper(arg);
-			return fn(...args);
-		};
-	} };
+	for (const key in tables) result[key] = {
+		table: tables[key].instance().table,
+		makeHelper(arg) {
+			let fn;
+			return (...args) => {
+				if (!fn) fn = dbAwareInstance[key].makeHelper(arg);
+				return fn(...args);
+			};
+		}
+	};
 	Object.defineProperty(result, orchidORMBundleMetadataKey, {
 		enumerable: false,
 		value: {
@@ -1463,7 +1467,7 @@ const privateOrchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPr
 	} else {
 		adapter = options.adapter;
 		asyncStorage = new node_async_hooks.AsyncLocalStorage();
-		qb = (0, pqb_internal._initQueryBuilder)(adapter, (0, pqb_internal.makeColumnTypes)(pqb_internal.defaultSchemaConfig), asyncStorage, commonOptions, options);
+		qb = (0, pqb_internal._initQueryBuilder)(adapter, (0, pqb_internal.makeColumnTypes)((0, pqb_internal.defaultSchemaConfig)(adapter.driverAdapter.schemaConfig)), asyncStorage, commonOptions, options);
 	}
 	qb.internal.rls = options.rls;
 	const result = {