@freehour/supabase-core 1.2.1 → 1.3.0

package/dist/data-service.d.ts

@@ -6,7 +6,7 @@ import { DatabaseService } from './database-service';
 import { ColumnName, ID, Insert, RelationName, RelationType, Row, SchemaName, TableName, Update, ViewName } from './relation';
 import { Select, SelectColumns, SelectOptions, CountMethod } from './select';
 import { OmitFrom } from './utils';
-import { Filter } from './filter';
+import { FilterNode } from './filter';
 import { PaginatedList } from './postgrest-extensions';
 export interface DataServiceParams<Database extends CoreDatabase, Schema extends SchemaName<Database>, Type extends RelationType = RelationType, Relation extends RelationName<Database, Schema, Type> = RelationName<Database, Schema, Type>> {
     /**
@@ -52,7 +52,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
      * @example
      * const { data, error } = await dataService.query.select('*');
      */
-    get query(): PostgrestQueryBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T ? T extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+    get query(): OmitFrom< PostgrestQueryBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T ? T extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
         __InternalSupabase: {
             PostgrestVersion: string;
         };
@@ -242,7 +242,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
         }>;
     } ? Database[Schema] : any)["Tables"][Relation] ? T_1 extends {
         Relationships: infer R;
-    } ? R : unknown : never : never> & {
+    } ? R : unknown : never : never>, "select" | "delete"> & {
         select: <Columns extends SelectColumns<(Database[Schema] extends {
             Tables: Record<string, {
                 Row: Record<string, unknown>;
@@ -288,7 +288,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                     from: string;
                 };
             }>;
-        } ? Database[Schema] : any)["Tables"][Relation]["Row"]>>(columns: Columns, options?: SelectOptions) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_2 ? T_2 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_2 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+        } ? Database[Schema] : any)["Tables"][Relation]["Row"]>>(columns: Columns, options?: SelectOptions) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_2 ? T_2 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_2 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
             __InternalSupabase: {
                 PostgrestVersion: string;
             };
@@ -523,8 +523,8 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
             }>;
         } ? Database[Schema] : any)["Tables"][Relation] ? T_3 extends {
             Relationships: infer R;
-        } ? R : unknown : never : never, "GET"> & {
-            apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+        } ? R : unknown : never : never, "GET">, "filter"> & {
+            filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
                 __InternalSupabase: {
                     PostgrestVersion: string;
                 };
@@ -759,8 +759,8 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation] ? T_5 extends {
                 Relationships: infer R;
-            } ? R : unknown : never : never, "GET"> & /*elided*/ any;
-            paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+            } ? R : unknown : never : never, "GET">, "filter"> & /*elided*/ any;
+            paginate: (page: number, limit: number, count?: number) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
                 __InternalSupabase: {
                     PostgrestVersion: string;
                 };
@@ -995,7 +995,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation] ? T_5 extends {
                 Relationships: infer R;
-            } ? R : unknown : never : never, "GET"> & /*elided*/ any;
+            } ? R : unknown : never : never, "GET">, "filter"> & /*elided*/ any;
             collect: () => PromiseLike< PaginatedList<Select<(Database[Schema] extends {
                 Tables: Record<string, {
                     Row: Record<string, unknown>;
@@ -1043,7 +1043,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation]["Row"], Columns>>>;
         };
-        count: (method?: CountMethod) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_2 ? T_2 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_2 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+        count: (method?: CountMethod) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_2 ? T_2 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_2 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
             __InternalSupabase: {
                 PostgrestVersion: string;
             };
@@ -1423,8 +1423,8 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
             }>;
         } ? Database[Schema] : any)["Tables"][Relation] ? T_5 extends {
             Relationships: infer R;
-        } ? R : unknown : never : never, "GET"> & {
-            apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_6 ? T_6 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_6 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+        } ? R : unknown : never : never, "GET">, "filter"> & {
+            filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_6 ? T_6 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_6 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
                 __InternalSupabase: {
                     PostgrestVersion: string;
                 };
@@ -1804,8 +1804,8 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation] ? T_9 extends {
                 Relationships: infer R;
-            } ? R : unknown : never : never, "GET"> & /*elided*/ any;
-            paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_6 ? T_6 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_6 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+            } ? R : unknown : never : never, "GET">, "filter"> & /*elided*/ any;
+            paginate: (page: number, limit: number, count?: number) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_6 ? T_6 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_6 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
                 __InternalSupabase: {
                     PostgrestVersion: string;
                 };
