@supabase/postgrest-js 0.37.3 → 1.0.0-next.1

package/dist/main/PostgrestBuilder.d.ts

@@ -0,0 +1,24 @@
+import type { Fetch, PostgrestResponse } from './types';
+export default abstract class PostgrestBuilder<Result> implements PromiseLike<PostgrestResponse<Result>> {
+    protected method: 'GET' | 'HEAD' | 'POST' | 'PATCH' | 'DELETE';
+    protected url: URL;
+    protected headers: Record<string, string>;
+    protected schema?: string;
+    protected body?: unknown;
+    protected shouldThrowOnError: boolean;
+    protected signal?: AbortSignal;
+    protected fetch: Fetch;
+    protected allowEmpty: boolean;
+    constructor(builder: PostgrestBuilder<Result>);
+    /**
+     * If there's an error with the query, throwOnError will reject the promise by
+     * throwing the error instead of returning it as part of a successful response.
+     *
+     * {@link https://github.com/supabase/supabase-js/issues/92}
+     *
+     * @deprecated Use `throwOnError` in the `PostgrestClient` constructor instead.
+     */
+    throwOnError(throwOnError?: boolean): this;
+    then<TResult1 = PostgrestResponse<Result>, TResult2 = never>(onfulfilled?: ((value: PostgrestResponse<Result>) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): PromiseLike<TResult1 | TResult2>;
+}
+//# sourceMappingURL=PostgrestBuilder.d.ts.map

package/dist/main/PostgrestBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgrestBuilder.d.ts","sourceRoot":"","sources":["../../src/PostgrestBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAEvD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAAC,MAAM,CACnD,YAAW,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAEjD,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;IAC9D,SAAS,CAAC,GAAG,EAAE,GAAG,CAAA;IAClB,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;IACxB,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAA;IACrC,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;IAC9B,SAAS,CAAC,KAAK,EAAE,KAAK,CAAA;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO,CAAA;gBAEjB,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAmB7C;;;;;;;OAOG;IACH,YAAY,CAAC,YAAY,CAAC,EAAE,OAAO,GAAG,IAAI;IAK1C,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,KAAK,EACzD,WAAW,CAAC,EACR,CAAC,CAAC,KAAK,EAAE,iBAAiB,CAAC,MAAM,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GACxE,SAAS,GACT,IAAI,EACR,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAClF,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC;CA+FpC"}

package/dist/main/{lib/types.js → PostgrestBuilder.js}

@@ -12,36 +12,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgrestBuilder = void 0;
 const cross_fetch_1 = __importDefault(require("cross-fetch"));
 class PostgrestBuilder {
     constructor(builder) {
-        Object.assign(this, builder);
-        let _fetch;
+        this.method = builder.method;
+        this.url = builder.url;
+        this.headers = builder.headers;
+        this.schema = builder.schema;
+        this.body = builder.body;
+        this.shouldThrowOnError = builder.shouldThrowOnError;
+        this.signal = builder.signal;
+        this.allowEmpty = builder.allowEmpty;
         if (builder.fetch) {
-            _fetch = builder.fetch;
+            this.fetch = builder.fetch;
         }
         else if (typeof fetch === 'undefined') {
-            _fetch = cross_fetch_1.default;
+            this.fetch = cross_fetch_1.default;
         }
         else {
-            _fetch = fetch;
+            this.fetch = fetch;
         }
-        this.fetch = (...args) => _fetch(...args);
-        this.shouldThrowOnError = builder.shouldThrowOnError || false;
-        this.allowEmpty = builder.allowEmpty || false;
     }
     /**
      * If there's an error with the query, throwOnError will reject the promise by
      * throwing the error instead of returning it as part of a successful response.
      *
      * {@link https://github.com/supabase/supabase-js/issues/92}
+     *
+     * @deprecated Use `throwOnError` in the `PostgrestClient` constructor instead.
      */
     throwOnError(throwOnError) {
-        if (throwOnError === null || throwOnError === undefined) {
-            throwOnError = true;
-        }
-        this.shouldThrowOnError = throwOnError;
+        this.shouldThrowOnError = throwOnError !== null && throwOnError !== void 0 ? throwOnError : true;
         return this;
     }
     then(onfulfilled, onrejected) {
@@ -58,16 +59,19 @@ class PostgrestBuilder {
         if (this.method !== 'GET' && this.method !== 'HEAD') {
             this.headers['Content-Type'] = 'application/json';
         }
-        let res = this.fetch(this.url.toString(), {
+        // NOTE: Invoke w/o `this` to avoid illegal invocation error.
+        // https://github.com/supabase/postgrest-js/pull/247
+        const _fetch = this.fetch;
+        let res = _fetch(this.url.toString(), {
             method: this.method,
             headers: this.headers,
             body: JSON.stringify(this.body),
             signal: this.signal,
         }).then((res) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
-            let error = null;
-            let data = null;
-            let count = null;
+            let error = undefined;
+            let data = undefined;
+            let count = undefined;
             let status = res.status;
             let statusText = res.statusText;
             if (res.ok) {
@@ -101,7 +105,7 @@ class PostgrestBuilder {
                     };
                 }
                 if (error && this.allowEmpty && ((_d = error === null || error === void 0 ? void 0 : error.details) === null || _d === void 0 ? void 0 : _d.includes('Results contain 0 rows'))) {
-                    error = null;
+                    error = undefined;
                     status = 200;
                     statusText = 'OK';
                 }
@@ -115,7 +119,6 @@ class PostgrestBuilder {
                 count,
                 status,
                 statusText,
-                body: data,
             };
             return postgrestResponse;
         }));
@@ -127,9 +130,8 @@ class PostgrestBuilder {
                     hint: '',
                     code: fetchError.code || '',
                 },
-                data: null,
-                body: null,
-                count: null,
+                data: undefined,
+                count: undefined,
                 status: 400,
                 statusText: 'Bad Request',
             }));
@@ -137,5 +139,5 @@ class PostgrestBuilder {
         return res.then(onfulfilled, onrejected);
     }
 }
