@rvoh/dream 2.18.1 → 2.19.0

package/dist/types/src/types/types/variadic.ts

@@ -8,18 +8,23 @@ import {
   AssociationTableNamesForAssociation,
   DreamAssociationNameToAssociatedModel,
   IsNonOptionalBelongsToAssociation,
+  IsPolymorphicBelongsToAssociation,
   JoinAndStatements,
   MAX_VARIADIC_DEPTH,
+  PolymorphicBelongsToAssociationNames,
   RequiredOnClauseKeys,
 } from './dream.js'
 import { Inc, ReadonlyTail } from './utils.js'
 
 type VALID = 'valid'
 type INVALID = 'invalid'
+type INVALID_NON_TERMINAL_ARRAY = 'invalid_non_terminal_array'
+type INVALID_NAMESPACE_REUSE = 'invalid_namespace_reuse'
+type INVALID_POLYMORPHIC_BELONGS_TO_JOIN = 'invalid_polymorphic_belongs_to_join'
+type INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO = 'invalid_constraint_on_required_belongs_to'
 type IS_ASSOCIATION_ALIAS = 'association_alias'
 type IS_ASSOCIATION_NAME = 'association_name'
 type IS_NOT_ASSOCIATION_NAME = 'not_association_name'
-type IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME = 'cross_polymorphic_association_name'
 type RecursionTypes = 'load' | 'leftJoinLoad' | 'join'
 
 /**
@@ -56,7 +61,10 @@ export type VariadicLoadArgs<
   ConcreteTableName,
   ConcreteArgs,
   'load',
-  ConcreteTableName,
+  // load/preload issue a separate query per association, so reusing an
+  // association name or alias never causes a namespace collision, and no
+  // namespaces are tracked.
+  never,
   0,
   null,
   never,
@@ -76,9 +84,15 @@ export type VariadicLeftJoinLoadArgs<
   ConcreteArgs extends readonly unknown[],
   //
   SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]],
+  // joining a polymorphic BelongsTo raises CannotJoinPolymorphicBelongsToError
+  // at runtime, so exclude those association names (and their aliased forms)
+  PolymorphicBelongsToNames = PolymorphicBelongsToAssociationNames<Schema, ConcreteTableName>,
   AllowedNextArgValues =
-    | (keyof SchemaAssociations & string)
-    | AliasedSchemaAssociation<Schema, ConcreteTableName>,
+    | Exclude<keyof SchemaAssociations & string, PolymorphicBelongsToNames>
+    | Exclude<
+        AliasedSchemaAssociation<Schema, ConcreteTableName>,
+        `${PolymorphicBelongsToNames & string} as ${string}`
+      >,
 > = VariadicCheckThenRecurse<
   I,
   DB,
@@ -111,9 +125,15 @@ export type VariadicJoinsArgs<
   ConcreteArgs extends readonly unknown[],
   //
   SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]],
+  // joining a polymorphic BelongsTo raises CannotJoinPolymorphicBelongsToError
+  // at runtime, so exclude those association names (and their aliased forms)
+  PolymorphicBelongsToNames = PolymorphicBelongsToAssociationNames<Schema, ConcreteTableName>,
   AllowedNextArgValues =
-    | (keyof SchemaAssociations & string)
-    | AliasedSchemaAssociation<Schema, ConcreteTableName>,
+    | Exclude<keyof SchemaAssociations & string, PolymorphicBelongsToNames>
+    | Exclude<
+        AliasedSchemaAssociation<Schema, ConcreteTableName>,
+        `${PolymorphicBelongsToNames & string} as ${string}`
+      >,
 > = VariadicCheckThenRecurse<
   I,
   DB,
@@ -126,7 +146,6 @@ export type VariadicJoinsArgs<
   // Without camelizing, the table name of the starting model could conflict with the
   // snake-cased version of an association name. By camelizing the table that goes
   // into the UsedNamespaces, we prevent this from happeing at the type level.
-  // Camelized<ConcreteTableName>,
   Camelized<ConcreteTableName>,
   0,
   null,
@@ -154,15 +173,48 @@ type VariadicCheckThenRecurse<
   LastDream extends Dream = I,
   //
   SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]],
-  AllowedNamesForArrayArg = PreviousConcreteTableName extends keyof Schema
+  // The association names reachable at this position: when traversing through a
+  // polymorphic association, the union of association names across all of the
+  // polymorphic target tables (plus their aliased forms); otherwise, the
+  // association names on the current table.
+  AllowedNamesForNthArg = PreviousConcreteTableName extends keyof Schema
     ? AssociationNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName>
     : keyof SchemaAssociations & string,
-  NthArgument extends VALID | INVALID = ConcreteArgs['length'] extends 0
+  // The current arg with any ` as alias` suffix stripped, so aliased
+  // associations resolve to the same metadata as their unaliased counterparts.
+  UnaliasedNthArg = ConcreteArgs[0] extends `${infer AssociationName extends string} as ${string}`
+    ? AssociationName
+    : ConcreteArgs[0],
+  // The namespace the current arg would claim: its alias when aliased,
+  // otherwise the association name itself.
+  NthArgumentNamespace = ConcreteArgs[0] extends `${string} as ${infer Alias extends string}`
+    ? Alias
+    : ConcreteArgs[0],
+  NthArgument extends
+    | VALID
+    | INVALID
+    | INVALID_NON_TERMINAL_ARRAY
+    | INVALID_NAMESPACE_REUSE
+    | INVALID_POLYMORPHIC_BELONGS_TO_JOIN
+    | INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO = ConcreteArgs['length'] extends 0
     ? VALID
-    : ConcreteArgs[0] extends keyof SchemaAssociations & string
-      ? VALID
-      : ConcreteArgs[0] extends AliasedSchemaAssociation<Schema, ConcreteTableName>
+    : ConcreteArgs[0] extends
+          | (keyof SchemaAssociations & string)
+          | AliasedSchemaAssociation<Schema, ConcreteTableName>
+          | AllowedNamesForNthArg
+      ? RecursionType extends 'load'
         ? VALID
+        : NthArgumentNamespace extends UsedNamespaces
+          ? INVALID_NAMESPACE_REUSE
+          : IsPolymorphicBelongsToAssociation<Schema, ConcreteTableName, UnaliasedNthArg> extends true
+            ? INVALID_POLYMORPHIC_BELONGS_TO_JOIN
+            : VALID
+      : ConcreteArgs[0] extends readonly unknown[]
+        ? // the runtime only supports an array of association names as the final
+          // argument (everything after a mid-chain array is silently dropped), so
+          // arrays are only valid in the terminal position, which is validated
+          // against AllowedNextArgValues rather than by this check
+          INVALID_NON_TERMINAL_ARRAY
         : ConcreteArgs[0] extends JoinAndStatements<
               LastDream,
               DB,
@@ -170,37 +222,41 @@ type VariadicCheckThenRecurse<
               ConcreteTableName,
               RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>
             >
-          ? VALID
-          : ConcreteArgs[0] extends readonly AllowedNamesForArrayArg[]
+          ? RecursionType extends 'join'
             ? VALID
-            : ConcreteArgs[0] extends JoinAndStatements<
-                  LastDream,
-                  DB,
+            : IsNonOptionalBelongsToAssociation<
                   Schema,
-                  ConcreteTableName,
-                  RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>
-                >
-              ? VALID
-              : ConcreteArgs[0] extends AllowedNamesForArrayArg
-                ? VALID
-                : INVALID,
-> = NthArgument extends INVALID
-  ? `invalid where clause in argument ${Inc<Depth>}`
-  : ConcreteArgs['length'] extends 0
-    ? AssociationNamesOrOnClause
-    : VariadicRecurse<
-        I,
-        DB,
-        Schema,
-        ConcreteTableName,
-        ConcreteArgs,
-        RecursionType,
-        UsedNamespaces,
-        Depth,
-        PreviousConcreteTableName,
-        ConcreteAssociationName,
-        LastDream
-      >
+                  PreviousConcreteTableName,
+                  ConcreteAssociationName
+                > extends true
+              ? INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO
+              : VALID
+          : INVALID,
+> = NthArgument extends INVALID_NON_TERMINAL_ARRAY
+  ? `an array of association names is only allowed as the final argument (argument ${Inc<Depth>})`
+  : NthArgument extends INVALID_NAMESPACE_REUSE
+    ? `association name or alias already used earlier in this chain (argument ${Inc<Depth>})`
+    : NthArgument extends INVALID_POLYMORPHIC_BELONGS_TO_JOIN
+      ? `cannot join a polymorphic BelongsTo association (argument ${Inc<Depth>})`
+      : NthArgument extends INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO
+        ? `${CannotConstrainRequiredBelongsTo} (argument ${Inc<Depth>})`
+        : NthArgument extends INVALID
+          ? `invalid where clause in argument ${Inc<Depth>}`
+          : ConcreteArgs['length'] extends 0
+            ? AssociationNamesOrOnClause
+            : VariadicRecurse<
+                I,
+                DB,
+                Schema,
+                ConcreteTableName,
+                ConcreteArgs,
+                RecursionType,
+                UsedNamespaces,
+                Depth,
+                PreviousConcreteTableName,
+                ConcreteAssociationName,
+                LastDream
+              >
 
 export type AliasedSchemaAssociation<
   Schema,
@@ -223,6 +279,11 @@ type VariadicRecurse<
   LastDream extends Dream,
   //
   SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]],
+  // The current arg with any ` as alias` suffix stripped, so aliased
+  // associations resolve to the same metadata as their unaliased counterparts.
+  UnaliasedNthArg = ConcreteArgs[0] extends `${infer AssociationName extends string} as ${string}`
+    ? AssociationName
+    : ConcreteArgs[0],
   // Union of all table names reachable via the previous polymorphic association.
   // When PreviousConcreteTableName is not a schema key (e.g. at depth 0), fall back to ConcreteTableName.
   PolymorphicTableNamesUnion = PreviousConcreteTableName extends keyof Schema
@@ -230,8 +291,8 @@ type VariadicRecurse<
     : ConcreteTableName,
   // The specific table from the polymorphic union that owns the current arg as an association.
   // Used when the arg is not directly on ConcreteTableName (i.e. cross-polymorphic traversal).
-  CrossPolymorphicTableForCurrentArg = ConcreteArgs[0] extends string
-    ? TableContainingAssociationInUnion<Schema, PolymorphicTableNamesUnion, ConcreteArgs[0]>
+  CrossPolymorphicTableForCurrentArg = UnaliasedNthArg extends string
+    ? TableContainingAssociationInUnion<Schema, PolymorphicTableNamesUnion, UnaliasedNthArg>
     : never,
   // The effective table for looking up the current arg's association:
   // - ConcreteTableName when the arg is directly on it (normal case)
@@ -241,7 +302,7 @@ type VariadicRecurse<
   // to become `never` if we used a plain conditional.
   EffectiveConcreteTableName extends keyof Schema &
     AssociationTableNames<DB, Schema> &
-    keyof DB = ConcreteArgs[0] extends keyof SchemaAssociations & string
+    keyof DB = UnaliasedNthArg extends keyof SchemaAssociations & string
     ? ConcreteTableName
     : [CrossPolymorphicTableForCurrentArg] extends [never]
       ? ConcreteTableName
@@ -251,83 +312,45 @@ type VariadicRecurse<
   // Schema associations on the effective table (may differ from SchemaAssociations when cross-polymorphic).
   EffectiveSchemaAssociations = Schema[EffectiveConcreteTableName]['associations' &
     keyof Schema[EffectiveConcreteTableName]],
-  ConcreteNthArg extends
-    | (keyof SchemaAssociations & string)
-    | (keyof EffectiveSchemaAssociations & string)
-    | AliasedSchemaAssociation<Schema, ConcreteTableName>
-    | null = ConcreteArgs[0] extends undefined
-    ? null
-    : ConcreteArgs[0] extends null
-      ? null
-      : ConcreteArgs[0] extends keyof SchemaAssociations & string
-        ? ConcreteArgs[0] & keyof SchemaAssociations & string
-        : ConcreteArgs[0] extends AliasedSchemaAssociation<Schema, ConcreteTableName>
-          ? ConcreteArgs[0] & AliasedSchemaAssociation<Schema, ConcreteTableName>
-          : ConcreteArgs[0] extends keyof EffectiveSchemaAssociations & string
-            ? ConcreteArgs[0] & keyof EffectiveSchemaAssociations & string
-            : null,
-  NextUsedNamespaces = ConcreteArgs[0] extends undefined
-    ? never
-    : ConcreteArgs[0] extends null
-      ? never
-      : ConcreteNthArg extends null
-        ? UsedNamespaces
-        : UsedNamespaces | ConcreteNthArg,
-  //
-  CurrentArgumentType extends
-    | IS_ASSOCIATION_NAME
-    | IS_ASSOCIATION_ALIAS
-    | IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME
-    | IS_NOT_ASSOCIATION_NAME = ConcreteNthArg extends null
-    ? IS_NOT_ASSOCIATION_NAME
-    : ConcreteNthArg extends keyof SchemaAssociations & string
-      ? IS_ASSOCIATION_NAME
-      : ConcreteNthArg extends AliasedSchemaAssociation<Schema, ConcreteTableName>
-        ? IS_ASSOCIATION_ALIAS
-        : ConcreteNthArg extends keyof EffectiveSchemaAssociations & string
-          ? IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME
-          : IS_NOT_ASSOCIATION_NAME,
+  // True when the current arg names an association (aliased or not) on the
+  // effective table. EffectiveConcreteTableName falls back to ConcreteTableName,
+  // so this covers direct names, aliased names, cross-polymorphic names, and
+  // aliased cross-polymorphic names with a single check.
+  IsAssociationNameOrAlias extends boolean = UnaliasedNthArg extends keyof EffectiveSchemaAssociations &
+    string
+    ? true
+    : false,
   //
-  NextPreviousConcreteTableName = CurrentArgumentType extends IS_ASSOCIATION_NAME
-    ? ConcreteTableName
-    : CurrentArgumentType extends IS_ASSOCIATION_ALIAS
-      ? ConcreteTableName
-      : CurrentArgumentType extends IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME
-        ? EffectiveConcreteTableName
-        : PreviousConcreteTableName,
+  NextUnaliasedAssociationName = IsAssociationNameOrAlias extends true
+    ? UnaliasedNthArg & keyof EffectiveSchemaAssociations & string
+    : never,
   //
-  NextUnaliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME
-    ? ConcreteNthArg
-    : CurrentArgumentType extends IS_ASSOCIATION_ALIAS
-      ? ConcreteNthArg extends `${infer AssocName extends string} as ${string}`
-        ? AssocName & keyof SchemaAssociations & string
-        : never
-      : CurrentArgumentType extends IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME
-        ? ConcreteNthArg
-        : never,
+  // The namespace claimed by the current arg: its alias when aliased, otherwise
+  // the association name itself. Non-association args leave the namespace of the
+  // previously consumed association in place.
+  NextAliasedAssociationName = IsAssociationNameOrAlias extends true
+    ? ConcreteArgs[0] extends `${string} as ${infer AssociationAlias extends string}`
+      ? AssociationAlias
+      : NextUnaliasedAssociationName
+    : ConcreteAssociationName,
   //
-  NextAliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME
-    ? ConcreteNthArg
-    : CurrentArgumentType extends IS_ASSOCIATION_ALIAS
-      ? ConcreteNthArg extends `${string} as ${infer AssocAlias extends string}`
-        ? AssocAlias & string
-        : ConcreteAssociationName
-      : CurrentArgumentType extends IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME
-        ? ConcreteNthArg
-        : ConcreteAssociationName,
+  NextPreviousConcreteTableName = IsAssociationNameOrAlias extends true
+    ? EffectiveConcreteTableName
+    : PreviousConcreteTableName,
   //
-  IsAssociationNameOrAlias extends boolean = CurrentArgumentType extends
-    | IS_ASSOCIATION_NAME
-    | IS_ASSOCIATION_ALIAS
-    | IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME
-    ? true
-    : false,
+  // load/preload issue a separate query per association, so namespaces are not
+  // tracked for the load recursion type
+  NextUsedNamespaces = RecursionType extends 'load'
+    ? never
+    : IsAssociationNameOrAlias extends true
+      ? UsedNamespaces | NextAliasedAssociationName
+      : UsedNamespaces,
   //
   NextTableName extends keyof Schema &
     AssociationTableNames<DB, Schema> &
     keyof DB = IsAssociationNameOrAlias extends true
     ? AssociationTableName<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName>
-    : ConcreteTableName & AssociationTableNames<DB, Schema> & keyof DB,
+    : ConcreteTableName,
   //
   AllowedAssociationNames = IsAssociationNameOrAlias extends true
     ? AssociationNamesForAssociation<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName>
@@ -335,12 +358,6 @@ type VariadicRecurse<
       ? AssociationNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName>
       : AssociationNamesForTable<Schema, ConcreteTableName>, // fall back to association names for table for root only
   //
-  AssociationTableOrConcreteTable extends keyof Schema &
-    AssociationTableNames<DB, Schema> &
-    keyof DB = IsAssociationNameOrAlias extends true
-    ? AssociationTableName<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName>
-    : ConcreteTableName,
-  //
   CurrentRequiredOnClauseKeys = IsAssociationNameOrAlias extends true
     ? RequiredOnClauseKeys<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName>
     : RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>,
@@ -353,34 +370,64 @@ type VariadicRecurse<
     ? IsNonOptionalBelongsToAssociation<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName>
     : IsNonOptionalBelongsToAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName>,
   //
+  // The Dream model reached after consuming the current arg. Distributes over
+  // LastDream so that traversing through a polymorphic association resolves to
+  // the specific polymorphic target that owns the association, and uses the
+  // unaliased association name so that aliased traversal advances the model the
+  // same way unaliased traversal does. Falls back to LastDream for
+  // non-association args (e.g. and-clauses), which do not advance the chain.
+  NextDreamCandidate = IsAssociationNameOrAlias extends true
+    ? LastDream extends Dream
+      ? NextUnaliasedAssociationName extends keyof LastDream
+        ? DreamAssociationNameToAssociatedModel<LastDream, NextUnaliasedAssociationName & keyof LastDream>
+        : never
+      : never
+    : LastDream,
+  NextDream extends Dream = [NextDreamCandidate] extends [never]
+    ? LastDream
+    : NextDreamCandidate extends Dream
+      ? NextDreamCandidate
+      : LastDream,
+  //
+  // The join recursion types exclude polymorphic BelongsTo association names
+  // (and their aliased forms), since joining a polymorphic BelongsTo raises
+  // CannotJoinPolymorphicBelongsToError at runtime.
+  NextPolymorphicBelongsToNames = RecursionType extends 'load'
+    ? never
+    : PolymorphicBelongsToAssociationNames<Schema, NextTableName>,
+  JoinSafeAllowedAssociationNames = Exclude<
+    AllowedAssociationNames,
+    NextPolymorphicBelongsToNames | `${NextPolymorphicBelongsToNames & string} as ${string}`
+  >,
+  //
   AllowedNextArgValues = RecursionType extends 'load'
     ? AllowedNextArgValuesForLoad<
-        DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>,
+        NextDream,
         DB,
         Schema,
         AllowedAssociationNames,
-        AssociationTableOrConcreteTable,
+        NextTableName,
         CurrentRequiredOnClauseKeys,
         CurrentAssociationIsNonOptionalBelongsTo
       >
     : RecursionType extends 'leftJoinLoad'
       ? AllowedNextArgValuesForLeftJoinLoad<
-          DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>,
+          NextDream,
           DB,
           Schema,
-          AllowedAssociationNames,
-          AssociationTableOrConcreteTable,
+          JoinSafeAllowedAssociationNames,
+          NextTableName,
           CurrentRequiredOnClauseKeys,
           NextUsedNamespaces,
           CurrentAssociationIsNonOptionalBelongsTo
         >
       : RecursionType extends 'join'
         ? AllowedNextArgValuesForJoin<
-            DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>,
+            NextDream,
             DB,
             Schema,
-            AllowedAssociationNames,
-            AssociationTableOrConcreteTable,
+            JoinSafeAllowedAssociationNames,
+            NextTableName,
             CurrentRequiredOnClauseKeys,
             NextUsedNamespaces
           >
@@ -397,11 +444,13 @@ type VariadicRecurse<
       NextUsedNamespaces,
       Inc<Depth>,
       NextPreviousConcreteTableName,
-      NextAliasedAssociationName,
+      // the real (unaliased) association name: downstream lookups
+      // (RequiredOnClauseKeys, IsNonOptionalBelongsToAssociation,
+      // AssociationNamesForAssociation) index schema metadata by real name,
+      // and an alias would silently collapse them to null
+      [NextUnaliasedAssociationName] extends [never] ? ConcreteAssociationName : NextUnaliasedAssociationName,
       AllowedNextArgValues,
-      DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream> extends Dream
-        ? DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>
-        : LastDream
+      NextDream
     >
 
 /**
@@ -477,8 +526,6 @@ export type JoinedAssociationsTypeFromAssociations<
   ConcreteArgs extends readonly unknown[],
   Depth extends number = 0,
   //
-  //
-  PreviousConcreteTableName = ConcreteTableName,
   ConcreteAssociationName = never,
   //
   JoinedAssociationsType extends Readonly<JoinedAssociation[]> = Readonly<[]>,
@@ -513,12 +560,6 @@ export type JoinedAssociationsTypeFromAssociations<
           ? IS_ASSOCIATION_ALIAS
           : IS_NOT_ASSOCIATION_NAME,
   //
-  NextPreviousConcreteTableName = CurrentArgumentType extends IS_ASSOCIATION_NAME
-    ? ConcreteTableName
-    : CurrentArgumentType extends IS_ASSOCIATION_ALIAS
-      ? ConcreteTableName
-      : PreviousConcreteTableName,
-  //
   NextUnaliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME
     ? ConcreteNthArg
     : CurrentArgumentType extends IS_ASSOCIATION_ALIAS
@@ -555,7 +596,6 @@ export type JoinedAssociationsTypeFromAssociations<
             NextTableName,
             ReadonlyTail<ConcreteArgs>,
             Inc<Depth>,
-            NextPreviousConcreteTableName,
             NextAliasedAssociationName,
             CurrentArgumentType extends IS_NOT_ASSOCIATION_NAME
               ? JoinedAssociationsType
@@ -572,7 +612,6 @@ export type JoinedAssociationsTypeFromAssociations<
           NextTableName,
           ReadonlyTail<ConcreteArgs>,
           Inc<Depth>,
-          NextPreviousConcreteTableName,
           NextAliasedAssociationName,
           CurrentArgumentType extends IS_NOT_ASSOCIATION_NAME
             ? JoinedAssociationsType

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

@@ -1,14 +1,17 @@
 import Dream from '../Dream.js';
 import { Camelized } from '../helpers/stringCasing.js';
 import { AssociationTableNames } from './db.js';
-import { AssociationNamesForAssociation, AssociationNamesForTable, AssociationTableName, AssociationTableNamesForAssociation, DreamAssociationNameToAssociatedModel, IsNonOptionalBelongsToAssociation, JoinAndStatements, MAX_VARIADIC_DEPTH, RequiredOnClauseKeys } from './dream.js';
+import { AssociationNamesForAssociation, AssociationNamesForTable, AssociationTableName, AssociationTableNamesForAssociation, DreamAssociationNameToAssociatedModel, IsNonOptionalBelongsToAssociation, IsPolymorphicBelongsToAssociation, JoinAndStatements, MAX_VARIADIC_DEPTH, PolymorphicBelongsToAssociationNames, RequiredOnClauseKeys } from './dream.js';
 import { Inc, ReadonlyTail } from './utils.js';
 type VALID = 'valid';
 type INVALID = 'invalid';
+type INVALID_NON_TERMINAL_ARRAY = 'invalid_non_terminal_array';
+type INVALID_NAMESPACE_REUSE = 'invalid_namespace_reuse';
+type INVALID_POLYMORPHIC_BELONGS_TO_JOIN = 'invalid_polymorphic_belongs_to_join';
+type INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO = 'invalid_constraint_on_required_belongs_to';
 type IS_ASSOCIATION_ALIAS = 'association_alias';
 type IS_ASSOCIATION_NAME = 'association_name';
 type IS_NOT_ASSOCIATION_NAME = 'not_association_name';
-type IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME = 'cross_polymorphic_association_name';
 type RecursionTypes = 'load' | 'leftJoinLoad' | 'join';
 /**
  * Given a union of table names and an association name, returns the
@@ -17,13 +20,15 @@ type RecursionTypes = 'load' | 'leftJoinLoad' | 'join';
  * that only exists on one of the polymorphic targets.
  */
 type TableContainingAssociationInUnion<Schema, TableNamesUnion, AssociationName> = TableNamesUnion extends keyof Schema ? AssociationName extends keyof Schema[TableNamesUnion]['associations' & keyof Schema[TableNamesUnion]] ? TableNamesUnion : never : never;