@@ -2185,7 +2185,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation] ? T_9 extends {
                 Relationships: infer R;
-            } ? R : unknown : never : never, "GET"> & /*elided*/ any;
+            } ? R : unknown : never : never, "GET">, "filter"> & /*elided*/ any;
             collect: () => PromiseLike< PaginatedList<UnstableGetResult<Database[Schema] extends {
                 Tables: Record<string, {
                     Row: Record<string, unknown>;
@@ -2378,7 +2378,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 PostgrestVersion: string;
             } ? T_7 : never : never : never>>>;
         };
-        delete: () => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_2 ? T_2 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_2 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+        delete: () => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_2 ? T_2 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_2 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
             __InternalSupabase: {
                 PostgrestVersion: string;
             };
@@ -2568,8 +2568,8 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
             }>;
         } ? Database[Schema] : any)["Tables"][Relation] ? T_3 extends {
             Relationships: infer R;
-        } ? R : unknown : never : never, "DELETE"> & {
-            apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+        } ? R : unknown : never : never, "DELETE">, "filter"> & {
+            filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
                 __InternalSupabase: {
                     PostgrestVersion: string;
                 };
@@ -2759,8 +2759,8 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation] ? T_5 extends {
                 Relationships: infer R;
-            } ? R : unknown : never : never, "DELETE"> & /*elided*/ any;
-            paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
+            } ? R : unknown : never : never, "DELETE">, "filter"> & /*elided*/ any;
+            paginate: (page: number, limit: number, count?: number) => OmitFrom< PostgrestFilterBuilder<("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) extends infer T_4 ? T_4 extends ("public" extends Exclude<keyof Database, "__InternalSupabase"> ? Exclude<keyof Database, "__InternalSupabase"> & "public" : string & Exclude<keyof Database, "__InternalSupabase">) ? T_4 extends string & Exclude<keyof Database, "__InternalSupabase"> ? Database extends {
                 __InternalSupabase: {
                     PostgrestVersion: string;
                 };
@@ -2950,7 +2950,7 @@ export declare class DataService<Database extends CoreDatabase, Schema extends S
                 }>;
             } ? Database[Schema] : any)["Tables"][Relation] ? T_5 extends {
                 Relationships: infer R;
-            } ? R : unknown : never : never, "DELETE"> & /*elided*/ any;
+            } ? R : unknown : never : never, "DELETE">, "filter"> & /*elided*/ any;
             collect: () => PromiseLike< PaginatedList<null>>;
         };
     };

package/dist/embedding-service.d.ts

@@ -1,7 +1,7 @@
 import { Embedding, EmbeddingPreprocessingStep, EmbeddingSynchronizationResult, FileMetadata, Metadata, MetadataGeneratorFn } from './embedding';
 import { FileRef, StorageLocation } from './storage';
 import { StorageService } from './storage-service';
