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

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

@@ -8,6 +8,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'
@@ -93,9 +94,13 @@ type NonKyselySupportedSupplementalWhereClauseValues<
       ? TypesAllowedForBigintAgainstTheDb | PermanentOpsValTypes
       : ModelPropertyType extends DateTime | CalendarDate
         ? DateTime | CalendarDate | null
-        : ModelPropertyType extends number | string
-          ? ModelPropertyType | PermanentOpsValTypes
-          : never
+        : ModelPropertyType extends ClockTime
+          ? ClockTime | null
+          : ModelPropertyType extends ClockTimeTz
+            ? ClockTimeTz | null
+            : ModelPropertyType extends number | string
+              ? ModelPropertyType | PermanentOpsValTypes
+              : never
     : EnumTypeArray extends string[]
       ? EnumTypeArray[number] | PermanentOpsValTypes
       : never,
@@ -108,30 +113,44 @@ type NonKyselySupportedSupplementalWhereClauseValues<
           | (() => Range<DateTime | CalendarDate>)
           | (() => Range<null, DateTime | CalendarDate>)
           | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any>
-      : ModelPropertyType extends CalendarDate
+      : ModelPropertyType extends ClockTime
         ?
-            | Range<DateTime | CalendarDate>
-            | Range<null, DateTime | CalendarDate>
-            | (() => Range<DateTime | CalendarDate>)
-            | (() => Range<null, DateTime | CalendarDate>)
-            | OpsStatement<KyselyComparisonOperatorExpression, OpsValType>
-        : ColumnType extends 'bigint'
+            | Range<ClockTime>
+            | Range<null, ClockTime>
+            | (() => Range<ClockTime>)
+            | (() => Range<null, ClockTime>)
+            | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any>
+        : ModelPropertyType extends ClockTimeTz
           ?
-              | Range<TypesAllowedForBigintAgainstTheDb>
-              | Range<null, TypesAllowedForBigintAgainstTheDb>
+              | Range<ClockTimeTz>
+              | Range<null, ClockTimeTz>
+              | (() => Range<ClockTimeTz>)
+              | (() => Range<null, ClockTimeTz>)
               | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any>
-          : ModelPropertyType extends number
+          : ModelPropertyType extends CalendarDate
             ?
-                | Range<ModelPropertyType>
-                | Range<null, ModelPropertyType>
-                | OpsStatement<KyselyComparisonOperatorExpression, OpsValType, any>
-            : ModelPropertyType extends string
+                | Range<DateTime | CalendarDate>
+                | Range<null, DateTime | CalendarDate>
+                | (() => Range<DateTime | CalendarDate>)
+                | (() => Range<null, DateTime | CalendarDate>)
+                | OpsStatement<KyselyComparisonOperatorExpression, OpsValType>
+            : ColumnType extends 'bigint'
               ?
-                  | Range<string>
-                  | Range<null, string>
-                  | OpsStatement<KyselyComparisonOperatorExpression, string, any>
-                  | OpsStatement<TrigramOperator, OpsValType, ExtraSimilarityArgs>
-              : never
+                  | 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,
@@ -143,16 +162,12 @@ type NonKyselySupportedSupplementalWhereClauseValues<
   : 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']
+  InstanceType<DreamClass>
 >
 
-export type WhereStatementForDream<DreamInstance extends Dream> = WhereStatement<
-  DreamInstance['DB'],
-  DreamInstance['schema'],
-  DreamInstance['table']
->
+// TODO: deprecate, since this is now the same as WhereStatement? it is not used internally, only exported.
+export type WhereStatementForDream<DreamInstance extends Dream> = WhereStatement<DreamInstance>
+
 type AssociationNameToDotReferencedColumns<
   DB,
   TableName extends keyof DB,
@@ -200,31 +215,50 @@ type Whereable<R> = {
   [K in keyof Selectable<R>]?: Selectable<R>[K] | Selectable<R>[K][]
 }
 
-export type WhereStatement<
+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>>>
+> = 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 WhereStatement<DB, Schema, TableName> = WhereStatement<DB, Schema, TableName>,
+  OnStatement extends InternalWhereStatement<I, DB, Schema, TableName> = InternalWhereStatement<
+    I,
+    DB,
+    Schema,
+    TableName
+  >,
 > = RequiredOnClauseKeysForThisAssociation extends null
