@supabase/postgrest-js - npm Package Compare versions

Comparing version 1.17.9 to 1.17.10

dist/cjs/PostgrestFilterBuilder.d.ts

 import PostgrestTransformBuilder from './PostgrestTransformBuilder';
-import { GenericSchema, GenericTable } from './types';
+import { GenericSchema } from './types';
 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';
-declare type ResolveFilterValue<Tables extends Record<string, GenericTable>, Row extends Record<string, unknown>, ColumnName extends string> = ColumnName extends `${infer RelationshipTable}.${infer Remainder}` ? Remainder extends `${infer _}.${infer _}` ? ResolveFilterValue<Tables, Row, Remainder> : ResolveFilterRelationshipValue<Tables, RelationshipTable, Remainder> : ColumnName extends keyof Row ? Row[ColumnName] : never;
-declare type ResolveFilterRelationshipValue<Tables extends Record<string, GenericTable>, RelationshipTable extends string, RelationshipColumn extends string> = RelationshipTable extends keyof Tables ? 'Row' extends keyof Tables[RelationshipTable] ? RelationshipColumn extends keyof Tables[RelationshipTable]['Row'] ? Tables[RelationshipTable]['Row'][RelationshipColumn] : unknown : unknown : unknown;
+declare type ResolveFilterValue<Schema extends GenericSchema, Row extends Record<string, unknown>, ColumnName extends string> = ColumnName extends `${infer RelationshipTable}.${infer Remainder}` ? Remainder extends `${infer _}.${infer _}` ? ResolveFilterValue<Schema, Row, Remainder> : ResolveFilterRelationshipValue<Schema, RelationshipTable, Remainder> : ColumnName extends keyof Row ? Row[ColumnName] : never;
+declare type ResolveFilterRelationshipValue<Schema extends GenericSchema, RelationshipTable extends string, RelationshipColumn extends string> = Schema['Tables'] & Schema['Views'] extends infer TablesAndViews ? RelationshipTable extends keyof TablesAndViews ? 'Row' extends keyof TablesAndViews[RelationshipTable] ? RelationshipColumn extends keyof TablesAndViews[RelationshipTable]['Row'] ? TablesAndViews[RelationshipTable]['Row'][RelationshipColumn] : unknown : unknown : unknown : never;
 export default class PostgrestFilterBuilder<Schema extends GenericSchema, Row extends Record<string, unknown>, Result, RelationName = unknown, Relationships = unknown> extends PostgrestTransformBuilder<Schema, Row, Result, RelationName, Relationships> {
@@ -15,3 +15,3 @@ /**
      */
-    eq<ColumnName extends string>(column: ColumnName, value: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never ? NonNullable<unknown> : NonNullable<ResolveFilterValue<Schema['Tables'], Row, ColumnName>>): this;
+    eq<ColumnName extends string>(column: ColumnName, value: ResolveFilterValue<Schema, Row, ColumnName> extends never ? NonNullable<unknown> : NonNullable<ResolveFilterValue<Schema, Row, ColumnName>>): this;
     /**
@@ -23,3 +23,3 @@ * Match only rows where `column` is not equal to `value`.
      */
-    neq<ColumnName extends string>(column: ColumnName, value: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never ? unknown : ResolveFilterValue<Schema['Tables'], Row, ColumnName>): this;
+    neq<ColumnName extends string>(column: ColumnName, value: ResolveFilterValue<Schema, Row, ColumnName> extends never ? unknown : ResolveFilterValue<Schema, Row, ColumnName>): this;
     gt<ColumnName extends string & keyof Row>(column: ColumnName, value: Row[ColumnName]): this;
@@ -53,3 +53,3 @@ gt(column: string, value: unknown): this;
      */
-    in<ColumnName extends string>(column: ColumnName, values: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never ? unknown[] : ReadonlyArray<ResolveFilterValue<Schema['Tables'], Row, ColumnName>>): this;
+    in<ColumnName extends string>(column: ColumnName, values: ResolveFilterValue<Schema, Row, ColumnName> extends never ? unknown[] : ReadonlyArray<ResolveFilterValue<Schema, Row, ColumnName>>): this;
     contains<ColumnName extends string & keyof Row>(column: ColumnName, value: string | ReadonlyArray<Row[ColumnName]> | Record<string, unknown>): this;
@@ -56,0 +56,0 @@ contains(column: string, value: string | readonly unknown[] | Record<string, unknown>): this;

package.json

 {
   "name": "@supabase/postgrest-js",
-  "version": "1.17.9",
+  "version": "1.17.10",
   "description": "Isomorphic PostgREST client",
@@ -5,0 +5,0 @@ "keywords": [

src/PostgrestFilterBuilder.ts

 import PostgrestTransformBuilder from './PostgrestTransformBuilder'
-import { GenericSchema, GenericTable } from './types'
+import { GenericSchema } from './types'
 
@@ -34,3 +34,3 @@ type FilterOperator =
 type ResolveFilterValue<
-  Tables extends Record<string, GenericTable>,
+  Schema extends GenericSchema,
   Row extends Record<string, unknown>,
@@ -40,4 +40,4 @@ ColumnName extends string
   ? Remainder extends `${infer _}.${infer _}`
-    ? ResolveFilterValue<Tables, Row, Remainder>
-    : ResolveFilterRelationshipValue<Tables, RelationshipTable, Remainder>
+    ? ResolveFilterValue<Schema, Row, Remainder>
+    : ResolveFilterRelationshipValue<Schema, RelationshipTable, Remainder>
   : ColumnName extends keyof Row
@@ -48,12 +48,14 @@ ? Row[ColumnName]
 type ResolveFilterRelationshipValue<
-  Tables extends Record<string, GenericTable>,
+  Schema extends GenericSchema,
   RelationshipTable extends string,
   RelationshipColumn extends string
-> = RelationshipTable extends keyof Tables
-  ? 'Row' extends keyof Tables[RelationshipTable]
-    ? RelationshipColumn extends keyof Tables[RelationshipTable]['Row']
-      ? Tables[RelationshipTable]['Row'][RelationshipColumn]
+> = Schema['Tables'] & Schema['Views'] extends infer TablesAndViews
+  ? RelationshipTable extends keyof TablesAndViews
+    ? 'Row' extends keyof TablesAndViews[RelationshipTable]
+      ? RelationshipColumn extends keyof TablesAndViews[RelationshipTable]['Row']
+        ? TablesAndViews[RelationshipTable]['Row'][RelationshipColumn]
+        : unknown
       : unknown
     : unknown
-  : unknown
+  : never
 
@@ -77,5 +79,5 @@ export default class PostgrestFilterBuilder<
     column: ColumnName,
-    value: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never
+    value: ResolveFilterValue<Schema, Row, ColumnName> extends never
       ? NonNullable<unknown>
-      : NonNullable<ResolveFilterValue<Schema['Tables'], Row, ColumnName>>
+      : NonNullable<ResolveFilterValue<Schema, Row, ColumnName>>
   ): this {
@@ -94,5 +96,5 @@ this.url.searchParams.append(column, `eq.${value}`)
     column: ColumnName,
-    value: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never
+    value: ResolveFilterValue<Schema, Row, ColumnName> extends never
       ? unknown
-      : ResolveFilterValue<Schema['Tables'], Row, ColumnName>
+      : ResolveFilterValue<Schema, Row, ColumnName>
   ): this {
@@ -275,5 +277,5 @@ this.url.searchParams.append(column, `neq.${value}`)
     column: ColumnName,
-    values: ResolveFilterValue<Schema['Tables'], Row, ColumnName> extends never
+    values: ResolveFilterValue<Schema, Row, ColumnName> extends never
       ? unknown[]
-      : ReadonlyArray<ResolveFilterValue<Schema['Tables'], Row, ColumnName>>
+      : ReadonlyArray<ResolveFilterValue<Schema, Row, ColumnName>>
   ): this {
@@ -280,0 +282,0 @@ const cleanedValues = Array.from(new Set(values))

src/version.ts

@@ -1,1 +0,1 @@
-export const version = '1.17.9'
+export const version = '1.17.10'

No alert changes

Improved metrics

Lines of code

5682

increased by0.04%

Worsened metrics

Total package byte prevSize

328682

decreased by-0.02%

No dependency changes