-export interface EmbeddingServiceParams<BucketName extends string> {
+export interface EmbeddingServiceParams<BucketName extends string = string> {
     storage: StorageService<BucketName>;
 }
 export declare abstract class EmbeddingService<BucketName extends string = string> {

package/dist/embedding-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"embedding-service.d.ts","sourceRoot":"","sources":["../lib/embedding-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,0BAA0B,EAAmC,8BAA8B,EAAmC,YAAY,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAExN,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,MAAM,WAAW,sBAAsB,CAAC,UAAU,SAAS,MAAM;IAC7D,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;CACvC;AAED,8BAAsB,gBAAgB,CAClC,UAAU,SAAS,MAAM,GAAG,MAAM;IAGlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoC;IACjE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;gBAE3C,EACR,OAAO,GACV,EAAE,sBAAsB,CAAC,UAAU,CAAC;IAIrC;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAEjF;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAE1H;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7E;;;;;;;OAOG;cACa,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;IA4BzF,OAAO,CAAC,UAAU;IAOlB,oBAAoB,CAAC,UAAU,EAAE,0BAA0B,GAAG,IAAI;IAKlE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKrC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKvD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAyBrG,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC,8BAA8B,EAAE,CAAC;CA2B9H"}
+{"version":3,"file":"embedding-service.d.ts","sourceRoot":"","sources":["../lib/embedding-service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,0BAA0B,EAAmC,8BAA8B,EAAmC,YAAY,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAExN,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,MAAM,WAAW,sBAAsB,CACnC,UAAU,SAAS,MAAM,GAAG,MAAM;IAElC,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;CACvC;AAED,8BAAsB,gBAAgB,CAClC,UAAU,SAAS,MAAM,GAAG,MAAM;IAGlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoC;IACjE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;gBAE3C,EACR,OAAO,GACV,EAAE,sBAAsB,CAAC,UAAU,CAAC;IAIrC;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAEjF;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAE1H;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7E;;;;;;;OAOG;cACa,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;IA4BzF,OAAO,CAAC,UAAU;IAOlB,oBAAoB,CAAC,UAAU,EAAE,0BAA0B,GAAG,IAAI;IAKlE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKrC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKvD,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAyBrG,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,mBAAmB,GAAG,OAAO,CAAC,8BAA8B,EAAE,CAAC;CA2B9H"}

package/dist/filter.d.ts

@@ -36,12 +36,12 @@ export declare const LogicalOpSeparator = ",";
  */
 export declare const FilterChainSeparator = "~";
 /**
- * A single filter conddition in an abstract syntax tree (AST) of filter nodes.
+ * A single filter condition in an abstract syntax tree (AST) of filter nodes.
  * @param K The type of keys in the filter expression.
  * @return The Zod schema representing the filter condition node.
  */
 export interface FilterConditionNode<K extends string = string> {
-    type: 'condition';
+    type?: 'condition';
     op: FilterOp;
     value: string | number | boolean | null;
     key: K;

package/dist/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../lib/filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,CAAC,MAAM,KAAK,CAAC;AAKpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,QAAQ,oMAAqM,CAAC;AAC3N,MAAM,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;AAElE;;;;GAIG;AACH,eAAO,MAAM,SAAS,wBAAyB,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,GAAG,EAAE,GAAG,MAAM,GAAG,OAAO,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,MAAM,CAAC;AAGxC;;;;GAIG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IAC1D,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,QAAQ,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IACxC,GAAG,EAAE,CAAC,CAAC;CACV;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACxD,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,EAAE,SAAS,CAAC;IAEd,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;AAElG;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;AAG/D;;;GAGG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,SAAS,SAAS,EAAE,MAAM,IAAI,MAAM,SAAS,SAAS,MAAM,GAAG,MAAM,EAC5F,UAAS,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAM,sEAyBrE,CAAC;AACF,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;AAGhE;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,EAAE,SAAS,QAAQ,GAAG,SAAS,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAEpE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAK/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EACtD,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EACnB,YAAY,GAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAmB,GAC9C,MAAM,CAQR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAClD,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EACjB,YAAY,GAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAmB,EAC7C,SAAS,SAAuB,GACjC,MAAM,CAER;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,SAAS,MAAM,GAAG,QAAQ,EACvG,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,QAAQ,EAAO,EAC1B,YAAY,GAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,SAA8C,GAChF,UAAU,CAAC,SAAS,CAAC,CAoFvB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,SAAS,MAAM,GAAG,QAAQ,EAC5G,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,QAAQ,EAAO,EAC1B,YAAY,GAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,SAA8C,EAC/E,SAAS,SAAuB,GACjC,UAAU,CAAC,SAAS,CAAC,EAAE,CAOzB"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../lib/filter.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -214,44 +214,47 @@ const w = {
    * @example
    * const table = supabase.schema('public').from('my_table');
    * const {data, error} = await postgrestExtensions.query.enable(table)
-   *     .selectColumns(['id', 'name'])
+   *     .select(['id', 'name'])
    *     .then(({data}) => console.log(data)); // [{ id: 1, name: 'John' }, ...]
    */
   query: {
-    enable: (s) => Object.assign(s, {
-      /**
-       * Selects columns from the relation.
-       *
-       * @param columns The array of column names to select, or '*' to select all columns.
-       * @param options The options for the selection, such as count.
-       * @returns The PostgREST filter builder with selection applied and filter extension enabled.
-       */
-      select: (t, e) => w.filter.enable(
-        s.select(
-          A(t).join(","),
-          e
+    enable: (s) => Object.assign(
+      s,
+      {
+        /**
+         * Selects columns from the relation.
+         *
+         * @param columns The array of column names to select, or '*' to select all columns.
+         * @param options The options for the selection, such as count.
+         * @returns The PostgREST filter builder with selection applied and filter extension enabled.
+         */
+        select: (t, e) => w.filter.enable(
+          s.select(
+            A(t).join(","),
+            e
+          )
+        ),
+        /**
+         * Counts the number of rows in the relation.
+         * Does not select any columns, only counts the rows.
+         *
+         * @param method The counting method to use, defaults to 'exact'.
+         * @returns The PostgREST filter builder with counting applied and filter extension enabled.
+         */
+        count: (t = "exact") => w.filter.enable(
+          s.select("*", { count: t, head: !0 })
+        ),
+        /**
+         * Deletes rows from the relation.
+         * Returns a filter builder for further filtering before deletion.
+         *
+         * @returns The PostgREST filter builder with delete applied and filter extension enabled.
+         */
+        delete: () => w.filter.enable(
+          s.delete()
         )
-      ),
-      /**
-       * Counts the number of rows in the relation.
-       * Does not select any columns, only counts the rows.
-       *
-       * @param method The counting method to use, defaults to 'exact'.
-       * @returns The PostgREST filter builder with counting applied and filter extension enabled.
-       */
-      count: (t = "exact") => w.filter.enable(
-        s.select("*", { count: t, head: !0 })
-      ),
-      /**
-       * Deletes rows from the relation.
-       * Returns a filter builder for further filtering before deletion.
-       *
-       * @returns The PostgREST filter builder with delete applied and filter extension enabled.
-       */
-      delete: () => w.filter.enable(
-        s.delete()
-      )
-    })
+      }
+    )
   },
   /**
    * Filter extension for PostgREST queries.
@@ -261,78 +264,81 @@ const w = {
    * @example
    * const selection = supabase.schema('public').from('my_table').select('*', { count: 'exact' });
    * const {data, error} = await postgrestExtensions.filter.enable(selection)
-   *     .apply({ key: 'name', op: 'eq', value: 'John' })
+   *     .filter({ key: 'name', op: 'eq', value: 'John' })
    *     .paginate(1, 10)
    *     .collect();
    */
   filter: {
-    enable: (s, t = {}) => Object.assign(s, {
-      /**
-       * Applies a filter to the query.
-       * A filter is defined as an array of AST filter nodes including conditions and logical operators.
-       * @param filter The filter to apply.
-       */
-      apply: (e) => w.filter.enable(
-        (() => {
-          function r(a, n) {
-            if (n.type === "logical") {
-              const i = D(n.args, (c) => c, ",");
-              return n.op === "or" ? a.or(i) : n.op === "not.or" ? a.or(i, { referencedTable: "not" }) : r(a, {
-                type: "logical",
-                op: n.op === "and" ? "not.or" : "or",
-                args: n.args.map(N)
-              });
+    enable: (s, t = {}) => Object.assign(
+      s,
+      {
+        /**
+         * Applies a filter to the query.
+         * A filter is defined as an AST of filter nodes including conditions and logical operators.
+         * @param node The filter to apply.
+         */
+        filter: (e) => w.filter.enable(
+          (() => {
+            function r(a, n) {
+              if (n.type === "logical") {
+                const i = D(n.args, (c) => c, ",");
+                return n.op === "or" ? a.or(i) : n.op === "not.or" ? a.or(i, { referencedTable: "not" }) : r(a, {
+                  type: "logical",
+                  op: n.op === "and" ? "not.or" : "or",
+                  args: n.args.map(N)
+                });
+              }
+              return a.filter(n.key, n.op, n.value);
+            }
+            return r(s, e);
+          })(),
+          t
+        ),
+        /**
+         * Limits the range of results to a specific page given a page index and limit.
+         * @param page The page index (0-based).
+         * @param limit The number of items per page.
+         * @param count Optional count of total items, if known.
+         * If provided, it will be used to check if the pagination range is valid and resolve to an empty range if not.
+         */
+        paginate: (e, r, a) => w.filter.enable(
+          (() => {
+            l(e >= 0, "Page index must be ≥ 0"), l(r >= 0, "Page limit must be ≥ 0");
+            const n = e * r, i = n + r - 1;
+            if (a !== void 0) {
+              if (n >= a)
+                return s.limit(0);
+              if (i >= a)
+                return s.range(n, a - 1);
+            }
+            return s.range(n, i);
+          })(),
+          {
+            ...t,
+            pagination: {
+              page: e,
+              limit: r,
+              count: a
             }
-            return a.filter(n.key, n.op, n.value);
-          }
-          return e.reduce(r, s);
-        })(),
-        t
-      ),
-      /**
-       * Limits the range of results to a specific page given a page index and limit.
-       * @param page The page index (0-based).
-       * @param limit The number of items per page.
-       * @param count Optional count of total items, if known.
-       * If provided, it will be used to check if the pagination range is valid and resolve to an empty range if not.
-       */
-      paginate: (e, r, a) => w.filter.enable(
-        (() => {
-          l(e >= 0, "Page index must be ≥ 0"), l(r >= 0, "Page limit must be ≥ 0");
-          const n = e * r, i = n + r - 1;
-          if (a !== void 0) {
-            if (n >= a)
-              return s.limit(0);
-            if (i >= a)
-              return s.range(n, a - 1);
-          }
-          return s.range(n, i);
-        })(),
-        {
-          ...t,
-          pagination: {
-            page: e,
-            limit: r,
-            count: a
           }
-        }
-      ),
-      /**
-       * Collects the results of a pagination query.
-       * **Note:** For collect to work, paginate() must be called before collect() and the selection must include a `count`.
-       * @returns The paginated list of queried items.
-       */
-      collect: () => s.throwOnError().then((e) => {
-        const { data: r, count: a } = e, { page: n, limit: i, ...c } = l.defined(t.pagination, "Pagination context is required for collect(). Make sure to call paginate() before collect()"), o = a ?? c.count;
-        return l(i > 0, "Page limit must be > 0"), l(Array.isArray(r), "Data must be an array for pagination, make sure to select multiple rows in query"), l(o !== void 0, "Row count is required for pagination, make sure to count in query or pass `count` in paginate()"), {
-          items: r,
-          totalItems: o,
-          page: n,
-          totalPages: Math.ceil(o / i),
-          limit: i
-        };
-      })
-    })
+        ),
+        /**
+         * Collects the results of a pagination query.
+         * **Note:** For collect to work, paginate() must be called before collect() and the selection must include a `count`.
+         * @returns The paginated list of queried items.
+         */
+        collect: () => s.throwOnError().then((e) => {
+          const { data: r, count: a } = e, { page: n, limit: i, ...c } = l.defined(t.pagination, "Pagination context is required for collect(). Make sure to call paginate() before collect()"), o = a ?? c.count;
+          return l(i > 0, "Page limit must be > 0"), l(Array.isArray(r), "Data must be an array for pagination, make sure to select multiple rows in query"), l(o !== void 0, "Row count is required for pagination, make sure to count in query or pass `count` in paginate()"), {
+            items: r,
+            totalItems: o,
+            page: n,
+            totalPages: Math.ceil(o / i),
+            limit: i
+          };
+        })
+      }
+    )
   }
 };
 class F {

package/dist/postgrest-extensions.d.ts

@@ -1,8 +1,8 @@
 import { PostgrestClientOptions, PostgrestFilterBuilder, PostgrestQueryBuilder, UnstableGetResult } from '@supabase/postgrest-js';
 import { GenericSchema, GenericTable, GenericView } from './database';
-import { Filter } from './filter';
+import { FilterNode } from './filter';
 import { CountMethod, Select, SelectColumns, SelectOptions } from './select';
-import { ElementOf } from './utils';
+import { ElementOf, OmitFrom } from './utils';
 /**
  * Paginated list of items with pagination info.
  */
@@ -31,7 +31,7 @@ interface PostgrestFilterExtensionContext {
  * @example
  * const selection = supabase.schema('public').from('my_table').select('*', { count: 'exact' });
  * const {data, error} = await postgrestExtensions.filter.enable(selection)
- *     .apply({ key: 'name', op: 'eq', value: 'John' })
+ *     .filter({ key: 'name', op: 'eq', value: 'John' })
  *     .paginate(1, 10)
  *     .collect();
  */
@@ -44,13 +44,13 @@ export declare const postgrestExtensions: {
      * @example
      * const table = supabase.schema('public').from('my_table');
      * const {data, error} = await postgrestExtensions.query.enable(table)
-     *     .selectColumns(['id', 'name'])
+     *     .select(['id', 'name'])
      *     .then(({data}) => console.log(data)); // [{ id: 1, name: 'John' }, ...]
      */
     readonly query: {
         readonly enable: <ClientOptions extends PostgrestClientOptions, Schema extends GenericSchema, Relation extends GenericTable | GenericView, RelationName = unknown, Relationships = Relation extends {
             Relationships: infer R;
-        } ? R : unknown>(builder: PostgrestQueryBuilder<ClientOptions, Schema, Relation, RelationName, Relationships>) => PostgrestQueryBuilder<ClientOptions, Schema, Relation, RelationName, Relationships> & {
+        } ? R : unknown>(builder: PostgrestQueryBuilder<ClientOptions, Schema, Relation, RelationName, Relationships>) => OmitFrom<PostgrestQueryBuilder<ClientOptions, Schema, Relation, RelationName, Relationships>, "select" | "delete"> & {
             /**
              * Selects columns from the relation.
              *
@@ -58,13 +58,13 @@ export declare const postgrestExtensions: {
              * @param options The options for the selection, such as count.
              * @returns The PostgREST filter builder with selection applied and filter extension enabled.
              */
-            select: <Columns extends SelectColumns<Relation["Row"]>>(columns: Columns, options?: SelectOptions) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], Select<Relation["Row"], Columns>[], RelationName, Relationships, "GET"> & {
+            select: <Columns extends SelectColumns<Relation["Row"]>>(columns: Columns, options?: SelectOptions) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], Select<Relation["Row"], Columns>[], RelationName, Relationships, "GET">, "filter"> & {
                 /**
                  * Applies a filter to the query.
-                 * A filter is defined as an array of AST filter nodes including conditions and logical operators.
-                 * @param filter The filter to apply.
+                 * A filter is defined as an AST of filter nodes including conditions and logical operators.
+                 * @param node The filter to apply.
                  */
-                apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], Select<Relation["Row"], Columns>[], RelationName, Relationships, "GET"> & /*elided*/ any;
+                filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], Select<Relation["Row"], Columns>[], RelationName, Relationships, "GET">, "filter"> & /*elided*/ any;
                 /**
                  * Limits the range of results to a specific page given a page index and limit.
                  * @param page The page index (0-based).
@@ -72,7 +72,7 @@ export declare const postgrestExtensions: {
                  * @param count Optional count of total items, if known.
                  * If provided, it will be used to check if the pagination range is valid and resolve to an empty range if not.
                  */
-                paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], Select<Relation["Row"], Columns>[], RelationName, Relationships, "GET"> & /*elided*/ any;
+                paginate: (page: number, limit: number, count?: number) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], Select<Relation["Row"], Columns>[], RelationName, Relationships, "GET">, "filter"> & /*elided*/ any;
                 /**
                  * Collects the results of a pagination query.
                  * **Note:** For collect to work, paginate() must be called before collect() and the selection must include a `count`.
@@ -87,13 +87,13 @@ export declare const postgrestExtensions: {
              * @param method The counting method to use, defaults to 'exact'.
              * @returns The PostgREST filter builder with counting applied and filter extension enabled.
              */
-            count: (method?: CountMethod) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], UnstableGetResult<Schema, Relation["Row"], RelationName, Relationships, "*", ClientOptions>[], RelationName, Relationships, "GET"> & {
+            count: (method?: CountMethod) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], UnstableGetResult<Schema, Relation["Row"], RelationName, Relationships, "*", ClientOptions>[], RelationName, Relationships, "GET">, "filter"> & {
                 /**
                  * Applies a filter to the query.
-                 * A filter is defined as an array of AST filter nodes including conditions and logical operators.
-                 * @param filter The filter to apply.
+                 * A filter is defined as an AST of filter nodes including conditions and logical operators.
+                 * @param node The filter to apply.
                  */
-                apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], UnstableGetResult<Schema, Relation["Row"], RelationName, Relationships, "*", ClientOptions>[], RelationName, Relationships, "GET"> & /*elided*/ any;
+                filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], UnstableGetResult<Schema, Relation["Row"], RelationName, Relationships, "*", ClientOptions>[], RelationName, Relationships, "GET">, "filter"> & /*elided*/ any;
                 /**
                  * Limits the range of results to a specific page given a page index and limit.
                  * @param page The page index (0-based).
@@ -101,7 +101,7 @@ export declare const postgrestExtensions: {
                  * @param count Optional count of total items, if known.
                  * If provided, it will be used to check if the pagination range is valid and resolve to an empty range if not.
                  */
-                paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], UnstableGetResult<Schema, Relation["Row"], RelationName, Relationships, "*", ClientOptions>[], RelationName, Relationships, "GET"> & /*elided*/ any;
+                paginate: (page: number, limit: number, count?: number) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], UnstableGetResult<Schema, Relation["Row"], RelationName, Relationships, "*", ClientOptions>[], RelationName, Relationships, "GET">, "filter"> & /*elided*/ any;
                 /**
                  * Collects the results of a pagination query.
                  * **Note:** For collect to work, paginate() must be called before collect() and the selection must include a `count`.
@@ -115,13 +115,13 @@ export declare const postgrestExtensions: {
              *
              * @returns The PostgREST filter builder with delete applied and filter extension enabled.
              */
-            delete: () => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], null, RelationName, Relationships, "DELETE"> & {
+            delete: () => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], null, RelationName, Relationships, "DELETE">, "filter"> & {
                 /**
                  * Applies a filter to the query.
-                 * A filter is defined as an array of AST filter nodes including conditions and logical operators.
-                 * @param filter The filter to apply.
+                 * A filter is defined as an AST of filter nodes including conditions and logical operators.
+                 * @param node The filter to apply.
                  */
-                apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], null, RelationName, Relationships, "DELETE"> & /*elided*/ any;
+                filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], null, RelationName, Relationships, "DELETE">, "filter"> & /*elided*/ any;
                 /**
                  * Limits the range of results to a specific page given a page index and limit.
                  * @param page The page index (0-based).
@@ -129,7 +129,7 @@ export declare const postgrestExtensions: {
                  * @param count Optional count of total items, if known.
                  * If provided, it will be used to check if the pagination range is valid and resolve to an empty range if not.
                  */
-                paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], null, RelationName, Relationships, "DELETE"> & /*elided*/ any;
+                paginate: (page: number, limit: number, count?: number) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Relation["Row"], null, RelationName, Relationships, "DELETE">, "filter"> & /*elided*/ any;
                 /**
                  * Collects the results of a pagination query.
                  * **Note:** For collect to work, paginate() must be called before collect() and the selection must include a `count`.
@@ -147,18 +147,18 @@ export declare const postgrestExtensions: {
      * @example
      * const selection = supabase.schema('public').from('my_table').select('*', { count: 'exact' });
      * const {data, error} = await postgrestExtensions.filter.enable(selection)
-     *     .apply({ key: 'name', op: 'eq', value: 'John' })
+     *     .filter({ key: 'name', op: 'eq', value: 'John' })
      *     .paginate(1, 10)
      *     .collect();
      */
     readonly filter: {
-        readonly enable: <ClientOptions extends PostgrestClientOptions, Schema extends GenericSchema, Row extends Record<string, unknown>, Result, RelationName = unknown, Relationships = unknown, Method = unknown>(builder: PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method>, context?: PostgrestFilterExtensionContext) => PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method> & {
+        readonly enable: <ClientOptions extends PostgrestClientOptions, Schema extends GenericSchema, Row extends Record<string, unknown>, Result, RelationName = unknown, Relationships = unknown, Method = unknown>(builder: PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method>, context?: PostgrestFilterExtensionContext) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method>, "filter"> & {
             /**
              * Applies a filter to the query.
-             * A filter is defined as an array of AST filter nodes including conditions and logical operators.
-             * @param filter The filter to apply.
+             * A filter is defined as an AST of filter nodes including conditions and logical operators.
+             * @param node The filter to apply.
              */
-            apply: <K extends string = string>(filter: Filter<K>) => PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method> & /*elided*/ any;
+            filter: <K extends string = string>(node: FilterNode<K>) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method>, "filter"> & /*elided*/ any;
             /**
              * Limits the range of results to a specific page given a page index and limit.
              * @param page The page index (0-based).
@@ -166,7 +166,7 @@ export declare const postgrestExtensions: {
              * @param count Optional count of total items, if known.
              * If provided, it will be used to check if the pagination range is valid and resolve to an empty range if not.
              */
-            paginate: (page: number, limit: number, count?: number) => PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method> & /*elided*/ any;
+            paginate: (page: number, limit: number, count?: number) => OmitFrom<PostgrestFilterBuilder<ClientOptions, Schema, Row, Result, RelationName, Relationships, Method>, "filter"> & /*elided*/ any;
             /**
              * Collects the results of a pagination query.
              * **Note:** For collect to work, paginate() must be called before collect() and the selection must include a `count`.

package/dist/postgrest-extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgrest-extensions.d.ts","sourceRoot":"","sources":["../lib/postgrest-extensions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,qBAAqB,EAA4B,MAAM,wBAAwB,CAAC;AAE9I,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,UAAU,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzC;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,IAAI;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,UAAU,+BAA+B;IACrC,UAAU,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACL;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB;IAC5B;;;;;;;;;;OAUG;;0BAGK,aAAa,SAAS,sBAAsB,EAC5C,MAAM,SAAS,aAAa,EAC5B,QAAQ,SAAS,YAAY,GAAG,WAAW,EAC3C,YAAY,YACZ,aAAa;2BAAqC,MAAM,CAAC;kCAEhD,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC;YAE5F;;;;;;eAMG;qBAEC,OAAO,SAAS,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,WACvC,OAAO,YAAY,aAAa;gBA2D3C;;;;mBAIG;wBACK,CAAC,SAAS,MAAM;gBAgCxB;;;;;;mBAMG;iCACc,MAAM,SAAS,MAAM,UAAU,MAAM;gBA8BtD;;;;mBAIG;;;YA/HH;;;;;;eAMG;6BACa,WAAW;gBA0C3B;;;;mBAIG;wBACK,CAAC,SAAS,MAAM;gBAgCxB;;;;;;mBAMG;iCACc,MAAM,SAAS,MAAM,UAAU,MAAM;gBA8BtD;;;;mBAIG;;;YApHH;;;;;eAKG;;gBAiCH;;;;mBAIG;wBACK,CAAC,SAAS,MAAM;gBAgCxB;;;;;;mBAMG;iCACc,MAAM,SAAS,MAAM,UAAU,MAAM;gBA8BtD;;;;mBAIG;;;;;IAxGX;;;;;;;;;;;OAWG;;0BAGK,aAAa,SAAS,sBAAsB,EAC5C,MAAM,SAAS,aAAa,EAC5B,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,MAAM,EACN,YAAY,YACZ,aAAa,YACb,MAAM,qBAEG,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,YAC/F,+BAA+B;YAGxC;;;;eAIG;oBACK,CAAC,SAAS,MAAM,mBAAmB,MAAM,CAAC,CAAC,CAAC;YAgCpD;;;;;;eAMG;6BACc,MAAM,SAAS,MAAM,UAAU,MAAM;YA8BtD;;;;eAIG;;;;CAoBL,CAAC"}
+{"version":3,"file":"postgrest-extensions.d.ts","sourceRoot":"","sources":["../lib/postgrest-extensions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,qBAAqB,EAA4B,MAAM,wBAAwB,CAAC;AAE9I,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnD;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,IAAI;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,UAAU,+BAA+B;IACrC,UAAU,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACL;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB;IAC5B;;;;;;;;;;OAUG;;0BAGK,aAAa,SAAS,sBAAsB,EAC5C,MAAM,SAAS,aAAa,EAC5B,QAAQ,SAAS,YAAY,GAAG,WAAW,EAC3C,YAAY,YACZ,aAAa;2BAAqC,MAAM,CAAC;kCAEhD,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC;YAIxF;;;;;;eAMG;qBAEC,OAAO,SAAS,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,WACvC,OAAO,YAAY,aAAa;gBA8D3C;;;;mBAIG;yBACM,CAAC,SAAS,MAAM;gBAgCzB;;;;;;mBAMG;iCACc,MAAM,SAAS,MAAM,UAAU,MAAM;gBA8BtD;;;;mBAIG;;;YAlIH;;;;;;eAMG;6BACa,WAAW;gBA6C3B;;;;mBAIG;yBACM,CAAC,SAAS,MAAM;gBAgCzB;;;;;;mBAMG;iCACc,MAAM,SAAS,MAAM,UAAU,MAAM;gBA8BtD;;;;mBAIG;;;YAvHH;;;;;eAKG;;gBAoCH;;;;mBAIG;yBACM,CAAC,SAAS,MAAM;gBAgCzB;;;;;;mBAMG;iCACc,MAAM,SAAS,MAAM,UAAU,MAAM;gBA8BtD;;;;mBAIG;;;;;IA1Gf;;;;;;;;;;;OAWG;;0BAGK,aAAa,SAAS,sBAAsB,EAC5C,MAAM,SAAS,aAAa,EAC5B,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,MAAM,EACN,YAAY,YACZ,aAAa,YACb,MAAM,qBAEG,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,YAC/F,+BAA+B;YAKpC;;;;eAIG;qBACM,CAAC,SAAS,MAAM,iBAAiB,UAAU,CAAC,CAAC,CAAC;YAgCvD;;;;;;eAMG;6BACc,MAAM,SAAS,MAAM,UAAU,MAAM;YA8BtD;;;;eAIG;;;;CAqBT,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
     "private": false,
     "displayName": "Supabase-Core",
     "description": "Lightweight services for supabase to make it easier to work with databases, tables and storage buckets",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "type": "module",
     "repository": {
         "type": "git",