@web-ts-toolkit/access-router-client 0.38.0 → 0.40.0

package/index.js

@@ -77,22 +77,26 @@ var Model = class _Model {
    *
    * Concurrency contract:
    *
-   * 1. Submitted paths and their values are snapshotted before the request
+   * 1. Multiple `save()` calls on the same wrapper are serialized in call
+   *    order. A later save snapshots its dirty paths only after the previous
+   *    save has finished reconciling, so overlapping callers cannot submit
+   *    the same stale dirty set concurrently.
+   * 2. Submitted paths and their values are snapshotted before the request
    *    starts, so an in-flight response cannot wipe edits that were made
    *    while the request was pending.
-   * 2. On success, a submitted path is cleared from `modifiedPaths` only if
+   * 3. On success, a submitted path is cleared from `modifiedPaths` only if
    *    its current local value still equals the submitted value — i.e. the
    *    user has not concurrently re-edited it to a different value.
-   * 3. Server-returned values overwrite local values for paths the user did
+   * 4. Server-returned values overwrite local values for paths the user did
    *    NOT concurrently re-modify during the in-flight save; for paths the
    *    user did concurrently re-modify, the local value is preserved and
    *    the dirty flag is retained so the concurrent edit is resubmitted on
    *    the next `save()`. (Deterministic conflict rule: the newer local
    *    edit wins for the same path; the server value becomes its reset
    *    baseline without replacing the newer local value.)
-   * 4. On failure, no dirty state is cleared and no local value is
+   * 5. On failure, no dirty state is cleared and no local value is
    *    overwritten; the caller can retry `save()` with the same set.
-   * 5. The return value echoes `{ ...result, data }` where `data` is a
+   * 6. The return value echoes `{ ...result, data }` where `data` is a
    *    refreshed `Model` snapshot of the post-save local state (or `null`
    *    on failure), matching `ModelResponse<T, TData>`.
    *
@@ -108,6 +112,23 @@ var Model = class _Model {
    * of POSTing a new document.
    */
   async save(reqConfig) {
+    const queuedSave = this._saveQueue ? this._saveQueue.then(
+      () => this.saveNow(reqConfig),
+      () => this.saveNow(reqConfig)
+    ) : this.saveNow(reqConfig);
+    const queueSlot = queuedSave.then(
+      () => void 0,
+      () => void 0
+    );
+    this._saveQueue = queueSlot;
+    void queueSlot.then(() => {
+      if (this._saveQueue === queueSlot) {
+        this._saveQueue = void 0;
+      }
+    });
+    return queuedSave;
+  }
+  async saveNow(reqConfig) {
     const submittedPaths = new Set(this.modifiedPaths);
     const submittedValues = {};
     for (const path of submittedPaths) {
@@ -121,7 +142,7 @@ var Model = class _Model {
       );
     }
     const isCreate = persistenceId == null;
-    const result = isCreate ? await this._service.create(submittedData, null, reqConfig) : await this._service.update(String(persistenceId), submittedData, { returningAll: false }, reqConfig);
+    const result = isCreate ? await this._service.create(submittedData, void 0, reqConfig) : await this._service.update(String(persistenceId), submittedData, { returningAll: false }, reqConfig);
     if (!result.success) {
       return { ...result, data: null };
     }
@@ -341,13 +362,13 @@ var Model = class _Model {
 };
 
 // src/services/service.ts
-var import_axios2 = require("axios");
+var import_axios4 = require("axios");
 
 // src/constants.ts
 var CACHE_HEADER = "x-axios-cache";
 
 // src/services/wrap.ts
-var import_axios = require("axios");
+var import_axios3 = require("axios");
 
 // src/helpers.ts
 var import_utils2 = require("@web-ts-toolkit/utils");
@@ -385,272 +406,32 @@ function getWrapContext(url, options, config) {
   return { finalUrl, finalConfig };
 }
 
-// src/services/wrap.ts
-var removeTrailingSlash = (s) => s.replace(/\/$/, "");
-var removeLeadingSlash = (s) => s.replace(/^\/+/g, "");
-function resolveUrl(basePath, url) {
-  return basePath ? `${removeTrailingSlash(basePath)}/${removeLeadingSlash(url)}` : url;
-}
-function prepareConfig(defaultConfig, cacheValue, requestConfig) {
-  const headerClone = new import_axios.AxiosHeaders(defaultConfig.headers);
-  headerClone.set(CACHE_HEADER, cacheValue);
-  const defaulted = { ...defaultConfig, headers: headerClone };
-  return (0, import_axios.mergeConfig)(defaulted, requestConfig);
-}
-function createWrapHelper(axios3, basePath) {
-  return {
-    wrapGet: (url, defaultConfig = {}) => {
-      const _url = resolveUrl(basePath, url);
-      return (options, requestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          _url,
-          options,
-          prepareConfig(defaultConfig, "true", requestConfig)
-        );
-        return axios3.get(finalUrl, finalConfig);
-      };
-    },
-    wrapPost: (url, defaultConfig = {}) => {
-      const _url = resolveUrl(basePath, url);
-      return (data, options, requestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          _url,
-          options,
-          prepareConfig(defaultConfig, "false", requestConfig)
-        );
-        return axios3.post(finalUrl, data, finalConfig);
-      };
-    },
-    wrapPut: (url, defaultConfig = {}) => {
-      const _url = resolveUrl(basePath, url);
-      return (data, options, requestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          _url,
-          options,
-          prepareConfig(defaultConfig, "false", requestConfig)
-        );
-        return axios3.put(finalUrl, data, finalConfig);
-      };
-    },
-    wrapPatch: (url, defaultConfig = {}) => {
-      const _url = resolveUrl(basePath, url);
-      return (data, options, requestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          _url,
-          options,
-          prepareConfig(defaultConfig, "false", requestConfig)
-        );
-        return axios3.patch(finalUrl, data, finalConfig);
-      };
-    },
-    wrapDelete: (url, defaultConfig = {}) => {
-      const _url = resolveUrl(basePath, url);
-      return (options, requestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          _url,
-          options,
-          prepareConfig(defaultConfig, "false", requestConfig)
-        );
-        return axios3.delete(finalUrl, finalConfig);
-      };
-    }
-  };
-}
-
-// src/services/service.ts
-var readProblemDetail = (value) => {
-  if (!value || typeof value !== "object") {
-    return void 0;
-  }
-  if ("detail" in value && typeof value.detail === "string" && value.detail) {
-    return value.detail;
-  }
-  if ("message" in value && typeof value.message === "string" && value.message) {
-    return value.message;
-  }
-  if ("title" in value && typeof value.title === "string" && value.title) {
-    return value.title;
-  }
-  if ("errors" in value && Array.isArray(value.errors)) {
-    for (const item of value.errors) {
-      if (typeof item === "string" && item) {
-        return item;
-      }
-      const nested = readProblemDetail(item);
-      if (nested) {
-        return nested;
-      }
-    }
-  }
-  return void 0;
-};
-var stringifyErrorPayload = (value) => {
-  if (typeof value === "string") {
-    return value;
-  }
-  const detail = readProblemDetail(value);
-  if (detail) {
-    return detail;
-  }
-  if (value == null) {
-    return "";
-  }
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return String(value);
-  }
-};
-function finalizeOperationResult({
-  success,
-  raw,
-  status,
-  headers = {},
-  message,
-  totalCount
-}) {
-  if (success) {
-    return {
-      success: true,
-      raw,
-      data: raw,
-      message: "",
-      status,
-      headers,
-      ...totalCount == null ? {} : { totalCount }
-    };
-  }
-  return {
-    success: false,
-    raw,
-    data: null,
-    message: message ?? stringifyErrorPayload(raw),
-    status,
-    headers,
-    ...totalCount == null ? {} : { totalCount }
-  };
-}
-var normalizeTransportFailure = (error) => {
-  const transportError = error && typeof error === "object" ? error : {};
-  let raw = null;
-  let status = 0;
-  let headers = {};
-  let message;
-  if (transportError.response) {
-    status = transportError.response.status;
-    headers = transportError.response.headers;
-    raw = transportError.response.data;
-  } else if (transportError.request) {
-    message = "The server is not responding";
-  } else {
-    message = transportError.message;
-  }
-  return finalizeOperationResult({ success: false, raw, status, headers, message });
-};
-var Service = class {
-  constructor(axios3, basePath, throwOnError = false) {
-    this._axios = axios3;
-    this._basePath = basePath;
-    this._wrap = createWrapHelper(axios3, basePath);
-    this._throwOnError = throwOnError;
-  }
-  handleSuccess(res, extra = {}) {
-    return {
-      ...finalizeOperationResult({
-        success: true,
-        raw: res.data,
-        status: res.status,
-        headers: res.headers
-      }),
-      ...extra
-    };
-  }
-  // See https://axios-http.com/docs/handling-errors
-  handleError(error) {
-    return normalizeTransportFailure(error);
-  }
-  /** Resolves per-call policy against the already-resolved service/adapter default. */
-  resolveThrowOnError(override) {
-    return override ?? this._throwOnError;
-  }
-  wrapGet(url, defaultAxiosRequestConfig = {}) {
-    return this._wrap.wrapGet(url, defaultAxiosRequestConfig);
-  }
-  wrapPost(url, defaultAxiosRequestConfig = {}) {
-    return this._wrap.wrapPost(url, defaultAxiosRequestConfig);
-  }
-  wrapPut(url, defaultAxiosRequestConfig = {}) {
-    return this._wrap.wrapPut(url, defaultAxiosRequestConfig);
-  }
-  wrapPatch(url, defaultAxiosRequestConfig = {}) {
-    return this._wrap.wrapPatch(url, defaultAxiosRequestConfig);
-  }
-  wrapDelete(url, defaultAxiosRequestConfig = {}) {
-    return this._wrap.wrapDelete(url, defaultAxiosRequestConfig);
-  }
-  /**
-   * Public bridge to the per-service success/failure callback pipeline and
-   * `throwOnError` policy. Adapter-internal grouping machinery calls this so
-   * that grouped entries go through the same finalization the direct path
-   * uses (`createResponseHandler`). Returns `res` unchanged on success and
-   * throws `ServiceError` when both `res.success === false` and the
-   * `throwOnError` override (or the service-level default) are enabled.
-   */
-  applyResponseCallbacks(res, throwOnErrorOverride) {
-    const handler = this._handleCallbacks;
-    return handler ? handler(res, throwOnErrorOverride) : res;
-  }
-  /**
-   * Returns a fresh headers object that includes the package-owned
-   * `CACHE_HEADER` set to `"true"` (cache eligible) or `"false"` (bypass)
-   * according to the `ignoreCache` option. The caller's `CACHE_HEADER`
-   * value, if any, wins over the `ignoreCache` default.
-   *
-   * The input `headers` object is **never mutated**: an `AxiosHeaders`
-   * instance is cloned via `.toJSON()` before any value is set, and a
-   * plain-object headers input is shallow-copied. Reusing the same
-   * caller-owned headers across multiple requests therefore has no
-   * hidden side effects, and the order of invocations is irrelevant.
-   */
-  updateHeaders(headers, { ignoreCache }) {
-    const cacheValue = ignoreCache ? "false" : "true";
-    if (!headers) {
-      return { [CACHE_HEADER]: cacheValue };
-    }
-    if (headers instanceof import_axios2.AxiosHeaders) {
-      if (headers.has(CACHE_HEADER)) return headers;
-      const cloned = new import_axios2.AxiosHeaders(headers.toJSON());
-      cloned.set(CACHE_HEADER, cacheValue);
-      return cloned;
-    }
-    if (CACHE_HEADER in headers) return headers;
-    return {
-      ...headers,
-      [CACHE_HEADER]: cacheValue
-    };
-  }
-};
-var ServiceError = class extends Error {
-  constructor(result) {
-    super(result.message);
-    this.name = "ServiceError";
-    this.success = false;
-    this.raw = result.raw;
-    this.data = null;
-    this.status = result.status;
-    this.headers = result.headers;
-  }
-};
-
 // src/services/interceptors.ts
