@open-mercato/ui 0.6.6-develop.6094.1.28b081ea16 → 0.6.6-develop.6126.1.0b9392fdae

package/dist/theme/QueryProvider.js

@@ -2,6 +2,7 @@
 import { jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { MutationCache, QueryCache, QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { parseBooleanWithDefault } from "@open-mercato/shared/lib/boolean";
 import { redirectToSessionRefresh, notifyForbiddenAccess, UnauthorizedError, ForbiddenError, apiFetch, setAuthRedirectConfig } from "../backend/utils/api.js";
 function ensureGlobalFetchInterception() {
   if (typeof window === "undefined") return;
@@ -11,7 +12,33 @@ function ensureGlobalFetchInterception() {
   w.__omOriginalFetch = window.fetch;
   window.fetch = ((input, init) => apiFetch(input, init));
 }
+const DEFAULT_QUERY_STALE_TIME_MS = 3e4;
+const QUERY_RETRY_LIMIT = 2;
+function readErrorStatus(error) {
+  const status = error?.status;
+  if (typeof status === "number") return status;
+  const responseStatus = error?.response?.status;
+  return typeof responseStatus === "number" ? responseStatus : null;
+}
+function shouldRetryQuery(failureCount, error) {
+  const status = readErrorStatus(error);
+  if (status !== null && status >= 400 && status <= 404) return false;
+  return failureCount < QUERY_RETRY_LIMIT;
+}
+function buildDefaultQueryOptions() {
+  const enableDefaultStaleTime = parseBooleanWithDefault(
+    process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED,
+    false
+  );
+  return {
+    retry: shouldRetryQuery,
+    ...enableDefaultStaleTime ? { staleTime: DEFAULT_QUERY_STALE_TIME_MS } : {}
+  };
+}
 const client = new QueryClient({
+  defaultOptions: {
+    queries: buildDefaultQueryOptions()
+  },
   queryCache: new QueryCache({
     onError: (error) => {
       if (error instanceof UnauthorizedError) redirectToSessionRefresh();
@@ -39,6 +66,9 @@ function QueryProvider({ children, defaultForbiddenRoles }) {
   return /* @__PURE__ */ jsx(QueryClientProvider, { client, children });
 }
 export {
-  QueryProvider
+  DEFAULT_QUERY_STALE_TIME_MS,
+  QueryProvider,
+  buildDefaultQueryOptions,
+  shouldRetryQuery
 };
 //# sourceMappingURL=QueryProvider.js.map

package/dist/theme/QueryProvider.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/theme/QueryProvider.tsx"],
-  "sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport { MutationCache, QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query'\nimport { redirectToSessionRefresh, notifyForbiddenAccess, UnauthorizedError, ForbiddenError, apiFetch, setAuthRedirectConfig } from '../backend/utils/api'\n\n// Ensure global fetch calls also flow through apiFetch so 401 session-refresh\n// and 403 access-denied flash banners fire consistently.\nfunction ensureGlobalFetchInterception() {\n  if (typeof window === 'undefined') return\n  const w = window as any\n  if (w.__omFetchPatched) return\n  w.__omFetchPatched = true\n  w.__omOriginalFetch = window.fetch\n  window.fetch = ((input: RequestInfo | URL, init?: RequestInit) => apiFetch(input, init)) as any\n}\n\nconst client = new QueryClient({\n  queryCache: new QueryCache({\n    onError: (error) => {\n      if (error instanceof UnauthorizedError) redirectToSessionRefresh()\n      else if (error instanceof ForbiddenError) notifyForbiddenAccess()\n      // As a fallback, try to detect common cases\n      else if ((error as any)?.status === 401) redirectToSessionRefresh()\n      else if ((error as any)?.status === 403) notifyForbiddenAccess()\n    },\n  }),\n  mutationCache: new MutationCache({\n    onError: (error) => {\n      if (error instanceof UnauthorizedError) redirectToSessionRefresh()\n      else if (error instanceof ForbiddenError) notifyForbiddenAccess()\n      else if ((error as any)?.status === 401) redirectToSessionRefresh()\n      else if ((error as any)?.status === 403) notifyForbiddenAccess()\n    },\n  }),\n})\n\ntype QueryProviderProps = { children: React.ReactNode; defaultForbiddenRoles?: string[] }\n\nexport function QueryProvider({ children, defaultForbiddenRoles }: QueryProviderProps) {\n  React.useEffect(() => {\n    ensureGlobalFetchInterception()\n    if (defaultForbiddenRoles && defaultForbiddenRoles.length) {\n      setAuthRedirectConfig({ defaultForbiddenRoles })\n    }\n  }, [])\n  return <QueryClientProvider client={client}>{children}</QueryClientProvider>\n}\n"],
-  "mappings": ";AA6CS;AA5CT,YAAY,WAAW;AACvB,SAAS,eAAe,YAAY,aAAa,2BAA2B;AAC5E,SAAS,0BAA0B,uBAAuB,mBAAmB,gBAAgB,UAAU,6BAA6B;AAIpI,SAAS,gCAAgC;AACvC,MAAI,OAAO,WAAW,YAAa;AACnC,QAAM,IAAI;AACV,MAAI,EAAE,iBAAkB;AACxB,IAAE,mBAAmB;AACrB,IAAE,oBAAoB,OAAO;AAC7B,SAAO,SAAS,CAAC,OAA0B,SAAuB,SAAS,OAAO,IAAI;AACxF;AAEA,MAAM,SAAS,IAAI,YAAY;AAAA,EAC7B,YAAY,IAAI,WAAW;AAAA,IACzB,SAAS,CAAC,UAAU;AAClB,UAAI,iBAAiB,kBAAmB,0BAAyB;AAAA,eACxD,iBAAiB,eAAgB,uBAAsB;AAAA,eAEtD,OAAe,WAAW,IAAK,0BAAyB;AAAA,eACxD,OAAe,WAAW,IAAK,uBAAsB;AAAA,IACjE;AAAA,EACF,CAAC;AAAA,EACD,eAAe,IAAI,cAAc;AAAA,IAC/B,SAAS,CAAC,UAAU;AAClB,UAAI,iBAAiB,kBAAmB,0BAAyB;AAAA,eACxD,iBAAiB,eAAgB,uBAAsB;AAAA,eACtD,OAAe,WAAW,IAAK,0BAAyB;AAAA,eACxD,OAAe,WAAW,IAAK,uBAAsB;AAAA,IACjE;AAAA,EACF,CAAC;AACH,CAAC;AAIM,SAAS,cAAc,EAAE,UAAU,sBAAsB,GAAuB;AACrF,QAAM,UAAU,MAAM;AACpB,kCAA8B;AAC9B,QAAI,yBAAyB,sBAAsB,QAAQ;AACzD,4BAAsB,EAAE,sBAAsB,CAAC;AAAA,IACjD;AAAA,EACF,GAAG,CAAC,CAAC;AACL,SAAO,oBAAC,uBAAoB,QAAiB,UAAS;AACxD;",
+  "sourcesContent": ["\"use client\"\nimport * as React from 'react'\nimport { MutationCache, QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query'\nimport { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'\nimport { redirectToSessionRefresh, notifyForbiddenAccess, UnauthorizedError, ForbiddenError, apiFetch, setAuthRedirectConfig } from '../backend/utils/api'\n\n// Ensure global fetch calls also flow through apiFetch so 401 session-refresh\n// and 403 access-denied flash banners fire consistently.\nfunction ensureGlobalFetchInterception() {\n  if (typeof window === 'undefined') return\n  const w = window as any\n  if (w.__omFetchPatched) return\n  w.__omFetchPatched = true\n  w.__omOriginalFetch = window.fetch\n  window.fetch = ((input: RequestInfo | URL, init?: RequestInit) => apiFetch(input, init)) as any\n}\n\nexport const DEFAULT_QUERY_STALE_TIME_MS = 30_000\nconst QUERY_RETRY_LIMIT = 2\n\nfunction readErrorStatus(error: unknown): number | null {\n  const status = (error as { status?: unknown })?.status\n  if (typeof status === 'number') return status\n  const responseStatus = (error as { response?: { status?: unknown } })?.response?.status\n  return typeof responseStatus === 'number' ? responseStatus : null\n}\n\nexport function shouldRetryQuery(failureCount: number, error: unknown): boolean {\n  const status = readErrorStatus(error)\n  if (status !== null && status >= 400 && status <= 404) return false\n  return failureCount < QUERY_RETRY_LIMIT\n}\n\nexport function buildDefaultQueryOptions() {\n  const enableDefaultStaleTime = parseBooleanWithDefault(\n    process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED,\n    false,\n  )\n  return {\n    retry: shouldRetryQuery,\n    ...(enableDefaultStaleTime ? { staleTime: DEFAULT_QUERY_STALE_TIME_MS } : {}),\n  }\n}\n\nconst client = new QueryClient({\n  defaultOptions: {\n    queries: buildDefaultQueryOptions(),\n  },\n  queryCache: new QueryCache({\n    onError: (error) => {\n      if (error instanceof UnauthorizedError) redirectToSessionRefresh()\n      else if (error instanceof ForbiddenError) notifyForbiddenAccess()\n      // As a fallback, try to detect common cases\n      else if ((error as any)?.status === 401) redirectToSessionRefresh()\n      else if ((error as any)?.status === 403) notifyForbiddenAccess()\n    },\n  }),\n  mutationCache: new MutationCache({\n    onError: (error) => {\n      if (error instanceof UnauthorizedError) redirectToSessionRefresh()\n      else if (error instanceof ForbiddenError) notifyForbiddenAccess()\n      else if ((error as any)?.status === 401) redirectToSessionRefresh()\n      else if ((error as any)?.status === 403) notifyForbiddenAccess()\n    },\n  }),\n})\n\ntype QueryProviderProps = { children: React.ReactNode; defaultForbiddenRoles?: string[] }\n\nexport function QueryProvider({ children, defaultForbiddenRoles }: QueryProviderProps) {\n  React.useEffect(() => {\n    ensureGlobalFetchInterception()\n    if (defaultForbiddenRoles && defaultForbiddenRoles.length) {\n      setAuthRedirectConfig({ defaultForbiddenRoles })\n    }\n  }, [])\n  return <QueryClientProvider client={client}>{children}</QueryClientProvider>\n}\n"],
+  "mappings": ";AA4ES;AA3ET,YAAY,WAAW;AACvB,SAAS,eAAe,YAAY,aAAa,2BAA2B;AAC5E,SAAS,+BAA+B;AACxC,SAAS,0BAA0B,uBAAuB,mBAAmB,gBAAgB,UAAU,6BAA6B;AAIpI,SAAS,gCAAgC;AACvC,MAAI,OAAO,WAAW,YAAa;AACnC,QAAM,IAAI;AACV,MAAI,EAAE,iBAAkB;AACxB,IAAE,mBAAmB;AACrB,IAAE,oBAAoB,OAAO;AAC7B,SAAO,SAAS,CAAC,OAA0B,SAAuB,SAAS,OAAO,IAAI;AACxF;AAEO,MAAM,8BAA8B;AAC3C,MAAM,oBAAoB;AAE1B,SAAS,gBAAgB,OAA+B;AACtD,QAAM,SAAU,OAAgC;AAChD,MAAI,OAAO,WAAW,SAAU,QAAO;AACvC,QAAM,iBAAkB,OAA+C,UAAU;AACjF,SAAO,OAAO,mBAAmB,WAAW,iBAAiB;AAC/D;AAEO,SAAS,iBAAiB,cAAsB,OAAyB;AAC9E,QAAM,SAAS,gBAAgB,KAAK;AACpC,MAAI,WAAW,QAAQ,UAAU,OAAO,UAAU,IAAK,QAAO;AAC9D,SAAO,eAAe;AACxB;AAEO,SAAS,2BAA2B;AACzC,QAAM,yBAAyB;AAAA,IAC7B,QAAQ,IAAI;AAAA,IACZ;AAAA,EACF;AACA,SAAO;AAAA,IACL,OAAO;AAAA,IACP,GAAI,yBAAyB,EAAE,WAAW,4BAA4B,IAAI,CAAC;AAAA,EAC7E;AACF;AAEA,MAAM,SAAS,IAAI,YAAY;AAAA,EAC7B,gBAAgB;AAAA,IACd,SAAS,yBAAyB;AAAA,EACpC;AAAA,EACA,YAAY,IAAI,WAAW;AAAA,IACzB,SAAS,CAAC,UAAU;AAClB,UAAI,iBAAiB,kBAAmB,0BAAyB;AAAA,eACxD,iBAAiB,eAAgB,uBAAsB;AAAA,eAEtD,OAAe,WAAW,IAAK,0BAAyB;AAAA,eACxD,OAAe,WAAW,IAAK,uBAAsB;AAAA,IACjE;AAAA,EACF,CAAC;AAAA,EACD,eAAe,IAAI,cAAc;AAAA,IAC/B,SAAS,CAAC,UAAU;AAClB,UAAI,iBAAiB,kBAAmB,0BAAyB;AAAA,eACxD,iBAAiB,eAAgB,uBAAsB;AAAA,eACtD,OAAe,WAAW,IAAK,0BAAyB;AAAA,eACxD,OAAe,WAAW,IAAK,uBAAsB;AAAA,IACjE;AAAA,EACF,CAAC;AACH,CAAC;AAIM,SAAS,cAAc,EAAE,UAAU,sBAAsB,GAAuB;AACrF,QAAM,UAAU,MAAM;AACpB,kCAA8B;AAC9B,QAAI,yBAAyB,sBAAsB,QAAQ;AACzD,4BAAsB,EAAE,sBAAsB,CAAC;AAAA,IACjD;AAAA,EACF,GAAG,CAAC,CAAC;AACL,SAAO,oBAAC,uBAAoB,QAAiB,UAAS;AACxD;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ui",
-  "version": "0.6.6-develop.6094.1.28b081ea16",
+  "version": "0.6.6-develop.6126.1.0b9392fdae",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -155,13 +155,13 @@
     "remark-gfm": "^4.0.1"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6094.1.28b081ea16",
+    "@open-mercato/shared": "0.6.6-develop.6126.1.0b9392fdae",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-is": ">=18.0.0"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6094.1.28b081ea16",
+    "@open-mercato/shared": "0.6.6-develop.6126.1.0b9392fdae",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/theme/QueryProvider.tsx

@@ -1,6 +1,7 @@
 "use client"
 import * as React from 'react'
 import { MutationCache, QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
 import { redirectToSessionRefresh, notifyForbiddenAccess, UnauthorizedError, ForbiddenError, apiFetch, setAuthRedirectConfig } from '../backend/utils/api'
 
 // Ensure global fetch calls also flow through apiFetch so 401 session-refresh
@@ -14,7 +15,37 @@ function ensureGlobalFetchInterception() {
   window.fetch = ((input: RequestInfo | URL, init?: RequestInit) => apiFetch(input, init)) as any
 }
 
+export const DEFAULT_QUERY_STALE_TIME_MS = 30_000
+const QUERY_RETRY_LIMIT = 2
+
+function readErrorStatus(error: unknown): number | null {
+  const status = (error as { status?: unknown })?.status
+  if (typeof status === 'number') return status
+  const responseStatus = (error as { response?: { status?: unknown } })?.response?.status
+  return typeof responseStatus === 'number' ? responseStatus : null
+}
+
+export function shouldRetryQuery(failureCount: number, error: unknown): boolean {
+  const status = readErrorStatus(error)
+  if (status !== null && status >= 400 && status <= 404) return false
+  return failureCount < QUERY_RETRY_LIMIT
+}
+
+export function buildDefaultQueryOptions() {
+  const enableDefaultStaleTime = parseBooleanWithDefault(
+    process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED,
+    false,
+  )
+  return {
+    retry: shouldRetryQuery,
+    ...(enableDefaultStaleTime ? { staleTime: DEFAULT_QUERY_STALE_TIME_MS } : {}),
+  }
+}
+
 const client = new QueryClient({
+  defaultOptions: {
+    queries: buildDefaultQueryOptions(),
+  },
   queryCache: new QueryCache({
     onError: (error) => {
       if (error instanceof UnauthorizedError) redirectToSessionRefresh()

package/src/theme/__tests__/QueryProvider.test.tsx

@@ -0,0 +1,37 @@
+import {
+  DEFAULT_QUERY_STALE_TIME_MS,
+  buildDefaultQueryOptions,
+  shouldRetryQuery,
+} from '../QueryProvider'
+import { UnauthorizedError } from '../../backend/utils/api'
+
+describe('QueryProvider defaults', () => {
+  const originalStaleTimeFlag = process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED
+
+  afterEach(() => {
+    process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED = originalStaleTimeFlag
+  })
+
+  it('does not retry deterministic 4xx query failures', () => {
+    expect(shouldRetryQuery(0, new UnauthorizedError())).toBe(false)
+    expect(shouldRetryQuery(0, { status: 400 })).toBe(false)
+    expect(shouldRetryQuery(0, { status: 404 })).toBe(false)
+  })
+
+  it('keeps transient query failures retryable with a two-retry cap', () => {
+    expect(shouldRetryQuery(0, { status: 408 })).toBe(true)
+    expect(shouldRetryQuery(1, { status: 429 })).toBe(true)
+    expect(shouldRetryQuery(1, { status: 503 })).toBe(true)
+    expect(shouldRetryQuery(1, new Error('network'))).toBe(true)
+
+    expect(shouldRetryQuery(2, { status: 503 })).toBe(false)
+  })
+
+  it('gates the shared staleTime default behind the public env flag', () => {
+    process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED = '0'
+    expect(buildDefaultQueryOptions().staleTime).toBeUndefined()
+
+    process.env.NEXT_PUBLIC_OM_QUERY_DEFAULT_STALE_TIME_ENABLED = '1'
+    expect(buildDefaultQueryOptions().staleTime).toBe(DEFAULT_QUERY_STALE_TIME_MS)
+  })
+})