-export type VariadicLoadArgs<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], AllowedNextArgValues = (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName>> = VariadicCheckThenRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, 'load', ConcreteTableName, 0, null, never, AllowedNextArgValues | Readonly<AllowedNextArgValues[]>>;
-export type VariadicLeftJoinLoadArgs<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], AllowedNextArgValues = (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName>> = VariadicCheckThenRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, 'leftJoinLoad', Camelized<ConcreteTableName>, 0, null, never, AllowedNextArgValues | Readonly<AllowedNextArgValues[]>>;
-export type VariadicJoinsArgs<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], AllowedNextArgValues = (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName>> = VariadicCheckThenRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, 'join', Camelized<ConcreteTableName>, 0, null, never, AllowedNextArgValues>;
-type VariadicCheckThenRecurse<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], RecursionType extends RecursionTypes, UsedNamespaces, Depth extends number, PreviousConcreteTableName, ConcreteAssociationName, AssociationNamesOrOnClause, LastDream extends Dream = I, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], AllowedNamesForArrayArg = PreviousConcreteTableName extends keyof Schema ? AssociationNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> : keyof SchemaAssociations & string, NthArgument extends VALID | INVALID = ConcreteArgs['length'] extends 0 ? VALID : ConcreteArgs[0] extends keyof SchemaAssociations & string ? VALID : ConcreteArgs[0] extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? VALID : ConcreteArgs[0] extends JoinAndStatements<LastDream, DB, Schema, ConcreteTableName, RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>> ? VALID : ConcreteArgs[0] extends readonly AllowedNamesForArrayArg[] ? VALID : ConcreteArgs[0] extends JoinAndStatements<LastDream, DB, Schema, ConcreteTableName, RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>> ? VALID : ConcreteArgs[0] extends AllowedNamesForArrayArg ? VALID : INVALID> = NthArgument extends INVALID ? `invalid where clause in argument ${Inc<Depth>}` : ConcreteArgs['length'] extends 0 ? AssociationNamesOrOnClause : VariadicRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, RecursionType, UsedNamespaces, Depth, PreviousConcreteTableName, ConcreteAssociationName, LastDream>;
+export type VariadicLoadArgs<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], AllowedNextArgValues = (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName>> = VariadicCheckThenRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, 'load', never, 0, null, never, AllowedNextArgValues | Readonly<AllowedNextArgValues[]>>;
+export type VariadicLeftJoinLoadArgs<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], PolymorphicBelongsToNames = PolymorphicBelongsToAssociationNames<Schema, ConcreteTableName>, AllowedNextArgValues = Exclude<keyof SchemaAssociations & string, PolymorphicBelongsToNames> | Exclude<AliasedSchemaAssociation<Schema, ConcreteTableName>, `${PolymorphicBelongsToNames & string} as ${string}`>> = VariadicCheckThenRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, 'leftJoinLoad', Camelized<ConcreteTableName>, 0, null, never, AllowedNextArgValues | Readonly<AllowedNextArgValues[]>>;
+export type VariadicJoinsArgs<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], PolymorphicBelongsToNames = PolymorphicBelongsToAssociationNames<Schema, ConcreteTableName>, AllowedNextArgValues = Exclude<keyof SchemaAssociations & string, PolymorphicBelongsToNames> | Exclude<AliasedSchemaAssociation<Schema, ConcreteTableName>, `${PolymorphicBelongsToNames & string} as ${string}`>> = VariadicCheckThenRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, 'join', Camelized<ConcreteTableName>, 0, null, never, AllowedNextArgValues>;
+type VariadicCheckThenRecurse<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], RecursionType extends RecursionTypes, UsedNamespaces, Depth extends number, PreviousConcreteTableName, ConcreteAssociationName, AssociationNamesOrOnClause, LastDream extends Dream = I, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], AllowedNamesForNthArg = PreviousConcreteTableName extends keyof Schema ? AssociationNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> : keyof SchemaAssociations & string, UnaliasedNthArg = ConcreteArgs[0] extends `${infer AssociationName extends string} as ${string}` ? AssociationName : ConcreteArgs[0], NthArgumentNamespace = ConcreteArgs[0] extends `${string} as ${infer Alias extends string}` ? Alias : ConcreteArgs[0], NthArgument extends VALID | INVALID | INVALID_NON_TERMINAL_ARRAY | INVALID_NAMESPACE_REUSE | INVALID_POLYMORPHIC_BELONGS_TO_JOIN | INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO = ConcreteArgs['length'] extends 0 ? VALID : ConcreteArgs[0] extends (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName> | AllowedNamesForNthArg ? RecursionType extends 'load' ? VALID : NthArgumentNamespace extends UsedNamespaces ? INVALID_NAMESPACE_REUSE : IsPolymorphicBelongsToAssociation<Schema, ConcreteTableName, UnaliasedNthArg> extends true ? INVALID_POLYMORPHIC_BELONGS_TO_JOIN : VALID : ConcreteArgs[0] extends readonly unknown[] ? INVALID_NON_TERMINAL_ARRAY : ConcreteArgs[0] extends JoinAndStatements<LastDream, DB, Schema, ConcreteTableName, RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>> ? RecursionType extends 'join' ? VALID : IsNonOptionalBelongsToAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> extends true ? INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO : VALID : INVALID> = NthArgument extends INVALID_NON_TERMINAL_ARRAY ? `an array of association names is only allowed as the final argument (argument ${Inc<Depth>})` : NthArgument extends INVALID_NAMESPACE_REUSE ? `association name or alias already used earlier in this chain (argument ${Inc<Depth>})` : NthArgument extends INVALID_POLYMORPHIC_BELONGS_TO_JOIN ? `cannot join a polymorphic BelongsTo association (argument ${Inc<Depth>})` : NthArgument extends INVALID_CONSTRAINT_ON_REQUIRED_BELONGS_TO ? `${CannotConstrainRequiredBelongsTo} (argument ${Inc<Depth>})` : NthArgument extends INVALID ? `invalid where clause in argument ${Inc<Depth>}` : ConcreteArgs['length'] extends 0 ? AssociationNamesOrOnClause : VariadicRecurse<I, DB, Schema, ConcreteTableName, ConcreteArgs, RecursionType, UsedNamespaces, Depth, PreviousConcreteTableName, ConcreteAssociationName, LastDream>;
 export type AliasedSchemaAssociation<Schema, ConcreteTableName extends keyof Schema, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]]> = `${keyof SchemaAssociations & string} as ${string}`;
