@archbase/data 4.0.19 → 4.0.20

package/dist/index.js

@@ -2,17 +2,17 @@ import { isDate as ve, parseISO as Ie } from "date-fns";
 import { EventEmitter as Be } from "events";
 import { uniqueId as $e, cloneDeep as Ne } from "lodash";
 import { archbaseI18next as R, ArchbaseDataSourceError as g, ArchbaseObjectHelper as Re, processErrorMessage as G, QUICK as we, NORMAL as Ee, ADVANCED as Se, ArchbaseFilterDSL as Fe, QueryFilterEntity as he, detectDataSourceVersion as pe, MigrationMetrics as He, ARCHBASE_IOC_API_TYPE as We, ArchbaseJacksonParser as ie } from "@archbase/core";
-import { ADVANCED as jt, ARCHBASE_IOC_API_TYPE as kt, FILTER_TYPE as Ut, NORMAL as _t, QUICK as Gt, useArchbaseBool as qt } from "@archbase/core";
-import { useState as T, useCallback as l, useRef as ce, useMemo as z, useEffect as q, useReducer as ze } from "react";
+import { ADVANCED as jt, ARCHBASE_IOC_API_TYPE as _t, FILTER_TYPE as kt, NORMAL as Ut, QUICK as Gt, useArchbaseBool as qt } from "@archbase/core";
+import { useState as V, useCallback as u, useRef as ce, useMemo as M, useEffect as q, useReducer as Me } from "react";
 import { produce as Q } from "immer";
 import "reflect-metadata";
 import X from "axios";
 import * as ne from "inversify";
-import { useContainer as Me } from "inversify-react";
+import { useContainer as ze } from "inversify-react";
 import { create as je } from "zustand";
