fix: makse has wildcard path a getter

psteinroe · Jul 14, 2024 · 539020b · 539020b
1 parent e445d58
commit 539020b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/packages/postgrest-core/src/mutate-item.ts b/packages/postgrest-core/src/mutate-item.ts
@@ -141,7 +141,7 @@ export const mutateItem = async <KeyType, Type extends Record<string, unknown>>(
         const orderBy = key.orderByKey
           ? parseOrderByKey(key.orderByKey)
           : undefined;
-        if (key.isHead === true || filter.hasWildcardPath()) {
+        if (key.isHead === true || filter.hasWildcardPath) {
           // we cannot know whether the new item after mutating still has all paths required for a query if it contains a wildcard,
           // because we do not know what columns a table has. we must always revalidate then.
           mutations.push(revalidate(k));

diff --git a/packages/postgrest-core/src/postgrest-filter.ts b/packages/postgrest-core/src/postgrest-filter.ts
@@ -34,6 +34,9 @@ export class PostgrestFilter<Result extends Record<string, unknown>> {
       this.params.filters,
       this.params.paths,
     );
+    this._hasWildcardPath = this.params.paths.some((p) =>
+      p.declaration.endsWith('*'),
+    );
   }
 
   public static fromQuery(query: string, opts?: PostgrestQueryParserOptions) {
@@ -81,7 +84,7 @@ export class PostgrestFilter<Result extends Record<string, unknown>> {
     return this._filtersFn(obj);
   }
 
-  hasWildcardPath(): boolean {
+  get hasWildcardPath(): boolean {
     if (typeof this._hasWildcardPath === 'undefined') {
       this._hasWildcardPath = this.params.paths.some((p) =>
         p.declaration.endsWith('*'),

diff --git a/packages/postgrest-core/src/upsert-item.ts b/packages/postgrest-core/src/upsert-item.ts
@@ -143,7 +143,7 @@ export const upsertItem = async <KeyType, Type extends Record<string, unknown>>(
           ? parseOrderByKey(key.orderByKey)
           : undefined;
 
-        if (key.isHead === true || filter.hasWildcardPath()) {
+        if (key.isHead === true || filter.hasWildcardPath) {
           // we cannot know whether the new item after merging still has all paths required for a query if it contains a wildcard,
           // because we do not know what columns a table has. we must always revalidate then.
           mutations.push(revalidate(k));

diff --git a/packages/postgrest-core/tests/mutate-item.spec.ts b/packages/postgrest-core/tests/mutate-item.spec.ts
@@ -52,7 +52,7 @@ const mutateFnMock = async (
       },
       getPostgrestFilter() {
         return {
-          hasWildcardPath(): boolean {
+          get hasWildcardPath(): boolean {
             return typeof postgrestFilter.hasWildcardPath === 'boolean'
               ? postgrestFilter.hasWildcardPath
               : false;
@@ -137,7 +137,7 @@ const mutateRelationMock = async (
       },
       getPostgrestFilter() {
         return {
-          hasWildcardPath(): boolean {
+          get hasWildcardPath(): boolean {
             return false;
           },
           denormalize<RelationType>(obj: RelationType): RelationType {
@@ -205,7 +205,7 @@ const mutateFnResult = async (
         },
         getPostgrestFilter() {
           return {
-            hasWildcardPath(): boolean {
+            get hasWildcardPath(): boolean {
               return typeof postgrestFilter.hasWildcardPath === 'boolean'
                 ? postgrestFilter.hasWildcardPath
                 : false;

diff --git a/packages/postgrest-core/tests/postgrest-filter.spec.ts b/packages/postgrest-core/tests/postgrest-filter.spec.ts
@@ -42,6 +42,19 @@ describe('PostgrestFilter', () => {
     ).toEqual(true);
   });
 
+  it('should set has wildcard paths', () => {
+    expect(
+      PostgrestFilter.fromQuery(
+        new PostgrestParser(
+          createClient('https://localhost', 'test')
+            .from('contact')
+            .select('some,*')
+            .eq('username', 'test'),
+        ).queryKey,
+      ).hasWildcardPath,
+    ).toEqual(true);
+  });
+
   describe('.transform', () => {
     it('should transform nested one-to-many relations', () => {
       expect(

diff --git a/packages/postgrest-core/tests/upsert-item.spec.ts b/packages/postgrest-core/tests/upsert-item.spec.ts
@@ -50,7 +50,7 @@ const mutateFnMock = async (
       },
       getPostgrestFilter() {
         return {
-          hasWildcardPath(): boolean {
+          get hasWildcardPath(): boolean {
             return typeof postgrestFilter.hasWildcardPath === 'boolean'
               ? postgrestFilter.hasWildcardPath
               : false;
@@ -134,7 +134,7 @@ const mutateRelationMock = async (
       },
       getPostgrestFilter() {
         return {
-          hasWildcardPath(): boolean {
+          get hasWildcardPath(): boolean {
             return false;
           },
           denormalize<RelationType>(obj: RelationType): RelationType {
@@ -202,7 +202,7 @@ const mutateFnResult = async (
         },
         getPostgrestFilter() {
           return {
-            hasWildcardPath(): boolean {
+            get hasWildcardPath(): boolean {
               return typeof postgrestFilter.hasWildcardPath === 'boolean'
                 ? postgrestFilter.hasWildcardPath
                 : false;