-type VariadicRecurse<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], RecursionType extends RecursionTypes, UsedNamespaces, Depth extends number, PreviousConcreteTableName, ConcreteAssociationName, LastDream extends Dream, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], PolymorphicTableNamesUnion = PreviousConcreteTableName extends keyof Schema ? AssociationTableNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> : ConcreteTableName, CrossPolymorphicTableForCurrentArg = ConcreteArgs[0] extends string ? TableContainingAssociationInUnion<Schema, PolymorphicTableNamesUnion, ConcreteArgs[0]> : never, EffectiveConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = ConcreteArgs[0] extends keyof SchemaAssociations & string ? ConcreteTableName : [CrossPolymorphicTableForCurrentArg] extends [never] ? ConcreteTableName : CrossPolymorphicTableForCurrentArg extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB ? CrossPolymorphicTableForCurrentArg : ConcreteTableName, EffectiveSchemaAssociations = Schema[EffectiveConcreteTableName]['associations' & keyof Schema[EffectiveConcreteTableName]], ConcreteNthArg extends (keyof SchemaAssociations & string) | (keyof EffectiveSchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName> | null = ConcreteArgs[0] extends undefined ? null : ConcreteArgs[0] extends null ? null : ConcreteArgs[0] extends keyof SchemaAssociations & string ? ConcreteArgs[0] & keyof SchemaAssociations & string : ConcreteArgs[0] extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? ConcreteArgs[0] & AliasedSchemaAssociation<Schema, ConcreteTableName> : ConcreteArgs[0] extends keyof EffectiveSchemaAssociations & string ? ConcreteArgs[0] & keyof EffectiveSchemaAssociations & string : null, NextUsedNamespaces = ConcreteArgs[0] extends undefined ? never : ConcreteArgs[0] extends null ? never : ConcreteNthArg extends null ? UsedNamespaces : UsedNamespaces | ConcreteNthArg, CurrentArgumentType extends IS_ASSOCIATION_NAME | IS_ASSOCIATION_ALIAS | IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME | IS_NOT_ASSOCIATION_NAME = ConcreteNthArg extends null ? IS_NOT_ASSOCIATION_NAME : ConcreteNthArg extends keyof SchemaAssociations & string ? IS_ASSOCIATION_NAME : ConcreteNthArg extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? IS_ASSOCIATION_ALIAS : ConcreteNthArg extends keyof EffectiveSchemaAssociations & string ? IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME : IS_NOT_ASSOCIATION_NAME, NextPreviousConcreteTableName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteTableName : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteTableName : CurrentArgumentType extends IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME ? EffectiveConcreteTableName : PreviousConcreteTableName, NextUnaliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteNthArg : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteNthArg extends `${infer AssocName extends string} as ${string}` ? AssocName & keyof SchemaAssociations & string : never : CurrentArgumentType extends IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME ? ConcreteNthArg : never, NextAliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteNthArg : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteNthArg extends `${string} as ${infer AssocAlias extends string}` ? AssocAlias & string : ConcreteAssociationName : CurrentArgumentType extends IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME ? ConcreteNthArg : ConcreteAssociationName, IsAssociationNameOrAlias extends boolean = CurrentArgumentType extends IS_ASSOCIATION_NAME | IS_ASSOCIATION_ALIAS | IS_CROSS_POLYMORPHIC_ASSOCIATION_NAME ? true : false, NextTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = IsAssociationNameOrAlias extends true ? AssociationTableName<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : ConcreteTableName & AssociationTableNames<DB, Schema> & keyof DB, AllowedAssociationNames = IsAssociationNameOrAlias extends true ? AssociationNamesForAssociation<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : PreviousConcreteTableName extends keyof Schema ? AssociationNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> : AssociationNamesForTable<Schema, ConcreteTableName>, // fall back to association names for table for root only
-AssociationTableOrConcreteTable extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = IsAssociationNameOrAlias extends true ? AssociationTableName<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : ConcreteTableName, CurrentRequiredOnClauseKeys = IsAssociationNameOrAlias extends true ? RequiredOnClauseKeys<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>, CurrentAssociationIsNonOptionalBelongsTo = IsAssociationNameOrAlias extends true ? IsNonOptionalBelongsToAssociation<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : IsNonOptionalBelongsToAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName>, AllowedNextArgValues = RecursionType extends 'load' ? AllowedNextArgValuesForLoad<DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>, DB, Schema, AllowedAssociationNames, AssociationTableOrConcreteTable, CurrentRequiredOnClauseKeys, CurrentAssociationIsNonOptionalBelongsTo> : RecursionType extends 'leftJoinLoad' ? AllowedNextArgValuesForLeftJoinLoad<DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>, DB, Schema, AllowedAssociationNames, AssociationTableOrConcreteTable, CurrentRequiredOnClauseKeys, NextUsedNamespaces, CurrentAssociationIsNonOptionalBelongsTo> : RecursionType extends 'join' ? AllowedNextArgValuesForJoin<DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream>, DB, Schema, AllowedAssociationNames, AssociationTableOrConcreteTable, CurrentRequiredOnClauseKeys, NextUsedNamespaces> : never> = Depth extends MAX_VARIADIC_DEPTH ? never : VariadicCheckThenRecurse<I, DB, Schema, NextTableName, ReadonlyTail<ConcreteArgs>, RecursionType, NextUsedNamespaces, Inc<Depth>, NextPreviousConcreteTableName, NextAliasedAssociationName, AllowedNextArgValues, DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream> extends Dream ? DreamAssociationNameToAssociatedModel<LastDream, ConcreteArgs[0] & keyof LastDream> : LastDream>;
+type VariadicRecurse<I extends Dream, DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], RecursionType extends RecursionTypes, UsedNamespaces, Depth extends number, PreviousConcreteTableName, ConcreteAssociationName, LastDream extends Dream, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], UnaliasedNthArg = ConcreteArgs[0] extends `${infer AssociationName extends string} as ${string}` ? AssociationName : ConcreteArgs[0], PolymorphicTableNamesUnion = PreviousConcreteTableName extends keyof Schema ? AssociationTableNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> : ConcreteTableName, CrossPolymorphicTableForCurrentArg = UnaliasedNthArg extends string ? TableContainingAssociationInUnion<Schema, PolymorphicTableNamesUnion, UnaliasedNthArg> : never, EffectiveConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = UnaliasedNthArg extends keyof SchemaAssociations & string ? ConcreteTableName : [CrossPolymorphicTableForCurrentArg] extends [never] ? ConcreteTableName : CrossPolymorphicTableForCurrentArg extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB ? CrossPolymorphicTableForCurrentArg : ConcreteTableName, EffectiveSchemaAssociations = Schema[EffectiveConcreteTableName]['associations' & keyof Schema[EffectiveConcreteTableName]], IsAssociationNameOrAlias extends boolean = UnaliasedNthArg extends keyof EffectiveSchemaAssociations & string ? true : false, NextUnaliasedAssociationName = IsAssociationNameOrAlias extends true ? UnaliasedNthArg & keyof EffectiveSchemaAssociations & string : never, NextAliasedAssociationName = IsAssociationNameOrAlias extends true ? ConcreteArgs[0] extends `${string} as ${infer AssociationAlias extends string}` ? AssociationAlias : NextUnaliasedAssociationName : ConcreteAssociationName, NextPreviousConcreteTableName = IsAssociationNameOrAlias extends true ? EffectiveConcreteTableName : PreviousConcreteTableName, NextUsedNamespaces = RecursionType extends 'load' ? never : IsAssociationNameOrAlias extends true ? UsedNamespaces | NextAliasedAssociationName : UsedNamespaces, NextTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = IsAssociationNameOrAlias extends true ? AssociationTableName<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : ConcreteTableName, AllowedAssociationNames = IsAssociationNameOrAlias extends true ? AssociationNamesForAssociation<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : PreviousConcreteTableName extends keyof Schema ? AssociationNamesForAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName> : AssociationNamesForTable<Schema, ConcreteTableName>, // fall back to association names for table for root only
+CurrentRequiredOnClauseKeys = IsAssociationNameOrAlias extends true ? RequiredOnClauseKeys<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : RequiredOnClauseKeys<Schema, PreviousConcreteTableName, ConcreteAssociationName>, CurrentAssociationIsNonOptionalBelongsTo = IsAssociationNameOrAlias extends true ? IsNonOptionalBelongsToAssociation<Schema, EffectiveConcreteTableName, NextUnaliasedAssociationName> : IsNonOptionalBelongsToAssociation<Schema, PreviousConcreteTableName, ConcreteAssociationName>, NextDreamCandidate = IsAssociationNameOrAlias extends true ? LastDream extends Dream ? NextUnaliasedAssociationName extends keyof LastDream ? DreamAssociationNameToAssociatedModel<LastDream, NextUnaliasedAssociationName & keyof LastDream> : never : never : LastDream, NextDream extends Dream = [NextDreamCandidate] extends [never] ? LastDream : NextDreamCandidate extends Dream ? NextDreamCandidate : LastDream, NextPolymorphicBelongsToNames = RecursionType extends 'load' ? never : PolymorphicBelongsToAssociationNames<Schema, NextTableName>, JoinSafeAllowedAssociationNames = Exclude<AllowedAssociationNames, NextPolymorphicBelongsToNames | `${NextPolymorphicBelongsToNames & string} as ${string}`>, AllowedNextArgValues = RecursionType extends 'load' ? AllowedNextArgValuesForLoad<NextDream, DB, Schema, AllowedAssociationNames, NextTableName, CurrentRequiredOnClauseKeys, CurrentAssociationIsNonOptionalBelongsTo> : RecursionType extends 'leftJoinLoad' ? AllowedNextArgValuesForLeftJoinLoad<NextDream, DB, Schema, JoinSafeAllowedAssociationNames, NextTableName, CurrentRequiredOnClauseKeys, NextUsedNamespaces, CurrentAssociationIsNonOptionalBelongsTo> : RecursionType extends 'join' ? AllowedNextArgValuesForJoin<NextDream, DB, Schema, JoinSafeAllowedAssociationNames, NextTableName, CurrentRequiredOnClauseKeys, NextUsedNamespaces> : never> = Depth extends MAX_VARIADIC_DEPTH ? never : VariadicCheckThenRecurse<I, DB, Schema, NextTableName, ReadonlyTail<ConcreteArgs>, RecursionType, NextUsedNamespaces, Inc<Depth>, NextPreviousConcreteTableName, [
+    NextUnaliasedAssociationName
+] extends [never] ? ConcreteAssociationName : NextUnaliasedAssociationName, AllowedNextArgValues, NextDream>;
 /**
  * Error string surfaced when a trailing load-time constraint is applied to a
  * non-optional BelongsTo association in a hydrating load variant.
@@ -46,13 +51,13 @@ export type QueryTypeOptions = {
     allowOffset: boolean;
     allowPaginate: boolean;
 };
-export type JoinedAssociationsTypeFromAssociations<DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], Depth extends number = 0, PreviousConcreteTableName = ConcreteTableName, ConcreteAssociationName = never, JoinedAssociationsType extends Readonly<JoinedAssociation[]> = Readonly<[]>, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], ConcreteNthArg extends (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName> | Readonly<unknown[]> | null = ConcreteArgs[0] extends undefined ? null : ConcreteArgs[0] extends null ? null : ConcreteArgs[0] extends keyof SchemaAssociations & string ? ConcreteArgs[0] & keyof SchemaAssociations & string : ConcreteArgs[0] extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? ConcreteArgs[0] & AliasedSchemaAssociation<Schema, ConcreteTableName> : ConcreteArgs[0] extends Readonly<unknown[]> ? Readonly<unknown[]> : null, CurrentArgumentType extends IS_ASSOCIATION_NAME | IS_ASSOCIATION_ALIAS | IS_NOT_ASSOCIATION_NAME = ConcreteNthArg extends null ? IS_NOT_ASSOCIATION_NAME : ConcreteNthArg extends Readonly<unknown[]> ? IS_NOT_ASSOCIATION_NAME : ConcreteNthArg extends keyof SchemaAssociations & string ? IS_ASSOCIATION_NAME : ConcreteNthArg extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? IS_ASSOCIATION_ALIAS : IS_NOT_ASSOCIATION_NAME, NextPreviousConcreteTableName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteTableName : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteTableName : PreviousConcreteTableName, NextUnaliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteNthArg : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteNthArg extends `${infer AssocName extends string} as ${string}` ? AssocName & keyof SchemaAssociations : never : never, NextAliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteNthArg : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteNthArg extends `${string} as ${infer Alias extends string}` ? Alias : ConcreteAssociationName : ConcreteAssociationName, NextTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = CurrentArgumentType extends IS_ASSOCIATION_NAME ? AssociationTableName<Schema, ConcreteTableName, NextUnaliasedAssociationName> : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? AssociationTableName<Schema, ConcreteTableName, NextUnaliasedAssociationName> : ConcreteTableName & AssociationTableNames<DB, Schema> & keyof DB> = ConcreteArgs['length'] extends 0 ? JoinedAssociationsType : Depth extends MAX_VARIADIC_DEPTH ? never : ConcreteArgs['length'] extends 1 ? ConcreteNthArg extends Readonly<unknown[]> ? JoinedAssociationsType : JoinedAssociationsTypeFromAssociations<DB, Schema, NextTableName, ReadonlyTail<ConcreteArgs>, Inc<Depth>, NextPreviousConcreteTableName, NextAliasedAssociationName, CurrentArgumentType extends IS_NOT_ASSOCIATION_NAME ? JoinedAssociationsType : Readonly<[
+export type JoinedAssociationsTypeFromAssociations<DB, Schema, ConcreteTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB, ConcreteArgs extends readonly unknown[], Depth extends number = 0, ConcreteAssociationName = never, JoinedAssociationsType extends Readonly<JoinedAssociation[]> = Readonly<[]>, SchemaAssociations = Schema[ConcreteTableName]['associations' & keyof Schema[ConcreteTableName]], ConcreteNthArg extends (keyof SchemaAssociations & string) | AliasedSchemaAssociation<Schema, ConcreteTableName> | Readonly<unknown[]> | null = ConcreteArgs[0] extends undefined ? null : ConcreteArgs[0] extends null ? null : ConcreteArgs[0] extends keyof SchemaAssociations & string ? ConcreteArgs[0] & keyof SchemaAssociations & string : ConcreteArgs[0] extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? ConcreteArgs[0] & AliasedSchemaAssociation<Schema, ConcreteTableName> : ConcreteArgs[0] extends Readonly<unknown[]> ? Readonly<unknown[]> : null, CurrentArgumentType extends IS_ASSOCIATION_NAME | IS_ASSOCIATION_ALIAS | IS_NOT_ASSOCIATION_NAME = ConcreteNthArg extends null ? IS_NOT_ASSOCIATION_NAME : ConcreteNthArg extends Readonly<unknown[]> ? IS_NOT_ASSOCIATION_NAME : ConcreteNthArg extends keyof SchemaAssociations & string ? IS_ASSOCIATION_NAME : ConcreteNthArg extends AliasedSchemaAssociation<Schema, ConcreteTableName> ? IS_ASSOCIATION_ALIAS : IS_NOT_ASSOCIATION_NAME, NextUnaliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteNthArg : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteNthArg extends `${infer AssocName extends string} as ${string}` ? AssocName & keyof SchemaAssociations : never : never, NextAliasedAssociationName = CurrentArgumentType extends IS_ASSOCIATION_NAME ? ConcreteNthArg : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? ConcreteNthArg extends `${string} as ${infer Alias extends string}` ? Alias : ConcreteAssociationName : ConcreteAssociationName, NextTableName extends keyof Schema & AssociationTableNames<DB, Schema> & keyof DB = CurrentArgumentType extends IS_ASSOCIATION_NAME ? AssociationTableName<Schema, ConcreteTableName, NextUnaliasedAssociationName> : CurrentArgumentType extends IS_ASSOCIATION_ALIAS ? AssociationTableName<Schema, ConcreteTableName, NextUnaliasedAssociationName> : ConcreteTableName & AssociationTableNames<DB, Schema> & keyof DB> = ConcreteArgs['length'] extends 0 ? JoinedAssociationsType : Depth extends MAX_VARIADIC_DEPTH ? never : ConcreteArgs['length'] extends 1 ? ConcreteNthArg extends Readonly<unknown[]> ? JoinedAssociationsType : JoinedAssociationsTypeFromAssociations<DB, Schema, NextTableName, ReadonlyTail<ConcreteArgs>, Inc<Depth>, NextAliasedAssociationName, CurrentArgumentType extends IS_NOT_ASSOCIATION_NAME ? JoinedAssociationsType : Readonly<[
     ...JoinedAssociationsType,
     {
         table: NextTableName & string;
         alias: NextAliasedAssociationName & string;
     }
-]>> : JoinedAssociationsTypeFromAssociations<DB, Schema, NextTableName, ReadonlyTail<ConcreteArgs>, Inc<Depth>, NextPreviousConcreteTableName, NextAliasedAssociationName, CurrentArgumentType extends IS_NOT_ASSOCIATION_NAME ? JoinedAssociationsType : Readonly<[
+]>> : JoinedAssociationsTypeFromAssociations<DB, Schema, NextTableName, ReadonlyTail<ConcreteArgs>, Inc<Depth>, NextAliasedAssociationName, CurrentArgumentType extends IS_NOT_ASSOCIATION_NAME ? JoinedAssociationsType : Readonly<[
     ...JoinedAssociationsType,
     {
         table: NextTableName & string;

package/docs/assets/hierarchy.js

@@ -1 +1 @@
-window.hierarchyData = "eJyVksFOwzAMht/F5zCajqVVjmxCQogBEoLDtEPWejRamkxJOlRNe3cUdglj0OzkyPLv/7PjPVhjvAO+oIyVhFK6JGBxrbDy0mgHfA+U0hC0aBE4vHRo+5mVO7S3wiEQ2EhdA6d5SaCzCjhUSjiH7rpejU6qR41vFZBjBXDwrr4K8qtjgkDVSFVb1MAXOcuXBwI5yyP3h96h6qOuA/6/6i8hoDdZGRBCjBiejfMfFl06xRnFAEdwZeN48mmD1WZqtPNWSO3fpFEifNF/1mitsW70lzSFYZLFDEZ1rX7aoV0r85ni/EOQ4sfiTc+EF/e6Mu1WeLlS+C59E3Ir4fBOoqoTEAZ7XHQRbJyTsBRCWVkQWmST7wNhZXGC/dpv8Th9eD1K1wpfNYm858UJ6yuyScQxN37eKXXJqZxKhjwPhy/b2G8J"
+window.hierarchyData = "eJyVksFOAjEQht9lzgW3SwpLj0JMjBE1MXogHMru4DZ0W9J2MRvCu5vKpSK65TTNZP75v87MAawx3gFfUjahhFK6ImBxo7D00mgH/ACU0hC0aBA4vLRou7mVe7S3wiEQ2EpdAad5QaC1CjiUSjiH7qZaD8+qh7VvFJBTBXDwrhoE+eCUIFDWUlUWNfBlXtDVkUBexO4PnUPVRV17/H/VX0NA82keEEKMGJ6N8x8WXTrFBUUPR3BlIxa5zmostzOjnbdCav8mjRJhRf9Zo7XGuuFf0hQGNooZjGob/bRHu1HmM8X5hyDFbxJvey68uNelaXbCy7XCd+nrkFsLh3cSVZWA0NvjqotgI0bCUAhl04zQcVZ8HwibZmfYr90OT78Pr0fpGuHLOpH3sjhhfOOsiDgWxi9apa45lXNJn+fx+AXCu279"