@oracle/oraclejet 16.0.6 → 16.1.0

package/dist/custom-tsc/utils/TransformerError.js

@@ -71,6 +71,10 @@ var ExceptionKey;
     ExceptionKey["UNRECOGNIZED_OJMETADATA_KEY"] = "unrecognized_ojmetadata_key";
     ExceptionKey["INCORRECT_METADATA_VALUE_TYPE"] = "incorrect_metadata_value_type";
     ExceptionKey["DT_REQUIRED_HAS_DEFAULT_VALUE"] = "dt_required_has_default_value";
+    ExceptionKey["IGNORED_BIGINT_DEFAULT_VALUE"] = "ignored_bigint_default_value";
+    ExceptionKey["IGNORED_FUNCTION_DEFAULT_VALUE"] = "ignored_function_default_value";
+    ExceptionKey["IGNORED_ARRAY_DEFAULT_VALUE"] = "ignored_array_default_value";
+    ExceptionKey["UNRECOGNIZED_SUBPROP_KEY"] = "unrecognized_subprop_key";
 })(ExceptionKey || (exports.ExceptionKey = ExceptionKey = {}));
 class TransformerError extends Error {
     constructor(vcompName, message, errNode) {

package/dist/custom-tsc/utils/TransformerError.js.map

@@ -1 +1 @@
-{"version":3,"file":"TransformerError.js","sourceRoot":"","sources":["../../../../build/src/custom-tsc/compiler/utils/TransformerError.ts"],"names":[],"mappings":";;;AAEA,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,sCAAqB,CAAA;IACrB,sDAAqC,CAAA;IACrC,wCAAuB,CAAA;AACzB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAED,IAAY,YAoEX;AApED,WAAY,YAAY;IAEtB,yDAAyC,CAAA;IACzC,iEAAiD,CAAA;IACjD,6DAA6C,CAAA;IAC7C,6DAA6C,CAAA;IAC7C,yEAAyD,CAAA;IACzD,2EAA2D,CAAA;IAC3D,iFAAiE,CAAA;IACjE,+EAA+D,CAAA;IAC/D,iFAAiE,CAAA;IACjE,uDAAuC,CAAA;IACvC,uDAAuC,CAAA;IACvC,mEAAmD,CAAA;IACnD,+DAA+C,CAAA;IAC/C,2DAA2C,CAAA;IAC3C,2DAA2C,CAAA;IAC3C,iFAAiE,CAAA;IACjE,yEAAyD,CAAA;IACzD,yEAAyD,CAAA;IACzD,mEAAmD,CAAA;IACnD,uEAAuD,CAAA;IACvD,qEAAqD,CAAA;IACrD,6EAA6D,CAAA;IAC7D,yEAAyD,CAAA;IACzD,mFAAmE,CAAA;IACnE,mFAAmE,CAAA;IACnE,iEAAiD,CAAA;IACjD,qFAAqE,CAAA;IACrE,+EAA+D,CAAA;IAC/D,2FAA2E,CAAA;IAC3E,6FAA6E,CAAA;IAC7E,qDAAqC,CAAA;IAGrC,+EAA+D,CAAA;IAC/D,mFAAmE,CAAA;IACnE,6EAA6D,CAAA;IAC7D,uEAAuD,CAAA;IACvD,qEAAqD,CAAA;IACrD,mFAAmE,CAAA;IAGnE,2EAA2D,CAAA;IAC3D,uEAAuD,CAAA;IACvD,2EAA2D,CAAA;IAC3D,mEAAmD,CAAA;IACnD,mEAAmD,CAAA;IACnD,uEAAuD,CAAA;IACvD,6EAA6D,CAAA;IAC7D,uFAAuE,CAAA;IACvE,uEAAuD,CAAA;IACvD,yEAAyD,CAAA;IACzD,mFAAmE,CAAA;IACnE,+EAA+D,CAAA;IAC/D,yEAAyD,CAAA;IACzD,6DAA6C,CAAA;IAC7C,6EAA6D,CAAA;IAC7D,2EAA2D,CAAA;IAC3D,2DAA2C,CAAA;IAC3C,iEAAiD,CAAA;IACjD,qEAAqD,CAAA;IACrD,qEAAqD,CAAA;IACrD,qEAAqD,CAAA;IACrD,mEAAmD,CAAA;IACnD,2EAA2D,CAAA;IAC3D,+EAA+D,CAAA;IAC/D,+EAA+D,CAAA;AACjE,CAAC,EApEW,YAAY,4BAAZ,YAAY,QAoEvB;AAKD,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAoB,SAAiB,EAAE,OAAe,EAAE,OAAiB;QACvE,MAAM,MAAM,GAAG,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjE,KAAK,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC,CAAC;QAC9B,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC5B,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;IAIO,MAAM,CAAC,YAAY,CAAC,SAAiB,EAAE,OAAiB;QAC9D,IAAI,SAAiB,CAAC;QACtB,MAAM,UAAU,GAAG,OAAO,EAAE,aAAa,EAAE,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC,6BAA6B,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzF,SAAS,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,MAAM,SAAS,GAAG,CAAC;QACpF,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,GAAG,SAAS,GAAG,CAAC;QAC9B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,IAA0B;QAC/C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,eAAe,CACpB,GAAiB,EACjB,IAAmB,EACnB,SAAiB,EACjB,OAAe,EACf,OAAiB;QAEjB,IACE,IAAI,KAAK,aAAa,CAAC,WAAW;YAClC,CAAC,IAAI,KAAK,aAAa,CAAC,gBAAgB;gBACtC,CAAC,IAAI,CAAC,aAAa,KAAK,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAC1E,CAAC;YACD,MAAM,IAAI,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACpE,OAAO,CAAC,GAAG,CAAC,GAAG,SAAS,IAAI,OAAO,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;;AA7CH,4CA8CC;AApCgB,8BAAa,GAAyB,IAAI,CAAC"}
+{"version":3,"file":"TransformerError.js","sourceRoot":"","sources":["../../../../build/src/custom-tsc/compiler/utils/TransformerError.ts"],"names":[],"mappings":"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"}

package/dist/js/libs/oj/debug/ojbufferingdataprovider.js

@@ -5,10 +5,11 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap', 'ojs/ojbufferingdataproviderevents', 'ojs/ojcomponentcore'], function (oj, ojdataprovider, ojeventtarget, ojMap, ojbufferingdataproviderevents, ojcomponentcore) { 'use strict';
+define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap', 'ojs/ojbufferingdataproviderevents', 'ojs/ojset', 'ojs/ojcomponentcore'], function (oj, ojdataprovider, ojeventtarget, ojMap, ojbufferingdataproviderevents, ojSet, ojcomponentcore) { 'use strict';
 
     oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
     ojMap = ojMap && Object.prototype.hasOwnProperty.call(ojMap, 'default') ? ojMap['default'] : ojMap;
+    ojSet = ojSet && Object.prototype.hasOwnProperty.call(ojSet, 'default') ? ojSet['default'] : ojSet;
 
     /**
      * @preserve Copyright 2013 jQuery Foundation and other contributors
@@ -28,7 +29,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
      * @classdesc
      * <p>BufferingDataProvider is a wrapping DataProvider that provides edit buffering for an underlying DataProvider, so that
      * the edits can be committed to the data source later on.
-     * The underlying DataProvider is responsible for fetchting data, and BufferingDataProvider will merge any buffered edits with
+     * The underlying DataProvider is responsible for fetching data, and BufferingDataProvider will merge any buffered edits with
      * the underlying data so that they appear as an unified set of data.
      * </p>
      * <p>Because all edits are tracked by keys, the underlying DataProvider must return unique keys in the metadata.  If new rows
@@ -314,7 +315,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
      * Note: Starting in 12.0.1, addItem supports passing in an item which has null key. If the key is null then
      * a string typed v4 UUID key is generated for the key. It is expected that the application will later call
      * setItemStatus with the newKey parameter to pass in the real key once it becomes available after commit. The
-     * newKey will then be stored in an internal map with the generated key and then when the underyling DataProvider
+     * newKey will then be stored in an internal map with the generated key and then when the underlying DataProvider
      * subsequently dispatches an add mutation event which contains the new key then the BufferingDataProvider will
      * include a remove mutation which will remove the row with the generated key. If a non-string typed or
      * non-v4 UUID generated key is desired then please use the constructor option: keyGenerator.
@@ -528,47 +529,56 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         constructor() {
             this.unsubmittedItems = new ojMap();
             this.submittingItems = new ojMap();
-            this.unsubmittedChangedItems = new ojMap();
+            this.submittedAddItems = new ojMap();
+            this.addItemOrder = [];
             this.mapOpTransform = new ojMap();
             this.mapEditItemStatus = new ojMap();
         }
         addItem(item) {
-            const unsubmitted = this.unsubmittedItems.get(item.metadata.key);
-            const submitting = this.submittingItems.get(item.metadata.key);
-            const changed = this.unsubmittedChangedItems.get(item.metadata.key);
+            const key = item.metadata.key;
+            const unsubmitted = this.unsubmittedItems.get(key);
+            const submitting = this.submittingItems.get(key);
             if ((unsubmitted && (unsubmitted.operation === 'add' || unsubmitted.operation === 'update')) ||
                 (submitting && (submitting.operation === 'add' || submitting.operation === 'update'))) {
                 throw new Error('Cannot add item with same key as an item being added or updated');
             }
             else if (unsubmitted && unsubmitted.operation === 'remove') {
-                this.unsubmittedItems.delete(item.metadata.key);
+                this.unsubmittedItems.delete(key);
                 const editItem = { operation: 'update', item };
-                this.unsubmittedItems.set(item.metadata.key, editItem);
-                this.mapOpTransform.set(item.metadata.key, editItem);
+                this.unsubmittedItems.set(key, editItem);
+                this.mapOpTransform.set(key, editItem);
+                this.addItemOrder.unshift(key);
                 return;
             }
-            this.unsubmittedItems.set(item.metadata.key, { operation: 'add', item });
+            this.unsubmittedItems.set(key, { operation: 'add', item });
+            this.addItemOrder.unshift(key);
         }
         removeItem(item) {
-            const unsubmitted = this.unsubmittedItems.get(item.metadata.key);
-            const submitting = this.submittingItems.get(item.metadata.key);
+            const key = item.metadata.key;
+            const unsubmitted = this.unsubmittedItems.get(key);
+            const submitting = this.submittingItems.get(key);
             if ((unsubmitted && unsubmitted.operation === 'remove') ||
                 (submitting && submitting.operation === 'remove')) {
                 throw new Error('Cannot remove item with same key as an item being removed');
             }
             else if (unsubmitted && unsubmitted.operation === 'add') {
-                this.unsubmittedItems.delete(item.metadata.key);
+                this.unsubmittedItems.delete(key);
+                this._removeFromAddItemOrder(key);
                 return;
             }
             else if (unsubmitted && unsubmitted.operation === 'update') {
-                this.unsubmittedItems.set(item.metadata.key, {
+                this.unsubmittedItems.set(key, {
                     operation: 'remove',
                     item
                 });
-                this.mapOpTransform.delete(item.metadata.key);
+                this.mapOpTransform.delete(key);
+                this._removeFromAddItemOrder(key);
+                this.submittedAddItems.delete(key);
                 return;
             }
-            this.unsubmittedItems.set(item.metadata.key, { operation: 'remove', item });
+            this._removeFromAddItemOrder(key);
+            this.submittedAddItems.delete(key);
+            this.unsubmittedItems.set(key, { operation: 'remove', item });
         }
         updateItem(item) {
             const unsubmitted = this.unsubmittedItems.get(item.metadata.key);
@@ -583,10 +593,8 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     operation: unsubmitted.operation,
                     item
                 });
-                this.mapOpTransform.delete(item.metadata.key);
                 return;
             }
-            this.unsubmittedChangedItems.set(item.metadata.key, true);
             this.unsubmittedItems.set(item.metadata.key, { operation: 'update', item });
         }
         setItemMutated(editItem) {
@@ -596,6 +604,9 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                 const status = this.mapEditItemStatus.get(key);
                 if (status === 'submitted') {
                     this.submittingItems.delete(key);
+                    if (this._isAddOrMoveAdd(item)) {
+                        this.submittedAddItems.set(key, item);
+                    }
                 }
                 else {
                     this.mapEditItemStatus.set(key, 'mutated');
@@ -614,12 +625,14 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     const status = this.mapEditItemStatus.get(key);
                     if (status === 'mutated') {
                         this.submittingItems.delete(key);
+                        if (this._isAddOrMoveAdd(editItem)) {
+                            this.submittedAddItems.set(key, editItem);
+                        }
                     }
                     else {
                         this.mapEditItemStatus.set(key, 'submitted');
                     }
                 }
-                this.unsubmittedChangedItems.delete(key);
             }
             else if (newStatus === 'unsubmitted') {
                 this.submittingItems.delete(key);
@@ -648,14 +661,22 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         getSubmittingItems() {
             return this.submittingItems;
         }
-        isEmpty() {
-            return this.unsubmittedItems.size === 0 && this.submittingItems.size === 0;
+        getSubmittedAddItems() {
+            return this.submittedAddItems;
+        }
+        isEmpty(includeSubmitted) {
+            return (this.unsubmittedItems.size === 0 &&
+                this.submittingItems.size === 0 &&
+                (includeSubmitted ? this.submittedAddItems.size === 0 : true));
         }
-        getItem(key) {
+        getItem(key, includeSubmitted) {
             let editItem = this.unsubmittedItems.get(key);
             if (!editItem) {
                 editItem = this.submittingItems.get(key);
             }
+            if (includeSubmitted && !editItem) {
+                editItem = this.submittedAddItems.get(key);
+            }
             return editItem;
         }
         isUpdateTransformed(key) {
@@ -664,12 +685,44 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         getEditItemStatus(key) {
             return this.mapEditItemStatus.get(key);
         }
+        isSubmittingOrSubmitted(key) {
+            return this.submittingItems.has(key) || this.submittedAddItems.has(key);
+        }
         resetAllUnsubmittedItems() {
+            this._clearAddItemOrder();
             this.unsubmittedItems.clear();
             this.submittingItems.clear();
-            this.unsubmittedChangedItems.clear();
             this.mapOpTransform.clear();
         }
+        _clearAddItemOrder() {
+            this.unsubmittedItems.forEach((editItem, key) => {
+                if (this._isAddOrMoveAdd(editItem)) {
+                    this._removeFromAddItemOrder(key);
+                }
+            });
+            this.submittingItems.forEach((editItem, key) => {
+                if (this._isAddOrMoveAdd(editItem)) {
+                    this._removeFromAddItemOrder(key);
+                }
+            });
+        }
+        _removeFromAddItemOrder(key) {
+            let index = this.addItemOrder.findIndex((k) => {
+                return oj.KeyUtils.equals(k, key);
+            });
+            if (index !== -1) {
+                this.addItemOrder.splice(index, 1);
+            }
+        }
+        _isAddOrMoveAdd(editItem) {
+            return editItem.operation === 'add' || this._isMoveAdd(editItem);
+        }
+        _isMoveAdd(editItem) {
+            return editItem.operation === 'update' && this.isUpdateTransformed(editItem.item.metadata.key);
+        }
+        getAddItemOrder() {
+            return this.addItemOrder;
+        }
     }
 
     class BufferingDataProvider {
@@ -707,7 +760,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     this._baseIterator = _baseIterator;
                     this._params = _params;
                     this.firstBaseKey = null;
-                    this.mergedAddKeySet = new MutableKeySet();
+                    this.mergedAddKeySet = new ojSet();
                     this.mergedItemArray = [];
                     this.nextOffset = 0;
                     if (this._params == null) {
@@ -955,65 +1008,94 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             }
             this._mergeAddEdits(filterObj, sortCriteria, newItemArray, mergedAddKeySet, lastBlock);
         }
-        _fetchFromOffset(params, newItemArray) {
+        async _fetchFromOffset(params) {
             const signal = params?.signal;
-            if (signal && signal.aborted) {
+            if (signal) {
                 const reason = signal.reason;
-                return Promise.reject(new DOMException(reason, 'AbortError'));
+                if (signal.aborted) {
+                    throw new DOMException(reason, 'AbortError');
+                }
+                signal.addEventListener('abort', () => {
+                    throw new DOMException(reason, 'AbortError');
+                });
             }
-            return new Promise((resolve, reject) => {
-                if (signal) {
-                    const reason = signal.reason;
-                    signal.addEventListener('abort', (e) => {
-                        return reject(new DOMException(reason, 'AbortError'));
-                    });
+            const offset = params.offset;
+            const isFetchAll = params.size == null || params.size === -1;
+            const size = params.size;
+            const mergedItems = [];
+            const { submitting, submitted, unsubmitted } = this._getEditBufferCounts();
+            const numUnsubmittedAdds = unsubmitted.numAdds;
+            const numAdds = numUnsubmittedAdds + submitting.numAdds + submitted.numAdds;
+            let results;
+            let baseItemArray = [];
+            let done = false;
+            let unbufferedResultsToIgnore = 0;
+            if (isFetchAll) {
+                results = await this.dataProvider.fetchByOffset(params);
+                if (this.editBuffer.isEmpty(true)) {
+                    return results;
                 }
-                return resolve(this.dataProvider.fetchByOffset(params).then((baseResults) => {
-                    const editBuffer = this.editBuffer;
-                    if (!editBuffer.isEmpty()) {
-                        const baseItemArray = baseResults.results;
-                        let sortCriteria = null;
-                        if (baseResults.fetchParameters && baseResults.fetchParameters.sortCriteria) {
-                            sortCriteria = baseResults.fetchParameters.sortCriteria;
-                        }
-                        else {
-                            sortCriteria = params.sortCriteria;
-                        }
-                        this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new MutableKeySet(), baseResults.done);
-                        let actualReturnSize = newItemArray.length;
-                        for (const newItem of newItemArray) {
-                            if (this._isItemRemoved(newItem.metadata.key)) {
-                                --actualReturnSize;
-                            }
-                        }
-                        if ((params.size && actualReturnSize < params.size) ||
-                            (params.size == null && actualReturnSize === 0)) {
-                            if (!baseResults.done) {
-                                const nextParams = {
-                                    attributes: params.attributes,
-                                    clientId: params.clientId,
-                                    filterCriterion: params.filterCriterion,
-                                    offset: params.offset + baseResults.results.length,
-                                    size: params.size,
-                                    sortCriteria: params.sortCriteria
-                                };
-                                return this._fetchFromOffset(nextParams, newItemArray);
-                            }
-                        }
-                        for (let i = 0; i < newItemArray.length; i++) {
-                            if (this._isItemRemoved(newItemArray[i].metadata.key)) {
-                                newItemArray.splice(i, 1);
-                                --i;
-                            }
-                        }
-                        if (params.size && params.size != -1 && newItemArray.length > params.size) {
-                            newItemArray.splice(params.size);
-                        }
-                        return { fetchParameters: params, results: newItemArray, done: baseResults.done };
-                    }
-                    return baseResults;
-                }));
-            });
+            }
+            else if (offset + size > numAdds) {
+                const numRemoves = unsubmitted.numRemoves + submitting.numRemoves;
+                const numMoveAdds = unsubmitted.numMoveAdds + submitting.numMoveAdds;
+                const numSubmittedOrSubmittingAdds = submitting.numAdds + submitted.numAdds;
+                let overrideParams;
+                if (numRemoves > 0 || numMoveAdds > 0 || numSubmittedOrSubmittingAdds > 0) {
+                    overrideParams = {
+                        offset: 0,
+                        size: offset +
+                            size +
+                            numRemoves +
+                            numMoveAdds +
+                            numSubmittedOrSubmittingAdds -
+                            Math.max(numUnsubmittedAdds - offset, 0)
+                    };
+                    unbufferedResultsToIgnore = Math.max(offset - numAdds, 0);
+                }
+                else if (numUnsubmittedAdds > 0) {
+                    overrideParams = {
+                        offset: Math.max(offset - numUnsubmittedAdds, 0),
+                        size: size - Math.max(numUnsubmittedAdds - offset, 0)
+                    };
+                }
+                const underlyingFetchParams = { ...params, ...overrideParams };
+                results = await this.dataProvider.fetchByOffset(underlyingFetchParams);
+            }
+            if (results) {
+                baseItemArray = results.results;
+                done = results.done;
+            }
+            if (offset < numAdds) {
+                mergedItems.push(...this._getAllAdds().slice(offset, offset + size));
+            }
+            for (let index = 0; index < baseItemArray.length && (isFetchAll || mergedItems.length < size); index++) {
+                const item = baseItemArray[index];
+                const key = item.metadata.key;
+                if (this.editBuffer.isUpdateTransformed(key) ||
+                    this._isItemRemoved(key) ||
+                    this.editBuffer.isSubmittingOrSubmitted(key)) {
+                    continue;
+                }
+                else if (unbufferedResultsToIgnore > 0) {
+                    --unbufferedResultsToIgnore;
+                }
+                else {
+                    const updatedItem = this.editBuffer.getItem(key);
+                    mergedItems.push(updatedItem ? updatedItem.item : item);
+                }
+            }
+            if (!done && (isFetchAll || mergedItems.length < size)) {
+                const nextParams = {
+                    ...params,
+                    offset: params.offset + mergedItems.length,
+                    size: isFetchAll ? params.size : params.size - mergedItems.length
+                };
+                let extraResults = await this._fetchFromOffset(nextParams);
+                mergedItems.push(...extraResults.results);
+                done = extraResults.done;
+            }
+            return { fetchParameters: params, results: mergedItems, done: done };
         }
         containsKeys(params) {
             const bufferResult = this._fetchByKeysFromBuffer(params);
@@ -1075,7 +1157,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             });
         }
         fetchByOffset(params) {
-            return this._fetchFromOffset(params, []);
+            return this._fetchFromOffset(params);
         }
         fetchFirst(params) {
             this.lastSortCriteria = params ? params.sortCriteria : null;
@@ -1100,6 +1182,35 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             });
             return sizeChange;
         }
+        _getEditBufferCounts() {
+            const submitting = this._getCounts(this.editBuffer.getSubmittingItems());
+            const unsubmitted = this._getCounts(this.editBuffer.getUnsubmittedItems());
+            const submitted = { numAdds: this.editBuffer.getSubmittedAddItems().size };
+            return { submitting, unsubmitted, submitted };
+        }
+        _getCounts(editItems) {
+            let numAdds = 0;
+            let numRemoves = 0;
+            let numMoveAdds = 0;
+            editItems.forEach((value, key) => {
+                if (value.operation === 'add') {
+                    ++numAdds;
+                }
+                else if (value.operation === 'remove') {
+                    ++numRemoves;
+                }
+                else if (value.operation === 'update' && this.editBuffer.isUpdateTransformed(key)) {
+                    ++numMoveAdds;
+                }
+            });
+            return { numAdds, numRemoves, numMoveAdds };
+        }
+        _getAllAdds() {
+            let addOrder = this.editBuffer.getAddItemOrder();
+            return addOrder.map((key) => {
+                return this.editBuffer.getItem(key, true)?.item;
+            });
+        }
         getTotalSize() {
             return this.dataProvider.getTotalSize().then((totalSize) => {
                 if (totalSize > -1) {
@@ -1662,47 +1773,6 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
     BufferingDataProvider._REFRESH = 'refresh';
     BufferingDataProvider._MUTATE = 'mutate';
     BufferingDataProvider._ADDEVENTLISTENER = 'addEventListener';
-    class MutableKeySet {
-        constructor() {
-            this.set = new Set();
-        }
-        has(key) {
-            return _has(this.set, key);
-        }
-        add(key) {
-            if (!_has(this.set, key)) {
-                this.set.add(key);
-            }
-        }
-        delete(key) {
-            const ret = _find(this.set, key);
-            if (ret.value) {
-                this.set.delete(ret.key);
-            }
-        }
-    }
-    const _has = (keys, keyToFind) => {
-        return _find(keys, keyToFind).value;
-    };
-    const _find = (keys, keyToFind) => {
-        if (keys.size === 0) {
-            return { value: false };
-        }
-        if (typeof keyToFind === 'string' ||
-            typeof keyToFind === 'number' ||
-            typeof keyToFind === 'boolean') {
-            return { value: keys.has(keyToFind), key: keyToFind };
-        }
-        const iterator = keys[Symbol.iterator]();
-        let key = iterator.next();
-        while (!key.done) {
-            if (oj.KeyUtils.equals(key.value, keyToFind)) {
-                return { value: true, key: key.value };
-            }
-            key = iterator.next();
-        }
-        return { value: false };
-    };
     ojeventtarget.EventTargetMixin.applyMixin(BufferingDataProvider);
     oj._registerLegacyNamespaceProp('BufferingDataProvider', BufferingDataProvider);
 

package/dist/js/libs/oj/debug/ojchart-toolkit.js

@@ -32737,7 +32737,9 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-axis', 'ojs/ojlegend-toolkit'
 
       var context = this.getCtx();
 
-      var animationOnDataChange = this.Options ? this.Options['animationOnDataChange'] : 'none';
+      // current options takes precedent over previous options.
+      var animationOnDataChange =
+        options?.['animationOnDataChange'] || this.Options?.['animationOnDataChange'] || 'none';
 
       // Cache and cleanup objects from the previous render
       var oldChart = animationOnDataChange != 'none' ? new DvtChartDataChange(this) : null;
@@ -32760,7 +32762,12 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-axis', 'ojs/ojlegend-toolkit'
       DvtChartRenderer.render(this, container, new dvt.Rectangle(0, 0, this.Width, this.Height));
 
       // . We don't want the inner chart's listeners to be invoked when it is a spark chart, thus we are removing them.
-      if (DvtChartTypeUtils.isSpark(this)) this.EventManager.removeListeners(this);
+      if (DvtChartTypeUtils.isSpark(this)) {
+        this.EventManager.removeListeners(this);
+        // deferred data case won't have xAxis and yAxis initialized.
+        if (this.xAxis) this.xAxis.EventManager.removeListeners(this.xAxis);
+        if (this.yAxis) this.yAxis.EventManager.removeListeners(this.yAxis);
+      }
 
       // Animation Support
       this.StopAnimation();

package/dist/js/libs/oj/debug/ojcore-base.js

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '16.0.6',
+    version: '16.1.0',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-05-03_09-32-18',
+    revision: '2024-05-03_10-41-36',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate