orchid-orm 1.72.8 → 1.72.10

package/dist/index.d.ts

@@ -20,7 +20,7 @@ interface RelationHasOneThroughOptions<Through extends string, Source extends st
   required?: boolean;
 }
 type HasOneOptions<Columns extends Column.Shape.QueryInit = Column.Shape.QueryInit, Related extends ORMTableInput = ORMTableInput, Through extends string = string, Source extends string = string> = RelationRefsOptions<keyof Columns, Related['columns']['shape']> | RelationHasOneThroughOptions<Through, Source>;
-type HasOneParams<T extends RelationConfigSelf, Options> = Options extends RelationRefsOptions ? { [Name in Options['columns'][number]]: T['columns']['shape'][Name]['type'] } : Options extends RelationThroughOptions ? RelationConfigParams<T, T['relations'][Options['through']]> : never;
+type HasOneParams<T extends RelationConfigSelf, Options> = Options extends RelationRefsOptions ? { [Name in Options['columns'][number]]: T['columns']['shape'][Name]['__type'] } : Options extends RelationThroughOptions ? RelationConfigParams<T, T['relations'][Options['through']]> : never;
 type HasOneQueryThrough<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateMethodsNames ? never : TableQuery[K] } & QueryHasWhere & HasRelJoin;
 type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationRefsOptions ? { [K in keyof TableQuery]: K extends '__defaults' ? { [K in keyof TableQuery['__defaults'] | T['relations'][Name]['options']['references'][number]]: true } : K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateManyMethodsNames ? never : TableQuery[K] } & QueryHasWhere & HasRelJoin : HasOneQueryThrough<Name, TableQuery>;
 interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query> extends RelationConfigBase {
@@ -117,7 +117,7 @@ interface BelongsToOptions<Columns extends Column.Shape.QueryInit = Column.Shape
   foreignKey?: boolean | TableData.References.Options;
   on?: ColumnsShape.InputPartial<Related['columns']['shape']>;
 }
-type BelongsToParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['type'] };
+type BelongsToParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['__type'] };
 type BelongsToQuery<T extends Query, Name extends string> = { [P in keyof T]: P extends '__selectable' ? SelectableFromShape<T['shape'], Name> : P extends '__as' ? Name : P extends CreateMethodsNames | DeleteMethodsNames ? never : T[P] } & QueryHasWhere & HasRelJoin;
 interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, FK extends string, Required, Q extends Query> extends RelationConfigBase {
   returnsOne: true;
@@ -175,7 +175,7 @@ interface HasAndBelongsToManyOptions<Columns extends Column.Shape.QueryInit = Co
   };
   on?: ColumnsShape.InputPartial<Related['columns']['shape']>;
 }
