@rvoh/dream 2.3.0-alpha.6 → 2.3.0-alpha.8

package/dist/types/src/dream/Query.d.ts

@@ -1,6 +1,6 @@
 import { DeleteQueryBuilder, SelectQueryBuilder, UpdateQueryBuilder } from 'kysely';
 import Dream from '../Dream.js';
-import { ColumnNamesAccountingForJoinedAssociations, LimitStatement, OffsetStatement, OrderQueryStatement, PassthroughOnClause, WhereStatement, WhereStatementForJoinedAssociation } from '../types/associations/shared.js';
+import { ColumnNamesAccountingForJoinedAssociations, InternalWhereStatement, LimitStatement, OffsetStatement, OrderQueryStatement, PassthroughOnClause, WhereStatement, WhereStatementForJoinedAssociation } from '../types/associations/shared.js';
 import { DbConnectionType } from '../types/db.js';
 import { AllDefaultScopeNames, DefaultScopeName, DreamColumnNames, DreamConstructorType, DreamSerializerKey, DreamTableSchema, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, RelaxedJoinAndStatement, RelaxedJoinStatement, RelaxedPreloadOnStatement, RelaxedPreloadStatement, TableColumnNames, TableOrAssociationName } from '../types/dream.js';
 import { CursorPaginatedDreamQueryOptions, CursorPaginatedDreamQueryResult, DefaultQueryTypeOptions, ExtendQueryType, LoadForModifierFn, NamespacedOrBaseModelColumnTypes, PaginatedDreamQueryOptions, PaginatedDreamQueryResult, QueryToKyselyDBType, QueryToKyselyTableNamesType } from '../types/query.js';
@@ -259,7 +259,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param whereStatement - The where statement used to locate the record
      * @returns Either the first record found matching the attributes, or else null
      */
-    findBy<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatement: WhereStatement<DB, Schema, DreamInstance['table']>): Promise<DreamInstance | null>;
+    findBy(whereStatement: WhereStatement<DreamInstance>): Promise<DreamInstance | null>;
     /**
      * Finds a record matching the Query and the
      * specified where statement. If not found, an exception
@@ -273,7 +273,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param whereStatement - The where statement used to locate the record
      * @returns The first record found matching the attributes
      */
-    findOrFailBy<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatement: WhereStatement<DB, Schema, DreamInstance['table']>): Promise<DreamInstance>;
+    findOrFailBy(whereStatement: WhereStatement<DreamInstance>): Promise<DreamInstance>;
     /**
      * Finds all records matching the Query in batches,
      * and then calls the provided callback for each found record.
@@ -319,7 +319,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param args - A chain of association names and and/andNot/andAny clauses
      * @returns A cloned Query with the joinLoad statement applied
      */
-    leftJoinPreload<Q extends Query<DreamInstance, any>, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], TableName extends DreamInstance['table'], const Arr extends readonly unknown[], const LastArg extends VariadicLeftJoinLoadArgs<DB, Schema, TableName, Arr>, Incompatible extends Q['queryTypeOpts'] extends Readonly<{
+    leftJoinPreload<Q extends Query<DreamInstance, any>, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], TableName extends DreamInstance['table'], const Arr extends readonly unknown[], const LastArg extends VariadicLeftJoinLoadArgs<DreamInstance, DB, Schema, TableName, Arr>, Incompatible extends Q['queryTypeOpts'] extends Readonly<{
         allowLeftJoinPreload: false;
     }> ? true : false, const JoinedAssociationsCandidate = JoinedAssociationsTypeFromAssociations<DB, Schema, TableName, Incompatible extends true ? [] : [...Arr, LastArg]>, const JoinedAssociations extends readonly JoinedAssociation[] = JoinedAssociationsCandidate extends readonly JoinedAssociation[] ? JoinedAssociationsCandidate : never, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
         joinedAssociations: JoinedAssociations;
@@ -345,7 +345,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
         allowPreload: false;
     }> ? true : false, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
         allowLeftJoinPreload: false;
-    }>>>>(this: Q, ...args: Incompatible extends true ? 'preload is incompatible with leftJoinPreload'[] : [...Arr, VariadicLoadArgs<DB, Schema, TableName, Arr>]): RetQuery;
+    }>>>>(this: Q, ...args: Incompatible extends true ? 'preload is incompatible with leftJoinPreload'[] : [...Arr, VariadicLoadArgs<DreamInstance, DB, Schema, TableName, Arr>]): RetQuery;
     /**
      * Recursively preloads all Dream associations referenced by `rendersOne` and `rendersMany`
      * in a DreamSerializer. This traverses the entire content tree of serializers to automatically
@@ -404,7 +404,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param args - A chain of association names and and/andNot/andAny clauses
      * @returns A cloned Query with the joins clause applied
      */
-    innerJoin<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], TableName extends DreamInstance['table'], const Arr extends readonly unknown[], const LastArg extends VariadicJoinsArgs<DB, Schema, TableName, Arr>, const JoinedAssociationsCandidate = JoinedAssociationsTypeFromAssociations<DB, Schema, TableName, [
+    innerJoin<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], TableName extends DreamInstance['table'], const Arr extends readonly unknown[], const LastArg extends VariadicJoinsArgs<DreamInstance, DB, Schema, TableName, Arr>, const JoinedAssociationsCandidate = JoinedAssociationsTypeFromAssociations<DB, Schema, TableName, [
         ...Arr,
         LastArg
     ]>, const JoinedAssociations extends readonly JoinedAssociation[] = JoinedAssociationsCandidate extends readonly JoinedAssociation[] ? JoinedAssociationsCandidate : never, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
