@web-ts-toolkit/access-router-client 0.28.0 → 0.30.0

package/index.js

@@ -44,7 +44,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/adapter.ts
 var import_axios8 = __toESM(require("axios"));
-var import_utils6 = require("@web-ts-toolkit/utils");
+var import_utils7 = require("@web-ts-toolkit/utils");
 
 // src/services/model-service.ts
 var import_axios4 = require("axios");
@@ -133,7 +133,7 @@ var Model = class _Model {
     const currentKeys = Object.keys(this._data);
     for (let x = 0; x < currentKeys.length; x++) {
       const key = currentKeys[x];
-      if (!Object.prototype.hasOwnProperty.call(nextData, key)) {
+      if (!(0, import_utils.hasOwn)(nextData, key)) {
         delete this._data[key];
       }
     }
@@ -189,7 +189,7 @@ var Model = class _Model {
       if (key in this) continue;
       Object.defineProperty(this, key, {
         enumerable: true,
-        get: () => Object.prototype.hasOwnProperty.call(this._data, key) ? this._data[key] : null,
+        get: () => (0, import_utils.hasOwn)(this._data, key) ? this._data[key] : null,
         set: (value) => this._data[key] = value
       });
     }
@@ -451,6 +451,20 @@ var CustomHeaders = /* @__PURE__ */ ((CustomHeaders2) => {
 })(CustomHeaders || {});
 
 // src/services/shared.ts
+var toResultError = (result) => ({
+  success: false,
+  raw: result.raw ?? null,
+  data: result.data ?? null,
+  message: result.message ?? "",
+  status: result.status ?? 0,
+  headers: result.headers ?? {}
+});
+var isLegacyListPayload = (value) => {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  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);
@@ -466,7 +480,7 @@ var createResponseHandler = (onSuccess, onFailure, throwOnError) => {
     }
     failureHandler(res);
     if (shouldThrowOnError) {
-      throw new ServiceError(res);
+      throw new ServiceError(toResultError(res));
     }
     return res;
   };
@@ -490,9 +504,13 @@ function processListResult(result, { includeCount, includeExtraHeaders }, wrapIt
       const totalCount = (0, import_utils4.get)(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
       result.totalCount = Number(totalCount);
     } else {
-      const listData = result.raw;
-      result.totalCount = listData.count;
-      result.raw = listData.rows;
+      if (isLegacyListPayload(result.raw)) {
+        result.totalCount = result.raw.count;
+        result.raw = result.raw.rows;
+      } else {
+        result.totalCount = 0;
+        result.raw = [];
+      }
     }
   }
   result.data = wrapItem ? result.raw.map(wrapItem) : result.raw;
@@ -1615,6 +1633,7 @@ var import_axios7 = require("axios");
 
 // src/services/cache-utils.ts
 var import_axios6 = require("axios");
+var import_utils6 = require("@web-ts-toolkit/utils");
 var normalizeConfigValue = (value) => {
   if (value == null) return value;
   if (value instanceof import_axios6.AxiosHeaders) {
@@ -1624,7 +1643,7 @@ var normalizeConfigValue = (value) => {
     return value.map((item) => normalizeConfigValue(item));
   }
   if (typeof value === "object") {
-    return Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).reduce((acc, [key, item]) => {
+    return Object.entries((0, import_utils6.omitBy)(value, (item) => item === void 0)).sort(([left], [right]) => left.localeCompare(right)).reduce((acc, [key, item]) => {
       acc[key] = normalizeConfigValue(item);
       return acc;
     }, {});
@@ -1832,7 +1851,7 @@ function createAdapter(axiosConfig, adapterOptions) {
       let sharedConfig;
       let sharedConfigKey;
       const defs = proms.map((prom, index) => {
-        if (!(0, import_utils6.isEmpty)(prom.__requestConfig)) {
+        if (!(0, import_utils7.isEmpty)(prom.__requestConfig)) {
           const configKey = serializeRequestConfig(prom.__requestConfig);
           if (sharedConfigKey && sharedConfigKey !== configKey) {
             throw new Error("Grouped requests must share the same axios request config");
@@ -1863,7 +1882,7 @@ function createAdapter(axiosConfig, adapterOptions) {
                 _raw = result2.data[0];
                 _data = Model.create(result2.data[0], modelService);
               } else if (!["distinct", "subList"].includes(op)) {
-                _data = (0, import_utils6.castArray)(result2.data).map((item) => Model.create(item, modelService));
+                _data = (0, import_utils7.castArray)(result2.data).map((item) => Model.create(item, modelService));
               }
             } else if (result2.kind === "single" && ["new", "read", "update", "upsert"].includes(op)) {
               _data = Model.create(result2.data, modelService);

package/index.mjs

@@ -7,7 +7,15 @@ import { mergeConfig as mergeConfig3 } from "axios";
 import { set as set3 } from "@web-ts-toolkit/utils";
 
 // src/model.ts
-import { assign as assignObject, cloneDeep, get as getValue, omit, pick, set as setValue } from "@web-ts-toolkit/utils";
+import {
+  assign as assignObject,
+  cloneDeep,
+  get as getValue,
+  hasOwn,
+  omit,
+  pick,
+  set as setValue
+} from "@web-ts-toolkit/utils";
 var Model = class _Model {
   constructor(data, adapter) {
     this.modifiedPaths = /* @__PURE__ */ new Set();
@@ -89,7 +97,7 @@ var Model = class _Model {
     const currentKeys = Object.keys(this._data);
     for (let x = 0; x < currentKeys.length; x++) {
       const key = currentKeys[x];
-      if (!Object.prototype.hasOwnProperty.call(nextData, key)) {
+      if (!hasOwn(nextData, key)) {
         delete this._data[key];
       }
     }
@@ -145,7 +153,7 @@ var Model = class _Model {
       if (key in this) continue;
       Object.defineProperty(this, key, {
         enumerable: true,
-        get: () => Object.prototype.hasOwnProperty.call(this._data, key) ? this._data[key] : null,
+        get: () => hasOwn(this._data, key) ? this._data[key] : null,
         set: (value) => this._data[key] = value
       });
     }
@@ -407,6 +415,20 @@ var CustomHeaders = /* @__PURE__ */ ((CustomHeaders2) => {
 })(CustomHeaders || {});
 
 // src/services/shared.ts
+var toResultError = (result) => ({
+  success: false,
+  raw: result.raw ?? null,
+  data: result.data ?? null,
+  message: result.message ?? "",
+  status: result.status ?? 0,
+  headers: result.headers ?? {}
+});
+var isLegacyListPayload = (value) => {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  return "count" in value && typeof value.count === "number" && "rows" in value && Array.isArray(value.rows);
+};
 var setDefaultObjectProp = (obj, key, value) => {
   if (!get(obj, key)) {
     set2(obj, key, value);
@@ -422,7 +444,7 @@ var createResponseHandler = (onSuccess, onFailure, throwOnError) => {
     }
     failureHandler(res);
     if (shouldThrowOnError) {
-      throw new ServiceError(res);
+      throw new ServiceError(toResultError(res));
     }
     return res;
   };
@@ -446,9 +468,13 @@ function processListResult(result, { includeCount, includeExtraHeaders }, wrapIt
       const totalCount = get(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
       result.totalCount = Number(totalCount);
     } else {
-      const listData = result.raw;
-      result.totalCount = listData.count;
-      result.raw = listData.rows;
+      if (isLegacyListPayload(result.raw)) {
+        result.totalCount = result.raw.count;
+        result.raw = result.raw.rows;
+      } else {
+        result.totalCount = 0;
+        result.raw = [];
+      }
     }
   }
   result.data = wrapItem ? result.raw.map(wrapItem) : result.raw;
@@ -1571,6 +1597,7 @@ import { AxiosHeaders as AxiosHeaders3 } from "axios";
 
 // src/services/cache-utils.ts
 import { AxiosHeaders as AxiosHeaders2 } from "axios";
+import { omitBy } from "@web-ts-toolkit/utils";
 var normalizeConfigValue = (value) => {
   if (value == null) return value;
   if (value instanceof AxiosHeaders2) {
@@ -1580,7 +1607,7 @@ var normalizeConfigValue = (value) => {
     return value.map((item) => normalizeConfigValue(item));
   }
   if (typeof value === "object") {
-    return Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).reduce((acc, [key, item]) => {
+    return Object.entries(omitBy(value, (item) => item === void 0)).sort(([left], [right]) => left.localeCompare(right)).reduce((acc, [key, item]) => {
       acc[key] = normalizeConfigValue(item);
       return acc;
     }, {});

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.28.0",
+  "version": "0.30.0",
   "sideEffects": false,
   "keywords": [
     "axios",
@@ -26,7 +26,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@web-ts-toolkit/utils": "0.28.0",
+    "@web-ts-toolkit/utils": "0.30.0",
     "axios": "^1.18.1"
   },
   "files": [