@archbase/data 4.0.2 → 4.0.3

package/dist/index.js

@@ -1,22 +1,22 @@
 import { isDate as ve, parseISO as Ie } from "date-fns";
-import { EventEmitter as Oe } from "events";
-import { uniqueId as Pe, cloneDeep as Le } from "lodash";
-import { archbaseI18next as m, ArchbaseDataSourceError as g, ArchbaseObjectHelper as Re, processErrorMessage as q, QUICK as we, NORMAL as Ee, ADVANCED as Se, ArchbaseFilterDSL as Fe, QueryFilterEntity as he, detectDataSourceVersion as pe, MigrationMetrics as Be, ARCHBASE_IOC_API_TYPE as $e, ArchbaseJacksonParser as ie } from "@archbase/core";
-import { ADVANCED as Wt, ARCHBASE_IOC_API_TYPE as zt, FILTER_TYPE as Mt, NORMAL as jt, QUICK as kt, useArchbaseBool as Ut } from "@archbase/core";
-import { useState as V, useCallback as u, useRef as ce, useMemo as W, useEffect as K, useReducer as Ne } from "react";
+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 He } from "inversify-react";
-import { create as We } from "zustand";
-import { createTrackedSelector as ze } from "react-tracked";
+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 Me {
+class Ue {
   eventEmitter;
   listenersDisable = !1;
   constructor() {
-    this.eventEmitter = new Oe();
+    this.eventEmitter = new Be();
   }
   disabledAllListeners() {
     return this.listenersDisable = !0, this;
@@ -79,14 +79,14 @@ class ye {
   validator;
   getIdentity;
   constructor(e, t, r) {
-    this.name = e, this.label = r || e, this.records = [], this.filteredRecords = [], this.loadOptions(t), this.fieldEventListeners = {}, this.emitter = new Me(), this.uuid = Pe(), 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 ye {
    */
   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 ye {
   }
   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 ye {
   }
   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 ye {
   }
   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 ye {
   }
   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 = Le(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 ye {
   }
   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 ye {
   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 ye {
           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 ye {
       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 ye {
   }
   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 ye {
       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 ye {
   }
   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 ye {
   }
   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)
@@ -422,7 +422,7 @@ class ye {
     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;
@@ -489,7 +489,7 @@ class ye {
   }
   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 ye {
   }
   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 ye {
   }
   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 ye {
   }
   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 ye {
     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 ye {
   }
   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 ye {
   }
   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 ye {
   }
   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 ye {
       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 ye {
     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));
     }
   }
   /**
@@ -648,11 +648,11 @@ class Ae extends ye {
   }
   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({
@@ -663,7 +663,7 @@ class Ae extends ye {
       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);
@@ -681,7 +681,7 @@ class Ae extends ye {
     } 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: a.onFieldError,
             fieldName: i.field,
@@ -690,7 +690,7 @@ class Ae extends ye {
           });
         }
       });
-      const r = q(t);
+      const r = G(t);
       throw this.emitter.emit("onError", r, t), this.emit({
         type: a.onError,
         error: r,
@@ -701,21 +701,21 @@ class Ae extends ye {
   }
   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({
@@ -735,7 +735,7 @@ class Ae extends ye {
         index: i
       }), this.lastDataBrowsingOn = (/* @__PURE__ */ new Date()).getTime(), this.lastDataChangedAt = (/* @__PURE__ */ new Date()).getTime(), e && e(), r;
     } catch (t) {
-      const r = q(t);
+      const r = G(t);
       throw this.emitter.emit("onError", r, t), this.emit({
         type: a.onError,
         error: r,
@@ -770,7 +770,7 @@ class Ae extends ye {
     return e && e.sort ? e.sort.quickFilterSort : this.defaultSortFields;
   }
 }
-class je {
+class _e {
   id;
   companyId;
   filter;
@@ -788,7 +788,7 @@ class je {
     Object.assign(this, e);
   }
 }
-class ke extends ye {
+class Ge extends ye {
   getFilterById(e) {
     if (this.locate({ id: e }))
       return this.convertCurrentRecordToFilter();
@@ -808,7 +808,7 @@ class ke extends ye {
   }
   async addNewFilter(e, t) {
     this.insert(
-      new je({
+      new _e({
         id: e.id,
         name: e.name,
         description: e.description,
@@ -856,7 +856,7 @@ class ke extends ye {
     ) : [];
   }
 }
-class Ue {
+class qe {
   id;
   companyId;
   filter;
@@ -875,7 +875,7 @@ class Ue {
     Object.assign(this, e);
   }
 }
-class _e extends Ae {
+class Je extends Ae {
   getFilterById(e) {
     if (this.locate({ id: e }))
       return this.convertCurrentRecordToFilter();
@@ -895,7 +895,7 @@ class _e extends Ae {
   }
   async addNewFilter(e, t) {
     this.insert(
-      new Ue({
+      new qe({
         id: e.id,
         name: e.name,
         description: e.description,
@@ -946,19 +946,19 @@ class _e extends Ae {
     ) : [];
   }
 }
-function mt(n, e, t, r) {
-  const i = e && ("appendToFieldArray" in e || "updateFieldArrayItem" in e), [s, o] = V(r), [, c] = V(0), f = u(() => {
-    c((l) => l + 1);
-  }, []), [R, C] = V(r), [H, z] = V(0), O = u(() => {
-    let l = r;
-    e && t && (l = e.getFieldValue(t), l == null && (l = r)), i ? (C(l), z((b) => b + 1)) : o(l);
-  }, [e, t, r, i]), P = u((l) => {
-    e && t && ((l.type === a.dataChanged || l.type === a.recordChanged || l.type === a.afterScroll || l.type === a.afterCancel || l.type === a.afterEdit) && (O(), i || f()), l.type === a.onFieldError && l.fieldName === t && console.warn(`[${n}] Field error:`, l.error));
-  }, [e, t, O, f, i, n]), N = u((l, b) => {
-    i ? (C(l), e && !e.isBrowsing() && t && e.getFieldValue(t) !== l && e.setFieldValue(t, l)) : (o(l), e && !e.isBrowsing() && t && e.getFieldValue(t) !== l && e.setFieldValue(t, l));
-  }, [e, t, i]), d = u(() => {
-    const l = pe(e);
-    Be.trackV2Usage(n, l);
+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 ce(() => {
     process.env.NODE_ENV === "production" && d();
@@ -967,12 +967,12 @@ function mt(n, e, t, r) {
     isDataSourceV2: i,
     dataSourceVersion: pe(e),
     // Estados
-    currentValue: i ? R : s,
-    v1State: { currentValue: s, setCurrentValue: o, forceUpdate: f },
-    v2State: { v2Value: R, setV2Value: C, v2ShouldUpdate: H },
+    currentValue: i ? p : s,
+    v1State: { currentValue: s, setCurrentValue: o, forceUpdate: u },
+    v2State: { v2Value: p, setV2Value: C, v2ShouldUpdate: W },
     // Funções
-    loadDataSourceFieldValue: O,
-    dataSourceEvent: P,
+    loadDataSourceFieldValue: P,
+    dataSourceEvent: L,
     handleValueChange: N,
     // Utilitários
     isReadOnly: e ? e.isBrowsing() : !1,
@@ -980,7 +980,7 @@ function mt(n, e, t, r) {
     trackUsage: d
   };
 }
-const Rt = {
+const vt = {
   /**
    * Valida se o componente está seguindo o padrão corretamente
    */
@@ -997,7 +997,7 @@ const Rt = {
     "getFieldValue",
     "setFieldValue"
   ].every((r) => typeof e[r] == "function") ? !0 : (console.error(`[${n}] V1 DataSource missing required methods`), !1)
-}, pt = `
+}, It = `
 // Em qualquer componente que use DataSource:
 
 import { useArchbaseV1V2Compatibility } from '../core/patterns/ArchbaseV1V2CompatibilityPattern';
@@ -1278,8 +1278,8 @@ class U {
     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: a.fieldChanged,
@@ -1522,7 +1522,7 @@ class U {
     return i;
   }
 }
-class Ge {
+class Qe {
   name;
   label;
   service;
@@ -1623,7 +1623,7 @@ class Ge {
   }
   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({
@@ -1663,11 +1663,11 @@ class Ge {
   // =================== 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();
@@ -1679,7 +1679,7 @@ class Ge {
       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);
@@ -1691,8 +1691,8 @@ class Ge {
       });
       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);
+        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({
@@ -1701,16 +1701,16 @@ class Ge {
         index: this.getCurrentIndex()
       }), e && e(), r;
     } catch (r) {
-      throw this.handleSaveError(r, e), new g(q(r));
+      throw this.handleSaveError(r, e), new g(G(r));
     }
   }
   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;
@@ -1730,7 +1730,7 @@ class Ge {
         index: r
       }), e && e(), t;
     } catch (i) {
-      const s = q(i);
+      const s = G(i);
       throw this.emit({
         type: a.onError,
         error: s,
@@ -1811,8 +1811,8 @@ class Ge {
     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: a.fieldChanged,
@@ -1893,6 +1893,25 @@ class Ge {
     }
     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
    */
@@ -2083,7 +2102,7 @@ class Ge {
         originalError: i.message
       }), this.onFieldError && this.onFieldError(i.field, i.message));
     });
-    const r = q(e);
+    const r = G(e);
     this.emit({
       type: a.onError,
       error: r,
@@ -2158,7 +2177,7 @@ class Ge {
     return this.defaultSortFields;
   }
   handleRemoteError(e, t) {
-    const r = q(e);
+    const r = G(e);
     this.emit({
       type: a.onError,
       error: r,
@@ -2167,11 +2186,11 @@ class Ge {
   }
 }
 function xe(n) {
-  const e = ce(null), [t, r] = V(null), [i, s] = V(-1), [o, c] = V(0), [f, R] = V(!0), [C, H] = V(!1), [z, O] = V(!1), [P, N] = V(!1), d = W(() => (e.current || (e.current = new U(n)), e.current), []), l = u((F) => {
+  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 a.dataChanged:
       case a.recordChanged:
-        r(d.getCurrentRecord()), s(d.getCurrentIndex()), c(d.getTotalRecords()), R(d.isBrowsing()), H(d.isEditing()), O(d.isInserting());
+        r(d.getCurrentRecord()), s(d.getCurrentIndex()), c(d.getTotalRecords()), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting());
         break;
       case a.fieldChanged:
         break;
@@ -2186,7 +2205,7 @@ function xe(n) {
       case a.afterInsert:
       case a.afterSave:
       case a.afterCancel:
-        N(!1), R(d.isBrowsing()), H(d.isEditing()), O(d.isInserting());
+        N(!1), p(d.isBrowsing()), W(d.isEditing()), P(d.isInserting());
         break;
       case a.onError:
       case a.onFieldError:
@@ -2194,57 +2213,57 @@ function xe(n) {
         break;
     }
   }, [d]);
-  K(() => (d.addListener(l), r(d.getCurrentRecord()), s(d.getCurrentIndex()), c(d.getTotalRecords()), R(d.isBrowsing()), H(d.isEditing()), O(d.isInserting()), () => {
-    d.removeListener(l);
-  }), [d, l]);
-  const b = u((F, k) => {
+  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]), L = u((F) => d.getFieldValue(F), [d]), h = u(() => {
+  }, [d]), V = l((F) => d.getFieldValue(F), [d]), K = l(() => {
     d instanceof U, d.edit();
-  }, [d]), E = u(async () => await d.save(), [d]), j = u(() => {
+  }, [d]), m = l(async () => await d.save(), [d]), h = l(() => {
     d instanceof U, d.cancel();
-  }, [d]), X = u((F) => {
+  }, [d]), Y = l((F) => {
     d instanceof U, d.insert(F);
-  }, [d]), Z = u(async (F) => await d.remove(F), [d]), I = u(() => {
+  }, [d]), Z = l(async (F) => await d.remove(F), [d]), E = l(() => {
     d instanceof U, d.first();
-  }, [d]), _ = u(() => {
+  }, [d]), j = l(() => {
     d instanceof U, d.last();
-  }, [d]), ee = u(() => {
+  }, [d]), ee = l(() => {
     d instanceof U, d.next();
-  }, [d]), D = u(() => {
+  }, [d]), D = l(() => {
     d instanceof U, d.prior();
-  }, [d]), S = u((F) => {
+  }, [d]), S = l((F) => {
     d instanceof U, d.goToRecord(F);
-  }, [d]), A = u((F, k) => {
+  }, [d]), A = l((F, k) => {
     d instanceof U && d.appendToFieldArray(F, k);
-  }, [d]), B = u((F, k, de) => {
+  }, [d]), B = l((F, k, de) => {
     d instanceof U && d.updateFieldArrayItem(F, k, de);
-  }, [d]), p = u((F, k) => {
+  }, [d]), y = l((F, k) => {
     d instanceof U && d.removeFromFieldArray(F, k);
-  }, [d]), v = u((F, k, de) => {
+  }, [d]), w = l((F, k, de) => {
     d instanceof U && d.insertIntoFieldArray(F, k, de);
-  }, [d]), x = u((F) => {
+  }, [d]), x = l((F) => {
     if (d instanceof U)
       return d.getFieldArray(F);
     const k = d.getFieldValue(F);
     return Array.isArray(k) ? k : [];
-  }, [d]), $ = u((F) => {
+  }, [d]), $ = l((F) => {
     if (d instanceof U)
       return d.isFieldArray(F);
     const k = d.getFieldValue(F);
     return Array.isArray(k);
-  }, [d]), y = W(() => i < o - 1, [i, o]), J = W(() => i > 0, [i]), te = W(() => o === 0, [o]), oe = W(() => i === 0, [i]), ae = W(() => i === o - 1, [i, o]), T = W(() => f, [f]), G = W(() => C, [C]), re = W(() => z, [z]), ue = u(() => process.env.NODE_ENV === "development" ? {
+  }, [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: T,
-      isEditing: G,
+      isBrowsing: O,
+      isEditing: _,
       isInserting: re,
-      isLoading: P
+      isLoading: L
     }
-  } : null, [d, t, i, o, T, G, re, P]);
+  } : null, [d, t, i, o, O, _, re, L]);
   return {
     // DataSource instance (para casos onde acesso direto é necessário)
     dataSource: d,
@@ -2252,42 +2271,42 @@ function xe(n) {
     currentRecord: t,
     currentIndex: i,
     totalRecords: o,
-    isLoading: P,
+    isLoading: L,
     // Estado derivado
-    canNext: y,
+    canNext: v,
     canPrior: J,
     isEmpty: te,
     isFirst: oe,
     isLast: ae,
-    isBrowsing: T,
-    isEditing: G,
+    isBrowsing: O,
+    isEditing: _,
     isInserting: re,
     // Operações básicas
     setFieldValue: b,
-    getFieldValue: L,
-    edit: h,
-    save: E,
-    cancel: j,
-    insert: X,
+    getFieldValue: V,
+    edit: K,
+    save: m,
+    cancel: h,
+    insert: Y,
     remove: Z,
     // Navegação
-    first: I,
-    last: _,
+    first: E,
+    last: j,
     next: ee,
     prior: D,
     goToRecord: S,
     // Operações de array (V2)
     appendToFieldArray: A,
     updateFieldArrayItem: B,
-    removeFromFieldArray: p,
-    insertIntoFieldArray: v,
+    removeFromFieldArray: y,
+    insertIntoFieldArray: w,
     getFieldArray: x,
     isFieldArray: $,
     // Debug
     getDebugInfo: ue
   };
 }
-function yt(n) {
+function wt(n) {
   const {
     dataSource: e,
     currentRecord: t,
@@ -2296,16 +2315,16 @@ function yt(n) {
     canNext: s,
     canPrior: o,
     isEmpty: c,
-    isFirst: f,
-    isLast: R,
+    isFirst: u,
+    isLast: p,
     isBrowsing: C,
-    first: H,
-    last: z,
-    next: O,
-    prior: P,
+    first: W,
+    last: M,
+    next: P,
+    prior: L,
     goToRecord: N,
     getFieldValue: d,
-    getFieldArray: l,
+    getFieldArray: f,
     isFieldArray: b
   } = xe(n);
   return {
@@ -2316,178 +2335,191 @@ function yt(n) {
     canNext: s,
     canPrior: o,
     isEmpty: c,
-    isFirst: f,
-    isLast: R,
+    isFirst: u,
+    isLast: p,
     isBrowsing: C,
-    first: H,
-    last: z,
-    next: O,
-    prior: P,
+    first: W,
+    last: M,
+    next: P,
+    prior: L,
     goToRecord: N,
     getFieldValue: d,
-    getFieldArray: l,
+    getFieldArray: f,
     isFieldArray: b
   };
 }
-function vt(n) {
+function Et(n) {
   return xe(n);
 }
 function Ce(n) {
-  const e = ce(null), [t, r] = V(void 0), [i, s] = V(-1), [o, c] = V(0), [f, R] = V(0), [C, H] = V(!0), [z, O] = V(!1), [P, N] = V(!1), [d, l] = V(!1), [b, L] = V(null), h = W(() => (e.current || (e.current = new Ge(n)), e.current), []), E = u((w) => {
-    switch (w.type) {
+  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:
-        r(h.getCurrentRecord()), s(h.getCurrentIndex()), c(h.getTotalRecords()), R(h.getGrandTotalRecords()), H(h.isBrowsing()), O(h.isEditing()), N(h.isInserting()), l(!1), L(null);
+        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 a.fieldChanged:
         break;
       case a.afterScroll:
-        r(h.getCurrentRecord()), s(h.getCurrentIndex());
+        s(h.getCurrentRecord()), c(h.getCurrentIndex());
         break;
       case a.beforeEdit:
       case a.beforeInsert:
       case a.beforeSave:
       case a.beforeRemove:
-        l(!0), L(null);
+        V(!0), m(null);
         break;
       case a.afterEdit:
       case a.afterInsert:
       case a.afterSave:
       case a.afterCancel:
       case a.afterRemove:
-        l(!1), H(h.isBrowsing()), O(h.isEditing()), N(h.isInserting()), L(null);
+        V(!1), P(h.isBrowsing()), N(h.isEditing()), f(h.isInserting()), m(null);
         break;
       case a.onError:
-        l(!1), L(w.error);
+        V(!1), m(I.error);
         break;
       case a.onFieldError:
-        l(!1);
+        V(!1);
         break;
     }
   }, [h]);
-  K(() => (h.addListener(E), r(h.getCurrentRecord()), s(h.getCurrentIndex()), c(h.getTotalRecords()), R(h.getGrandTotalRecords()), H(h.isBrowsing()), O(h.isEditing()), N(h.isInserting()), () => {
-    h.removeListener(E);
-  }), [h, E]);
-  const j = u((w, M) => {
-    h.setFieldValue(w, M);
-  }, [h]), X = u((w) => h.getFieldValue(w), [h]), Z = u(() => {
+  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]), I = u(async () => {
+  }, [h]), ee = l(async () => {
     try {
-      return L(null), await h.save();
-    } catch (w) {
-      throw L(w.message || "Erro ao salvar"), w;
+      return m(null), await h.save();
+    } catch (I) {
+      throw m(I.message || "Erro ao salvar"), I;
     }
-  }, [h]), _ = u(() => {
+  }, [h]), D = l(() => {
     h.cancel();
-  }, [h]), ee = u((w) => {
-    h.insert(w);
-  }, [h]), D = u(async (w) => {
+  }, [h]), S = l((I) => {
+    h.insert(I);
+  }, [h]), A = l(async (I) => {
     try {
-      return L(null), await h.remove(w);
-    } catch (M) {
-      throw L(M.message || "Erro ao remover"), M;
+      return m(null), await h.remove(I);
+    } catch (H) {
+      throw m(H.message || "Erro ao remover"), H;
     }
-  }, [h]), S = u(() => {
+  }, [h]), B = l(() => {
     h.first();
-  }, [h]), A = u(() => {
+  }, [h]), y = l(() => {
     h.last();
-  }, [h]), B = u(() => {
+  }, [h]), w = l(() => {
     h.next();
-  }, [h]), p = u(() => {
+  }, [h]), x = l(() => {
     h.prior();
-  }, [h]), v = u((w) => {
-    h.goToRecord(w);
-  }, [h]), x = u((w, M) => {
-    h.appendToFieldArray(w, M);
-  }, [h]), $ = u((w, M, se) => {
-    h.updateFieldArrayItem(w, M, se);
-  }, [h]), y = u((w, M) => {
-    h.removeFromFieldArray(w, M);
-  }, [h]), J = u((w, M, se) => {
-    h.insertIntoFieldArray(w, M, se);
-  }, [h]), te = u((w) => h.getFieldArray(w), [h]), oe = u((w) => h.isFieldArray(w), [h]), ae = u((w, M, se) => {
-    l(!0), L(null);
+  }, [h]), $ = l((I) => {
+    h.goToRecord(I);
+  }, [h]), v = l(async (I) => {
     try {
-      h.applyRemoteFilter(w, M, () => {
-        l(!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 (Te) {
-      l(!1), L(Te.message || "Erro ao aplicar filtro");
+    } catch (Le) {
+      V(!1), m(Le.message || "Erro ao aplicar filtro");
     }
-  }, [h]), T = u(async (w) => {
+  }, [h]), ue = l(async (I) => {
     try {
-      l(!0), L(null), h.refreshData(w);
-    } catch (M) {
-      throw l(!1), L(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]), G = u((w) => {
-    h.setPageSize(w);
-  }, [h]), re = u(() => h.getPageSize(), [h]), ue = W(() => i < o - 1, [i, o]), F = W(() => i > 0, [i]), k = W(() => o === 0, [o]), de = W(() => i === 0, [i]), De = W(() => i === o - 1, [i, o]), ge = W(() => C, [C]), fe = W(() => z, [z]), me = W(() => P, [P]), Ve = u(() => 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,
+      currentRecord: i,
+      currentIndex: o,
+      totalRecords: u,
+      grandTotalRecords: C,
       isBrowsing: ge,
       isEditing: fe,
       isInserting: me,
-      isLoading: d,
-      error: b
+      isLoading: b,
+      error: K
     }
-  } : null, [h, t, i, o, f, ge, fe, me, d, b]);
+  } : 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: d,
-    error: b,
+    currentRecord: i,
+    currentIndex: o,
+    totalRecords: u,
+    grandTotalRecords: C,
+    isLoading: b,
+    error: K,
     // Estado derivado
-    canNext: ue,
-    canPrior: F,
-    isEmpty: k,
-    isFirst: de,
-    isLast: De,
+    canNext: de,
+    canPrior: De,
+    isEmpty: Ve,
+    isFirst: Te,
+    isLast: Oe,
     isBrowsing: ge,
     isEditing: fe,
     isInserting: me,
     // Operações básicas
-    setFieldValue: j,
-    getFieldValue: X,
-    edit: Z,
-    save: I,
-    cancel: _,
-    insert: ee,
-    remove: D,
+    setFieldValue: Z,
+    getFieldValue: E,
+    edit: j,
+    save: ee,
+    cancel: D,
+    insert: S,
+    remove: A,
     // Navegação
-    first: S,
-    last: A,
-    next: B,
-    prior: p,
-    goToRecord: v,
+    first: B,
+    last: y,
+    next: w,
+    prior: x,
+    goToRecord: $,
+    loadById: v,
     // Operações de array (V2)
-    appendToFieldArray: x,
-    updateFieldArrayItem: $,
-    removeFromFieldArray: y,
-    insertIntoFieldArray: J,
-    getFieldArray: te,
-    isFieldArray: oe,
+    appendToFieldArray: J,
+    updateFieldArrayItem: te,
+    removeFromFieldArray: oe,
+    insertIntoFieldArray: ae,
+    getFieldArray: O,
+    isFieldArray: _,
     // Operações remotas
-    applyRemoteFilter: ae,
-    refreshData: T,
-    setPageSize: G,
-    getPageSize: re,
+    applyRemoteFilter: re,
+    refreshData: ue,
+    setPageSize: F,
+    getPageSize: k,
     // Debug
-    getDebugInfo: Ve
+    getDebugInfo: Pe
   };
 }
-function It(n) {
+function St(n) {
   const {
     dataSource: e,
     currentRecord: t,
@@ -2496,24 +2528,25 @@ function It(n) {
     grandTotalRecords: s,
     isLoading: o,
     error: c,
-    canNext: f,
-    canPrior: R,
+    canNext: u,
+    canPrior: p,
     isEmpty: C,
-    isFirst: H,
-    isLast: z,
-    isBrowsing: O,
-    first: P,
+    isFirst: W,
+    isLast: M,
+    isBrowsing: P,
+    first: L,
     last: N,
     next: d,
-    prior: l,
+    prior: f,
     goToRecord: b,
-    getFieldValue: L,
-    getFieldArray: h,
-    isFieldArray: E,
-    applyRemoteFilter: j,
-    refreshData: X,
-    getPageSize: Z,
-    getDebugInfo: I
+    loadById: V,
+    getFieldValue: K,
+    getFieldArray: m,
+    isFieldArray: h,
+    applyRemoteFilter: Y,
+    refreshData: Z,
+    getPageSize: E,
+    getDebugInfo: j
   } = Ce(n);
   return {
     dataSource: e,
@@ -2523,30 +2556,31 @@ function It(n) {
     grandTotalRecords: s,
     isLoading: o,
     error: c,
-    canNext: f,
-    canPrior: R,
+    canNext: u,
+    canPrior: p,
     isEmpty: C,
-    isFirst: H,
-    isLast: z,
-    isBrowsing: O,
-    first: P,
+    isFirst: W,
+    isLast: M,
+    isBrowsing: P,
+    first: L,
     last: N,
     next: d,
-    prior: l,
+    prior: f,
     goToRecord: b,
-    getFieldValue: L,
-    getFieldArray: h,
-    isFieldArray: E,
-    applyRemoteFilter: j,
-    refreshData: X,
-    getPageSize: Z,
-    getDebugInfo: I
+    loadById: V,
+    getFieldValue: K,
+    getFieldArray: m,
+    isFieldArray: h,
+    applyRemoteFilter: Y,
+    refreshData: Z,
+    getPageSize: E,
+    getDebugInfo: j
   };
 }
-function wt(n) {
+function Ft(n) {
   return Ce(n);
 }
-class Et {
+class At {
   /**
    * Gera chave de query baseada no DataSource e filtros
    */
@@ -2570,7 +2604,7 @@ class Et {
     );
   }
 }
-const St = {
+const xt = {
   /** Configuração para dados que mudam raramente */
   STATIC_DATA: {
     staleTime: 30 * 60 * 1e3,
@@ -2600,32 +2634,32 @@ const St = {
     // 1 minuto
     retry: 5
   }
-}, Ft = (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 ye(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, C] = V(
-    f()
+  }, r), [p, C] = T(
+    u()
   );
-  return K(() => {
-    o && o.setValue(t, R), s && s(R);
-  }, [t]), { dataSource: R };
-}, At = (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);
   };
-  K(() => (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()]);
-}, xt = (n) => {
-  const { initialData: e, name: t, initialDataSource: r, onLoadComplete: i, validator: s } = n, [o, c] = V(
-    r ?? new ke(t, {
+}, 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,
       currentPage: 0,
@@ -2634,9 +2668,9 @@ const St = {
       validator: s
     })
   );
-  return K(() => {
-    c((f) => {
-      const R = {
+  return q(() => {
+    c((u) => {
+      const p = {
         records: e,
         grandTotalRecords: e.length,
         totalPages: 0,
@@ -2644,7 +2678,7 @@ const St = {
         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 };
 };
@@ -2663,7 +2697,7 @@ class be {
   }
   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);
@@ -2671,7 +2705,7 @@ class be {
   }
   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),
         {
@@ -2687,7 +2721,7 @@ class be {
   async postNoConvertId(e, t, r, i, s) {
     try {
       const o = this.prepareHeaders(r, i);
-      return (await Y.post(
+      return (await X.post(
         e,
         t,
         {
@@ -2701,7 +2735,7 @@ class be {
   }
   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
       });
@@ -2713,7 +2747,7 @@ class be {
   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;
@@ -2724,7 +2758,7 @@ class be {
   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;
@@ -2734,7 +2768,7 @@ class be {
   }
   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);
@@ -2742,7 +2776,7 @@ class be {
   }
   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
       });
@@ -2754,7 +2788,7 @@ class be {
   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;
@@ -2769,7 +2803,7 @@ class be {
   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;
@@ -2784,7 +2818,7 @@ class be {
   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;
@@ -2803,15 +2837,15 @@ class be {
         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($e.TokenManager), be, 0);
+ne.decorate(ne.inject(We.TokenManager), be, 0);
 ne.decorate(ne.injectable(), be);
-class qe {
+class Ke {
   client;
   constructor(e) {
     this.client = e;
@@ -2911,7 +2945,7 @@ class qe {
     return this.client.delete(`${this.getEndpoint()}/${e}`, t, !1);
   }
 }
-ne.decorate(ne.injectable(), qe);
+ne.decorate(ne.injectable(), Ke);
 class le {
   content;
   pageable;
@@ -2924,8 +2958,8 @@ class le {
   first;
   numberOfElements;
   empty;
-  constructor(e, t, r, i, s, o, c, f, R, 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 = f !== void 0 ? f : i === 0, this.numberOfElements = R !== void 0 ? R : e.length, this.empty = C !== void 0 ? C : 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,
@@ -2938,16 +2972,16 @@ class le {
     return new le(e, t, r, i, s);
   }
 }
-function Je(n) {
+function Ye(n) {
   return n.totalElements || n.totalElements === 0 ? n.totalElements : n.page.totalElements;
 }
-function Qe(n) {
+function Xe(n) {
   return n.totalPages || n.totalPages === 0 ? n.totalPages : n.page.totalPages;
 }
-function Ke(n) {
+function Ze(n) {
   return n.pageable ? n.pageable.pageNumber : n.page.number;
 }
-function Ct(n) {
+function Vt(n) {
   const {
     name: e,
     label: t,
@@ -2956,28 +2990,28 @@ function Ct(n) {
     sort: s,
     transformData: o,
     onLoadComplete: c,
-    onDestroy: f,
-    filterData: R,
+    onDestroy: u,
+    filterData: p,
     findAll: C,
-    findAllWithSort: H,
-    findAllWithFilter: z,
-    findAllWithFilterAndSort: O,
-    initialDataSource: P,
+    findAllWithSort: W,
+    findAllWithFilter: M,
+    findAllWithFilterAndSort: P,
+    initialDataSource: L,
     pageSize: N = 50,
     currentPage: d = 0,
-    loadOnStart: l = !0,
+    loadOnStart: f = !0,
     store: b,
-    id: L,
-    validator: h
-  } = n, E = ce(!1), j = () => !!(b && b.existsValue(e) || P), X = () => b && b.existsValue(e) ? b.getValue(e) : P || new Ae(r, e, {
+    id: V,
+    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: d,
     totalPages: 0,
     pageSize: N,
-    validator: h
-  }, t), Z = () => b && b.existsValue(e) ? b.getValue(e).getCurrentPage() : P ? P.getCurrentPage() : 0, [I, _] = V({
-    dataSource: X(),
+    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: "",
@@ -2985,156 +3019,156 @@ function Ct(n) {
     label: t,
     filter: i,
     sort: s,
-    id: L,
+    id: V,
     currentPage: Z(),
     pageSize: N,
-    loadDataCount: j() ? 1 : 0
-  }), ee = async (p, v, x, $, y, J, te, oe, ae) => {
-    let T;
+    loadDataCount: h() ? 1 : 0
+  }), ee = async (y, w, x, $, v, J, te, oe, ae) => {
+    let O;
     if (J) {
-      const G = await r.findOne(J);
-      G ? T = le.createFromValues([G], 1, 0, 0, 0) : T = le.createFromValues([], 0, 0, 0, 0);
+      const _ = await r.findOne(J);
+      _ ? O = le.createFromValues([_], 1, 0, 0, 0) : O = le.createFromValues([], 0, 0, 0, 0);
     } else
-      O && $ && y && y.length > 0 ? T = await O($, v, x, y) : z && $ ? T = await z($, v, x) : H && y && y.length > 0 ? T = await H(v, x, y) : C ? T = await C(v, x) : $ && y && y.length > 0 ? T = await r.findAllWithFilterAndSort($, v, x, y) : $ ? T = await r.findAllWithFilter($, v, x) : y && y.length > 0 ? T = await r.findAllWithSort(v, x, y) : T = await r.findAll(v, x);
-    R && (T = R(T)), o && (T = o(T)), _((G) => {
+      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: T.content,
-        grandTotalRecords: Je(T),
-        totalPages: Qe(T),
-        currentPage: Ke(T),
+        records: O.content,
+        grandTotalRecords: Ye(O),
+        totalPages: Xe(O),
+        currentPage: Ze(O),
         pageSize: x,
         filter: $,
-        sort: y,
+        sort: v,
         originFilter: te,
         originGlobalFilter: ae,
         originSort: oe,
-        validator: h
+        validator: K
       };
-      return G.dataSource.isActive() ? G.dataSource.setData(re) : G.dataSource.open(re), {
-        ...G,
-        currentPage: v,
+      return _.dataSource.isActive() ? _.dataSource.setData(re) : _.dataSource.open(re), {
+        ..._,
+        currentPage: w,
         pageSize: x,
         filter: $,
-        sort: y,
+        sort: v,
         id: J,
         isLoading: !1,
         isError: !1,
         error: "",
-        loadDataCount: G.loadDataCount + 1
+        loadDataCount: _.loadDataCount + 1
       };
-    }), b && b.setValue(e, I.dataSource);
+    }), b && b.setValue(e, E.dataSource);
   };
-  K(() => {
-    c && I.loadDataCount > 0 && c(I.dataSource);
-  }, [I.loadDataCount]);
-  const D = u((p) => {
-    if (p.type === a.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 {
-        _((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 $ = q(x);
-          _((y) => ({
-            ...y,
+          const $ = G(x);
+          j((v) => ({
+            ...v,
             isError: !0,
             isLoading: !1,
             error: $
           })), n.onError && n.onError($, x);
         });
       } catch (x) {
-        const $ = q(x);
-        _((y) => ({
-          ...y,
+        const $ = G(x);
+        j((v) => ({
+          ...v,
           isError: !0,
           isLoading: !1,
           error: $
         })), n.onError && n.onError($, x);
       }
     }
-  }, [ee, I.name, n.onError]), S = u((p) => {
-    E.current || (p.addListener(D), E.current = !0);
-  }, [D]), A = u((p) => {
-    E.current && (p.removeListener(D), E.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]);
-  K(() => {
+  q(() => {
     try {
-      return S(I.dataSource), l && I.loadDataCount === 0 ? (_((p) => ({ ...p, isLoading: !0 })), ee(
-        I.name,
+      return S(E.dataSource), f && E.loadDataCount === 0 ? (j((y) => ({ ...y, isLoading: !0 })), ee(
+        E.name,
         d,
         N,
-        I.filter,
-        I.sort,
-        I.id
-      ).catch((p) => {
-        const v = q(p);
-        _((x) => ({
+        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 = q(p);
-      _((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 B = () => {
-    _((p) => ({
-      ...p,
+    j((y) => ({
+      ...y,
       isError: !1,
       isLoading: !1,
       error: ""
     }));
   };
   return {
-    isLoading: I.isLoading,
-    isError: I.isError,
-    error: I.error,
-    dataSource: I.dataSource,
+    isLoading: E.isLoading,
+    isError: E.isError,
+    error: E.error,
+    dataSource: E.dataSource,
     clearError: B
   };
 }
-function Ye(n) {
+function et(n) {
   return n.totalElements || n.totalElements === 0 ? n.totalElements : n.page.totalElements;
 }
-function Xe(n) {
+function tt(n) {
   return n.totalPages || n.totalPages === 0 ? n.totalPages : n.page.totalPages;
 }
-function Ze(n) {
+function rt(n) {
   return n.pageable ? n.pageable.pageNumber : n.page.number;
 }
-function bt(n) {
+function Tt(n) {
   const {
     name: e,
     service: t,
@@ -3143,26 +3177,26 @@ function bt(n) {
     transformData: s,
     onLoadComplete: o,
     onDestroy: c,
-    filterData: f,
-    findAll: R,
+    filterData: u,
+    findAll: p,
     findAllWithSort: C,
-    findAllWithFilter: H,
-    findAllWithFilterAndSort: z,
-    initialDataSource: O,
-    pageSize: P = 50,
+    findAllWithFilter: W,
+    findAllWithFilterAndSort: M,
+    initialDataSource: P,
+    pageSize: L = 50,
     currentPage: N = 0,
     loadOnStart: d = !0,
-    store: l,
+    store: f,
     validator: b
-  } = n, L = () => !!(l && l.existsValue(e) || O), h = () => l && l.existsValue(e) ? l.getValue(e) : O || new _e(t, e, {
+  } = n, V = () => !!(f && f.existsValue(e) || P), K = () => f && f.existsValue(e) ? f.getValue(e) : P || new Je(t, e, {
     records: [],
     grandTotalRecords: 0,
     currentPage: N,
     totalPages: 0,
-    pageSize: P,
+    pageSize: L,
     validator: b
-  }), [E, j] = V({
-    dataSource: h(),
+  }), [m, h] = T({
+    dataSource: K(),
     isLoading: !1,
     isError: !1,
     error: "",
@@ -3170,20 +3204,20 @@ function bt(n) {
     filter: r,
     sort: i,
     currentPage: N,
-    pageSize: P,
-    loadDataCount: L() ? 1 : 0
-  }), X = async (D, S, A, B, p, v, x, $) => {
-    let y;
-    z && B && p && p.length > 0 ? y = await z(B, S, A, p) : H && B ? y = await H(B, S, A) : C && p && p.length > 0 ? y = await C(S, A, p) : R ? y = await R(S, A) : B && p && p.length > 0 ? y = await t.findAllWithFilterAndSort(B, S, A, p) : B ? y = await t.findAllWithFilter(B, S, A) : p && p.length > 0 ? y = await t.findAllWithSort(S, A, p) : y = await t.findAll(S, A), f && (y = f(y)), s && (y = s(y)), j((J) => {
+    pageSize: L,
+    loadDataCount: V() ? 1 : 0
+  }), Y = async (D, S, A, B, y, w, x, $) => {
+    let v;
+    M && B && y && y.length > 0 ? v = await M(B, S, A, y) : W && B ? v = await W(B, S, A) : C && y && y.length > 0 ? v = await C(S, A, y) : p ? v = await p(S, A) : B && y && y.length > 0 ? v = await t.findAllWithFilterAndSort(B, S, A, y) : B ? v = await t.findAllWithFilter(B, S, A) : y && y.length > 0 ? v = await t.findAllWithSort(S, A, y) : v = await t.findAll(S, A), u && (v = u(v)), s && (v = s(v)), h((J) => {
       const te = {
-        records: y.content,
-        grandTotalRecords: Ye(y),
-        totalPages: Xe(y),
-        currentPage: Ze(y),
+        records: v.content,
+        grandTotalRecords: et(v),
+        totalPages: tt(v),
+        currentPage: rt(v),
         pageSize: A,
         filter: B,
-        sort: p,
-        originFilter: v,
+        sort: y,
+        originFilter: w,
         originGlobalFilter: $,
         originSort: x,
         validator: b
@@ -3193,25 +3227,25 @@ function bt(n) {
         currentPage: S,
         pageSize: A,
         filter: B,
-        sort: p,
+        sort: y,
         isLoading: !1,
         isError: !1,
         error: "",
         loadDataCount: J.loadDataCount + 1
       };
-    }), l && l.setValue(e, E.dataSource), o && o(E.dataSource);
+    }), f && f.setValue(e, m.dataSource), o && o(m.dataSource);
   }, Z = (D) => {
     if (D.type === a.refreshData) {
       const S = D.options;
       try {
-        j((A) => ({
+        h((A) => ({
           ...A,
           isLoading: !0,
           filter: S.filter,
           sort: S.sort,
           currentPage: S.currentPage
-        })), X(
-          E.name,
+        })), Y(
+          m.name,
           S.currentPage,
           S.pageSize,
           S.filter,
@@ -3220,51 +3254,51 @@ function bt(n) {
           S.originSort,
           S.originGlobalFilter
         ).catch((A) => {
-          const B = q(A);
-          j((p) => ({
-            ...p,
+          const B = G(A);
+          h((y) => ({
+            ...y,
             isError: !0,
             isLoading: !1,
             error: B
           })), n.onError && n.onError(B, A);
         });
       } catch (A) {
-        const B = q(A);
-        j((p) => ({
-          ...p,
+        const B = G(A);
+        h((y) => ({
+          ...y,
           isError: !0,
           isLoading: !1,
           error: B
         })), n.onError && n.onError(B, A);
       }
     }
-  }, I = (D) => {
+  }, E = (D) => {
     D.addListener(Z);
-  }, _ = (D) => {
+  }, j = (D) => {
     D.removeListener(Z);
   };
-  K(() => {
+  q(() => {
     try {
-      return I(E.dataSource), d && E.loadDataCount === 0 && (j((D) => ({ ...D, isLoading: !0 })), X(
-        E.name,
+      return E(m.dataSource), d && m.loadDataCount === 0 && (h((D) => ({ ...D, isLoading: !0 })), Y(
+        m.name,
         N,
-        P,
-        E.filter,
-        E.sort
+        L,
+        m.filter,
+        m.sort
       ).catch((D) => {
-        const S = q(D);
-        j((A) => ({
+        const S = G(D);
+        h((A) => ({
           ...A,
           isError: !0,
           isLoading: !1,
           error: S
         })), n.onError && n.onError(S, D);
       })), () => {
-        c && (_(E.dataSource), c(E.dataSource));
+        c && (j(m.dataSource), c(m.dataSource));
       };
     } catch (D) {
-      const S = q(D);
-      j((A) => ({
+      const S = G(D);
+      h((A) => ({
         ...A,
         isError: !0,
         isLoading: !1,
@@ -3272,14 +3306,14 @@ function bt(n) {
       })), n.onError && n.onError(S, D);
     }
   }, [
-    E.name,
-    E.sort,
-    E.filter,
-    E.currentPage,
-    E.pageSize
+    m.name,
+    m.sort,
+    m.filter,
+    m.currentPage,
+    m.pageSize
   ]);
   const ee = () => {
-    j((D) => ({
+    h((D) => ({
       ...D,
       isError: !1,
       isLoading: !1,
@@ -3287,46 +3321,46 @@ function bt(n) {
     }));
   };
   return {
-    isLoading: E.isLoading,
-    isError: E.isError,
-    error: E.error,
-    dataSource: E.dataSource,
+    isLoading: m.isLoading,
+    isError: m.isError,
+    error: m.error,
+    dataSource: m.dataSource,
     clearError: ee
   };
 }
-function Dt(n) {
-  return He((e) => e.get(n));
+function Ot(n) {
+  return Me((e) => e.get(n));
 }
-function Vt(n) {
-  K(() => {
+function Pt(n) {
+  q(() => {
     n();
   }, []);
 }
-function Tt(n, e) {
-  K(() => {
+function Lt(n, e) {
+  q(() => {
     n();
   }, e);
 }
-function Ot(n) {
-  K(() => () => {
+function Bt(n) {
+  q(() => () => {
     n();
   }, []);
 }
-function Pt() {
-  const [, n] = V(0);
-  return u(() => {
+function $t() {
+  const [, n] = T(0);
+  return l(() => {
     n((t) => t + 1);
   }, []);
 }
-const et = (n) => (n + 1) % 1e6;
-function tt() {
-  const [, n] = Ne(et, 0);
+const it = (n) => (n + 1) % 1e6;
+function st() {
+  const [, n] = ze(it, 0);
   return n;
 }
-function Lt() {
-  return tt();
+function Nt() {
+  return st();
 }
-const rt = We((n, e) => ({
+const nt = je((n, e) => ({
   values: /* @__PURE__ */ new Map(),
   setValue: (t, r) => n((i) => {
     const s = new Map(i.values);
@@ -3340,24 +3374,24 @@ const rt = We((n, e) => ({
   }),
   clearAllValues: () => n((t) => ({ values: /* @__PURE__ */ new Map() })),
   reset: () => n((t) => ({ values: /* @__PURE__ */ new Map() }))
-})), it = ze(rt), Bt = (n = "default") => {
-  const e = it();
-  return { setValue: (R, C) => {
-    e.setValue(`${n}.${R}`, C);
-  }, getValue: (R) => e.getValue(`${n}.${R}`), clearValue: (R) => {
-    e.clearValue(`${n}.${R}`);
-  }, existsValue: (R) => e.existsValue(`${n}.${R}`), clearAllValues: () => {
-    for (const [R, C] 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 $t(n, e, t = window) {
+function Wt(n, e, t = window) {
   const r = ce(e);
-  K(() => {
+  q(() => {
     r.current = e;
-  }, [e]), K(
+  }, [e]), q(
     () => {
       if (t && t.addEventListener && r.current) {
         const s = (o) => r.current(o);
@@ -3371,46 +3405,46 @@ function $t(n, e, t = window) {
   );
 }
 export {
-  Wt as ADVANCED,
-  zt as ARCHBASE_IOC_API_TYPE,
-  St as ARCHBASE_QUERY_DEFAULTS,
+  jt as ADVANCED,
+  kt as ARCHBASE_IOC_API_TYPE,
+  xt as ARCHBASE_QUERY_DEFAULTS,
   be as ArchbaseAxiosRemoteApiClient,
   ye as ArchbaseDataSource,
   U as ArchbaseDataSourceV2,
-  ke as ArchbaseLocalFilterDataSource,
-  Et as ArchbaseQueryUtils,
-  qe as ArchbaseRemoteApiService,
+  Ge as ArchbaseLocalFilterDataSource,
+  At as ArchbaseQueryUtils,
+  Ke as ArchbaseRemoteApiService,
   Ae as ArchbaseRemoteDataSource,
-  Ge as ArchbaseRemoteDataSourceV2,
-  _e as ArchbaseRemoteFilterDataSource,
+  Qe as ArchbaseRemoteDataSourceV2,
+  Je as ArchbaseRemoteFilterDataSource,
   a as DataSourceEventNames,
   le as DefaultPage,
-  Mt as FILTER_TYPE,
-  je as LocalFilter,
-  Rt as MigrationValidation,
-  jt as NORMAL,
-  kt as QUICK,
-  Ue as RemoteFilter,
-  pt as USAGE_EXAMPLE,
-  Ut as useArchbaseBool,
-  Ft as useArchbaseDataSource,
-  At as useArchbaseDataSourceListener,
+  Ut as FILTER_TYPE,
+  _e as LocalFilter,
+  vt as MigrationValidation,
+  _t as NORMAL,
+  Gt as QUICK,
+  qe as RemoteFilter,
+  It as USAGE_EXAMPLE,
+  qt as useArchbaseBool,
+  Ct as useArchbaseDataSource,
+  bt as useArchbaseDataSourceListener,
   xe as useArchbaseDataSourceV2,
-  vt as useArchbaseDataSourceV2Editor,
-  yt as useArchbaseDataSourceV2ReadOnly,
-  Vt as useArchbaseDidMount,
-  Tt as useArchbaseDidUpdate,
-  $t as useArchbaseEventListener,
-  Pt as useArchbaseForceRerender,
-  Lt as useArchbaseForceUpdate,
-  xt as useArchbaseLocalFilterDataSource,
-  Ct as useArchbaseRemoteDataSource,
+  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,
-  wt as useArchbaseRemoteDataSourceV2Editor,
-  It as useArchbaseRemoteDataSourceV2ReadOnly,
-  bt as useArchbaseRemoteFilterDataSource,
-  Dt as useArchbaseRemoteServiceApi,
-  Bt as useArchbaseStore,
-  mt as useArchbaseV1V2Compatibility,
-  Ot as useArchbaseWillUnmount
+  Ft as useArchbaseRemoteDataSourceV2Editor,
+  St as useArchbaseRemoteDataSourceV2ReadOnly,
+  Tt as useArchbaseRemoteFilterDataSource,
+  Ot as useArchbaseRemoteServiceApi,
+  Ht as useArchbaseStore,
+  yt as useArchbaseV1V2Compatibility,
+  Bt as useArchbaseWillUnmount
 };