-var import_axios4 = __toESM(require("axios"));
+var import_axios2 = __toESM(require("axios"));
 
 // src/services/cache-utils.ts
-var import_axios3 = require("axios");
+var import_axios = require("axios");
 var import_utils3 = require("@web-ts-toolkit/utils");
+var unsupportedGroupConfigKeys = /* @__PURE__ */ new Set([
+  "adapter",
+  "cancelToken",
+  "onDownloadProgress",
+  "onUploadProgress",
+  "paramsSerializer",
+  "signal",
+  "transformRequest",
+  "transformResponse",
+  "validateStatus"
+]);
+var UnsupportedGroupedRequestConfigError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "UnsupportedGroupedRequestConfigError";
+  }
+};
 var normalizeConfigValue = (value) => {
   if (value == null) return value;
-  if (value instanceof import_axios3.AxiosHeaders) {
+  if (value instanceof import_axios.AxiosHeaders) {
     return normalizeConfigValue(value.toJSON());
   }
   if (Array.isArray(value)) {
@@ -664,12 +445,57 @@ var normalizeConfigValue = (value) => {
   }
   return value;
 };
+var normalizeGroupedRequestConfig = (config) => {
+  const seen = /* @__PURE__ */ new WeakSet();
+  const normalize = (value, path) => {
+    if (value == null) return value;
+    if (typeof value === "function") {
+      throw new UnsupportedGroupedRequestConfigError(
+        `Grouped requests do not support function-valued axios config at ${path}`
+      );
+    }
+    if (typeof value === "symbol") {
+      throw new UnsupportedGroupedRequestConfigError(
+        `Grouped requests do not support symbol-valued axios config at ${path}`
+      );
+    }
+    if (value instanceof import_axios.AxiosHeaders) {
+      return normalize(value.toJSON(), path);
+    }
+    if (Array.isArray(value)) {
+      return value.map((item, index) => normalize(item, `${path}[${index}]`));
+    }
+    if (typeof value === "object") {
+      if (seen.has(value)) {
+        throw new UnsupportedGroupedRequestConfigError(
+          `Grouped requests do not support circular axios config at ${path}`
+        );
+      }
+      seen.add(value);
+      const normalized = Object.entries((0, import_utils3.omitBy)(value, (item) => item === void 0)).sort(([left], [right]) => left.localeCompare(right)).reduce((acc, [key, item]) => {
+        const itemPath = path === "config" ? key : `${path}.${key}`;
+        if (unsupportedGroupConfigKeys.has(key)) {
+          throw new UnsupportedGroupedRequestConfigError(
+            `Grouped requests do not support axios config key ${itemPath}`
+          );
+        }
+        acc[key] = normalize(item, itemPath);
+        return acc;
+      }, {});
+      seen.delete(value);
+      return normalized;
+    }
+    return value;
+  };
+  return normalize(config, "config");
+};
 
 // src/services/interceptors.ts
 var DEFAULT_CACHE_CAPACITY = 100;
 var CACHEABLE_METHODS = /* @__PURE__ */ new Set(["get"]);
-var MUTATION_METHODS = /* @__PURE__ */ new Set(["post", "put", "patch", "delete"]);
 var CACHEABLE_RESPONSE_TYPES = /* @__PURE__ */ new Set(["", "json", "text"]);
+var CACHE_INVALIDATE_ON_SUCCESS = "__accessRouterClientCacheInvalidateOnSuccess";
+var CACHE_INVALIDATE_HEADER = "x-axios-cache-invalidate-on-success";
 var SENSITIVE_CACHE_HEADERS = /* @__PURE__ */ new Set([
   "authorization",
   "cookie",
@@ -677,11 +503,19 @@ var SENSITIVE_CACHE_HEADERS = /* @__PURE__ */ new Set([
   "proxy-authorization",
   "www-authenticate"
 ]);
-var cloneConfigWithCacheBypass = (config) => {
+var AUTHENTICATION_REQUEST_HEADERS = /* @__PURE__ */ new Set([
+  "authorization",
+  "cookie",
+  "proxy-authorization",
+  "x-api-key",
+  "x-auth-token",
+  "x-access-token"
+]);
+var cloneConfigWithCacheBypass = (config, invalidateOnSuccess = true) => {
   const baseConfig = config ?? {};
   const next = { ...baseConfig };
   const sourceHeaders = config?.headers;
-  if (sourceHeaders instanceof import_axios4.AxiosHeaders) {
+  if (sourceHeaders instanceof import_axios2.AxiosHeaders) {
     next.headers = sourceHeaders.toJSON();
   } else if (sourceHeaders && typeof sourceHeaders === "object") {
     next.headers = { ...sourceHeaders };
@@ -689,8 +523,30 @@ var cloneConfigWithCacheBypass = (config) => {
     next.headers = {};
   }
   next.headers[CACHE_HEADER] = "false";
+  if (invalidateOnSuccess) {
+    next[CACHE_INVALIDATE_ON_SUCCESS] = true;
+    next.headers[CACHE_INVALIDATE_HEADER] = "true";
+  }
   return next;
 };
+var removeCacheInvalidationSignal = (config) => {
+  const headers = config.headers;
+  const hasHeaderSignal = headers instanceof import_axios2.AxiosHeaders ? headers.has(CACHE_INVALIDATE_HEADER) : Boolean(headers && typeof headers === "object" && CACHE_INVALIDATE_HEADER in headers);
+  if (CACHE_INVALIDATE_ON_SUCCESS in config || hasHeaderSignal) {
+    const next = { ...config };
+    delete next[CACHE_INVALIDATE_ON_SUCCESS];
+    if (headers instanceof import_axios2.AxiosHeaders) {
+      const clonedHeaders = import_axios2.AxiosHeaders.from(headers);
+      clonedHeaders.delete(CACHE_INVALIDATE_HEADER);
+      next.headers = clonedHeaders;
+    } else if (headers && typeof headers === "object") {
+      next.headers = { ...headers };
+      delete next.headers[CACHE_INVALIDATE_HEADER];
+    }
+    return next;
+  }
+  return config;
+};
 var SimpleCache = class {
   constructor(opts = {}) {
     this.cache = /* @__PURE__ */ new Map();
@@ -698,7 +554,7 @@ var SimpleCache = class {
     this.capacity = opts.capacity !== void 0 && Number.isFinite(opts.capacity) && opts.capacity > 0 ? Math.floor(opts.capacity) : DEFAULT_CACHE_CAPACITY;
     this.clone = opts.clone ?? defaultClone;
   }
-  set(key, value, ttl) {
+  set(key, value, ttlMs) {
     if (this.cache.size >= this.capacity && !this.cache.has(key)) {
       const oldestKey = this.cache.keys().next().value;
       if (oldestKey !== void 0) {
@@ -707,13 +563,13 @@ var SimpleCache = class {
     }
     this.cache.delete(key);
     this.cache.set(key, value);
-    if (ttl && ttl > 0) {
+    if (ttlMs && ttlMs > 0) {
       const existing = this.timers.get(key);
       if (existing) clearTimeout(existing);
       const timer = setTimeout(() => {
         this.cache.delete(key);
         this.timers.delete(key);
-      }, ttl);
+      }, ttlMs);
       if (typeof timer === "object" && timer && "unref" in timer && typeof timer.unref === "function") {
         timer.unref();
       }
@@ -786,17 +642,17 @@ var isUnsupportedResponseBody = (response) => {
     return true;
   }
 };
-var snapshotResponse = (response) => {
-  const headers = response.headers instanceof import_axios4.AxiosHeaders ? response.headers.toJSON() : { ...response.headers ?? {} };
+var snapshotResponse = (response, clone) => {
+  const headers = response.headers instanceof import_axios2.AxiosHeaders ? response.headers.toJSON() : { ...response.headers ?? {} };
   return {
-    data: defaultClone(response.data),
+    data: clone(response.data),
     status: response.status,
     statusText: response.statusText,
-    headers: defaultClone(headers)
+    headers: clone(headers)
   };
 };
 var serializeHeaders = (headers) => {
-  const resolvedHeaders = headers instanceof import_axios4.AxiosHeaders ? headers.toJSON() : headers;
+  const resolvedHeaders = headers instanceof import_axios2.AxiosHeaders ? headers.toJSON() : headers;
   const normalizedHeaders = Object.entries(resolvedHeaders ?? {}).filter(([key, value]) => {
     const normalizedKey = key.toLowerCase();
     return normalizedKey !== CACHE_HEADER.toLowerCase() && !SENSITIVE_CACHE_HEADERS.has(normalizedKey) && value !== void 0;
@@ -806,12 +662,35 @@ var serializeHeaders = (headers) => {
   }, {});
   return JSON.stringify(normalizeConfigValue(normalizedHeaders));
 };
+var hasHeaderValue = (value) => {
+  if (Array.isArray(value)) return value.some(hasHeaderValue);
+  if (value == null || value === false) return false;
+  if (typeof value === "string") return value.trim().length > 0;
+  return true;
+};
+var consumeCacheInvalidationSignal = (config) => {
+  const headers = config.headers;
+  const hasSignal = headers instanceof import_axios2.AxiosHeaders ? headers.has(CACHE_INVALIDATE_HEADER) : Boolean(headers && typeof headers === "object" && CACHE_INVALIDATE_HEADER in headers);
+  if (!hasSignal && !config[CACHE_INVALIDATE_ON_SUCCESS]) return;
+  config[CACHE_INVALIDATE_ON_SUCCESS] = true;
+  if (headers instanceof import_axios2.AxiosHeaders) {
+    headers.delete(CACHE_INVALIDATE_HEADER);
+  } else if (headers && typeof headers === "object") {
+    delete headers[CACHE_INVALIDATE_HEADER];
+  }
+};
+var hasAuthenticationHeader = (headers) => {
+  const resolvedHeaders = headers instanceof import_axios2.AxiosHeaders ? headers.toJSON() : headers;
+  return Object.entries(resolvedHeaders ?? {}).some(
+    ([key, value]) => AUTHENTICATION_REQUEST_HEADERS.has(key.toLowerCase()) && hasHeaderValue(value)
+  );
+};
 var hasStableCacheValue = (value, seen = /* @__PURE__ */ new Set()) => {
   if (value == null || typeof value === "string" || typeof value === "number" || typeof value === "boolean")
     return true;
   if (typeof value !== "object") return false;
   if (seen.has(value)) return false;
-  if (value instanceof import_axios4.AxiosHeaders) {
+  if (value instanceof import_axios2.AxiosHeaders) {
     return hasStableCacheValue(value.toJSON(), seen);
   }
   const prototype = Object.getPrototypeOf(value);
@@ -867,8 +746,10 @@ var resolveWithCredentials = (config, withCredentialsDefault) => {
   }
   return withCredentialsDefault;
 };
+var hasUsablePartition = (partition) => typeof partition === "string" && partition.trim().length > 0;
 function useCacheInterceptors(instance, policyOrTtl) {
-  const policy = typeof policyOrTtl === "number" ? { ttl: policyOrTtl } : policyOrTtl;
+  const policy = typeof policyOrTtl === "number" ? { ttlMs: policyOrTtl } : policyOrTtl;
+  const clone = policy.clone ?? defaultClone;
   const store = new SimpleCache({ capacity: policy.capacity, clone: policy.clone });
   const withCredentialsDefault = policy.withCredentialsDefault ?? Boolean(instance.defaults.withCredentials);
   const inflight = /* @__PURE__ */ new Map();
@@ -898,10 +779,11 @@ function useCacheInterceptors(instance, policyOrTtl) {
   };
   instance.interceptors.request.use(
     async (config) => {
+      consumeCacheInvalidationSignal(config);
       if (disposed || config.headers[CACHE_HEADER] === "false" || !isCacheEligible(config, instance)) return config;
-      const isCredentialed = resolveWithCredentials(config, withCredentialsDefault);
+      const isCredentialed = resolveWithCredentials(config, withCredentialsDefault) || hasAuthenticationHeader(config.headers);
       const partitionKey = policy.partitionForRequest?.(config);
-      if (isCredentialed && !partitionKey) {
+      if (isCredentialed && !hasUsablePartition(partitionKey)) {
         return config;
       }
       const key = generateCacheKey(config, partitionKey);
@@ -926,7 +808,7 @@ function useCacheInterceptors(instance, policyOrTtl) {
           const response = await existing.promise;
           const shared = response;
           return {
-            data: defaultClone(shared.data),
+            data: clone(shared.data),
             status: shared.status,
             statusText: shared.statusText,
             headers: { ...shared.headers, [CACHE_HEADER]: "true" },
@@ -959,7 +841,7 @@ function useCacheInterceptors(instance, policyOrTtl) {
       if (realAdapter === void 0 || realAdapter === null) {
         realAdapter = instance.defaults.adapter;
       }
-      const dispatch = typeof realAdapter === "function" ? realAdapter : typeof import_axios4.default.getAdapter === "function" ? import_axios4.default.getAdapter(
+      const dispatch = typeof realAdapter === "function" ? realAdapter : typeof import_axios2.default.getAdapter === "function" ? import_axios2.default.getAdapter(
         realAdapter,
         instance.defaults
       ) : void 0;
@@ -982,8 +864,7 @@ function useCacheInterceptors(instance, policyOrTtl) {
   );
   instance.interceptors.response.use(
     (response) => {
-      const method = (response.config.method ?? "get").toLowerCase();
-      if (response.config.headers[CACHE_HEADER] === "false" || MUTATION_METHODS.has(method)) {
+      if (response.config[CACHE_INVALIDATE_ON_SUCCESS]) {
         if (response.status >= 200 && response.status < 300) {
           invalidate();
         }
@@ -993,37 +874,300 @@ function useCacheInterceptors(instance, policyOrTtl) {
       if (!state || state.role !== "source" || !state.slot) {
         return response;
       }
-      if (response.status >= 200 && response.status < 300) {
-        if (!disposed && state.generation === generation && !isUnsupportedResponseBody(response)) {
-          store.set(state.key, snapshotResponse(response), policy.ttl);
+      if (response.status >= 200 && response.status < 300 && !isUnsupportedResponseBody(response)) {
+        const snapshot = snapshotResponse(response, clone);
+        response.data = clone(snapshot.data);
+        response.headers = clone(snapshot.headers);
+        if (!disposed && state.generation === generation) {
+          store.set(state.key, snapshot, policy.ttlMs);
         }
+        resolveInflight(state.slot, snapshot);
+        return response;
       }
       resolveInflight(state.slot, response);
       return response;
     },
-    (error) => {
-      const state = (error?.config ?? {})[CACHE_REQUEST_STATE];
-      if (state?.role === "source" && state.slot) {
-        rejectInflight(state.slot, error);
-      }
-      return Promise.reject(error);
+    (error) => {
+      const state = (error?.config ?? {})[CACHE_REQUEST_STATE];
+      if (state?.role === "source" && state.slot) {
+        rejectInflight(state.slot, error);
+      }
+      return Promise.reject(error);
+    }
+  );
+  return {
+    clear: invalidate,
+    dispose: () => {
+      if (disposed) return;
+      disposed = true;
+      generation += 1;
+      store.dispose();
+      const error = new Error(CACHE_DISPOSED_ERROR);
+      for (const slot of inflight.values()) {
+        rejectInflight(slot, error);
+      }
+      inflight.clear();
+    }
+  };
+}
+
+// src/services/wrap.ts
+var removeTrailingSlash = (s) => s.replace(/\/$/, "");
+var removeLeadingSlash = (s) => s.replace(/^\/+/g, "");
+function resolveUrl(basePath, url) {
+  return basePath ? `${removeTrailingSlash(basePath)}/${removeLeadingSlash(url)}` : url;
+}
+function prepareConfig(defaultConfig, cacheValue, requestConfig, invalidateOnSuccess = false) {
+  const headerClone = new import_axios3.AxiosHeaders(defaultConfig.headers);
+  headerClone.set(CACHE_HEADER, cacheValue);
+  const defaulted = { ...defaultConfig, headers: headerClone };
+  const merged = (0, import_axios3.mergeConfig)(defaulted, requestConfig ?? {});
+  return invalidateOnSuccess ? cloneConfigWithCacheBypass(merged) : merged;
+}
+function createWrapHelper(axios3, basePath) {
+  return {
+    wrapGet: (url, defaultConfig = {}) => {
+      const _url = resolveUrl(basePath, url);
+      return (options, requestConfig) => {
+        const { finalUrl, finalConfig } = getWrapContext(
+          _url,
+          options,
+          prepareConfig(defaultConfig, "true", requestConfig)
+        );
+        return axios3.get(finalUrl, finalConfig);
+      };
+    },
+    wrapPost: (url, defaultConfig = {}) => {
+      const _url = resolveUrl(basePath, url);
+      return (data, options, requestConfig) => {
+        const { finalUrl, finalConfig } = getWrapContext(
+          _url,
+          options,
+          prepareConfig(defaultConfig, "false", requestConfig, true)
+        );
+        return axios3.post(finalUrl, data, finalConfig);
+      };
+    },
+    wrapPut: (url, defaultConfig = {}) => {
+      const _url = resolveUrl(basePath, url);
+      return (data, options, requestConfig) => {
+        const { finalUrl, finalConfig } = getWrapContext(
+          _url,
+          options,
+          prepareConfig(defaultConfig, "false", requestConfig, true)
+        );
+        return axios3.put(finalUrl, data, finalConfig);
+      };
+    },
+    wrapPatch: (url, defaultConfig = {}) => {
+      const _url = resolveUrl(basePath, url);
+      return (data, options, requestConfig) => {
+        const { finalUrl, finalConfig } = getWrapContext(
+          _url,
+          options,
+          prepareConfig(defaultConfig, "false", requestConfig, true)
+        );
+        return axios3.patch(finalUrl, data, finalConfig);
+      };
+    },
+    wrapDelete: (url, defaultConfig = {}) => {
+      const _url = resolveUrl(basePath, url);
+      return (options, requestConfig) => {
+        const { finalUrl, finalConfig } = getWrapContext(
+          _url,
+          options,
+          prepareConfig(defaultConfig, "false", requestConfig, true)
+        );
+        return axios3.delete(finalUrl, finalConfig);
+      };
     }
-  );
-  return {
-    clear: invalidate,
-    dispose: () => {
-      if (disposed) return;
-      disposed = true;
-      generation += 1;
-      store.dispose();
-      const error = new Error(CACHE_DISPOSED_ERROR);
-      for (const slot of inflight.values()) {
-        rejectInflight(slot, error);
+  };
+}
+
+// src/services/service.ts
+var readProblemDetail = (value) => {
+  if (!value || typeof value !== "object") {
+    return void 0;
+  }
+  if ("detail" in value && typeof value.detail === "string" && value.detail) {
+    return value.detail;
+  }
+  if ("message" in value && typeof value.message === "string" && value.message) {
+    return value.message;
+  }
+  if ("title" in value && typeof value.title === "string" && value.title) {
+    return value.title;
+  }
+  if ("errors" in value && Array.isArray(value.errors)) {
+    for (const item of value.errors) {
+      if (typeof item === "string" && item) {
+        return item;
+      }
+      const nested = readProblemDetail(item);
+      if (nested) {
+        return nested;
       }
-      inflight.clear();
     }
+  }
+  return void 0;
+};
+var stringifyErrorPayload = (value) => {
+  if (typeof value === "string") {
+    return value;
+  }
+  const detail = readProblemDetail(value);
+  if (detail) {
+    return detail;
+  }
+  if (value == null) {
+    return "";
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+};
+function finalizeOperationResult({
+  success,
+  raw,
+  status,
+  headers = {},
+  message,
+  totalCount
+}) {
+  if (success) {
+    return {
+      success: true,
+      raw,
+      data: raw,
+      message: "",
+      status,
+      headers,
+      ...totalCount == null ? {} : { totalCount }
+    };
+  }
+  return {
+    success: false,
+    raw,
+    data: null,
+    message: message ?? stringifyErrorPayload(raw),
+    status,
+    headers,
+    ...totalCount == null ? {} : { totalCount }
   };
 }
+var normalizeTransportFailure = (error) => {
+  const transportError = error && typeof error === "object" ? error : {};
+  let raw = null;
+  let status = 0;
+  let headers = {};
+  let message;
+  if (transportError.response) {
+    status = transportError.response.status;
+    headers = transportError.response.headers;
+    raw = transportError.response.data;
+  } else if (transportError.request) {
+    message = "The server is not responding";
+  } else {
+    message = transportError.message;
+  }
+  return finalizeOperationResult({ success: false, raw, status, headers, message });
+};
+var Service = class {
+  constructor(axios3, basePath, throwOnError = false) {
+    this._axios = axios3;
+    this._basePath = basePath;
+    this._wrap = createWrapHelper(axios3, basePath);
+    this._throwOnError = throwOnError;
+  }
+  handleSuccess(res, extra = {}) {
+    return {
+      ...finalizeOperationResult({
+        success: true,
+        raw: res.data,
+        status: res.status,
+        headers: res.headers
+      }),
+      ...extra
+    };
+  }
+  // See https://axios-http.com/docs/handling-errors
+  handleError(error) {
+    return normalizeTransportFailure(error);
+  }
+  /** Resolves per-call policy against the already-resolved service/adapter default. */
+  resolveThrowOnError(override) {
+    return override ?? this._throwOnError;
+  }
+  wrapGet(url, defaultAxiosRequestConfig = {}) {
+    return this._wrap.wrapGet(url, defaultAxiosRequestConfig);
+  }
+  wrapPost(url, defaultAxiosRequestConfig = {}) {
+    return this._wrap.wrapPost(url, defaultAxiosRequestConfig);
+  }
+  wrapPut(url, defaultAxiosRequestConfig = {}) {
+    return this._wrap.wrapPut(url, defaultAxiosRequestConfig);
+  }
+  wrapPatch(url, defaultAxiosRequestConfig = {}) {
+    return this._wrap.wrapPatch(url, defaultAxiosRequestConfig);
+  }
+  wrapDelete(url, defaultAxiosRequestConfig = {}) {
+    return this._wrap.wrapDelete(url, defaultAxiosRequestConfig);
+  }
+  /**
+   * Public bridge to the per-service success/failure callback pipeline and
+   * `throwOnError` policy. Adapter-internal grouping machinery calls this so
+   * that grouped entries go through the same finalization the direct path
+   * uses (`createResponseHandler`). Returns `res` unchanged on success and
+   * throws `ServiceError` when both `res.success === false` and the
+   * `throwOnError` override (or the service-level default) are enabled.
+   */
+  applyResponseCallbacks(res, throwOnErrorOverride) {
+    const handler = this._handleCallbacks;
+    return handler ? handler(res, throwOnErrorOverride) : res;
+  }
+  /**
+   * Returns a fresh headers object that includes the package-owned
+   * `CACHE_HEADER` set to `"true"` (cache eligible) or `"false"` (bypass)
+   * according to the `ignoreCache` option. The caller's `CACHE_HEADER`
+   * value, if any, wins over the `ignoreCache` default.
+   *
+   * The input `headers` object is **never mutated**: an `AxiosHeaders`
+   * instance is cloned via `.toJSON()` before any value is set, and a
+   * plain-object headers input is shallow-copied. Reusing the same
+   * caller-owned headers across multiple requests therefore has no
+   * hidden side effects, and the order of invocations is irrelevant.
+   */
+  updateHeaders(headers, { ignoreCache }) {
+    const cacheValue = ignoreCache ? "false" : "true";
+    if (!headers) {
+      return { [CACHE_HEADER]: cacheValue };
+    }
+    if (headers instanceof import_axios4.AxiosHeaders) {
+      if (headers.has(CACHE_HEADER)) return headers;
+      const cloned = new import_axios4.AxiosHeaders(headers.toJSON());
+      cloned.set(CACHE_HEADER, cacheValue);
+      return cloned;
+    }
+    if (CACHE_HEADER in headers) return headers;
+    return {
+      ...headers,
+      [CACHE_HEADER]: cacheValue
+    };
+  }
+};
+var ServiceError = class extends Error {
+  constructor(result) {
+    super(result.message);
+    this.name = "ServiceError";
+    this.success = false;
+    this.raw = result.raw;
+    this.data = null;
+    this.status = result.status;
+    this.headers = result.headers;
+  }
+};
 
 // src/services/shared.ts
 var import_utils4 = require("@web-ts-toolkit/utils");
@@ -1103,7 +1247,7 @@ function finalizeRootEntry(query, entry, responseHeaders, service) {
       }
       if (modelService) {
         const fromExisting = op !== "new";
-        const persistenceId = op === "read" && query.target === "model" && "id" in query ? query.id : void 0;
+        const persistenceId = (op === "read" || op === "update") && query.target === "model" && "id" in query ? query.id : void 0;
         _data = Model.create(_data, modelService, persistenceId, fromExisting);
       }
     }
@@ -1163,10 +1307,35 @@ var isLegacyListPayload = (value) => {
   }
   return "count" in value && typeof value.count === "number" && "rows" in value && Array.isArray(value.rows);
 };
-var setDefaultObjectProp = (obj, key, value) => {
-  if (!(0, import_utils4.get)(obj, key)) {
-    (0, import_utils4.set)(obj, key, value);
+var cloneDefaultValue = (value) => {
+  if (Array.isArray(value)) {
+    return value.map((item) => cloneDefaultValue(item));
+  }
+  if (value && typeof value === "object") {
+    const cloned = {};
+    for (const [key, item] of Object.entries(value)) {
+      cloned[key] = cloneDefaultValue(item);
+    }
+    return cloned;
+  }
+  return value;
+};
+var deepFreeze = (value) => {
+  if (!value || typeof value !== "object" || Object.isFrozen(value)) {
+    return value;
+  }
+  Object.freeze(value);
+  for (const item of Object.values(value)) {
+    deepFreeze(item);
+  }
+  return value;
+};
+var normalizeServiceDefaults = (defaults, objectKeys) => {
+  const normalized = cloneDefaultValue(defaults ?? {});
+  for (const key of objectKeys) {
+    normalized[key] ??= {};
   }
+  return deepFreeze(normalized);
 };
 var ensureListResultCount = (result) => {
   result.totalCount ??= 0;
@@ -1324,7 +1493,7 @@ function buildSubDocumentOps(ctx, id, sub) {
         () => axios3.get(
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}`,
           (0, import_axios5.mergeConfig)(reqConfig, { params: {} })
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           const rawArray = toArray(result.raw);
           result.raw = rawArray;
           result.count = rawArray.length;
@@ -1358,7 +1527,7 @@ function buildSubDocumentOps(ctx, id, sub) {
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}/${queryPath}`,
           { filter, select },
           reqConfig
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           const rawArray = toArray(result.raw);
           result.raw = rawArray;
           result.count = rawArray.length;
@@ -1392,7 +1561,7 @@ function buildSubDocumentOps(ctx, id, sub) {
         () => axios3.get(
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}/${encodePathSegment(subId)}`,
           (0, import_axios5.mergeConfig)(reqConfig, { params: {} })
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           result.data = result.success ? result.raw : null;
           return result;
         }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
@@ -1423,7 +1592,7 @@ function buildSubDocumentOps(ctx, id, sub) {
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}/${encodePathSegment(subId)}/${queryPath}`,
           { select, populate },
           reqConfig
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           result.data = result.success ? result.raw : null;
           return result;
         }).catch(handleError).then(
@@ -1455,7 +1624,7 @@ function buildSubDocumentOps(ctx, id, sub) {
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}/${encodePathSegment(subId)}`,
           data,
           (0, import_axios5.mergeConfig)(reqConfig, { params: {} })
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           result.data = result.success ? result.raw : null;
           return result;
         }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
@@ -1485,7 +1654,7 @@ function buildSubDocumentOps(ctx, id, sub) {
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}`,
           data,
           (0, import_axios5.mergeConfig)(reqConfig, { params: {} })
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           const rawArray = toArray(result.raw);
           result.raw = rawArray;
           result.count = rawArray.length;
@@ -1517,7 +1686,7 @@ function buildSubDocumentOps(ctx, id, sub) {
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}`,
           data,
           (0, import_axios5.mergeConfig)(reqConfig, { params: {} })
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           const rawArray = toArray(result.raw);
           result.raw = rawArray;
           result.count = rawArray.length;
@@ -1539,7 +1708,7 @@ function buildSubDocumentOps(ctx, id, sub) {
         () => axios3.delete(
           `${basePath}/${encodePathSegment(id)}/${encodePathSegment(sub)}/${encodePathSegment(subId)}`,
           reqConfig
-        ).then(handleSuccess).then((result) => {
+        ).then((res) => handleSuccess(res)).then((result) => {
           if (result.success) result.data = result.raw;
           return result;
         }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
@@ -1562,9 +1731,7 @@ var ModelService = class extends Service {
     this._modelName = modelName;
     this._queryPath = queryPath;
     this._mutationPath = mutationPath;
-    this._defaults = defaults ?? {};
-    this._handleCallbacks = createResponseHandler(onSuccess, onFailure, throwOnError);
-    [
+    this._defaults = normalizeServiceDefaults(defaults, [
       "listArgs",
       "listOptions",
       "listAdvancedArgs",
@@ -1581,7 +1748,8 @@ var ModelService = class extends Service {
       "upsertOptions",
       "upsertAdvancedArgs",
       "upsertAdvancedOptions"
-    ].forEach((key) => setDefaultObjectProp(this._defaults, key, {}));
+    ]);
+    this._handleCallbacks = createResponseHandler(onSuccess, onFailure, throwOnError);
   }
   // ---------------------------------------------------------------------------
   // Collection operations
@@ -1618,7 +1786,7 @@ var ModelService = class extends Service {
             include_extra_headers: includeExtraHeaders
           }
         })
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         return processListResult(
           result,
           { includeCount, includeExtraHeaders },
@@ -1688,7 +1856,7 @@ var ModelService = class extends Service {
           options: { skim, includePermissions, includeCount, includeExtraHeaders, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         return processListResult(
           result,
           { includeCount, includeExtraHeaders },
@@ -1725,7 +1893,7 @@ var ModelService = class extends Service {
     const { throwOnError, ...reqConfig } = cloneConfigWithCacheBypass(axiosRequestConfig ?? {});
     const bulk = Array.isArray(data);
     return makeRequest(
-      () => this._axios.post(this._basePath, data, (0, import_axios6.mergeConfig)(reqConfig, { params: { include_permissions: includePermissions } })).then(this.handleSuccess).then((result) => {
+      () => this._axios.post(this._basePath, data, (0, import_axios6.mergeConfig)(reqConfig, { params: { include_permissions: includePermissions } })).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) {
           if (bulk) {
             const rows = Array.isArray(result.raw) ? result.raw : [result.raw];
@@ -1769,7 +1937,7 @@ var ModelService = class extends Service {
         `${this._basePath}/${this._mutationPath}`,
         { data, select, populate, tasks, options: { includePermissions, populateAccess } },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) {
           if (bulk) {
             const rows = Array.isArray(result.raw) ? result.raw : [result.raw];
@@ -1811,7 +1979,7 @@ var ModelService = class extends Service {
         (0, import_axios6.mergeConfig)(reqConfig, {
           params: { returning_all: returningAll, include_permissions: includePermissions }
         })
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         result.data = result.success ? Model.create(result.raw, this, void 0, true) : null;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -1851,7 +2019,7 @@ var ModelService = class extends Service {
           options: { returningAll, includePermissions, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         result.data = result.success ? Model.create(result.raw, this, void 0, true) : null;
         return result;
       }).catch(this.handleError).then(
@@ -1877,7 +2045,7 @@ var ModelService = class extends Service {
   delete(identifier, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = cloneConfigWithCacheBypass(axiosRequestConfig ?? {});
     return makeRequest(
-      () => this._axios.delete(`${this._basePath}/${encodePathSegment(identifier)}`, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.delete(`${this._basePath}/${encodePathSegment(identifier)}`, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -1897,9 +2065,9 @@ var ModelService = class extends Service {
     );
   }
   new(axiosRequestConfig) {
-    const { throwOnError, ...reqConfig } = cloneConfigWithCacheBypass(axiosRequestConfig ?? {});
+    const { throwOnError, ...reqConfig } = cloneConfigWithCacheBypass(axiosRequestConfig ?? {}, false);
     return makeRequest(
-      () => this._axios.get(`${this._basePath}/new`, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.get(`${this._basePath}/new`, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) {
           delete result.raw._id;
           result.data = Model.create(result.raw, this);
@@ -1923,7 +2091,7 @@ var ModelService = class extends Service {
   distinct(field, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     return makeRequest(
-      () => this._axios.get(`${this._basePath}/distinct/${encodePathSegment(field)}`, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.get(`${this._basePath}/distinct/${encodePathSegment(field)}`, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -1945,7 +2113,7 @@ var ModelService = class extends Service {
   distinctAdvanced(field, conditions, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     return makeRequest(
-      () => this._axios.post(`${this._basePath}/distinct/${encodePathSegment(field)}`, { filter: conditions }, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.post(`${this._basePath}/distinct/${encodePathSegment(field)}`, { filter: conditions }, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -1968,7 +2136,7 @@ var ModelService = class extends Service {
   count(axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     return makeRequest(
-      () => this._axios.get(`${this._basePath}/count`, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.get(`${this._basePath}/count`, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -1989,7 +2157,7 @@ var ModelService = class extends Service {
   countAdvanced(filter, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     return makeRequest(
-      () => this._axios.post(`${this._basePath}/count`, { filter }, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.post(`${this._basePath}/count`, { filter }, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -2026,7 +2194,7 @@ var ModelService = class extends Service {
         (0, import_axios6.mergeConfig)(reqConfig, {
           params: { include_permissions: includePermissions, try_list: tryList }
         })
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         result.data = result.success ? Model.create(result.raw, this, identifier, true) : null;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -2076,7 +2244,7 @@ var ModelService = class extends Service {
           options: { skim, includePermissions, tryList, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         result.data = result.success ? Model.create(result.raw, this, identifier, true) : null;
         return result;
       }).catch(this.handleError).then(
@@ -2132,7 +2300,7 @@ var ModelService = class extends Service {
           options: { skim, includePermissions, tryList, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         result.data = result.success ? Model.create(result.raw, this, void 0, true) : null;
         return result;
       }).catch(this.handleError).then(
@@ -2169,8 +2337,8 @@ var ModelService = class extends Service {
         (0, import_axios6.mergeConfig)(reqConfig, {
           params: { returning_all: returningAll, include_permissions: includePermissions }
         })
-      ).then(this.handleSuccess).then((result) => {
-        result.data = result.success ? Model.create(result.raw, this, void 0, true) : null;
+      ).then((res) => this.handleSuccess(res)).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this, identifier, true) : null;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
@@ -2210,8 +2378,8 @@ var ModelService = class extends Service {
           options: { returningAll, includePermissions, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
-        result.data = result.success ? Model.create(result.raw, this, void 0, true) : null;
+      ).then((res) => this.handleSuccess(res)).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this, identifier, true) : null;
         return result;
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
@@ -2270,9 +2438,7 @@ var DataService = class extends Service {
     super(axios3, basePath, throwOnError);
     this._dataName = dataName;
     this._queryPath = queryPath;
-    this._defaults = defaults ?? {};
-    this._handleCallbacks = createResponseHandler(onSuccess, onFailure, throwOnError);
-    [
+    this._defaults = normalizeServiceDefaults(defaults, [
       "listArgs",
       "listOptions",
       "listAdvancedArgs",
@@ -2280,7 +2446,8 @@ var DataService = class extends Service {
       "readOptions",
       "readAdvancedArgs",
       "readAdvancedOptions"
-    ].forEach((key) => setDefaultObjectProp(this._defaults, key, {}));
+    ]);
+    this._handleCallbacks = createResponseHandler(onSuccess, onFailure, throwOnError);
   }
   // ---------------------------------------------------------------------------
   // Collection operations
@@ -2312,7 +2479,7 @@ var DataService = class extends Service {
             include_extra_headers: includeExtraHeaders
           }
         })
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         return processListResult(result, { includeCount, includeExtraHeaders });
       }).catch(this.handleError).then(ensureListResultCount).then((res) => this._handleCallbacks(res, throwOnError)),
       {
@@ -2362,7 +2529,7 @@ var DataService = class extends Service {
           options: { includeCount, includeExtraHeaders }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result) => {
+      ).then((res) => this.handleSuccess(res)).then((result) => {
         return processListResult(result, {
           includeCount,
           includeExtraHeaders
@@ -2394,7 +2561,7 @@ var DataService = class extends Service {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
     return makeRequest(
-      () => this._axios.get(`${this._basePath}/${encodePathSegment(identifier)}`, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.get(`${this._basePath}/${encodePathSegment(identifier)}`, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
@@ -2420,7 +2587,7 @@ var DataService = class extends Service {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
     return makeRequest(
-      () => this._axios.post(`${this._basePath}/${this._queryPath}/${encodePathSegment(identifier)}`, { select }, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.post(`${this._basePath}/${this._queryPath}/${encodePathSegment(identifier)}`, { select }, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then(
@@ -2449,7 +2616,7 @@ var DataService = class extends Service {
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
     const _filter = replaceSubQuery(filter);
     return makeRequest(
-      () => this._axios.post(`${this._basePath}/${this._queryPath}/__filter`, { filter: _filter, select }, reqConfig).then(this.handleSuccess).then((result) => {
+      () => this._axios.post(`${this._basePath}/${this._queryPath}/__filter`, { filter: _filter, select }, reqConfig).then((res) => this.handleSuccess(res)).then((result) => {
         if (result.success) result.data = result.raw;
         return result;
       }).catch(this.handleError).then(
@@ -2493,7 +2660,71 @@ var noopCacheController = {
   dispose: () => {
   }
 };
-var serializeRequestConfig = (config) => JSON.stringify(normalizeConfigValue(config ?? {}));
+var noopResponseCallback = () => {
+};
+var ROOT_MUTATION_OPS = /* @__PURE__ */ new Set([
+  "create",
+  "update",
+  "upsert",
+  "delete",
+  "subCreate",
+  "subUpdate",
+  "subBulkUpdate",
+  "subDelete"
+]);
+var serializeRequestConfig = (config) => JSON.stringify(normalizeGroupedRequestConfig(removeCacheInvalidationSignal(config ?? {})));
+var createMalformedRootResponseError = (message) => {
+  const error = new Error(message);
+  error.name = "MalformedRootResponseError";
+  return error;
+};
+var validateRootResponseEntries = (data, expectedLength) => {
+  if (!Array.isArray(data)) {
+    throw createMalformedRootResponseError("Malformed root response: expected an array");
+  }
+  if (data.length !== expectedLength) {
+    throw createMalformedRootResponseError(
+      `Malformed root response: expected ${expectedLength} entries but received ${data.length}`
+    );
+  }
+  return data.map((entry, index) => {
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+      throw createMalformedRootResponseError(`Malformed root response: entry ${index} is not an object`);
+    }
+    const { result, message, statusCode, op } = entry;
+    if (!result || typeof result !== "object" || Array.isArray(result)) {
+      throw createMalformedRootResponseError(`Malformed root response: entry ${index} result is not an object`);
+    }
+    if (typeof result.success !== "boolean") {
+      throw createMalformedRootResponseError(`Malformed root response: entry ${index} result.success is not boolean`);
+    }
+    if (typeof statusCode !== "number" || !Number.isFinite(statusCode)) {
+      throw createMalformedRootResponseError(
+        `Malformed root response: entry ${index} statusCode is not a finite number`
+      );
+    }
+    if (message != null && typeof message !== "string") {
+      throw createMalformedRootResponseError(`Malformed root response: entry ${index} message is not a string`);
+    }
+    if (op != null && typeof op !== "string") {
+      throw createMalformedRootResponseError(`Malformed root response: entry ${index} op is not a string`);
+    }
+    return {
+      result,
+      message: message ?? "",
+      statusCode,
+      op
+    };
+  });
+};
+var applyRootTransportFailure = (proms, groupThrowOnError, error) => {
+  const failures = proms.map((prom) => finalizeRootTransportFailure(prom.__query, error));
+  return applyGroupCallbacks(
+    failures,
+    proms.map((p) => p.__service),
+    groupThrowOnError ?? false
+  );
+};
 var isObjectRecord = (value) => value != null && typeof value === "object" && !Array.isArray(value);
 var mergeServiceDefaults = (adapterDefaults, serviceDefaults) => {
   if (!adapterDefaults && !serviceDefaults) return void 0;
@@ -2530,7 +2761,7 @@ function createAdapter(axiosConfig, adapterOptions) {
     dataDefaults: adapterDataDefaults
   } = adapterOptions ?? {};
   const cacheController = cacheTTL > 0 ? useCacheInterceptors(instance, {
-    ttl: cacheTTL,
+    ttlMs: cacheTTL,
     capacity: cacheCapacity,
     withCredentialsDefault: Boolean(instance.defaults.withCredentials),
     partitionForRequest: cachePartition
@@ -2566,8 +2797,8 @@ function createAdapter(axiosConfig, adapterOptions) {
           basePath,
           queryPath,
           mutationPath,
-          onSuccess: onSuccess ?? onSuccessRoot,
-          onFailure: onFailure ?? onFailureRoot,
+          onSuccess: onSuccess ?? onSuccessRoot ?? noopResponseCallback,
+          onFailure: onFailure ?? onFailureRoot ?? noopResponseCallback,
           throwOnError: throwOnError ?? throwOnErrorRoot ?? false
         },
         mergeServiceDefaults(adapterModelDefaults, defaults)
@@ -2581,8 +2812,8 @@ function createAdapter(axiosConfig, adapterOptions) {
           dataName,
           basePath,
           queryPath,
-          onSuccess: onSuccess ?? onSuccessRoot,
-          onFailure: onFailure ?? onFailureRoot,
+          onSuccess: onSuccess ?? onSuccessRoot ?? noopResponseCallback,
+          onFailure: onFailure ?? onFailureRoot ?? noopResponseCallback,
           throwOnError: throwOnError ?? throwOnErrorRoot ?? false
         },
         mergeServiceDefaults(adapterDataDefaults, defaults)
@@ -2613,7 +2844,7 @@ function createAdapter(axiosConfig, adapterOptions) {
         if (sharedConfigKey != null && sharedConfigKey !== configKey) {
           throw new Error("Grouped requests must share the same axios request config");
         }
-        sharedConfig = prom.__requestConfig ?? {};
+        sharedConfig ??= prom.__requestConfig ?? {};
         sharedConfigKey = configKey;
         const query = { ...prom.__query };
         if (query.target === "model") {
@@ -2637,14 +2868,20 @@ function createAdapter(axiosConfig, adapterOptions) {
         }
         throw error;
       }
-      const result = await instance.post(rootRouterPath, defs, sharedConfig ?? {}).then(
+      const groupConfig = removeCacheInvalidationSignal(sharedConfig ?? {});
+      const result = await instance.post(rootRouterPath, defs, groupConfig).then(
         (res) => {
-          const rawEntries = res.data.map(({ result: result2, message, statusCode, op }) => ({
-            result: result2,
-            message,
-            statusCode,
-            op
-          }));
+          let rawEntries;
+          try {
+            rawEntries = validateRootResponseEntries(res.data, proms.length);
+          } catch (error) {
+            return applyRootTransportFailure(proms, groupThrowOnError, error);
+          }
+          if (rawEntries.some(
+            (entry, index) => ROOT_MUTATION_OPS.has(proms[index].__query.op) && entry.result?.success === true && entry.statusCode >= 200 && entry.statusCode < 300
+          )) {
+            cacheController.clear();
+          }
           const finalized = rawEntries.map(
             (rawEntry, index) => finalizeRootEntry(proms[index].__query, rawEntry, {}, proms[index].__service)
           );
@@ -2655,12 +2892,7 @@ function createAdapter(axiosConfig, adapterOptions) {
           );
         },
         (error) => {
-          const failures = proms.map((prom) => finalizeRootTransportFailure(prom.__query, error));
-          return applyGroupCallbacks(
-            failures,
-            proms.map((p) => p.__service),
-            groupThrowOnError ?? false
-          );
+          return applyRootTransportFailure(proms, groupThrowOnError, error);
         }
       );
       return result;