prostgles-types 4.0.67 → 4.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +12 -13
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +24 -5
- package/dist/index.js.map +1 -1
- package/dist/index_umd.js +1 -1
- package/dist/insertUpdateUtils.d.ts +12 -0
- package/dist/insertUpdateUtils.d.ts.map +1 -0
- package/dist/insertUpdateUtils.js +23 -0
- package/dist/insertUpdateUtils.js.map +1 -0
- package/dist/jsonb.js.map +1 -1
- package/dist/md5.js.map +1 -1
- package/dist/util.d.ts +5 -5
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js.map +1 -1
- package/lib/index.ts +50 -26
- package/lib/insertUpdateUtils.ts +58 -0
- package/lib/util.ts +1 -1
- package/package.json +2 -2
- package/tests/index.js.map +1 -1
- package/tests/index.ts +2 -2
- package/tests/tsconfig.json +3 -1
- package/tests/typeTests.d.ts.map +1 -1
- package/tests/typeTests.js +8 -6
- package/tests/typeTests.js.map +1 -1
- package/tests/typeTests.ts +35 -11
- package/tsconfig.json +1 -0
- package/webpack.prod.js +0 -1
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../lib/util.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../lib/util.ts"],"names":[],"mappings":"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"}
|
package/lib/index.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
|
|
2
|
-
import { FullFilter, AnyObject, FullFilterBasic, ValueOf, ComplexFilter, CastFromTSToPG } from "./filters";
|
|
3
2
|
import { FileColumnConfig } from "./files";
|
|
3
|
+
import { AnyObject, ComplexFilter, FullFilter, FullFilterBasic, ValueOf } from "./filters";
|
|
4
|
+
import type { UpsertDataToPGCast } from "./insertUpdateUtils";
|
|
4
5
|
import { JSONB } from "./jsonb";
|
|
5
|
-
|
|
6
6
|
export const _PG_strings = [
|
|
7
7
|
'bpchar','char','varchar','text','citext','uuid','bytea', 'time','timetz','interval','name',
|
|
8
8
|
'cidr', 'inet', 'macaddr', 'macaddr8', "int4range", "int8range", "numrange",
|
|
@@ -411,7 +411,7 @@ export type SubscribeParams<T extends AnyObject | void = void, S extends DBSchem
|
|
|
411
411
|
|
|
412
412
|
export type UpdateParams<T extends AnyObject | void = void, S extends DBSchema | void = void> = {
|
|
413
413
|
returning?: Select<T, S>;
|
|
414
|
-
|
|
414
|
+
onConflict?: "DoNothing" | "DoUpdate";
|
|
415
415
|
fixIssues?: boolean;
|
|
416
416
|
|
|
417
417
|
/* true by default. If false the update will fail if affecting more than one row */
|
|
@@ -420,7 +420,7 @@ export type UpdateParams<T extends AnyObject | void = void, S extends DBSchema |
|
|
|
420
420
|
|
|
421
421
|
export type InsertParams<T extends AnyObject | void = void, S extends DBSchema | void = void> = {
|
|
422
422
|
returning?: Select<T, S>;
|
|
423
|
-
|
|
423
|
+
onConflict?: "DoNothing" | "DoUpdate";
|
|
424
424
|
fixIssues?: boolean;
|
|
425
425
|
} & Pick<CommonSelectParams, "returnType">;
|
|
426
426
|
|
|
@@ -484,12 +484,12 @@ export type TableInfo = {
|
|
|
484
484
|
export type OnError = (err: any) => void;
|
|
485
485
|
|
|
486
486
|
type JoinedSelect = Record<string, Select>;
|
|
487
|
-
|
|
487
|
+
export type SelectFunction = Record<string, any[]>;
|
|
488
488
|
type ParseSelect<Select extends SelectParams<TD>["select"], TD extends AnyObject> =
|
|
489
489
|
(Select extends { "*": 1 }? Required<TD> : {})
|
|
490
490
|
& {
|
|
491
491
|
[Key in keyof Omit<Select, "*">]: Select[Key] extends 1? Required<TD>[Key] :
|
|
492
|
-
Select[Key] extends
|
|
492
|
+
Select[Key] extends SelectFunction? any : //Function select
|
|
493
493
|
Select[Key] extends JoinedSelect? any[] :
|
|
494
494
|
any;
|
|
495
495
|
}
|
|
@@ -516,13 +516,13 @@ type GetReturningReturnType<O extends UpdateParams<TD, S>, TD extends AnyObject,
|
|
|
516
516
|
O extends { returning: Record<string, 0> }? Omit<Required<TD>, keyof O["returning"]> :
|
|
517
517
|
void;
|
|
518
518
|
|
|
519
|
-
type GetUpdateReturnType<O extends UpdateParams<TD, S>, TD extends AnyObject, S extends DBSchema | void = void> =
|
|
519
|
+
export type GetUpdateReturnType<O extends UpdateParams<TD, S>, TD extends AnyObject, S extends DBSchema | void = void> =
|
|
520
520
|
O extends { multi: false }?
|
|
521
521
|
GetReturningReturnType<O, TD, S> :
|
|
522
522
|
GetReturningReturnType<O, TD, S>[];
|
|
523
523
|
|
|
524
|
-
type GetInsertReturnType<Data extends AnyObject
|
|
525
|
-
Data extends any[]?
|
|
524
|
+
export type GetInsertReturnType<Data extends InsertData<AnyObject>, O extends UpdateParams<TD, S>, TD extends AnyObject, S extends DBSchema | void = void> =
|
|
525
|
+
Data extends any[] | readonly any[]?
|
|
526
526
|
GetReturningReturnType<O, TD, S>[] :
|
|
527
527
|
GetReturningReturnType<O, TD, S>;
|
|
528
528
|
|
|
@@ -555,12 +555,9 @@ export type ViewHandler<TD extends AnyObject = AnyObject, S extends DBSchema | v
|
|
|
555
555
|
* Returns result size in bits
|
|
556
556
|
*/
|
|
557
557
|
size: <P extends SelectParams<TD, S>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<string>;
|
|
558
|
-
}
|
|
559
|
-
|
|
560
|
-
export type UpsertDataToPGCast<TD extends AnyObject = AnyObject> = {
|
|
561
|
-
[K in keyof TD]: CastFromTSToPG<TD[K]>
|
|
562
|
-
};
|
|
558
|
+
}
|
|
563
559
|
|
|
560
|
+
|
|
564
561
|
type UpsertDataToPGCastLax<T extends AnyObject> = PartialLax<UpsertDataToPGCast<T>>;
|
|
565
562
|
type InsertData<T extends AnyObject> = UpsertDataToPGCast<T> | UpsertDataToPGCast<T>[]
|
|
566
563
|
|
|
@@ -568,7 +565,7 @@ export type TableHandler<TD extends AnyObject = AnyObject, S extends DBSchema |
|
|
|
568
565
|
update: <P extends UpdateParams<TD, S>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P ,TD, S> | undefined>;
|
|
569
566
|
updateBatch: <P extends UpdateParams<TD, S>>(data: [FullFilter<TD, S>, UpsertDataToPGCastLax<TD>][], params?: P) => Promise<GetUpdateReturnType<P ,TD, S> | void>;
|
|
570
567
|
upsert: <P extends UpdateParams<TD, S>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P ,TD, S>>;
|
|
571
|
-
insert: <P extends InsertParams<TD, S>, D extends InsertData<TD>>(data: D, params?: P
|
|
568
|
+
insert: <P extends InsertParams<TD, S>, D extends InsertData<TD>>(data: D, params?: P) => Promise<GetInsertReturnType<D, P ,TD, S>>;
|
|
572
569
|
delete: <P extends DeleteParams<TD, S>>(filter?: FullFilter<TD, S>, params?: P) => Promise<GetUpdateReturnType<P ,TD, S> | undefined>;
|
|
573
570
|
}
|
|
574
571
|
|
|
@@ -992,6 +989,7 @@ export type ProstglesError = {
|
|
|
992
989
|
is_view: false,
|
|
993
990
|
columns: {
|
|
994
991
|
col1: string,
|
|
992
|
+
col2: string,
|
|
995
993
|
},
|
|
996
994
|
delete: true,
|
|
997
995
|
select: true,
|
|
@@ -1000,6 +998,9 @@ export type ProstglesError = {
|
|
|
1000
998
|
}
|
|
1001
999
|
};
|
|
1002
1000
|
|
|
1001
|
+
type TableDef = { h: number; b?: number; c?: number; }
|
|
1002
|
+
const tableHandler: TableHandler<TableDef> = undefined as any;
|
|
1003
|
+
tableHandler.insert({ h: 1, c: 2, "b.$func": { dwa: [] } })
|
|
1003
1004
|
|
|
1004
1005
|
type DBOFullyTyped<Schema = void> = Schema extends DBSchema ? {
|
|
1005
1006
|
[tov_name in keyof Schema]: Schema[tov_name]["is_view"] extends true ?
|
|
@@ -1016,13 +1017,15 @@ export type ProstglesError = {
|
|
|
1016
1017
|
ffFunc(schemaFFilter);
|
|
1017
1018
|
|
|
1018
1019
|
const dbo: DBOFullyTyped<GSchema> = 1 as any;
|
|
1019
|
-
|
|
1020
|
+
const funcData = { funcName: [] };
|
|
1020
1021
|
const noRow = await dbo.tbl1.update({}, { col1: "" });
|
|
1021
1022
|
//@ts-expect-error
|
|
1022
1023
|
noRow.length;
|
|
1023
1024
|
//@ts-expect-error
|
|
1024
1025
|
noRow.col1;
|
|
1025
1026
|
|
|
1027
|
+
const noRowFunc = await dbo.tbl1.update({}, { col1: "" });
|
|
1028
|
+
|
|
1026
1029
|
const oneRow = await dbo.tbl1.update({}, { col1: "" }, { returning: "*", multi: false });
|
|
1027
1030
|
//@ts-expect-error
|
|
1028
1031
|
oneRow?.length;
|
|
@@ -1030,24 +1033,28 @@ export type ProstglesError = {
|
|
|
1030
1033
|
oneRow.col1;
|
|
1031
1034
|
oneRow?.col1;
|
|
1032
1035
|
|
|
1036
|
+
const oneRowFunc = await dbo.tbl1.update({}, { "col1.$func": funcData }, { returning: "*", multi: false });
|
|
1037
|
+
|
|
1033
1038
|
const manyRows = await dbo.tbl1.update({}, { col1: "" }, { returning: "*" });
|
|
1034
1039
|
//@ts-expect-error
|
|
1035
1040
|
manyRows?.col1;
|
|
1036
1041
|
manyRows?.at(0)?.col1;
|
|
1037
1042
|
|
|
1038
1043
|
|
|
1039
|
-
const noIRow = await dbo.tbl1.insert({ col1: "" });
|
|
1044
|
+
const noIRow = await dbo.tbl1.insert({ col1: "", col2: { $func: [] } });
|
|
1040
1045
|
//@ts-expect-error
|
|
1041
1046
|
noIRow.length;
|
|
1042
1047
|
//@ts-expect-error
|
|
1043
1048
|
noIRow.col1;
|
|
1044
1049
|
|
|
1045
|
-
const irow = await dbo.tbl1.insert({ col1: "" }, { returning: "*" });
|
|
1050
|
+
const irow = await dbo.tbl1.insert({ col1: "", col2: funcData }, { returning: "*" });
|
|
1046
1051
|
//@ts-expect-error
|
|
1047
1052
|
irow.length;
|
|
1048
1053
|
irow.col1;
|
|
1049
1054
|
|
|
1050
|
-
const
|
|
1055
|
+
const irowFunc = await dbo.tbl1.insert({ col1: funcData, col2: "" }, { returning: "*" });
|
|
1056
|
+
|
|
1057
|
+
const irows = await dbo.tbl1.insert([{ col1: "", col2: "" }], { returning: "*" });
|
|
1051
1058
|
//@ts-expect-error
|
|
1052
1059
|
irows.col1;
|
|
1053
1060
|
irows.length;
|
|
@@ -1059,7 +1066,7 @@ export type ProstglesError = {
|
|
|
1059
1066
|
|
|
1060
1067
|
const t: UpsertDataToPGCast<GSchema["tbl1"]["columns"]> = {} as any;
|
|
1061
1068
|
const d: UpsertDataToPGCast<AnyObject> = t;
|
|
1062
|
-
const fup = (a: UpsertDataToPGCast) => {}
|
|
1069
|
+
const fup = (a: UpsertDataToPGCast<AnyObject>) => {}
|
|
1063
1070
|
fup(t);
|
|
1064
1071
|
|
|
1065
1072
|
// const f = <A extends TableHandler["count"]>(a: A) => {};
|
|
@@ -1074,7 +1081,24 @@ export type ProstglesError = {
|
|
|
1074
1081
|
sf(sp);
|
|
1075
1082
|
// const sub: TableHandler["count"] = dbo.tbl1.count
|
|
1076
1083
|
|
|
1077
|
-
|
|
1084
|
+
/**
|
|
1085
|
+
* Upsert data funcs
|
|
1086
|
+
*/
|
|
1087
|
+
const gdw: InsertData<{ a: number; z: number }> = {
|
|
1088
|
+
a: { dwa: [] },
|
|
1089
|
+
z: { dwa: [] }
|
|
1090
|
+
}
|
|
1091
|
+
const gdwn: InsertData<{ a: number; z: number }> = {
|
|
1092
|
+
a: 2,
|
|
1093
|
+
z: { dwa: [] }
|
|
1094
|
+
}
|
|
1095
|
+
const gdw1: InsertData<{ a: number; z: number }> = { a: 1, z: 2 }
|
|
1096
|
+
const gdw1Opt: InsertData<{ a: number; z?: number }> = { a: {}, z: 2 }
|
|
1097
|
+
const gdw2: InsertData<{ a: number; z: number; }> = { a: { dwa: [] } , z: { dwa: [] } }
|
|
1098
|
+
//@ts-expect-error
|
|
1099
|
+
const missingKey: InsertData<{ a: number; z: number; }> = { z: 1, z: { dwa: [] } }
|
|
1100
|
+
//@ts-expect-error
|
|
1101
|
+
const missingKey2: InsertData<{ a: number; z: number; }> = { z: 1 };
|
|
1078
1102
|
// ra(schema);
|
|
1079
1103
|
})
|
|
1080
1104
|
|
|
@@ -1082,9 +1106,9 @@ export type ProstglesError = {
|
|
|
1082
1106
|
// import { md5 } from "./md5";
|
|
1083
1107
|
// export { get, getTextPatch, unpatchText, isEmpty, WAL, WALConfig, asName } from "./util";
|
|
1084
1108
|
// export type { WALItem, BasicOrderBy, WALItemsObj, WALConfig, TextPatch, SyncTableInfo } from "./util";
|
|
1085
|
-
export * from "./util";
|
|
1086
|
-
export * from "./filters";
|
|
1087
|
-
export type { ClientExpressData, ClientSyncHandles, ClientSyncInfo, SyncConfig, ClientSyncPullResponse, SyncBatchParams, onUpdatesParams } from "./replication";
|
|
1088
|
-
export type { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, FileColumnConfig, FileType } from "./files";
|
|
1089
1109
|
export { CONTENT_TYPE_TO_EXT } from "./files";
|
|
1090
|
-
export
|
|
1110
|
+
export type { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, FileColumnConfig, FileType } from "./files";
|
|
1111
|
+
export * from "./filters";
|
|
1112
|
+
export * from "./jsonb";
|
|
1113
|
+
export type { ClientExpressData, ClientSyncHandles, ClientSyncInfo, ClientSyncPullResponse, SyncBatchParams, SyncConfig, onUpdatesParams } from "./replication";
|
|
1114
|
+
export * from "./util";
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { AnyObject, CastFromTSToPG } from "./filters";
|
|
2
|
+
import { ExactlyOne } from "./util";
|
|
3
|
+
|
|
4
|
+
export type KeysOfType<T, U> = { [K in keyof T]: T[K] extends U ? K : never }[keyof T];
|
|
5
|
+
export type RequiredKeys<T> = Exclude<KeysOfType<T, Exclude<T[keyof T], undefined>>, undefined>;
|
|
6
|
+
export type OptionalKeys<T> = Exclude<keyof T, RequiredKeys<T>>;
|
|
7
|
+
export type PartialBy<T, K extends keyof T | string> = Omit<T, K> & Partial<Pick<T, Extract<K, keyof T>>>
|
|
8
|
+
|
|
9
|
+
export const FUNC_ENDING_HINT = "$func" as const;
|
|
10
|
+
type DataOrFuncValuesObject<ObjectType> = {
|
|
11
|
+
[Key in keyof ObjectType]:
|
|
12
|
+
| { [K in Key]: ObjectType[Key] }
|
|
13
|
+
| { [K in `${Key}.${typeof FUNC_ENDING_HINT}`]: Record<string, any[]> };
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
type PropertyValueIntersection<O> = {
|
|
17
|
+
[K in keyof O]: (x: O[K]) => void;
|
|
18
|
+
}[keyof O] extends (x: infer I) => void
|
|
19
|
+
? I
|
|
20
|
+
: never;
|
|
21
|
+
|
|
22
|
+
// export type UpsertDataToPGCast<TD> = PropertyValueIntersection<DataOrFuncValuesObject<Required<TD>>>;
|
|
23
|
+
export type UpsertDataToPGCast<TD extends AnyObject = AnyObject> = {
|
|
24
|
+
[K in keyof TD]: CastFromTSToPG<TD[K]> | Record<string, any[]>;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
type Schema = {
|
|
28
|
+
col1: number;
|
|
29
|
+
col2: string;
|
|
30
|
+
col3?: string;
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
const basic: UpsertDataToPGCast<Schema> = {
|
|
34
|
+
col1: 2,
|
|
35
|
+
col2: "2",
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
const funcs: UpsertDataToPGCast<Schema> = {
|
|
39
|
+
col1: { func: [] },
|
|
40
|
+
col2: { func: [] },
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
const mixed: UpsertDataToPGCast<Schema> = {
|
|
44
|
+
col1: 2,
|
|
45
|
+
col2: { func: [] },
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
const badKey: UpsertDataToPGCast<Schema> = {
|
|
49
|
+
//@ts-expect-error
|
|
50
|
+
badkey: { func: [] },
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
//@ts-expect-error
|
|
54
|
+
const wrong: UpsertDataToPGCast<Schema> = {
|
|
55
|
+
col2: { func: [] },
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
|
package/lib/util.ts
CHANGED
|
@@ -148,7 +148,7 @@ export function getTextPatch(oldStr: string, newStr: string): TextPatch | string
|
|
|
148
148
|
}
|
|
149
149
|
|
|
150
150
|
|
|
151
|
-
export function unpatchText(original: string, patch: TextPatch): string {
|
|
151
|
+
export function unpatchText(original: string | null, patch: TextPatch): string {
|
|
152
152
|
if (!patch || typeof patch === "string") return (patch as unknown as string);
|
|
153
153
|
const { from, to, text, md5: md5Hash } = patch;
|
|
154
154
|
if (text === null || original === null) return text;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-types",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.69",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index_umd.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"homepage": "https://prostgles.com",
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"tsconfig-paths-webpack-plugin": "^4.0.0",
|
|
33
|
-
"typescript": "^
|
|
33
|
+
"typescript": "^5.3.3",
|
|
34
34
|
"webpack": "^5.88.2",
|
|
35
35
|
"webpack-cli": "^5.0.1"
|
|
36
36
|
},
|
package/tests/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAAA,mCAA0C;AAC1C,uCAAyE;AACzE,yCAA2D;AAC3D,2CAA0C;AAE1C,IAAA,uBAAW,GAAE,CAAC;AAEd,IAAI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/tests/index.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { typeTestsOK } from "./typeTests";
|
|
|
5
5
|
|
|
6
6
|
typeTestsOK();
|
|
7
7
|
|
|
8
|
-
let error;
|
|
8
|
+
let error: any;
|
|
9
9
|
|
|
10
10
|
let failed = -1;
|
|
11
11
|
const vals = [
|
|
@@ -21,7 +21,7 @@ const vals = [
|
|
|
21
21
|
];
|
|
22
22
|
|
|
23
23
|
vals.map(({ o, n }, i) => {
|
|
24
|
-
const patch = getTextPatch(o, n) as TextPatch;
|
|
24
|
+
const patch = getTextPatch(o as any, n as any) as TextPatch;
|
|
25
25
|
// console.log(o, patch)
|
|
26
26
|
const unpatched = unpatchText(o, patch);
|
|
27
27
|
// console.log(o, unpatched, n)
|
package/tests/tsconfig.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"lib": [
|
|
7
7
|
"es2019"
|
|
8
8
|
],
|
|
9
|
-
|
|
9
|
+
"strict": true,
|
|
10
10
|
"module": "commonjs",
|
|
11
11
|
"removeComments": true,
|
|
12
12
|
"sourceMap": true,
|
|
@@ -17,8 +17,10 @@
|
|
|
17
17
|
"resolveJsonModule": true,
|
|
18
18
|
// "outFile": "bundle.js",
|
|
19
19
|
// "moduleResolution": "node"
|
|
20
|
+
"skipDefaultLibCheck": true,
|
|
20
21
|
"declaration": true,
|
|
21
22
|
"declarationMap": true,
|
|
23
|
+
"ignoreDeprecations": "5.0",
|
|
22
24
|
"keyofStringsOnly": true
|
|
23
25
|
},
|
|
24
26
|
"exclude": [
|
package/tests/typeTests.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeTests.d.ts","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typeTests.d.ts","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"AAqOA,eAAO,MAAM,WAAW,YAAW,CAAC"}
|
package/tests/typeTests.js
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.typeTestsOK = void 0;
|
|
4
4
|
(async () => {
|
|
5
|
-
const
|
|
5
|
+
const dbo = 1;
|
|
6
|
+
const tableHandler = dbo.tbl1;
|
|
6
7
|
const params = {
|
|
7
8
|
select: {
|
|
8
9
|
"*": 1,
|
|
@@ -22,8 +23,8 @@ exports.typeTestsOK = void 0;
|
|
|
22
23
|
newRow.c;
|
|
23
24
|
newRow.h;
|
|
24
25
|
const row = await tableHandler.findOne?.({ "c.$nin": [2] }, { select: { b: 0 } });
|
|
25
|
-
row
|
|
26
|
-
row
|
|
26
|
+
row?.c;
|
|
27
|
+
row?.h;
|
|
27
28
|
const query = await tableHandler.find?.({ h: 2 }, { returnType: "statement" });
|
|
28
29
|
query.toUpperCase();
|
|
29
30
|
row.b;
|
|
@@ -43,6 +44,7 @@ exports.typeTestsOK = void 0;
|
|
|
43
44
|
tableHandler.subscribeOne({ h: 2 }, { select: { b: 0 } }, async (row) => {
|
|
44
45
|
row.b;
|
|
45
46
|
row.c;
|
|
47
|
+
row?.c;
|
|
46
48
|
});
|
|
47
49
|
}
|
|
48
50
|
const s1 = {
|
|
@@ -58,7 +60,7 @@ exports.typeTestsOK = void 0;
|
|
|
58
60
|
const values = await sqlHandler("SELECT 1", {}, { returnType: "values" });
|
|
59
61
|
values.flatMap;
|
|
60
62
|
const row = await sqlHandler("SELECT 1", {}, { returnType: "row" });
|
|
61
|
-
row
|
|
63
|
+
row?.dhawjpeojfgrdfhoeisj;
|
|
62
64
|
const rows = await sqlHandler("SELECT 1", {}, { returnType: "rows" });
|
|
63
65
|
rows.flatMap;
|
|
64
66
|
const handles = await sqlHandler("SELECT 1", {}, { returnType: "noticeSubscription" });
|
|
@@ -83,13 +85,13 @@ exports.typeTestsOK = void 0;
|
|
|
83
85
|
const s22 = { a: 1, zz: { $max: ["c"] } };
|
|
84
86
|
const s3 = { a: 1, cc: "2" };
|
|
85
87
|
const s33 = { a: 1, c: "$max" };
|
|
86
|
-
db.view1.find({ "c1.$in": ["2",
|
|
88
|
+
db.view1.find({ "c1.$in": ["2", new Date()] }, { select: { c1: 1, c2: 1 } });
|
|
87
89
|
db.table1.insert({ c1: "2" }, { returning: { c1: 1, c2: "func", dwad: { dwada: [] } } });
|
|
88
90
|
db.table1.update;
|
|
89
91
|
db.table12.update;
|
|
90
92
|
db.table1.find;
|
|
91
93
|
const result = await db.table2.update({}, { c1: "" }, { returning: "*" });
|
|
92
|
-
result
|
|
94
|
+
result?.at(0)?.c2 ?? 0 + 2;
|
|
93
95
|
const ef = {
|
|
94
96
|
$existsJoined: {
|
|
95
97
|
tbl11: {}
|
package/tests/typeTests.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeTests.js","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":";;;AAMC,CAAC,KAAK,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"typeTests.js","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"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"}
|
package/tests/typeTests.ts
CHANGED
|
@@ -1,14 +1,35 @@
|
|
|
1
1
|
|
|
2
|
-
import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyped, ExistsFilter, AnyObject, SelectParams } from "../dist/index";
|
|
2
|
+
import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyped, ExistsFilter, AnyObject, SelectParams, DBSchema, ViewHandler } from "../dist/index";
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Test select/return type inference
|
|
6
6
|
*/
|
|
7
7
|
(async () => {
|
|
8
8
|
|
|
9
|
-
type
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
type DBOFullyTyped<Schema = void> = Schema extends DBSchema ? {
|
|
10
|
+
[tov_name in keyof Schema]: Schema[tov_name]["is_view"] extends true ?
|
|
11
|
+
ViewHandler<Schema[tov_name]["columns"], Schema> :
|
|
12
|
+
TableHandler<Schema[tov_name]["columns"], Schema>
|
|
13
|
+
} : Record<string, ViewHandler | TableHandler>;
|
|
14
|
+
|
|
15
|
+
type GSchema = {
|
|
16
|
+
tbl1: {
|
|
17
|
+
is_view: false,
|
|
18
|
+
columns: {
|
|
19
|
+
h: number;
|
|
20
|
+
b?: number;
|
|
21
|
+
c?: number;
|
|
22
|
+
},
|
|
23
|
+
delete: true,
|
|
24
|
+
select: true,
|
|
25
|
+
insert: true,
|
|
26
|
+
update: true,
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
const dbo: DBOFullyTyped<GSchema> = 1 as any;
|
|
30
|
+
// type SchemaDef = { h: number; b?: number; c?: number; }
|
|
31
|
+
const tableHandler = dbo.tbl1; //: TableHandler<TableDef> = undefined as any;
|
|
32
|
+
const params: SelectParams<GSchema["tbl1"]["columns"]> = {
|
|
12
33
|
select: {
|
|
13
34
|
"*": 1,
|
|
14
35
|
bd: { $max: ["b"] },
|
|
@@ -24,7 +45,7 @@ import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyp
|
|
|
24
45
|
};
|
|
25
46
|
|
|
26
47
|
if(tableHandler){
|
|
27
|
-
const newRow = await tableHandler.insert?.({ h: 2 }, { returning: {b: 1, c: 1} });
|
|
48
|
+
const newRow = await tableHandler.insert?.({ h: 2 }, { returning: { b: 1, c: 1 } });
|
|
28
49
|
newRow.b;
|
|
29
50
|
newRow.c;
|
|
30
51
|
|
|
@@ -33,8 +54,8 @@ import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyp
|
|
|
33
54
|
|
|
34
55
|
// const f: FullFilter<Partial<{ a: number; s: string}>> = { }
|
|
35
56
|
const row = await tableHandler.findOne?.({ "c.$nin": [2] }, { select: {b: 0} });
|
|
36
|
-
row
|
|
37
|
-
row
|
|
57
|
+
row?.c;
|
|
58
|
+
row?.h;
|
|
38
59
|
|
|
39
60
|
|
|
40
61
|
const query = await tableHandler.find?.({ h: 2 }, { returnType: "statement" });
|
|
@@ -68,8 +89,11 @@ import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyp
|
|
|
68
89
|
|
|
69
90
|
//@ts-expect-error
|
|
70
91
|
row.b;
|
|
71
|
-
|
|
92
|
+
|
|
93
|
+
//@ts-expect-error
|
|
72
94
|
row.c;
|
|
95
|
+
|
|
96
|
+
row?.c;
|
|
73
97
|
});
|
|
74
98
|
}
|
|
75
99
|
const s1: Select<AnyObject> = {
|
|
@@ -91,7 +115,7 @@ import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyp
|
|
|
91
115
|
values.flatMap
|
|
92
116
|
|
|
93
117
|
const row = await sqlHandler("SELECT 1", {}, { returnType: "row" });
|
|
94
|
-
row
|
|
118
|
+
row?.dhawjpeojfgrdfhoeisj;
|
|
95
119
|
|
|
96
120
|
const rows = await sqlHandler("SELECT 1", {}, { returnType: "rows" });
|
|
97
121
|
rows.flatMap
|
|
@@ -150,7 +174,7 @@ import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyp
|
|
|
150
174
|
|
|
151
175
|
const s33: Select<{ a: number; c: string }, {}> = { a: 1 , c: "$max" }
|
|
152
176
|
|
|
153
|
-
db.view1.find({ "c1.$in": ["2",
|
|
177
|
+
db.view1.find({ "c1.$in": ["2", new Date()] }, { select: { c1: 1, c2: 1 } });
|
|
154
178
|
db.table1.insert({ c1: "2" }, { returning: { c1: 1, c2: "func", dwad: { dwada: [] } } });
|
|
155
179
|
|
|
156
180
|
//@ts-expect-error
|
|
@@ -162,7 +186,7 @@ import type { TableHandler, SQLHandler, FullFilter, DBHandler, Select, SelectTyp
|
|
|
162
186
|
db.table1.find;
|
|
163
187
|
|
|
164
188
|
const result = await db.table2.update({}, { c1: "" }, { returning: "*" });
|
|
165
|
-
result
|
|
189
|
+
result?.at(0)?.c2 ?? 0 + 2;
|
|
166
190
|
|
|
167
191
|
|
|
168
192
|
type SampleSchema = {
|
package/tsconfig.json
CHANGED