table.ts addUniqueKey() freaks out

AnyhowStep · AnyhowStep · commit 7ba70257c7ed · 2018-05-26T19:15:18.000-04:00
diff --git a/TODO.md b/TODO.md
@@ -46,4 +46,10 @@ function transformBuilder (s : SelectBuilder) {
         .joinUsing(table, /*columns*/)
 }
 query.transform(transformBuilder)
-    .orderBy(/*other stuff*/);
+    .orderBy(/*other stuff*/);
+
+-----
+
++ Proper Unique Key support, rather than just auto-increment keys
+
+  Enables convenient (if badly named) `fetchByUk()` method
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "test": "ts-node ./src/main/sandbox/select-builder-v2",
     "check": "tsc --noEmit --diagnostics",
-    "check2": "node --max-old-space-size=8192 ./node_modules/typescript/lib/tsc.js --noEmit --noErrorTruncation --diagnostics",
+    "check2": "node --max-old-space-size=8192 ./node_modules/typescript/lib/tsc.js --noEmit --noErrorTruncation --diagnostics --listFiles",
     "build": "(rm -r ./dist || true) && tsc -d"
   },
   "author": "anyhowstep",
diff --git a/src/main/declaration-v2/column/tuple-util.ts b/src/main/declaration-v2/column/tuple-util.ts
@@ -47,4 +47,18 @@ export namespace ColumnTupleUtil {
                 }[TupleKeys<TupleT>]
             )
     );
+    export type MapToColumnNames<TupleT extends Tuple<AnyColumn>> = (
+        {
+            [index in TupleKeys<TupleT>] : (
+                TupleT[index] extends AnyColumn ?
+                    TupleT[index]["name"] :
+                    never
+            )
+        } &
+        {
+            "0" : TupleT[0]["name"],
+            length : TupleLength<TupleT>
+        } &
+        string[]
+    );
 }
diff --git a/src/main/declaration-v2/table-data/table-data.ts b/src/main/declaration-v2/table-data/table-data.ts
@@ -36,6 +36,8 @@ export interface TableData {
     isMutable : {
         [name : string] : true;
     };
+
+    uniqueKeys : undefined|(Tuple<Tuple<string>>);
 }
 
 //The `number` requirement is only a compile-time constraint
@@ -99,4 +101,9 @@ export type IsMutableDelegate<DataT extends TableData, ColumnCollectionT extends
             >
         >
     >
+);
+export type AddUniqueKeyDelegate<ColumnCollectionT extends ColumnCollection> = (
+    (columns : ColumnCollectionT) => Tuple<
+        ColumnCollectionUtil.Columns<ColumnCollectionT>
+    >
 );
diff --git a/src/main/declaration-v2/table-data/util.ts b/src/main/declaration-v2/table-data/util.ts
@@ -3,12 +3,13 @@ import {
     AutoIncrementDelegate,
     IsGeneratedDelegate,
     HasDefaultValueDelegate,
-    IsMutableDelegate
+    IsMutableDelegate,
+    AddUniqueKeyDelegate
 } from "./table-data";
 import {RemoveKey, ReplaceValue, ReplaceValue3, ReplaceValue4} from "../obj-util";
 import {ColumnCollection, ColumnCollectionUtil} from "../column-collection";
-import {TupleKeys} from "../tuple";
-import {AnyColumn} from "../column";
+import {Tuple, TupleKeys, TupleWPush} from "../tuple";
+import {AnyColumn, ColumnUtil, ColumnTupleUtil} from "../column";
 
 export namespace TableDataUtil {
     export type AutoIncrement<
@@ -303,4 +304,114 @@ export namespace TableDataUtil {
             isMutable : {},
         } as any;
     }