-type HasAndBelongsToManyParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['type'] };
+type HasAndBelongsToManyParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['__type'] };
 type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K] } & QueryHasWhere & HasRelJoin;
 interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends string, FK extends string, Q extends Query> extends RelationConfigBase {
   returnsOne: false;
@@ -562,9 +562,15 @@ interface ORMTableInput extends PickORMTableInputColumnsAndComputed {
   grants?: readonly Grant.TableClassGrant[];
   readonly readOnly?: boolean;
   readonly materialized?: true;
+  /**
+   * Keep this table-like definition available at runtime, but exclude it from
+   * generated migration DDL reconciliation.
+   */
+  generatorIgnore?: true;
   table?: string;
   noPrimaryKey?: boolean;
   name?: string;
+  query?: Query;
   sql?: string | RawSqlBase;
   recursive?: boolean;
   checkOption?: 'LOCAL' | 'CASCADED';
@@ -572,17 +578,17 @@ interface ORMTableInput extends PickORMTableInputColumnsAndComputed {
   securityInvoker?: boolean;
   withData?: boolean;
 }
-type Queryable<T extends PickORMTableInputColumns> = ShallowSimplify<{ [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'] }>;
+type Queryable<T extends PickORMTableInputColumns> = ShallowSimplify<{ [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['__queryType'] }>;
 type DefaultSelect<T extends PickORMTableInputColumns> = ShallowSimplify<ColumnsShape.DefaultOutput<T['columns']['shape']>>;
 type Selectable<T extends PickORMTableInputColumnsAndComputed> = T['computed'] extends ((t: never) => infer R extends ComputedOptionsConfig) ? ShallowSimplify<ColumnsShape.Output<T['columns']['shape']> & { [K in keyof R]: R[K] extends {
   result: {
     value: infer Value extends Column.Pick.QueryColumn;
   };
-} ? Value['outputType'] : R[K] extends (() => {
+} ? Value['__outputType'] : R[K] extends (() => {
   result: {
     value: infer Value extends Column.Pick.QueryColumn;
   };
-}) ? Value['outputType'] : never }> : ShallowSimplify<ColumnsShape.Output<T['columns']['shape']>>;
+}) ? Value['__outputType'] : never }> : ShallowSimplify<ColumnsShape.Output<T['columns']['shape']>>;
 type Insertable<T extends PickORMTableInputColumns> = ShallowSimplify<ColumnsShape.Input<T['columns']['shape']>>;
 type Updatable<T extends PickORMTableInputColumns> = ShallowSimplify<ColumnsShape.InputPartial<T['columns']['shape']>>;
 type BeforeHookMethod = (cb: QueryBeforeHook) => void;
@@ -610,6 +616,11 @@ interface BaseTableInstance<ColumnTypes> {
   q: QueryData;
   language?: string;
   filePath: string;
+  /**
+   * Keep this table-like definition available at runtime, but exclude it from
+   * generated migration DDL reconciliation.
+   */
+  generatorIgnore?: true;
   result: Column.Shape.QueryInit;
   clone<T extends IsQuery>(this: T): T;
   getFilePath(): string;
@@ -819,6 +830,7 @@ interface BaseTableClass<SchemaConfig extends ColumnSchemaConfig, ColumnTypes> {
 }
 interface BaseViewInstance<ColumnTypes> extends BaseTableInstance<ColumnTypes> {
   name: string;
+  query?: Query;
   sql: string | RawSqlBase;
   readonly readOnly?: boolean;
   recursive?: boolean;
@@ -828,6 +840,7 @@ interface BaseViewInstance<ColumnTypes> extends BaseTableInstance<ColumnTypes> {
 }
 interface BaseMaterializedViewInstance<ColumnTypes> extends BaseTableInstance<ColumnTypes> {
   name: string;
+  query?: Query;
   sql: string | RawSqlBase;
   readonly readOnly?: true;
   readonly materialized: true;

package/dist/index.js

@@ -1482,18 +1482,12 @@ const assignTablesToOrm = (isTable, tables, result, adapter, qb, asyncStorage, c
 			comment: table.comment,
 			readOnly: isTable ? table.readOnly ? true : void 0 : table.materialized || table.readOnly !== false ? true : void 0,
 			materialized: !isTable && table.materialized ? true : void 0,
+			generatorIgnore: table.generatorIgnore,
 			noPrimaryKey: table.noPrimaryKey || !isTable ? "ignore" : void 0,
 			computed: table.computed,
 			nowSQL: tableClass.nowSQL
 		};
-		const dbTable = new pqb.Db(adapter, qb, isTable ? table.table : table.name, table.columns.shape, table.types, asyncStorage, options, table.columns?.data ?? {}, isTable ? void 0 : {
-			sql: table.sql,
-			recursive: table.recursive,
-			checkOption: table.checkOption,
-			securityBarrier: table.securityBarrier,
-			securityInvoker: table.securityInvoker,
-			withData: table.withData
-		});
+		const dbTable = new pqb.Db(adapter, qb, isTable ? table.table : table.name, table.columns.shape, table.types, asyncStorage, options, table.columns?.data ?? {}, getViewData(isTable, table));
 		dbTable.definedAs = key;
 		dbTable.db = result;
 		dbTable.filePath = table.filePath;
@@ -1504,6 +1498,18 @@ const assignTablesToOrm = (isTable, tables, result, adapter, qb, asyncStorage, c
 	}
 	return tableInstances;
 };
+const getViewData = (isTable, table) => {
+	if (isTable) return;
+	return {
+		query: table.query,
+		sql: table.sql,
+		recursive: table.recursive,
+		checkOption: table.checkOption,
+		securityBarrier: table.securityBarrier,
+		securityInvoker: table.securityInvoker,
+		withData: table.withData
+	};
+};
 const bundleOrchidORM = ({ tables = {}, views = {} }) => {
 	const result = {};
 	const bundledViews = {};
@@ -1619,14 +1625,23 @@ const privateOrchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPr
 		...result.$views
 	}, schema);
 	setDbAwareInstance?.(result);
-	const initItems = [[tableInstances, result], [viewInstances, result.$views]];
-	for (const [items, queries] of initItems) {
+	const initItems = [[
+		tableInstances,
+		result,
+		true
+	], [
+		viewInstances,
+		result.$views,
+		false
+	]];
+	for (const [items, queries, isTable] of initItems) {
 		if (!items) continue;
 		for (const key in items) {
 			const table = items[key];
 			if (table.init) {
 				table.init(result);
 				Object.assign(queries[key].baseQuery.q, table.q);
+				if (!isTable) queries[key].internal.viewData = getViewData(false, table);
 			}
 		}
 	}