fix: address pr comments

Author: ymc9

packages/clients/tanstack-query/src/common/client.ts

@@ -2,6 +2,11 @@ import type { QueryClient } from '@tanstack/query-core';
 import type { InvalidationPredicate, QueryInfo } from '@zenstackhq/client-helpers';
 import { parseQueryKey } from './query-key.js';
 
+/** Strips a trailing slash from an endpoint URL. */
+export function normalizeEndpoint(endpoint: string) {
+    return endpoint.replace(/\/$/, '');
+}
+
 export function invalidateQueriesMatchingPredicate(queryClient: QueryClient, predicate: InvalidationPredicate) {
     return queryClient.invalidateQueries({
         predicate: ({ queryKey }) => {

packages/clients/tanstack-query/src/react.ts

@@ -65,7 +65,7 @@ import type {
 } from '@zenstackhq/orm';
 import type { GetModels, SchemaDef } from '@zenstackhq/schema';
 import { createContext, useContext } from 'react';
-import { getAllQueries, invalidateQueriesMatchingPredicate } from './common/client.js';
+import { getAllQueries, invalidateQueriesMatchingPredicate, normalizeEndpoint } from './common/client.js';
 import { CUSTOM_PROC_ROUTE_NAME } from './common/constants.js';
 import { getQueryKey } from './common/query-key.js';
 import { makeTransactionMutationFn, makeTransactionOnSuccess } from './common/transaction.js';
@@ -832,7 +832,7 @@ function useFetchOptions(options: QueryContext | undefined) {
     const { endpoint, fetch, logging } = useHooksContext();
     // options take precedence over context
     return {
-        endpoint: options?.endpoint ?? endpoint,
+        endpoint: normalizeEndpoint(options?.endpoint ?? endpoint),
         fetch: options?.fetch ?? fetch,
         logging: options?.logging ?? logging,
     };

packages/clients/tanstack-query/src/svelte/index.svelte.ts

@@ -62,7 +62,7 @@ import type {
 } from '@zenstackhq/orm';
 import type { GetModels, SchemaDef } from '@zenstackhq/schema';
 import { getContext, setContext } from 'svelte';
-import { getAllQueries, invalidateQueriesMatchingPredicate } from '../common/client.js';
+import { getAllQueries, invalidateQueriesMatchingPredicate, normalizeEndpoint } from '../common/client.js';
 import { CUSTOM_PROC_ROUTE_NAME } from '../common/constants.js';
 import { getQueryKey } from '../common/query-key.js';
 import { makeTransactionMutationFn, makeTransactionOnSuccess } from '../common/transaction.js';
@@ -741,7 +741,7 @@ function useFetchOptions(options: Accessor<QueryContext> | undefined) {
     const optionsValue = options?.();
     // options take precedence over context
     return {
-        endpoint: optionsValue?.endpoint ?? endpoint,
+        endpoint: normalizeEndpoint(optionsValue?.endpoint ?? endpoint),
         fetch: optionsValue?.fetch ?? fetch,
         logging: optionsValue?.logging ?? logging,
     };

packages/clients/tanstack-query/src/vue.ts

@@ -60,7 +60,7 @@ import type {
 } from '@zenstackhq/orm';
 import type { GetModels, SchemaDef } from '@zenstackhq/schema';
 import { computed, inject, provide, toValue, unref, type MaybeRefOrGetter, type Ref, type UnwrapRef } from 'vue';
-import { getAllQueries, invalidateQueriesMatchingPredicate } from './common/client.js';
+import { getAllQueries, invalidateQueriesMatchingPredicate, normalizeEndpoint } from './common/client.js';
 import { CUSTOM_PROC_ROUTE_NAME } from './common/constants.js';
 import { getQueryKey } from './common/query-key.js';
 import { makeTransactionMutationFn, makeTransactionOnSuccess } from './common/transaction.js';
@@ -762,7 +762,7 @@ function useFetchOptions(options: MaybeRefOrGetter<QueryContext | undefined>) {
     const optionsValue = toValue(options);
     // options take precedence over context
     return {
-        endpoint: optionsValue?.endpoint ?? endpoint,
+        endpoint: normalizeEndpoint(optionsValue?.endpoint ?? endpoint),
         fetch: optionsValue?.fetch ?? fetch,
         logging: optionsValue?.logging ?? logging,
     };