@web-ts-toolkit/access-router-client 0.4.0 → 0.5.0

package/index.mjs

@@ -1,44 +1,10 @@
 // src/adapter.ts
-import axios, { AxiosHeaders as AxiosHeaders3, mergeConfig as mergeConfig4 } from "axios";
-import { castArray, isEmpty, set as set4 } from "@web-ts-toolkit/utils";
+import axios, { mergeConfig as mergeConfig5 } from "axios";
+import { castArray, isEmpty } from "@web-ts-toolkit/utils";
 
 // src/services/model-service.ts
-import { mergeConfig as mergeConfig2 } from "axios";
-import { get as get2, set as set3 } from "@web-ts-toolkit/utils";
-
-// src/types.ts
-var wrapLazyPromise = (promiseFn, meta) => {
-  let promise;
-  const exec = () => {
-    if (!promise) {
-      promise = promiseFn();
-    }
-    return promise;
-  };
-  const prom = {
-    exec,
-    then(onFulfilled, onRejected) {
-      return exec().then(onFulfilled, onRejected);
-    },
-    catch(onRejected) {
-      return exec().catch(onRejected);
-    },
-    finally(onFinally) {
-      return exec().finally(onFinally);
-    },
-    [/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")]() {
-      return "LazyPromise";
-    }
-  };
-  Object.defineProperty(prom, Symbol.toStringTag, {
-    value: "Promise",
-    writable: false,
-    enumerable: false,
-    configurable: true
-  });
-  Object.assign(prom, meta);
-  return prom;
-};
+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";
@@ -114,7 +80,6 @@ var Model = class _Model {
   toJSON() {
     return this.toObject();
   }
-  // async validate() {}
   updateModel(data) {
     assignObject(this._data, data);
     this.definePublicDataProps();
@@ -194,12 +159,15 @@ var Model = class _Model {
 };
 
 // src/services/service.ts
-import { AxiosHeaders, mergeConfig } from "axios";
-import { set } from "@web-ts-toolkit/utils";
+import { AxiosHeaders } from "axios";
 
 // src/constants.ts
 var CACHE_HEADER = "x-axios-cache";
 
+// src/services/wrap.ts
+import { mergeConfig } from "axios";
+import { set } from "@web-ts-toolkit/utils";
+
 // src/helpers.ts
 import { isPlainObject, mapValues } from "@web-ts-toolkit/utils";
 function replaceSubQuery(filter) {
@@ -232,9 +200,77 @@ function getWrapContext(url, options, config) {
   return { finalUrl, finalConfig: config };
 }
 
+// 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) {
+  set(defaultConfig, `headers.${CACHE_HEADER}`, cacheValue);
+  return mergeConfig(defaultConfig, requestConfig);
+}
+function createWrapHelper(axios2, basePath) {
+  return {
+    wrapGet: (url, defaultConfig = {}) => {
+      const _url = resolveUrl(basePath, url);
+      return (options, requestConfig) => {
+        const { finalUrl, finalConfig } = getWrapContext(
+          _url,
+          options,
+          prepareConfig(defaultConfig, "true", requestConfig)
+        );
+        return axios2.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 axios2.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 axios2.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 axios2.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 axios2.delete(finalUrl, finalConfig);
+      };
+    }
+  };
+}
+
 // src/services/service.ts
-var removeTrailingSlash = (inputString) => inputString.replace(/\/$/, "");
-var removeLeadingSlash = (inputString) => inputString.replace(/^\/+/g, "");
 var readProblemDetail = (value) => {
   if (!value || typeof value !== "object") {
     return void 0;
@@ -282,11 +318,12 @@ var Service = class {
   constructor(axios2, basePath) {
     this._axios = axios2;
     this._basePath = basePath;
+    this._wrap = createWrapHelper(axios2, basePath);
   }
   handleSuccess(res, extra = {}) {
     return { success: true, raw: res.data, status: res.status, headers: res.headers, ...extra };
   }
-  // See https://axios-http.com/docs/handling_errors
+  // See https://axios-http.com/docs/handling-errors
   handleError(error) {
     const result = {
       success: false,
@@ -311,64 +348,19 @@ var Service = class {
     return result;
   }
   wrapGet(url, defaultAxiosRequestConfig = {}) {
-    const _url = `${removeTrailingSlash(this._basePath)}/${removeLeadingSlash(url)}`;
-    set(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "true");
-    return (options, axiosRequestConfig) => {
-      const { finalUrl, finalConfig } = getWrapContext(
-        _url,
-        options,
-        mergeConfig(defaultAxiosRequestConfig, axiosRequestConfig)
-      );
-      return this._axios.get(finalUrl, finalConfig);
-    };
+    return this._wrap.wrapGet(url, defaultAxiosRequestConfig);
   }
   wrapPost(url, defaultAxiosRequestConfig = {}) {
-    const _url = `${removeTrailingSlash(this._basePath)}/${removeLeadingSlash(url)}`;
-    set(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-    return (data, options, axiosRequestConfig) => {
-      const { finalUrl, finalConfig } = getWrapContext(
-        _url,
-        options,
-        mergeConfig(defaultAxiosRequestConfig, axiosRequestConfig)
-      );
-      return this._axios.post(finalUrl, data, finalConfig);
-    };
+    return this._wrap.wrapPost(url, defaultAxiosRequestConfig);
   }
   wrapPut(url, defaultAxiosRequestConfig = {}) {
-    const _url = `${removeTrailingSlash(this._basePath)}/${removeLeadingSlash(url)}`;
-    set(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-    return (data, options, axiosRequestConfig) => {
-      const { finalUrl, finalConfig } = getWrapContext(
-        _url,
-        options,
-        mergeConfig(defaultAxiosRequestConfig, axiosRequestConfig)
-      );
-      return this._axios.put(finalUrl, data, finalConfig);
-    };
+    return this._wrap.wrapPut(url, defaultAxiosRequestConfig);
   }
   wrapPatch(url, defaultAxiosRequestConfig = {}) {
-    const _url = `${removeTrailingSlash(this._basePath)}/${removeLeadingSlash(url)}`;
-    set(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-    return (data, options, axiosRequestConfig) => {
-      const { finalUrl, finalConfig } = getWrapContext(
-        _url,
-        options,
-        mergeConfig(defaultAxiosRequestConfig, axiosRequestConfig)
-      );
-      return this._axios.patch(finalUrl, data, finalConfig);
-    };
+    return this._wrap.wrapPatch(url, defaultAxiosRequestConfig);
   }
   wrapDelete(url, defaultAxiosRequestConfig = {}) {
-    const _url = `${removeTrailingSlash(this._basePath)}/${removeLeadingSlash(url)}`;
-    set(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-    return (options, axiosRequestConfig) => {
-      const { finalUrl, finalConfig } = getWrapContext(
-        _url,
-        options,
-        mergeConfig(defaultAxiosRequestConfig, axiosRequestConfig)
-      );
-      return this._axios.delete(finalUrl, finalConfig);
-    };
+    return this._wrap.wrapDelete(url, defaultAxiosRequestConfig);
   }
   updateHeaders(headers, { ignoreCache }) {
     const cacheValue = ignoreCache ? "false" : "true";
@@ -401,6 +393,20 @@ var ServiceError = class extends Error {
 
 // src/services/shared.ts
 import { get, noop, set as set2 } from "@web-ts-toolkit/utils";
+
+// src/enums.ts
+var CustomHeaders = /* @__PURE__ */ ((CustomHeaders2) => {
+  CustomHeaders2["TotalCount"] = "wtt-total-count";
+  CustomHeaders2["ReturnedCount"] = "wtt-returned-count";
+  CustomHeaders2["Page"] = "wtt-page";
+  CustomHeaders2["PageSize"] = "wtt-page-size";
+  CustomHeaders2["TotalPages"] = "wtt-total-pages";
+  CustomHeaders2["HasNextPage"] = "wtt-has-next-page";
+  CustomHeaders2["HasPreviousPage"] = "wtt-has-previous-page";
+  return CustomHeaders2;
+})(CustomHeaders || {});
+
+// src/services/shared.ts
 var setDefaultObjectProp = (obj, key, value) => {
   if (!get(obj, key)) {
     set2(obj, key, value);
@@ -421,6 +427,268 @@ var createResponseHandler = (onSuccess, onFailure, throwOnError) => {
     return res;
   };
 };
+function processListResult(result, { includeCount, includeExtraHeaders }, wrapItem) {
+  const wrappedRows = get(result, "raw.data");
+  const wrappedTotalCount = get(result, "raw.meta.totalCount");
+  if (Array.isArray(wrappedRows)) {
+    const rows = wrappedRows;
+    result.raw = wrappedRows;
+    if (includeCount) {
+      if (includeExtraHeaders) {
+        const totalCount = get(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
+        result.totalCount = Number(totalCount);
+      } else {
+        result.totalCount = Number(wrappedTotalCount ?? rows.length);
+      }
+    }
+  } else if (includeCount) {
+    if (includeExtraHeaders) {
+      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;
+    }
+  }
+  result.data = wrapItem ? result.raw.map(wrapItem) : result.raw;
+  return result;
+}
+
+// src/lazy-promise.ts
+var wrapLazyPromise = (promiseFn, meta) => {
+  let promise;
+  const exec = () => {
+    if (!promise) {
+      promise = promiseFn();
+    }
+    return promise;
+  };
+  const prom = {
+    exec,
+    then(onFulfilled, onRejected) {
+      return exec().then(onFulfilled, onRejected);
+    },
+    catch(onRejected) {
+      return exec().catch(onRejected);
+    },
+    finally(onFinally) {
+      return exec().finally(onFinally);
+    },
+    [/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")]() {
+      return "LazyPromise";
+    }
+  };
+  Object.defineProperty(prom, Symbol.toStringTag, {
+    value: "Promise",
+    writable: false,
+    enumerable: false,
+    configurable: true
+  });
+  Object.assign(prom, meta);
+  return prom;
+};
+
+// src/services/request.ts
+function makeRequest(execute, meta) {
+  return wrapLazyPromise(execute, meta);
+}
+
+// src/services/sub-ops.ts
+import { mergeConfig as mergeConfig2 } from "axios";
+function buildSubDocumentOps(ctx, id, sub) {
+  const { axios: axios2, basePath, modelName, queryPath, handleSuccess, handleError, _handleCallbacks, parentService } = ctx;
+  const asS = parentService;
+  return {
+    list: (axiosRequestConfig) => {
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.get(`${basePath}/${id}/${sub}`, mergeConfig2(reqConfig, { params: {} })).then(handleSuccess).then((result) => {
+          result.totalCount = Array.isArray(result.raw) ? result.raw.length : 0;
+          result.data = Array.isArray(result.raw) ? result.raw.map((item) => Model.create(item, asS)) : [];
+          return result;
+        }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
+        {
+          __op: "listSub",
+          __query: {
+            target: "model",
+            name: modelName,
+            model: modelName,
+            op: "subList",
+            id,
+            sub,
+            filter: {},
+            args: {},
+            options: {}
+          },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    listAdvanced: (filter, args, axiosRequestConfig) => {
+      const select = args?.select;
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.post(`${basePath}/${id}/${sub}/${queryPath}`, { filter, select }, reqConfig).then(handleSuccess).then((result) => {
+          result.totalCount = Array.isArray(result.raw) ? result.raw.length : 0;
+          result.data = Array.isArray(result.raw) ? result.raw.map((item) => Model.create(item, asS)) : [];
+          return result;
+        }).catch(handleError).then(
+          (res) => _handleCallbacks(res, throwOnError)
+        ),
+        {
+          __op: "listAdvancedSub",
+          __query: {
+            target: "model",
+            name: modelName,
+            model: modelName,
+            op: "subList",
+            id,
+            sub,
+            filter,
+            args: { select },
+            options: {}
+          },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    read: (subId, axiosRequestConfig) => {
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.get(`${basePath}/${id}/${sub}/${subId}`, mergeConfig2(reqConfig, { params: {} })).then(handleSuccess).then((result) => {
+          result.data = result.success ? Model.create(result.raw, asS) : null;
+          return result;
+        }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
+        {
+          __op: "readSub",
+          __query: {
+            target: "model",
+            name: modelName,
+            model: modelName,
+            op: "subRead",
+            id,
+            sub,
+            subId,
+            args: {},
+            options: {}
+          },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    readAdvanced: (subId, args, axiosRequestConfig) => {
+      const { select, populate } = args ?? {};
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.post(`${basePath}/${id}/${sub}/${subId}/${queryPath}`, { select, populate }, reqConfig).then(handleSuccess).then((result) => {
+          result.data = result.success ? Model.create(result.raw, asS) : null;
+          return result;
+        }).catch(handleError).then(
+          (res) => _handleCallbacks(res, throwOnError)
+        ),
+        {
+          __op: "readAdvancedSub",
+          __query: {
+            target: "model",
+            name: modelName,
+            model: modelName,
+            op: "subRead",
+            id,
+            sub,
+            subId,
+            args: { select, populate },
+            options: {}
+          },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    update: (subId, data, axiosRequestConfig) => {
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.patch(`${basePath}/${id}/${sub}/${subId}`, data, mergeConfig2(reqConfig, { params: {} })).then(handleSuccess).then((result) => {
+          result.data = result.success ? Model.create(result.raw, asS) : null;
+          return result;
+        }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
+        {
+          __op: "updateSub",
+          __query: {
+            target: "model",
+            name: modelName,
+            model: modelName,
+            op: "subUpdate",
+            id,
+            sub,
+            subId,
+            data,
+            options: {}
+          },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    bulkUpdate: (data, axiosRequestConfig) => {
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.patch(`${basePath}/${id}/${sub}`, data, mergeConfig2(reqConfig, { params: {} })).then(handleSuccess).then((result) => {
+          result.data = Array.isArray(result.raw) ? result.raw.map((item) => Model.create(item, asS)) : [];
+          return result;
+        }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
+        {
+          __op: "bulkUpdateSub",
+          __query: {
+            target: "model",
+            name: modelName,
+            model: modelName,
+            op: "subBulkUpdate",
+            id,
+            sub,
+            data,
+            options: {}
+          },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    create: (data, axiosRequestConfig) => {
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.post(`${basePath}/${id}/${sub}`, data, mergeConfig2(reqConfig, { params: {} })).then(handleSuccess).then((result) => {
+          result.data = result.success ? Model.create(result.raw, asS) : null;
+          return result;
+        }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
+        {
+          __op: "createSub",
+          __query: { target: "model", name: modelName, model: modelName, op: "subCreate", id, sub, data, options: {} },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    },
+    delete: (subId, axiosRequestConfig) => {
+      const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+      return makeRequest(
+        () => axios2.delete(`${basePath}/${id}/${sub}/${subId}`, reqConfig).then(handleSuccess).then((result) => {
+          result.data = result.raw;
+          return result;
+        }).catch(handleError).then((res) => _handleCallbacks(res, throwOnError)),
+        {
+          __op: "deleteSub",
+          __query: { target: "model", name: modelName, model: modelName, op: "subDelete", id, sub, subId },
+          __requestConfig: reqConfig,
+          __service: parentService
+        }
+      );
+    }
+  };
+}
 
 // src/services/model-service.ts
 var ModelService = class extends Service {
@@ -450,6 +718,9 @@ var ModelService = class extends Service {
       "upsertAdvancedOptions"
     ].forEach((key) => setDefaultObjectProp(this._defaults, key, {}));
   }
+  // ---------------------------------------------------------------------------
+  // Collection operations
+  // ---------------------------------------------------------------------------
   list(args, options, axiosRequestConfig) {
     const {
       skip = this._defaults.listArgs.skip,
@@ -467,10 +738,10 @@ var ModelService = class extends Service {
     } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const result = wrapLazyPromise(
+    return makeRequest(
       () => this._axios.get(
         this._basePath,
-        mergeConfig2(reqConfig, {
+        mergeConfig3(reqConfig, {
           params: {
             skip,
             limit,
@@ -482,8 +753,12 @@ var ModelService = class extends Service {
             include_extra_headers: includeExtraHeaders
           }
         })
-      ).then(this.handleSuccess).then((result2) => {
-        return this.processListResult(this, result2, { includeCount, includeExtraHeaders });
+      ).then(this.handleSuccess).then((result) => {
+        return processListResult(
+          result,
+          { includeCount, includeExtraHeaders },
+          (item) => Model.create(item, this)
+        );
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
         __op: "list",
@@ -494,19 +769,13 @@ var ModelService = class extends Service {
           op: "list",
           filter: {},
           args: { skip, limit, page, pageSize },
-          options: {
-            skim,
-            includePermissions,
-            includeCount,
-            includeExtraHeaders
-          },
+          options: { skim, includePermissions, includeCount, includeExtraHeaders },
           sqOptions: sq
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
   listAdvanced(filter, args, options, axiosRequestConfig) {
     const {
@@ -532,7 +801,7 @@ var ModelService = class extends Service {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
     const _filter = replaceSubQuery(filter);
-    const result = wrapLazyPromise(
+    return makeRequest(
       () => this._axios.post(
         `${this._basePath}/${this._queryPath}`,
         {
@@ -546,17 +815,15 @@ var ModelService = class extends Service {
           page,
           pageSize,
           tasks,
-          options: {
-            skim,
-            includePermissions,
-            includeCount,
-            includeExtraHeaders,
-            populateAccess
-          }
+          options: { skim, includePermissions, includeCount, includeExtraHeaders, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        return this.processListResult(this, result2, { includeCount, includeExtraHeaders });
+      ).then(this.handleSuccess).then((result) => {
+        return processListResult(
+          result,
+          { includeCount, includeExtraHeaders },
+          (item) => Model.create(item, this)
+        );
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
       ),
@@ -569,829 +836,520 @@ var ModelService = class extends Service {
           op: "list",
           filter: _filter,
           args: { select, sort, populate, include, skip, limit, page, pageSize, tasks },
-          options: {
-            skim,
-            includePermissions,
-            includeCount,
-            includeExtraHeaders,
-            populateAccess
-          },
+          options: { skim, includePermissions, includeCount, includeExtraHeaders, populateAccess },
           sqOptions: sq
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  read(identifier, options, axiosRequestConfig) {
-    const {
-      includePermissions = this._defaults.readOptions.includePermissions ?? true,
-      tryList = this._defaults.readOptions.tryList ?? true,
-      ignoreCache = this._defaults.readOptions.ignoreCache ?? false,
-      sq
-    } = options ?? {};
+  create(data, options, axiosRequestConfig) {
+    const { includePermissions = this._defaults.createOptions.includePermissions ?? true } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const result = wrapLazyPromise(
-      () => this._axios.get(
-        `${this._basePath}/${identifier}`,
-        mergeConfig2(reqConfig, {
-          params: {
-            include_permissions: includePermissions,
-            try_list: tryList
-          }
-        })
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
+    return makeRequest(
+      () => this._axios.post(this._basePath, data, mergeConfig3(reqConfig, { params: { include_permissions: includePermissions } })).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "read",
+        __op: "create",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "read",
-          id: identifier,
-          args: {},
-          options: {
-            includePermissions,
-            tryList
-          },
-          sqOptions: sq
+          op: "create",
+          data,
+          options: { includePermissions }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  readAdvanced(identifier, args, options, axiosRequestConfig) {
-    const {
-      populate = this._defaults.readAdvancedArgs.populate,
-      include = this._defaults.readAdvancedArgs.include,
-      tasks = this._defaults.readAdvancedArgs.tasks
-    } = args ?? {};
-    const select = args?.select ?? this._defaults.readAdvancedArgs.select;
+  createAdvanced(data, args, options, axiosRequestConfig) {
+    const { populate = this._defaults.createAdvancedArgs.populate, tasks = this._defaults.createAdvancedArgs.tasks } = args ?? {};
+    const select = args?.select ?? this._defaults.createAdvancedArgs.select;
     const {
-      skim = this._defaults.readAdvancedOptions.skim ?? true,
-      includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true,
-      tryList = this._defaults.readAdvancedOptions.tryList ?? true,
-      populateAccess = this._defaults.readAdvancedOptions.populateAccess,
-      ignoreCache = this._defaults.readAdvancedOptions.ignoreCache ?? false,
-      sq
+      includePermissions = this._defaults.createAdvancedOptions.includePermissions ?? true,
+      populateAccess = this._defaults.createAdvancedOptions.populateAccess
     } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const result = wrapLazyPromise(
+    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
+    return makeRequest(
       () => this._axios.post(
-        `${this._basePath}/${this._queryPath}/${identifier}`,
-        {
-          select,
-          populate,
-          include,
-          tasks,
-          options: {
-            skim,
-            includePermissions,
-            tryList,
-            populateAccess
-          }
-        },
+        `${this._basePath}/${this._mutationPath}`,
+        { data, select, populate, tasks, options: { includePermissions, populateAccess } },
         reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
       ),
       {
-        __op: "readAdvanced",
+        __op: "createAdvanced",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "read",
-          id: identifier,
-          args: { select, populate, include, tasks },
-          options: {
-            skim,
-            includePermissions,
-            tryList,
-            populateAccess
-          },
-          sqOptions: sq
+          op: "create",
+          data,
+          args: { select, populate, tasks },
+          options: { includePermissions, populateAccess }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  readAdvancedFilter(filter, args, options, axiosRequestConfig) {
-    const {
-      sort = this._defaults.readAdvancedArgs.sort,
-      populate = this._defaults.readAdvancedArgs.populate,
-      include = this._defaults.readAdvancedArgs.include,
-      tasks = this._defaults.readAdvancedArgs.tasks
-    } = args ?? {};
-    const select = args?.select ?? this._defaults.readAdvancedArgs.select;
+  upsert(data, options, axiosRequestConfig) {
+    const { returningAll = this._defaults.upsertOptions.returningAll ?? true } = options ?? {};
+    const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
+    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
+    return makeRequest(
+      () => this._axios.put(this._basePath, data, mergeConfig3(reqConfig, { params: { returning_all: returningAll } })).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
+      }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
+      {
+        __op: "upsert",
+        __query: {
+          target: "model",
+          name: this._modelName,
+          model: this._modelName,
+          op: "upsert",
+          data,
+          options: { returningAll }
+        },
+        __requestConfig: reqConfig,
+        __service: this
+      }
+    );
+  }
+  upsertAdvanced(data, args, options, axiosRequestConfig) {
+    const { populate = this._defaults.upsertAdvancedArgs.populate, tasks = this._defaults.upsertAdvancedArgs.tasks } = args ?? {};
+    const select = args?.select ?? this._defaults.upsertAdvancedArgs.select;
     const {
-      skim = this._defaults.readAdvancedOptions.skim ?? true,
-      includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true,
-      tryList = this._defaults.readAdvancedOptions.tryList ?? true,
-      populateAccess = this._defaults.readAdvancedOptions.populateAccess,
-      ignoreCache = this._defaults.readAdvancedOptions.ignoreCache ?? false,
-      sq
+      returningAll = this._defaults.upsertAdvancedOptions.returningAll ?? true,
+      includePermissions = this._defaults.upsertAdvancedOptions.includePermissions ?? true,
+      populateAccess = this._defaults.upsertAdvancedOptions.populateAccess
     } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const _filter = replaceSubQuery(filter);
-    const result = wrapLazyPromise(
-      () => this._axios.post(
-        `${this._basePath}/${this._queryPath}/__filter`,
+    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
+    return makeRequest(
+      () => this._axios.put(
+        `${this._basePath}/${this._mutationPath}`,
         {
-          filter: _filter,
+          data,
           select,
-          sort,
           populate,
-          include,
           tasks,
-          options: {
-            skim,
-            includePermissions,
-            tryList,
-            populateAccess
-          }
+          options: { returningAll, includePermissions, populateAccess }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
       ),
       {
-        __op: "readAdvancedFilter",
+        __op: "upsertAdvanced",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "read",
-          filter: _filter,
-          args: { select, sort, populate, include, tasks },
-          options: {
-            skim,
-            includePermissions,
-            tryList,
-            populateAccess
-          },
-          sqOptions: sq
+          op: "upsert",
+          data,
+          args: { select, populate, tasks },
+          options: { returningAll, includePermissions, populateAccess }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  new(axiosRequestConfig) {
+  delete(identifier, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.get(`${this._basePath}/new`, reqConfig).then(this.handleSuccess).then((result2) => {
-        delete result2.raw._id;
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+    return makeRequest(
+      () => this._axios.delete(`${this._basePath}/${identifier}`, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "new",
+        __op: "delete",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "new"
+          op: "delete",
+          id: identifier
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  create(data, options, axiosRequestConfig) {
-    const { includePermissions = this._defaults.createOptions.includePermissions ?? true } = options ?? {};
+  new(axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.post(this._basePath, data, mergeConfig2(reqConfig, { params: { include_permissions: includePermissions } })).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+    return makeRequest(
+      () => this._axios.get(`${this._basePath}/new`, reqConfig).then(this.handleSuccess).then((result) => {
+        delete result.raw._id;
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "create",
+        __op: "new",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "create",
-          data,
-          options: {
-            includePermissions
-          }
+          op: "new"
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  createAdvanced(data, args, options, axiosRequestConfig) {
-    const { populate = this._defaults.createAdvancedArgs.populate, tasks = this._defaults.createAdvancedArgs.tasks } = args ?? {};
-    const select = args?.select ?? this._defaults.createAdvancedArgs.select;
-    const {
-      includePermissions = this._defaults.createAdvancedOptions.includePermissions ?? true,
-      populateAccess = this._defaults.createAdvancedOptions.populateAccess
-    } = options ?? {};
+  distinct(field, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.post(
-        `${this._basePath}/${this._mutationPath}`,
-        { data, select, populate, tasks, options: { includePermissions, populateAccess } },
-        reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
-      }).catch(this.handleError).then(
-        (res) => this._handleCallbacks(res, throwOnError)
-      ),
+    return makeRequest(
+      () => this._axios.get(`${this._basePath}/distinct/${field}`, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
+      }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "createAdvanced",
+        __op: "distinct",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "create",
-          data,
-          args: { select, populate, tasks },
-          options: {
-            includePermissions,
-            populateAccess
-          }
+          op: "distinct",
+          field
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  update(identifier, data, options, axiosRequestConfig) {
-    const { returningAll = this._defaults.updateOptions.returningAll ?? true } = options ?? {};
+  distinctAdvanced(field, conditions, axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.patch(
-        `${this._basePath}/${identifier}`,
-        data,
-        mergeConfig2(reqConfig, { params: { returning_all: returningAll } })
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+    return makeRequest(
+      () => this._axios.post(`${this._basePath}/distinct/${field}`, conditions, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "update",
+        __op: "distinctAdvanced",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "update",
-          id: identifier,
-          data,
-          options: {
-            returningAll
-          }
+          op: "distinct",
+          field,
+          filter: conditions
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  updateAdvanced(identifier, data, args, options, axiosRequestConfig) {
-    const { populate = this._defaults.updateAdvancedArgs.populate, tasks = this._defaults.updateAdvancedArgs.tasks } = args ?? {};
-    const select = args?.select ?? this._defaults.updateAdvancedArgs.select;
-    const {
-      returningAll = this._defaults.updateAdvancedOptions.returningAll ?? true,
-      includePermissions = this._defaults.updateAdvancedOptions.includePermissions ?? true,
-      populateAccess = this._defaults.updateAdvancedOptions.populateAccess
-    } = options ?? {};
+  count(axiosRequestConfig) {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.patch(
-        `${this._basePath}/${this._mutationPath}/${identifier}`,
-        {
-          data,
-          select,
-          populate,
-          tasks,
-          options: { returningAll, includePermissions, populateAccess }
-        },
-        reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
-      }).catch(this.handleError).then(
-        (res) => this._handleCallbacks(res, throwOnError)
-      ),
+    return makeRequest(
+      () => this._axios.get(`${this._basePath}/count`, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
+      }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "updateAdvanced",
+        __op: "count",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "update",
-          id: identifier,
-          data,
-          args: { select, populate, tasks },
-          options: {
-            returningAll,
-            includePermissions,
-            populateAccess
-          }
+          op: "count"
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  upsert(data, options, axiosRequestConfig) {
-    const { returningAll = this._defaults.upsertOptions.returningAll ?? true } = options ?? {};
+  countAdvanced(filter, args, axiosRequestConfig) {
+    const { access } = args ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.put(this._basePath, data, mergeConfig2(reqConfig, { params: { returning_all: returningAll } })).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
+    return makeRequest(
+      () => this._axios.post(`${this._basePath}/count`, { filter, options: { access } }, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "upsert",
+        __op: "countAdvanced",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "upsert",
-          data,
-          options: {
-            returningAll
-          }
+          op: "count",
+          filter,
+          options: { access }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  upsertAdvanced(data, args, options, axiosRequestConfig) {
-    const { populate = this._defaults.upsertAdvancedArgs.populate, tasks = this._defaults.upsertAdvancedArgs.tasks } = args ?? {};
-    const select = args?.select ?? this._defaults.upsertAdvancedArgs.select;
+  // ---------------------------------------------------------------------------
+  // Document operations
+  // ---------------------------------------------------------------------------
+  read(identifier, options, axiosRequestConfig) {
     const {
-      returningAll = this._defaults.upsertAdvancedOptions.returningAll ?? true,
-      includePermissions = this._defaults.upsertAdvancedOptions.includePermissions ?? true,
-      populateAccess = this._defaults.upsertAdvancedOptions.populateAccess
+      includePermissions = this._defaults.readOptions.includePermissions ?? true,
+      tryList = this._defaults.readOptions.tryList ?? true,
+      ignoreCache = this._defaults.readOptions.ignoreCache ?? false,
+      sq
     } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.put(
-        `${this._basePath}/${this._mutationPath}`,
-        {
-          data,
-          select,
-          populate,
-          tasks,
-          options: { returningAll, includePermissions, populateAccess }
-        },
-        reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.success ? Model.create(result2.raw, this) : null;
-        return result2;
-      }).catch(this.handleError).then(
-        (res) => this._handleCallbacks(res, throwOnError)
-      ),
-      {
-        __op: "upsertAdvanced",
-        __query: {
-          target: "model",
-          name: this._modelName,
-          model: this._modelName,
-          op: "upsert",
-          data,
-          args: { select, populate, tasks },
-          options: {
-            returningAll,
-            includePermissions,
-            populateAccess
-          }
-        },
-        __requestConfig: reqConfig,
-        __service: this
-      }
-    );
-    return result;
-  }
-  delete(identifier, axiosRequestConfig) {
-    const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
-    const result = wrapLazyPromise(
-      () => this._axios.delete(`${this._basePath}/${identifier}`, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
+    reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
+    return makeRequest(
+      () => this._axios.get(
+        `${this._basePath}/${identifier}`,
+        mergeConfig3(reqConfig, {
+          params: { include_permissions: includePermissions, try_list: tryList }
+        })
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "delete",
+        __op: "read",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "delete",
-          id: identifier
+          op: "read",
+          id: identifier,
+          args: {},
+          options: { includePermissions, tryList },
+          sqOptions: sq
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  distinct(field, axiosRequestConfig) {
+  readAdvanced(identifier, args, options, axiosRequestConfig) {
+    const {
+      populate = this._defaults.readAdvancedArgs.populate,
+      include = this._defaults.readAdvancedArgs.include,
+      tasks = this._defaults.readAdvancedArgs.tasks
+    } = args ?? {};
+    const select = args?.select ?? this._defaults.readAdvancedArgs.select;
+    const {
+      skim = this._defaults.readAdvancedOptions.skim ?? true,
+      includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true,
+      tryList = this._defaults.readAdvancedOptions.tryList ?? true,
+      populateAccess = this._defaults.readAdvancedOptions.populateAccess,
+      ignoreCache = this._defaults.readAdvancedOptions.ignoreCache ?? false,
+      sq
+    } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    const result = wrapLazyPromise(
-      () => this._axios.get(`${this._basePath}/distinct/${field}`, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
-      }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
+    reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
+    return makeRequest(
+      () => this._axios.post(
+        `${this._basePath}/${this._queryPath}/${identifier}`,
+        {
+          select,
+          populate,
+          include,
+          tasks,
+          options: { skim, includePermissions, tryList, populateAccess }
+        },
+        reqConfig
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
+      }).catch(this.handleError).then(
+        (res) => this._handleCallbacks(res, throwOnError)
+      ),
       {
-        __op: "distinct",
+        __op: "readAdvanced",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "distinct",
-          field
+          op: "read",
+          id: identifier,
+          args: { select, populate, include, tasks },
+          options: { skim, includePermissions, tryList, populateAccess },
+          sqOptions: sq
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  distinctAdvanced(field, conditions, axiosRequestConfig) {
+  readAdvancedFilter(filter, args, options, axiosRequestConfig) {
+    const {
+      sort = this._defaults.readAdvancedArgs.sort,
+      populate = this._defaults.readAdvancedArgs.populate,
+      include = this._defaults.readAdvancedArgs.include,
+      tasks = this._defaults.readAdvancedArgs.tasks
+    } = args ?? {};
+    const select = args?.select ?? this._defaults.readAdvancedArgs.select;
+    const {
+      skim = this._defaults.readAdvancedOptions.skim ?? true,
+      includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true,
+      tryList = this._defaults.readAdvancedOptions.tryList ?? true,
+      populateAccess = this._defaults.readAdvancedOptions.populateAccess,
+      ignoreCache = this._defaults.readAdvancedOptions.ignoreCache ?? false,
+      sq
+    } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    const result = wrapLazyPromise(
-      () => this._axios.post(`${this._basePath}/distinct/${field}`, conditions, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
-      }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
+    reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
+    const _filter = replaceSubQuery(filter);
+    return makeRequest(
+      () => this._axios.post(
+        `${this._basePath}/${this._queryPath}/__filter`,
+        {
+          filter: _filter,
+          select,
+          sort,
+          populate,
+          include,
+          tasks,
+          options: { skim, includePermissions, tryList, populateAccess }
+        },
+        reqConfig
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
+      }).catch(this.handleError).then(
+        (res) => this._handleCallbacks(res, throwOnError)
+      ),
       {
-        __op: "distinctAdvanced",
+        __op: "readAdvancedFilter",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "distinct",
-          field,
-          filter: conditions
+          op: "read",
+          filter: _filter,
+          args: { select, sort, populate, include, tasks },
+          options: { skim, includePermissions, tryList, populateAccess },
+          sqOptions: sq
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  count(axiosRequestConfig) {
+  update(identifier, data, options, axiosRequestConfig) {
+    const { returningAll = this._defaults.updateOptions.returningAll ?? true } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    const result = wrapLazyPromise(
-      () => this._axios.get(`${this._basePath}/count`, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
+    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
+    return makeRequest(
+      () => this._axios.patch(
+        `${this._basePath}/${identifier}`,
+        data,
+        mergeConfig3(reqConfig, { params: { returning_all: returningAll } })
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
-        __op: "count",
+        __op: "update",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "count"
+          op: "update",
+          id: identifier,
+          data,
+          options: { returningAll }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
-  countAdvanced(filter, args, axiosRequestConfig) {
-    const { access } = args ?? {};
+  updateAdvanced(identifier, data, args, options, axiosRequestConfig) {
+    const { populate = this._defaults.updateAdvancedArgs.populate, tasks = this._defaults.updateAdvancedArgs.tasks } = args ?? {};
+    const select = args?.select ?? this._defaults.updateAdvancedArgs.select;
+    const {
+      returningAll = this._defaults.updateAdvancedOptions.returningAll ?? true,
+      includePermissions = this._defaults.updateAdvancedOptions.includePermissions ?? true,
+      populateAccess = this._defaults.updateAdvancedOptions.populateAccess
+    } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-    const result = wrapLazyPromise(
-      () => this._axios.post(`${this._basePath}/count`, { filter, options: { access } }, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
-      }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
+    set3(reqConfig, `headers.${CACHE_HEADER}`, "false");
+    return makeRequest(
+      () => this._axios.patch(
+        `${this._basePath}/${this._mutationPath}/${identifier}`,
+        {
+          data,
+          select,
+          populate,
+          tasks,
+          options: { returningAll, includePermissions, populateAccess }
+        },
+        reqConfig
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.success ? Model.create(result.raw, this) : null;
+        return result;
+      }).catch(this.handleError).then(
+        (res) => this._handleCallbacks(res, throwOnError)
+      ),
       {
-        __op: "countAdvanced",
+        __op: "updateAdvanced",
         __query: {
           target: "model",
           name: this._modelName,
           model: this._modelName,
-          op: "count",
-          filter,
-          options: { access }
+          op: "update",
+          id: identifier,
+          data,
+          args: { select, populate, tasks },
+          options: { returningAll, includePermissions, populateAccess }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
+  // ---------------------------------------------------------------------------
+  // Sub-document operations
+  // ---------------------------------------------------------------------------
   id(id) {
     return {
       subs: (field) => {
         const sub = String(field);
-        return {
-          list: (axiosRequestConfig) => {
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.get(
-                `${this._basePath}/${id}/${sub}`,
-                mergeConfig2(reqConfig, {
-                  params: {}
-                })
-              ).then(this.handleSuccess).then((result2) => {
-                result2.totalCount = Array.isArray(result2.raw) ? result2.raw.length : 0;
-                result2.data = [];
-                return result2;
-              }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
-              {
-                __op: "listSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subList",
-                  id,
-                  sub,
-                  filter: {},
-                  args: {},
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          },
-          listAdvanced: (filter, args, axiosRequestConfig) => {
-            const select = args?.select;
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.post(`${this._basePath}/${id}/${sub}/${this._queryPath}`, { filter, select }, reqConfig).then(this.handleSuccess).then((result2) => {
-                result2.totalCount = result2.raw.length;
-                result2.data = [];
-                return result2;
-              }).catch(this.handleError).then(
-                (res) => this._handleCallbacks(
-                  res,
-                  throwOnError
-                )
-              ),
-              {
-                __op: "listAdvancedSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subList",
-                  id,
-                  sub,
-                  filter,
-                  args: { select },
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          },
-          read: (subId, axiosRequestConfig) => {
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.get(
-                `${this._basePath}/${id}/${sub}/${subId}`,
-                mergeConfig2(reqConfig, {
-                  params: {}
-                })
-              ).then(this.handleSuccess).then((result2) => {
-                result2.data = null;
-                return result2;
-              }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
-              {
-                __op: "readSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subRead",
-                  id,
-                  sub,
-                  subId,
-                  args: {},
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          },
-          readAdvanced: (subId, args, axiosRequestConfig) => {
-            const { select, populate } = args ?? {};
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.post(
-                `${this._basePath}/${id}/${sub}/${subId}/${this._queryPath}`,
-                {
-                  select,
-                  populate
-                },
-                reqConfig
-              ).then(this.handleSuccess).then((result2) => {
-                result2.data = null;
-                return result2;
-              }).catch(this.handleError).then(
-                (res) => this._handleCallbacks(
-                  res,
-                  throwOnError
-                )
-              ),
-              {
-                __op: "readAdvancedSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subRead",
-                  id,
-                  sub,
-                  subId,
-                  args: { select, populate },
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
+        return buildSubDocumentOps(
+          {
+            axios: this._axios,
+            basePath: this._basePath,
+            modelName: this._modelName,
+            queryPath: this._queryPath,
+            handleSuccess: this.handleSuccess,
+            handleError: this.handleError,
+            _handleCallbacks: this._handleCallbacks,
+            parentService: this
           },
-          update: (subId, data, axiosRequestConfig) => {
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.patch(`${this._basePath}/${id}/${sub}/${subId}`, data, mergeConfig2(reqConfig, { params: {} })).then(this.handleSuccess).then((result2) => {
-                result2.data = null;
-                return result2;
-              }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
-              {
-                __op: "updateSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subUpdate",
-                  id,
-                  sub,
-                  subId,
-                  data,
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          },
-          bulkUpdate: (data, _options, axiosRequestConfig) => {
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.patch(`${this._basePath}/${id}/${sub}`, data, mergeConfig2(reqConfig, { params: {} })).then(this.handleSuccess).then((result2) => {
-                result2.data = [];
-                return result2;
-              }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
-              {
-                __op: "bulkUpdateSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subBulkUpdate",
-                  id,
-                  sub,
-                  data,
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          },
-          create: (data, axiosRequestConfig) => {
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.post(`${this._basePath}/${id}/${sub}`, data, mergeConfig2(reqConfig, { params: {} })).then(this.handleSuccess).then((result2) => {
-                result2.data = null;
-                return result2;
-              }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
-              {
-                __op: "createSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subCreate",
-                  id,
-                  sub,
-                  data,
-                  options: {}
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          },
-          delete: (subId, axiosRequestConfig) => {
-            const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
-            const result = wrapLazyPromise(
-              () => this._axios.delete(`${this._basePath}/${id}/${sub}/${subId}`, reqConfig).then(this.handleSuccess).then((result2) => {
-                result2.data = null;
-                return result2;
-              }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
-              {
-                __op: "deleteSub",
-                __query: {
-                  target: "model",
-                  name: this._modelName,
-                  model: this._modelName,
-                  op: "subDelete",
-                  id,
-                  sub,
-                  subId
-                },
-                __requestConfig: reqConfig,
-                __service: this
-              }
-            );
-            return result;
-          }
-        };
+          id,
+          sub
+        );
       },
       fetch: (args, options, axiosRequestConfig) => {
         return this.readAdvanced(id, args, options, axiosRequestConfig);
       }
     };
   }
-  processListResult(_this, result, { includeCount, includeExtraHeaders }) {
-    const wrappedRows = get2(result, "raw.data");
-    const wrappedTotalCount = get2(result, "raw.meta.totalCount");
-    if (Array.isArray(wrappedRows)) {
-      const rows = wrappedRows;
-      result.raw = wrappedRows;
-      if (includeCount) {
-        if (includeExtraHeaders) {
-          const totalCount = get2(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
-          result.totalCount = Number(totalCount);
-        } else {
-          result.totalCount = Number(wrappedTotalCount ?? rows.length);
-        }
-      }
-    } else if (includeCount) {
-      if (includeExtraHeaders) {
-        const totalCount = get2(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
-        result.totalCount = Number(totalCount);
-      } else {
-        result.totalCount = result.raw.count;
-        result.raw = result.raw.rows;
-      }
-    }
-    result.data = result.success ? result.raw.map((item) => Model.create(item, _this)) : [];
-    return result;
-  }
 };
 
 // src/services/data-service.ts
-import { mergeConfig as mergeConfig3 } from "axios";
-import { get as get3 } from "@web-ts-toolkit/utils";
+import { mergeConfig as mergeConfig4 } from "axios";
 var DataService = class extends Service {
   constructor({ axios: axios2, dataName, basePath, queryPath, onSuccess, onFailure, throwOnError }, defaults) {
     super(axios2, basePath);
@@ -1409,6 +1367,9 @@ var DataService = class extends Service {
       "readAdvancedOptions"
     ].forEach((key) => setDefaultObjectProp(this._defaults, key, {}));
   }
+  // ---------------------------------------------------------------------------
+  // Collection operations
+  // ---------------------------------------------------------------------------
   list(args, options, axiosRequestConfig) {
     const {
       skip = this._defaults.listArgs.skip,
@@ -1424,10 +1385,10 @@ var DataService = class extends Service {
     } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const result = wrapLazyPromise(
+    return makeRequest(
       () => this._axios.get(
         this._basePath,
-        mergeConfig3(reqConfig, {
+        mergeConfig4(reqConfig, {
           params: {
             skip,
             limit,
@@ -1438,8 +1399,8 @@ var DataService = class extends Service {
             include_extra_headers: includeExtraHeaders
           }
         })
-      ).then(this.handleSuccess).then((result2) => {
-        return this.processListResult(result2, { includeCount, includeExtraHeaders });
+      ).then(this.handleSuccess).then((result) => {
+        return processListResult(result, { includeCount, includeExtraHeaders });
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
         __op: "list",
@@ -1449,17 +1410,12 @@ var DataService = class extends Service {
           op: "list",
           filter: {},
           args: { skip, limit, page, pageSize },
-          options: {
-            includePermissions,
-            includeCount,
-            includeExtraHeaders
-          }
+          options: { includePermissions, includeCount, includeExtraHeaders }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
   listAdvanced(filter, args, options, axiosRequestConfig) {
     const {
@@ -1479,7 +1435,7 @@ var DataService = class extends Service {
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
     const _filter = replaceSubQuery(filter);
-    const result = wrapLazyPromise(
+    return makeRequest(
       () => this._axios.post(
         `${this._basePath}/${this._queryPath}`,
         {
@@ -1490,15 +1446,14 @@ var DataService = class extends Service {
           limit,
           page,
           pageSize,
-          options: {
-            includePermissions,
-            includeCount,
-            includeExtraHeaders
-          }
+          options: { includePermissions, includeCount, includeExtraHeaders }
         },
         reqConfig
-      ).then(this.handleSuccess).then((result2) => {
-        return this.processListResult(result2, { includeCount, includeExtraHeaders });
+      ).then(this.handleSuccess).then((result) => {
+        return processListResult(result, {
+          includeCount,
+          includeExtraHeaders
+        });
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
       ),
@@ -1510,18 +1465,16 @@ var DataService = class extends Service {
           op: "list",
           filter: _filter,
           args: { select, sort, skip, limit, page, pageSize },
-          options: {
-            includePermissions,
-            includeCount,
-            includeExtraHeaders
-          }
+          options: { includePermissions, includeCount, includeExtraHeaders }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
+  // ---------------------------------------------------------------------------
+  // Document operations
+  // ---------------------------------------------------------------------------
   read(identifier, options, axiosRequestConfig) {
     const {
       includePermissions = this._defaults.readOptions.includePermissions ?? true,
@@ -1529,17 +1482,15 @@ var DataService = class extends Service {
     } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const result = wrapLazyPromise(
+    return makeRequest(
       () => this._axios.get(
         `${this._basePath}/${identifier}`,
-        mergeConfig3(reqConfig, {
-          params: {
-            include_permissions: includePermissions
-          }
+        mergeConfig4(reqConfig, {
+          params: { include_permissions: includePermissions }
         })
-      ).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
+      ).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
       }).catch(this.handleError).then((res) => this._handleCallbacks(res, throwOnError)),
       {
         __op: "read",
@@ -1549,15 +1500,12 @@ var DataService = class extends Service {
           op: "read",
           id: identifier,
           args: {},
-          options: {
-            includePermissions
-          }
+          options: { includePermissions }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
   readAdvanced(identifier, args, options, axiosRequestConfig) {
     const { ignoreCache = this._defaults.readAdvancedArgs.ignoreCache ?? false } = args ?? {};
@@ -1565,10 +1513,10 @@ var DataService = class extends Service {
     const { includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
-    const result = wrapLazyPromise(
-      () => this._axios.post(`${this._basePath}/${this._queryPath}/${identifier}`, { select }, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
+    return makeRequest(
+      () => this._axios.post(`${this._basePath}/${this._queryPath}/${identifier}`, { select }, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
       ),
@@ -1580,29 +1528,24 @@ var DataService = class extends Service {
           op: "read",
           id: identifier,
           args: { select },
-          options: {
-            includePermissions
-          }
+          options: { includePermissions }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
   }
   readAdvancedFilter(filter, args, options, axiosRequestConfig) {
     const select = args?.select ?? this._defaults.readAdvancedArgs.select;
-    const {
-      includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true,
-      ignoreCache = this._defaults.readAdvancedOptions.ignoreCache ?? false
-    } = options ?? {};
+    const { ignoreCache = this._defaults.readAdvancedArgs.ignoreCache ?? false } = args ?? {};
+    const { includePermissions = this._defaults.readAdvancedOptions.includePermissions ?? true } = options ?? {};
     const { throwOnError, ...reqConfig } = axiosRequestConfig ?? {};
     reqConfig.headers = this.updateHeaders(reqConfig.headers, { ignoreCache });
     const _filter = replaceSubQuery(filter);
-    const result = wrapLazyPromise(
-      () => this._axios.post(`${this._basePath}/${this._queryPath}/__filter`, { filter: _filter, select }, reqConfig).then(this.handleSuccess).then((result2) => {
-        result2.data = result2.raw;
-        return result2;
+    return makeRequest(
+      () => this._axios.post(`${this._basePath}/${this._queryPath}/__filter`, { filter: _filter, select }, reqConfig).then(this.handleSuccess).then((result) => {
+        result.data = result.raw;
+        return result;
       }).catch(this.handleError).then(
         (res) => this._handleCallbacks(res, throwOnError)
       ),
@@ -1614,52 +1557,56 @@ var DataService = class extends Service {
           op: "read",
           filter: _filter,
           args: { select },
-          options: {
-            includePermissions
-          }
+          options: { includePermissions }
         },
         __requestConfig: reqConfig,
         __service: this
       }
     );
-    return result;
-  }
-  processListResult(result, { includeCount, includeExtraHeaders }) {
-    const wrappedRows = get3(result, "raw.data");
-    const wrappedTotalCount = get3(result, "raw.meta.totalCount");
-    if (Array.isArray(wrappedRows)) {
-      const rows = wrappedRows;
-      result.raw = wrappedRows;
-      if (includeCount) {
-        if (includeExtraHeaders) {
-          const totalCount = get3(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
-          result.totalCount = Number(totalCount);
-        } else {
-          result.totalCount = Number(wrappedTotalCount ?? rows.length);
-        }
-      }
-    } else if (includeCount) {
-      if (includeExtraHeaders) {
-        const totalCount = get3(result, `headers.${"wtt-total-count" /* TotalCount */}`, 0);
-        result.totalCount = Number(totalCount);
-      } else {
-        result.totalCount = result.raw.count;
-        result.raw = result.raw.rows;
-      }
-    }
-    result.data = result.raw;
-    return result;
   }
 };
 
 // src/services/interceptors.ts
+import { AxiosHeaders as AxiosHeaders3 } from "axios";
+
+// src/services/cache-utils.ts
 import { AxiosHeaders as AxiosHeaders2 } from "axios";
+var normalizeConfigValue = (value) => {
+  if (value == null) return value;
+  if (value instanceof AxiosHeaders2) {
+    return normalizeConfigValue(value.toJSON());
+  }
+  if (Array.isArray(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]) => {
+      acc[key] = normalizeConfigValue(item);
+      return acc;
+    }, {});
+  }
+  return value;
+};
+
+// src/services/interceptors.ts
 var SimpleCache = class {
   constructor() {
     this.cache = /* @__PURE__ */ new Map();
+    this.timers = /* @__PURE__ */ new Map();
   }
-  set(key, value) {
+  set(key, value, ttl) {
     this.cache.set(key, value);
+    if (ttl && ttl > 0) {
+      const existing = this.timers.get(key);
+      if (existing) clearTimeout(existing);
+      this.timers.set(
+        key,
+        setTimeout(() => {
+          this.cache.delete(key);
+          this.timers.delete(key);
+        }, ttl)
+      );
+    }
   }
   get(key) {
     return this.cache.get(key);
@@ -1668,22 +1615,14 @@ var SimpleCache = class {
     return this.cache.has(key);
   }
   delete(key) {
+    const timer = this.timers.get(key);
+    if (timer) {
+      clearTimeout(timer);
+      this.timers.delete(key);
+    }
     return this.cache.delete(key);
   }
 };
-var normalizeCacheValue = (value) => {
-  if (value == null) return value;
-  if (Array.isArray(value)) {
-    return value.map((item) => normalizeCacheValue(item));
-  }
-  if (typeof value === "object") {
-    return Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).reduce((acc, [key, item]) => {
-      acc[key] = normalizeCacheValue(item);
-      return acc;
-    }, {});
-  }
-  return value;
-};
 var IGNORED_CACHE_HEADERS = /* @__PURE__ */ new Set([
   "accept",
   "accept-encoding",
@@ -1697,7 +1636,7 @@ var IGNORED_CACHE_HEADERS = /* @__PURE__ */ new Set([
   "user-agent"
 ]);
 var serializeHeaders = (headers) => {
-  const resolvedHeaders = headers instanceof AxiosHeaders2 ? headers.toJSON() : headers;
+  const resolvedHeaders = headers instanceof AxiosHeaders3 ? headers.toJSON() : headers;
   const normalizedHeaders = Object.entries(resolvedHeaders ?? {}).filter(([key, value]) => {
     const normalizedKey = key.toLowerCase();
     return normalizedKey !== CACHE_HEADER.toLowerCase() && !IGNORED_CACHE_HEADERS.has(normalizedKey) && value !== void 0;
@@ -1705,7 +1644,7 @@ var serializeHeaders = (headers) => {
     acc[key.toLowerCase()] = value;
     return acc;
   }, {});
-  return JSON.stringify(normalizeCacheValue(normalizedHeaders));
+  return JSON.stringify(normalizeConfigValue(normalizedHeaders));
 };
 function generateCacheKey(config) {
   const key = `${config.baseURL}/${config.url}_${config.method}_${generateParamKey(config.params)}_${generateDataKey(
@@ -1715,11 +1654,11 @@ function generateCacheKey(config) {
 }
 function generateParamKey(params) {
   if (!params) return "";
-  return JSON.stringify(normalizeCacheValue(params));
+  return JSON.stringify(normalizeConfigValue(params));
 }
 function generateDataKey(data) {
   if (!data) return "";
-  return typeof data === "string" ? data : JSON.stringify(normalizeCacheValue(data));
+  return typeof data === "string" ? data : JSON.stringify(normalizeConfigValue(data));
 }
 function useCacheInterceptors(instance, cacheTTL) {
   const store = new SimpleCache();
@@ -1746,8 +1685,7 @@ function useCacheInterceptors(instance, cacheTTL) {
     (response) => {
       if (response.config.headers[CACHE_HEADER] === "false") return response;
       const key = generateCacheKey(response.config);
-      store.set(key, response);
-      setTimeout(() => store.delete(key), cacheTTL);
+      store.set(key, response, cacheTTL);
       return response;
     },
     (error) => Promise.reject(error)
@@ -1766,25 +1704,9 @@ var defaultAxiosConfig = Object.freeze({
   }
 });
 var isModelQuery = (query) => query.target === "model";
-var normalizeConfigValue = (value) => {
-  if (value == null) return value;
-  if (value instanceof AxiosHeaders3) {
-    return normalizeConfigValue(value.toJSON());
-  }
-  if (Array.isArray(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]) => {
-      acc[key] = normalizeConfigValue(item);
-      return acc;
-    }, {});
-  }
-  return value;
-};
 var serializeRequestConfig = (config) => JSON.stringify(normalizeConfigValue(config ?? {}));
 function createAdapter(axiosConfig, adapterOptions) {
-  const merged = mergeConfig4(defaultAxiosConfig, axiosConfig ?? {});
+  const merged = mergeConfig5(defaultAxiosConfig, axiosConfig ?? {});
   const instance = axios.create(merged);
   const {
     rootRouterPath = "root",
@@ -1794,6 +1716,7 @@ function createAdapter(axiosConfig, adapterOptions) {
     cacheTTL = 0
   } = adapterOptions ?? {};
   if (cacheTTL > 0) useCacheInterceptors(instance, cacheTTL);
+  const wraps = createWrapHelper(instance);
   return Object.freeze({
     axios: instance,
     createModelService: ({
@@ -1833,65 +1756,15 @@ function createAdapter(axiosConfig, adapterOptions) {
         defaults
       );
     },
-    wrapGet: (url, defaultAxiosRequestConfig = {}) => {
-      set4(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "true");
-      return (options, axiosRequestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          url,
-          options,
-          mergeConfig4(defaultAxiosRequestConfig, axiosRequestConfig)
-        );
-        return instance.get(finalUrl, finalConfig);
-      };
-    },
-    wrapPost: (url, defaultAxiosRequestConfig = {}) => {
-      set4(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-      return (data, options, axiosRequestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          url,
-          options,
-          mergeConfig4(defaultAxiosRequestConfig, axiosRequestConfig)
-        );
-        return instance.post(finalUrl, data, finalConfig);
-      };
-    },
-    wrapPut: (url, defaultAxiosRequestConfig = {}) => {
-      set4(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-      return (data, options, axiosRequestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          url,
-          options,
-          mergeConfig4(defaultAxiosRequestConfig, axiosRequestConfig)
-        );
-        return instance.put(finalUrl, data, finalConfig);
-      };
-    },
-    wrapPatch: (url, defaultAxiosRequestConfig = {}) => {
-      set4(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-      return (data, options, axiosRequestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          url,
-          options,
-          mergeConfig4(defaultAxiosRequestConfig, axiosRequestConfig)
-        );
-        return instance.patch(finalUrl, data, finalConfig);
-      };
-    },
-    wrapDelete: (url, defaultAxiosRequestConfig = {}) => {
-      set4(defaultAxiosRequestConfig, `headers.${CACHE_HEADER}`, "false");
-      return (options, axiosRequestConfig) => {
-        const { finalUrl, finalConfig } = getWrapContext(
-          url,
-          options,
-          mergeConfig4(defaultAxiosRequestConfig, axiosRequestConfig)
-        );
-        return instance.delete(finalUrl, finalConfig);
-      };
-    },
+    wrapGet: wraps.wrapGet,
+    wrapPost: wraps.wrapPost,
+    wrapPut: wraps.wrapPut,
+    wrapPatch: wraps.wrapPatch,
+    wrapDelete: wraps.wrapDelete,
     group: async (...proms) => {
       let sharedConfig;
       let sharedConfigKey;
-      const defs = proms.map((prom) => {
+      const defs = proms.map((prom, index) => {
         if (!isEmpty(prom.__requestConfig)) {
           const configKey = serializeRequestConfig(prom.__requestConfig);
           if (sharedConfigKey && sharedConfigKey !== configKey) {
@@ -1900,9 +1773,14 @@ function createAdapter(axiosConfig, adapterOptions) {
           sharedConfig = prom.__requestConfig;
           sharedConfigKey = configKey;
         }
-        return prom.__query;
+        const query = { ...prom.__query };
+        if (prom.__query.order == null) {
+          query.order = index;
+        }
+        return query;
       });
       const result = await instance.post(rootRouterPath, defs, sharedConfig ?? {}).then((res) => {
+        const responseHeaders = res.headers ?? {};
         return res.data.map(({ result: result2, message, statusCode, op }, index) => {
           const service = proms[index].__service;
           const query = proms[index].__query;
@@ -1931,7 +1809,7 @@ function createAdapter(axiosConfig, adapterOptions) {
             message,
             status: statusCode,
             totalCount: result2.success && result2.kind === "list" ? result2.totalCount ?? result2.count ?? 0 : 0,
-            headers: {}
+            headers: responseHeaders
           };
         });
       });
@@ -1941,24 +1819,25 @@ function createAdapter(axiosConfig, adapterOptions) {
 }
 
 // src/utils.ts
-function replaceItemById(items, newItem, options) {
+function replaceItemById(items, targetItem, options) {
   const { merge = true } = options ?? {};
   return items.map((item) => {
-    if (item._id === newItem._id) {
-      return merge ? { ...item, ...newItem } : newItem;
+    if (item._id === targetItem._id) {
+      return merge ? { ...item, ...targetItem } : targetItem;
     }
     return item;
   });
 }
-function removeItemById(items, newItem) {
+function removeItemById(items, targetItem) {
   return items.filter((item) => {
-    return item._id !== newItem._id;
+    return item._id !== targetItem._id;
   });
 }
 
 // src/index.ts
 var index_default = { createAdapter };
 export {
+  CustomHeaders,
   DataService,
   Model,
   ModelService,