improve join types (#33)

lucasavila00 · Jul 1, 2022 · fa0ae6d · fa0ae6d
1 parent d242c2a
commit fa0ae6d
Show file tree

Hide file tree

Showing 24 changed files with 156 additions and 696 deletions.
diff --git a/docs/api/classes/compound.ts.md b/docs/api/classes/compound.ts.md
@@ -110,6 +110,7 @@ joinTable: <
   table: Table<Selection2, Alias2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`
@@ -136,6 +137,7 @@ commaJoinTable: <
   table: Table<Selection2, Alias2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`
@@ -163,6 +165,7 @@ joinStringifiedSelect: <
   select: StringifiedSelectStatement<Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -192,6 +195,7 @@ joinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -219,6 +223,7 @@ commaJoinStringifiedSelect: <
   select: StringifiedSelectStatement<Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -246,6 +251,7 @@ commaJoinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -274,6 +280,7 @@ joinCompound: <
   compound: Compound<Scope2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -302,6 +309,7 @@ commaJoinCompound: <
   compound: Compound<Scope2, Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`

diff --git a/docs/api/classes/joined.ts.md b/docs/api/classes/joined.ts.md
@@ -31,7 +31,7 @@ This class is not meant to be used directly, but rather through methods in table
 **Signature**
 
 ```ts
-export declare class Joined<Selection, Aliases, Ambiguous> {
+export declare class Joined<Selection, Scope, Aliases, Ambiguous> {
   private constructor(
     /* @internal */
     public __props: {
@@ -51,9 +51,9 @@ Added in v0.0.0
 ```ts
 select: <NewSelection extends string>(
   f: (
-    f: Record<Selection, SafeString> & NoSelectFieldsCompileError
+    f: Record<Selection | Scope, SafeString> & NoSelectFieldsCompileError
   ) => Record<NewSelection, SafeString>
-) => SelectStatement<Selection, NewSelection>;
+) => SelectStatement<Selection | Scope, NewSelection>;
 ```
 
 Added in v0.0.0
@@ -63,7 +63,7 @@ Added in v0.0.0
 **Signature**
 
 ```ts
-selectStar: () => SelectStatement<Selection, Selection>;
+selectStar: () => SelectStatement<Selection | Scope, Selection>;
 ```
 
 Added in v0.0.0
@@ -75,8 +75,10 @@ Added in v0.0.0
 ```ts
 selectStarOfAliases: <TheAliases extends Aliases>(aliases: TheAliases[]) =>
   SelectStatement<
-    RemoveAliasFromSelection<TheAliases, Selection>,
-    RemoveAliasFromSelection<TheAliases, Selection>
+    | RemoveAliasFromSelection<TheAliases, Selection>
+    | RemoveAliasFromSelection<TheAliases, Scope>,
+    | RemoveAliasFromSelection<TheAliases, Selection>
+    | RemoveAliasFromSelection<TheAliases, Scope>
   >;
 ```
 
@@ -91,6 +93,8 @@ commaJoinTable: <Selection2 extends string, Alias2 extends string>(
   table: Table<Selection2, Alias2>
 ) =>
   Joined<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | Exclude<Selection2, Ambiguous>
@@ -112,6 +116,8 @@ joinTable: <Selection2 extends string, Alias2 extends string>(
   table: Table<Selection2, Alias2>
 ) =>
   JoinedFactory<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -133,6 +139,8 @@ commaJoinStringifiedSelect: <Selection2 extends string, Alias2 extends string>(
   select: StringifiedSelectStatement<Selection2>
 ) =>
   Joined<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -157,6 +165,8 @@ commaJoinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   Joined<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -178,6 +188,8 @@ joinStringifiedSelect: <Selection2 extends string, Alias2 extends string>(
   table: StringifiedSelectStatement<Selection2>
 ) =>
   JoinedFactory<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -204,6 +216,8 @@ joinSelect: <
   table: SelectStatement<Scope2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -229,6 +243,8 @@ commaJoinCompound: <
   compound: Compound<Scope2, Selection2>
 ) =>
   Joined<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -254,6 +270,8 @@ joinCompound: <
   compound: Compound<Scope2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
+    | Scope
     | Exclude<Selection, Selection2>
     | Exclude<Exclude<Selection2, Selection>, Ambiguous>
     | `${Alias2}.${Selection2}`,
@@ -275,6 +293,7 @@ Allows the selection of the constraint to be done in another method call.
 ```ts
 export declare class JoinedFactory<
   Selection,
+  Scope,
   Aliases,
   Ambiguous,
   UsingPossibleKeys
@@ -297,7 +316,7 @@ Added in v0.0.0
 **Signature**
 
 ```ts
-noConstraint: () => Joined<Selection, Aliases, Ambiguous>;
+noConstraint: () => Joined<Selection, Scope, Aliases, Ambiguous>;
 ```
 
 Added in v0.0.0
@@ -307,9 +326,8 @@ Added in v0.0.0
 **Signature**
 
 ```ts
-on: (
-  on: (fields: Record<Selection, SafeString>) => SafeString | SafeString[]
-) => Joined<Selection, Aliases, Ambiguous>;
+on: (on: (fields: Record<Scope, SafeString>) => SafeString | SafeString[]) =>
+  Joined<Selection, Scope, Aliases, Ambiguous>;
 ```
 
 Added in v0.0.0
@@ -319,7 +337,8 @@ Added in v0.0.0
 **Signature**
 
 ```ts
-using: (keys: UsingPossibleKeys[]) => Joined<Selection, Aliases, Ambiguous>;
+using: (keys: UsingPossibleKeys[]) =>
+  Joined<Selection, Scope, Aliases, Ambiguous>;
 ```
 
 Added in v0.0.0
diff --git a/docs/api/classes/select-statement.ts.md b/docs/api/classes/select-statement.ts.md
@@ -213,6 +213,7 @@ commaJoinTable: <
   table: Table<Selection2, Alias2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`,
@@ -238,6 +239,7 @@ joinTable: <
   table: Table<Selection2, Alias2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`
@@ -265,6 +267,7 @@ commaJoinStringifiedSelect: <
   select: StringifiedSelectStatement<Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -292,6 +295,7 @@ commaJoinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -319,6 +323,7 @@ joinStringifiedSelect: <
   select: StringifiedSelectStatement<Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -348,6 +353,7 @@ joinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -375,6 +381,7 @@ commaJoinCompound: <
   compound: Compound<Selection2, Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`
@@ -402,6 +409,7 @@ joinCompound: <
   compound: Compound<Selection2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`

diff --git a/docs/api/classes/stringified-select-statement.ts.md b/docs/api/classes/stringified-select-statement.ts.md
@@ -80,6 +80,7 @@ commaJoinTable: <
   table: Table<Selection2, Alias2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`,
@@ -105,6 +106,7 @@ joinTable: <
   table: Table<Selection2, Alias2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`
@@ -132,6 +134,7 @@ commaJoinStringifiedSelect: <
   select: StringifiedSelectStatement<Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -159,6 +162,7 @@ commaJoinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -186,6 +190,7 @@ joinStringifiedSelect: <
   select: StringifiedSelectStatement<Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -215,6 +220,7 @@ joinSelect: <
   select: SelectStatement<Scope2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias2}.${Selection2}`
@@ -242,6 +248,7 @@ commaJoinCompound: <
   compound: Compound<Selection2, Selection2>
 ) =>
   Joined<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`
@@ -269,6 +276,7 @@ joinCompound: <
   compound: Compound<Selection2, Selection2>
 ) =>
   JoinedFactory<
+    Selection,
     | Exclude<Selection, Selection2>
     | Exclude<Selection2, Selection>
     | `${Alias1}.${Selection}`