@web-ts-toolkit/access-router-client 0.24.0 → 0.26.0

package/index.d.mts

@@ -538,6 +538,8 @@ interface AdapterOptions {
     onFailure?: ResponseCallback;
     throwOnError?: boolean;
     cacheTTL?: number;
+    modelDefaults?: Defaults;
+    dataDefaults?: DataDefaults;
 }
 interface ModelServiceOptions {
     modelName: string;

package/index.d.ts

@@ -538,6 +538,8 @@ interface AdapterOptions {
     onFailure?: ResponseCallback;
     throwOnError?: boolean;
     cacheTTL?: number;
+    modelDefaults?: Defaults;
+    dataDefaults?: DataDefaults;
 }
 interface ModelServiceOptions {
     modelName: string;

package/index.js

@@ -1749,6 +1749,27 @@ var defaultAxiosConfig = Object.freeze({
 });
 var isModelQuery = (query) => query.target === "model";
 var serializeRequestConfig = (config) => JSON.stringify(normalizeConfigValue(config ?? {}));
+var isObjectRecord = (value) => value != null && typeof value === "object" && !Array.isArray(value);
+var mergeServiceDefaults = (adapterDefaults, serviceDefaults) => {
+  if (!adapterDefaults && !serviceDefaults) return void 0;
+  const merged = {};
+  const adapterDefaultsRecord = adapterDefaults ?? {};
+  const serviceDefaultsRecord = serviceDefaults ?? {};
+  const keys = /* @__PURE__ */ new Set([...Object.keys(adapterDefaultsRecord), ...Object.keys(serviceDefaultsRecord)]);
+  for (const key of keys) {
+    const adapterValue = adapterDefaultsRecord[key];
+    const serviceValue = serviceDefaultsRecord[key];
+    if (isObjectRecord(adapterValue) || isObjectRecord(serviceValue)) {
+      merged[key] = {
+        ...isObjectRecord(adapterValue) ? adapterValue : {},
+        ...isObjectRecord(serviceValue) ? serviceValue : {}
+      };
+      continue;
+    }
+    merged[key] = serviceValue ?? adapterValue;
+  }
+  return merged;
+};
 function createAdapter(axiosConfig, adapterOptions) {
   const merged = (0, import_axios8.mergeConfig)(defaultAxiosConfig, axiosConfig ?? {});
   const instance = import_axios8.default.create(merged);
@@ -1757,7 +1778,9 @@ function createAdapter(axiosConfig, adapterOptions) {
     onSuccess: onSuccessRoot,
     onFailure: onFailureRoot,
     throwOnError: throwOnErrorRoot,
-    cacheTTL = 0
+    cacheTTL = 0,
+    modelDefaults: adapterModelDefaults,
+    dataDefaults: adapterDataDefaults
   } = adapterOptions ?? {};
   if (cacheTTL > 0) useCacheInterceptors(instance, cacheTTL);
   const wraps = createWrapHelper(instance);
@@ -1783,7 +1806,7 @@ function createAdapter(axiosConfig, adapterOptions) {
           onFailure: onFailure ?? onFailureRoot,
           throwOnError: throwOnError ?? throwOnErrorRoot ?? false
         },
-        defaults
+        mergeServiceDefaults(adapterModelDefaults, defaults)
       );
     },
     createDataService: ({ dataName, basePath, queryPath = "__query", onSuccess, onFailure, throwOnError }, defaults) => {
@@ -1797,7 +1820,7 @@ function createAdapter(axiosConfig, adapterOptions) {
           onFailure: onFailure ?? onFailureRoot,
           throwOnError: throwOnError ?? throwOnErrorRoot ?? false
         },
-        defaults
+        mergeServiceDefaults(adapterDataDefaults, defaults)
       );
     },
     wrapGet: wraps.wrapGet,

package/index.mjs

@@ -1705,6 +1705,27 @@ var defaultAxiosConfig = Object.freeze({
 });
 var isModelQuery = (query) => query.target === "model";
 var serializeRequestConfig = (config) => JSON.stringify(normalizeConfigValue(config ?? {}));
+var isObjectRecord = (value) => value != null && typeof value === "object" && !Array.isArray(value);
+var mergeServiceDefaults = (adapterDefaults, serviceDefaults) => {
+  if (!adapterDefaults && !serviceDefaults) return void 0;
+  const merged = {};
+  const adapterDefaultsRecord = adapterDefaults ?? {};
+  const serviceDefaultsRecord = serviceDefaults ?? {};
+  const keys = /* @__PURE__ */ new Set([...Object.keys(adapterDefaultsRecord), ...Object.keys(serviceDefaultsRecord)]);
+  for (const key of keys) {
+    const adapterValue = adapterDefaultsRecord[key];
+    const serviceValue = serviceDefaultsRecord[key];
+    if (isObjectRecord(adapterValue) || isObjectRecord(serviceValue)) {
+      merged[key] = {
+        ...isObjectRecord(adapterValue) ? adapterValue : {},
+        ...isObjectRecord(serviceValue) ? serviceValue : {}
+      };
+      continue;
+    }
+    merged[key] = serviceValue ?? adapterValue;
+  }
+  return merged;
+};
 function createAdapter(axiosConfig, adapterOptions) {
   const merged = mergeConfig5(defaultAxiosConfig, axiosConfig ?? {});
   const instance = axios.create(merged);
@@ -1713,7 +1734,9 @@ function createAdapter(axiosConfig, adapterOptions) {
     onSuccess: onSuccessRoot,
     onFailure: onFailureRoot,
     throwOnError: throwOnErrorRoot,
-    cacheTTL = 0
+    cacheTTL = 0,
+    modelDefaults: adapterModelDefaults,
+    dataDefaults: adapterDataDefaults
   } = adapterOptions ?? {};
   if (cacheTTL > 0) useCacheInterceptors(instance, cacheTTL);
   const wraps = createWrapHelper(instance);
@@ -1739,7 +1762,7 @@ function createAdapter(axiosConfig, adapterOptions) {
           onFailure: onFailure ?? onFailureRoot,
           throwOnError: throwOnError ?? throwOnErrorRoot ?? false
         },
-        defaults
+        mergeServiceDefaults(adapterModelDefaults, defaults)
       );
     },
     createDataService: ({ dataName, basePath, queryPath = "__query", onSuccess, onFailure, throwOnError }, defaults) => {
@@ -1753,7 +1776,7 @@ function createAdapter(axiosConfig, adapterOptions) {
           onFailure: onFailure ?? onFailureRoot,
           throwOnError: throwOnError ?? throwOnErrorRoot ?? false
         },
-        defaults
+        mergeServiceDefaults(adapterDataDefaults, defaults)
       );
     },
     wrapGet: wraps.wrapGet,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@web-ts-toolkit/access-router-client",
   "description": "Typed client utilities for @web-ts-toolkit/access-router APIs",
   "homepage": "https://web-ts-toolkit.pages.dev/docs/packages/access-router-client",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "sideEffects": false,
   "keywords": [
     "axios",
@@ -26,7 +26,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@web-ts-toolkit/utils": "0.24.0",
+    "@web-ts-toolkit/utils": "0.26.0",
     "axios": "^1.7.9"
   },
   "files": [