prostgles-types 4.0.6 → 4.0.8

package/dist/filters.d.ts

@@ -125,11 +125,12 @@ export type ExistsFilter<S = void> = Partial<{
     }> : any;
 }>;
 export type FilterItem<T extends AnyObject = AnyObject> = FilterForObject<T>;
-export type FullFilter<T extends AnyObject = AnyObject, S = void> = {
-    $and: FullFilter<T, S>[];
+export type AnyObjIfVoid<T extends AnyObject | void> = T extends AnyObject ? T : AnyObject;
+export type FullFilter<T extends AnyObject | void = void, S = void> = {
+    $and: FullFilter<AnyObjIfVoid<T>, S>[];
 } | {
     $or: FullFilter<T, S>[];
-} | FilterItem<T> | ExistsFilter<S>;
+} | FilterItem<AnyObjIfVoid<T>> | ExistsFilter<S>;
 export type FullFilterBasic<T = {
     [key: string]: any;
 }> = {

package/dist/filters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../lib/filters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../lib/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA+D,MAAM,GAAG,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAW,MAAM,QAAQ,CAAC;AAE7C,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC;AACnE,MAAM,MAAM,cAAc,GAAG,aAAa,EAAE,CAAC;AAE7C,eAAO,MAAM,iBAAiB,wFAA+E,CAAC;AAC9G,eAAO,MAAM,mBAAmB,0BAA2B,CAAC;AAE5D,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6DhB,CAAC;AAEX,eAAO,MAAM,eAAe,uEAAyB,CAAC;AAKrD,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,aAAa,GAAG,MAAM,IAIxD,CAAC,GACD,UAAU,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,GAEvD,UAAU,CAAC,MAAM,CAAC,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAC3D;IAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,CACxB;AACD,eAAO,MAAM,cAAc,mDAAoD,CAAC;AAEhF,eAAO,MAAM,iBAAiB,0DAA2D,CAAC;AAE1F,eAAO,MAAM,mCAAmC,wFAAsF,CAAC;AACvI,MAAM,MAAM,oBAAoB,GAC7B,UAAU,CAAC,MAAM,CAAC,OAAO,mCAAmC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAClF;AAED,MAAM,MAAM,UAAU,GACnB,aAAa,CAAC,MAAM,CAAC,GACrB,UAAU,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAEzD,UAAU,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAC5E;AAED,eAAO,MAAM,mBAAmB,mFAAoF,CAAC;AACrH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,EAAE,IAC9C,MAAM,CAAC,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAC7C,UAAU,CAAC,MAAM,CAAC,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAC3D;AASD,MAAM,MAAM,OAAO,GAAG;IAAE,eAAe,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAOnD,MAAM,MAAM,UAAU,GAKnB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GAcjB;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CASlB;AACD,eAAO,MAAM,cAAc,iGAA8F,CAAC;AAC1H,eAAO,MAAM,gBAAgB,qFAKnB,CAAC;AAGX,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAG/C,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,aAAa,IAChD,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,GAC/B,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAC7B,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,GAChC,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,GAC7B,CAAC,CAAA;AAEH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,aAAa,IAChD,CAAC,SAAS,MAAM,GAAG,UAAU,GAC7B,CAAC,SAAS,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GACnD,CAAC,SAAS,OAAO,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GACpD,CAAC,SAAS,IAAI,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GACjD,CAAC,SAAS,GAAG,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,GAChC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,UAAU,CAAC,CAC7C;AAED,eAAO,MAAM,WAAW,yEAA0E,CAAC;AACnG,MAAM,MAAM,UAAU,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAWpD,eAAO,MAAM,kBAAkB,WAAqB,CAAC;AACrD,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,kBAAkB,EAAE;IAC5D;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,CAAA;KAAE;IAC7B,MAAM,CAAC;IACP,GAAG,CAAC;CACL,CAAC,CAAC;AAKF,KAAK,WAAW,CAAC,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,GAAG,IAAI,OAAO,CAAC;KACrE,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC;CACtG,CAAC,GAAG,OAAO,CAAC;KACV,CAAC,IAAI,OAAO,CAAC,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC,EAAE;CAC1G,CAAC,CAAC;AACH,KAAK,YAAY,CAAC,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,GAAG,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;KACrG,CAAC,IAAI,OAAO,CAAC,OAAO,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,EAAE,GAAG,QAAQ;CACnF,CAAC,GAAG,OAAO,CAAC;KACV,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,EAAE,GAAG,GAAG;CACjF,CAAC,CAAC,CAAC;AACJ,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEpC,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC;KAC7D,CAAC,IAAI,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,MAAM,GAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CAC9G,CAAC,CAAA;AAGF,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAEzD;KACC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC9C,GAKC,eAAe,CAAC,CAAC,CAAC,CAAC;AAErB,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,IAAI,IAAI,OAAO,CAAC;KAC1C,GAAG,IAAI,UAAU,GAAG,CAAC,SAAS,QAAQ,GACrC,UAAU,CAAC;SACR,KAAK,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KACvD,CAAC,GAAG,GAAG;CAKX,CAAC,CAAC;AAOH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAClD,eAAe,CAAC,CAAC,CAAC,CAAA;AAGtB,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,SAAS,GAAE,CAAC,GAAG,SAAS,CAAC;AAK1F,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,SAAS,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAC/D;IAAE,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;CAAE,GAC1C;IAAE,GAAG,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;CAAE,GAC3B,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAC3B,YAAY,CAAC,CAAC,CAAC,CAIjB;AAKD,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,IAAI;KACvD,GAAG,IAAI,MAAM,OAAO,CAAC,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC,GAAG,GAAG;CACxD,CAAA"}

package/dist/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../lib/filters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../lib/filters.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -72,7 +72,7 @@ export type DBSchemaTable = {
 };
 export type FieldFilter<T extends AnyObject = AnyObject> = SelectTyped<T>;
 export type AscOrDesc = 1 | -1 | boolean;
-export type _OrderBy<T = AnyObject> = {
+export type _OrderBy<T extends AnyObject> = {
     [K in keyof Partial<T>]: AscOrDesc;
 } | {
     [K in keyof Partial<T>]: AscOrDesc;
@@ -82,7 +82,7 @@ export type _OrderBy<T = AnyObject> = {
     nulls?: "last" | "first";
     nullEmpty?: boolean;
 }[] | Array<keyof T> | keyof T;
-export type OrderBy<T = AnyObject> = _OrderBy<T> | _OrderBy<AnyObject>;
+export type OrderBy<T extends AnyObject | void = void> = T extends AnyObject ? _OrderBy<T> : _OrderBy<AnyObject>;
 type CommonSelect = "*" | "" | {
     "*": 1;
 };
@@ -123,7 +123,13 @@ type SelectFuncs<T extends AnyObject = AnyObject, IsTyped = false> = (({
 } | {
     [K in keyof Partial<T>]: 0 | false;
 } | CommonSelect | (keyof Partial<T>)[]);
-export type Select<T extends AnyObject | void = void> = T extends AnyObject ? SelectFuncs<T & {
+export type Select<T extends AnyObject | void = void, S = void> = {
+    t: T;
+    s: S;
+} extends {
+    t: AnyObject;
+    s: any;
+} ? SelectFuncs<T & {
     $rowhash: string;
 }, true> : SelectFuncs<AnyObject & {
     $rowhash: string;
@@ -137,49 +143,29 @@ type CommonSelectParams = {
     groupBy?: boolean;
     returnType?: "row" | "value" | "values" | "statement";
 };
-export type SelectParams<T extends AnyObject | void = void> = CommonSelectParams & {
-    select?: Select<T>;
-    orderBy?: OrderBy<T>;
+export type SelectParams<T extends AnyObject | void = void, S = void> = CommonSelectParams & {
+    select?: Select<T, S>;
+    orderBy?: OrderBy<S extends DBSchema ? T : void>;
 };
-export type SubscribeParams<T extends AnyObject | void = void> = SelectParams<T> & {
+export type SubscribeParams<T extends AnyObject | void = void, S = void> = SelectParams<T, S> & {
     throttle?: number;
     throttleOpts?: {
         skipFirst?: boolean;
     };
 };
-export type UpdateParams<T extends AnyObject | void = void> = {
-    returning?: Select<T>;
+export type UpdateParams<T extends AnyObject | void = void, S = void> = {
+    returning?: Select<T, S>;
     onConflictDoNothing?: boolean;
     fixIssues?: boolean;
     multi?: boolean;
 };
-export type InsertParams<T extends AnyObject | void = void> = {
-    returning?: Select<T>;
+export type InsertParams<T extends AnyObject | void = void, S = void> = {
+    returning?: Select<T, S>;
     onConflictDoNothing?: boolean;
     fixIssues?: boolean;
 };
-export type DeleteParams<T extends AnyObject | void = void> = {
-    returning?: Select<T>;
-};
-export type SubscribeParamsBasic = CommonSelectParams & {
-    throttle?: number;
-    throttleOpts?: {
-        skipFirst?: boolean;
-    };
-};
-export type UpdateParamsBasic = {
-    returning?: SelectBasic;
-    onConflictDoNothing?: boolean;
-    fixIssues?: boolean;
-    multi?: boolean;
-};
-export type InsertParamsBasic = {
-    returning?: SelectBasic;
-    onConflictDoNothing?: boolean;
-    fixIssues?: boolean;
-};
-export type DeleteParamsBasic = {
-    returning?: SelectBasic;
+export type DeleteParams<T extends AnyObject | void = void, S = void> = {
+    returning?: Select<T, S>;
 };
 export type PartialLax<T = AnyObject> = Partial<T> & AnyObject;
 export type TableInfo = {
@@ -204,7 +190,7 @@ type ParseSelect<Select extends SelectParams<TD>["select"], TD extends AnyObject
 } ? Required<TD> : {}) & {
     [Key in keyof Omit<Select, "*">]: Select[Key] extends 1 ? Required<TD>[Key] : Select[Key] extends Record<string, any[]> ? any : Select[Key] extends JoinedSelect ? any[] : any;
 };
-type GetSelectDataType<O extends SelectParams<TD>, TD extends AnyObject> = O extends {
+type GetSelectDataType<S, O extends SelectParams<TD, S>, TD extends AnyObject> = O extends {
     returnType: "value";
 } ? any : O extends {
     returnType: "values";
@@ -220,10 +206,10 @@ type GetSelectDataType<O extends SelectParams<TD>, TD extends AnyObject> = O ext
 } ? Omit<Required<TD>, keyof O["select"]> : O extends {
     select: Record<string, any>;
 } ? ParseSelect<O["select"], Required<TD>> : Required<TD>;
-export type GetSelectReturnType<O extends SelectParams<TD>, TD extends AnyObject, isMulti extends boolean> = O extends {
+export type GetSelectReturnType<S, O extends SelectParams<TD, S>, TD extends AnyObject, isMulti extends boolean> = O extends {
     returnType: "statement";
-} ? string : isMulti extends true ? GetSelectDataType<O, TD>[] : GetSelectDataType<O, TD>;
-type GetUpdateReturnType<O extends UpdateParams, TD extends AnyObject> = O extends {
+} ? string : isMulti extends true ? GetSelectDataType<S, O, TD>[] : GetSelectDataType<S, O, TD>;
+type GetUpdateReturnType<O extends UpdateParams<TD, S>, TD extends AnyObject, S = void> = O extends {
     returning: "*";
 } ? Required<TD> : O extends {
     returning: "";
@@ -244,10 +230,10 @@ type GetColumns = (lang?: string, params?: {
 export type ViewHandler<TD extends AnyObject = AnyObject, S = void> = {
     getInfo?: (lang?: string) => Promise<TableInfo>;
     getColumns?: GetColumns;
-    find: <P extends SelectParams<TD>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<GetSelectReturnType<P, TD, true>>;
-    findOne: <P extends SelectParams<TD>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<undefined | GetSelectReturnType<P, TD, false>>;
-    subscribe: <P extends SubscribeParams<TD>>(filter: FullFilter<TD, S>, params: P, onData: (items: GetSelectReturnType<P, TD, true>) => any, onError?: OnError) => Promise<SubscriptionHandler<TD>>;
-    subscribeOne: <P extends SubscribeParams<TD>>(filter: FullFilter<TD, S>, params: P, onData: (item: GetSelectReturnType<P, TD, false> | undefined) => any, onError?: OnError) => Promise<SubscriptionHandler<TD>>;
+    find: <P extends SelectParams<TD, S>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<GetSelectReturnType<S, P, TD, true>>;
+    findOne: <P extends SelectParams<TD, S>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<undefined | GetSelectReturnType<S, P, TD, false>>;
+    subscribe: <P extends SubscribeParams<TD, S>>(filter: FullFilter<TD, S>, params: P, onData: (items: GetSelectReturnType<S, P, TD, true>) => any, onError?: OnError) => Promise<SubscriptionHandler<TD>>;
+    subscribeOne: <P extends SubscribeParams<TD, S>>(filter: FullFilter<TD, S>, params: P, onData: (item: GetSelectReturnType<S, P, TD, false> | undefined) => any, onError?: OnError) => Promise<SubscriptionHandler<TD>>;
     count: (filter?: FullFilter<TD, S>) => Promise<number>;
     size: (filter?: FullFilter<TD>, selectParams?: SelectParams<TD>) => Promise<string>;
 };
@@ -257,32 +243,11 @@ export type UpsertDataToPGCast<TD extends AnyObject = AnyObject> = {
 type UpsertDataToPGCastLax<T extends AnyObject> = PartialLax<UpsertDataToPGCast<T>>;
 type InsertData<T extends AnyObject> = UpsertDataToPGCast<T> | UpsertDataToPGCast<T>[];
 export type TableHandler<TD extends AnyObject = AnyObject, S = void> = ViewHandler<TD, S> & {
-    update: <P extends UpdateParams<TD>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P, TD> | undefined>;
+    update: <P extends UpdateParams<TD, S>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P, TD, S> | undefined>;
     updateBatch: (data: [FullFilter<TD, S>, UpsertDataToPGCastLax<TD>][], params?: UpdateParams<TD>) => Promise<PartialLax<TD> | void>;
-    upsert: <P extends UpdateParams<TD>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P, TD>>;
-    insert: <P extends UpdateParams<TD>, Data extends InsertData<TD>>(data: Data, params?: P) => Promise<GetUpdateReturnType<P, TD>>;
-    delete: <P extends DeleteParams<TD>>(filter?: FullFilter<TD, S>, params?: P) => Promise<GetUpdateReturnType<P, TD> | undefined>;
-};
-export type ViewHandlerBasic = {
-    getInfo?: (lang?: string) => Promise<TableInfo>;
-    getColumns?: GetColumns;
-    find: <TD = AnyObject>(filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<PartialLax<TD>[]>;
-    findOne: <TD = AnyObject>(filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<PartialLax<TD>>;
-    subscribe: <TD = AnyObject>(filter: FullFilterBasic, params: SubscribeParamsBasic, onData: (items: PartialLax<TD>[]) => void, onError?: OnError) => Promise<{
-        unsubscribe: () => any;
-    }>;
-    subscribeOne: <TD = AnyObject>(filter: FullFilterBasic, params: SubscribeParamsBasic, onData: (item: PartialLax<TD> | undefined) => any, onError?: OnError) => Promise<{
-        unsubscribe: () => any;
-    }>;
-    count: (filter?: FullFilterBasic) => Promise<number>;
-    size: (filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<string>;
-};
-export type TableHandlerBasic = ViewHandlerBasic & {
-    update: <TD = AnyObject>(filter: FullFilterBasic, newData: PartialLax<TD>, params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
-    updateBatch: <TD = AnyObject>(data: [FullFilterBasic, PartialLax<TD>][], params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
-    upsert: <TD = AnyObject>(filter: FullFilterBasic, newData: PartialLax<TD>, params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
-    insert: <TD = AnyObject>(data: (PartialLax<TD> | PartialLax<TD>[]), params?: InsertParamsBasic) => Promise<PartialLax<TD> | void>;
-    delete: <TD = AnyObject>(filter?: FullFilterBasic, params?: DeleteParamsBasic) => Promise<PartialLax<TD> | void>;
+    upsert: <P extends UpdateParams<TD, S>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P, TD, S>>;
+    insert: <P extends UpdateParams<TD, S>, Data extends InsertData<TD>>(data: Data, params?: P) => Promise<GetUpdateReturnType<P, TD, S>>;
+    delete: <P extends DeleteParams<TD, S>>(filter?: FullFilter<TD, S>, params?: P) => Promise<GetUpdateReturnType<P, TD, S> | undefined>;
 };
 export type JoinMaker<TT extends AnyObject = AnyObject> = (filter?: FullFilter<TT>, select?: Select<TT>, options?: SelectParams<TT>) => any;
 export type JoinMakerBasic = (filter?: FullFilterBasic, select?: SelectBasic, options?: SelectParams) => any;
@@ -340,16 +305,6 @@ export type DBHandler<S = void> = (S extends DBSchema ? {
 }) & DbJoinMaker & {
     sql?: SQLHandler;
 };
-export type DBHandlerBasic = {
-    [key: string]: Partial<TableHandlerBasic>;
-} & {
-    innerJoin: TableJoinBasic;
-    leftJoin: TableJoinBasic;
-    innerJoinOne: TableJoinBasic;
-    leftJoinOne: TableJoinBasic;
-} & {
-    sql?: SQLHandler;
-};
 export type DBNoticeConfig = {
     socketChannel: string;
     socketUnsubChannel: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -50,33 +50,6 @@ exports.TS_PG_Types = {
 };
 exports.JOIN_KEYS = ["$innerJoin", "$leftJoin"];
 exports.JOIN_PARAMS = ["select", "filter", "$path", "$condition", "offset", "limit", "orderBy"];
-const fs = {
-    a: 1,
-    c: 1,
-    ddd: { dwa: [2] }
-};
-const sel = {
-    a: 1,
-    $rowhash: 1,
-    dwadwA: { dwdwa: [5] }
-};
-const sds = sel;
-const sds01 = "";
-const sds02 = "*";
-const sds03 = {};
-const sds2 = sel;
-const badSel = {
-    a: 1,
-    b: 0
-};
-const badSel1 = {
-    b: 1,
-    a: 1
-};
-const sds3 = {
-    a: { dwda: [] },
-    $rowhashD: { dwda: [] },
-};
 const preffix = "_psqlWS_.";
 exports.CHANNELS = {
     SCHEMA_CHANGED: preffix + "schema-changed",
@@ -103,6 +76,80 @@ exports.RULE_METHODS = {
     "sync": ["sync", "unsync"],
     "subscribe": ["unsubscribe", "subscribe", "subscribeOne"],
 };
+(() => {
+    const r = 1;
+    const sel1 = { id: 1, name: 1, public: 1, $rowhash: 1, added_day: { $day: [] } };
+    const sel2 = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
+    const sel3 = "";
+    const sel4 = "*";
+    const sel12 = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
+    const sel13 = "";
+    const sel14 = "*";
+    const fRow = {
+        $rowhash: { "$in": [""] }
+    };
+    const emptyFilter = {};
+    const sel32 = {
+        dwa: 1
+    };
+    const sel = {
+        a: 1,
+        $rowhash: 1,
+        dwadwA: { dwdwa: [5] }
+    };
+    const sds = sel;
+    const sds01 = "";
+    const sds02 = "*";
+    const sds03 = {};
+    const sds2 = sel;
+    const s001 = {
+        h: { "$ts_headline_simple": ["name", { plainto_tsquery: "abc81" }] },
+        hh: { "$ts_headline": ["name", "abc81"] },
+        added: "$date_trunc_2hour",
+        addedY: { "$date_trunc_5minute": ["added"] },
+    };
+    const badSel = {
+        a: 1,
+        b: 0
+    };
+    const badSel1 = {
+        b: 1,
+        a: 1
+    };
+    const sds3 = {
+        a: { dwda: [] },
+        $rowhashD: { dwda: [] },
+    };
+    const sel1d = {
+        dwada: 1,
+        $rowhash: 1,
+        dwawd: { funcName: [12] }
+    };
+    const sel1d2 = ["a"];
+    const deletePar = {
+        returning: { id: 1, name: 1, public: 1, $rowhash: 1, added_day: { "$day": ["added"] } }
+    };
+});
+(() => {
+    const schemaFFilter = { "col1.$eq": "dd" };
+    const fullFilter = schemaFFilter;
+    const ffFunc = (f) => { };
+    ffFunc(schemaFFilter);
+    const dbo = 1;
+    const filter = {};
+    const filterCheck = (f) => { };
+    filterCheck(filter);
+    const t = {};
+    const d = t;
+    const fup = (a) => { };
+    fup(t);
+    const f = (s) => { };
+    const th = {};
+    const sp = { select: {} };
+    const sf = (sp) => {
+    };
+    sf(sp);
+});
 var util_1 = require("./util");
 Object.defineProperty(exports, "asName", { enumerable: true, get: function () { return util_1.asName; } });
 Object.defineProperty(exports, "pickKeys", { enumerable: true, get: function () { return util_1.pickKeys; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}

package/lib/filters.ts

@@ -248,14 +248,15 @@ export type FilterItem<T extends AnyObject = AnyObject> =
   | FilterForObject<T> 
 
 
+export type AnyObjIfVoid<T extends AnyObject | void> = T extends AnyObject? T : AnyObject;
 /**
  * Full filter
  * @example { $or: [ { id: 1 }, { status: 'live' } ] }
  */
-export type FullFilter<T extends AnyObject = AnyObject, S = void> = 
- | { $and: FullFilter<T, S>[] } 
+export type FullFilter<T extends AnyObject | void = void, S = void> = 
+ | { $and: FullFilter<AnyObjIfVoid<T>, S>[] } 
  | { $or: FullFilter<T, S>[] } 
- | FilterItem<T> 
+ | FilterItem<AnyObjIfVoid<T>> 
  | ExistsFilter<S>
 
  /** Not implemented yet */

package/lib/index.ts

@@ -242,18 +242,15 @@ export type AscOrDesc = 1 | -1 | boolean;
  * Array order is maintained
  * if nullEmpty is true then empty text will be replaced to null (so nulls sorting takes effect on it)
  */
-export type _OrderBy<T = AnyObject> = 
+export type _OrderBy<T extends AnyObject> = 
   | { [K in keyof Partial<T>]: AscOrDesc }
   | { [K in keyof Partial<T>]: AscOrDesc }[]
   | { key: keyof T, asc?: AscOrDesc, nulls?: "last" | "first", nullEmpty?: boolean }[] 
   | Array<keyof T>
   | keyof T
   ;
-
-export type OrderBy<T = AnyObject> = 
-  | _OrderBy<T>
-  | _OrderBy<AnyObject>
-  ;
+  
+export type OrderBy<T extends AnyObject | void = void> = T extends AnyObject? _OrderBy<T> :  _OrderBy<AnyObject>;
 
 type CommonSelect =  
 | "*"
@@ -310,26 +307,6 @@ type FunctionSelect = FunctionShorthand | FunctionFull;
  */
 type FunctionAliasedSelect = Record<string, FunctionFull>;
 
-type FSel <T extends AnyObject = AnyObject> = Partial<{
-  [K in keyof Partial<AnyObject>]: T[K] extends any? (1 | true | FunctionFull) : never;
-}> & ({
-  [K in keyof Partial<T>]: (true | 1 | FunctionSelect);
-} | {
-  [K in keyof Partial<T>]: (false | 0);
-});
-// { 
-//   h: { "$ts_headline_simple": ["name", { plainto_tsquery: "abc81" }] },
-//   hh: { "$ts_headline": ["name", "abc81"] } ,
-//   added: "$date_trunc_2hour",
-//   addedY: { "$date_trunc_5minute": ["added"] }
-// }
-const fs: FSel<{ a: number; c: string}> = {
-  // const fs: FSel = {
-  a: 1,
-  c: 1,
-  ddd: { dwa: [2] }
-}
-
 type InclusiveSelect = true | 1 | FunctionSelect
 
 type SelectFuncs<T extends AnyObject = AnyObject, IsTyped = false> = (
@@ -342,42 +319,9 @@ type SelectFuncs<T extends AnyObject = AnyObject, IsTyped = false> = (
   | (keyof Partial<T>)[]
 );
 
-export type Select<T extends AnyObject | void = void> = T extends AnyObject? SelectFuncs<T & { $rowhash: string }, true> : SelectFuncs<AnyObject & { $rowhash: string }, false>;
-
-/**
- * Type tests
- */
-const sel = {
-  a: 1,
-  $rowhash: 1,
-  dwadwA: { dwdwa: [5] }
-} as const; 
-
-const sds: Select = sel;
-const sds01: Select = "";
-const sds02: Select = "*";
-const sds03: Select = {};
-const sds2: Select<{a: number}> = sel;
-
-//@ts-expect-error
-const badSel: Select = {
-  a: 1,
-  b: 0
-};
-
-//@ts-expect-error
-const badSel1: Select<{a: number}> = {
-  b: 1,
-  a: 1
-};
+/** S param is needed to ensure the non typed select works fine */
+export type Select<T extends AnyObject | void = void, S = void> = { t: T, s: S } extends { t: AnyObject, s: any } ? SelectFuncs<T & { $rowhash: string }, true> : SelectFuncs<AnyObject & { $rowhash: string }, false>;
 
-const sds3: Select<{a: number}> = {
-  // "*": 1,
-  // a: "$funcName",
-  a: { dwda: [] },
-  $rowhashD: { dwda: [] },
-  // dwadwa: 1, //{ dwa: []}
-}
 
 
 export type SelectBasic = 
@@ -428,11 +372,11 @@ type CommonSelectParams = {
 //  ;
 // }
 
-export type SelectParams<T extends AnyObject | void = void> = CommonSelectParams & {
-  select?: Select<T>;
-  orderBy?: OrderBy<T>;
+export type SelectParams<T extends AnyObject | void = void, S = void> = CommonSelectParams & {
+  select?: Select<T, S>;
+  orderBy?: OrderBy<S extends DBSchema? T : void>;
 }
-export type SubscribeParams<T extends AnyObject | void = void> = SelectParams<T> & {
+export type SubscribeParams<T extends AnyObject | void = void, S = void> = SelectParams<T, S> & {
   throttle?: number;
   throttleOpts?: {
     /** 
@@ -443,50 +387,50 @@ export type SubscribeParams<T extends AnyObject | void = void> = SelectParams<T>
   };
 };
 
-export type UpdateParams<T extends AnyObject | void = void> = {
-  returning?: Select<T>;
+export type UpdateParams<T extends AnyObject | void = void, S = void> = {
+  returning?: Select<T, S>;
   onConflictDoNothing?: boolean;
   fixIssues?: boolean;
 
   /* true by default. If false the update will fail if affecting more than one row */
   multi?: boolean;
 }
-export type InsertParams<T extends AnyObject | void = void> = {
-  returning?: Select<T>;
+export type InsertParams<T extends AnyObject | void = void, S = void> = {
+  returning?: Select<T, S>;
   onConflictDoNothing?: boolean;
   fixIssues?: boolean;
 }
-export type DeleteParams<T extends AnyObject | void = void> = {
-  returning?: Select<T>;
+export type DeleteParams<T extends AnyObject | void = void, S = void> = {
+  returning?: Select<T, S>;
 }
 
-export type SubscribeParamsBasic = CommonSelectParams & {
-  throttle?: number;
-  throttleOpts?: {
-    /** 
-     * False by default. 
-     * If true then the first value will be emitted at the end of the interval. Instant otherwise 
-     * */
-    skipFirst?: boolean;
-  };
-};
-
-export type UpdateParamsBasic = {
-  returning?: SelectBasic;
-  onConflictDoNothing?: boolean;
-  fixIssues?: boolean;
-
-  /* true by default. If false the update will fail if affecting more than one row */
-  multi?: boolean;
-}
-export type InsertParamsBasic = {
-  returning?: SelectBasic;
-  onConflictDoNothing?: boolean;
-  fixIssues?: boolean;
-}
-export type DeleteParamsBasic = {
-  returning?: SelectBasic;
-}
+// export type SubscribeParamsBasic = CommonSelectParams & {
+//   throttle?: number;
+//   throttleOpts?: {
+//     /** 
+//      * False by default. 
+//      * If true then the first value will be emitted at the end of the interval. Instant otherwise 
+//      * */
+//     skipFirst?: boolean;
+//   };
+// };
+
+// export type UpdateParamsBasic = {
+//   returning?: SelectBasic;
+//   onConflictDoNothing?: boolean;
+//   fixIssues?: boolean;
+
+//   /* true by default. If false the update will fail if affecting more than one row */
+//   multi?: boolean;
+// }
+// export type InsertParamsBasic = {
+//   returning?: SelectBasic;
+//   onConflictDoNothing?: boolean;
+//   fixIssues?: boolean;
+// }
+// export type DeleteParamsBasic = {
+//   returning?: SelectBasic;
+// }
 /**
  * Adds unknown props to object
  * Used in represent data returned from a query that can have arbitrary computed fields
@@ -548,7 +492,7 @@ type ParseSelect<Select extends SelectParams<TD>["select"], TD extends AnyObject
     any;
 }
 
-type GetSelectDataType<O extends SelectParams<TD>, TD extends AnyObject> = 
+type GetSelectDataType<S, O extends SelectParams<TD, S>, TD extends AnyObject> = 
   O extends { returnType: "value" }? any : 
   O extends { returnType: "values"; select: Record<string, 1> }? ValueOf<Pick<Required<TD>, keyof O["select"]>> : 
   O extends { returnType: "values" }? any : 
@@ -558,12 +502,12 @@ type GetSelectDataType<O extends SelectParams<TD>, TD extends AnyObject> =
   O extends { select: Record<string, any> }? ParseSelect<O["select"], Required<TD>> : 
   Required<TD>;
 
-export type GetSelectReturnType<O extends SelectParams<TD>, TD extends AnyObject, isMulti extends boolean> = 
+export type GetSelectReturnType<S, O extends SelectParams<TD, S>, TD extends AnyObject, isMulti extends boolean> = 
   O extends { returnType: "statement" }? string : 
-  isMulti extends true? GetSelectDataType<O, TD>[] :
-  GetSelectDataType<O, TD>;
+  isMulti extends true? GetSelectDataType<S, O, TD>[] :
+  GetSelectDataType<S, O, TD>;
 
-type GetUpdateReturnType<O extends UpdateParams, TD extends AnyObject> = 
+type GetUpdateReturnType<O extends UpdateParams<TD, S>, TD extends AnyObject, S = void> = 
   O extends { returning: "*" }? Required<TD> : 
   O extends { returning: "" }? Record<string, never> : 
   O extends { returning: Record<string, 1> }? Pick<Required<TD>, keyof O["returning"]> : 
@@ -580,18 +524,18 @@ type GetColumns = (lang?: string, params?: { rule: "update", data: AnyObject, fi
 export type ViewHandler<TD extends AnyObject = AnyObject, S = void> = {
   getInfo?: (lang?: string) => Promise<TableInfo>;
   getColumns?: GetColumns
-  find: <P extends SelectParams<TD>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<GetSelectReturnType<P, TD, true>>;
-  findOne: <P extends SelectParams<TD>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<undefined | GetSelectReturnType<P, TD, false>>;
-  subscribe: <P extends SubscribeParams<TD>>(
+  find: <P extends SelectParams<TD, S>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<GetSelectReturnType<S, P, TD, true>>;
+  findOne: <P extends SelectParams<TD, S>>(filter?: FullFilter<TD, S>, selectParams?: P) => Promise<undefined | GetSelectReturnType<S, P, TD, false>>;
+  subscribe: <P extends SubscribeParams<TD, S>>(
     filter: FullFilter<TD, S>, 
     params: P, 
-    onData: (items: GetSelectReturnType<P, TD, true>) => any,
+    onData: (items: GetSelectReturnType<S, P, TD, true>) => any,
     onError?: OnError
   ) => Promise<SubscriptionHandler<TD>>;
-  subscribeOne: <P extends SubscribeParams<TD>>(
+  subscribeOne: <P extends SubscribeParams<TD, S>>(
     filter: FullFilter<TD, S>, 
     params: P, 
-    onData: (item: GetSelectReturnType<P, TD, false> | undefined) => any, 
+    onData: (item: GetSelectReturnType<S, P, TD, false> | undefined) => any, 
     onError?: OnError
   ) => Promise<SubscriptionHandler<TD>>;
   count: (filter?: FullFilter<TD, S>) => Promise<number>;
@@ -609,35 +553,35 @@ type UpsertDataToPGCastLax<T extends AnyObject> = PartialLax<UpsertDataToPGCast<
 type InsertData<T extends AnyObject> = UpsertDataToPGCast<T> | UpsertDataToPGCast<T>[]
 
 export type TableHandler<TD extends AnyObject = AnyObject, S = void> = ViewHandler<TD, S> & {
-  update: <P extends UpdateParams<TD>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P ,TD> | undefined>;
+  update: <P extends UpdateParams<TD, S>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P ,TD, S> | undefined>;
   updateBatch: (data: [FullFilter<TD, S>, UpsertDataToPGCastLax<TD>][], params?: UpdateParams<TD>) => Promise<PartialLax<TD> | void>;
-  upsert: <P extends UpdateParams<TD>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P ,TD>>;
+  upsert: <P extends UpdateParams<TD, S>>(filter: FullFilter<TD, S>, newData: UpsertDataToPGCastLax<TD>, params?: P) => Promise<GetUpdateReturnType<P ,TD, S>>;
   // insert: <P extends UpdateParams<TD>>(data: (UpsertDataToPGCast<TD> | UpsertDataToPGCast<TD>[]), params?: P ) => Promise<GetUpdateReturnType<P ,TD>>;
-  insert: <P extends UpdateParams<TD>, Data extends InsertData<TD>>(data: Data, params?: P ) => Promise<GetUpdateReturnType<P ,TD>>;
-  delete: <P extends DeleteParams<TD>>(filter?: FullFilter<TD, S>, params?: P) => Promise<GetUpdateReturnType<P ,TD> | undefined>;
+  insert: <P extends UpdateParams<TD, S>, Data extends InsertData<TD>>(data: Data, params?: P ) => Promise<GetUpdateReturnType<P ,TD, S>>;
+  delete: <P extends DeleteParams<TD, S>>(filter?: FullFilter<TD, S>, params?: P) => Promise<GetUpdateReturnType<P ,TD, S> | undefined>;
 }
 
-export type ViewHandlerBasic = {
-  getInfo?: (lang?: string) => Promise<TableInfo>;
-  getColumns?: GetColumns
-  find: <TD = AnyObject>(filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<PartialLax<TD>[]>;
-  findOne: <TD = AnyObject>(filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<PartialLax<TD>>;
-  subscribe: <TD = AnyObject>(filter: FullFilterBasic, params: SubscribeParamsBasic, onData: (items: PartialLax<TD>[]) => void, onError?: OnError) => Promise<{ unsubscribe: () => any }>;
-  subscribeOne: <TD = AnyObject>(filter: FullFilterBasic, params: SubscribeParamsBasic, onData: (item: PartialLax<TD> | undefined) => any, onError?: OnError) => Promise<{ unsubscribe: () => any }>;
-  count: (filter?: FullFilterBasic) => Promise<number>;
-  /**
-   * Returns result size in bits
-   */
-  size: (filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<string>;
-}
+// export type ViewHandlerBasic = {
+//   getInfo?: (lang?: string) => Promise<TableInfo>;
+//   getColumns?: GetColumns
+//   find: <TD = AnyObject>(filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<PartialLax<TD>[]>;
+//   findOne: <TD = AnyObject>(filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<PartialLax<TD>>;
+//   subscribe: <TD = AnyObject>(filter: FullFilterBasic, params: SubscribeParamsBasic, onData: (items: PartialLax<TD>[]) => void, onError?: OnError) => Promise<{ unsubscribe: () => any }>;
+//   subscribeOne: <TD = AnyObject>(filter: FullFilterBasic, params: SubscribeParamsBasic, onData: (item: PartialLax<TD> | undefined) => any, onError?: OnError) => Promise<{ unsubscribe: () => any }>;
+//   count: (filter?: FullFilterBasic) => Promise<number>;
+//   /**
+//    * Returns result size in bits
+//    */
+//   size: (filter?: FullFilterBasic, selectParams?: SelectParams) => Promise<string>;
+// }
 
-export type TableHandlerBasic = ViewHandlerBasic & {
-  update: <TD = AnyObject>(filter: FullFilterBasic, newData: PartialLax<TD>, params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
-  updateBatch: <TD = AnyObject>(data: [FullFilterBasic, PartialLax<TD>][], params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
-  upsert: <TD = AnyObject>(filter: FullFilterBasic, newData: PartialLax<TD>, params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
-  insert: <TD = AnyObject>(data: (PartialLax<TD> | PartialLax<TD>[]), params?: InsertParamsBasic) => Promise<PartialLax<TD> | void>;
-  delete: <TD = AnyObject>(filter?: FullFilterBasic, params?: DeleteParamsBasic) => Promise<PartialLax<TD> | void>;
-}
+// export type TableHandlerBasic = ViewHandlerBasic & {
+//   update: <TD = AnyObject>(filter: FullFilterBasic, newData: PartialLax<TD>, params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
+//   updateBatch: <TD = AnyObject>(data: [FullFilterBasic, PartialLax<TD>][], params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
+//   upsert: <TD = AnyObject>(filter: FullFilterBasic, newData: PartialLax<TD>, params?: UpdateParamsBasic) => Promise<PartialLax<TD> | void>;
+//   insert: <TD = AnyObject>(data: (PartialLax<TD> | PartialLax<TD>[]), params?: InsertParamsBasic) => Promise<PartialLax<TD> | void>;
+//   delete: <TD = AnyObject>(filter?: FullFilterBasic, params?: DeleteParamsBasic) => Promise<PartialLax<TD> | void>;
+// }
 
 export type JoinMaker<TT extends AnyObject = AnyObject> = (filter?: FullFilter<TT>, select?: Select<TT>, options?: SelectParams<TT>) => any;
 export type JoinMakerBasic = (filter?: FullFilterBasic, select?: SelectBasic, options?: SelectParams) => any;
@@ -737,16 +681,16 @@ export type DBHandler<S = void> = (S extends DBSchema? {
 /**
  * Simpler DBHandler types to reduce load on TS
  */
-export type DBHandlerBasic = {
-  [key: string]: Partial<TableHandlerBasic>;
-} & {
-  innerJoin: TableJoinBasic;
-  leftJoin: TableJoinBasic;
-  innerJoinOne: TableJoinBasic;
-  leftJoinOne: TableJoinBasic;
-} & {
-  sql?: SQLHandler
-}
+// export type DBHandlerBasic = {
+//   [key: string]: Partial<TableHandlerBasic>;
+// } & {
+//   innerJoin: TableJoinBasic;
+//   leftJoin: TableJoinBasic;
+//   innerJoinOne: TableJoinBasic;
+//   leftJoinOne: TableJoinBasic;
+// } & {
+//   sql?: SQLHandler
+// }
 
 
 
@@ -944,6 +888,146 @@ export type ProstglesError = {
   columns?: string[];
 }
 
+
+/**
+ * Type tests
+ */
+ (( ) => {
+
+  type Fields =  { id: number; name: number; public: number; $rowhash: string; added_day: any }
+  const r:Fields = 1 as any
+  const sel1: Select = { id: 1, name: 1, public: 1, $rowhash: 1, added_day: { $day: []  } };
+  const sel2: Select<{ id: number; name: number; public: number; }> = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
+  const sel3: Select<{ id: number; name: number; public: number; }> = ""
+  const sel4: Select<{ id: number; name: number; public: number; }> = "*"
+  const sel12: Select = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
+  const sel13: Select = ""
+  const sel14: Select = "*";
+
+  const fRow: FullFilter<Fields> = {
+    $rowhash: { "$in": [""] }
+  };
+  const emptyFilter: FullFilter<Fields> = {
+  };
+
+  const sel32: Select = {
+    dwa: 1
+  }
+  
+  const sel = {
+    a: 1,
+    $rowhash: 1,
+    dwadwA: { dwdwa: [5] }
+  } as const; 
+  
+  const sds: Select = sel;
+  const sds01: Select = "";
+  const sds02: Select = "*";
+  const sds03: Select = {};
+  const sds2: Select<{a: number}> = sel;
+  
+  const s001: Select = { 
+    h: { "$ts_headline_simple": ["name", { plainto_tsquery: "abc81" }] },
+    hh: { "$ts_headline": ["name", "abc81"] } ,
+    added: "$date_trunc_2hour",
+    addedY: { "$date_trunc_5minute": ["added"] },
+  }
+  
+  //@ts-expect-error
+  const badSel: Select = {
+    a: 1,
+    b: 0
+  };
+  
+  //@ts-expect-error
+  const badSel1: Select<{a: number}> = {
+    b: 1,
+    a: 1
+  };
+  
+  const sds3: Select<{a: number}> = {
+    // "*": 1,
+    // a: "$funcName",
+    a: { dwda: [] },
+    $rowhashD: { dwda: [] },
+    // dwadwa: 1, //{ dwa: []}
+  }
+
+
+  const sel1d: Select = {
+    dwada: 1,
+    $rowhash: 1,
+    dwawd: { funcName: [12] }
+  }
+
+  const sel1d2: Select<AnyObject> = ["a"]
+
+  const deletePar: DeleteParams = {
+    returning: { id: 1, name: 1, public: 1 , $rowhash: 1, added_day: { "$day": ["added"] } }
+  }
+});
+
+/** More Type tests */
+(() => {
+
+  type GSchema = {
+    tbl1: {
+      is_view: false,
+      columns: {
+        col1: string,
+      },
+      delete: true,
+      select: true,
+      insert: true,
+      update: true,
+    }
+  };
+
+    
+  type DBOFullyTyped<Schema = void> = Schema extends DBSchema ? {
+    [tov_name in keyof Schema]: Schema[tov_name]["is_view"] extends true ?
+    ViewHandler<Schema[tov_name]["columns"], Schema> :
+    TableHandler<Schema[tov_name]["columns"], Schema>
+  } : Record<string, ViewHandler | TableHandler>;
+  
+
+  type TypedFFilter = FullFilter<GSchema["tbl1"]["columns"], GSchema>
+  const schemaFFilter: TypedFFilter = { "col1.$eq": "dd" };
+  const fullFilter: FullFilter = schemaFFilter;
+  
+  const ffFunc = (f: FullFilter) => {};
+  ffFunc(schemaFFilter);
+  // const thandler: TableHandler = 
+  
+  const dbo: DBOFullyTyped<GSchema> = 1 as any;
+  
+  const filter: FullFilter<GSchema["tbl1"]["columns"], GSchema> = {  };
+  
+  const filterCheck = <F extends FullFilter | undefined>(f: F) => {};
+  filterCheck(filter);
+  
+  const t: UpsertDataToPGCast<GSchema["tbl1"]["columns"]> = {} as any;
+  const d: UpsertDataToPGCast<AnyObject> = t;
+  const fup = (a: UpsertDataToPGCast) => {}
+  fup(t);
+
+  // const f = <A extends TableHandler["count"]>(a: A) => {};
+  const f = (s: TableHandler) => {};
+  const th: TableHandler<GSchema["tbl1"]["columns"], GSchema> = {  } as any;
+  // f(th) 
+
+  const sp: SelectParams<GSchema["tbl1"]["columns"]> = { select: {} };
+  const sf = (sp: SelectParams) => {
+
+  }
+  sf(sp);
+  // const sub: TableHandler["count"] = dbo.tbl1.count
+  
+  
+  // ra(schema);
+})
+
+
 // import { md5 } from "./md5";
 // export { get, getTextPatch, unpatchText, isEmpty, WAL, WALConfig, asName } from "./util";
 export type { WALItem, BasicOrderBy, WALItemsObj, WALConfig, TextPatch, SyncTableInfo } from "./util";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-types",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "",
   "main": "dist/index_umd.js",
   "types": "dist/index.d.ts",

package/tests/typeTests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeTests.d.ts","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"AA6OA,eAAO,MAAM,WAAW,YAAW,CAAC"}
+{"version":3,"file":"typeTests.d.ts","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"AA8MA,eAAO,MAAM,WAAW,YAAW,CAAC"}

package/tests/typeTests.js

@@ -90,21 +90,6 @@ exports.typeTestsOK = void 0;
     db.table1.find;
     const result = await db.table2.update({}, { c1: "" }, { returning: "*" });
     result.c2 + 2;
-    const sel = {
-        dwa: 1
-    };
-    const r = 1;
-    const sel1 = { id: 1, name: 1, public: 1, $rowhash: 1, added_day: { $day: [] } };
-    const sel2 = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
-    const sel3 = "";
-    const sel4 = "*";
-    const sel12 = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
-    const sel13 = "";
-    const sel14 = "*";
-    const fRow = {
-        $rowhash: { "$in": [""] }
-    };
-    const emptyFilter = {};
     const ef = {
         $existsJoined: {
             tbl11: {}
@@ -115,46 +100,7 @@ exports.typeTestsOK = void 0;
             tbl1: {}
         }
     };
-    const sel1d = {
-        dwada: 1,
-        $rowhash: 1,
-        dwawd: { funcName: [12] }
-    };
-    const sel1d2 = ["a"];
-    const deletePar = {
-        returning: { id: 1, name: 1, public: 1, $rowhash: 1, added_day: { "$day": ["added"] } }
-    };
 });
 const typeTestsOK = () => { };
 exports.typeTestsOK = typeTestsOK;
-(() => {
-    const schemaFFilter = { "col1.$eq": "dd" };
-    const fullFilter = schemaFFilter;
-    const ffFunc = (f) => { };
-    ffFunc(schemaFFilter);
-    const dbo = 1;
-    const filter = {};
-    const filterCheck = (f) => { };
-    filterCheck(filter);
-    const t = {};
-    const d = t;
-    const fup = (a) => { };
-    fup(t);
-    const f = (s) => { };
-    const th = {};
-    f(th);
-    const ra = (a) => {
-    };
-    const eft = { tbl1: { "col1.$eq": '2' } };
-    const fFilter = (a) => {
-    };
-    fFilter(eft);
-    const ff2 = (a) => {
-    };
-    ff2({ $exists: eft });
-    const sp = { select: {} };
-    const sf = (sp) => {
-    };
-    sf(sp);
-});
 //# sourceMappingURL=typeTests.js.map

package/tests/typeTests.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeTests.js","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typeTests.js","sourceRoot":"","sources":["typeTests.ts"],"names":[],"mappings":"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"}

package/tests/typeTests.ts

@@ -137,19 +137,19 @@ import { ExactlyOne } from "../dist/util";
     };
   }> = 1 as any;
 // const v = await db.sql<{ c: string }>(``)
-  const s: SelectTyped<{ a: number; c: string }> = { a: 1 }
+  const s: SelectTyped<{ a: number; c: string } > = { a: 1 }
 
   // @ts-expect-error
-  const s2: Select<{ a: number; c: string }> = { a: 1 , zz: 1 }
+  const s2: Select<{ a: number; c: string }, 1> = { a: 1 , zz: 1 }
 
   // Correct function
-  const s22: Select<{ a: number; c: string }> = { a: 1 , zz: { $max: ["c"] } }
+  const s22: Select<{ a: number; c: string }, 1> = { a: 1 , zz: { $max: ["c"] } }
 
   // Quick string func notation can only be used against existing column names
   // @ts-expect-error
-  const s3: Select<{ a: number; c: string }> = { a: 1 , cc: "2" }
+  const s3: Select<{ a: number; c: string }, 1> = { a: 1 , cc: "2" }
 
-  const s33: Select<{ a: number; c: string }> = { a: 1 , c: "$max" }
+  const s33: Select<{ a: number; c: string }, 1> = { a: 1 , c: "$max" }
 
   db.view1.find({ "c1.$in": ["2", null] }, { select: { c1: 1, c2: 1 }  });
   db.table1.insert({ c1: "2" }, { returning: { c1: 1, c2: "func", dwad: { dwada: [] } } });
@@ -164,26 +164,7 @@ import { ExactlyOne } from "../dist/util";
 
   const result = await db.table2.update({}, { c1: "" }, { returning: "*" });
   result.c2 + 2;
-
-  const sel: Select = {
-    dwa: 1
-  }
-
-  type Fields =  { id: number; name: number; public: number; $rowhash: string; added_day: any }
-  const r:Fields = 1 as any
-  const sel1: Select = { id: 1, name: 1, public: 1, $rowhash: 1, added_day: { $day: []  } };
-  const sel2: Select<{ id: number; name: number; public: number; }> = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
-  const sel3: Select<{ id: number; name: number; public: number; }> = ""
-  const sel4: Select<{ id: number; name: number; public: number; }> = "*"
-  const sel12: Select = { id: 1, name: 1, public: 1, $rowhash: 1, dsds: { d: [] } };
-  const sel13: Select = ""
-  const sel14: Select = "*";
-
-  const fRow: FullFilter<Fields> = {
-    $rowhash: { "$in": [""] }
-  };
-  const emptyFilter: FullFilter<Fields> = {
-  };
+ 
 
   type SampleSchema = {
     tbl1: {
@@ -221,98 +202,9 @@ import { ExactlyOne } from "../dist/util";
       tbl1: { }
     }
   }
-
-  const sel1d: Select = {
-    dwada: 1,
-    $rowhash: 1,
-    dwawd: { funcName: [12] }
-  }
-
-  const sel1d2: Select<AnyObject> = ["a"]
-
-  const deletePar: DeleteParams = {
-    returning: { id: 1, name: 1, public: 1 , $rowhash: 1, added_day: { "$day": ["added"] } }
-  }
 });
 
 export const typeTestsOK = () => {};
 
 
 
-
-/** Type tests */
-(() => {
-
-  type GSchema = {
-    tbl1: {
-      is_view: false,
-      columns: {
-        col1: string,
-      },
-      delete: true,
-      select: true,
-      insert: true,
-      update: true,
-    }
-  };
-
-    
-  type DBOFullyTyped<Schema = void> = Schema extends DBSchema ? {
-    [tov_name in keyof Schema]: Schema[tov_name]["is_view"] extends true ?
-    ViewHandler<Schema[tov_name]["columns"], Schema> :
-    TableHandler<Schema[tov_name]["columns"], Schema>
-  } : Record<string, ViewHandler | TableHandler>;
-  
-
-  type TypedFFilter = FullFilter<GSchema["tbl1"]["columns"], GSchema>
-  const schemaFFilter: TypedFFilter = { "col1.$eq": "dd" };
-  const fullFilter: FullFilter = schemaFFilter;
-  
-  const ffFunc = (f: FullFilter) => {};
-  ffFunc(schemaFFilter);
-  // const thandler: TableHandler = 
-  
-  const dbo: DBOFullyTyped<GSchema> = 1 as any;
-  
-  const filter: FullFilter<GSchema["tbl1"]["columns"], GSchema> = {  };
-  
-  const filterCheck = <F extends FullFilter | undefined>(f: F) => {};
-  filterCheck(filter);
-  
-  const t: UpsertDataToPGCast<GSchema["tbl1"]["columns"]> = {} as any;
-  const d: UpsertDataToPGCast<AnyObject> = t;
-  const fup = (a: UpsertDataToPGCast) => {}
-  fup(t);
-
-  // const f = <A extends TableHandler["count"]>(a: A) => {};
-  const f = (s: TableHandler) => {};
-  const th: TableHandler<GSchema["tbl1"]["columns"], GSchema> = {  } as any;
-  f(th)
-  // f(dbo.tbl1.find)
-  const ra = <A extends AnyObject>(a: A) => {
-  
-  };
-  const eft: ExactlyOne<{ tbl1: FullFilter<{ col1: string; }, GSchema>; }> = { tbl1: { "col1.$eq": '2' } }
-
-  // Type 'ExactlyOne<{ [key: string]: FullFilter<AnyObject, void>; }>' is not assignable to type 'ExactlyOne<{ tbl1: FullFilter<{ col1: string; }, GSchema>; }>'.
-  const fFilter = (a: ExactlyOne<{ [key: string]: FullFilter<AnyObject, void>; }>) => {
-
-  };
-  fFilter(eft);
-
-  const ff2 = <F extends ExistsFilter>(a: F) => {
-
-  }
-  ff2({ $exists: eft });
-
-
-  const sp: SelectParams<GSchema["tbl1"]["columns"]> = { select: {} };
-  const sf = (sp: SelectParams) => {
-
-  }
-  sf(sp);
-  // const sub: TableHandler["count"] = dbo.tbl1.count
-  
-  
-  // ra(schema);
-})