@archbase/data 4.0.1 → 4.0.3

package/dist/index.js

@@ -1,22 +1,22 @@
-import { isDate as we, parseISO as Ee } from "date-fns";
-import { EventEmitter as Le } from "events";
-import { uniqueId as Be, cloneDeep as $e } from "lodash";
-import { archbaseI18next as m, ArchbaseDataSourceError as g, ArchbaseObjectHelper as ye, processErrorMessage as G, QUICK as Se, NORMAL as Fe, ADVANCED as Ae, ArchbaseFilterDSL as xe, QueryFilterEntity as ue, detectDataSourceVersion as ve, MigrationMetrics as Ne, ARCHBASE_IOC_API_TYPE as He, ArchbaseJacksonParser as ie } from "@archbase/core";
-import { ADVANCED as Mt, ARCHBASE_IOC_API_TYPE as jt, FILTER_TYPE as kt, NORMAL as Ut, QUICK as Gt, useArchbaseBool as qt } from "@archbase/core";
-import { useState as C, useCallback as l, useRef as le, useMemo as H, useEffect as J, useReducer as We } from "react";
-import { produce as _ } from "immer";
+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 { produce as Q } from "immer";
 import "reflect-metadata";
-import Y from "axios";
+import X from "axios";
 import * as ne from "inversify";