@@ -416,7 +416,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param args - A chain of association names and and/andNot/andAny clauses
      * @returns A cloned Query with the joins clause applied
      */
-    leftJoin<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], TableName extends DreamInstance['table'], const Arr extends readonly unknown[], const LastArg extends VariadicJoinsArgs<DB, Schema, TableName, Arr>, const JoinedAssociationsCandidate = JoinedAssociationsTypeFromAssociations<DB, Schema, TableName, [
+    leftJoin<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], TableName extends DreamInstance['table'], const Arr extends readonly unknown[], const LastArg extends VariadicJoinsArgs<DreamInstance, DB, Schema, TableName, Arr>, const JoinedAssociationsCandidate = JoinedAssociationsTypeFromAssociations<DB, Schema, TableName, [
         ...Arr,
         LastArg
     ]>, const JoinedAssociations extends readonly JoinedAssociation[] = JoinedAssociationsCandidate extends readonly JoinedAssociation[] ? JoinedAssociationsCandidate : never, RetQuery = Query<DreamInstance, ExtendQueryType<QueryTypeOpts, Readonly<{
@@ -527,7 +527,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param whereStatement - Where statement to apply to the Query
      * @returns A cloned Query with the where clause applied
      */
-    where<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatement: WhereStatementForJoinedAssociation<QueryTypeOpts['joinedAssociations'], DB, Schema, QueryTypeOpts['rootTableName']> | null): Query<DreamInstance, QueryTypeOpts>;
+    where<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatement: WhereStatementForJoinedAssociation<DreamInstance, QueryTypeOpts['joinedAssociations'], DB, Schema, QueryTypeOpts['rootTableName']> | null): Query<DreamInstance, QueryTypeOpts>;
     /**
      * Accepts a list of where statements, each of
      * which is combined via `OR`
@@ -540,7 +540,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param whereStatements - a list of where statements to `OR` together
      * @returns A cloned Query with the whereAny clause applied
      */
-    whereAny<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatements: WhereStatementForJoinedAssociation<QueryTypeOpts['joinedAssociations'], DB, Schema, QueryTypeOpts['rootTableName']>[] | null): Query<DreamInstance, QueryTypeOpts>;
+    whereAny<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatements: WhereStatementForJoinedAssociation<DreamInstance, QueryTypeOpts['joinedAssociations'], DB, Schema, QueryTypeOpts['rootTableName']>[] | null): Query<DreamInstance, QueryTypeOpts>;
     /**
      * Applies a whereNot statement to the Query instance
      *
@@ -552,7 +552,7 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
      * @param whereStatement - A where statement to negate and apply to the Query
      * @returns A cloned Query with the whereNot clause applied
      */