-}
+    export type AddUniqueKey<
+        DataT extends TableData,
+        ColumnCollectionT extends ColumnCollection,
+        AddUniqueKeyDelegateT extends AddUniqueKeyDelegate<ColumnCollectionT>
+    > = (
+        ReplaceValue<
+            DataT,
+            "uniqueKeys",
+            DataT["uniqueKeys"] extends Tuple<Tuple<string>> ?
+                (
+                    TupleWPush<
+                        Tuple<string>,
+                        DataT["uniqueKeys"],
+                        ColumnTupleUtil.MapToColumnNames<
+                            ReturnType<AddUniqueKeyDelegateT>
+                        >
+                    >
+                ) :
+                undefined
+        >
+    );
+    export function addUniqueKey<
+        DataT extends TableData,
+        ColumnCollectionT extends ColumnCollection,
+        AddUniqueKeyDelegateT extends AddUniqueKeyDelegate<ColumnCollectionT>
+    > (
+        data : DataT,
+        columnCollection : ColumnCollectionT,
+        delegate : AddUniqueKeyDelegateT
+    ) : (
+        AddUniqueKey<
+            DataT,
+            ColumnCollectionT,
+            AddUniqueKeyDelegateT
+        >
+    ) {
+        const uniqueKey = delegate(columnCollection);
+        ColumnCollectionUtil.assertHasColumns(columnCollection, uniqueKey);
+        return {
+            ...(data as any),
+            uniqueKeys : (data.uniqueKeys == undefined) ?
+                undefined :
+                data.uniqueKeys.push(uniqueKey.map(c => c.name) as any)
+        } as any;
+    }
+
+    export type WithTableAlias<DataT extends TableData, TableAliasT extends string> = (
+        ReplaceValue<
+            DataT,
+            "autoIncrement",
+            (
+                DataT["autoIncrement"] extends AnyColumn ?
+                    ColumnUtil.WithTableAlias<DataT["autoIncrement"], TableAliasT> :
+                    undefined
+            )
+        >
+        /*{
+            autoIncrement : (
+                DataT["autoIncrement"] extends AnyColumn ?
+                    ColumnUtil.WithTableAlias<DataT["autoIncrement"], TableAliasT> :
+                    undefined
+            ),
+            isGenerated : DataT["isGenerated"],
+            hasDefaultValue : DataT["hasDefaultValue"],
+            isMutable : DataT["isMutable"],
+            uniqueKeys : (
+                DataT["uniqueKeys"] extends Tuple<Tuple<AnyColumn>> ?
+                    UniqueKeysWithTableAlias<DataT["uniqueKeys"], TableAliasT> :
+                    undefined|Tuple<Tuple<AnyColumn>>
+            ),
+        }*/
+        /*
+        {
+            isGenerated : DataT["isGenerated"],
+            hasDefaultValue : DataT["hasDefaultValue"],
+            isMutable : DataT["isMutable"],
+        } &
+        (
+            DataT["autoIncrement"] extends AnyColumn ?
+                {
+                    autoIncrement : ColumnUtil.WithTableAlias<DataT["autoIncrement"], TableAliasT>,
+                } :
+                {
+                    autoIncrement : undefined,
+                }
+        ) &
+        (
+            DataT["uniqueKeys"] extends Tuple<Tuple<AnyColumn>> ?
+                {
+                    uniqueKeys : UniqueKeysWithTableAlias<DataT["uniqueKeys"], TableAliasT>,
+                } :
+                {
+                    uniqueKeys : undefined,
+                }
+        )
+        */
+    );
+    export function withTableAlias<
+        DataT extends TableData,
+        TableAliasT extends string
+    > (data : DataT, tableAlias : TableAliasT) : (
+        WithTableAlias<DataT, TableAliasT>
+    ) {
+        return {
+            ...(data as any),
+            autoIncrement : (data.autoIncrement == undefined) ?
+                undefined :
+                ColumnUtil.withTableAlias(data.autoIncrement, tableAlias),
+        } as any;
+    }
+}
diff --git a/src/main/declaration-v2/table/table.ts b/src/main/declaration-v2/table/table.ts
@@ -7,7 +7,8 @@ import {
     IsGeneratedDelegate,
     HasDefaultValueDelegate,
     IsMutableDelegate,
-    TableDataUtil
+    TableDataUtil,
+    //AddUniqueKeyDelegate
 } from "../table-data";
 import * as fieldUtil from "../field-util";
 
@@ -148,7 +149,8 @@ export class Table<
             newAlias,
             this.name,
             ColumnCollectionUtil.withTableAlias(this.columns, newAlias),
-            this.data
+            TableDataUtil.withTableAlias(this.data, newAlias)
+            //this.data
         );
     }
 
@@ -160,14 +162,14 @@ export class Table<
                 ColumnCollectionT,
                 NewNameT
             >,
-            DataT
+            TableDataUtil.WithTableAlias<DataT, NewNameT>
         >
     ) {
         return new Table(
             newName,
             newName,
             ColumnCollectionUtil.withTableAlias(this.columns, newName),
-            this.data
+            TableDataUtil.withTableAlias(this.data, newName)
         );
     }
     addColumns<RawColumnCollectionT extends RawColumnCollection> (
@@ -223,6 +225,33 @@ export class Table<
             this.data
         );
     }
+    //This method causes `tsc` to not terminate if uncommented
+    /*
+    addUniqueKey<
+        AddUniqueKeyDelegateT extends AddUniqueKeyDelegate<ColumnCollectionT>
+    > (delegate : AddUniqueKeyDelegateT) : (
+        Table<
+            AliasT,
+            NameT,
+            ColumnCollectionT,
+            TableDataUtil.AddUniqueKey<
+                DataT,
+                ColumnCollectionT,
+                AddUniqueKeyDelegateT
+            >
+        >
+    ) {
+        return new Table(
+            this.alias,
+            this.name,
+            this.columns,
+            TableDataUtil.addUniqueKey(
+                this.data,
+                this.columns,
+                delegate
+            )
+        ) as any;
+    }*/
 }
 
 export type AnyTable = Table<string, string, ColumnCollection, TableData>;
@@ -248,7 +277,8 @@ export function table<
             },
             isMutable : {
                 [name in Extract<keyof RawColumnCollectionT, string>] : true
-            }
+            },
+            uniqueKeys : undefined,
         }
     >
 );
@@ -273,7 +303,8 @@ export function table<
             },
             isMutable : {
                 [name in Extract<keyof fieldUtil.FieldsToObject<TupleT>, string>] : true
-            }
+            },
+            uniqueKeys : undefined,
         }
     >
 );
@@ -306,6 +337,7 @@ export function table (
             isGenerated : {},
             hasDefaultValue : hasDefaultValue,
             isMutable : isMutable,
+            uniqueKeys : undefined,
         }
     );
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ export interface TableData {`
`36`	`36`	`isMutable : {`
`37`	`37`	`[name : string] : true;`
`38`	`38`	`};`
	`39`	`+`
	`40`	`+ uniqueKeys : undefined\|(Tuple<Tuple<string>>);`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	//The `number` requirement is only a compile-time constraint
`@@ -99,4 +101,9 @@ export type IsMutableDelegate<DataT extends TableData, ColumnCollectionT extends`
`99`	`101`	`>`
`100`	`102`	`>`
`101`	`103`	`>`
	`104`	`+);`
	`105`	`+export type AddUniqueKeyDelegate<ColumnCollectionT extends ColumnCollection> = (`
	`106`	`+ (columns : ColumnCollectionT) => Tuple<`
	`107`	`+ ColumnCollectionUtil.Columns<ColumnCollectionT>`
	`108`	`+ >`
`102`	`109`	`);`