-exports.PostgrestBuilder = PostgrestBuilder;
-//# sourceMappingURL=types.js.map
+exports.default = PostgrestBuilder;
+//# sourceMappingURL=PostgrestBuilder.js.map

package/dist/main/PostgrestBuilder.js.map

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

package/dist/main/PostgrestClient.d.ts

@@ -1,14 +1,12 @@
-import PostgrestQueryBuilder from './lib/PostgrestQueryBuilder';
-import PostgrestFilterBuilder from './lib/PostgrestFilterBuilder';
-import { Fetch } from './lib/types';
-export default class PostgrestClient {
+import PostgrestQueryBuilder from './PostgrestQueryBuilder';
+import PostgrestFilterBuilder from './PostgrestFilterBuilder';
+import { Fetch, GenericSchema } from './types';
+export default class PostgrestClient<Database = any, SchemaName extends string & keyof Database = 'public' extends keyof Database ? 'public' : string & keyof Database, Schema extends GenericSchema = Database[SchemaName] extends GenericSchema ? Database[SchemaName] : any> {
     url: string;
-    headers: {
-        [key: string]: string;
-    };
-    schema?: string;
+    headers: Record<string, string>;
+    schema?: SchemaName;
     fetch?: Fetch;
-    shouldThrowOnError?: boolean;
+    shouldThrowOnError: boolean;
     /**
      * Creates a PostgREST client.
      *
@@ -17,10 +15,8 @@ export default class PostgrestClient {
      * @param schema  Postgres schema to switch to.
      */
     constructor(url: string, { headers, schema, fetch, throwOnError, }?: {
-        headers?: {
-            [key: string]: string;
-        };
-        schema?: string;
+        headers?: Record<string, string>;
+        schema?: SchemaName;
         fetch?: Fetch;
         throwOnError?: boolean;
     });
@@ -28,6 +24,8 @@ export default class PostgrestClient {
      * Authenticates the request with JWT.
      *
      * @param token  The JWT token to use.
+     *
+     * @deprecated Use `headers` in constructor instead.
      */
     auth(token: string): this;
     /**
@@ -35,18 +33,19 @@ export default class PostgrestClient {
      *
      * @param table  The table name to operate on.
      */
-    from<T = any>(table: string): PostgrestQueryBuilder<T>;
+    from<TableName extends string & keyof Schema['Tables'], Table extends Schema['Tables'][TableName]>(table: TableName): PostgrestQueryBuilder<Table>;
     /**
      * Perform a function call.
      *
      * @param fn  The function name to call.
-     * @param params  The parameters to pass to the function call.
-     * @param head  When set to true, no data will be returned.
-     * @param count  Count algorithm to use to count rows in a table.
+     * @param args  The parameters to pass to the function call.
+     * @param options  Named parameters.
+     * @param options.head  When set to true, no data will be returned.
+     * @param options.count  Count algorithm to use to count rows in a table.
      */
-    rpc<T = any>(fn: string, params?: object, { head, count, }?: {
+    rpc<FunctionName extends string & keyof Schema['Functions'], Function_ extends Schema['Functions'][FunctionName]>(fn: FunctionName, args?: Function_['Args'], { head, count, }?: {
         head?: boolean;
-        count?: null | 'exact' | 'planned' | 'estimated';
-    }): PostgrestFilterBuilder<T>;
+        count?: 'exact' | 'planned' | 'estimated';
+    }): PostgrestFilterBuilder<Function_['Returns'] extends any[] ? Function_['Returns'][number] extends Record<string, unknown> ? Function_['Returns'][number] : never : never, Function_['Returns']>;
 }
 //# sourceMappingURL=PostgrestClient.d.ts.map

package/dist/main/PostgrestClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PostgrestClient.d.ts","sourceRoot":"","sources":["../../src/PostgrestClient.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,6BAA6B,CAAA;AAE/D,OAAO,sBAAsB,MAAM,8BAA8B,CAAA;AAEjE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAClC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAE5B;;;;;;OAMG;gBAED,GAAG,EAAE,MAAM,EACX,EACE,OAAY,EACZ,MAAM,EACN,KAAK,EACL,YAAY,GACb,GAAE;QACD,OAAO,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;QACnC,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,CAAC,EAAE,KAAK,CAAA;QACb,YAAY,CAAC,EAAE,OAAO,CAAA;KAClB;IASR;;;;OAIG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKzB;;;;OAIG;IACH,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAC,CAAC,CAAC;IAUtD;;;;;;;OAOG;IACH,GAAG,CAAC,CAAC,GAAG,GAAG,EACT,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,EACf,EACE,IAAY,EACZ,KAAY,GACb,GAAE;QACD,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAA;KAC5C,GACL,sBAAsB,CAAC,CAAC,CAAC;CAS7B"}
+{"version":3,"file":"PostgrestClient.d.ts","sourceRoot":"","sources":["../../src/PostgrestClient.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,yBAAyB,CAAA;AAC3D,OAAO,sBAAsB,MAAM,0BAA0B,CAAA;AAG7D,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE9C,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,QAAQ,GAAG,GAAG,EACd,UAAU,SAAS,MAAM,GAAG,MAAM,QAAQ,GAAG,QAAQ,SAAS,MAAM,QAAQ,GACxE,QAAQ,GACR,MAAM,GAAG,MAAM,QAAQ,EAC3B,MAAM,SAAS,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,aAAa,GACrE,QAAQ,CAAC,UAAU,CAAC,GACpB,GAAG;IAEP,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,kBAAkB,EAAE,OAAO,CAAA;IAE3B;;;;;;OAMG;gBAED,GAAG,EAAE,MAAM,EACX,EACE,OAAY,EACZ,MAAM,EACN,KAAK,EACL,YAAoB,GACrB,GAAE;QACD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAChC,MAAM,CAAC,EAAE,UAAU,CAAA;QACnB,KAAK,CAAC,EAAE,KAAK,CAAA;QACb,YAAY,CAAC,EAAE,OAAO,CAAA;KAClB;IASR;;;;;;OAMG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKzB;;;;OAIG;IACH,IAAI,CACF,SAAS,SAAS,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EACjD,KAAK,SAAS,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EACzC,KAAK,EAAE,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC;IAUjD;;;;;;;;OAQG;IACH,GAAG,CACD,YAAY,SAAS,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,EACvD,SAAS,SAAS,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,EAEnD,EAAE,EAAE,YAAY,EAChB,IAAI,GAAE,SAAS,CAAC,MAAM,CAAM,EAC5B,EACE,IAAY,EACZ,KAAK,GACN,GAAE;QACD,IAAI,CAAC,EAAE,OAAO,CAAA;QACd,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,WAAW,CAAA;KACrC,GACL,sBAAsB,CACvB,SAAS,CAAC,SAAS,CAAC,SAAS,GAAG,EAAE,GAC9B,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC1D,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAC5B,KAAK,GACP,KAAK,EACT,SAAS,CAAC,SAAS,CAAC,CACrB;CA8BF"}

package/dist/main/PostgrestClient.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const PostgrestQueryBuilder_1 = __importDefault(require("./lib/PostgrestQueryBuilder"));
-const PostgrestRpcBuilder_1 = __importDefault(require("./lib/PostgrestRpcBuilder"));
-const constants_1 = require("./lib/constants");
+const PostgrestQueryBuilder_1 = __importDefault(require("./PostgrestQueryBuilder"));
+const PostgrestFilterBuilder_1 = __importDefault(require("./PostgrestFilterBuilder"));
+const constants_1 = require("./constants");
 class PostgrestClient {
     /**
      * Creates a PostgREST client.
@@ -14,7 +14,7 @@ class PostgrestClient {
      * @param headers  Custom headers.
      * @param schema  Postgres schema to switch to.
      */
-    constructor(url, { headers = {}, schema, fetch, throwOnError, } = {}) {
+    constructor(url, { headers = {}, schema, fetch, throwOnError = false, } = {}) {
         this.url = url;
         this.headers = Object.assign(Object.assign({}, constants_1.DEFAULT_HEADERS), headers);
         this.schema = schema;
@@ -25,6 +25,8 @@ class PostgrestClient {
      * Authenticates the request with JWT.
      *
      * @param token  The JWT token to use.
+     *
+     * @deprecated Use `headers` in constructor instead.
      */
     auth(token) {
         this.headers['Authorization'] = `Bearer ${token}`;
@@ -36,9 +38,9 @@ class PostgrestClient {
      * @param table  The table name to operate on.
      */
     from(table) {
-        const url = `${this.url}/${table}`;
+        const url = new URL(`${this.url}/${table}`);
         return new PostgrestQueryBuilder_1.default(url, {
-            headers: this.headers,
+            headers: Object.assign({}, this.headers),
             schema: this.schema,
             fetch: this.fetch,
             shouldThrowOnError: this.shouldThrowOnError,
@@ -48,18 +50,39 @@ class PostgrestClient {
      * Perform a function call.
      *
      * @param fn  The function name to call.
-     * @param params  The parameters to pass to the function call.
-     * @param head  When set to true, no data will be returned.
-     * @param count  Count algorithm to use to count rows in a table.
+     * @param args  The parameters to pass to the function call.
+     * @param options  Named parameters.
+     * @param options.head  When set to true, no data will be returned.
+     * @param options.count  Count algorithm to use to count rows in a table.
      */
-    rpc(fn, params, { head = false, count = null, } = {}) {
-        const url = `${this.url}/rpc/${fn}`;
-        return new PostgrestRpcBuilder_1.default(url, {
-            headers: this.headers,
+    rpc(fn, args = {}, { head = false, count, } = {}) {
+        let method;
+        const url = new URL(`${this.url}/rpc/${fn}`);
+        let body;
+        if (head) {
+            method = 'HEAD';
+            Object.entries(args).forEach(([name, value]) => {
+                url.searchParams.append(name, `${value}`);
+            });
+        }
+        else {
+            method = 'POST';
+            body = args;
+        }
+        const headers = Object.assign({}, this.headers);
+        if (count) {
+            headers['Prefer'] = `count=${count}`;
+        }
+        return new PostgrestFilterBuilder_1.default({
+            method,
+            url,
+            headers,
             schema: this.schema,
+            body,
             fetch: this.fetch,
             shouldThrowOnError: this.shouldThrowOnError,
-        }).rpc(params, { head, count });
+            allowEmpty: false,
+        });
     }
 }
 exports.default = PostgrestClient;

package/dist/main/PostgrestClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"PostgrestClient.js","sourceRoot":"","sources":["../../src/PostgrestClient.ts"],"names":[],"mappings":";;;;;AAAA,wFAA+D;AAC/D,oFAA2D;AAE3D,+CAAiD;AAGjD,MAAqB,eAAe;IAOlC;;;;;;OAMG;IACH,YACE,GAAW,EACX,EACE,OAAO,GAAG,EAAE,EACZ,MAAM,EACN,KAAK,EACL,YAAY,MAMV,EAAE;QAEN,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,mCAAQ,2BAAe,GAAK,OAAO,CAAE,CAAA;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAA;IACxC,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,KAAa;QAChB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAA;QACjD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAU,KAAa;QACzB,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,KAAK,EAAE,CAAA;QAClC,OAAO,IAAI,+BAAqB,CAAI,GAAG,EAAE;YACvC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,GAAG,CACD,EAAU,EACV,MAAe,EACf,EACE,IAAI,GAAG,KAAK,EACZ,KAAK,GAAG,IAAI,MAIV,EAAE;QAEN,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,QAAQ,EAAE,EAAE,CAAA;QACnC,OAAO,IAAI,6BAAmB,CAAI,GAAG,EAAE;YACrC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;IACjC,CAAC;CACF;AAvFD,kCAuFC"}
+{"version":3,"file":"PostgrestClient.js","sourceRoot":"","sources":["../../src/PostgrestClient.ts"],"names":[],"mappings":";;;;;AAAA,oFAA2D;AAC3D,sFAA6D;AAE7D,2CAA6C;AAG7C,MAAqB,eAAe;IAelC;;;;;;OAMG;IACH,YACE,GAAW,EACX,EACE,OAAO,GAAG,EAAE,EACZ,MAAM,EACN,KAAK,EACL,YAAY,GAAG,KAAK,MAMlB,EAAE;QAEN,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,mCAAQ,2BAAe,GAAK,OAAO,CAAE,CAAA;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAA;IACxC,CAAC;IAED;;;;;;OAMG;IACH,IAAI,CAAC,KAAa;QAChB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAA;QACjD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACH,IAAI,CAGF,KAAgB;QAChB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,KAAK,EAAE,CAAC,CAAA;QAC3C,OAAO,IAAI,+BAAqB,CAAQ,GAAG,EAAE;YAC3C,OAAO,oBAAO,IAAI,CAAC,OAAO,CAAE;YAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAA;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,GAAG,CAID,EAAgB,EAChB,OAA0B,EAAE,EAC5B,EACE,IAAI,GAAG,KAAK,EACZ,KAAK,MAIH,EAAE;QASN,IAAI,MAAuB,CAAA;QAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAA;QAC5C,IAAI,IAAyB,CAAA;QAC7B,IAAI,IAAI,EAAE;YACR,MAAM,GAAG,MAAM,CAAA;YACf,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC7C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC,CAAA;YAC3C,CAAC,CAAC,CAAA;SACH;aAAM;YACL,MAAM,GAAG,MAAM,CAAA;YACf,IAAI,GAAG,IAAI,CAAA;SACZ;QAED,MAAM,OAAO,qBAAQ,IAAI,CAAC,OAAO,CAAE,CAAA;QACnC,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS,KAAK,EAAE,CAAA;SACrC;QAED,OAAO,IAAI,gCAAsB,CAAC;YAChC,MAAM;YACN,GAAG;YACH,OAAO;YACP,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,UAAU,EAAE,KAAK;SACmC,CAAC,CAAA;IACzD,CAAC;CACF;AApID,kCAoIC"}

package/dist/main/{lib/PostgrestFilterBuilder.d.ts → PostgrestFilterBuilder.d.ts}

@@ -2,8 +2,8 @@ import PostgrestTransformBuilder from './PostgrestTransformBuilder';
 /**
  * Filters
  */
-declare type FilterOperator = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte' | 'like' | 'ilike' | 'is' | 'in' | 'cs' | 'cd' | 'sl' | 'sr' | 'nxl' | 'nxr' | 'adj' | 'ov' | 'fts' | 'plfts' | 'phfts' | 'wfts' | 'not.eq' | 'not.neq' | 'not.gt' | 'not.gte' | 'not.lt' | 'not.lte' | 'not.like' | 'not.ilike' | 'not.is' | 'not.in' | 'not.cs' | 'not.cd' | 'not.sl' | 'not.sr' | 'not.nxl' | 'not.nxr' | 'not.adj' | 'not.ov' | 'not.fts' | 'not.plfts' | 'not.phfts' | 'not.wfts';
-export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder<T> {
+declare type FilterOperator = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte' | 'like' | 'ilike' | 'is' | 'in' | 'cs' | 'cd' | 'sl' | 'sr' | 'nxl' | 'nxr' | 'adj' | 'ov' | 'fts' | 'plfts' | 'phfts' | 'wfts';
+export default class PostgrestFilterBuilder<Table extends Record<string, unknown>, Result> extends PostgrestTransformBuilder<Table, Result> {
     /**
      * Finds all rows which doesn't satisfy the filter.
      *
@@ -11,7 +11,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param operator  The operator to filter with.
      * @param value  The value to filter with.
      */
-    not(column: keyof T, operator: FilterOperator, value: any): this;
+    not<ColumnName extends string & keyof Table>(column: ColumnName, operator: FilterOperator, value: Table[ColumnName]): this;
+    not(column: string, operator: string, value: unknown): this;
     /**
      * Finds all rows satisfying at least one of the filters.
      *
@@ -28,7 +29,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    eq(column: keyof T, value: T[keyof T]): this;
+    eq<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName]): this;
+    eq(column: string, value: unknown): this;
     /**
      * Finds all rows whose value on the stated `column` doesn't match the
      * specified `value`.
@@ -36,7 +38,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    neq(column: keyof T, value: T[keyof T]): this;
+    neq<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName]): this;
+    neq(column: string, value: unknown): this;
     /**
      * Finds all rows whose value on the stated `column` is greater than the
      * specified `value`.
@@ -44,7 +47,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    gt(column: keyof T, value: T[keyof T]): this;
+    gt<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName]): this;
+    gt(column: string, value: unknown): this;
     /**
      * Finds all rows whose value on the stated `column` is greater than or
      * equal to the specified `value`.
@@ -52,7 +56,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    gte(column: keyof T, value: T[keyof T]): this;
+    gte<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName]): this;
+    gte(column: string, value: unknown): this;
     /**
      * Finds all rows whose value on the stated `column` is less than the
      * specified `value`.
@@ -60,7 +65,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    lt(column: keyof T, value: T[keyof T]): this;
+    lt<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName]): this;
+    lt(column: string, value: unknown): this;
     /**
      * Finds all rows whose value on the stated `column` is less than or equal
      * to the specified `value`.
@@ -68,7 +74,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    lte(column: keyof T, value: T[keyof T]): this;
+    lte<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName]): this;
+    lte(column: string, value: unknown): this;
     /**
      * Finds all rows whose value in the stated `column` matches the supplied
      * `pattern` (case sensitive).
@@ -76,7 +83,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param pattern  The pattern to filter with.
      */
-    like(column: keyof T, pattern: string): this;
+    like<ColumnName extends string & keyof Table>(column: ColumnName, pattern: string): this;
+    like(column: string, pattern: string): this;
     /**
      * Finds all rows whose value in the stated `column` matches the supplied
      * `pattern` (case insensitive).
@@ -84,7 +92,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param pattern  The pattern to filter with.
      */
-    ilike(column: keyof T, pattern: string): this;
+    ilike<ColumnName extends string & keyof Table>(column: ColumnName, pattern: string): this;
+    ilike(column: string, pattern: string): this;
     /**
      * A check for exact equality (null, true, false), finds all rows whose
      * value on the stated `column` exactly match the specified `value`.
@@ -92,7 +101,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    is(column: keyof T, value: boolean | null): this;
+    is<ColumnName extends string & keyof Table>(column: ColumnName, value: Table[ColumnName] & (boolean | null)): this;
+    is(column: string, value: boolean | null): this;
     /**
      * Finds all rows whose value on the stated `column` is found on the
      * specified `values`.
@@ -100,7 +110,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param values  The values to filter with.
      */
-    in(column: keyof T, values: T[keyof T][]): this;
+    in<ColumnName extends string & keyof Table>(column: ColumnName, values: Table[ColumnName][]): this;
+    in(column: string, values: unknown[]): this;
     /**
      * Finds all rows whose json, array, or range value on the stated `column`
      * contains the values specified in `value`.
@@ -108,9 +119,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    contains(column: keyof T, value: string | T[keyof T][] | object): this;
-    /** @deprecated Use `contains()` instead. */
-    cs: (column: keyof T, value: string | T[keyof T][] | object) => this;
+    contains<ColumnName extends string & keyof Table>(column: ColumnName, value: string | Table[ColumnName][] | Record<string, unknown>): this;
+    contains(column: string, value: string | unknown[] | Record<string, unknown>): this;
     /**
      * Finds all rows whose json, array, or range value on the stated `column` is
      * contained by the specified `value`.
@@ -118,9 +128,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    containedBy(column: keyof T, value: string | T[keyof T][] | object): this;
-    /** @deprecated Use `containedBy()` instead. */
-    cd: (column: keyof T, value: string | T[keyof T][] | object) => this;
+    containedBy<ColumnName extends string & keyof Table>(column: ColumnName, value: string | Table[ColumnName][] | Record<string, unknown>): this;
+    containedBy(column: string, value: string | unknown[] | Record<string, unknown>): this;
     /**
      * Finds all rows whose range value on the stated `column` is strictly to the
      * left of the specified `range`.
@@ -128,9 +137,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param range  The range to filter with.
      */
-    rangeLt(column: keyof T, range: string): this;
-    /** @deprecated Use `rangeLt()` instead. */
-    sl: (column: keyof T, range: string) => this;
+    rangeLt<ColumnName extends string & keyof Table>(column: ColumnName, range: string): this;
+    rangeLt(column: string, range: string): this;
     /**
      * Finds all rows whose range value on the stated `column` is strictly to
      * the right of the specified `range`.
@@ -138,9 +146,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param range  The range to filter with.
      */
-    rangeGt(column: keyof T, range: string): this;
-    /** @deprecated Use `rangeGt()` instead. */
-    sr: (column: keyof T, range: string) => this;
+    rangeGt<ColumnName extends string & keyof Table>(column: ColumnName, range: string): this;
+    rangeGt(column: string, range: string): this;
     /**
      * Finds all rows whose range value on the stated `column` does not extend
      * to the left of the specified `range`.
@@ -148,9 +155,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param range  The range to filter with.
      */
-    rangeGte(column: keyof T, range: string): this;
-    /** @deprecated Use `rangeGte()` instead. */
-    nxl: (column: keyof T, range: string) => this;
+    rangeGte<ColumnName extends string & keyof Table>(column: ColumnName, range: string): this;
+    rangeGte(column: string, range: string): this;
     /**
      * Finds all rows whose range value on the stated `column` does not extend
      * to the right of the specified `range`.
@@ -158,9 +164,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param range  The range to filter with.
      */
-    rangeLte(column: keyof T, range: string): this;
-    /** @deprecated Use `rangeLte()` instead. */
-    nxr: (column: keyof T, range: string) => this;
+    rangeLte<ColumnName extends string & keyof Table>(column: ColumnName, range: string): this;
+    rangeLte(column: string, range: string): this;
     /**
      * Finds all rows whose range value on the stated `column` is adjacent to
      * the specified `range`.
@@ -168,9 +173,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param range  The range to filter with.
      */
-    rangeAdjacent(column: keyof T, range: string): this;
-    /** @deprecated Use `rangeAdjacent()` instead. */
-    adj: (column: keyof T, range: string) => this;
+    rangeAdjacent<ColumnName extends string & keyof Table>(column: ColumnName, range: string): this;
+    rangeAdjacent(column: string, range: string): this;
     /**
      * Finds all rows whose array or range value on the stated `column` overlaps
      * (has a value in common) with the specified `value`.
@@ -178,9 +182,8 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param column  The column to filter on.
      * @param value  The value to filter with.
      */
-    overlaps(column: keyof T, value: string | T[keyof T][]): this;
-    /** @deprecated Use `overlaps()` instead. */
-    ov: (column: keyof T, value: string | T[keyof T][]) => this;
+    overlaps<ColumnName extends string & keyof Table>(column: ColumnName, value: string | Table[ColumnName][]): this;
+    overlaps(column: string, value: string | unknown[]): this;
     /**
      * Finds all rows whose text or tsvector value on the stated `column` matches
      * the tsquery in `query`.
@@ -190,61 +193,13 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param config  The text search configuration to use.
      * @param type  The type of tsquery conversion to use on `query`.
      */
-    textSearch(column: keyof T, query: string, { config, type, }?: {
+    textSearch<ColumnName extends string & keyof Table>(column: ColumnName, query: string, options?: {
         config?: string;
-        type?: 'plain' | 'phrase' | 'websearch' | null;
+        type?: 'plain' | 'phrase' | 'websearch';
     }): this;
-    /**
-     * Finds all rows whose tsvector value on the stated `column` matches
-     * to_tsquery(`query`).
-     *
-     * @param column  The column to filter on.
-     * @param query  The Postgres tsquery string to filter with.
-     * @param config  The text search configuration to use.
-     *
-     * @deprecated Use `textSearch()` instead.
-     */
-    fts(column: keyof T, query: string, { config }?: {
-        config?: string;
-    }): this;
-    /**
-     * Finds all rows whose tsvector value on the stated `column` matches
-     * plainto_tsquery(`query`).
-     *
-     * @param column  The column to filter on.
-     * @param query  The Postgres tsquery string to filter with.
-     * @param config  The text search configuration to use.
-     *
-     * @deprecated Use `textSearch()` with `type: 'plain'` instead.
-     */
-    plfts(column: keyof T, query: string, { config }?: {
-        config?: string;
-    }): this;
-    /**
-     * Finds all rows whose tsvector value on the stated `column` matches
-     * phraseto_tsquery(`query`).
-     *
-     * @param column  The column to filter on.
-     * @param query  The Postgres tsquery string to filter with.
-     * @param config  The text search configuration to use.
-     *
-     * @deprecated Use `textSearch()` with `type: 'phrase'` instead.
-     */
-    phfts(column: keyof T, query: string, { config }?: {
-        config?: string;
-    }): this;
-    /**
-     * Finds all rows whose tsvector value on the stated `column` matches
-     * websearch_to_tsquery(`query`).
-     *
-     * @param column  The column to filter on.
-     * @param query  The Postgres tsquery string to filter with.
-     * @param config  The text search configuration to use.
-     *
-     * @deprecated Use `textSearch()` with `type: 'websearch'` instead.
-     */
-    wfts(column: keyof T, query: string, { config }?: {
+    textSearch(column: string, query: string, options?: {
         config?: string;
+        type?: 'plain' | 'phrase' | 'websearch';
     }): this;
     /**
      * Finds all rows whose `column` satisfies the filter.
@@ -253,13 +208,15 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
      * @param operator  The operator to filter with.
      * @param value  The value to filter with.
      */
-    filter(column: keyof T, operator: FilterOperator, value: any): this;
+    filter<ColumnName extends string & keyof Table>(column: ColumnName, operator: `${'' | 'not.'}${FilterOperator}`, value: unknown): this;
+    filter(column: string, operator: string, value: unknown): this;
     /**
      * Finds all rows whose columns match the specified `query` object.
      *
      * @param query  The object to filter with, with column names as keys mapped
      *               to their filter values.
      */
+    match<ColumnName extends string & keyof Table>(query: Record<ColumnName, Table[ColumnName]>): this;
     match(query: Record<string, unknown>): this;
 }
 export {};