-import { useContainer as ze } from "inversify-react";
-import { create as Me } from "zustand";
-import { createTrackedSelector as je } from "react-tracked";
-var d = /* @__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))(d || {});
-class ke {
+import { useContainer as Me } 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 {
   eventEmitter;
   listenersDisable = !1;
   constructor() {
-    this.eventEmitter = new Le();
+    this.eventEmitter = new Be();
   }
   disabledAllListeners() {
     return this.listenersDisable = !0, this;
@@ -46,7 +46,7 @@ class ke {
     return this.eventEmitter.removeAllListeners(e), this;
   }
 }
-class Ie {
+class ye {
   fieldEventListeners;
   records;
   filteredRecords;
@@ -79,14 +79,14 @@ class Ie {
   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 ke(), this.uuid = Be(), 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 Ue(), 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 : [];
   }
   validateDataSourceActive(e) {
     if (!this.isActive()) {
-      const t = m.t("archbase:operationNotAllowed", { dataSourceName: this.name, operation: e });
+      const t = R.t("archbase:operationNotAllowed", { dataSourceName: this.name, operation: e });
       throw this.publishEventError(t, {}), new g(t);
     }
   }
@@ -99,7 +99,7 @@ class Ie {
    */
   clear() {
     if (!this.isActive()) {
-      const e = m.t("archbase:operationNotAllowed", { dataSourceName: this.name, operation: "clear" });
+      const e = R.t("archbase:operationNotAllowed", { dataSourceName: this.name, operation: "clear" });
       throw this.publishEventError(e, {}), new g(e);
     }
     this.emitter.emit("beforeClose"), this.emit({
@@ -151,7 +151,7 @@ class Ie {
   }
   goToRecord(e) {
     if (this.validateDataSourceActive("goToRecord"), this.inserting || this.editing || this.isBOF() || this.isEOF()) {
-      const t = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const t = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     e <= this.getTotalRecords() - 1 && (this.currentRecordIndex = e, this.emitter.emit("afterScroll"), this.emit({
@@ -190,7 +190,7 @@ class Ie {
   }
   append(e) {
     if (this.validateDataSourceActive("append"), this.inserting || this.editing) {
-      const t = m.t("archbase:insertRecordIsNotAllowed", { dataSourceName: this.name });
+      const t = R.t("archbase:insertRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     return this.emitter.emit("beforeAppend", e), this.emit({ type: 8, record: e }), this.records.push(e), this.filteredRecords = this.applyFilters(), this.grandTotalRecords++, this.filteredRecords.forEach((t, r) => {
@@ -209,7 +209,7 @@ class Ie {
   }
   insert(e) {
     if (this.validateDataSourceActive("insert"), this.inserting || this.editing) {
-      const r = m.t("archbase:insertRecordIsNotAllowed", { dataSourceName: this.name });
+      const r = R.t("archbase:insertRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     this.emitter.emit("beforeInsert"), this.emit({
@@ -228,26 +228,26 @@ class Ie {
   }
   edit() {
     if (this.validateDataSourceActive("edit"), this.inserting || this.editing) {
-      const e = m.t("archbase:editRecordIsNotAllowed", { dataSourceName: this.name });
+      const e = R.t("archbase:editRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     if (this.isEmpty() || !this.currentRecord) {
-      const e = m.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
+      const e = R.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     if (this.isBOF()) {
-      const e = m.t("archbase:BOFDataSource", { dataSourceName: this.name });
+      const e = R.t("archbase:BOFDataSource", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     if (this.isEOF()) {
-      const e = m.t("archbase:EOFDataSource", { dataSourceName: this.name });
+      const e = R.t("archbase:EOFDataSource", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     return this.emitter.emit("beforeEdit", this.currentRecord, this.currentRecordIndex), this.emit({
       type: 14,
       record: this.currentRecord,
       index: this.getCurrentIndex()
-    }), this.editing = !0, this.currentRecord = $e(this.currentRecord), this.emitter.emit("afterEdit", this.currentRecord, this.getCurrentIndex()), this.emit({
+    }), this.editing = !0, this.currentRecord = Ne(this.currentRecord), this.emitter.emit("afterEdit", this.currentRecord, this.getCurrentIndex()), this.emit({
       type: 15,
       record: this.currentRecord,
       index: this.getCurrentIndex()
@@ -255,19 +255,19 @@ class Ie {
   }
   async remove(e) {
     if (this.validateDataSourceActive("remove"), this.inserting || this.editing) {
-      const s = m.t("archbase:removingRecordIsNotAllowed", { dataSourceName: this.name });
+      const s = R.t("archbase:removingRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(s, {}), new g(s);
     }
     if (this.isEmpty() || !this.currentRecord) {
-      const s = m.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
+      const s = R.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
       throw this.publishEventError(s, {}), new g(s);
     }
     if (this.isBOF()) {
-      const s = m.t("archbase:BOFDataSource", { dataSourceName: this.name });
+      const s = R.t("archbase:BOFDataSource", { dataSourceName: this.name });
       throw this.publishEventError(s, {}), new g(s);
     }
     if (this.isEOF()) {
-      const s = m.t("archbase:EOFDataSource", { dataSourceName: this.name });
+      const s = R.t("archbase:EOFDataSource", { dataSourceName: this.name });
       throw this.publishEventError(s, {}), new g(s);
     }
     this.emitter.emit("beforeRemove", this.currentRecord, this.currentRecordIndex), this.emit({
@@ -306,7 +306,7 @@ class Ie {
   publishEventErrors = (e) => {
     e.forEach((t) => {
       if (t.fieldName) {
-        const r = m.t(t.errorMessage, { keySeparator: !1 });
+        const r = R.t(t.errorMessage, { keySeparator: !1 });
         this.emitter.emit("onFieldError", t.fieldName, r), this.emit({
           type: 22,
           fieldName: t.fieldName,
@@ -314,7 +314,7 @@ class Ie {
           originalError: t
         });
       } else
-        this.publishEventError(m.t(t.errorMessage, { keySeparator: !1 }), t);
+        this.publishEventError(R.t(t.errorMessage, { keySeparator: !1 }), t);
     });
   };
   publishEventError = (e, t) => {
@@ -329,7 +329,7 @@ class Ie {
       const e = this.validator.validateEntity(this.currentRecord);
       if (e && e.length > 0)
         if (this.publishEventErrors(e), e[0].fieldName) {
-          const t = m.t("archbase:errorSavingRecord", { dataSourceName: this.label });
+          const t = R.t("archbase:errorSavingRecord", { dataSourceName: this.label });
           throw new g(t);
         } else
           throw new g(e[0].errorMessage);
@@ -338,11 +338,11 @@ class Ie {
   }
   async save(e) {
     if (this.validateDataSourceActive("save"), !this.inserting && !this.editing) {
-      const r = m.t("archbase:saveRecordIsNotAllowed", { dataSourceName: this.name });
+      const r = R.t("archbase:saveRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     if (!this.currentRecord) {
-      const r = m.t("archbase:noRecordToSave", { dataSourceName: this.name });
+      const r = R.t("archbase:noRecordToSave", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     if (this.emitter.emit("beforeSave", this.currentRecord, this.getCurrentIndex()), this.emit({
@@ -353,7 +353,7 @@ class Ie {
       const r = this.validator.validateEntity(this.currentRecord);
       if (r && r.length > 0)
         if (this.publishEventErrors(r), r[0].fieldName) {
-          const i = m.t("archbase:errorSavingRecord", { dataSourceName: this.label });
+          const i = R.t("archbase:errorSavingRecord", { dataSourceName: this.label });
           throw new g(i);
         } else
           throw new g(r[0].errorMessage);
@@ -371,7 +371,7 @@ class Ie {
   }
   cancel() {
     if (this.validateDataSourceActive("cancel"), !this.inserting && !this.editing) {
-      const e = m.t("archbase:notAllowCancelRecord", { dataSourceName: this.name });
+      const e = R.t("archbase:notAllowCancelRecord", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     return this.emitter.emit("beforeCancel", this.currentRecord, this.currentRecordIndex), this.emit({
@@ -401,7 +401,7 @@ class Ie {
   }
   getFieldValue(e, t = "") {
     if (this.validateDataSourceActive("getFieldValue"), !e) {
-      const s = m.t("archbase:invalidFieldName", { dataSourceName: this.name });
+      const s = R.t("archbase:invalidFieldName", { dataSourceName: this.name });
       throw this.publishEventError(s, {}), new g(s);
     }
     if (this.isEmpty() || this.isBOF() || this.isEOF() && !this.inserting)
@@ -414,20 +414,20 @@ class Ie {
   fieldValueByName(e, t) {
     if (e === void 0)
       return;
-    const r = ye.getNestedProperty(e, t);
+    const r = Re.getNestedProperty(e, t);
     if (r !== void 0)
-      return we(r) ? Ee(r) : r;
+      return ve(r) ? Ie(r) : r;
   }
   setFieldValue(e, t) {
     if (this.validateDataSourceActive("setFieldValue"), this.isEmpty() || !this.currentRecord)
       return this;
     if (!(this.inserting || this.editing || this.isBOF() || this.isEOF())) {
-      const o = m.t("archbase:recordNotBeingEdited", { dataSourceName: this.name });
+      const o = R.t("archbase:recordNotBeingEdited", { dataSourceName: this.name });
       throw this.publishEventError(o, {}), new g(o);
     }
     let r = t;
-    const i = ye.getNestedProperty(this.currentRecord, e);
-    return we(t) && (r = Ee(t)), e.split(".").length > 1 ? ye.setNestedProperty(this.currentRecord, e, r) : this.currentRecord[e] = r, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.emitFieldChangeEvent(e, i, r), this.emitter.emit("fieldChanged", this.currentRecord, this.getCurrentIndex(), e, i, r), this.emit({
+    const i = Re.getNestedProperty(this.currentRecord, e);
+    return ve(t) && (r = Ie(t)), e.split(".").length > 1 ? Re.setNestedProperty(this.currentRecord, e, r) : this.currentRecord[e] = r, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.emitFieldChangeEvent(e, i, r), this.emitter.emit("fieldChanged", this.currentRecord, this.getCurrentIndex(), e, i, r), this.emit({
       type: 3,
       record: this.currentRecord,
       index: this.getCurrentIndex(),
@@ -489,7 +489,7 @@ class Ie {
   }
   next() {
     if (this.validateDataSourceActive("next"), this.inserting || this.editing || this.isBOF() || this.isEOF()) {
-      const e = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const e = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     return this.currentRecordIndex + 1 > this.getTotalRecords() - 1 ? (this.currentRecordIndex++, this.currentRecord = void 0) : (this.currentRecordIndex++, this.currentRecord = this.filteredRecords[this.currentRecordIndex], this.emitter.emit("afterScroll"), this.emit({
@@ -499,7 +499,7 @@ class Ie {
   }
   prior() {
     if (this.validateDataSourceActive("prior"), this.inserting || this.editing || this.isBOF() || this.isEOF()) {
-      const e = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const e = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     return this.currentRecordIndex - 1 < 0 ? (this.currentRecordIndex = -1, this.currentRecord = void 0) : (this.currentRecordIndex--, this.currentRecord = this.filteredRecords[this.currentRecordIndex], this.emitter.emit("afterScroll"), this.emit({
@@ -509,7 +509,7 @@ class Ie {
   }
   first() {
     if (this.validateDataSourceActive("first"), this.inserting || this.editing) {
-      const e = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const e = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     return this.getTotalRecords() === 0 ? (this.currentRecordIndex = -1, this.currentRecord = void 0) : (this.currentRecordIndex = 0, this.currentRecord = this.filteredRecords[this.currentRecordIndex], this.emitter.emit("afterScroll"), this.emit({
@@ -519,7 +519,7 @@ class Ie {
   }
   last() {
     if (this.validateDataSourceActive("last"), this.inserting || this.editing) {
-      const e = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const e = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     return this.getTotalRecords() === 0 ? (this.currentRecordIndex = -1, this.currentRecord = void 0) : (this.currentRecordIndex = this.getTotalRecords() - 1, this.currentRecord = this.filteredRecords[this.currentRecordIndex], this.emitter.emit("afterScroll"), this.emit({
@@ -531,7 +531,7 @@ class Ie {
     if (e === this.currentRecordIndex)
       return this.currentRecord;
     if (this.validateDataSourceActive("gotoRecord"), this.inserting || this.editing || this.isBOF() || this.isEOF()) {
-      const t = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const t = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     if (e < 0 || e >= this.filteredRecords.length) {
@@ -545,7 +545,7 @@ class Ie {
   }
   gotoRecordByData(e) {
     if (this.validateDataSourceActive("gotoRecordByData"), this.inserting || this.editing || this.isBOF() || this.isEOF()) {
-      const r = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const r = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     if (this.isEmpty())
@@ -565,7 +565,7 @@ class Ie {
   }
   locate(e) {
     if (!this.isBrowsing()) {
-      const i = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const i = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(i, {}), new g(i);
     }
     if (this.isEmpty())
@@ -579,7 +579,7 @@ class Ie {
   }
   locateByFilter(e) {
     if (this.validateDataSourceActive("locate"), this.inserting || this.editing) {
-      const r = m.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
+      const r = R.t("archbase:notAllowedBrowseRecords", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     if (this.isEmpty())
@@ -613,8 +613,8 @@ class Ie {
       i = o === 0 ? s : `${i}.${s}`;
       const c = this.fieldEventListeners[`field:${i}`];
       if (c) {
-        const f = c.indexOf(t);
-        f !== -1 && c.splice(f, 1);
+        const u = c.indexOf(t);
+        u !== -1 && c.splice(u, 1);
       }
     }), this;
   }
@@ -624,7 +624,7 @@ class Ie {
     for (const o of i) {
       s = s ? `${s}.${o}` : o;
       const c = this.fieldEventListeners[`field:${s}`];
-      c && c.forEach((f) => f(s, t, r));
+      c && c.forEach((u) => u(s, t, r));
     }
   }
   /**
@@ -641,29 +641,29 @@ class Ie {
     }));
   }
 }
-class Ce extends Ie {
+class Ae extends ye {
   service;
   constructor(e, t, r, i) {
     super(t, r, i), this.service = e;
   }
   async save(e) {
     if (this.validateDataSourceActive("save"), !this.inserting && !this.editing) {
-      const t = m.t("archbase:saveRecordIsNotAllowed", { dataSourceName: this.name });
+      const t = R.t("archbase:saveRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     if (!this.currentRecord) {
-      const t = m.t("archbase:noRecordToSave", { dataSourceName: this.name });
+      const t = R.t("archbase:noRecordToSave", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     if (this.emitter.emit("beforeSave", this.currentRecord), this.emit({
-      type: d.beforeSave,
+      type: a.beforeSave,
       record: this.currentRecord,
       index: this.getCurrentIndex()
     }), this.validator) {
       const t = this.validator.validateEntity(this.currentRecord);
       if (t && t.length > 0)
         if (this.publishEventErrors(t), t[0].fieldName) {
-          const r = m.t("archbase:errorSavingRecord", { dataSourceName: this.label });
+          const r = R.t("archbase:errorSavingRecord", { dataSourceName: this.label });
           throw new g(r);
         } else
           throw new g(t[0].errorMessage);
@@ -674,16 +674,16 @@ class Ce extends Ie {
         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);
       }), 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: d.afterSave,
+        type: a.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 = m.t(i.message, { defaultValue: i.message });
+          const s = R.t(i.message, { defaultValue: i.message });
           this.emitter.emit("onFieldError", i.field, s), this.emit({
-            type: d.onFieldError,
+            type: a.onFieldError,
             fieldName: i.field,
             error: s,
             originalError: i.message
@@ -692,7 +692,7 @@ class Ce extends Ie {
       });
       const r = G(t);
       throw this.emitter.emit("onError", r, t), this.emit({
-        type: d.onError,
+        type: a.onError,
         error: r,
         originalError: t
       }), e && e(r), new g(r);
@@ -701,25 +701,25 @@ class Ce extends Ie {
   }
   async remove(e) {
     if (this.validateDataSourceActive("remove"), this.inserting || this.editing) {
-      const t = m.t("archbase:removingRecordIsNotAllowed", { dataSourceName: this.name });
+      const t = R.t("archbase:removingRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(
         t
       );
     }
     if (this.isEmpty() || !this.currentRecord) {
-      const t = m.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
+      const t = R.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     if (this.isBOF()) {
-      const t = m.t("archbase:BOFDataSource", { dataSourceName: this.name });
+      const t = R.t("archbase:BOFDataSource", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     if (this.isEOF()) {
-      const t = m.t("archbase:EOFDataSource", { dataSourceName: this.name });
+      const t = R.t("archbase:EOFDataSource", { dataSourceName: this.name });
       throw this.publishEventError(t, {}), new g(t);
     }
     this.emitter.emit("beforeRemove", this.currentRecord, this.currentRecordIndex), this.emit({
-      type: d.beforeRemove,
+      type: a.beforeRemove,
       record: this.currentRecord,
       index: this.getCurrentIndex()
     });
@@ -729,25 +729,25 @@ class Ce extends Ie {
       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: d.afterScroll }), this.emitter.emit("afterRemove", r, i), this.emit({
-        type: d.afterRemove,
+      }), 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,
         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: d.onError,
+        type: a.onError,
         error: r,
         originalError: t
       }), e && e(r), new g(r);
     }
   }
   applyRemoteFilter(e, t, r) {
-    return e && e.filter.filterType === Se && e.filter.quickFilterText && e.filter.quickFilterText !== "" ? this.getDataWithQuickFilter(e, t) : e && (e.filter.filterType === Fe || e.filter.filterType === Ae) ? this.getDataWithFilter(e, t) : this.getDataWithoutFilter(t);
+    return e && e.filter.filterType === we && e.filter.quickFilterText && e.filter.quickFilterText !== "" ? this.getDataWithQuickFilter(e, t) : e && (e.filter.filterType === Ee || e.filter.filterType === Se) ? this.getDataWithFilter(e, t) : this.getDataWithoutFilter(t);
   }
   async getDataWithFilter(e, t) {
-    const r = new xe();
+    const r = new Fe();
     r.buildFrom(e.filter, e.sort);
     const i = r.toJSON();
     let s;
@@ -770,7 +770,7 @@ class Ce extends Ie {
     return e && e.sort ? e.sort.quickFilterSort : this.defaultSortFields;
   }
 }
-class Ue {
+class _e {
   id;
   companyId;
   filter;
@@ -788,13 +788,13 @@ class Ue {
     Object.assign(this, e);
   }
 }
-class Ge extends Ie {
+class Ge extends ye {
   getFilterById(e) {
     if (this.locate({ id: e }))
       return this.convertCurrentRecordToFilter();
   }
   convertCurrentRecordToFilter() {
-    return new ue({
+    return new he({
       id: this.getFieldValue("id"),
       name: this.getFieldValue("name"),
       description: this.getFieldValue("description"),
@@ -808,7 +808,7 @@ class Ge extends Ie {
   }
   async addNewFilter(e, t) {
     this.insert(
-      new Ue({
+      new _e({
         id: e.id,
         name: e.name,
         description: e.description,
@@ -842,7 +842,7 @@ class Ge extends Ie {
   }
   getFilters() {
     return this.getTotalRecords() > 0 ? this.browseRecords().map(
-      (e) => new ue({
+      (e) => new he({
         id: e.id,
         name: e.name,
         description: e.description,
@@ -875,13 +875,13 @@ class qe {
     Object.assign(this, e);
   }
 }
-class _e extends Ce {
+class Je extends Ae {
   getFilterById(e) {
     if (this.locate({ id: e }))
       return this.convertCurrentRecordToFilter();
   }
   convertCurrentRecordToFilter() {
-    return new ue({
+    return new he({
       id: this.getFieldValue("id"),
       name: this.getFieldValue("name"),
       description: this.getFieldValue("description"),
@@ -932,7 +932,7 @@ class _e extends Ce {
   }
   getFilters() {
     return this.getTotalRecords() > 0 ? this.browseRecords().map(
-      (e) => new ue({
+      (e) => new he({
         id: e.id,
         name: e.name,
         description: e.description,
@@ -946,41 +946,41 @@ class _e extends Ce {
     ) : [];
   }
 }
-function pt(n, e, t, r) {
-  const i = e && ("appendToFieldArray" in e || "updateFieldArrayItem" in e), [s, o] = C(r), [, c] = C(0), f = l(() => {
-    c((u) => u + 1);
-  }, []), [R, b] = C(r), [N, W] = C(0), T = l(() => {
-    let u = r;
-    e && t && (u = e.getFieldValue(t), u == null && (u = r)), i ? (b(u), W((a) => a + 1)) : o(u);
-  }, [e, t, r, i]), O = l((u) => {
-    e && t && ((u.type === d.dataChanged || u.type === d.recordChanged || u.type === d.afterScroll || u.type === d.afterCancel || u.type === d.afterEdit) && (T(), i || f()), u.type === d.onFieldError && u.fieldName === t && console.warn(`[${n}] Field error:`, u.error));
-  }, [e, t, T, f, i, n]), $ = l((u, a) => {
-    i ? (b(u), e && !e.isBrowsing() && t && e.getFieldValue(t) !== u && e.setFieldValue(t, u)) : (o(u), e && !e.isBrowsing() && t && e.getFieldValue(t) !== u && e.setFieldValue(t, u));
-  }, [e, t, i]), z = l(() => {
-    const u = ve(e);
-    Ne.trackV2Usage(n, u);
+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(() => {
+    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(() => {
+    const f = pe(e);
+    He.trackV2Usage(n, f);
   }, [n, e]);
-  return le(() => {
-    process.env.NODE_ENV === "production" && z();
+  return ce(() => {
+    process.env.NODE_ENV === "production" && d();
   }).current, {
     // Detecção de versão
     isDataSourceV2: i,
-    dataSourceVersion: ve(e),
+    dataSourceVersion: pe(e),
     // Estados
-    currentValue: i ? R : s,
-    v1State: { currentValue: s, setCurrentValue: o, forceUpdate: f },
-    v2State: { v2Value: R, setV2Value: b, v2ShouldUpdate: N },
+    currentValue: i ? p : s,
+    v1State: { currentValue: s, setCurrentValue: o, forceUpdate: u },
+    v2State: { v2Value: p, setV2Value: C, v2ShouldUpdate: W },
     // Funções
-    loadDataSourceFieldValue: T,
-    dataSourceEvent: O,
-    handleValueChange: $,
+    loadDataSourceFieldValue: P,
+    dataSourceEvent: L,
+    handleValueChange: N,
     // Utilitários
     isReadOnly: e ? e.isBrowsing() : !1,
     isEditing: e ? e.isEditing() : !1,
-    trackUsage: z
+    trackUsage: d
   };
 }
-const yt = {
+const vt = {
   /**
    * Valida se o componente está seguindo o padrão corretamente
    */
@@ -991,13 +991,13 @@ const yt = {
   /**
    * Testa se o comportamento V1 está preservado
    */
-  testV1Compatibility: (n, e) => !e || ve(e) !== "V1" || [
+  testV1Compatibility: (n, 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)
-}, vt = `
+}, It = `
 // Em qualquer componente que use DataSource:
 
 import { useArchbaseV1V2Compatibility } from '../core/patterns/ArchbaseV1V2CompatibilityPattern';
@@ -1050,7 +1050,7 @@ export function MyComponent<T, ID>({ dataSource, dataField, value, onChangeValue
   );
 }
 `;
-class k {
+class U {
   name;
   label;
   records = [];
@@ -1098,24 +1098,24 @@ class k {
   // =================== Navigation ===================
   first() {
     return this.records.length > 0 && (this.currentIndex = 0, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     })), this;
   }
   last() {
     return this.records.length > 0 && (this.currentIndex = this.records.length - 1, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     })), this;
   }
   next() {
     return this.currentIndex < this.records.length - 1 && (this.currentIndex++, this.emit({
-      type: d.recordChanged,
+      type: a.recordChanged,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     })), this;
   }
   prior() {
     return this.currentIndex > 0 && (this.currentIndex--, this.emit({
-      type: d.recordChanged,
+      type: a.recordChanged,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     })), this;
@@ -1123,7 +1123,7 @@ class k {
   goToRecord(e) {
     if (e >= 0 && e < this.records.length)
       return this.currentIndex = e, this.emit({
-        type: d.recordChanged,
+        type: a.recordChanged,
         record: this.getCurrentRecord(),
         index: this.currentIndex
       }), this.getCurrentRecord();
@@ -1154,27 +1154,27 @@ class k {
     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: d.beforeEdit,
+      type: a.beforeEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this.emit({
-      type: d.afterEdit,
+      type: a.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: d.afterCancel,
+      type: a.afterCancel,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this;
   }
   insert(e) {
     return this.validateDataSourceActive("insert"), this.state = "insert", this.emit({
-      type: d.beforeInsert
+      type: a.beforeInsert
     }), this.records = [...this.records, e], this.currentIndex = this.records.length - 1, this.notifyStateChange(), this.emit({
-      type: d.afterInsert,
+      type: a.afterInsert,
       record: e,
       index: this.currentIndex
     }), this;
@@ -1186,7 +1186,7 @@ class k {
       throw new Error(`No record to save in DataSource ${this.name}`);
     const t = this.getCurrentRecord();
     if (this.emit({
-      type: d.beforeSave,
+      type: a.beforeSave,
       record: t,
       index: this.getCurrentIndex()
     }), this.validator) {
@@ -1195,7 +1195,7 @@ class k {
         throw new Error(r[0].errorMessage);
     }
     return this.state = "browse", this.originalRecord = null, this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), this.notifyStateChange(), this.emit({
-      type: d.afterSave,
+      type: a.afterSave,
       record: t,
       index: this.getCurrentIndex()
     }), e && e(), t;
@@ -1207,11 +1207,11 @@ class k {
       throw new Error(`No records to remove in DataSource ${this.name}`);
     const t = this.getCurrentRecord(), r = this.currentIndex;
     return this.emit({
-      type: d.beforeRemove,
+      type: a.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: d.afterScroll }), this.emit({
-      type: d.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: a.afterScroll }), this.emit({
+      type: a.afterRemove,
       record: t,
       index: r
     }), e && e(), t;
@@ -1224,19 +1224,16 @@ class k {
     if (r === t)
       return this;
     const i = [...this.records];
-    return this.records = _(this.records, (s) => {
+    return this.records = Q(this.records, (s) => {
       const o = s[this.currentIndex];
       o && this.setNestedValue(o, e, t);
     }), this.notifyStateChange(i), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: t,
       record: this.getCurrentRecord(),
       index: this.currentIndex
-    }), this.emit({
-      type: d.dataChanged,
-      data: this.records
     }), this;
   }
   getFieldValue(e) {
@@ -1256,14 +1253,14 @@ class k {
     if (!Array.isArray(r))
       throw new Error(`Field ${String(e)} is not an array (found: ${typeof r})`);
     const i = [...this.records];
-    this.records = _(this.records, (s) => {
+    this.records = Q(this.records, (s) => {
       const o = s[this.currentIndex];
       if (o) {
         const c = this.getNestedValue(o, e);
         c && c.push(t);
       }
     }), this.notifyStateChange(i), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: [...r, t],
@@ -1278,14 +1275,14 @@ class k {
     if (!Array.isArray(i) || t < 0 || t >= i.length)
       return;
     const s = [...this.records];
-    this.records = _(this.records, (o) => {
+    this.records = Q(this.records, (o) => {
       const c = o[this.currentIndex];
       if (c) {
-        const f = this.getNestedValue(c, e);
-        f[t] !== void 0 && r(f[t]);
+        const u = this.getNestedValue(c, e);
+        u[t] !== void 0 && r(u[t]);
       }
     }), this.notifyStateChange(s), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1302,11 +1299,11 @@ class k {
     if (t < 0 || t >= r.length)
       return;
     const i = [...this.records];
-    this.records = _(this.records, (s) => {
+    this.records = Q(this.records, (s) => {
       const o = s[this.currentIndex];
       o && this.getNestedValue(o, e).splice(t, 1);
     }), this.notifyStateChange(i), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: this.getFieldValue(e),
@@ -1321,11 +1318,11 @@ class k {
     if (!Array.isArray(i))
       throw new Error(`Field ${String(e)} is not an array`);
     const s = [...this.records];
-    this.records = _(this.records, (o) => {
+    this.records = Q(this.records, (o) => {
       const c = o[this.currentIndex];
       c && this.getNestedValue(c, e).splice(t, 0, r);
     }), this.notifyStateChange(s), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1351,7 +1348,7 @@ class k {
   }
   clear() {
     this.records = [], this.currentIndex = -1, this.state = "browse", this.originalRecord = null, this.emit({
-      type: d.dataChanged,
+      type: a.dataChanged,
       data: this.records
     });
   }
@@ -1361,7 +1358,7 @@ class k {
    */
   setData(e) {
     this.records = [...e.records || []], this.currentIndex = this.records.length > 0 ? 0 : -1, this.state = "browse", this.originalRecord = null, this.emit({
-      type: d.dataChanged,
+      type: a.dataChanged,
       data: this.records
     });
   }
@@ -1399,7 +1396,7 @@ class k {
   gotoRecordByData(e) {
     const t = this.records.findIndex((r) => r === e);
     return t >= 0 ? (this.currentIndex = t, this.emit({
-      type: d.recordChanged,
+      type: a.recordChanged,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), !0) : !1;
@@ -1412,7 +1409,7 @@ class k {
   }
   addFieldChangeListener(e, t) {
     const r = (i) => {
-      i.type === d.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
+      i.type === a.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
     };
     return this.addListener(r), this;
   }
@@ -1439,7 +1436,7 @@ class k {
         }
       if (i)
         return this.currentIndex = t, this.emit({
-          type: d.recordChanged,
+          type: a.recordChanged,
           record: this.getCurrentRecord(),
           index: this.currentIndex
         }), !0;
@@ -1450,7 +1447,7 @@ class k {
     for (let t = 0; t < this.records.length; t++)
       if (e(this.records[t]))
         return this.currentIndex = t, this.emit({
-          type: d.recordChanged,
+          type: a.recordChanged,
           record: this.getCurrentRecord(),
           index: this.currentIndex
         }), !0;
@@ -1482,7 +1479,7 @@ class k {
   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: d.dataChanged,
+      type: a.dataChanged,
       data: this.records
     });
   }
@@ -1525,7 +1522,7 @@ class k {
     return i;
   }
 }
-class Je {
+class Qe {
   name;
   label;
   service;
@@ -1579,27 +1576,27 @@ class Je {
   // =================== Navigation ===================
   first() {
     this.filteredRecords.length > 0 && (this.currentIndex = 0, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     }));
   }
   last() {
     this.filteredRecords.length > 0 && (this.currentIndex = this.filteredRecords.length - 1, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     }));
   }
   next() {
     this.currentIndex < this.filteredRecords.length - 1 && (this.currentIndex++, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     }));
   }
   prior() {
     this.currentIndex > 0 && (this.currentIndex--, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     }));
   }
   goToRecord(e) {
     e >= 0 && e < this.filteredRecords.length && (this.currentIndex = e, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     }));
   }
   isFirst() {
@@ -1626,15 +1623,15 @@ class Je {
   }
   edit() {
     if (this.validateDataSourceActive("edit"), this.isEmpty() || !this.getCurrentRecord()) {
-      const e = m.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
+      const e = R.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
       throw this.publishEventError(e, {}), new g(e);
     }
     this.state = "edit", this.originalRecord = JSON.parse(JSON.stringify(this.getCurrentRecord())), this.emit({
-      type: d.beforeEdit,
+      type: a.beforeEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     }), this.emit({
-      type: d.afterEdit,
+      type: a.afterEdit,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     });
@@ -1649,16 +1646,16 @@ class Je {
     } 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: d.afterCancel,
+      type: a.afterCancel,
       record: this.getCurrentRecord(),
       index: this.currentIndex
     });
   }
   insert(e) {
     this.validateDataSourceActive("insert"), this.state = "insert", this.emit({
-      type: d.beforeInsert
+      type: a.beforeInsert
     }), this.filteredRecords = [...this.filteredRecords, e], this.records = [...this.records, e], this.currentIndex = this.filteredRecords.length - 1, this.grandTotalRecords++, this.notifyStateChange(), this.emit({
-      type: d.afterInsert,
+      type: a.afterInsert,
       record: e,
       index: this.currentIndex
     });
@@ -1666,40 +1663,40 @@ class Je {
   // =================== Remote CRUD Operations ===================
   async save(e) {
     if (this.validateDataSourceActive("save"), !this.isInserting() && !this.isEditing()) {
-      const r = m.t("archbase:saveRecordIsNotAllowed", { dataSourceName: this.name });
+      const r = R.t("archbase:saveRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     if (!this.getCurrentRecord()) {
-      const r = m.t("archbase:noRecordToSave", { dataSourceName: this.name });
+      const r = R.t("archbase:noRecordToSave", { dataSourceName: this.name });
       throw this.publishEventError(r, {}), new g(r);
     }
     const t = this.getCurrentRecord();
     if (this.emit({
-      type: d.beforeSave,
+      type: a.beforeSave,
       record: t,
       index: this.getCurrentIndex()
     }), this.validator) {
       const r = this.validator.validateEntity(t);
       if (r && r.length > 0)
         if (this.publishEventErrors(r), r[0].fieldName) {
-          const i = m.t("archbase:errorSavingRecord", { dataSourceName: this.label });
+          const i = R.t("archbase:errorSavingRecord", { dataSourceName: this.label });
           throw new g(i);
         } else
           throw new g(r[0].errorMessage);
     }
     try {
       const r = await this.service.save(t);
-      this.filteredRecords = _(this.filteredRecords, (s) => {
+      this.filteredRecords = Q(this.filteredRecords, (s) => {
         s[this.currentIndex] = r;
       });
       let i = -1;
       return this.records.forEach((s, o) => {
-        const c = this.service.getId(s), f = this.service.getId(t);
-        (s === t || c !== void 0 && c === f) && (i = o);
-      }), this.records = _(this.records, (s) => {
+        const c = this.service.getId(s), u = this.service.getId(t);
+        (s === t || c !== void 0 && c === u) && (i = o);
+      }), 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: d.afterSave,
+        type: a.afterSave,
         record: r,
         index: this.getCurrentIndex()
       }), e && e(), r;
@@ -1709,16 +1706,16 @@ class Je {
   }
   async remove(e) {
     if (this.validateDataSourceActive("remove"), this.isInserting() || this.isEditing()) {
-      const i = m.t("archbase:removingRecordIsNotAllowed", { dataSourceName: this.name });
+      const i = R.t("archbase:removingRecordIsNotAllowed", { dataSourceName: this.name });
       throw this.publishEventError(i, {}), new g(i);
     }
     if (this.isEmpty() || !this.getCurrentRecord()) {
-      const i = m.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
+      const i = R.t("archbase:noRecordsToEdit", { dataSourceName: this.name });
       throw this.publishEventError(i, {}), new g(i);
     }
     const t = this.getCurrentRecord(), r = this.currentIndex;
     this.emit({
-      type: d.beforeRemove,
+      type: a.beforeRemove,
       record: t,
       index: r
     });
@@ -1727,15 +1724,15 @@ class Je {
       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: d.afterScroll }), this.emit({
-        type: d.afterRemove,
+      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,
         record: t,
         index: r
       }), e && e(), t;
     } catch (i) {
       const s = G(i);
       throw this.emit({
-        type: d.onError,
+        type: a.onError,
         error: s,
         originalError: i
       }), e && e(s), new g(s);
@@ -1749,7 +1746,7 @@ class Je {
     if (r === t)
       return;
     const i = [...this.filteredRecords];
-    if (this.filteredRecords = _(this.filteredRecords, (s) => {
+    if (this.filteredRecords = Q(this.filteredRecords, (s) => {
       const o = s[this.currentIndex];
       o && this.setNestedValue(o, e, t);
     }), this.state === "edit" || this.state === "insert") {
@@ -1758,21 +1755,18 @@ class Je {
         const o = this.records.findIndex(
           (c) => this.service.getId(c) === s
         );
-        o >= 0 && (this.records = _(this.records, (c) => {
+        o >= 0 && (this.records = Q(this.records, (c) => {
           this.setNestedValue(c[o], e, t);
         }));
       }
     }
     this.notifyStateChange(i), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: t,
       record: this.getCurrentRecord(),
       index: this.currentIndex
-    }), this.emit({
-      type: d.dataChanged,
-      data: this.filteredRecords
     });
   }
   getFieldValue(e) {
@@ -1792,14 +1786,14 @@ class Je {
     if (!Array.isArray(r))
       throw new Error(`Field ${String(e)} is not an array (found: ${typeof r})`);
     const i = [...this.filteredRecords];
-    this.filteredRecords = _(this.filteredRecords, (s) => {
+    this.filteredRecords = Q(this.filteredRecords, (s) => {
       const o = s[this.currentIndex];
       if (o) {
         const c = this.getNestedValue(o, e);
         c && c.push(t);
       }
     }), this.notifyStateChange(i), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: [...r, t],
@@ -1814,14 +1808,14 @@ class Je {
     if (!Array.isArray(i) || t < 0 || t >= i.length)
       return;
     const s = [...this.filteredRecords];
-    this.filteredRecords = _(this.filteredRecords, (o) => {
+    this.filteredRecords = Q(this.filteredRecords, (o) => {
       const c = o[this.currentIndex];
       if (c) {
-        const f = this.getNestedValue(c, e);
-        f[t] !== void 0 && r(f[t]);
+        const u = this.getNestedValue(c, e);
+        u[t] !== void 0 && r(u[t]);
       }
     }), this.notifyStateChange(s), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1838,11 +1832,11 @@ class Je {
     if (t < 0 || t >= r.length)
       return;
     const i = [...this.filteredRecords];
-    this.filteredRecords = _(this.filteredRecords, (s) => {
+    this.filteredRecords = Q(this.filteredRecords, (s) => {
       const o = s[this.currentIndex];
       o && this.getNestedValue(o, e).splice(t, 1);
     }), this.notifyStateChange(i), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: r,
       newValue: this.getFieldValue(e),
@@ -1857,11 +1851,11 @@ class Je {
     if (!Array.isArray(i))
       throw new Error(`Field ${String(e)} is not an array`);
     const s = [...this.filteredRecords];
-    this.filteredRecords = _(this.filteredRecords, (o) => {
+    this.filteredRecords = Q(this.filteredRecords, (o) => {
       const c = o[this.currentIndex];
       c && this.getNestedValue(c, e).splice(t, 0, r);
     }), this.notifyStateChange(s), this.emit({
-      type: d.fieldChanged,
+      type: a.fieldChanged,
       fieldName: e,
       oldValue: i,
       newValue: this.getFieldValue(e),
@@ -1899,6 +1893,25 @@ class Je {
     }
     console.log("[V2 refreshData] Chamando getDataWithoutFilter para página:", t), this.getDataWithoutFilter(t);
   }
+  /**
+   * Carrega um registro específico pelo ID.
+   * Útil para cenários onde se deseja editar um registro específico.
+   *
+   * @param id ID do registro a ser carregado
+   * @returns Promise com o registro carregado ou undefined se não encontrado
+   */
+  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;
+    } catch (t) {
+      throw console.error("[V2 loadById] Erro ao buscar registro:", t), this.handleRemoteError(t), t;
+    }
+  }
   /**
    * Carrega dados com filtro RSQL
    */
@@ -1942,7 +1955,7 @@ class Je {
       return;
     }
     const s = e.filter.filterType, o = e.filter.quickFilterText;
-    s === Se && o && o !== "" ? this.getDataWithQuickFilter(e, t, r) : s === Fe || s === Ae ? this.getDataWithFilter(e, t, r) : this.getDataWithoutFilter(t, r);
+    s === we && o && o !== "" ? this.getDataWithQuickFilter(e, t, r) : s === Ee || s === Se ? this.getDataWithFilter(e, t, r) : this.getDataWithoutFilter(t, r);
   }
   // =================== Event Management ===================
   addListener(e) {
@@ -1951,6 +1964,24 @@ class Je {
   removeListener(e) {
     this.listeners.delete(e);
   }
+  /**
+   * Adiciona um listener para mudanças em um campo específico.
+   * Permite que componentes escutem apenas mudanças no campo que exibem,
+   * evitando re-renders desnecessários.
+   */
+  addFieldChangeListener(e, t) {
+    const r = (i) => {
+      i.type === a.fieldChanged && "fieldName" in i && i.fieldName === e && t(e, i.oldValue, i.newValue);
+    };
+    return this.addListener(r), this;
+  }
+  /**
+   * Remove um listener de campo específico.
+   * Nota: A remoção exata não é suportada nesta versão simplificada.
+   */
+  removeFieldChangeListener(e, t) {
+    return this;
+  }
   emit(e) {
     this.listeners.forEach((t) => {
       try {
@@ -1996,7 +2027,7 @@ class Je {
       return o === c;
     }));
     return r >= 0 ? (this.currentIndex = r, this.emit({
-      type: d.afterScroll
+      type: a.afterScroll
     }), !0) : !1;
   }
   /**
@@ -2016,13 +2047,13 @@ class Je {
       (i) => this.service.getId(i) === t
     );
     return r >= 0 ? (this.currentIndex = r, this.emit({
-      type: d.afterScroll
+      type: a.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: d.dataChanged,
+      type: a.dataChanged,
       data: this.filteredRecords
     });
   }
@@ -2047,7 +2078,7 @@ class Je {
   }
   publishEventError(e, t) {
     this.emit({
-      type: d.onError,
+      type: a.onError,
       error: e,
       originalError: t
     }), this.onError && this.onError(e, t);
@@ -2055,7 +2086,7 @@ class Je {
   publishEventErrors(e) {
     e.forEach((t) => {
       t.fieldName && (this.emit({
-        type: d.onFieldError,
+        type: a.onFieldError,
         fieldName: t.fieldName,
         error: t.errorMessage,
         originalError: t
@@ -2065,7 +2096,7 @@ class Je {
   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: d.onFieldError,
+        type: a.onFieldError,
         fieldName: i.field,
         error: i.message,
         originalError: i.message
@@ -2073,7 +2104,7 @@ class Je {
     });
     const r = G(e);
     this.emit({
-      type: d.onError,
+      type: a.onError,
       error: r,
       originalError: e
     }), this.onError && this.onError(r, e), t && t(r);
@@ -2103,7 +2134,7 @@ class Je {
   // =================== Remote Data Loading ===================
   async getDataWithFilter(e, t, r) {
     try {
-      const i = new xe();
+      const i = new Fe();
       i.buildFrom(e.filter, e.sort);
       const s = i.toJSON();
       let o;
@@ -2148,135 +2179,134 @@ class Je {
   handleRemoteError(e, t) {
     const r = G(e);
     this.emit({
-      type: d.onError,
+      type: a.onError,
       error: r,
       originalError: e
     }), this.onError && this.onError(r, e), t && t();
   }
 }
-function be(n) {
-  const e = le(null), [t, r] = C(null), [i, s] = C(-1), [o, c] = C(0), [f, R] = C(!0), [b, N] = C(!1), [W, T] = C(!1), [O, $] = C(!1), [, z] = C({}), u = l(() => z({}), []), a = H(() => (e.current || (e.current = new k(n)), e.current), []), V = l((F) => {
+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) => {
     switch (F.type) {
-      case d.dataChanged:
-      case d.recordChanged:
-        r(a.getCurrentRecord()), s(a.getCurrentIndex()), c(a.getTotalRecords()), R(a.isBrowsing()), N(a.isEditing()), T(a.isInserting());
+      case a.dataChanged:
+      case a.recordChanged:
+        r(d.getCurrentRecord()), s(d.getCurrentIndex()), c(d.getTotalRecords()), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting());
         break;
-      case d.fieldChanged:
-        r(a.getCurrentRecord()), u();
+      case a.fieldChanged:
         break;
-      case d.afterScroll:
-        r(a.getCurrentRecord()), s(a.getCurrentIndex());
+      case a.afterScroll:
+        r(d.getCurrentRecord()), s(d.getCurrentIndex());
         break;
-      case d.beforeEdit:
-      case d.beforeInsert:
-        $(!0);
+      case a.beforeEdit:
+      case a.beforeInsert:
+        N(!0);
         break;
-      case d.afterEdit:
-      case d.afterInsert:
-      case d.afterSave:
-      case d.afterCancel:
-        $(!1), R(a.isBrowsing()), N(a.isEditing()), T(a.isInserting());
+      case a.afterEdit:
+      case a.afterInsert:
+      case a.afterSave:
+      case a.afterCancel:
+        N(!1), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting());
         break;
-      case d.onError:
-      case d.onFieldError:
-        $(!1);
+      case a.onError:
+      case a.onFieldError:
+        N(!1);
         break;
     }
-  }, [a, u]);
-  J(() => (a.addListener(V), r(a.getCurrentRecord()), s(a.getCurrentIndex()), c(a.getTotalRecords()), R(a.isBrowsing()), N(a.isEditing()), T(a.isInserting()), () => {
-    a.removeListener(V);
-  }), [a, V]);
-  const X = l((F, j) => {
-    a.setFieldValue(F, j);
-  }, [a]), S = l((F) => a.getFieldValue(F), [a]), h = l(() => {
-    a instanceof k, a.edit();
-  }, [a]), Q = l(async () => await a.save(), [a]), Z = l(() => {
-    a instanceof k, a.cancel();
-  }, [a]), I = l((F) => {
-    a instanceof k, a.insert(F);
-  }, [a]), U = l(async (F) => await a.remove(F), [a]), ee = l(() => {
-    a instanceof k, a.first();
-  }, [a]), D = l(() => {
-    a instanceof k, a.last();
-  }, [a]), E = l(() => {
-    a instanceof k, a.next();
-  }, [a]), A = l(() => {
-    a instanceof k, a.prior();
-  }, [a]), P = l((F) => {
-    a instanceof k, a.goToRecord(F);
-  }, [a]), p = l((F, j) => {
-    a instanceof k && a.appendToFieldArray(F, j);
-  }, [a]), v = l((F, j, he) => {
-    a instanceof k && a.updateFieldArrayItem(F, j, he);
-  }, [a]), x = l((F, j) => {
-    a instanceof k && a.removeFromFieldArray(F, j);
-  }, [a]), L = l((F, j, he) => {
-    a instanceof k && a.insertIntoFieldArray(F, j, he);
-  }, [a]), y = l((F) => {
-    if (a instanceof k)
-      return a.getFieldArray(F);
-    const j = a.getFieldValue(F);
-    return Array.isArray(j) ? j : [];
-  }, [a]), q = l((F) => {
-    if (a instanceof k)
-      return a.isFieldArray(F);
-    const j = a.getFieldValue(F);
-    return Array.isArray(j);
-  }, [a]), te = H(() => i < o - 1, [i, o]), oe = H(() => i > 0, [i]), ae = H(() => o === 0, [o]), B = H(() => i === 0, [i]), K = H(() => i === o - 1, [i, o]), re = H(() => f, [f]), de = H(() => b, [b]), ce = H(() => W, [W]), fe = l(() => process.env.NODE_ENV === "development" ? {
-    ...a.getDebugSnapshot(),
+  }, [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(),
     hookState: {
       currentRecord: t,
       currentIndex: i,
       totalRecords: o,
-      isBrowsing: re,
-      isEditing: de,
-      isInserting: ce,
-      isLoading: O
+      isBrowsing: O,
+      isEditing: _,
+      isInserting: re,
+      isLoading: L
     }
-  } : null, [a, t, i, o, re, de, ce, O]);
+  } : null, [d, t, i, o, O, _, re, L]);
   return {
     // DataSource instance (para casos onde acesso direto é necessário)
-    dataSource: a,
+    dataSource: d,
     // Estado reativo
     currentRecord: t,
     currentIndex: i,
     totalRecords: o,
-    isLoading: O,
+    isLoading: L,
     // Estado derivado
-    canNext: te,
-    canPrior: oe,
-    isEmpty: ae,
-    isFirst: B,
-    isLast: K,
-    isBrowsing: re,
-    isEditing: de,
-    isInserting: ce,
+    canNext: v,
+    canPrior: J,
+    isEmpty: te,
+    isFirst: oe,
+    isLast: ae,
+    isBrowsing: O,
+    isEditing: _,
+    isInserting: re,
     // Operações básicas
-    setFieldValue: X,
-    getFieldValue: S,
-    edit: h,
-    save: Q,
-    cancel: Z,
-    insert: I,
-    remove: U,
+    setFieldValue: b,
+    getFieldValue: V,
+    edit: K,
+    save: m,
+    cancel: h,
+    insert: Y,
+    remove: Z,
     // Navegação
-    first: ee,
-    last: D,
-    next: E,
-    prior: A,
-    goToRecord: P,
+    first: E,
+    last: j,
+    next: ee,
+    prior: D,
+    goToRecord: S,
     // Operações de array (V2)
-    appendToFieldArray: p,
-    updateFieldArrayItem: v,
-    removeFromFieldArray: x,
-    insertIntoFieldArray: L,
-    getFieldArray: y,
-    isFieldArray: q,
+    appendToFieldArray: A,
+    updateFieldArrayItem: B,
+    removeFromFieldArray: y,
+    insertIntoFieldArray: w,
+    getFieldArray: x,
+    isFieldArray: $,
     // Debug
-    getDebugInfo: fe
+    getDebugInfo: ue
   };
 }
-function It(n) {
+function wt(n) {
   const {
     dataSource: e,
     currentRecord: t,
@@ -2285,18 +2315,18 @@ function It(n) {
     canNext: s,
     canPrior: o,
     isEmpty: c,
-    isFirst: f,
-    isLast: R,
-    isBrowsing: b,
-    first: N,
-    last: W,
-    next: T,
-    prior: O,
-    goToRecord: $,
-    getFieldValue: z,
-    getFieldArray: u,
-    isFieldArray: a
-  } = be(n);
+    isFirst: u,
+    isLast: p,
+    isBrowsing: C,
+    first: W,
+    last: M,
+    next: P,
+    prior: L,
+    goToRecord: N,
+    getFieldValue: d,
+    getFieldArray: f,
+    isFieldArray: b
+  } = xe(n);
   return {
     dataSource: e,
     currentRecord: t,
@@ -2305,179 +2335,191 @@ function It(n) {
     canNext: s,
     canPrior: o,
     isEmpty: c,
-    isFirst: f,
-    isLast: R,
-    isBrowsing: b,
-    first: N,
-    last: W,
-    next: T,
-    prior: O,
-    goToRecord: $,
-    getFieldValue: z,
-    getFieldArray: u,
-    isFieldArray: a
+    isFirst: u,
+    isLast: p,
+    isBrowsing: C,
+    first: W,
+    last: M,
+    next: P,
+    prior: L,
+    goToRecord: N,
+    getFieldValue: d,
+    getFieldArray: f,
+    isFieldArray: b
   };
 }
-function wt(n) {
-  return be(n);
+function Et(n) {
+  return xe(n);
 }
-function De(n) {
-  const e = le(null), [t, r] = C(void 0), [i, s] = C(-1), [o, c] = C(0), [f, R] = C(0), [b, N] = C(!0), [W, T] = C(!1), [O, $] = C(!1), [z, u] = C(!1), [a, V] = C(null), [, X] = C({}), S = l(() => X({}), []), h = H(() => (e.current || (e.current = new Je(n)), e.current), []), Q = l((w) => {
-    switch (w.type) {
-      case d.dataChanged:
-      case d.recordChanged:
-      case d.refreshData:
-        r(h.getCurrentRecord()), s(h.getCurrentIndex()), c(h.getTotalRecords()), R(h.getGrandTotalRecords()), N(h.isBrowsing()), T(h.isEditing()), $(h.isInserting()), u(!1), V(null);
+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) => {
+    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);
         break;
-      case d.fieldChanged:
-        r(h.getCurrentRecord()), S();
+      case a.fieldChanged:
         break;
-      case d.afterScroll:
-        r(h.getCurrentRecord()), s(h.getCurrentIndex());
+      case a.afterScroll:
+        s(h.getCurrentRecord()), c(h.getCurrentIndex());
         break;
-      case d.beforeEdit:
-      case d.beforeInsert:
-      case d.beforeSave:
-      case d.beforeRemove:
-        u(!0), V(null);
+      case a.beforeEdit:
+      case a.beforeInsert:
+      case a.beforeSave:
+      case a.beforeRemove:
+        V(!0), m(null);
         break;
-      case d.afterEdit:
-      case d.afterInsert:
-      case d.afterSave:
-      case d.afterCancel:
-      case d.afterRemove:
-        u(!1), N(h.isBrowsing()), T(h.isEditing()), $(h.isInserting()), V(null);
+      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);
         break;
-      case d.onError:
-        u(!1), V(w.error);
+      case a.onError:
+        V(!1), m(I.error);
         break;
-      case d.onFieldError:
-        u(!1);
+      case a.onFieldError:
+        V(!1);
         break;
     }
-  }, [h, S]);
-  J(() => (h.addListener(Q), r(h.getCurrentRecord()), s(h.getCurrentIndex()), c(h.getTotalRecords()), R(h.getGrandTotalRecords()), N(h.isBrowsing()), T(h.isEditing()), $(h.isInserting()), () => {
-    h.removeListener(Q);
-  }), [h, Q]);
-  const Z = l((w, M) => {
-    h.setFieldValue(w, M);
-  }, [h]), I = l((w) => h.getFieldValue(w), [h]), U = l(() => {
+  }, [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()), () => {
+    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()));
+  }, [e, t, h]);
+  const Z = l((I, H) => {
+    h.setFieldValue(I, H);
+  }, [h]), E = l((I) => h.getFieldValue(I), [h]), j = l(() => {
     h.edit();
   }, [h]), ee = l(async () => {
     try {
-      return V(null), await h.save();
-    } catch (w) {
-      throw V(w.message || "Erro ao salvar"), w;
+      return m(null), await h.save();
+    } catch (I) {
+      throw m(I.message || "Erro ao salvar"), I;
     }
   }, [h]), D = l(() => {
     h.cancel();
-  }, [h]), E = l((w) => {
-    h.insert(w);
-  }, [h]), A = l(async (w) => {
+  }, [h]), S = l((I) => {
+    h.insert(I);
+  }, [h]), A = l(async (I) => {
     try {
-      return V(null), await h.remove(w);
-    } catch (M) {
-      throw V(M.message || "Erro ao remover"), M;
+      return m(null), await h.remove(I);
+    } catch (H) {
+      throw m(H.message || "Erro ao remover"), H;
     }
-  }, [h]), P = l(() => {
+  }, [h]), B = l(() => {
     h.first();
-  }, [h]), p = l(() => {
+  }, [h]), y = l(() => {
     h.last();
-  }, [h]), v = l(() => {
+  }, [h]), w = l(() => {
     h.next();
   }, [h]), x = l(() => {
     h.prior();
-  }, [h]), L = l((w) => {
-    h.goToRecord(w);
-  }, [h]), y = l((w, M) => {
-    h.appendToFieldArray(w, M);
-  }, [h]), q = l((w, M, se) => {
-    h.updateFieldArrayItem(w, M, se);
-  }, [h]), te = l((w, M) => {
-    h.removeFromFieldArray(w, M);
-  }, [h]), oe = l((w, M, se) => {
-    h.insertIntoFieldArray(w, M, se);
-  }, [h]), ae = l((w) => h.getFieldArray(w), [h]), B = l((w) => h.isFieldArray(w), [h]), K = l((w, M, se) => {
-    u(!0), V(null);
+  }, [h]), $ = l((I) => {
+    h.goToRecord(I);
+  }, [h]), v = l(async (I) => {
     try {
-      h.applyRemoteFilter(w, M, () => {
-        u(!1), se && se();
+      return V(!0), m(null), await h.loadById(I);
+    } catch (H) {
+      throw m(H.message || "Erro ao carregar registro"), H;
+    } finally {
+      V(!1);
+    }
+  }, [h]), J = l((I, H) => {
+    h.appendToFieldArray(I, H);
+  }, [h]), te = l((I, H, se) => {
+    h.updateFieldArrayItem(I, H, se);
+  }, [h]), oe = l((I, H) => {
+    h.removeFromFieldArray(I, H);
+  }, [h]), ae = l((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);
+    try {
+      h.applyRemoteFilter(I, H, () => {
+        V(!1), se && se();
       });
-    } catch (Pe) {
-      u(!1), V(Pe.message || "Erro ao aplicar filtro");
+    } catch (Le) {
+      V(!1), m(Le.message || "Erro ao aplicar filtro");
     }
-  }, [h]), re = l(async (w) => {
+  }, [h]), ue = l(async (I) => {
     try {
-      u(!0), V(null), h.refreshData(w);
-    } catch (M) {
-      throw u(!1), V(M.message || "Erro ao atualizar dados"), M;
+      V(!0), m(null), h.refreshData(I);
+    } catch (H) {
+      throw V(!1), m(H.message || "Erro ao atualizar dados"), H;
     }
-  }, [h]), de = l((w) => {
-    h.setPageSize(w);
-  }, [h]), ce = l(() => h.getPageSize(), [h]), fe = H(() => i < o - 1, [i, o]), F = H(() => i > 0, [i]), j = H(() => o === 0, [o]), he = H(() => i === 0, [i]), Te = H(() => i === o - 1, [i, o]), me = H(() => b, [b]), Re = H(() => W, [W]), pe = H(() => O, [O]), Oe = l(() => process.env.NODE_ENV === "development" ? {
+  }, [h]), F = l((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.getDebugSnapshot(),
     hookState: {
-      currentRecord: t,
-      currentIndex: i,
-      totalRecords: o,
-      grandTotalRecords: f,
-      isBrowsing: me,
-      isEditing: Re,
-      isInserting: pe,
-      isLoading: z,
-      error: a
-    }
-  } : null, [h, t, i, o, f, me, Re, pe, z, a]);
+      currentRecord: i,
+      currentIndex: o,
+      totalRecords: u,
+      grandTotalRecords: C,
+      isBrowsing: ge,
+      isEditing: fe,
+      isInserting: me,
+      isLoading: b,
+      error: K
+    }
+  } : null, [h, i, o, u, C, ge, fe, me, b, K]);
   return {
     // DataSource instance (para casos onde acesso direto é necessário)
     dataSource: h,
     // Estado reativo
-    currentRecord: t,
-    currentIndex: i,
-    totalRecords: o,
-    grandTotalRecords: f,
-    isLoading: z,
-    error: a,
+    currentRecord: i,
+    currentIndex: o,
+    totalRecords: u,
+    grandTotalRecords: C,
+    isLoading: b,
+    error: K,
     // Estado derivado
-    canNext: fe,
-    canPrior: F,
-    isEmpty: j,
-    isFirst: he,
-    isLast: Te,
-    isBrowsing: me,
-    isEditing: Re,
-    isInserting: pe,
+    canNext: de,
+    canPrior: De,
+    isEmpty: Ve,
+    isFirst: Te,
+    isLast: Oe,
+    isBrowsing: ge,
+    isEditing: fe,
+    isInserting: me,
     // Operações básicas
     setFieldValue: Z,
-    getFieldValue: I,
-    edit: U,
+    getFieldValue: E,
+    edit: j,
     save: ee,
     cancel: D,
-    insert: E,
+    insert: S,
     remove: A,
     // Navegação
-    first: P,
-    last: p,
-    next: v,
+    first: B,
+    last: y,
+    next: w,
     prior: x,
-    goToRecord: L,
+    goToRecord: $,
+    loadById: v,
     // Operações de array (V2)
-    appendToFieldArray: y,
-    updateFieldArrayItem: q,
-    removeFromFieldArray: te,
-    insertIntoFieldArray: oe,
-    getFieldArray: ae,
-    isFieldArray: B,
+    appendToFieldArray: J,
+    updateFieldArrayItem: te,
+    removeFromFieldArray: oe,
+    insertIntoFieldArray: ae,
+    getFieldArray: O,
+    isFieldArray: _,
     // Operações remotas
-    applyRemoteFilter: K,
-    refreshData: re,
-    setPageSize: de,
-    getPageSize: ce,
+    applyRemoteFilter: re,
+    refreshData: ue,
+    setPageSize: F,
+    getPageSize: k,
     // Debug
-    getDebugInfo: Oe
+    getDebugInfo: Pe
   };
 }
-function Et(n) {
+function St(n) {
   const {
     dataSource: e,
     currentRecord: t,
@@ -2486,25 +2528,26 @@ function Et(n) {
     grandTotalRecords: s,
     isLoading: o,
     error: c,
-    canNext: f,
-    canPrior: R,
-    isEmpty: b,
-    isFirst: N,
-    isLast: W,
-    isBrowsing: T,
-    first: O,
-    last: $,
-    next: z,
-    prior: u,
-    goToRecord: a,
-    getFieldValue: V,
-    getFieldArray: X,
-    isFieldArray: S,
-    applyRemoteFilter: h,
-    refreshData: Q,
-    getPageSize: Z,
-    getDebugInfo: I
-  } = De(n);
+    canNext: u,
+    canPrior: p,
+    isEmpty: C,
+    isFirst: W,
+    isLast: M,
+    isBrowsing: P,
+    first: L,
+    last: N,
+    next: d,
+    prior: f,
+    goToRecord: b,
+    loadById: V,
+    getFieldValue: K,
+    getFieldArray: m,
+    isFieldArray: h,
+    applyRemoteFilter: Y,
+    refreshData: Z,
+    getPageSize: E,
+    getDebugInfo: j
+  } = Ce(n);
   return {
     dataSource: e,
     currentRecord: t,
@@ -2513,30 +2556,31 @@ function Et(n) {
     grandTotalRecords: s,
     isLoading: o,
     error: c,
-    canNext: f,
-    canPrior: R,
-    isEmpty: b,
-    isFirst: N,
-    isLast: W,
-    isBrowsing: T,
-    first: O,
-    last: $,
-    next: z,
-    prior: u,
-    goToRecord: a,
-    getFieldValue: V,
-    getFieldArray: X,
-    isFieldArray: S,
-    applyRemoteFilter: h,
-    refreshData: Q,
-    getPageSize: Z,
-    getDebugInfo: I
+    canNext: u,
+    canPrior: p,
+    isEmpty: C,
+    isFirst: W,
+    isLast: M,
+    isBrowsing: P,
+    first: L,
+    last: N,
+    next: d,
+    prior: f,
+    goToRecord: b,
+    loadById: V,
+    getFieldValue: K,
+    getFieldArray: m,
+    isFieldArray: h,
+    applyRemoteFilter: Y,
+    refreshData: Z,
+    getPageSize: E,
+    getDebugInfo: j
   };
 }
-function St(n) {
-  return De(n);
+function Ft(n) {
+  return Ce(n);
 }
-class Ft {
+class At {
   /**
    * Gera chave de query baseada no DataSource e filtros
    */
@@ -2560,7 +2604,7 @@ class Ft {
     );
   }
 }
-const At = {
+const xt = {
   /** Configuração para dados que mudam raramente */
   STATIC_DATA: {
     staleTime: 30 * 60 * 1e3,
@@ -2590,31 +2634,31 @@ const At = {
     // 1 minuto
     retry: 5
   }
-}, xt = (n) => {
-  const { initialData: e, name: t, label: r, initialDataSource: i, onLoadComplete: s, store: o, validator: c } = n, f = () => o && o.existsValue(t) ? o.getValue(t) : i || new Ie(t, {
+}, 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, {
     records: e,
     grandTotalRecords: e.length,
     currentPage: 0,
     totalPages: 0,
     pageSize: 0,
     validator: c
-  }, r), [R, b] = C(
-    f()
+  }, r), [p, C] = T(
+    u()
   );
-  return J(() => {
-    o && o.setValue(t, R), s && s(R);
-  }, [t]), { dataSource: R };
-}, Ct = (n) => {
+  return q(() => {
+    o && o.setValue(t, p), s && s(p);
+  }, [t]), { dataSource: p };
+}, bt = (n) => {
   const e = (r) => {
     r.addListener(n.listener);
   }, t = (r) => {
     r.removeListener(n.listener);
   };
-  J(() => (n.dataSource && (t(n.dataSource), e(n.dataSource)), () => {
+  q(() => (n.dataSource && (t(n.dataSource), e(n.dataSource)), () => {
     n.dataSource && t(n.dataSource);
   }), [n.dataSource?.uuid || n.dataSource?.getName()]);
-}, bt = (n) => {
-  const { initialData: e, name: t, initialDataSource: r, onLoadComplete: i, validator: s } = n, [o, c] = C(
+}, Dt = (n) => {
+  const { initialData: e, name: t, initialDataSource: r, onLoadComplete: i, validator: s } = n, [o, c] = T(
     r ?? new Ge(t, {
       records: e,
       grandTotalRecords: e.length,
@@ -2624,9 +2668,9 @@ const At = {
       validator: s
     })
   );
-  return J(() => {
-    c((f) => {
-      const R = {
+  return q(() => {
+    c((u) => {
+      const p = {
         records: e,
         grandTotalRecords: e.length,
         totalPages: 0,
@@ -2634,11 +2678,11 @@ const At = {
         pageSize: 0,
         validator: s
       };
-      return f.isActive() ? f.setData(R) : f.open(R), f;
+      return u.isActive() ? u.setData(p) : u.open(p), u;
     }), i && i(o);
   }, [e, t]), { dataSource: o };
 };
-class Ve {
+class be {
   tokenManager;
   constructor(e) {
     this.tokenManager = e;
@@ -2653,7 +2697,7 @@ class Ve {
   }
   async get(e, t, r, i) {
     try {
-      const s = this.prepareHeaders(t, r), o = await Y.get(e, { headers: s, ...i });
+      const s = this.prepareHeaders(t, r), o = await X.get(e, { headers: s, ...i });
       return ie.convertJsonToObject(o.data);
     } catch (s) {
       return Promise.reject(s);
@@ -2661,7 +2705,7 @@ class Ve {
   }
   async post(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i), c = await Y.post(
+      const o = this.prepareHeaders(r, i), c = await X.post(
         e,
         ie.convertObjectToJson(t),
         {
@@ -2677,7 +2721,7 @@ class Ve {
   async postNoConvertId(e, t, r, i, s) {
     try {
       const o = this.prepareHeaders(r, i);
-      return (await Y.post(
+      return (await X.post(
         e,
         t,
         {
@@ -2691,7 +2735,7 @@ class Ve {
   }
   async put(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i), c = await Y.put(e, ie.convertObjectToJson(t), {
+      const o = this.prepareHeaders(r, i), c = await X.put(e, ie.convertObjectToJson(t), {
         headers: o,
         ...s
       });
@@ -2703,7 +2747,7 @@ class Ve {
   async putNoConvertId(e, t, r, i, s) {
     try {
       const o = this.prepareHeaders(r, i);
-      return (await Y.put(e, t, {
+      return (await X.put(e, t, {
         headers: o,
         ...s
       })).data;
@@ -2714,7 +2758,7 @@ class Ve {
   async binaryPut(e, t, r = {}, i, s) {
     try {
       const o = this.prepareHeaders(r, i);
-      return s = s || {}, (await Y.put(e, t, {
+      return s = s || {}, (await X.put(e, t, {
         headers: o,
         ...s
       })).data;
@@ -2724,7 +2768,7 @@ class Ve {
   }
   async delete(e, t, r, i) {
     try {
-      const s = this.prepareHeaders(t, r), o = await Y.delete(e, { headers: s, ...i });
+      const s = this.prepareHeaders(t, r), o = await X.delete(e, { headers: s, ...i });
       return ie.convertJsonToObject(o.data);
     } catch (s) {
       return Promise.reject(s);
@@ -2732,7 +2776,7 @@ class Ve {
   }
   async patch(e, t, r, i, s) {
     try {
-      const o = this.prepareHeaders(r, i), c = await Y.patch(e, ie.convertObjectToJson(t), {
+      const o = this.prepareHeaders(r, i), c = await X.patch(e, ie.convertObjectToJson(t), {
         headers: o,
         ...s
       });
@@ -2744,7 +2788,7 @@ class Ve {
   async patchNoConvertId(e, t, r, i, s) {
     try {
       const o = this.prepareHeaders(r, i);
-      return (await Y.patch(e, t, {
+      return (await X.patch(e, t, {
         headers: o,
         ...s
       })).data;
@@ -2759,7 +2803,7 @@ class Ve {
   async getBlob(e, t, r) {
     try {
       const i = this.prepareHeaders(t, r);
-      return (await Y.get(e, {
+      return (await X.get(e, {
         headers: i,
         responseType: "blob"
       })).data;
@@ -2774,7 +2818,7 @@ class Ve {
   async postBlob(e, t, r, i) {
     try {
       const s = this.prepareHeaders(r, i);
-      return (await Y.post(e, t, {
+      return (await X.post(e, t, {
         headers: s,
         responseType: "blob"
       })).data;
@@ -2793,15 +2837,15 @@ class Ve {
         const c = this.tokenManager.getToken();
         c && (s.Authorization = `Bearer ${c.access_token}`);
       }
-      return (await Y.post(e, t, { headers: s })).data;
+      return (await X.post(e, t, { headers: s })).data;
     } catch (s) {
       return Promise.reject(s);
     }
   }
 }
-ne.decorate(ne.inject(He.TokenManager), Ve, 0);
-ne.decorate(ne.injectable(), Ve);
-class Qe {
+ne.decorate(ne.inject(We.TokenManager), be, 0);
+ne.decorate(ne.injectable(), be);
+class Ke {
   client;
   constructor(e) {
     this.client = e;
@@ -2901,8 +2945,8 @@ class Qe {
     return this.client.delete(`${this.getEndpoint()}/${e}`, t, !1);
   }
 }
-ne.decorate(ne.injectable(), Qe);
-class ge {
+ne.decorate(ne.injectable(), Ke);
+class le {
   content;
   pageable;
   totalElements;
@@ -2914,8 +2958,8 @@ class ge {
   first;
   numberOfElements;
   empty;
-  constructor(e, t, r, i, s, o, c, f, R, b) {
-    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 = f !== void 0 ? f : i === 0, this.numberOfElements = R !== void 0 ? R : e.length, this.empty = b !== void 0 ? b : e.length === 0, this.pageable = {
+  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 = {
       sort: this.sort,
       offset: i * s,
       pageSize: s,
@@ -2925,19 +2969,19 @@ class ge {
     };
   }
   static createFromValues(e, t, r, i, s) {
-    return new ge(e, t, r, i, s);
+    return new le(e, t, r, i, s);
   }
 }
-function Ke(n) {
+function Ye(n) {
   return n.totalElements || n.totalElements === 0 ? n.totalElements : n.page.totalElements;
 }
-function Ye(n) {
+function Xe(n) {
   return n.totalPages || n.totalPages === 0 ? n.totalPages : n.page.totalPages;
 }
-function Xe(n) {
+function Ze(n) {
   return n.pageable ? n.pageable.pageNumber : n.page.number;
 }
-function Dt(n) {
+function Vt(n) {
   const {
     name: e,
     label: t,
@@ -2946,28 +2990,28 @@ function Dt(n) {
     sort: s,
     transformData: o,
     onLoadComplete: c,
-    onDestroy: f,
-    filterData: R,
-    findAll: b,
-    findAllWithSort: N,
-    findAllWithFilter: W,
-    findAllWithFilterAndSort: T,
-    initialDataSource: O,
-    pageSize: $ = 50,
-    currentPage: z = 0,
-    loadOnStart: u = !0,
-    store: a,
+    onDestroy: u,
+    filterData: p,
+    findAll: C,
+    findAllWithSort: W,
+    findAllWithFilter: M,
+    findAllWithFilterAndSort: P,
+    initialDataSource: L,
+    pageSize: N = 50,
+    currentPage: d = 0,
+    loadOnStart: f = !0,
+    store: b,
     id: V,
-    validator: X
-  } = n, S = le(!1), h = () => !!(a && a.existsValue(e) || O), Q = () => a && a.existsValue(e) ? a.getValue(e) : O || new Ce(r, e, {
+    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, {
     records: [],
     grandTotalRecords: 0,
-    currentPage: z,
+    currentPage: d,
     totalPages: 0,
-    pageSize: $,
-    validator: X
-  }, t), Z = () => a && a.existsValue(e) ? a.getValue(e).getCurrentPage() : O ? O.getCurrentPage() : 0, [I, U] = C({
-    dataSource: Q(),
+    pageSize: N,
+    validator: K
+  }, t), Z = () => b && b.existsValue(e) ? b.getValue(e).getCurrentPage() : L ? L.getCurrentPage() : 0, [E, j] = T({
+    dataSource: Y(),
     isLoading: !1,
     isError: !1,
     error: "",
@@ -2977,154 +3021,154 @@ function Dt(n) {
     sort: s,
     id: V,
     currentPage: Z(),
-    pageSize: $,
+    pageSize: N,
     loadDataCount: h() ? 1 : 0
-  }), ee = async (p, v, x, L, y, q, te, oe, ae) => {
-    let B;
-    if (q) {
-      const K = await r.findOne(q);
-      K ? B = ge.createFromValues([K], 1, 0, 0, 0) : B = ge.createFromValues([], 0, 0, 0, 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);
     } else
-      T && L && y && y.length > 0 ? B = await T(L, v, x, y) : W && L ? B = await W(L, v, x) : N && y && y.length > 0 ? B = await N(v, x, y) : b ? B = await b(v, x) : L && y && y.length > 0 ? B = await r.findAllWithFilterAndSort(L, v, x, y) : L ? B = await r.findAllWithFilter(L, v, x) : y && y.length > 0 ? B = await r.findAllWithSort(v, x, y) : B = await r.findAll(v, x);
-    R && (B = R(B)), o && (B = o(B)), U((K) => {
+      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((_) => {
       const re = {
-        records: B.content,
-        grandTotalRecords: Ke(B),
-        totalPages: Ye(B),
-        currentPage: Xe(B),
+        records: O.content,
+        grandTotalRecords: Ye(O),
+        totalPages: Xe(O),
+        currentPage: Ze(O),
         pageSize: x,
-        filter: L,
-        sort: y,
+        filter: $,
+        sort: v,
         originFilter: te,
         originGlobalFilter: ae,
         originSort: oe,
-        validator: X
+        validator: K
       };
-      return K.dataSource.isActive() ? K.dataSource.setData(re) : K.dataSource.open(re), {
-        ...K,
-        currentPage: v,
+      return _.dataSource.isActive() ? _.dataSource.setData(re) : _.dataSource.open(re), {
+        ..._,
+        currentPage: w,
         pageSize: x,
-        filter: L,
-        sort: y,
-        id: q,
+        filter: $,
+        sort: v,
+        id: J,
         isLoading: !1,
         isError: !1,
         error: "",
-        loadDataCount: K.loadDataCount + 1
+        loadDataCount: _.loadDataCount + 1
       };
-    }), a && a.setValue(e, I.dataSource);
+    }), b && b.setValue(e, E.dataSource);
   };
-  J(() => {
-    c && I.loadDataCount > 0 && c(I.dataSource);
-  }, [I.loadDataCount]);
-  const D = l((p) => {
-    if (p.type === d.refreshData) {
-      const v = p.options;
+  q(() => {
+    c && E.loadDataCount > 0 && c(E.dataSource);
+  }, [E.loadDataCount]);
+  const D = l((y) => {
+    if (y.type === a.refreshData) {
+      const w = y.options;
       try {
-        U((x) => ({
+        j((x) => ({
           ...x,
           isLoading: !0,
-          filter: v.filter,
-          sort: v.sort,
-          currentPage: v.currentPage,
-          id: v.id
+          filter: w.filter,
+          sort: w.sort,
+          currentPage: w.currentPage,
+          id: w.id
         })), ee(
-          I.name,
-          v.currentPage,
-          v.pageSize,
-          v.filter,
-          v.sort,
-          v.id,
-          v.originFilter,
-          v.originSort,
-          v.originGlobalFilter
+          E.name,
+          w.currentPage,
+          w.pageSize,
+          w.filter,
+          w.sort,
+          w.id,
+          w.originFilter,
+          w.originSort,
+          w.originGlobalFilter
         ).catch((x) => {
-          const L = G(x);
-          U((y) => ({
-            ...y,
+          const $ = G(x);
+          j((v) => ({
+            ...v,
             isError: !0,
             isLoading: !1,
-            error: L
-          })), n.onError && n.onError(L, x);
+            error: $
+          })), n.onError && n.onError($, x);
         });
       } catch (x) {
-        const L = G(x);
-        U((y) => ({
-          ...y,
+        const $ = G(x);
+        j((v) => ({
+          ...v,
           isError: !0,
           isLoading: !1,
-          error: L
-        })), n.onError && n.onError(L, x);
+          error: $
+        })), n.onError && n.onError($, x);
       }
     }
-  }, [ee, I.name, n.onError]), E = l((p) => {
-    S.current || (p.addListener(D), S.current = !0);
-  }, [D]), A = l((p) => {
-    S.current && (p.removeListener(D), S.current = !1);
+  }, [ee, E.name, n.onError]), S = l((y) => {
+    m.current || (y.addListener(D), m.current = !0);
+  }, [D]), A = l((y) => {
+    m.current && (y.removeListener(D), m.current = !1);
   }, [D]);
-  J(() => {
+  q(() => {
     try {
-      return E(I.dataSource), u && I.loadDataCount === 0 ? (U((p) => ({ ...p, isLoading: !0 })), ee(
-        I.name,
-        z,
-        $,
-        I.filter,
-        I.sort,
-        I.id
-      ).catch((p) => {
-        const v = G(p);
-        U((x) => ({
+      return S(E.dataSource), f && E.loadDataCount === 0 ? (j((y) => ({ ...y, isLoading: !0 })), ee(
+        E.name,
+        d,
+        N,
+        E.filter,
+        E.sort,
+        E.id
+      ).catch((y) => {
+        const w = G(y);
+        j((x) => ({
           ...x,
           isError: !0,
           isLoading: !1,
-          error: v
-        })), n.onError && n.onError(v, p);
-      })) : c && c(I.dataSource), () => {
-        f && (A(I.dataSource), f(I.dataSource));
+          error: w
+        })), n.onError && n.onError(w, y);
+      })) : c && c(E.dataSource), () => {
+        u && (A(E.dataSource), u(E.dataSource));
       };
-    } catch (p) {
-      const v = G(p);
-      U((x) => ({
+    } catch (y) {
+      const w = G(y);
+      j((x) => ({
         ...x,
         isError: !0,
         isLoading: !1,
-        error: v
-      })), n.onError && n.onError(v, p);
+        error: w
+      })), n.onError && n.onError(w, y);
     }
   }, [
-    I.name,
-    I.sort,
-    I.filter,
-    I.id,
-    I.currentPage,
-    I.pageSize
+    E.name,
+    E.sort,
+    E.filter,
+    E.id,
+    E.currentPage,
+    E.pageSize
   ]);
-  const P = () => {
-    U((p) => ({
-      ...p,
+  const B = () => {
+    j((y) => ({
+      ...y,
       isError: !1,
       isLoading: !1,
       error: ""
     }));
   };
   return {
-    isLoading: I.isLoading,
-    isError: I.isError,
-    error: I.error,
-    dataSource: I.dataSource,
-    clearError: P
+    isLoading: E.isLoading,
+    isError: E.isError,
+    error: E.error,
+    dataSource: E.dataSource,
+    clearError: B
   };
 }
-function Ze(n) {
+function et(n) {
   return n.totalElements || n.totalElements === 0 ? n.totalElements : n.page.totalElements;
 }
-function et(n) {
+function tt(n) {
   return n.totalPages || n.totalPages === 0 ? n.totalPages : n.page.totalPages;
 }
-function tt(n) {
+function rt(n) {
   return n.pageable ? n.pageable.pageNumber : n.page.number;
 }
-function Vt(n) {
+function Tt(n) {
   const {
     name: e,
     service: t,
@@ -3133,140 +3177,140 @@ function Vt(n) {
     transformData: s,
     onLoadComplete: o,
     onDestroy: c,
-    filterData: f,
-    findAll: R,
-    findAllWithSort: b,
-    findAllWithFilter: N,
-    findAllWithFilterAndSort: W,
-    initialDataSource: T,
-    pageSize: O = 50,
-    currentPage: $ = 0,
-    loadOnStart: z = !0,
-    store: u,
-    validator: a
-  } = n, V = () => !!(u && u.existsValue(e) || T), X = () => u && u.existsValue(e) ? u.getValue(e) : T || new _e(t, e, {
+    filterData: u,
+    findAll: p,
+    findAllWithSort: C,
+    findAllWithFilter: W,
+    findAllWithFilterAndSort: M,
+    initialDataSource: P,
+    pageSize: L = 50,
+    currentPage: N = 0,
+    loadOnStart: d = !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, {
     records: [],
     grandTotalRecords: 0,
-    currentPage: $,
+    currentPage: N,
     totalPages: 0,
-    pageSize: O,
-    validator: a
-  }), [S, h] = C({
-    dataSource: X(),
+    pageSize: L,
+    validator: b
+  }), [m, h] = T({
+    dataSource: K(),
     isLoading: !1,
     isError: !1,
     error: "",
     name: e,
     filter: r,
     sort: i,
-    currentPage: $,
-    pageSize: O,
+    currentPage: N,
+    pageSize: L,
     loadDataCount: V() ? 1 : 0
-  }), Q = async (D, E, A, P, p, v, x, L) => {
-    let y;
-    W && P && p && p.length > 0 ? y = await W(P, E, A, p) : N && P ? y = await N(P, E, A) : b && p && p.length > 0 ? y = await b(E, A, p) : R ? y = await R(E, A) : P && p && p.length > 0 ? y = await t.findAllWithFilterAndSort(P, E, A, p) : P ? y = await t.findAllWithFilter(P, E, A) : p && p.length > 0 ? y = await t.findAllWithSort(E, A, p) : y = await t.findAll(E, A), f && (y = f(y)), s && (y = s(y)), h((q) => {
+  }), 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) => {
       const te = {
-        records: y.content,
-        grandTotalRecords: Ze(y),
-        totalPages: et(y),
-        currentPage: tt(y),
+        records: v.content,
+        grandTotalRecords: et(v),
+        totalPages: tt(v),
+        currentPage: rt(v),
         pageSize: A,
-        filter: P,
-        sort: p,
-        originFilter: v,
-        originGlobalFilter: L,
+        filter: B,
+        sort: y,
+        originFilter: w,
+        originGlobalFilter: $,
         originSort: x,
-        validator: a
+        validator: b
       };
-      return q.dataSource.isActive() ? q.dataSource.setData(te) : q.dataSource.open(te), {
-        ...q,
-        currentPage: E,
+      return J.dataSource.isActive() ? J.dataSource.setData(te) : J.dataSource.open(te), {
+        ...J,
+        currentPage: S,
         pageSize: A,
-        filter: P,
-        sort: p,
+        filter: B,
+        sort: y,
         isLoading: !1,
         isError: !1,
         error: "",
-        loadDataCount: q.loadDataCount + 1
+        loadDataCount: J.loadDataCount + 1
       };
-    }), u && u.setValue(e, S.dataSource), o && o(S.dataSource);
+    }), f && f.setValue(e, m.dataSource), o && o(m.dataSource);
   }, Z = (D) => {
-    if (D.type === d.refreshData) {
-      const E = D.options;
+    if (D.type === a.refreshData) {
+      const S = D.options;
       try {
         h((A) => ({
           ...A,
           isLoading: !0,
-          filter: E.filter,
-          sort: E.sort,
-          currentPage: E.currentPage
-        })), Q(
-          S.name,
-          E.currentPage,
-          E.pageSize,
-          E.filter,
-          E.sort,
-          E.originFilter,
-          E.originSort,
-          E.originGlobalFilter
+          filter: S.filter,
+          sort: S.sort,
+          currentPage: S.currentPage
+        })), Y(
+          m.name,
+          S.currentPage,
+          S.pageSize,
+          S.filter,
+          S.sort,
+          S.originFilter,
+          S.originSort,
+          S.originGlobalFilter
         ).catch((A) => {
-          const P = G(A);
-          h((p) => ({
-            ...p,
+          const B = G(A);
+          h((y) => ({
+            ...y,
             isError: !0,
             isLoading: !1,
-            error: P
-          })), n.onError && n.onError(P, A);
+            error: B
+          })), n.onError && n.onError(B, A);
         });
       } catch (A) {
-        const P = G(A);
-        h((p) => ({
-          ...p,
+        const B = G(A);
+        h((y) => ({
+          ...y,
           isError: !0,
           isLoading: !1,
-          error: P
-        })), n.onError && n.onError(P, A);
+          error: B
+        })), n.onError && n.onError(B, A);
       }
     }
-  }, I = (D) => {
+  }, E = (D) => {
     D.addListener(Z);
-  }, U = (D) => {
+  }, j = (D) => {
     D.removeListener(Z);
   };
-  J(() => {
+  q(() => {
     try {
-      return I(S.dataSource), z && S.loadDataCount === 0 && (h((D) => ({ ...D, isLoading: !0 })), Q(
-        S.name,
-        $,
-        O,
-        S.filter,
-        S.sort
+      return E(m.dataSource), d && m.loadDataCount === 0 && (h((D) => ({ ...D, isLoading: !0 })), Y(
+        m.name,
+        N,
+        L,
+        m.filter,
+        m.sort
       ).catch((D) => {
-        const E = G(D);
+        const S = G(D);
         h((A) => ({
           ...A,
           isError: !0,
           isLoading: !1,
-          error: E
-        })), n.onError && n.onError(E, D);
+          error: S
+        })), n.onError && n.onError(S, D);
       })), () => {
-        c && (U(S.dataSource), c(S.dataSource));
+        c && (j(m.dataSource), c(m.dataSource));
       };
     } catch (D) {
-      const E = G(D);
+      const S = G(D);
       h((A) => ({
         ...A,
         isError: !0,
         isLoading: !1,
-        error: E
-      })), n.onError && n.onError(E, D);
+        error: S
+      })), n.onError && n.onError(S, D);
     }
   }, [
-    S.name,
-    S.sort,
-    S.filter,
-    S.currentPage,
-    S.pageSize
+    m.name,
+    m.sort,
+    m.filter,
+    m.currentPage,
+    m.pageSize
   ]);
   const ee = () => {
     h((D) => ({
@@ -3277,46 +3321,46 @@ function Vt(n) {
     }));
   };
   return {
-    isLoading: S.isLoading,
-    isError: S.isError,
-    error: S.error,
-    dataSource: S.dataSource,
+    isLoading: m.isLoading,
+    isError: m.isError,
+    error: m.error,
+    dataSource: m.dataSource,
     clearError: ee
   };
 }
-function Tt(n) {
-  return ze((e) => e.get(n));
-}
 function Ot(n) {
-  J(() => {
+  return Me((e) => e.get(n));
+}
+function Pt(n) {
+  q(() => {
     n();
   }, []);
 }
-function Pt(n, e) {
-  J(() => {
+function Lt(n, e) {
+  q(() => {
     n();
   }, e);
 }
-function Lt(n) {
-  J(() => () => {
+function Bt(n) {
+  q(() => () => {
     n();
   }, []);
 }
-function Bt() {
-  const [, n] = C(0);
+function $t() {
+  const [, n] = T(0);
   return l(() => {
     n((t) => t + 1);
   }, []);
 }
-const rt = (n) => (n + 1) % 1e6;
-function it() {
-  const [, n] = We(rt, 0);
+const it = (n) => (n + 1) % 1e6;
+function st() {
+  const [, n] = ze(it, 0);
   return n;
 }
-function $t() {
-  return it();
+function Nt() {
+  return st();
 }
-const st = Me((n, e) => ({
+const nt = je((n, e) => ({
   values: /* @__PURE__ */ new Map(),
   setValue: (t, r) => n((i) => {
     const s = new Map(i.values);
@@ -3330,24 +3374,24 @@ const st = Me((n, e) => ({
   }),
   clearAllValues: () => n((t) => ({ values: /* @__PURE__ */ new Map() })),
   reset: () => n((t) => ({ values: /* @__PURE__ */ new Map() }))
-})), nt = je(st), Nt = (n = "default") => {
-  const e = nt();
-  return { setValue: (R, b) => {
-    e.setValue(`${n}.${R}`, b);
-  }, getValue: (R) => e.getValue(`${n}.${R}`), clearValue: (R) => {
-    e.clearValue(`${n}.${R}`);
-  }, existsValue: (R) => e.existsValue(`${n}.${R}`), clearAllValues: () => {
-    for (const [R, b] of e.values.entries())
-      R.startsWith(`${n}.`) && e.clearValue(R);
+})), ot = ke(nt), Ht = (n = "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: () => {
+    for (const [p, C] of e.values.entries())
+      p.startsWith(`${n}.`) && e.clearValue(p);
   }, reset: () => {
     e.clearAllValues();
   }, values: e.values };
 };
-function Ht(n, e, t = window) {
-  const r = le(e);
-  J(() => {
+function Wt(n, e, t = window) {
+  const r = ce(e);
+  q(() => {
     r.current = e;
-  }, [e]), J(
+  }, [e]), q(
     () => {
       if (t && t.addEventListener && r.current) {
         const s = (o) => r.current(o);
@@ -3361,46 +3405,46 @@ function Ht(n, e, t = window) {
   );
 }
 export {
-  Mt as ADVANCED,
-  jt as ARCHBASE_IOC_API_TYPE,
-  At as ARCHBASE_QUERY_DEFAULTS,
-  Ve as ArchbaseAxiosRemoteApiClient,
-  Ie as ArchbaseDataSource,
-  k as ArchbaseDataSourceV2,
+  jt as ADVANCED,
+  kt as ARCHBASE_IOC_API_TYPE,
+  xt as ARCHBASE_QUERY_DEFAULTS,
+  be as ArchbaseAxiosRemoteApiClient,
+  ye as ArchbaseDataSource,
+  U as ArchbaseDataSourceV2,
   Ge as ArchbaseLocalFilterDataSource,
-  Ft as ArchbaseQueryUtils,
-  Qe as ArchbaseRemoteApiService,
-  Ce as ArchbaseRemoteDataSource,
-  Je as ArchbaseRemoteDataSourceV2,
-  _e as ArchbaseRemoteFilterDataSource,
-  d as DataSourceEventNames,
-  ge as DefaultPage,
-  kt as FILTER_TYPE,
-  Ue as LocalFilter,
-  yt as MigrationValidation,
-  Ut as NORMAL,
+  At as ArchbaseQueryUtils,
+  Ke as ArchbaseRemoteApiService,
+  Ae as ArchbaseRemoteDataSource,
+  Qe as ArchbaseRemoteDataSourceV2,
+  Je as ArchbaseRemoteFilterDataSource,
+  a as DataSourceEventNames,
+  le as DefaultPage,
+  Ut as FILTER_TYPE,
+  _e as LocalFilter,
+  vt as MigrationValidation,
+  _t as NORMAL,
   Gt as QUICK,
   qe as RemoteFilter,
-  vt as USAGE_EXAMPLE,
+  It as USAGE_EXAMPLE,
   qt as useArchbaseBool,
-  xt as useArchbaseDataSource,
-  Ct as useArchbaseDataSourceListener,
-  be as useArchbaseDataSourceV2,
-  wt as useArchbaseDataSourceV2Editor,
-  It as useArchbaseDataSourceV2ReadOnly,
-  Ot as useArchbaseDidMount,
-  Pt as useArchbaseDidUpdate,
-  Ht as useArchbaseEventListener,
-  Bt as useArchbaseForceRerender,
-  $t as useArchbaseForceUpdate,
-  bt as useArchbaseLocalFilterDataSource,
-  Dt as useArchbaseRemoteDataSource,
-  De as useArchbaseRemoteDataSourceV2,
-  St as useArchbaseRemoteDataSourceV2Editor,
-  Et as useArchbaseRemoteDataSourceV2ReadOnly,
-  Vt as useArchbaseRemoteFilterDataSource,
-  Tt as useArchbaseRemoteServiceApi,
-  Nt as useArchbaseStore,
-  pt as useArchbaseV1V2Compatibility,
-  Lt as useArchbaseWillUnmount
+  Ct as useArchbaseDataSource,
+  bt as useArchbaseDataSourceListener,
+  xe as useArchbaseDataSourceV2,
+  Et as useArchbaseDataSourceV2Editor,
+  wt as useArchbaseDataSourceV2ReadOnly,
+  Pt as useArchbaseDidMount,
+  Lt as useArchbaseDidUpdate,
+  Wt as useArchbaseEventListener,
+  $t as useArchbaseForceRerender,
+  Nt as useArchbaseForceUpdate,
+  Dt as useArchbaseLocalFilterDataSource,
+  Vt as useArchbaseRemoteDataSource,
+  Ce as useArchbaseRemoteDataSourceV2,
+  Ft as useArchbaseRemoteDataSourceV2Editor,
+  St as useArchbaseRemoteDataSourceV2ReadOnly,
+  Tt as useArchbaseRemoteFilterDataSource,
+  Ot as useArchbaseRemoteServiceApi,
+  Ht as useArchbaseStore,
+  yt as useArchbaseV1V2Compatibility,
+  Bt as useArchbaseWillUnmount
 };