-    whereNot<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatement: WhereStatementForJoinedAssociation<QueryTypeOpts['joinedAssociations'], DB, Schema, QueryTypeOpts['rootTableName']> | null): Query<DreamInstance, QueryTypeOpts>;
+    whereNot<DB extends DreamInstance['DB'], Schema extends DreamInstance['schema']>(whereStatement: WhereStatementForJoinedAssociation<DreamInstance, QueryTypeOpts['joinedAssociations'], DB, Schema, QueryTypeOpts['rootTableName']> | null): Query<DreamInstance, QueryTypeOpts>;
     /**
      * @internal
      *
@@ -1164,21 +1164,21 @@ export interface QueryOpts<DreamInstance extends Dream, ColumnType extends Dream
     baseSqlAlias?: TableOrAssociationName<Schema> | undefined;
     baseSelectQuery?: Query<any, any> | null | undefined;
     passthroughOnStatement?: PassthroughOnClause<PassthroughColumns> | null | undefined;
-    where?: readonly WhereStatement<DB, Schema, any>[] | null | undefined;
-    whereNot?: readonly WhereStatement<DB, Schema, any>[] | null | undefined;
+    where?: readonly InternalWhereStatement<DreamInstance, DB, Schema, any>[] | null | undefined;
+    whereNot?: readonly InternalWhereStatement<DreamInstance, DB, Schema, any>[] | null | undefined;
     limit?: LimitStatement | null | undefined;
     offset?: OffsetStatement | null | undefined;
-    or?: WhereStatement<DB, Schema, any>[][] | null | undefined;
+    or?: InternalWhereStatement<DreamInstance, DB, Schema, any>[][] | null | undefined;
     order?: OrderQueryStatement<ColumnType>[] | null | undefined;
     loadFromJoins?: boolean | undefined;
     preloadStatements?: RelaxedPreloadStatement | undefined;
-    preloadOnStatements?: RelaxedPreloadOnStatement<DB, Schema> | undefined;
+    preloadOnStatements?: RelaxedPreloadOnStatement<DreamInstance, DB, Schema> | undefined;
     distinctColumn?: ColumnType | null | undefined;
     innerJoinDreamClasses?: readonly (typeof Dream)[] | undefined;
     innerJoinStatements?: RelaxedJoinStatement | undefined;
-    innerJoinAndStatements?: RelaxedJoinAndStatement<DB, Schema> | undefined;
+    innerJoinAndStatements?: RelaxedJoinAndStatement<DreamInstance, DB, Schema> | undefined;
     leftJoinStatements?: RelaxedJoinStatement | undefined;
-    leftJoinAndStatements?: RelaxedJoinAndStatement<DB, Schema> | undefined;
+    leftJoinAndStatements?: RelaxedJoinAndStatement<DreamInstance, DB, Schema> | undefined;
     bypassAllDefaultScopes?: boolean | undefined;
     bypassAllDefaultScopesExceptOnAssociations?: boolean | undefined;
     defaultScopesToBypass?: AllDefaultScopeNames<DreamInstance>[] | undefined;

package/dist/types/src/dream/QueryDriver/Base.d.ts

@@ -126,7 +126,6 @@ export default class QueryDriverBase<DreamInstance extends Dream> {
     }): Promise<{
         [key: string]: SchemaBuilderColumnData;
     }>;
-    static serializeDbType(type: GenericDbType, val: any): any;
     /**
      * @internal
      *

package/dist/types/src/dream/QueryDriver/Kysely.d.ts

@@ -318,6 +318,7 @@ export default class KyselyQueryDriver<DreamInstance extends Dream> extends Quer
     private inArrayWithoutNullExpressionBuilder;
     private notInArrayWithNullExpressionBuilder;
     private dreamWhereStatementToExpressionBuilderParts;
+    private normalizedWhereValue;
     private recursivelyJoin;
     /**
      * @internal

package/dist/types/src/dream/internal/associations/associationQuery.d.ts

@@ -3,7 +3,7 @@ import { AssociationNameToDream, DreamAssociationNames, JoinAndStatements } from
 import DreamTransaction from '../../DreamTransaction.js';
 import Query from '../../Query.js';
 export default function associationQuery<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table'], AssociationQuery = Query<AssociationNameToDream<DreamInstance, AssociationName>>>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinAndStatements, bypassAllDefaultScopes, defaultScopesToBypass, }: {
-    joinAndStatements: JoinAndStatements<DB, Schema, AssociationTableName, null>;
+    joinAndStatements: JoinAndStatements<AssociationDream, DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;
     defaultScopesToBypass: string[];
 }): AssociationQuery;

package/dist/types/src/dream/internal/associations/associationUpdateQuery.d.ts

@@ -3,7 +3,7 @@ import { AssociationNameToDream, DreamAssociationNames, JoinAndStatements } from
 import DreamTransaction from '../../DreamTransaction.js';
 import Query from '../../Query.js';
 export default function associationUpdateQuery<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table'], AssociationQuery = Query<AssociationNameToDream<DreamInstance, AssociationName>>>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinAndStatements, bypassAllDefaultScopes, defaultScopesToBypass, }: {
-    joinAndStatements: JoinAndStatements<DB, Schema, AssociationTableName, null>;
+    joinAndStatements: JoinAndStatements<AssociationDream, DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;
     defaultScopesToBypass: string[];
 }): AssociationQuery;

package/dist/types/src/dream/internal/associations/destroyAssociation.d.ts

@@ -2,7 +2,7 @@ import Dream from '../../../Dream.js';
 import { AssociationNameToDream, DreamAssociationNames, JoinAndStatements } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
 export default function destroyAssociation<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table']>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinAndStatements, bypassAllDefaultScopes, defaultScopesToBypass, cascade, reallyDestroy, skipHooks, }: {
-    joinAndStatements: JoinAndStatements<DB, Schema, AssociationTableName, null>;
+    joinAndStatements: JoinAndStatements<AssociationDream, DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;
     defaultScopesToBypass: string[];
     cascade: boolean;

package/dist/types/src/dream/internal/associations/throughAssociationHasOptionsBesidesThroughAndSource.d.ts

@@ -1,11 +1,13 @@
 import { HasManyStatement } from '../../../types/associations/hasMany.js';
 import { HasOneStatement } from '../../../types/associations/hasOne.js';
-export default function throughAssociationHasOptionsBesidesThroughAndSource(throughAssociation: HasOneStatement<any, any, any, any> | HasManyStatement<any, any, any, any> | undefined): Partial<import("../../../types/utils.js").MergeUnionOfRecordTypes<{
+export default function throughAssociationHasOptionsBesidesThroughAndSource(throughAssociation: HasOneStatement<any, any, any, any> | HasManyStatement<any, any, any, any> | undefined): Partial<import("../../../types/utils.js").MergeUnionOfRecordTypes<Partial<{
     [x: string]: any;
-} | Partial<{
+}> | Partial<{
     [x: string]: any;
 }>>> | Partial<import("../../../types/utils.js").MergeUnionOfRecordTypes<{
     [x: string]: any;
 } | Partial<{
     [x: string]: any;
+}> | Partial<{
+    [x: string]: any;
 }>>>[] | import("../../../types/associations/shared.js").OrderStatement<any, any, any> | undefined;

package/dist/types/src/dream/internal/associations/undestroyAssociation.d.ts

@@ -2,7 +2,7 @@ import Dream from '../../../Dream.js';
 import { AssociationNameToDream, DreamAssociationNames, JoinAndStatements } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
 export default function undestroyAssociation<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table']>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinAndStatements, bypassAllDefaultScopes, defaultScopesToBypass, cascade, skipHooks, }: {
-    joinAndStatements: JoinAndStatements<DB, Schema, AssociationTableName, null>;
+    joinAndStatements: JoinAndStatements<AssociationDream, DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;
     defaultScopesToBypass: string[];
     cascade: boolean;

package/dist/types/src/dream/internal/extractAssignableAssociationAttributes.d.ts

@@ -0,0 +1,3 @@
+import Dream from '../../Dream.js';
+import { BelongsToStatement, HasManyStatement, HasOneStatement } from '../../package-exports/types.js';
+export default function extractAssignableAssociationAttributes(association: BelongsToStatement<any, any, any, any> | HasManyStatement<any, any, any, any> | HasOneStatement<any, any, any, any>, dreamInstance: Dream): Record<string, unknown>;

package/dist/types/src/dream/internal/similarity/SimilarityBuilder.d.ts

@@ -1,14 +1,14 @@
 import { SelectQueryBuilder, UpdateQueryBuilder } from 'kysely';
 import ConnectedToDB from '../../../db/ConnectedToDB.js';
 import Dream from '../../../Dream.js';
-import { WhereStatement } from '../../../types/associations/shared.js';
+import { InternalWhereStatement } from '../../../types/associations/shared.js';
 import { DbConnectionType } from '../../../types/db.js';
 import { JoinAndStatements, RelaxedJoinAndStatement, SimilarityStatement } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
 export default class SimilarityBuilder<DreamInstance extends Dream, DB extends DreamInstance['DB'] = DreamInstance['DB'], Schema extends DreamInstance['schema'] = DreamInstance['schema']> extends ConnectedToDB<DreamInstance> {
-    readonly whereStatement: readonly WhereStatement<DB, Schema, any>[];
-    readonly whereNotStatement: readonly WhereStatement<DB, Schema, any>[];
-    readonly joinAndStatements: JoinAndStatements<DB, Schema, any, any>;
+    readonly whereStatement: readonly InternalWhereStatement<DreamInstance, DB, Schema, any>[];
+    readonly whereNotStatement: readonly InternalWhereStatement<DreamInstance, DB, Schema, any>[];
+    readonly joinAndStatements: JoinAndStatements<DreamInstance, DB, Schema, any, any>;
     constructor(dreamInstance: DreamInstance, opts?: SimilarityBuilderOpts<DreamInstance>);
     select<T extends SimilarityBuilder<DreamInstance>>(this: T, kyselyQuery: SelectQueryBuilder<DB, any, object>, { bypassOrder }?: {
         bypassOrder?: boolean;
@@ -28,9 +28,9 @@ export default class SimilarityBuilder<DreamInstance extends Dream, DB extends D
     private rankSQLAlias;
 }
 export interface SimilarityBuilderOpts<DreamInstance extends Dream, DB extends DreamInstance['DB'] = DreamInstance['DB'], Schema extends DreamInstance['schema'] = DreamInstance['schema']> {
-    where?: WhereStatement<DB, Schema, any>[] | undefined;
-    whereNot?: WhereStatement<DB, Schema, any>[] | undefined;
-    joinAndStatements?: RelaxedJoinAndStatement<DB, Schema> | undefined;
+    where?: InternalWhereStatement<DreamInstance, DB, Schema, any>[] | undefined;
+    whereNot?: InternalWhereStatement<DreamInstance, DB, Schema, any>[] | undefined;
+    joinAndStatements?: RelaxedJoinAndStatement<DreamInstance, DB, Schema> | undefined;
     transaction?: DreamTransaction<Dream> | null | undefined;
     connection?: DbConnectionType | undefined;
 }

package/dist/types/src/errors/db/DataIncompatibleWithDatabaseField.d.ts

@@ -1,10 +1,5 @@
-import Dream from '../../Dream.js';
 export default class DataIncompatibleWithDatabaseField extends Error {
-    dream: Dream;
-    error: Error;
-    constructor({ dream, error }: {
-        dream: Dream;
-        error: Error;
-    });
+    private error;
+    constructor(error: Error);
     get message(): string;
 }

package/dist/types/src/helpers/cli/ASTBuilder.d.ts

@@ -116,6 +116,37 @@ export default class ASTBuilder {
      * returns an array of global names for all serializers in the app
      */
     protected globalSerializerNames(): string[];