-  ? WhereStatement<DB, Schema, TableName>
+  ? 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 WhereStatement<DB, Schema, TableName> = WhereStatement<DB, Schema, TableName>,
+  OnStatement extends InternalWhereStatement<I, DB, Schema, TableName> = InternalWhereStatement<
+    I,
+    DB,
+    Schema,
+    TableName
+  >,
 > = Pick<OnStatement, Columns[number] & keyof OnStatement>
 
 // on statement on an association definition
@@ -252,17 +286,20 @@ export type SelfOnStatement<
 > = Partial<Record<keyof DB[TableName], DreamColumnNames<BaseInstance>>>
 
 export type WhereStatementForJoinedAssociation<
+  I extends Dream,
   JoinedAssociations extends Readonly<JoinedAssociation[]>,
   DB,
   Schema,
   TableName extends AssociationTableNames<DB, Schema> & keyof DB,
 > = RecursiveWhereStatementForJoinedAssociation<
+  I,
   JoinedAssociations,
   DB,
   Schema,
-  WhereStatement<DB, Schema, TableName>
+  InternalWhereStatement<I, DB, Schema, TableName>
 >
 type RecursiveWhereStatementForJoinedAssociation<
+  I extends Dream,
   JoinedAssociations extends Readonly<JoinedAssociation[]>,
   DB,
   Schema,
@@ -277,7 +314,7 @@ type RecursiveWhereStatementForJoinedAssociation<
     ? never
     : AssociationName extends never
       ? never