-import { createTrackedSelector as ke } from "react-tracked";
-var a = /* @__PURE__ */ ((n) => (n[n.dataChanged = 0] = "dataChanged", n[n.recordChanged = 1] = "recordChanged", n[n.refreshData = 2] = "refreshData", n[n.fieldChanged = 3] = "fieldChanged", n[n.beforeClose = 4] = "beforeClose", n[n.afterClose = 5] = "afterClose", n[n.beforeOpen = 6] = "beforeOpen", n[n.afterOpen = 7] = "afterOpen", n[n.beforeAppend = 8] = "beforeAppend", n[n.afterAppend = 9] = "afterAppend", n[n.beforeRemove = 10] = "beforeRemove", n[n.afterRemove = 11] = "afterRemove", n[n.beforeInsert = 12] = "beforeInsert", n[n.afterInsert = 13] = "afterInsert", n[n.beforeEdit = 14] = "beforeEdit", n[n.afterEdit = 15] = "afterEdit", n[n.beforeSave = 16] = "beforeSave", n[n.afterSave = 17] = "afterSave", n[n.beforeCancel = 18] = "beforeCancel", n[n.afterCancel = 19] = "afterCancel", n[n.afterScroll = 20] = "afterScroll", n[n.onError = 21] = "onError", n[n.onFieldError = 22] = "onFieldError", n))(a || {});
-class Ue {
+import { createTrackedSelector as _e } from "react-tracked";
+var d = /* @__PURE__ */ ((o) => (o[o.dataChanged = 0] = "dataChanged", o[o.recordChanged = 1] = "recordChanged", o[o.refreshData = 2] = "refreshData", o[o.fieldChanged = 3] = "fieldChanged", o[o.beforeClose = 4] = "beforeClose", o[o.afterClose = 5] = "afterClose", o[o.beforeOpen = 6] = "beforeOpen", o[o.afterOpen = 7] = "afterOpen", o[o.beforeAppend = 8] = "beforeAppend", o[o.afterAppend = 9] = "afterAppend", o[o.beforeRemove = 10] = "beforeRemove", o[o.afterRemove = 11] = "afterRemove", o[o.beforeInsert = 12] = "beforeInsert", o[o.afterInsert = 13] = "afterInsert", o[o.beforeEdit = 14] = "beforeEdit", o[o.afterEdit = 15] = "afterEdit", o[o.beforeSave = 16] = "beforeSave", o[o.afterSave = 17] = "afterSave", o[o.beforeCancel = 18] = "beforeCancel", o[o.afterCancel = 19] = "afterCancel", o[o.afterScroll = 20] = "afterScroll", o[o.onError = 21] = "onError", o[o.onFieldError = 22] = "onFieldError", o))(d || {});
+class ke {
   eventEmitter;
   listenersDisable = !1;
   constructor() {
@@ -79,7 +79,7 @@ class ye {
   validator;
   getIdentity;
   constructor(e, t, r) {
-    this.name = e, this.label = r || e, this.records = [], this.filteredRecords = [], this.loadOptions(t), this.fieldEventListeners = {}, this.emitter = new Ue(), this.uuid = $e(), this.validator = t.validator, this.getIdentity = t.getIdentity;
+    this.name = e, this.label = r || e, this.records = [], this.filteredRecords = [], this.loadOptions(t), this.fieldEventListeners = {}, this.emitter = new ke(), this.uuid = $e(), this.validator = t.validator, this.getIdentity = t.getIdentity;
   }
   loadOptions(e) {
     this.records = e.records, this.filters = [], e.filters && (this.filters = e.filters), this.currentRecord = void 0, this.currentRecordIndex = -1, this.filteredRecords = this.applyFilters(), this.filteredRecords.length > 0 && (this.currentRecordIndex = 0, this.currentRecord = this.filteredRecords[this.currentRecordIndex]), this.grandTotalRecords = e.grandTotalRecords, this.currentPageIndex = e.currentPage, this.totalPages = e.totalPages, this.pageSize = e.pageSize, this.active = !0, this.filter = e.filter, this.sort = e.sort, this.originFilter = e.originFilter, this.originSort = e.originSort, this.originGlobalFilter = e.originGlobalFilter, this.defaultSortFields = e.defaultSortFields ? e.defaultSortFields : [];
@@ -277,8 +277,8 @@ class ye {
     });
     let t = -1;
     const r = this.currentRecord, i = this.currentRecordIndex;
-    return this.records.forEach((s, o) => {
-      this.currentRecord === s && (t = o);
+    return this.records.forEach((s, n) => {
+      this.currentRecord === s && (t = n);
     }), t >= 0 && this.records.splice(t, 1), this.records !== this.filteredRecords && this.filteredRecords.splice(this.getCurrentIndex(), 1), this.grandTotalRecords--, this.filteredRecords.length === 0 ? (this.currentRecord = void 0, this.currentRecordIndex = -1) : (this.currentRecordIndex > this.filteredRecords.length - 1 && this.currentRecordIndex--, this.currentRecord = this.filteredRecords[this.currentRecordIndex]), this.editing = !1, this.inserting = !1, this.emitter.emit("afterScroll"), this.emit({
       type: 20
       /* afterScroll */
@@ -361,8 +361,8 @@ class ye {
     this.editing && (this.filteredRecords[this.getCurrentIndex()] = this.currentRecord);
     let t = -1;
     return this.records.forEach((r, i) => {
-      const s = this.getIdentity ? this.getIdentity(r) : r.id, o = this.getIdentity ? this.getIdentity(this.currentRecord) : this.currentRecord.id;
-      (r === this.currentRecord || s !== void 0 && s === o) && (t = i);
+      const s = this.getIdentity ? this.getIdentity(r) : r.id, n = this.getIdentity ? this.getIdentity(this.currentRecord) : this.currentRecord.id;
+      (r === this.currentRecord || s !== void 0 && s === n) && (t = i);
     }), t >= 0 ? this.records[t] = this.currentRecord : this.records.push(this.currentRecord), this.editing = !1, this.inserting = !1, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.emitter.emit("afterSave", this.currentRecord, this.getCurrentIndex()), this.emit({
       type: 17,
       record: this.currentRecord,
@@ -422,8 +422,8 @@ class ye {
     if (this.validateDataSourceActive("setFieldValue"), this.isEmpty() || !this.currentRecord)
       return this;
     if (!(this.inserting || this.editing || this.isBOF() || this.isEOF())) {
-      const o = R.t("archbase:recordNotBeingEdited", { dataSourceName: this.name });
-      throw this.publishEventError(o, {}), new g(o);
+      const n = R.t("archbase:recordNotBeingEdited", { dataSourceName: this.name });
+      throw this.publishEventError(n, {}), new g(n);
     }
     let r = t;
     const i = Re.getNestedProperty(this.currentRecord, e);
@@ -602,29 +602,29 @@ class ye {
   addFieldChangeListener(e, t) {
     const r = e.split(".");
     let i = "";
-    return r.forEach((s, o) => {
-      i = o === 0 ? s : `${i}.${s}`, this.fieldEventListeners[`field:${i}`] || (this.fieldEventListeners[`field:${i}`] = []), this.fieldEventListeners[`field:${i}`].includes(t) || this.fieldEventListeners[`field:${i}`].push(t);
+    return r.forEach((s, n) => {
+      i = n === 0 ? s : `${i}.${s}`, this.fieldEventListeners[`field:${i}`] || (this.fieldEventListeners[`field:${i}`] = []), this.fieldEventListeners[`field:${i}`].includes(t) || this.fieldEventListeners[`field:${i}`].push(t);
     }), this;
   }
   removeFieldChangeListener(e, t) {
     const r = e.split(".");
     let i = "";
-    return r.forEach((s, o) => {
-      i = o === 0 ? s : `${i}.${s}`;
-      const c = this.fieldEventListeners[`field:${i}`];
-      if (c) {
-        const u = c.indexOf(t);
-        u !== -1 && c.splice(u, 1);
+    return r.forEach((s, n) => {
+      i = n === 0 ? s : `${i}.${s}`;
+      const a = this.fieldEventListeners[`field:${i}`];
+      if (a) {
+        const l = a.indexOf(t);
+        l !== -1 && a.splice(l, 1);
       }
     }), this;
   }
   emitFieldChangeEvent(e, t, r) {
     const i = e.split(".");
     let s = "";
-    for (const o of i) {
-      s = s ? `${s}.${o}` : o;
-      const c = this.fieldEventListeners[`field:${s}`];
-      c && c.forEach((u) => u(s, t, r));
+    for (const n of i) {
+      s = s ? `${s}.${n}` : n;
+      const a = this.fieldEventListeners[`field:${s}`];
+      a && a.forEach((l) => l(s, t, r));
     }
   }
   /**
@@ -656,7 +656,7 @@ class Ae extends ye {
       throw this.publishEventError(t, {}), new g(t);
     }
     if (this.emitter.emit("beforeSave", this.currentRecord), this.emit({
-      type: a.beforeSave,
+      type: d.beforeSave,
       record: this.currentRecord,
       index: this.getCurrentIndex()
     }), this.validator) {
@@ -671,31 +671,35 @@ class Ae extends ye {
     try {
       let t = -1;
       this.records.forEach((r, i) => {
-        const s = this.getIdentity ? this.getIdentity(r) : r.id, o = this.getIdentity ? this.getIdentity(this.currentRecord) : this.currentRecord.id;
-        (r === this.currentRecord || s !== void 0 && s === o) && (t = i);
+        const s = this.getIdentity ? this.getIdentity(r) : r.id, n = this.getIdentity ? this.getIdentity(this.currentRecord) : this.currentRecord.id;
+        (r === this.currentRecord || s !== void 0 && s === n) && (t = i);
       }), this.currentRecord = await this.service.save(this.currentRecord), this.editing && (this.filteredRecords = [...this.filteredRecords], this.filteredRecords[this.getCurrentIndex()] = this.currentRecord), this.records = [...this.records], t >= 0 ? this.records[t] = this.currentRecord : this.records.push(this.currentRecord), this.editing = !1, this.inserting = !1, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.emitter.emit("afterSave", this.currentRecord), this.emit({
-        type: a.afterSave,
+        type: d.afterSave,
         record: this.currentRecord,
         index: this.getCurrentIndex()
       }), e && e();
     } catch (t) {
-      t.response && t.response.data && t.response.data.apierror && t.response.data.apierror.subErrors && t.response.data.apierror.subErrors.forEach((i) => {
-        if (i.field) {
-          const s = R.t(i.message, { defaultValue: i.message });
-          this.emitter.emit("onFieldError", i.field, s), this.emit({
-            type: a.onFieldError,
-            fieldName: i.field,
-            error: s,
-            originalError: i.message
+      let r = !1;
+      const i = t?.response?.data?.apierror ?? t?.response?.data, s = i?.subErrors ?? i?.fieldErrors;
+      s && s.forEach((a) => {
+        const l = a.field ?? a.property;
+        if (l) {
+          r = !0;
+          const p = R.t(a.message, { defaultValue: a.message });
+          this.emitter.emit("onFieldError", l, p), this.emit({
+            type: d.onFieldError,
+            fieldName: l,
+            error: p,
+            originalError: a.message
           });
         }
       });
-      const r = G(t);
-      throw this.emitter.emit("onError", r, t), this.emit({
-        type: a.onError,
-        error: r,
+      const n = G(t);
+      throw r || (this.emitter.emit("onError", n, t), this.emit({
+        type: d.onError,
+        error: n,
         originalError: t
-      }), e && e(r), new g(r);
+      })), e && e(n), new g(n);
     }
     return this.currentRecord;
   }
@@ -719,7 +723,7 @@ class Ae extends ye {
       throw this.publishEventError(t, {}), new g(t);
     }
     this.emitter.emit("beforeRemove", this.currentRecord, this.currentRecordIndex), this.emit({
-      type: a.beforeRemove,
+      type: d.beforeRemove,
       record: this.currentRecord,
       index: this.getCurrentIndex()
     });
@@ -727,17 +731,17 @@ class Ae extends ye {
       await this.service.delete(this.service.getId(this.currentRecord));
       let t = -1;
       const r = this.currentRecord, i = this.currentRecordIndex;
-      return this.records = [...this.records], this.filteredRecords = [...this.filteredRecords], this.records.forEach((s, o) => {
-        this.currentRecord === s && (t = o);
-      }), t >= 0 && this.records.splice(t, 1), this.records !== this.filteredRecords && this.filteredRecords.splice(this.getCurrentIndex(), 1), this.grandTotalRecords--, this.filteredRecords.length === 0 ? (this.currentRecord = void 0, this.currentRecordIndex = -1) : (this.currentRecordIndex > this.filteredRecords.length - 1 && this.currentRecordIndex--, this.currentRecord = this.filteredRecords[this.currentRecordIndex]), this.editing = !1, this.inserting = !1, this.emitter.emit("afterScroll"), this.emit({ type: a.afterScroll }), this.emitter.emit("afterRemove", r, i), this.emit({
-        type: a.afterRemove,
+      return this.records = [...this.records], this.filteredRecords = [...this.filteredRecords], this.records.forEach((s, n) => {
+        this.currentRecord === s && (t = n);
+      }), t >= 0 && this.records.splice(t, 1), this.records !== this.filteredRecords && this.filteredRecords.splice(this.getCurrentIndex(), 1), this.grandTotalRecords--, this.filteredRecords.length === 0 ? (this.currentRecord = void 0, this.currentRecordIndex = -1) : (this.currentRecordIndex > this.filteredRecords.length - 1 && this.currentRecordIndex--, this.currentRecord = this.filteredRecords[this.currentRecordIndex]), this.editing = !1, this.inserting = !1, this.emitter.emit("afterScroll"), this.emit({ type: d.afterScroll }), this.emitter.emit("afterRemove", r, i), this.emit({
+        type: d.afterRemove,
         record: r,
         index: i
       }), this.lastDataBrowsingOn = (/* @__PURE__ */ new Date()).getTime(), this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), e && e(), r;
     } catch (t) {
       const r = G(t);
       throw this.emitter.emit("onError", r, t), this.emit({
-        type: a.onError,
+        type: d.onError,
         error: r,
         originalError: t
       }), e && e(r), new g(r);
@@ -770,7 +774,7 @@ class Ae extends ye {
     return e && e.sort ? e.sort.quickFilterSort : this.defaultSortFields;
   }
 }
-class _e {
+class Ue {
   id;
   companyId;
   filter;
@@ -808,7 +812,7 @@ class Ge extends ye {
   }
   async addNewFilter(e, t) {
     this.insert(
-      new _e({
+      new Ue({
         id: e.id,
         name: e.name,
         description: e.description,
@@ -946,57 +950,57 @@ class Je extends Ae {
     ) : [];
   }
 }
-function yt(n, e, t, r) {
-  const i = e && ("appendToFieldArray" in e || "updateFieldArrayItem" in e), [s, o] = T(r), [, c] = T(0), u = l(() => {
-    c((f) => f + 1);
-  }, []), [p, C] = T(r), [W, M] = T(0), P = l(() => {
+function yt(o, e, t, r) {
+  const i = e && ("appendToFieldArray" in e || "updateFieldArrayItem" in e), [s, n] = V(r), [, a] = V(0), l = u(() => {
+    a((f) => f + 1);
+  }, []), [p, C] = V(r), [W, z] = V(0), L = u(() => {
     let f = r;
-    e && t && (f = e.getFieldValue(t), f == null && (f = r)), i ? (C(f), M((b) => b + 1)) : o(f);
-  }, [e, t, r, i]), L = l((f) => {
-    e && t && ((f.type === a.dataChanged || f.type === a.recordChanged || f.type === a.afterScroll || f.type === a.afterCancel || f.type === a.afterEdit) && (P(), i || u()), f.type === a.onFieldError && f.fieldName === t && console.warn(`[${n}] Field error:`, f.error));
-  }, [e, t, P, u, i, n]), N = l((f, b) => {
-    i ? (C(f), e && !e.isBrowsing() && t && e.getFieldValue(t) !== f && e.setFieldValue(t, f)) : (o(f), e && !e.isBrowsing() && t && e.getFieldValue(t) !== f && e.setFieldValue(t, f));
-  }, [e, t, i]), d = l(() => {
+    e && t && (f = e.getFieldValue(t), f == null && (f = r)), i ? (C(f), z((b) => b + 1)) : n(f);
+  }, [e, t, r, i]), P = u((f) => {
+    e && t && ((f.type === d.dataChanged || f.type === d.recordChanged || f.type === d.afterScroll || f.type === d.afterCancel || f.type === d.afterEdit) && (L(), i || l()), f.type === d.onFieldError && f.fieldName === t && console.warn(`[${o}] Field error:`, f.error));
+  }, [e, t, L, l, i, o]), N = u((f, b) => {
+    i ? (C(f), e && !e.isBrowsing() && t && e.getFieldValue(t) !== f && e.setFieldValue(t, f)) : (n(f), e && !e.isBrowsing() && t && e.getFieldValue(t) !== f && e.setFieldValue(t, f));
+  }, [e, t, i]), c = u(() => {
     const f = pe(e);
-    He.trackV2Usage(n, f);
-  }, [n, e]);
+    He.trackV2Usage(o, f);
+  }, [o, e]);
   return ce(() => {
-    process.env.NODE_ENV === "production" && d();
+    process.env.NODE_ENV === "production" && c();
   }).current, {
     // Detecção de versão
     isDataSourceV2: i,
     dataSourceVersion: pe(e),
     // Estados
     currentValue: i ? p : s,
-    v1State: { currentValue: s, setCurrentValue: o, forceUpdate: u },
+    v1State: { currentValue: s, setCurrentValue: n, forceUpdate: l },
     v2State: { v2Value: p, setV2Value: C, v2ShouldUpdate: W },
     // Funções
-    loadDataSourceFieldValue: P,
-    dataSourceEvent: L,
+    loadDataSourceFieldValue: L,
+    dataSourceEvent: P,
     handleValueChange: N,
     // Utilitários
     isReadOnly: e ? e.isBrowsing() : !1,
     isEditing: e ? e.isEditing() : !1,
-    trackUsage: d
+    trackUsage: c
   };
 }
 const vt = {
   /**
    * Valida se o componente está seguindo o padrão corretamente
    */
-  validatePattern: (n, e) => {
+  validatePattern: (o, e) => {
     const t = [];
-    return e.dataSourceVersion === "NONE" && e.isDataSourceV2 && t.push("DataSource version detection inconsistent"), e.isDataSourceV2 && e.v1State.currentValue === e.currentValue && t.push("V2 should use v2Value, not v1 currentValue"), !e.isDataSourceV2 && e.v2State.v2Value === e.currentValue && t.push("V1 should use currentValue, not v2Value"), t.length > 0 ? (console.error(`[${n}] Migration pattern validation failed:`, t), !1) : !0;
+    return e.dataSourceVersion === "NONE" && e.isDataSourceV2 && t.push("DataSource version detection inconsistent"), e.isDataSourceV2 && e.v1State.currentValue === e.currentValue && t.push("V2 should use v2Value, not v1 currentValue"), !e.isDataSourceV2 && e.v2State.v2Value === e.currentValue && t.push("V1 should use currentValue, not v2Value"), t.length > 0 ? (console.error(`[${o}] Migration pattern validation failed:`, t), !1) : !0;
   },
   /**
    * Testa se o comportamento V1 está preservado
    */
-  testV1Compatibility: (n, e) => !e || pe(e) !== "V1" || [
+  testV1Compatibility: (o, e) => !e || pe(e) !== "V1" || [
     "isBrowsing",
     "isEditing",
     "getFieldValue",
     "setFieldValue"
-  ].every((r) => typeof e[r] == "function") ? !0 : (console.error(`[${n}] V1 DataSource missing required methods`), !1)
+  ].every((r) => typeof e[r] == "function") ? !0 : (console.error(`[${o}] V1 DataSource missing required methods`), !1)
 }, It = `
 // Em qualquer componente que use DataSource:
 
@@ -1050,7 +1054,7 @@ export function MyComponent<T, ID>({ dataSource, dataField, value, onChangeValue
   );
 }
 `;
-class U {
+class k {
   name;
   label;
   records = [];
@@ -1098,24 +1102,24 @@ class U {
   // =================== Navigation ===================
   first() {
     return this.records.length > 0 && (this.currentIndex = 0, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     })), this;
   }
   last() {
     return this.records.length > 0 && (this.currentIndex = this.records.length - 1, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     })), this;
   }
   next() {
     return this.currentIndex < this.records.length - 1 && (this.currentIndex++, this.emit({
-      type: a.recordChanged,
+      type: d.recordChanged,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     })), this;
   }
   prior() {
     return this.currentIndex > 0 && (this.currentIndex--, this.emit({
-      type: a.recordChanged,
+      type: d.recordChanged,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     })), this;
@@ -1123,7 +1127,7 @@ class U {
   goToRecord(e) {
     if (e >= 0 && e < this.records.length)
       return this.currentIndex = e, this.emit({
-        type: a.recordChanged,
+        type: d.recordChanged,
         record: this.getCurrentRecord(),
         index: this.currentIndex
       }), this.getCurrentRecord();
@@ -1154,27 +1158,27 @@ class U {
     if (this.validateDataSourceActive("edit"), this.isEmpty() || !this.getCurrentRecord())
       throw new Error(`No records to edit in DataSource ${this.name}`);
     return this.state = "edit", this.originalRecord = JSON.parse(JSON.stringify(this.getCurrentRecord())), this.emit({
-      type: a.beforeEdit,
+      type: d.beforeEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this.emit({
-      type: a.afterEdit,
+      type: d.afterEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this;
   }
   cancel() {
     return this.validateDataSourceActive("cancel"), this.state === "edit" && this.originalRecord ? (this.records = [...this.records], this.records[this.currentIndex] = { ...this.originalRecord }) : this.state === "insert" && (this.records = this.records.slice(0, -1), this.records.length > 0 ? this.currentIndex = Math.min(this.currentIndex, this.records.length - 1) : this.currentIndex = -1), this.state = "browse", this.originalRecord = null, this.emit({
-      type: a.afterCancel,
+      type: d.afterCancel,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this;
   }
   insert(e) {
     return this.validateDataSourceActive("insert"), this.state = "insert", this.emit({
-      type: a.beforeInsert
+      type: d.beforeInsert
     }), this.records = [...this.records, e], this.currentIndex = this.records.length - 1, this.notifyStateChange(), this.emit({
-      type: a.afterInsert,
+      type: d.afterInsert,
       record: e,
       index: this.currentIndex
     }), this;
@@ -1186,7 +1190,7 @@ class U {
       throw new Error(`No record to save in DataSource ${this.name}`);
     const t = this.getCurrentRecord();
     if (this.emit({
-      type: a.beforeSave,
+      type: d.beforeSave,
       record: t,
       index: this.getCurrentIndex()
     }), this.validator) {
@@ -1195,7 +1199,7 @@ class U {
         throw new Error(r[0].errorMessage);
     }
     return this.state = "browse", this.originalRecord = null, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({
-      type: a.afterSave,
+      type: d.afterSave,
       record: t,
       index: this.getCurrentIndex()
     }), e && e(), t;
@@ -1207,11 +1211,11 @@ class U {
       throw new Error(`No records to remove in DataSource ${this.name}`);
     const t = this.getCurrentRecord(), r = this.currentIndex;
     return this.emit({
-      type: a.beforeRemove,
+      type: d.beforeRemove,
       record: t,
       index: r
-    }), this.records = this.records.filter((i, s) => s !== this.currentIndex), this.records.length === 0 ? this.currentIndex = -1 : this.currentIndex >= this.records.length && (this.currentIndex = this.records.length - 1), this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({ type: a.afterScroll }), this.emit({
-      type: a.afterRemove,
+    }), this.records = this.records.filter((i, s) => s !== this.currentIndex), this.records.length === 0 ? this.currentIndex = -1 : this.currentIndex >= this.records.length && (this.currentIndex = this.records.length - 1), this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({ type: d.afterScroll }), this.emit({
+      type: d.afterRemove,
       record: t,
       index: r
     }), e && e(), t;
@@ -1225,10 +1229,10 @@ class U {
       return this;
     const i = [...this.records];
     return this.records = Q(this.records, (s) => {
-      const o = s[this.currentIndex];
-      o && this.setNestedValue(o, e, t);
+      const n = s[this.currentIndex];
+      n && this.setNestedValue(n, e, t);
     }), this.notifyStateChange(i), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: t,
@@ -1254,13 +1258,13 @@ class U {
       throw new Error(`Field ${String(e)} is not an array (found: ${typeof r})`);
     const i = [...this.records];
     this.records = Q(this.records, (s) => {
-      const o = s[this.currentIndex];
-      if (o) {
-        const c = this.getNestedValue(o, e);
-        c && c.push(t);
+      const n = s[this.currentIndex];
+      if (n) {
+        const a = this.getNestedValue(n, e);
+        a && a.push(t);
       }
     }), this.notifyStateChange(i), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: [...r, t],
@@ -1275,14 +1279,14 @@ class U {
     if (!Array.isArray(i) || t < 0 || t >= i.length)
       return;
     const s = [...this.records];
-    this.records = Q(this.records, (o) => {
-      const c = o[this.currentIndex];
-      if (c) {
-        const u = this.getNestedValue(c, e);
-        u[t] !== void 0 && r(u[t]);
+    this.records = Q(this.records, (n) => {
+      const a = n[this.currentIndex];
+      if (a) {
+        const l = this.getNestedValue(a, e);
+        l[t] !== void 0 && r(l[t]);
       }
     }), this.notifyStateChange(s), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1300,10 +1304,10 @@ class U {
       return;
     const i = [...this.records];
     this.records = Q(this.records, (s) => {
-      const o = s[this.currentIndex];
-      o && this.getNestedValue(o, e).splice(t, 1);
+      const n = s[this.currentIndex];
+      n && this.getNestedValue(n, e).splice(t, 1);
     }), this.notifyStateChange(i), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: this.getFieldValue(e),
@@ -1318,11 +1322,11 @@ class U {
     if (!Array.isArray(i))
       throw new Error(`Field ${String(e)} is not an array`);
     const s = [...this.records];
-    this.records = Q(this.records, (o) => {
-      const c = o[this.currentIndex];
-      c && this.getNestedValue(c, e).splice(t, 0, r);
+    this.records = Q(this.records, (n) => {
+      const a = n[this.currentIndex];
+      a && this.getNestedValue(a, e).splice(t, 0, r);
     }), this.notifyStateChange(s), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1348,7 +1352,7 @@ class U {
   }
   clear() {
     this.records = [], this.currentIndex = -1, this.state = "browse", this.originalRecord = null, this.emit({
-      type: a.dataChanged,
+      type: d.dataChanged,
       data: this.records
     });
   }
@@ -1358,7 +1362,7 @@ class U {
    */
   setData(e) {
     this.records = [...e.records || []], this.currentIndex = this.records.length > 0 ? 0 : -1, this.state = "browse", this.originalRecord = null, this.emit({
-      type: a.dataChanged,
+      type: d.dataChanged,
       data: this.records
     });
   }
@@ -1396,7 +1400,7 @@ class U {
   gotoRecordByData(e) {
     const t = this.records.findIndex((r) => r === e);
     return t >= 0 ? (this.currentIndex = t, this.emit({
-      type: a.recordChanged,
+      type: d.recordChanged,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), !0) : !1;
@@ -1409,7 +1413,7 @@ class U {
   }
   addFieldChangeListener(e, t) {
     const r = (i) => {
-      i.type === a.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
+      i.type === d.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
     };
     return this.addListener(r), this;
   }
@@ -1429,14 +1433,14 @@ class U {
     for (let t = 0; t < this.records.length; t++) {
       const r = this.records[t];
       let i = !0;
-      for (const [s, o] of Object.entries(e))
-        if (this.getNestedValue(r, s) !== o) {
+      for (const [s, n] of Object.entries(e))
+        if (this.getNestedValue(r, s) !== n) {
           i = !1;
           break;
         }
       if (i)
         return this.currentIndex = t, this.emit({
-          type: a.recordChanged,
+          type: d.recordChanged,
           record: this.getCurrentRecord(),
           index: this.currentIndex
         }), !0;
@@ -1447,7 +1451,7 @@ class U {
     for (let t = 0; t < this.records.length; t++)
       if (e(this.records[t]))
         return this.currentIndex = t, this.emit({
-          type: a.recordChanged,
+          type: d.recordChanged,
           record: this.getCurrentRecord(),
           index: this.currentIndex
         }), !0;
@@ -1479,7 +1483,7 @@ class U {
   setRecords(e) {
     const t = [...this.records];
     this.records = [...e], e.length > 0 ? this.currentIndex = 0 : this.currentIndex = -1, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(t), this.emit({
-      type: a.dataChanged,
+      type: d.dataChanged,
       data: this.records
     });
   }
@@ -1505,9 +1509,9 @@ class U {
   setNestedValue(e, t, r) {
     const i = t.split(".");
     let s = e;
-    for (let o = 0; o < i.length - 1; o++) {
-      const c = i[o];
-      c in s || (s[c] = {}), s = s[c];
+    for (let n = 0; n < i.length - 1; n++) {
+      const a = i[n];
+      a in s || (s[a] = {}), s = s[a];
     }
     s[i[i.length - 1]] = r;
   }
@@ -1576,27 +1580,27 @@ class Qe {
   // =================== Navigation ===================
   first() {
     this.filteredRecords.length > 0 && (this.currentIndex = 0, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }));
   }
   last() {
     this.filteredRecords.length > 0 && (this.currentIndex = this.filteredRecords.length - 1, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }));
   }
   next() {
     this.currentIndex < this.filteredRecords.length - 1 && (this.currentIndex++, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }));
   }
   prior() {
     this.currentIndex > 0 && (this.currentIndex--, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }));
   }
   goToRecord(e) {
     e >= 0 && e < this.filteredRecords.length && (this.currentIndex = e, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }));
   }
   isFirst() {
@@ -1627,11 +1631,11 @@ class Qe {
       throw this.publishEventError(e, {}), new g(e);
     }
     this.state = "edit", this.originalRecord = JSON.parse(JSON.stringify(this.getCurrentRecord())), this.emit({
-      type: a.beforeEdit,
+      type: d.beforeEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this.emit({
-      type: a.afterEdit,
+      type: d.afterEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     });
@@ -1646,16 +1650,16 @@ class Qe {
     } else
       this.state === "insert" && (this.filteredRecords = this.filteredRecords.slice(0, -1), this.records = this.records.slice(0, -1), this.grandTotalRecords--, this.filteredRecords.length > 0 ? this.currentIndex = Math.min(this.currentIndex, this.filteredRecords.length - 1) : this.currentIndex = -1);
     this.state = "browse", this.originalRecord = null, this.emit({
-      type: a.afterCancel,
+      type: d.afterCancel,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     });
   }
   insert(e) {
     this.validateDataSourceActive("insert"), this.state = "insert", this.emit({
-      type: a.beforeInsert
+      type: d.beforeInsert
     }), this.filteredRecords = [...this.filteredRecords, e], this.records = [...this.records, e], this.currentIndex = this.filteredRecords.length - 1, this.grandTotalRecords++, this.notifyStateChange(), this.emit({
-      type: a.afterInsert,
+      type: d.afterInsert,
       record: e,
       index: this.currentIndex
     });
@@ -1672,7 +1676,7 @@ class Qe {
     }
     const t = this.getCurrentRecord();
     if (this.emit({
-      type: a.beforeSave,
+      type: d.beforeSave,
       record: t,
       index: this.getCurrentIndex()
     }), this.validator) {
@@ -1690,13 +1694,13 @@ class Qe {
         s[this.currentIndex] = r;
       });
       let i = -1;
-      return this.records.forEach((s, o) => {
-        const c = this.service.getId(s), u = this.service.getId(t);
-        (s === t || c !== void 0 && c === u) && (i = o);
+      return this.records.forEach((s, n) => {
+        const a = this.service.getId(s), l = this.service.getId(t);
+        (s === t || a !== void 0 && a === l) && (i = n);
       }), this.records = Q(this.records, (s) => {
         i >= 0 ? s[i] = r : s.push(r);
       }), this.state = "browse", this.originalRecord = null, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({
-        type: a.afterSave,
+        type: d.afterSave,
         record: r,
         index: this.getCurrentIndex()
       }), e && e(), r;
@@ -1715,24 +1719,24 @@ class Qe {
     }
     const t = this.getCurrentRecord(), r = this.currentIndex;
     this.emit({
-      type: a.beforeRemove,
+      type: d.beforeRemove,
       record: t,
       index: r
     });
     try {
-      await this.service.delete(this.service.getId(t)), this.filteredRecords = this.filteredRecords.filter((s, o) => o !== this.currentIndex);
+      await this.service.delete(this.service.getId(t)), this.filteredRecords = this.filteredRecords.filter((s, n) => n !== this.currentIndex);
       const i = this.records.findIndex(
         (s) => this.service.getId(s) === this.service.getId(t)
       );
-      return i >= 0 && (this.records = this.records.filter((s, o) => o !== i)), this.grandTotalRecords--, this.filteredRecords.length === 0 ? this.currentIndex = -1 : this.currentIndex >= this.filteredRecords.length && (this.currentIndex = this.filteredRecords.length - 1), this.lastDataBrowsingOn = (/* @__PURE__ */ new Date()).getTime(), this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({ type: a.afterScroll }), this.emit({
-        type: a.afterRemove,
+      return i >= 0 && (this.records = this.records.filter((s, n) => n !== i)), this.grandTotalRecords--, this.filteredRecords.length === 0 ? this.currentIndex = -1 : this.currentIndex >= this.filteredRecords.length && (this.currentIndex = this.filteredRecords.length - 1), this.lastDataBrowsingOn = (/* @__PURE__ */ new Date()).getTime(), this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({ type: d.afterScroll }), this.emit({
+        type: d.afterRemove,
         record: t,
         index: r
       }), e && e(), t;
     } catch (i) {
       const s = G(i);
       throw this.emit({
-        type: a.onError,
+        type: d.onError,
         error: s,
         originalError: i
       }), e && e(s), new g(s);
@@ -1747,21 +1751,21 @@ class Qe {
       return;
     const i = [...this.filteredRecords];
     if (this.filteredRecords = Q(this.filteredRecords, (s) => {
-      const o = s[this.currentIndex];
-      o && this.setNestedValue(o, e, t);
+      const n = s[this.currentIndex];
+      n && this.setNestedValue(n, e, t);
     }), this.state === "edit" || this.state === "insert") {
       const s = this.getCurrentRecord() ? this.service.getId(this.getCurrentRecord()) : null;
       if (s !== void 0) {
-        const o = this.records.findIndex(
-          (c) => this.service.getId(c) === s
+        const n = this.records.findIndex(
+          (a) => this.service.getId(a) === s
         );
-        o >= 0 && (this.records = Q(this.records, (c) => {
-          this.setNestedValue(c[o], e, t);
+        n >= 0 && (this.records = Q(this.records, (a) => {
+          this.setNestedValue(a[n], e, t);
         }));
       }
     }
     this.notifyStateChange(i), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: t,
@@ -1787,13 +1791,13 @@ class Qe {
       throw new Error(`Field ${String(e)} is not an array (found: ${typeof r})`);
     const i = [...this.filteredRecords];
     this.filteredRecords = Q(this.filteredRecords, (s) => {
-      const o = s[this.currentIndex];
-      if (o) {
-        const c = this.getNestedValue(o, e);
-        c && c.push(t);
+      const n = s[this.currentIndex];
+      if (n) {
+        const a = this.getNestedValue(n, e);
+        a && a.push(t);
       }
     }), this.notifyStateChange(i), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: [...r, t],
@@ -1808,14 +1812,14 @@ class Qe {
     if (!Array.isArray(i) || t < 0 || t >= i.length)
       return;
     const s = [...this.filteredRecords];
-    this.filteredRecords = Q(this.filteredRecords, (o) => {
-      const c = o[this.currentIndex];
-      if (c) {
-        const u = this.getNestedValue(c, e);
-        u[t] !== void 0 && r(u[t]);
+    this.filteredRecords = Q(this.filteredRecords, (n) => {
+      const a = n[this.currentIndex];
+      if (a) {
+        const l = this.getNestedValue(a, e);
+        l[t] !== void 0 && r(l[t]);
       }
     }), this.notifyStateChange(s), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1833,10 +1837,10 @@ class Qe {
       return;
     const i = [...this.filteredRecords];
     this.filteredRecords = Q(this.filteredRecords, (s) => {
-      const o = s[this.currentIndex];
-      o && this.getNestedValue(o, e).splice(t, 1);
+      const n = s[this.currentIndex];
+      n && this.getNestedValue(n, e).splice(t, 1);
     }), this.notifyStateChange(i), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: this.getFieldValue(e),
@@ -1851,11 +1855,11 @@ class Qe {
     if (!Array.isArray(i))
       throw new Error(`Field ${String(e)} is not an array`);
     const s = [...this.filteredRecords];
-    this.filteredRecords = Q(this.filteredRecords, (o) => {
-      const c = o[this.currentIndex];
-      c && this.getNestedValue(c, e).splice(t, 0, r);
+    this.filteredRecords = Q(this.filteredRecords, (n) => {
+      const a = n[this.currentIndex];
+      a && this.getNestedValue(a, e).splice(t, 0, r);
     }), this.notifyStateChange(s), this.emit({
-      type: a.fieldChanged,
+      type: d.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1884,14 +1888,17 @@ class Qe {
    *
    * @param options Opções de refresh incluindo página, filtro e ordenação
    */
+  _isLoadingData = !1;
   refreshData(e) {
-    console.log("[V2 refreshData] Chamado com options:", e), e?.pageSize !== void 0 && (this.pageSize = e.pageSize);
+    if (this._isLoadingData)
+      return;
+    this._isLoadingData = !0, e?.pageSize !== void 0 && (this.pageSize = e.pageSize);
     const t = e?.currentPage ?? this.currentPage;
-    if (this.currentPage = t, console.log("[V2 refreshData] Página atual definida:", this.currentPage), "filter" in (e || {}) && (this.currentFilter = e?.filter, console.log("[V2 refreshData] Filtro definido:", this.currentFilter)), e?.sort !== void 0 && (this.currentSort = e.sort, this.defaultSortFields = e.sort), this.currentFilter && this.currentFilter.trim() !== "") {
-      console.log("[V2 refreshData] Chamando getDataWithRsqlFilter para página:", t), this.getDataWithRsqlFilter(t);
+    if (this.currentPage = t, "filter" in (e || {}) && (this.currentFilter = e?.filter), e?.sort !== void 0 && (this.currentSort = e.sort, this.defaultSortFields = e.sort), this.currentFilter && this.currentFilter.trim() !== "") {
+      this.getDataWithRsqlFilter(t);
       return;
     }
-    console.log("[V2 refreshData] Chamando getDataWithoutFilter para página:", t), this.getDataWithoutFilter(t);
+    this.getDataWithoutFilter(t);
   }
   /**
    * Carrega um registro específico pelo ID.
@@ -1902,11 +1909,10 @@ class Qe {
    */
   async loadById(e) {
     try {
-      console.log("[V2 loadById] Buscando registro com ID:", e);
       const t = await this.service.findOne(e);
       if (t)
-        return console.log("[V2 loadById] Registro encontrado:", t), this.grandTotalRecords = 1, this.setRecords([t]), t;
-      console.log("[V2 loadById] Registro não encontrado"), this.grandTotalRecords = 0, this.setRecords([]);
+        return this.grandTotalRecords = 1, this.setRecords([t]), t;
+      this.grandTotalRecords = 0, this.setRecords([]);
       return;
     } catch (t) {
       throw console.error("[V2 loadById] Erro ao buscar registro:", t), this.handleRemoteError(t), t;
@@ -1935,6 +1941,8 @@ class Qe {
       ), r && r.content && (this.grandTotalRecords = r.totalElements || r.content.length, this.setRecords(r.content)), t && t(), r;
     } catch (r) {
       throw this.handleRemoteError(r, t), r;
+    } finally {
+      this._isLoadingData = !1;
     }
   }
   /**
@@ -1954,8 +1962,8 @@ class Qe {
       this.getDataWithoutFilter(t, r);
       return;
     }
-    const s = e.filter.filterType, o = e.filter.quickFilterText;
-    s === we && o && o !== "" ? this.getDataWithQuickFilter(e, t, r) : s === Ee || s === Se ? this.getDataWithFilter(e, t, r) : this.getDataWithoutFilter(t, r);
+    const s = e.filter.filterType, n = e.filter.quickFilterText;
+    s === we && n && n !== "" ? this.getDataWithQuickFilter(e, t, r) : s === Ee || s === Se ? this.getDataWithFilter(e, t, r) : this.getDataWithoutFilter(t, r);
   }
   // =================== Event Management ===================
   addListener(e) {
@@ -1971,7 +1979,7 @@ class Qe {
    */
   addFieldChangeListener(e, t) {
     const r = (i) => {
-      i.type === a.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
+      i.type === d.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
     };
     return this.addListener(r), this;
   }
@@ -2023,11 +2031,11 @@ class Qe {
    */
   locate(e) {
     const t = Object.keys(e), r = this.filteredRecords.findIndex((i) => t.every((s) => {
-      const o = i[s], c = e[s];
-      return o === c;
+      const n = i[s], a = e[s];
+      return n === a;
     }));
     return r >= 0 ? (this.currentIndex = r, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }), !0) : !1;
   }
   /**
@@ -2047,13 +2055,13 @@ class Qe {
       (i) => this.service.getId(i) === t
     );
     return r >= 0 ? (this.currentIndex = r, this.emit({
-      type: a.afterScroll
+      type: d.afterScroll
     }), !0) : !1;
   }
   setRecords(e, t) {
     const r = [...this.filteredRecords];
     this.records = [...e], this.filteredRecords = [...e], t !== void 0 ? this.grandTotalRecords = t : this.grandTotalRecords < e.length && (this.grandTotalRecords = e.length), e.length > 0 ? this.currentIndex = 0 : this.currentIndex = -1, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(r), this.emit({
-      type: a.dataChanged,
+      type: d.dataChanged,
       data: this.filteredRecords
     });
   }
@@ -2078,7 +2086,7 @@ class Qe {
   }
   publishEventError(e, t) {
     this.emit({
-      type: a.onError,
+      type: d.onError,
       error: e,
       originalError: t
     }), this.onError && this.onError(e, t);
@@ -2086,7 +2094,7 @@ class Qe {
   publishEventErrors(e) {
     e.forEach((t) => {
       t.fieldName && (this.emit({
-        type: a.onFieldError,
+        type: d.onFieldError,
         fieldName: t.fieldName,
         error: t.errorMessage,
         originalError: t
@@ -2094,20 +2102,23 @@ class Qe {
     });
   }
   handleSaveError(e, t) {
-    e.response && e.response.data && e.response.data.apierror && e.response.data.apierror.subErrors && e.response.data.apierror.subErrors.forEach((i) => {
-      i.field && (this.emit({
-        type: a.onFieldError,
-        fieldName: i.field,
-        error: i.message,
-        originalError: i.message
-      }), this.onFieldError && this.onFieldError(i.field, i.message));
+    let r = !1;
+    const i = e?.response?.data?.apierror ?? e?.response?.data, s = i?.subErrors ?? i?.fieldErrors;
+    s && s.forEach((a) => {
+      const l = a.field ?? a.property;
+      l && (r = !0, this.emit({
+        type: d.onFieldError,
+        fieldName: l,
+        error: a.message,
+        originalError: a.message
+      }), this.onFieldError && this.onFieldError(l, a.message));
     });
-    const r = G(e);
-    this.emit({
-      type: a.onError,
-      error: r,
+    const n = G(e);
+    r || (this.emit({
+      type: d.onError,
+      error: n,
       originalError: e
-    }), this.onError && this.onError(r, e), t && t(r);
+    }), this.onError && this.onError(n, e)), t && t(n);
   }
   notifyStateChange(e) {
     this.onStateChange && e && this.onStateChange(e, [...this.filteredRecords]);
@@ -2115,9 +2126,9 @@ class Qe {
   setNestedValue(e, t, r) {
     const i = t.split(".");
     let s = e;
-    for (let o = 0; o < i.length - 1; o++) {
-      const c = i[o];
-      c in s || (s[c] = {}), s = s[c];
+    for (let n = 0; n < i.length - 1; n++) {
+      const a = i[n];
+      a in s || (s[a] = {}), s = s[a];
     }
     s[i[i.length - 1]] = r;
   }
@@ -2137,8 +2148,8 @@ class Qe {
       const i = new Fe();
       i.buildFrom(e.filter, e.sort);
       const s = i.toJSON();
-      let o;
-      return s ? o = await this.service.findAllWithFilter(s, t, this.getPageSize()) : o = await this.getDataWithoutFilter(t), o && o.content && (this.grandTotalRecords = o.totalElements || o.content.length, this.setRecords(o.content)), r && r(), o;
+      let n;
+      return s ? n = await this.service.findAllWithFilter(s, t, this.getPageSize()) : n = await this.getDataWithoutFilter(t), n && n.content && (this.grandTotalRecords = n.totalElements || n.content.length, this.setRecords(n.content)), r && r(), n;
     } catch (i) {
       throw this.handleRemoteError(i, r), i;
     }
@@ -2146,25 +2157,28 @@ class Qe {
   async getDataWithoutFilter(e, t) {
     try {
       const r = this.currentSort && this.currentSort.length > 0 ? this.currentSort : this.defaultSortFields;
-      console.log("[V2 getDataWithoutFilter] Buscando página:", e, "pageSize:", this.getPageSize(), "sort:", r);
       let i;
-      return r.length > 0 ? i = await this.service.findAllWithSort(e, this.getPageSize(), r) : i = await this.service.findAll(e, this.getPageSize()), console.log("[V2 getDataWithoutFilter] Resultado:", i?.totalElements, "registros totais,", i?.content?.length, "na página"), i && i.content && (this.grandTotalRecords = i.totalElements || i.content.length, this.setRecords(i.content), console.log("[V2 getDataWithoutFilter] Após setRecords - currentPage:", this.currentPage, "grandTotal:", this.grandTotalRecords)), t && t(), i;
+      return r.length > 0 ? i = await this.service.findAllWithSort(e, this.getPageSize(), r) : i = await this.service.findAll(e, this.getPageSize()), i && i.content && (this.grandTotalRecords = i.totalElements || i.content.length, this.setRecords(i.content)), t && t(), i;
     } catch (r) {
       throw this.handleRemoteError(r, t), r;
+    } finally {
+      this._isLoadingData = !1;
     }
   }
   async getDataWithQuickFilter(e, t, r) {
     try {
-      const i = Array.isArray(e.filter.quickFilterFieldsText) ? e.filter.quickFilterFieldsText.join(",") : e.filter.quickFilterFieldsText, s = this.getSortFields(e).join(","), o = await this.service.findAllMultipleFields(
+      const i = Array.isArray(e.filter.quickFilterFieldsText) ? e.filter.quickFilterFieldsText.join(",") : e.filter.quickFilterFieldsText, s = this.getSortFields(e).join(","), n = await this.service.findAllMultipleFields(
         e.filter.quickFilterText,
         i,
         t,
         this.getPageSize(),
         s
       );
-      return o && o.content && (this.grandTotalRecords = o.totalElements || o.content.length, this.setRecords(o.content)), r && r(), o;
+      return n && n.content && (this.grandTotalRecords = n.totalElements || n.content.length, this.setRecords(n.content)), r && r(), n;
     } catch (i) {
       throw this.handleRemoteError(i, r), i;
+    } finally {
+      this._isLoadingData = !1;
     }
   }
   getSortFields(e) {
@@ -2180,99 +2194,99 @@ class Qe {
   handleRemoteError(e, t) {
     const r = G(e);
     this.emit({
-      type: a.onError,
+      type: d.onError,
       error: r,
       originalError: e
     }), this.onError && this.onError(r, e), t && t();
   }
 }
-function xe(n) {
-  const e = ce(null), [t, r] = T(null), [i, s] = T(-1), [o, c] = T(0), [u, p] = T(!0), [C, W] = T(!1), [M, P] = T(!1), [L, N] = T(!1), d = z(() => (e.current || (e.current = new U(n)), e.current), []), f = l((F) => {
+function xe(o) {
+  const e = ce(null), [t, r] = V(null), [i, s] = V(-1), [n, a] = V(0), [l, p] = V(!0), [C, W] = V(!1), [z, L] = V(!1), [P, N] = V(!1), c = M(() => (e.current || (e.current = new k(o)), e.current), []), f = u((F) => {
     switch (F.type) {
-      case a.dataChanged:
-      case a.recordChanged:
-        r(d.getCurrentRecord()), s(d.getCurrentIndex()), c(d.getTotalRecords()), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting());
+      case d.dataChanged:
+      case d.recordChanged:
+        r(c.getCurrentRecord()), s(c.getCurrentIndex()), a(c.getTotalRecords()), p(c.isBrowsing()), W(c.isEditing()), L(c.isInserting());
         break;
-      case a.fieldChanged:
+      case d.fieldChanged:
         break;
-      case a.afterScroll:
-        r(d.getCurrentRecord()), s(d.getCurrentIndex());
+      case d.afterScroll:
+        r(c.getCurrentRecord()), s(c.getCurrentIndex());
         break;
-      case a.beforeEdit:
-      case a.beforeInsert:
+      case d.beforeEdit:
+      case d.beforeInsert:
         N(!0);
         break;
-      case a.afterEdit:
-      case a.afterInsert:
-      case a.afterSave:
-      case a.afterCancel:
-        N(!1), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting());
+      case d.afterEdit:
+      case d.afterInsert:
+      case d.afterSave:
+      case d.afterCancel:
+        N(!1), p(c.isBrowsing()), W(c.isEditing()), L(c.isInserting());
         break;
-      case a.onError:
-      case a.onFieldError:
+      case d.onError:
+      case d.onFieldError:
         N(!1);
         break;
     }
-  }, [d]);
-  q(() => (d.addListener(f), r(d.getCurrentRecord()), s(d.getCurrentIndex()), c(d.getTotalRecords()), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting()), () => {
-    d.removeListener(f);
-  }), [d, f]);
-  const b = l((F, k) => {
-    d.setFieldValue(F, k);
-  }, [d]), V = l((F) => d.getFieldValue(F), [d]), K = l(() => {
-    d instanceof U, d.edit();
-  }, [d]), m = l(async () => await d.save(), [d]), h = l(() => {
-    d instanceof U, d.cancel();
-  }, [d]), Y = l((F) => {
-    d instanceof U, d.insert(F);
-  }, [d]), Z = l(async (F) => await d.remove(F), [d]), E = l(() => {
-    d instanceof U, d.first();
-  }, [d]), j = l(() => {
-    d instanceof U, d.last();
-  }, [d]), ee = l(() => {
-    d instanceof U, d.next();
-  }, [d]), D = l(() => {
-    d instanceof U, d.prior();
-  }, [d]), S = l((F) => {
-    d instanceof U, d.goToRecord(F);
-  }, [d]), A = l((F, k) => {
-    d instanceof U && d.appendToFieldArray(F, k);
-  }, [d]), B = l((F, k, de) => {
-    d instanceof U && d.updateFieldArrayItem(F, k, de);
-  }, [d]), y = l((F, k) => {
-    d instanceof U && d.removeFromFieldArray(F, k);
-  }, [d]), w = l((F, k, de) => {
-    d instanceof U && d.insertIntoFieldArray(F, k, de);
-  }, [d]), x = l((F) => {
-    if (d instanceof U)
-      return d.getFieldArray(F);
-    const k = d.getFieldValue(F);
-    return Array.isArray(k) ? k : [];
-  }, [d]), $ = l((F) => {
-    if (d instanceof U)
-      return d.isFieldArray(F);
-    const k = d.getFieldValue(F);
-    return Array.isArray(k);
-  }, [d]), v = z(() => i < o - 1, [i, o]), J = z(() => i > 0, [i]), te = z(() => o === 0, [o]), oe = z(() => i === 0, [i]), ae = z(() => i === o - 1, [i, o]), O = z(() => u, [u]), _ = z(() => C, [C]), re = z(() => M, [M]), ue = l(() => process.env.NODE_ENV === "development" ? {
-    ...d.getDebugSnapshot(),
+  }, [c]);
+  q(() => (c.addListener(f), r(c.getCurrentRecord()), s(c.getCurrentIndex()), a(c.getTotalRecords()), p(c.isBrowsing()), W(c.isEditing()), L(c.isInserting()), () => {
+    c.removeListener(f);
+  }), [c, f]);
+  const b = u((F, _) => {
+    c.setFieldValue(F, _);
+  }, [c]), T = u((F) => c.getFieldValue(F), [c]), K = u(() => {
+    c instanceof k, c.edit();
+  }, [c]), m = u(async () => await c.save(), [c]), h = u(() => {
+    c instanceof k, c.cancel();
+  }, [c]), Y = u((F) => {
+    c instanceof k, c.insert(F);
+  }, [c]), Z = u(async (F) => await c.remove(F), [c]), E = u(() => {
+    c instanceof k, c.first();
+  }, [c]), j = u(() => {
+    c instanceof k, c.last();
+  }, [c]), ee = u(() => {
+    c instanceof k, c.next();
+  }, [c]), D = u(() => {
+    c instanceof k, c.prior();
+  }, [c]), S = u((F) => {
+    c instanceof k, c.goToRecord(F);
+  }, [c]), A = u((F, _) => {
+    c instanceof k && c.appendToFieldArray(F, _);
+  }, [c]), B = u((F, _, de) => {
+    c instanceof k && c.updateFieldArrayItem(F, _, de);
+  }, [c]), y = u((F, _) => {
+    c instanceof k && c.removeFromFieldArray(F, _);
+  }, [c]), w = u((F, _, de) => {
+    c instanceof k && c.insertIntoFieldArray(F, _, de);
+  }, [c]), x = u((F) => {
+    if (c instanceof k)
+      return c.getFieldArray(F);
+    const _ = c.getFieldValue(F);
+    return Array.isArray(_) ? _ : [];
+  }, [c]), $ = u((F) => {
+    if (c instanceof k)
+      return c.isFieldArray(F);
+    const _ = c.getFieldValue(F);
+    return Array.isArray(_);
+  }, [c]), v = M(() => i < n - 1, [i, n]), J = M(() => i > 0, [i]), te = M(() => n === 0, [n]), oe = M(() => i === 0, [i]), ae = M(() => i === n - 1, [i, n]), O = M(() => l, [l]), U = M(() => C, [C]), re = M(() => z, [z]), ue = u(() => process.env.NODE_ENV === "development" ? {
+    ...c.getDebugSnapshot(),
     hookState: {
       currentRecord: t,
       currentIndex: i,
-      totalRecords: o,
+      totalRecords: n,
       isBrowsing: O,
-      isEditing: _,
+      isEditing: U,
       isInserting: re,
-      isLoading: L
+      isLoading: P
     }
-  } : null, [d, t, i, o, O, _, re, L]);
+  } : null, [c, t, i, n, O, U, re, P]);
   return {
     // DataSource instance (para casos onde acesso direto é necessário)
-    dataSource: d,
+    dataSource: c,
     // Estado reativo
     currentRecord: t,
     currentIndex: i,
-    totalRecords: o,
-    isLoading: L,
+    totalRecords: n,
+    isLoading: P,
     // Estado derivado
     canNext: v,
     canPrior: J,
@@ -2280,11 +2294,11 @@ function xe(n) {
     isFirst: oe,
     isLast: ae,
     isBrowsing: O,
-    isEditing: _,
+    isEditing: U,
     isInserting: re,
     // Operações básicas
     setFieldValue: b,
-    getFieldValue: V,
+    getFieldValue: T,
     edit: K,
     save: m,
     cancel: h,
@@ -2307,161 +2321,161 @@ function xe(n) {
     getDebugInfo: ue
   };
 }
-function wt(n) {
+function wt(o) {
   const {
     dataSource: e,
     currentRecord: t,
     currentIndex: r,
     totalRecords: i,
     canNext: s,
-    canPrior: o,
-    isEmpty: c,
-    isFirst: u,
+    canPrior: n,
+    isEmpty: a,
+    isFirst: l,
     isLast: p,
     isBrowsing: C,
     first: W,
-    last: M,
-    next: P,
-    prior: L,
+    last: z,
+    next: L,
+    prior: P,
     goToRecord: N,
-    getFieldValue: d,
+    getFieldValue: c,
     getFieldArray: f,
     isFieldArray: b
-  } = xe(n);
+  } = xe(o);
   return {
     dataSource: e,
     currentRecord: t,
     currentIndex: r,
     totalRecords: i,
     canNext: s,
-    canPrior: o,
-    isEmpty: c,
-    isFirst: u,
+    canPrior: n,
+    isEmpty: a,
+    isFirst: l,
     isLast: p,
     isBrowsing: C,
     first: W,
-    last: M,
-    next: P,
-    prior: L,
+    last: z,
+    next: L,
+    prior: P,
     goToRecord: N,
-    getFieldValue: d,
+    getFieldValue: c,
     getFieldArray: f,
     isFieldArray: b
   };
 }
-function Et(n) {
-  return xe(n);
+function Et(o) {
+  return xe(o);
 }
-function Ce(n) {
-  const { id: e, loadOnStart: t = !0 } = n, r = ce(null), [i, s] = T(void 0), [o, c] = T(-1), [u, p] = T(0), [C, W] = T(0), [M, P] = T(!0), [L, N] = T(!1), [d, f] = T(!1), [b, V] = T(!1), [K, m] = T(null), h = z(() => (r.current || (r.current = new Qe(n)), r.current), []), Y = l((I) => {
+function Ce(o) {
+  const { id: e, loadOnStart: t = !0 } = o, r = ce(null), [i, s] = V(void 0), [n, a] = V(-1), [l, p] = V(0), [C, W] = V(0), [z, L] = V(!0), [P, N] = V(!1), [c, f] = V(!1), [b, T] = V(!1), [K, m] = V(null), h = M(() => (r.current || (r.current = new Qe(o)), r.current), []), Y = u((I) => {
     switch (I.type) {
-      case a.dataChanged:
-      case a.recordChanged:
-      case a.refreshData:
-        s(h.getCurrentRecord()), c(h.getCurrentIndex()), p(h.getTotalRecords()), W(h.getGrandTotalRecords()), P(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), V(!1), m(null);
+      case d.dataChanged:
+      case d.recordChanged:
+      case d.refreshData:
+        s(h.getCurrentRecord()), a(h.getCurrentIndex()), p(h.getTotalRecords()), W(h.getGrandTotalRecords()), L(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), T(!1), m(null);
         break;
-      case a.fieldChanged:
+      case d.fieldChanged:
         break;
-      case a.afterScroll:
-        s(h.getCurrentRecord()), c(h.getCurrentIndex());
+      case d.afterScroll:
+        s(h.getCurrentRecord()), a(h.getCurrentIndex());
         break;
-      case a.beforeEdit:
-      case a.beforeInsert:
-      case a.beforeSave:
-      case a.beforeRemove:
-        V(!0), m(null);
+      case d.beforeEdit:
+      case d.beforeInsert:
+      case d.beforeSave:
+      case d.beforeRemove:
+        T(!0), m(null);
         break;
-      case a.afterEdit:
-      case a.afterInsert:
-      case a.afterSave:
-      case a.afterCancel:
-      case a.afterRemove:
-        V(!1), P(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), m(null);
+      case d.afterEdit:
+      case d.afterInsert:
+      case d.afterSave:
+      case d.afterCancel:
+      case d.afterRemove:
+        T(!1), L(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), m(null);
         break;
-      case a.onError:
-        V(!1), m(I.error);
+      case d.onError:
+        T(!1), m(I.error);
         break;
-      case a.onFieldError:
-        V(!1);
+      case d.onFieldError:
+        T(!1);
         break;
     }
   }, [h]);
-  q(() => (h.addListener(Y), s(h.getCurrentRecord()), c(h.getCurrentIndex()), p(h.getTotalRecords()), W(h.getGrandTotalRecords()), P(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), () => {
+  q(() => (h.addListener(Y), s(h.getCurrentRecord()), a(h.getCurrentIndex()), p(h.getTotalRecords()), W(h.getGrandTotalRecords()), L(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), () => {
     h.removeListener(Y);
   }), [h, Y]), q(() => {
-    t && (e != null ? (V(!0), m(null), h.loadById(e).catch((I) => {
-      m(I.message || "Erro ao carregar registro"), V(!1);
-    })) : (V(!0), m(null), h.refreshData()));
+    t && (e != null ? (T(!0), m(null), h.loadById(e).catch((I) => {
+      m(I.message || "Erro ao carregar registro"), T(!1);
+    })) : (T(!0), m(null), h.refreshData()));
   }, [e, t, h]);
-  const Z = l((I, H) => {
+  const Z = u((I, H) => {
     h.setFieldValue(I, H);
-  }, [h]), E = l((I) => h.getFieldValue(I), [h]), j = l(() => {
+  }, [h]), E = u((I) => h.getFieldValue(I), [h]), j = u(() => {
     h.edit();
-  }, [h]), ee = l(async () => {
+  }, [h]), ee = u(async () => {
     try {
       return m(null), await h.save();
     } catch (I) {
       throw m(I.message || "Erro ao salvar"), I;
     }
-  }, [h]), D = l(() => {
+  }, [h]), D = u(() => {
     h.cancel();
-  }, [h]), S = l((I) => {
+  }, [h]), S = u((I) => {
     h.insert(I);
-  }, [h]), A = l(async (I) => {
+  }, [h]), A = u(async (I) => {
     try {
       return m(null), await h.remove(I);
     } catch (H) {
       throw m(H.message || "Erro ao remover"), H;
     }
-  }, [h]), B = l(() => {
+  }, [h]), B = u(() => {
     h.first();
-  }, [h]), y = l(() => {
+  }, [h]), y = u(() => {
     h.last();
-  }, [h]), w = l(() => {
+  }, [h]), w = u(() => {
     h.next();
-  }, [h]), x = l(() => {
+  }, [h]), x = u(() => {
     h.prior();
-  }, [h]), $ = l((I) => {
+  }, [h]), $ = u((I) => {
     h.goToRecord(I);
-  }, [h]), v = l(async (I) => {
+  }, [h]), v = u(async (I) => {
     try {
-      return V(!0), m(null), await h.loadById(I);
+      return T(!0), m(null), await h.loadById(I);
     } catch (H) {
       throw m(H.message || "Erro ao carregar registro"), H;
     } finally {
-      V(!1);
+      T(!1);
     }
-  }, [h]), J = l((I, H) => {
+  }, [h]), J = u((I, H) => {
     h.appendToFieldArray(I, H);
-  }, [h]), te = l((I, H, se) => {
+  }, [h]), te = u((I, H, se) => {
     h.updateFieldArrayItem(I, H, se);
-  }, [h]), oe = l((I, H) => {
+  }, [h]), oe = u((I, H) => {
     h.removeFromFieldArray(I, H);
-  }, [h]), ae = l((I, H, se) => {
+  }, [h]), ae = u((I, H, se) => {
     h.insertIntoFieldArray(I, H, se);
-  }, [h]), O = l((I) => h.getFieldArray(I), [h]), _ = l((I) => h.isFieldArray(I), [h]), re = l((I, H, se) => {
-    V(!0), m(null);
+  }, [h]), O = u((I) => h.getFieldArray(I), [h]), U = u((I) => h.isFieldArray(I), [h]), re = u((I, H, se) => {
+    T(!0), m(null);
     try {
       h.applyRemoteFilter(I, H, () => {
-        V(!1), se && se();
+        T(!1), se && se();
       });
-    } catch (Le) {
-      V(!1), m(Le.message || "Erro ao aplicar filtro");
+    } catch (Pe) {
+      T(!1), m(Pe.message || "Erro ao aplicar filtro");
     }
-  }, [h]), ue = l(async (I) => {
+  }, [h]), ue = u(async (I) => {
     try {
-      V(!0), m(null), h.refreshData(I);
+      T(!0), m(null), h.refreshData(I);
     } catch (H) {
-      throw V(!1), m(H.message || "Erro ao atualizar dados"), H;
+      throw T(!1), m(H.message || "Erro ao atualizar dados"), H;
     }
-  }, [h]), F = l((I) => {
+  }, [h]), F = u((I) => {
     h.setPageSize(I);
-  }, [h]), k = l(() => h.getPageSize(), [h]), de = z(() => o < u - 1, [o, u]), De = z(() => o > 0, [o]), Ve = z(() => u === 0, [u]), Te = z(() => o === 0, [o]), Oe = z(() => o === u - 1, [o, u]), ge = z(() => M, [M]), fe = z(() => L, [L]), me = z(() => d, [d]), Pe = l(() => process.env.NODE_ENV === "development" ? {
+  }, [h]), _ = u(() => h.getPageSize(), [h]), de = M(() => n < l - 1, [n, l]), De = M(() => n > 0, [n]), Te = M(() => l === 0, [l]), Ve = M(() => n === 0, [n]), Oe = M(() => n === l - 1, [n, l]), ge = M(() => z, [z]), fe = M(() => P, [P]), me = M(() => c, [c]), Le = u(() => process.env.NODE_ENV === "development" ? {
     ...h.getDebugSnapshot(),
     hookState: {
       currentRecord: i,
-      currentIndex: o,
-      totalRecords: u,
+      currentIndex: n,
+      totalRecords: l,
       grandTotalRecords: C,
       isBrowsing: ge,
       isEditing: fe,
@@ -2469,22 +2483,22 @@ function Ce(n) {
       isLoading: b,
       error: K
     }
-  } : null, [h, i, o, u, C, ge, fe, me, b, K]);
+  } : null, [h, i, n, l, C, ge, fe, me, b, K]);
   return {
     // DataSource instance (para casos onde acesso direto é necessário)
     dataSource: h,
     // Estado reativo
     currentRecord: i,
-    currentIndex: o,
-    totalRecords: u,
+    currentIndex: n,
+    totalRecords: l,
     grandTotalRecords: C,
     isLoading: b,
     error: K,
     // Estado derivado
     canNext: de,
     canPrior: De,
-    isEmpty: Ve,
-    isFirst: Te,
+    isEmpty: Te,
+    isFirst: Ve,
     isLast: Oe,
     isBrowsing: ge,
     isEditing: fe,
@@ -2510,37 +2524,37 @@ function Ce(n) {
     removeFromFieldArray: oe,
     insertIntoFieldArray: ae,
     getFieldArray: O,
-    isFieldArray: _,
+    isFieldArray: U,
     // Operações remotas
     applyRemoteFilter: re,
     refreshData: ue,
     setPageSize: F,
-    getPageSize: k,
+    getPageSize: _,
     // Debug
-    getDebugInfo: Pe
+    getDebugInfo: Le
   };
 }
-function St(n) {
+function St(o) {
   const {
     dataSource: e,
     currentRecord: t,
     currentIndex: r,
     totalRecords: i,
     grandTotalRecords: s,
-    isLoading: o,
-    error: c,
-    canNext: u,
+    isLoading: n,
+    error: a,
+    canNext: l,
     canPrior: p,
     isEmpty: C,
     isFirst: W,
-    isLast: M,
-    isBrowsing: P,
-    first: L,
+    isLast: z,
+    isBrowsing: L,
+    first: P,
     last: N,
-    next: d,
+    next: c,
     prior: f,
     goToRecord: b,
-    loadById: V,
+    loadById: T,
     getFieldValue: K,
     getFieldArray: m,
     isFieldArray: h,
@@ -2548,27 +2562,27 @@ function St(n) {
     refreshData: Z,
     getPageSize: E,
     getDebugInfo: j
-  } = Ce(n);
+  } = Ce(o);
   return {
     dataSource: e,
     currentRecord: t,
     currentIndex: r,
     totalRecords: i,
     grandTotalRecords: s,
-    isLoading: o,
-    error: c,
-    canNext: u,
+    isLoading: n,
+    error: a,
+    canNext: l,
     canPrior: p,
     isEmpty: C,
     isFirst: W,
-    isLast: M,
-    isBrowsing: P,
-    first: L,
+    isLast: z,
+    isBrowsing: L,
+    first: P,
     last: N,
-    next: d,
+    next: c,
     prior: f,
     goToRecord: b,
-    loadById: V,
+    loadById: T,
     getFieldValue: K,
     getFieldArray: m,
     isFieldArray: h,
@@ -2578,8 +2592,8 @@ function St(n) {
     getDebugInfo: j
   };
 }
-function Ft(n) {
-  return Ce(n);
+function Ft(o) {
+  return Ce(o);
 }
 class At {
   /**
@@ -2635,31 +2649,31 @@ const xt = {
     // 1 minuto
     retry: 5
   }
-}, Ct = (n) => {
-  const { initialData: e, name: t, label: r, initialDataSource: i, onLoadComplete: s, store: o, validator: c } = n, u = () => o && o.existsValue(t) ? o.getValue(t) : i || new ye(t, {
+}, Ct = (o) => {
+  const { initialData: e, name: t, label: r, initialDataSource: i, onLoadComplete: s, store: n, validator: a } = o, l = () => n && n.existsValue(t) ? n.getValue(t) : i || new ye(t, {
     records: e,
     grandTotalRecords: e.length,
     currentPage: 0,
     totalPages: 0,
     pageSize: 0,
-    validator: c
-  }, r), [p, C] = T(
-    u()
+    validator: a
+  }, r), [p, C] = V(
+    l()
   );
   return q(() => {
-    o && o.setValue(t, p), s && s(p);
+    n && n.setValue(t, p), s && s(p);
   }, [t]), { dataSource: p };
-}, bt = (n) => {
+}, bt = (o) => {
   const e = (r) => {
-    r.addListener(n.listener);
+    r.addListener(o.listener);
   }, t = (r) => {
-    r.removeListener(n.listener);
+    r.removeListener(o.listener);
   };
-  q(() => (n.dataSource && (t(n.dataSource), e(n.dataSource)), () => {
-    n.dataSource && t(n.dataSource);
-  }), [n.dataSource?.uuid || n.dataSource?.getName()]);
-}, Dt = (n) => {
-  const { initialData: e, name: t, initialDataSource: r, onLoadComplete: i, validator: s } = n, [o, c] = T(
+  q(() => (o.dataSource && (t(o.dataSource), e(o.dataSource)), () => {
+    o.dataSource && t(o.dataSource);
+  }), [o.dataSource?.uuid || o.dataSource?.getName()]);
+}, Dt = (o) => {
+  const { initialData: e, name: t, initialDataSource: r, onLoadComplete: i, validator: s } = o, [n, a] = V(
     r ?? new Ge(t, {
       records: e,
       grandTotalRecords: e.length,
@@ -2670,7 +2684,7 @@ const xt = {
     })
   );
   return q(() => {
-    c((u) => {
+    a((l) => {
       const p = {
         records: e,
         grandTotalRecords: e.length,
@@ -2679,9 +2693,9 @@ const xt = {
         pageSize: 0,
         validator: s
       };
-      return u.isActive() ? u.setData(p) : u.open(p), u;
-    }), i && i(o);
-  }, [e, t]), { dataSource: o };
+      return l.isActive() ? l.setData(p) : l.open(p), l;
+    }), i && i(n);
+  }, [e, t]), { dataSource: n };
 };
 class be {
   tokenManager;
@@ -2698,103 +2712,103 @@ class be {
   }
   async get(e, t, r, i) {
     try {
-      const s = this.prepareHeaders(t, r), o = await X.get(e, { headers: s, ...i });
-      return ie.convertJsonToObject(o.data);
+      const s = this.prepareHeaders(t, r), n = await X.get(e, { headers: s, ...i });
+      return ie.convertJsonToObject(n.data);
     } catch (s) {
       return Promise.reject(s);
     }
   }
   async post(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i), c = await X.post(
+      const n = this.prepareHeaders(r, i), a = await X.post(
         e,
         ie.convertObjectToJson(t),
         {
-          headers: o,
+          headers: n,
           ...s
         }
       );
-      return ie.convertJsonToObject(c.data);
-    } catch (o) {
-      return Promise.reject(o);
+      return ie.convertJsonToObject(a.data);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   async postNoConvertId(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i);
+      const n = this.prepareHeaders(r, i);
       return (await X.post(
         e,
         t,
         {
-          headers: o,
+          headers: n,
           ...s
         }
       )).data;
-    } catch (o) {
-      return Promise.reject(o);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   async put(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i), c = await X.put(e, ie.convertObjectToJson(t), {
-        headers: o,
+      const n = this.prepareHeaders(r, i), a = await X.put(e, ie.convertObjectToJson(t), {
+        headers: n,
         ...s
       });
-      return ie.convertJsonToObject(c.data);
-    } catch (o) {
-      return Promise.reject(o);
+      return ie.convertJsonToObject(a.data);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   async putNoConvertId(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i);
+      const n = this.prepareHeaders(r, i);
       return (await X.put(e, t, {
-        headers: o,
+        headers: n,
         ...s
       })).data;
-    } catch (o) {
-      return Promise.reject(o);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   async binaryPut(e, t, r = {}, i, s) {
     try {
-      const o = this.prepareHeaders(r, i);
+      const n = this.prepareHeaders(r, i);
       return s = s || {}, (await X.put(e, t, {
-        headers: o,
+        headers: n,
         ...s
       })).data;
-    } catch (o) {
-      return Promise.reject(o);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   async delete(e, t, r, i) {
     try {
-      const s = this.prepareHeaders(t, r), o = await X.delete(e, { headers: s, ...i });
-      return ie.convertJsonToObject(o.data);
+      const s = this.prepareHeaders(t, r), n = await X.delete(e, { headers: s, ...i });
+      return ie.convertJsonToObject(n.data);
     } catch (s) {
       return Promise.reject(s);
     }
   }
   async patch(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i), c = await X.patch(e, ie.convertObjectToJson(t), {
-        headers: o,
+      const n = this.prepareHeaders(r, i), a = await X.patch(e, ie.convertObjectToJson(t), {
+        headers: n,
         ...s
       });
-      return ie.convertJsonToObject(c.data);
-    } catch (o) {
-      return Promise.reject(o);
+      return ie.convertJsonToObject(a.data);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   async patchNoConvertId(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i);
+      const n = this.prepareHeaders(r, i);
       return (await X.patch(e, t, {
-        headers: o,
+        headers: n,
         ...s
       })).data;
-    } catch (o) {
-      return Promise.reject(o);
+    } catch (n) {
+      return Promise.reject(n);
     }
   }
   /**
@@ -2835,8 +2849,8 @@ class be {
     try {
       const s = { ...r };
       if (!i) {
-        const c = this.tokenManager.getToken();
-        c && (s.Authorization = `Bearer ${c.access_token}`);
+        const a = this.tokenManager.getToken();
+        a && (s.Authorization = `Bearer ${a.access_token}`);
       }
       return (await X.post(e, t, { headers: s })).data;
     } catch (s) {
@@ -2907,22 +2921,22 @@ class Ke {
     return this.transformPage(s), s;
   }
   async findAllMultipleFields(e, t, r, i, s) {
-    const o = this.configureHeaders(), c = await this.client.get(
+    const n = this.configureHeaders(), a = await this.client.get(
       `${this.getEndpoint()}/findMultipleFields?page=${r}&size=${i}&fields=${encodeURIComponent(
         t
       )}&filter=${encodeURIComponent(e)}&sort=${encodeURIComponent(s)}`,
-      o,
+      n,
       !1
     );
-    return this.transformPage(c), c;
+    return this.transformPage(a), a;
   }
   async findAllWithFilterAndSort(e, t, r, i) {
-    const s = this.configureHeaders(), o = `${this.getEndpoint()}/findWithFilterAndSort?page=${t}&size=${r}&filter=${encodeURIComponent(
+    const s = this.configureHeaders(), n = `${this.getEndpoint()}/findWithFilterAndSort?page=${t}&size=${r}&filter=${encodeURIComponent(
       e
     )}&sort=${i}`;
-    console.log("[findAllWithFilterAndSort] URL:", o), console.log("[findAllWithFilterAndSort] filter original:", e);
-    const c = await this.client.get(o, s, !1);
-    return this.transformPage(c), c;
+    console.log("[findAllWithFilterAndSort] URL:", n), console.log("[findAllWithFilterAndSort] filter original:", e);
+    const a = await this.client.get(n, s, !1);
+    return this.transformPage(a), a;
   }
   async findOne(e) {
     const t = this.configureHeaders(), r = await this.client.get(`${this.getEndpoint()}/${e}`, t, !1);
@@ -2959,8 +2973,8 @@ class le {
   first;
   numberOfElements;
   empty;
-  constructor(e, t, r, i, s, o, c, u, p, C) {
-    this.content = e, this.totalElements = t, this.totalPages = r, this.number = i, this.size = s, this.sort = o || { sorted: !1, unsorted: !0, empty: !0 }, this.last = c !== void 0 ? c : i === r - 1, this.first = u !== void 0 ? u : i === 0, this.numberOfElements = p !== void 0 ? p : e.length, this.empty = C !== void 0 ? C : e.length === 0, this.pageable = {
+  constructor(e, t, r, i, s, n, a, l, p, C) {
+    this.content = e, this.totalElements = t, this.totalPages = r, this.number = i, this.size = s, this.sort = n || { sorted: !1, unsorted: !0, empty: !0 }, this.last = a !== void 0 ? a : i === r - 1, this.first = l !== void 0 ? l : i === 0, this.numberOfElements = p !== void 0 ? p : e.length, this.empty = C !== void 0 ? C : e.length === 0, this.pageable = {
       sort: this.sort,
       offset: i * s,
       pageSize: s,
@@ -2973,45 +2987,45 @@ class le {
     return new le(e, t, r, i, s);
   }
 }
-function Ye(n) {
-  return n.totalElements || n.totalElements === 0 ? n.totalElements : n.page.totalElements;
+function Ye(o) {
+  return o.totalElements || o.totalElements === 0 ? o.totalElements : o.page.totalElements;
 }
-function Xe(n) {
-  return n.totalPages || n.totalPages === 0 ? n.totalPages : n.page.totalPages;
+function Xe(o) {
+  return o.totalPages || o.totalPages === 0 ? o.totalPages : o.page.totalPages;
 }
-function Ze(n) {
-  return n.pageable ? n.pageable.pageNumber : n.page.number;
+function Ze(o) {
+  return o.pageable ? o.pageable.pageNumber : o.page.number;
 }
-function Vt(n) {
+function Tt(o) {
   const {
     name: e,
     label: t,
     service: r,
     filter: i,
     sort: s,
-    transformData: o,
-    onLoadComplete: c,
-    onDestroy: u,
+    transformData: n,
+    onLoadComplete: a,
+    onDestroy: l,
     filterData: p,
     findAll: C,
     findAllWithSort: W,
-    findAllWithFilter: M,
-    findAllWithFilterAndSort: P,
-    initialDataSource: L,
+    findAllWithFilter: z,
+    findAllWithFilterAndSort: L,
+    initialDataSource: P,
     pageSize: N = 50,
-    currentPage: d = 0,
+    currentPage: c = 0,
     loadOnStart: f = !0,
     store: b,
-    id: V,
+    id: T,
     validator: K
-  } = n, m = ce(!1), h = () => !!(b && b.existsValue(e) || L), Y = () => b && b.existsValue(e) ? b.getValue(e) : L || new Ae(r, e, {
+  } = o, m = ce(!1), h = () => !!(b && b.existsValue(e) || P), Y = () => b && b.existsValue(e) ? b.getValue(e) : P || new Ae(r, e, {
     records: [],
     grandTotalRecords: 0,
-    currentPage: d,
+    currentPage: c,
     totalPages: 0,
     pageSize: N,
     validator: K
-  }, t), Z = () => b && b.existsValue(e) ? b.getValue(e).getCurrentPage() : L ? L.getCurrentPage() : 0, [E, j] = T({
+  }, t), Z = () => b && b.existsValue(e) ? b.getValue(e).getCurrentPage() : P ? P.getCurrentPage() : 0, [E, j] = V({
     dataSource: Y(),
     isLoading: !1,
     isError: !1,
@@ -3020,18 +3034,18 @@ function Vt(n) {
     label: t,
     filter: i,
     sort: s,
-    id: V,
+    id: T,
     currentPage: Z(),
     pageSize: N,
     loadDataCount: h() ? 1 : 0
   }), ee = async (y, w, x, $, v, J, te, oe, ae) => {
     let O;
     if (J) {
-      const _ = await r.findOne(J);
-      _ ? O = le.createFromValues([_], 1, 0, 0, 0) : O = le.createFromValues([], 0, 0, 0, 0);
+      const U = await r.findOne(J);
+      U ? O = le.createFromValues([U], 1, 0, 0, 0) : O = le.createFromValues([], 0, 0, 0, 0);
     } else
-      P && $ && v && v.length > 0 ? O = await P($, w, x, v) : M && $ ? O = await M($, w, x) : W && v && v.length > 0 ? O = await W(w, x, v) : C ? O = await C(w, x) : $ && v && v.length > 0 ? O = await r.findAllWithFilterAndSort($, w, x, v) : $ ? O = await r.findAllWithFilter($, w, x) : v && v.length > 0 ? O = await r.findAllWithSort(w, x, v) : O = await r.findAll(w, x);
-    p && (O = p(O)), o && (O = o(O)), j((_) => {
+      L && $ && v && v.length > 0 ? O = await L($, w, x, v) : z && $ ? O = await z($, w, x) : W && v && v.length > 0 ? O = await W(w, x, v) : C ? O = await C(w, x) : $ && v && v.length > 0 ? O = await r.findAllWithFilterAndSort($, w, x, v) : $ ? O = await r.findAllWithFilter($, w, x) : v && v.length > 0 ? O = await r.findAllWithSort(w, x, v) : O = await r.findAll(w, x);
+    p && (O = p(O)), n && (O = n(O)), j((U) => {
       const re = {
         records: O.content,
         grandTotalRecords: Ye(O),
@@ -3045,8 +3059,8 @@ function Vt(n) {
         originSort: oe,
         validator: K
       };
-      return _.dataSource.isActive() ? _.dataSource.setData(re) : _.dataSource.open(re), {
-        ..._,
+      return U.dataSource.isActive() ? U.dataSource.setData(re) : U.dataSource.open(re), {
+        ...U,
         currentPage: w,
         pageSize: x,
         filter: $,
@@ -3055,15 +3069,15 @@ function Vt(n) {
         isLoading: !1,
         isError: !1,
         error: "",
-        loadDataCount: _.loadDataCount + 1
+        loadDataCount: U.loadDataCount + 1
       };
     }), b && b.setValue(e, E.dataSource);
   };
   q(() => {
-    c && E.loadDataCount > 0 && c(E.dataSource);
+    a && E.loadDataCount > 0 && a(E.dataSource);
   }, [E.loadDataCount]);
-  const D = l((y) => {
-    if (y.type === a.refreshData) {
+  const D = u((y) => {
+    if (y.type === d.refreshData) {
       const w = y.options;
       try {
         j((x) => ({
@@ -3090,7 +3104,7 @@ function Vt(n) {
             isError: !0,
             isLoading: !1,
             error: $
-          })), n.onError && n.onError($, x);
+          })), o.onError && o.onError($, x);
         });
       } catch (x) {
         const $ = G(x);
@@ -3099,19 +3113,19 @@ function Vt(n) {
           isError: !0,
           isLoading: !1,
           error: $
-        })), n.onError && n.onError($, x);
+        })), o.onError && o.onError($, x);
       }
     }
-  }, [ee, E.name, n.onError]), S = l((y) => {
+  }, [ee, E.name, o.onError]), S = u((y) => {
     m.current || (y.addListener(D), m.current = !0);
-  }, [D]), A = l((y) => {
+  }, [D]), A = u((y) => {
     m.current && (y.removeListener(D), m.current = !1);
   }, [D]);
   q(() => {
     try {
       return S(E.dataSource), f && E.loadDataCount === 0 ? (j((y) => ({ ...y, isLoading: !0 })), ee(
         E.name,
-        d,
+        c,
         N,
         E.filter,
         E.sort,
@@ -3123,9 +3137,9 @@ function Vt(n) {
           isError: !0,
           isLoading: !1,
           error: w
-        })), n.onError && n.onError(w, y);
-      })) : c && c(E.dataSource), () => {
-        u && (A(E.dataSource), u(E.dataSource));
+        })), o.onError && o.onError(w, y);
+      })) : a && a(E.dataSource), () => {
+        l && (A(E.dataSource), l(E.dataSource));
       };
     } catch (y) {
       const w = G(y);
@@ -3134,7 +3148,7 @@ function Vt(n) {
         isError: !0,
         isLoading: !1,
         error: w
-      })), n.onError && n.onError(w, y);
+      })), o.onError && o.onError(w, y);
     }
   }, [
     E.name,
@@ -3160,43 +3174,43 @@ function Vt(n) {
     clearError: B
   };
 }
-function et(n) {
-  return n.totalElements || n.totalElements === 0 ? n.totalElements : n.page.totalElements;
+function et(o) {
+  return o.totalElements || o.totalElements === 0 ? o.totalElements : o.page.totalElements;
 }
-function tt(n) {
-  return n.totalPages || n.totalPages === 0 ? n.totalPages : n.page.totalPages;
+function tt(o) {
+  return o.totalPages || o.totalPages === 0 ? o.totalPages : o.page.totalPages;
 }
-function rt(n) {
-  return n.pageable ? n.pageable.pageNumber : n.page.number;
+function rt(o) {
+  return o.pageable ? o.pageable.pageNumber : o.page.number;
 }
-function Tt(n) {
+function Vt(o) {
   const {
     name: e,
     service: t,
     filter: r,
     sort: i,
     transformData: s,
-    onLoadComplete: o,
-    onDestroy: c,
-    filterData: u,
+    onLoadComplete: n,
+    onDestroy: a,
+    filterData: l,
     findAll: p,
     findAllWithSort: C,
     findAllWithFilter: W,
-    findAllWithFilterAndSort: M,
-    initialDataSource: P,
-    pageSize: L = 50,
+    findAllWithFilterAndSort: z,
+    initialDataSource: L,
+    pageSize: P = 50,
     currentPage: N = 0,
-    loadOnStart: d = !0,
+    loadOnStart: c = !0,
     store: f,
     validator: b
-  } = n, V = () => !!(f && f.existsValue(e) || P), K = () => f && f.existsValue(e) ? f.getValue(e) : P || new Je(t, e, {
+  } = o, T = () => !!(f && f.existsValue(e) || L), K = () => f && f.existsValue(e) ? f.getValue(e) : L || new Je(t, e, {
     records: [],
     grandTotalRecords: 0,
     currentPage: N,
     totalPages: 0,
-    pageSize: L,
+    pageSize: P,
     validator: b
-  }), [m, h] = T({
+  }), [m, h] = V({
     dataSource: K(),
     isLoading: !1,
     isError: !1,
@@ -3205,11 +3219,11 @@ function Tt(n) {
     filter: r,
     sort: i,
     currentPage: N,
-    pageSize: L,
-    loadDataCount: V() ? 1 : 0
+    pageSize: P,
+    loadDataCount: T() ? 1 : 0
   }), Y = async (D, S, A, B, y, w, x, $) => {
     let v;
-    M && B && y && y.length > 0 ? v = await M(B, S, A, y) : W && B ? v = await W(B, S, A) : C && y && y.length > 0 ? v = await C(S, A, y) : p ? v = await p(S, A) : B && y && y.length > 0 ? v = await t.findAllWithFilterAndSort(B, S, A, y) : B ? v = await t.findAllWithFilter(B, S, A) : y && y.length > 0 ? v = await t.findAllWithSort(S, A, y) : v = await t.findAll(S, A), u && (v = u(v)), s && (v = s(v)), h((J) => {
+    z && B && y && y.length > 0 ? v = await z(B, S, A, y) : W && B ? v = await W(B, S, A) : C && y && y.length > 0 ? v = await C(S, A, y) : p ? v = await p(S, A) : B && y && y.length > 0 ? v = await t.findAllWithFilterAndSort(B, S, A, y) : B ? v = await t.findAllWithFilter(B, S, A) : y && y.length > 0 ? v = await t.findAllWithSort(S, A, y) : v = await t.findAll(S, A), l && (v = l(v)), s && (v = s(v)), h((J) => {
       const te = {
         records: v.content,
         grandTotalRecords: et(v),
@@ -3234,9 +3248,9 @@ function Tt(n) {
         error: "",
         loadDataCount: J.loadDataCount + 1
       };
-    }), f && f.setValue(e, m.dataSource), o && o(m.dataSource);
+    }), f && f.setValue(e, m.dataSource), n && n(m.dataSource);
   }, Z = (D) => {
-    if (D.type === a.refreshData) {
+    if (D.type === d.refreshData) {
       const S = D.options;
       try {
         h((A) => ({
@@ -3261,7 +3275,7 @@ function Tt(n) {
             isError: !0,
             isLoading: !1,
             error: B
-          })), n.onError && n.onError(B, A);
+          })), o.onError && o.onError(B, A);
         });
       } catch (A) {
         const B = G(A);
@@ -3270,7 +3284,7 @@ function Tt(n) {
           isError: !0,
           isLoading: !1,
           error: B
-        })), n.onError && n.onError(B, A);
+        })), o.onError && o.onError(B, A);
       }
     }
   }, E = (D) => {
@@ -3280,10 +3294,10 @@ function Tt(n) {
   };
   q(() => {
     try {
-      return E(m.dataSource), d && m.loadDataCount === 0 && (h((D) => ({ ...D, isLoading: !0 })), Y(
+      return E(m.dataSource), c && m.loadDataCount === 0 && (h((D) => ({ ...D, isLoading: !0 })), Y(
         m.name,
         N,
-        L,
+        P,
         m.filter,
         m.sort
       ).catch((D) => {
@@ -3293,9 +3307,9 @@ function Tt(n) {
           isError: !0,
           isLoading: !1,
           error: S
-        })), n.onError && n.onError(S, D);
+        })), o.onError && o.onError(S, D);
       })), () => {
-        c && (j(m.dataSource), c(m.dataSource));
+        a && (j(m.dataSource), a(m.dataSource));
       };
     } catch (D) {
       const S = G(D);
@@ -3304,7 +3318,7 @@ function Tt(n) {
         isError: !0,
         isLoading: !1,
         error: S
-      })), n.onError && n.onError(S, D);
+      })), o.onError && o.onError(S, D);
     }
   }, [
     m.name,
@@ -3329,101 +3343,101 @@ function Tt(n) {
     clearError: ee
   };
 }
-function Ot(n) {
-  return Me((e) => e.get(n));
+function Ot(o) {
+  return ze((e) => e.get(o));
 }
-function Pt(n) {
+function Lt(o) {
   q(() => {
-    n();
+    o();
   }, []);
 }
-function Lt(n, e) {
+function Pt(o, e) {
   q(() => {
-    n();
+    o();
   }, e);
 }
-function Bt(n) {
+function Bt(o) {
   q(() => () => {
-    n();
+    o();
   }, []);
 }
 function $t() {
-  const [, n] = T(0);
-  return l(() => {
-    n((t) => t + 1);
+  const [, o] = V(0);
+  return u(() => {
+    o((t) => t + 1);
   }, []);
 }
-const it = (n) => (n + 1) % 1e6;
+const it = (o) => (o + 1) % 1e6;
 function st() {
-  const [, n] = ze(it, 0);
-  return n;
+  const [, o] = Me(it, 0);
+  return o;
 }
 function Nt() {
   return st();
 }
-const nt = je((n, e) => ({
+const nt = je((o, e) => ({
   values: /* @__PURE__ */ new Map(),
-  setValue: (t, r) => n((i) => {
+  setValue: (t, r) => o((i) => {
     const s = new Map(i.values);
     return s.set(t, r), { values: s };
   }),
   getValue: (t) => e().values.get(t),
   existsValue: (t) => e().values.has(t),
-  clearValue: (t) => n((r) => {
+  clearValue: (t) => o((r) => {
     const i = new Map(r.values);
     return i.delete(t), { values: i };
   }),
-  clearAllValues: () => n((t) => ({ values: /* @__PURE__ */ new Map() })),
-  reset: () => n((t) => ({ values: /* @__PURE__ */ new Map() }))
-})), ot = ke(nt), Ht = (n = "default") => {
+  clearAllValues: () => o((t) => ({ values: /* @__PURE__ */ new Map() })),
+  reset: () => o((t) => ({ values: /* @__PURE__ */ new Map() }))
+})), ot = _e(nt), Ht = (o = "default") => {
   const e = ot();
   return { setValue: (p, C) => {
-    e.setValue(`${n}.${p}`, C);
-  }, getValue: (p) => e.getValue(`${n}.${p}`), clearValue: (p) => {
-    e.clearValue(`${n}.${p}`);
-  }, existsValue: (p) => e.existsValue(`${n}.${p}`), clearAllValues: () => {
+    e.setValue(`${o}.${p}`, C);
+  }, getValue: (p) => e.getValue(`${o}.${p}`), clearValue: (p) => {
+    e.clearValue(`${o}.${p}`);
+  }, existsValue: (p) => e.existsValue(`${o}.${p}`), clearAllValues: () => {
     for (const [p, C] of e.values.entries())
-      p.startsWith(`${n}.`) && e.clearValue(p);
+      p.startsWith(`${o}.`) && e.clearValue(p);
   }, reset: () => {
     e.clearAllValues();
   }, values: e.values };
 };
-function Wt(n, e, t = window) {
+function Wt(o, e, t = window) {
   const r = ce(e);
   q(() => {
     r.current = e;
   }, [e]), q(
     () => {
       if (t && t.addEventListener && r.current) {
-        const s = (o) => r.current(o);
-        return t.addEventListener(n, s), () => {
-          t.removeEventListener(n, s);
+        const s = (n) => r.current(n);
+        return t.addEventListener(o, s), () => {
+          t.removeEventListener(o, s);
         };
       }
     },
-    [n, t]
+    [o, t]
     // Executa novamente se eventName ou elemento mudar
   );
 }
 export {
   jt as ADVANCED,
-  kt as ARCHBASE_IOC_API_TYPE,
+  _t as ARCHBASE_IOC_API_TYPE,
   xt as ARCHBASE_QUERY_DEFAULTS,
   be as ArchbaseAxiosRemoteApiClient,
   ye as ArchbaseDataSource,
-  U as ArchbaseDataSourceV2,
+  k as ArchbaseDataSourceV2,
   Ge as ArchbaseLocalFilterDataSource,
   At as ArchbaseQueryUtils,
   Ke as ArchbaseRemoteApiService,
   Ae as ArchbaseRemoteDataSource,
   Qe as ArchbaseRemoteDataSourceV2,
   Je as ArchbaseRemoteFilterDataSource,
-  a as DataSourceEventNames,
+  d as DataSourceEventNames,
   le as DefaultPage,
-  Ut as FILTER_TYPE,
-  _e as LocalFilter,
+  kt as FILTER_TYPE,
+  Ue as LocalFilter,
   vt as MigrationValidation,
-  _t as NORMAL,
+  Ut as NORMAL,
   Gt as QUICK,
   qe as RemoteFilter,
   It as USAGE_EXAMPLE,
@@ -3433,17 +3447,17 @@ export {
   xe as useArchbaseDataSourceV2,
   Et as useArchbaseDataSourceV2Editor,
   wt as useArchbaseDataSourceV2ReadOnly,
-  Pt as useArchbaseDidMount,
-  Lt as useArchbaseDidUpdate,
+  Lt as useArchbaseDidMount,
+  Pt as useArchbaseDidUpdate,
   Wt as useArchbaseEventListener,
   $t as useArchbaseForceRerender,
   Nt as useArchbaseForceUpdate,
   Dt as useArchbaseLocalFilterDataSource,
-  Vt as useArchbaseRemoteDataSource,
+  Tt as useArchbaseRemoteDataSource,
   Ce as useArchbaseRemoteDataSourceV2,
   Ft as useArchbaseRemoteDataSourceV2Editor,
   St as useArchbaseRemoteDataSourceV2ReadOnly,
-  Tt as useArchbaseRemoteFilterDataSource,
+  Vt as useArchbaseRemoteFilterDataSource,
   Ot as useArchbaseRemoteServiceApi,
   Ht as useArchbaseStore,
   yt as useArchbaseV1V2Compatibility,