+    /**
+     * @internal
+     *
+     * checks if a database type is a date type (with optional array suffix)
+     */
+    protected isDateDbType(dbType: string): boolean;
+    /**
+     * @internal
+     *
+     * checks if a database type is a time without time zone type (with optional array suffix)
+     */
+    protected isTimeWithoutTimeZoneDbType(dbType: string): boolean;
+    /**
+     * @internal
+     *
+     * checks if a database type is a time with time zone type (with optional array suffix)
+     */
+    protected isTimeWithTimeZoneDbType(dbType: string): boolean;
+    /**
+     * @internal
+     *
+     * checks if a database type is any time type (with or without time zone, with optional array suffix)
+     */
+    protected isTimeDbType(dbType: string): boolean;
+    /**
+     * @internal
+     *
+     * checks if a TypeScript type node represents a string-like type
+     * (string keyword, string type reference, or string literal)
+     */
+    protected isStringLikeType(node: ts.TypeNode, sourceFile: ts.SourceFile): boolean;
 }
 export interface SchemaData {
     [key: string]: TableData;

package/dist/types/src/helpers/cli/ASTKyselyCodegenEnhancer.d.ts

@@ -32,6 +32,19 @@ export default class ASTKyselyCodegenEnhancer extends ASTConnectionBuilder {
      * the DateTime or CalendarDate class, depending on the db type.
      */
     private replaceTimestampExport;
+    /**
+     * @internal
+     *
+     * Replaces string types with TimeWithZone or TimeWithoutZone for TIME columns
+     * based on the schema metadata from dream.ts
+     */
+    private replaceTimeFieldsInInterfaces;
+    /**
+     * @internal
+     *
+     * Helper to replace string type references with ClockTime or ClockTimeTz type references
+     */
+    private replaceStringWithClockTimeType;
     /**
      * @internal
      *

package/dist/types/src/helpers/customPgParsers.d.ts

@@ -1,10 +1,15 @@
 import { Kysely } from 'kysely';
 import CalendarDate from '../utils/datetime/CalendarDate.js';
+import ClockTime from '../utils/datetime/ClockTime.js';
+import ClockTimeTz from '../utils/datetime/ClockTimeTz.js';
 import { DateTime } from '../utils/datetime/DateTime.js';
 export declare function findEnumArrayOids(kyselyDb: Kysely<any>): Promise<number[]>;
 export declare function findCitextArrayOid(kyselyDb: Kysely<any>): Promise<number | undefined>;
 export declare function findCorrespondingArrayOid(kyselyDb: Kysely<any>, oid: number): Promise<number | undefined>;
 export declare function parsePostgresDate(dateString: string | null): string | CalendarDate | null;
 export declare function parsePostgresDatetime(datetimeString: string | null): string | DateTime | null;
+export declare function parsePostgresDatetimeTz(datetimeString: string | null): string | DateTime | null;
+export declare function parsePostgresTime(timeString: string | null): string | ClockTime | null;
+export declare function parsePostgresTimeTz(timeString: string | null): string | ClockTimeTz | null;
 export declare function parsePostgresDecimal(numberString: string | null): string | number | null;
 export declare function parsePostgresBigint(numberString: string | null): string | null;

package/dist/types/src/helpers/db/normalizeDataForDb.d.ts

@@ -0,0 +1,6 @@
+import Dream from '../../Dream.js';
+export declare function normalizeDataForDb({ val, dreamClass, column, }: {
+    val: unknown;
+    dreamClass: typeof Dream;
+    column: string;
+}): unknown;

package/dist/types/src/helpers/db/types/helpers.d.ts

@@ -0,0 +1,5 @@
+export declare const DATETIME_OR_DATETIME_ARRAY_COLUMN_CHECK_REGEXP: RegExp;
+export declare const DATE_OR_DATE_ARRAY_COLUMN_CHECK_REGEXP: RegExp;
+export declare const TIME_WITH_TIMEZONE_COLUMN_CHECK_REGEXP: RegExp;
+export declare const TIME_WITHOUT_TIMEZONE_COLUMN_CHECK_REGEXP: RegExp;
+export declare const STRING_OR_STRING_ARRAY_COLUMN_CHECK_REGEXP: RegExp;

package/dist/types/src/helpers/sort.d.ts

@@ -1,3 +1,4 @@
+import { ClockTime, ClockTimeTz } from '../package-exports/index.js';
 import CalendarDate from '../utils/datetime/CalendarDate.js';
 import { DateTime } from '../utils/datetime/DateTime.js';
 /**
@@ -14,4 +15,4 @@ import { DateTime } from '../utils/datetime/DateTime.js';
  * // ['hello', 'Hello', 'world', 'World']
  * ```
  */
-export default function sort<ArrayType extends string[] | number[] | bigint[] | (DateTime | CalendarDate)[]>(array: ArrayType): ArrayType;
+export default function sort<ArrayType extends string[] | number[] | bigint[] | (DateTime | CalendarDate)[] | ClockTime[] | ClockTimeTz[]>(array: ArrayType): ArrayType;

package/dist/types/src/helpers/sortBy.d.ts

@@ -1,9 +1,12 @@
+import { ClockTime, ClockTimeTz } from '../package-exports/index.js';
 import CalendarDate from '../utils/datetime/CalendarDate.js';
 import { DateTime } from '../utils/datetime/DateTime.js';
 export default function sortBy<T>(array: T[], valueToCompare: (value: T) => number): T[];
 export default function sortBy<T>(array: T[], valueToCompare: (value: T) => bigint): T[];
 export default function sortBy<T>(array: T[], valueToCompare: (value: T) => string): T[];
 export default function sortBy<T>(array: T[], valueToCompare: (value: T) => DateTime | CalendarDate): T[];
+export default function sortBy<T>(array: T[], valueToCompare: (value: T) => ClockTime): T[];
+export default function sortBy<T>(array: T[], valueToCompare: (value: T) => ClockTimeTz): T[];
 export declare class UnsupportedValueFromComparisonFunction extends Error {
     private aPrime;
     private bPrime;

package/dist/types/src/helpers/toSafeObject.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @internal
+ *
+ * Returns a shallow copy of the object using a prototype-less container
+ * (Object.create(null)). Use when assigning untrusted keys so that keys like
+ * __proto__ or constructor cannot pollute Object.prototype.
+ */
+export declare function toSafeObject<T extends object>(obj: T): T;

package/dist/types/src/package-exports/errors.d.ts

@@ -11,4 +11,6 @@ export { default as RecordNotFound } from '../errors/RecordNotFound.js';
 export { default as MissingSerializersDefinition } from '../errors/serializers/MissingSerializersDefinition.js';
 export { default as ValidationError } from '../errors/ValidationError.js';
 export { InvalidCalendarDate } from '../utils/datetime/CalendarDate.js';
+export { InvalidClockTime } from '../utils/datetime/ClockTime.js';
+export { InvalidClockTimeTz } from '../utils/datetime/ClockTimeTz.js';
 export { InvalidDateTime } from '../utils/datetime/DateTime.js';

package/dist/types/src/package-exports/index.d.ts

@@ -12,4 +12,6 @@ export { default as ops } from '../ops/index.js';
 export { default as DreamSerializer } from '../serializer/DreamSerializer.js';
 export { default as ObjectSerializer } from '../serializer/ObjectSerializer.js';
 export { default as CalendarDate } from '../utils/datetime/CalendarDate.js';
+export { default as ClockTime } from '../utils/datetime/ClockTime.js';
+export { default as ClockTimeTz } from '../utils/datetime/ClockTimeTz.js';
 export { DateTime } from '../utils/datetime/DateTime.js';

package/dist/types/src/package-exports/types.d.ts

@@ -8,8 +8,9 @@ export { type HasManyStatement } from '../types/associations/hasMany.js';
 export { type HasOneStatement } from '../types/associations/hasOne.js';
 export { type DbConnectionType, type DbTypes, type PrimaryKeyType } from '../types/db.js';
 export { type StrictInterface } from '../types/utils.js';
+export { type CalendarDateDurationUnit, type CalendarDateObject } from '../types/calendardate.js';
+export { type ClockTimeObject } from '../types/clocktime.js';
 export { type DurationObject, type DurationUnit, type WeekdayName } from '../types/datetime.js';
-export { type CalendarDateDurationUnit } from '../types/calendardate.js';
 export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassAssociationAndStatement, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelClassSerializerKey, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializable, type DreamSerializableArray, type DreamSerializerKey, type DreamSerializers, type DreamVirtualColumns, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModel, type ViewModelClass, } from '../types/dream.js';
 export { type DreamModelSerializerType, type InternalAnyTypedSerializerRendersMany, type InternalAnyTypedSerializerRendersOne, type SerializerCasing, type SimpleObjectSerializerType, } from '../types/serializer.js';
 export { type ValidationType } from '../types/validation.js';

package/dist/types/src/types/associations/shared.d.ts

@@ -4,6 +4,7 @@ import { DreamConst } from '../../dream/constants.js';
 import { Range } from '../../helpers/range.js';
 import CurriedOpsStatement from '../../ops/curried-ops-statement.js';
 import OpsStatement, { ExtraSimilarityArgs } from '../../ops/ops-statement.js';
+import { ClockTime, ClockTimeTz } from '../../package-exports/index.js';
 import CalendarDate from '../../utils/datetime/CalendarDate.js';
 import { DateTime } from '../../utils/datetime/DateTime.js';
 import { AssociationTableNames } from '../db.js';
@@ -24,26 +25,27 @@ export type PassthroughOnClause<PassthroughColumns extends string[]> = Partial<R
 type DreamSelectable<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<{
     [ColumnName in keyof DB[TableName]]: NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, ColumnName>;
 }>;
-type NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, Column, ModelPropertyType = ModelColumnType<Schema, TableName, Column>, ColumnType = TableColumnType<Schema, TableName, Column>, EnumTypeArray extends string[] | null = TableColumnEnumTypeArray<Schema, TableName, Column>, PermanentOpsValTypes = null | readonly [], OpsValType = EnumTypeArray extends null ? ColumnType extends 'bigint' ? TypesAllowedForBigintAgainstTheDb | PermanentOpsValTypes : ModelPropertyType extends DateTime | CalendarDate ? DateTime | CalendarDate | null : ModelPropertyType extends number | string ? ModelPropertyType | PermanentOpsValTypes : never : EnumTypeArray extends string[] ? EnumTypeArray[number] | PermanentOpsValTypes : never, PartialTypes = EnumTypeArray extends null ? ModelPropertyType extends DateTime ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends CalendarDate ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, OpsValType> : ColumnType extends 'bigint' ? Range<TypesAllowedForBigintAgainstTheDb> | Range<null, TypesAllowedForBigintAgainstTheDb> | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends number ? Range<ModelPropertyType> | Range<null, ModelPropertyType> | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends string ? Range<string> | Range<null, string> | OpsStatement<KyselyComparisonOperatorExpression, string, any> | OpsStatement<TrigramOperator, OpsValType, ExtraSimilarityArgs> : never : EnumTypeArray extends string[] ? EnumTypeArray | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : never> = PartialTypes extends never ? OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> | CurriedOpsStatement<any, any, any, OpsValType> | SelectQueryBuilder<DB, keyof DB, any> : PartialTypes | CurriedOpsStatement<any, any, any, OpsValType> | SelectQueryBuilder<DB, keyof DB, any>;
-export type WhereStatementForDreamClass<DreamClass extends typeof Dream> = WhereStatement<InstanceType<DreamClass>['DB'], InstanceType<DreamClass>['schema'], InstanceType<DreamClass>['table']>;
-export type WhereStatementForDream<DreamInstance extends Dream> = WhereStatement<DreamInstance['DB'], DreamInstance['schema'], DreamInstance['table']>;
+type NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, Column, ModelPropertyType = ModelColumnType<Schema, TableName, Column>, ColumnType = TableColumnType<Schema, TableName, Column>, EnumTypeArray extends string[] | null = TableColumnEnumTypeArray<Schema, TableName, Column>, PermanentOpsValTypes = null | readonly [], OpsValType = EnumTypeArray extends null ? ColumnType extends 'bigint' ? TypesAllowedForBigintAgainstTheDb | PermanentOpsValTypes : ModelPropertyType extends DateTime | CalendarDate ? DateTime | CalendarDate | null : ModelPropertyType extends ClockTime ? ClockTime | null : ModelPropertyType extends ClockTimeTz ? ClockTimeTz | null : ModelPropertyType extends number | string ? ModelPropertyType | PermanentOpsValTypes : never : EnumTypeArray extends string[] ? EnumTypeArray[number] | PermanentOpsValTypes : never, PartialTypes = EnumTypeArray extends null ? ModelPropertyType extends DateTime ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends ClockTime ? Range<ClockTime> | Range<null, ClockTime> | (() => Range<ClockTime>) | (() => Range<null, ClockTime>) | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends ClockTimeTz ? Range<ClockTimeTz> | Range<null, ClockTimeTz> | (() => Range<ClockTimeTz>) | (() => Range<null, ClockTimeTz>) | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends CalendarDate ? Range<DateTime | CalendarDate> | Range<null, DateTime | CalendarDate> | (() => Range<DateTime | CalendarDate>) | (() => Range<null, DateTime | CalendarDate>) | OpsStatement<KyselyComparisonOperatorExpression, OpsValType> : ColumnType extends 'bigint' ? Range<TypesAllowedForBigintAgainstTheDb> | Range<null, TypesAllowedForBigintAgainstTheDb> | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends number ? Range<ModelPropertyType> | Range<null, ModelPropertyType> | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : ModelPropertyType extends string ? Range<string> | Range<null, string> | OpsStatement<KyselyComparisonOperatorExpression, string, any> | OpsStatement<TrigramOperator, OpsValType, ExtraSimilarityArgs> : never : EnumTypeArray extends string[] ? EnumTypeArray | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> : never> = PartialTypes extends never ? OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any> | CurriedOpsStatement<any, any, any, OpsValType> | SelectQueryBuilder<DB, keyof DB, any> : PartialTypes | CurriedOpsStatement<any, any, any, OpsValType> | SelectQueryBuilder<DB, keyof DB, any>;
+export type WhereStatementForDreamClass<DreamClass extends typeof Dream> = WhereStatement<InstanceType<DreamClass>>;
+export type WhereStatementForDream<DreamInstance extends Dream> = WhereStatement<DreamInstance>;
 type AssociationNameToDotReferencedColumns<DB, TableName extends keyof DB, AssociationName> = `${AssociationName & string}.${TableColumnNames<DB, TableName>}`;
 export type ColumnNamesAccountingForJoinedAssociations<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, RootTableName extends keyof DB, RootTableAlias extends string> = JoinedAssociations['length'] extends 0 ? TableColumnNames<DB, RootTableName> : JoinedAssociationColumnNames<JoinedAssociations, DB, AssociationNameToDotReferencedColumns<DB, RootTableName & keyof DB, RootTableAlias>>;
 type JoinedAssociationColumnNames<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, AllColumnNames, Depth extends number = 0, CurrentJoinedAssociation = Readonly<JoinedAssociations[0]>, NextTableName = CurrentJoinedAssociation extends Readonly<JoinedAssociation> ? CurrentJoinedAssociation['table'] : never, NextAssociationName = CurrentJoinedAssociation extends Readonly<JoinedAssociation> ? CurrentJoinedAssociation['alias'] : never> = JoinedAssociations['length'] extends 0 ? AllColumnNames : Depth extends MAX_JOINED_TABLES_DEPTH ? AllColumnNames : JoinedAssociationColumnNames<ReadonlyTail<JoinedAssociations>, DB, AllColumnNames | AssociationNameToDotReferencedColumns<DB, NextTableName & keyof DB, NextAssociationName>, Inc<Depth>>;
 type Whereable<R> = {
     [K in keyof Selectable<R>]?: Selectable<R>[K] | Selectable<R>[K][];
 };
-export type WhereStatement<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Whereable<DB[TableName]> | DreamSelectable<DB, Schema, TableName>>>;
-export type OnStatementForAssociation<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB, RequiredOnClauseKeysForThisAssociation, OnStatement extends WhereStatement<DB, Schema, TableName> = WhereStatement<DB, Schema, TableName>> = RequiredOnClauseKeysForThisAssociation extends null ? WhereStatement<DB, Schema, TableName> : RequiredOnClauseKeysForThisAssociation extends string[] ? Required<Pick<OnStatement, RequiredOnClauseKeysForThisAssociation[number] & keyof OnStatement>> & Partial<Omit<OnStatement, RequiredOnClauseKeysForThisAssociation[number] & keyof OnStatement>> : never;
-export type OnStatementForSpecificColumns<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB, Columns extends string[], OnStatement extends WhereStatement<DB, Schema, TableName> = WhereStatement<DB, Schema, TableName>> = Pick<OnStatement, Columns[number] & keyof OnStatement>;
+export type WhereStatement<I extends Dream> = InternalWhereStatement<I, I['DB'], I['schema'], I['table']>;
+export type InternalWhereStatement<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Whereable<DB[TableName]> | DreamSelectable<DB, Schema, TableName> | AssociatedModelParam<I>>>;
+export type OnStatementForAssociation<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB, RequiredOnClauseKeysForThisAssociation, OnStatement extends InternalWhereStatement<I, DB, Schema, TableName> = InternalWhereStatement<I, DB, Schema, TableName>> = RequiredOnClauseKeysForThisAssociation extends null ? InternalWhereStatement<I, DB, Schema, TableName> : RequiredOnClauseKeysForThisAssociation extends string[] ? Required<Pick<OnStatement, RequiredOnClauseKeysForThisAssociation[number] & keyof OnStatement>> & Partial<Omit<OnStatement, RequiredOnClauseKeysForThisAssociation[number] & keyof OnStatement>> : never;
+export type OnStatementForSpecificColumns<I extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB, Columns extends string[], OnStatement extends InternalWhereStatement<I, DB, Schema, TableName> = InternalWhereStatement<I, DB, Schema, TableName>> = Pick<OnStatement, Columns[number] & keyof OnStatement>;
 type OnStatementForAssociationDefinition<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<MergeUnionOfRecordTypes<Partial<Selectable<DB[TableName]>> | Partial<{
     [ColumnName in keyof DB[TableName]]: NonKyselySupportedSupplementalWhereClauseValues<DB, Schema, TableName, ColumnName> | typeof DreamConst.passthrough | typeof DreamConst.required;
 }>>>;
 export type SelfOnStatement<BaseInstance extends Dream, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = Partial<Record<keyof DB[TableName], DreamColumnNames<BaseInstance>>>;
-export type WhereStatementForJoinedAssociation<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = RecursiveWhereStatementForJoinedAssociation<JoinedAssociations, DB, Schema, WhereStatement<DB, Schema, TableName>>;
-type RecursiveWhereStatementForJoinedAssociation<JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, Schema, OriginalOnStatement, Depth extends number = 0, CurrentJoinedAssociation = JoinedAssociations[0], TableName = CurrentJoinedAssociation extends JoinedAssociation ? CurrentJoinedAssociation['table'] : never, AssociationName = CurrentJoinedAssociation extends JoinedAssociation ? CurrentJoinedAssociation['alias'] : never, NonNamespacedAssociationOnStatement = TableName extends never ? never : AssociationName extends never ? never : WhereStatement<DB, Schema, TableName & AssociationTableNames<DB, Schema> & keyof DB>, NextOnStatement = NonNamespacedAssociationOnStatement extends never ? OriginalOnStatement : OriginalOnStatement & {
+export type WhereStatementForJoinedAssociation<I extends Dream, JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = RecursiveWhereStatementForJoinedAssociation<I, JoinedAssociations, DB, Schema, InternalWhereStatement<I, DB, Schema, TableName>>;
+type RecursiveWhereStatementForJoinedAssociation<I extends Dream, JoinedAssociations extends Readonly<JoinedAssociation[]>, DB, Schema, OriginalOnStatement, Depth extends number = 0, CurrentJoinedAssociation = JoinedAssociations[0], TableName = CurrentJoinedAssociation extends JoinedAssociation ? CurrentJoinedAssociation['table'] : never, AssociationName = CurrentJoinedAssociation extends JoinedAssociation ? CurrentJoinedAssociation['alias'] : never, NonNamespacedAssociationOnStatement = TableName extends never ? never : AssociationName extends never ? never : InternalWhereStatement<I, DB, Schema, TableName & AssociationTableNames<DB, Schema> & keyof DB>, NextOnStatement = NonNamespacedAssociationOnStatement extends never ? OriginalOnStatement : OriginalOnStatement & {
     [K in keyof NonNamespacedAssociationOnStatement as `${AssociationName & string}.${K & string}`]: NonNamespacedAssociationOnStatement[K & keyof NonNamespacedAssociationOnStatement] | null;
-}> = JoinedAssociations['length'] extends 0 ? OriginalOnStatement : Depth extends MAX_JOINED_TABLES_DEPTH ? OriginalOnStatement : TableName extends never ? OriginalOnStatement : RecursiveWhereStatementForJoinedAssociation<ReadonlyTail<JoinedAssociations>, DB, Schema, NextOnStatement, Inc<Depth>>;
+}> = JoinedAssociations['length'] extends 0 ? OriginalOnStatement : Depth extends MAX_JOINED_TABLES_DEPTH ? OriginalOnStatement : TableName extends never ? OriginalOnStatement : RecursiveWhereStatementForJoinedAssociation<I, ReadonlyTail<JoinedAssociations>, DB, Schema, NextOnStatement, Inc<Depth>>;
 export type OrderStatement<DB, Schema, TableName extends AssociationTableNames<DB, Schema> & keyof DB> = TableColumnNames<DB, TableName> | Partial<Record<TableColumnNames<DB, TableName>, OrderDir>>;
 export type LimitStatement = number;
 export type OffsetStatement = number;
@@ -59,8 +61,8 @@ export interface HasStatement<BaseInstance extends Dream, DB, Schema, ForeignTab
     foreignKeyTypeField: () => keyof DB[ForeignTableName] & string;
     globalAssociationNameOrNames: string[];
     and?: OnStatementForAssociationDefinition<DB, Schema, ForeignTableName>;
-    andNot?: WhereStatement<DB, Schema, ForeignTableName>;
-    andAny?: WhereStatement<DB, Schema, ForeignTableName>[];
+    andNot?: InternalWhereStatement<BaseInstance, DB, Schema, ForeignTableName>;
+    andAny?: InternalWhereStatement<BaseInstance, DB, Schema, ForeignTableName>[];
     polymorphic: boolean;
     primaryKey: (associationInstance?: Dream) => DreamColumnNames<BaseInstance>;
     primaryKeyOverride?: DreamColumnNames<BaseInstance> | null;
@@ -76,8 +78,8 @@ interface HasOptionsBase<BaseInstance extends Dream, AssociationGlobalName exten
     dependent?: DependentOptions;
     on?: TableColumnNames<BaseInstance['DB'], AssociationTableName & keyof BaseInstance['DB']>;
     and?: OnStatementForAssociationDefinition<BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>;
-    andNot?: WhereStatement<BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>;
-    andAny?: WhereStatement<BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>[];
+    andNot?: InternalWhereStatement<BaseInstance, BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>;
+    andAny?: InternalWhereStatement<BaseInstance, BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>[];
     polymorphic?: boolean;
     primaryKeyOverride?: DreamColumnNames<BaseInstance> | null;
     selfAnd?: SelfOnStatement<BaseInstance, BaseInstance['DB'], BaseInstance['schema'], AssociationTableName & AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> & keyof BaseInstance['DB']>;