-      : WhereStatement<DB, Schema, TableName & AssociationTableNames<DB, Schema> & keyof DB>,
+      : InternalWhereStatement<I, DB, Schema, TableName & AssociationTableNames<DB, Schema> & keyof DB>,
   NextOnStatement = NonNamespacedAssociationOnStatement extends never
     ? OriginalOnStatement
     : OriginalOnStatement & {
@@ -293,6 +330,7 @@ type RecursiveWhereStatementForJoinedAssociation<
     : TableName extends never
       ? OriginalOnStatement
       : RecursiveWhereStatementForJoinedAssociation<
+          I,
           ReadonlyTail<JoinedAssociations>,
           DB,
           Schema,
@@ -326,8 +364,8 @@ export interface HasStatement<
   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>[]
   // ATTENTION
   //
   // Using `order` with HasOne is tempting as an elegant API
@@ -372,7 +410,8 @@ interface HasOptionsBase<
       keyof BaseInstance['DB']
   >
 
-  andNot?: WhereStatement<
+  andNot?: InternalWhereStatement<
+    BaseInstance,
     BaseInstance['DB'],
     BaseInstance['schema'],
     AssociationTableName &
@@ -380,7 +419,8 @@ interface HasOptionsBase<
       keyof BaseInstance['DB']
   >
 
-  andAny?: WhereStatement<
+  andAny?: InternalWhereStatement<
+    BaseInstance,
     BaseInstance['DB'],
     BaseInstance['schema'],
     AssociationTableName &

package/dist/types/src/types/calendardate.d.ts

@@ -1,4 +1,25 @@
-import type { DateTimeUnit, DurationLikeObject } from './datetime.js';
+import type { DateTimeObject, DateTimeUnit, DurationLikeObject } from './datetime.js';
 export type CalendarDateDurationLike = Pick<DurationLikeObject, 'year' | 'years' | 'quarter' | 'quarters' | 'month' | 'months' | 'week' | 'weeks' | 'day' | 'days'>;
 export type CalendarDateDurationUnit = 'years' | 'quarters' | 'months' | 'weeks' | 'days';
 export type CalendarDateUnit = Extract<DateTimeUnit, 'year' | 'quarter' | 'month' | 'week' | 'day'>;
+/**
+ * Date-only object for CalendarDate (year, month, day).
+ */
+export type CalendarDateObject = Pick<DateTimeObject, 'year' | 'month' | 'day'>;
+/**
+ * Complete duration object with all possible calendar date units.
+ */
+export interface CalendarDateDurationObject {
+    years?: number;
+    quarters?: number;
+    months?: number;
+    weeks?: number;
+    days?: number;
+}
+/**
+ * Helper type to extract only the units specified in the unit parameter for CalendarDate.diff().
+ * If unit is a single string, returns an object with just that key.
+ * If unit is an array, returns an object with keys for each unit in the array.
+ * If unit is undefined, returns the full CalendarDateDurationObject.
+ */
+export type CalendarDateDiffResult<U extends CalendarDateDurationUnit | readonly CalendarDateDurationUnit[] | undefined> = U extends undefined ? CalendarDateDurationObject : U extends CalendarDateDurationUnit ? Pick<Required<CalendarDateDurationObject>, U> : U extends readonly CalendarDateDurationUnit[] ? Pick<Required<CalendarDateDurationObject>, U[number]> : never;

package/dist/types/src/types/calendardate.ts

@@ -1,4 +1,4 @@
-import type { DateTimeUnit, DurationLikeObject } from './datetime.js'
+import type { DateTimeObject, DateTimeUnit, DurationLikeObject } from './datetime.js'
 
 export type CalendarDateDurationLike = Pick<
   DurationLikeObject,
@@ -6,3 +6,35 @@ export type CalendarDateDurationLike = Pick<
 >
 export type CalendarDateDurationUnit = 'years' | 'quarters' | 'months' | 'weeks' | 'days'
 export type CalendarDateUnit = Extract<DateTimeUnit, 'year' | 'quarter' | 'month' | 'week' | 'day'>
+
+/**
+ * Date-only object for CalendarDate (year, month, day).
+ */
+export type CalendarDateObject = Pick<DateTimeObject, 'year' | 'month' | 'day'>
+
+/**
+ * Complete duration object with all possible calendar date units.
+ */
+export interface CalendarDateDurationObject {
+  years?: number
+  quarters?: number
+  months?: number
+  weeks?: number
+  days?: number
+}
+
+/**
+ * Helper type to extract only the units specified in the unit parameter for CalendarDate.diff().
+ * If unit is a single string, returns an object with just that key.
+ * If unit is an array, returns an object with keys for each unit in the array.
+ * If unit is undefined, returns the full CalendarDateDurationObject.
+ */
+export type CalendarDateDiffResult<
+  U extends CalendarDateDurationUnit | readonly CalendarDateDurationUnit[] | undefined,
+> = U extends undefined
+  ? CalendarDateDurationObject
+  : U extends CalendarDateDurationUnit
+    ? Pick<Required<CalendarDateDurationObject>, U>
+    : U extends readonly CalendarDateDurationUnit[]
+      ? Pick<Required<CalendarDateDurationObject>, U[number]>
+      : never

package/dist/types/src/types/clocktime.d.ts

@@ -0,0 +1,22 @@
+import { DateTimeObject, DateTimeUnit, DurationLikeObject, DurationObject, DurationUnit } from './datetime.js';
+/**
+ * Time-only object for ClockTime (hour, minute, second, millisecond, microsecond).
+ */
+export type ClockTimeObject = Pick<DateTimeObject, 'hour' | 'minute' | 'second' | 'millisecond' | 'microsecond'>;
+/**
+ * Time-only duration units for ClockTime.
+ */
+export type ClockTimeDurationUnit = Extract<DurationUnit, 'hours' | 'minutes' | 'seconds' | 'milliseconds' | 'microseconds'>;
+export type ClockTimeUnit = Extract<DateTimeUnit, 'hour' | 'minute' | 'second' | 'millisecond' | 'microsecond'>;
+/**
+ * Complete duration object with all possible clock time units.
+ */
+export type ClockTimeDurationObject = Pick<DurationObject, 'hours' | 'minutes' | 'seconds' | 'milliseconds' | 'microseconds'>;
+/**
+ * Helper type to extract only the units specified in the unit parameter for ClockTime.diff().
+ * If unit is a single string, returns an object with just that key.
+ * If unit is an array, returns an object with keys for each unit in the array.
+ * If unit is undefined, returns the full ClockTimeDurationObject.
+ */
+export type ClockTimeDiffResult<U extends ClockTimeDurationUnit | readonly ClockTimeDurationUnit[] | undefined> = U extends undefined ? ClockTimeDurationObject : U extends ClockTimeDurationUnit ? Pick<Required<ClockTimeDurationObject>, U> : U extends readonly ClockTimeDurationUnit[] ? Pick<Required<ClockTimeDurationObject>, U[number]> : never;
+export type ClockTimeDurationLikeObject = Pick<DurationLikeObject, 'hour' | 'hours' | 'minute' | 'minutes' | 'second' | 'seconds' | 'millisecond' | 'milliseconds' | 'microsecond' | 'microseconds'>;

package/dist/types/src/types/clocktime.ts

@@ -0,0 +1,59 @@
+import { DateTimeObject, DateTimeUnit, DurationLikeObject, DurationObject, DurationUnit } from './datetime.js'
+
+/**
+ * Time-only object for ClockTime (hour, minute, second, millisecond, microsecond).
+ */
+export type ClockTimeObject = Pick<
+  DateTimeObject,
+  'hour' | 'minute' | 'second' | 'millisecond' | 'microsecond'
+>
+
+/**
+ * Time-only duration units for ClockTime.
+ */
+export type ClockTimeDurationUnit = Extract<
+  DurationUnit,
+  'hours' | 'minutes' | 'seconds' | 'milliseconds' | 'microseconds'
+>
+export type ClockTimeUnit = Extract<
+  DateTimeUnit,
+  'hour' | 'minute' | 'second' | 'millisecond' | 'microsecond'
+>
+
+/**
+ * Complete duration object with all possible clock time units.
+ */
+export type ClockTimeDurationObject = Pick<
+  DurationObject,
+  'hours' | 'minutes' | 'seconds' | 'milliseconds' | 'microseconds'
+>
+
+/**
+ * Helper type to extract only the units specified in the unit parameter for ClockTime.diff().
+ * If unit is a single string, returns an object with just that key.
+ * If unit is an array, returns an object with keys for each unit in the array.
+ * If unit is undefined, returns the full ClockTimeDurationObject.
+ */
+export type ClockTimeDiffResult<
+  U extends ClockTimeDurationUnit | readonly ClockTimeDurationUnit[] | undefined,
+> = U extends undefined
+  ? ClockTimeDurationObject
+  : U extends ClockTimeDurationUnit
+    ? Pick<Required<ClockTimeDurationObject>, U>
+    : U extends readonly ClockTimeDurationUnit[]
+      ? Pick<Required<ClockTimeDurationObject>, U[number]>
+      : never
+
+export type ClockTimeDurationLikeObject = Pick<
+  DurationLikeObject,
+  | 'hour'
+  | 'hours'
+  | 'minute'
+  | 'minutes'
+  | 'second'
+  | 'seconds'
+  | 'millisecond'
+  | 'milliseconds'
+  | 'microsecond'
+  | 'microseconds'
+>

package/dist/types/src/types/datetime.d.ts

@@ -1,6 +1,5 @@
 export interface DateTimeOptions {
     zone?: string | Zone;
-    setZone?: boolean;
     locale?: string;
 }
 export interface DateTimeJSOptions {
@@ -15,18 +14,14 @@ export interface LocaleOptions {
     numberingSystem?: string;
 }
 export interface DateTimeObject {
-    year?: number;
-    month?: number;
-    day?: number;
-    ordinal?: number;
-    weekYear?: number;
-    weekNumber?: number;
-    weekday?: number;
-    hour?: number;
-    minute?: number;
-    second?: number;
-    millisecond?: number;
-    microsecond?: number;
+    year: number;
+    month: number;
+    day: number;
+    hour: number;
+    minute: number;
+    second: number;
+    millisecond: number;
+    microsecond: number;
 }
 export interface ToISOTimeOptions {
     suppressMilliseconds?: boolean;
@@ -96,17 +91,15 @@ export interface Zone {
 }
 /**
  * Duration units that can be used in diff operations.
- * Note: quarters and months are excluded because they don't have fixed relationships
- * with other time units (months vary from 28-31 days).
  */
-export type DurationUnit = 'years' | 'weeks' | 'days' | 'hours' | 'minutes' | 'seconds' | 'milliseconds' | 'microseconds';
+export type DurationUnit = 'years' | 'quarters' | 'months' | 'weeks' | 'days' | 'hours' | 'minutes' | 'seconds' | 'milliseconds' | 'microseconds';
 /**
  * Complete duration object with all possible units returned by diff.
- * Note: quarters and months are excluded because they don't have fixed relationships
- * with other time units (months vary from 28-31 days).
  */
 export interface DurationObject {
     years?: number;
+    quarters?: number;
+    months?: number;
     weeks?: number;
     days?: number;
     hours?: number;

package/dist/types/src/types/datetime.ts

@@ -2,7 +2,6 @@
 
 export interface DateTimeOptions {
   zone?: string | Zone
-  setZone?: boolean
   locale?: string
 }
 
@@ -20,18 +19,14 @@ export interface LocaleOptions {
 }
 
 export interface DateTimeObject {
-  year?: number
-  month?: number
-  day?: number
-  ordinal?: number
-  weekYear?: number
-  weekNumber?: number
-  weekday?: number
-  hour?: number
-  minute?: number
-  second?: number
-  millisecond?: number
-  microsecond?: number
+  year: number
+  month: number
+  day: number
+  hour: number
+  minute: number
+  second: number
+  millisecond: number
+  microsecond: number
 }
 
 export interface ToISOTimeOptions {
@@ -60,10 +55,10 @@ export type DateTimeUnit =
   | 'minute'
   | 'second'
   | 'millisecond'
+
 /**
  * Weekday name type (lowercase).
  */
-
 export type WeekdayName = 'monday' | 'tuesday' | 'wednesday' | 'thursday' | 'friday' | 'saturday' | 'sunday'
 
 /**
@@ -117,14 +112,14 @@ export interface Zone {
    */
   readonly isValid: boolean
 }
+
 /**
  * Duration units that can be used in diff operations.
- * Note: quarters and months are excluded because they don't have fixed relationships
- * with other time units (months vary from 28-31 days).
  */
-
 export type DurationUnit =
   | 'years'
+  | 'quarters'
+  | 'months'
   | 'weeks'
   | 'days'
   | 'hours'
@@ -132,14 +127,14 @@ export type DurationUnit =
   | 'seconds'
   | 'milliseconds'
   | 'microseconds'
+
 /**
  * Complete duration object with all possible units returned by diff.
- * Note: quarters and months are excluded because they don't have fixed relationships
- * with other time units (months vary from 28-31 days).
  */
-
 export interface DurationObject {
   years?: number
+  quarters?: number
+  months?: number
   weeks?: number
   days?: number
   hours?: number
@@ -148,13 +143,13 @@ export interface DurationObject {
   milliseconds?: number
   microseconds?: number
 }
+
 /**
  * Helper type to extract only the units specified in the unit parameter.
  * If unit is a single string, returns an object with just that key.
  * If unit is an array, returns an object with keys for each unit in the array.
  * If unit is undefined, returns the full DurationObject.
  */
-
 export type DiffResult<U extends DurationUnit | readonly DurationUnit[] | undefined> = U extends undefined
   ? DurationObject
   : U extends DurationUnit

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

@@ -5,7 +5,7 @@ import { TRIGRAM_OPERATORS } from '../dream/constants.js';
 import OpsStatement from '../ops/ops-statement.js';
 import CalendarDate from '../utils/datetime/CalendarDate.js';
 import { DateTime } from '../utils/datetime/DateTime.js';
-import { AssociatedModelParam, AssociationStatement, OnStatementForAssociation, WhereStatement } from './associations/shared.js';
+import { AssociatedModelParam, AssociationStatement, OnStatementForAssociation, InternalWhereStatement } from './associations/shared.js';
 import { AssociationTableNames } from './db.js';
 import { FindEachOpts } from './query.js';
 import { DreamModelSerializerType, SimpleObjectSerializerType } from './serializer.js';
@@ -80,15 +80,15 @@ type AssociationMetadataForTable<Schema, TableName extends keyof Schema> = Schem
 export type AssociationNamesForTable<Schema, TableName extends keyof Schema> = keyof AssociationMetadataForTable<Schema, TableName> | AliasedSchemaAssociation<Schema, TableName>;
 type MetadataForAssociation<Schema, TableName extends keyof Schema, AssociationName, AssociationMetadata = AssociationMetadataForTable<Schema, TableName>> = AssociationMetadata[AssociationName & keyof AssociationMetadata];
 export type AssociationTableName<Schema, TableName extends keyof Schema, AssociationName, AssociationData = MetadataForAssociation<Schema, TableName, AssociationName>> = (AssociationData['tables' & keyof AssociationData] & any[])[0] & keyof Schema;
-export type DreamClassAssociationAndStatement<DreamClass extends typeof Dream, AssociationName, DreamInstance extends InstanceType<DreamClass> = InstanceType<DreamClass>, DB extends DreamInstance['DB'] = DreamInstance['DB'], Schema extends DreamInstance['schema'] = DreamInstance['schema'], TableName extends DreamInstance['table'] = DreamInstance['table'], AssocTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = AssociationTableName<Schema, TableName, AssociationName>, RequiredOnClauseKeysForThisAssociation extends RequiredOnClauseKeys<Schema, TableName, AssociationName> = RequiredOnClauseKeys<Schema, TableName, AssociationName>, Statements extends JoinAndStatements<DB, Schema, AssocTableName, RequiredOnClauseKeysForThisAssociation> = JoinAndStatements<DB, Schema, AssocTableName, RequiredOnClauseKeysForThisAssociation>> = Statements;
-export type JoinAndStatements<DB, Schema, TableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, RequiredOnClauseKeysForThisAssociation> = RequiredOnClauseKeysForThisAssociation extends null ? {
-    and?: WhereStatement<DB, Schema, TableName>;
-    andNot?: WhereStatement<DB, Schema, TableName>;
-    andAny?: WhereStatement<DB, Schema, TableName>[];
+export type DreamClassAssociationAndStatement<DreamClass extends typeof Dream, AssociationName, DreamInstance extends InstanceType<DreamClass> = InstanceType<DreamClass>, DB extends DreamInstance['DB'] = DreamInstance['DB'], Schema extends DreamInstance['schema'] = DreamInstance['schema'], TableName extends DreamInstance['table'] = DreamInstance['table'], AssocTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = AssociationTableName<Schema, TableName, AssociationName>, RequiredOnClauseKeysForThisAssociation extends RequiredOnClauseKeys<Schema, TableName, AssociationName> = RequiredOnClauseKeys<Schema, TableName, AssociationName>, Statements extends JoinAndStatements<DreamInstance, DB, Schema, AssocTableName, RequiredOnClauseKeysForThisAssociation> = JoinAndStatements<DreamInstance, DB, Schema, AssocTableName, RequiredOnClauseKeysForThisAssociation>> = Statements;
+export type JoinAndStatements<I extends Dream, DB, Schema, TableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, RequiredOnClauseKeysForThisAssociation> = RequiredOnClauseKeysForThisAssociation extends null ? {
+    and?: InternalWhereStatement<I, DB, Schema, TableName>;
+    andNot?: InternalWhereStatement<I, DB, Schema, TableName>;
+    andAny?: InternalWhereStatement<I, DB, Schema, TableName>[];
 } : RequiredOnClauseKeysForThisAssociation extends string[] ? {
-    and: OnStatementForAssociation<DB, Schema, TableName, RequiredOnClauseKeysForThisAssociation>;
-    andNot?: WhereStatement<DB, Schema, TableName>;
-    andAny?: WhereStatement<DB, Schema, TableName>[];
+    and: OnStatementForAssociation<I, DB, Schema, TableName, RequiredOnClauseKeysForThisAssociation>;
+    andNot?: InternalWhereStatement<I, DB, Schema, TableName>;
+    andAny?: InternalWhereStatement<I, DB, Schema, TableName>[];
 } : never;
 export type UpdateablePropertiesForClass<DreamClass extends typeof Dream, TableName extends AssociationTableNames<InstanceType<DreamClass>['DB'], InstanceType<DreamClass>['schema']> & InstanceType<DreamClass>['table'] = InstanceType<DreamClass>['table'], VirtualColumns = DreamVirtualColumns<InstanceType<DreamClass>>> = Partial<Updateable<InstanceType<DreamClass>['DB'][TableName]> & (VirtualColumns extends readonly any[] ? Record<VirtualColumns[number], any> : object) & (AssociatedModelParam<InstanceType<DreamClass>> extends never ? object : AssociatedModelParam<InstanceType<DreamClass>>)>;
 export type UpdateableAssociationProperties<DreamInstance extends Dream, AssociationClass extends Dream, Schema = DreamInstance['schema'], AssociationTableName extends AssociationTableNames<DreamInstance['DB'], DreamInstance['schema']> & keyof DreamInstance['DB'] = AssociationClass['table'], VirtualColumns = VirtualColumnsForTable<Schema, AssociationTableName>> = Partial<Updateable<DreamInstance['DB'][AssociationTableName]> & (VirtualColumns extends readonly any[] ? Record<VirtualColumns[number], any> : object) & (AssociatedModelParam<AssociationClass> extends never ? object : AssociatedModelParam<AssociationClass>)>;
@@ -112,6 +112,20 @@ export type ViewModel = {
     serializers: Record<string, DreamModelSerializerType | SimpleObjectSerializerType | string>;
 };
 export type ViewModelClass = abstract new (...args: any) => ViewModel;
+/**
+ * given a Dream model and an association name, this
+ * type will return the actual type set for that association,
+ * excluding null or arrays.
+ *
+ * ```ts
+ * DreamAssociationNameToAssociatedModel<User, 'compositions'>
+ * // Composition
+ *
+ * DreamAssociationNameToAssociatedModel<User, 'featuredPost'>
+ * // Post
+ * ```
+ */
+export type DreamAssociationNameToAssociatedModel<I extends Dream, AssociationName extends keyof I> = I[AssociationName] extends (infer U extends Dream)[] ? U : I[AssociationName] extends Dream ? I[AssociationName] : I[AssociationName] extends Dream | null ? Required<I[AssociationName]> & Dream : I;
 export type DreamModelAssociationNames<Schema, TableName, SchemaAssociations = Schema[TableName & keyof Schema]['associations' & keyof Schema[TableName & keyof Schema]]> = (keyof SchemaAssociations & string) | (keyof SchemaAssociations & string)[];
 export type PreloadArgumentTypeAssociatedTableNames<Schema, PreviousTableNames, ArgumentType, PreviousSchemaAssociations = PreviousTableNames extends undefined ? undefined : Schema[PreviousTableNames & keyof Schema]> = ArgumentType extends string[] ? undefined : (PreviousSchemaAssociations[ArgumentType & (keyof PreviousSchemaAssociations & string)] & string[])[number];
 export type AssociationNameToDreamClassMap = Record<string, typeof Dream>;
@@ -124,11 +138,11 @@ type IdToDreamMap = Map<string | number, Dream>;
 export type AliasToDreamIdMap = Record<string, IdToDreamMap>;
 export type RelaxedPreloadStatement<Depth extends number = 0> = RelaxedJoinStatement<Depth>;
 export type RelaxedJoinStatement<Depth extends number = 0> = Depth extends 7 ? object : Record<string, RelaxedJoinStatement<Inc<Depth>>>;
-export type RelaxedPreloadOnStatement<DB, Schema, Depth extends number = 0> = Depth extends 7 ? object : {
-    [key: string]: RelaxedPreloadOnStatement<DB, Schema, Inc<Depth>> | JoinAndStatements<any, any, any, any> | FakeOnClauseValue | object;
+export type RelaxedPreloadOnStatement<I extends Dream, DB, Schema, Depth extends number = 0> = Depth extends 7 ? object : {
+    [key: string]: RelaxedPreloadOnStatement<I, DB, Schema, Inc<Depth>> | JoinAndStatements<I, any, any, any, any> | FakeOnClauseValue | object;
 };
-export type RelaxedJoinAndStatement<DB, Schema, Depth extends number = 0> = Depth extends 7 ? object : {
-    [key: string]: RelaxedJoinAndStatement<DB, Schema, Inc<Depth>> | JoinAndStatements<any, any, any, any> | FakeOnClauseValue | object;
+export type RelaxedJoinAndStatement<I extends Dream, DB, Schema, Depth extends number = 0> = Depth extends 7 ? object : {
+    [key: string]: RelaxedJoinAndStatement<I, DB, Schema, Inc<Depth>> | JoinAndStatements<I, any, any, any, any> | FakeOnClauseValue | object;
 };
 type FakeOnClauseValue = string | string[] | number | number[] | null;
 export type TableOrAssociationName<Schema> = (keyof Schema & string) | (keyof Schema[keyof Schema] & string);