highcharts 11.4.6 → 11.4.8

package/modules/data-tools.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v11.4.6 (2024-07-08)
+ * @license Highcharts JS v11.4.8 (2024-08-29)
  *
  * Highcharts
  *
@@ -330,9 +330,10 @@
          *  - Sophie Bremer
          *  - Gøran Slettemark
          *  - Jomar Hønsi
+         *  - Dawid Dragula
          *
          * */
-        const { addEvent, fireEvent, uniqueKey } = U;
+        const { addEvent, defined, fireEvent, uniqueKey } = U;
         /* *
          *
          *  Class
@@ -413,17 +414,6 @@
              * Options to initialize the new DataTable instance.
              */
             constructor(options = {}) {
-                /**
-                 * Dictionary of all column aliases and their mapped column. If a column
-                 * for one of the get-methods matches an column alias, this column will
-                 * be replaced with the mapped column by the column alias.
-                 *
-                 * @name Highcharts.DataTable#aliases
-                 * @type {Highcharts.Dictionary<string>}
-                 */
-                this.aliases = (options.aliases ?
-                    JSON.parse(JSON.stringify(options.aliases)) :
-                    {});
                 /**
                  * Whether the ID was automatic generated or given in the constructor.
                  *
@@ -442,7 +432,6 @@
                 this.modified = this;
                 this.rowCount = 0;
                 this.versionTag = uniqueKey();
-                this.rowKeysId = options.rowKeysId;
                 const columns = options.columns || {}, columnNames = Object.keys(columns), thisColumns = this.columns;
                 let rowCount = 0;
                 for (let i = 0, iEnd = columnNames.length, column, columnName; i < iEnd; ++i) {
@@ -455,12 +444,6 @@
                     thisColumns[columnNames[i]].length = rowCount;
                 }
                 this.rowCount = rowCount;
-                const aliases = options.aliases || {}, aliasKeys = Object.keys(aliases), thisAliases = this.aliases;
-                for (let i = 0, iEnd = aliasKeys.length, alias; i < iEnd; ++i) {
-                    alias = aliasKeys[i];
-                    thisAliases[alias] = aliases[alias];
-                }
-                this.setRowKeysColumn(rowCount);
             }
             /* *
              *
@@ -490,18 +473,16 @@
                 const table = this, tableOptions = {};
                 table.emit({ type: 'cloneTable', detail: eventDetail });
                 if (!skipColumns) {
-                    tableOptions.aliases = table.aliases;
                     tableOptions.columns = table.columns;
                 }
                 if (!table.autoId) {
                     tableOptions.id = table.id;
                 }
-                if (table.rowKeysId) {
-                    tableOptions.rowKeysId = table.rowKeysId;
-                }
                 const tableClone = new DataTable(tableOptions);
                 if (!skipColumns) {
                     tableClone.versionTag = table.versionTag;
+                    tableClone.originalRowIndexes = table.originalRowIndexes;
+                    tableClone.localRowIndexes = table.localRowIndexes;
                 }
                 table.emit({
                     type: 'afterCloneTable',
@@ -510,36 +491,13 @@
                 });
                 return tableClone;
             }
-            /**
-             * Deletes a column alias and returns the original column name. If the alias
-             * is not found, the method returns `undefined`. Deleting an alias does not
-             * affect the data in the table, only the way columns are accessed.
-             *
-             * @function Highcharts.DataTable#deleteColumnAlias
-             *
-             * @param {string} alias
-             * The alias to delete.
-             *
-             * @return {string|undefined}
-             * Returns the original column name, if found.
-             */
-            deleteColumnAlias(alias) {
-                const table = this, aliases = table.aliases, deletedAlias = aliases[alias], modifier = table.modifier;
-                if (deletedAlias) {
-                    delete table.aliases[alias];
-                    if (modifier) {
-                        modifier.modifyColumns(table, { [deletedAlias]: new Array(table.rowCount) }, 0);
-                    }
-                }
-                return deletedAlias;
-            }
             /**
              * Deletes columns from the table.
              *
              * @function Highcharts.DataTable#deleteColumns
              *
              * @param {Array<string>} [columnNames]
-             * Names (no alias) of columns to delete. If no array is provided, all
+             * Names of columns to delete. If no array is provided, all
              * columns will be deleted.
              *
              * @param {Highcharts.DataTableEventDetail} [eventDetail]
@@ -569,14 +527,9 @@
                         }
                         delete columns[columnName];
                     }
-                    let nColumns = Object.keys(columns).length;
-                    if (table.rowKeysId && nColumns === 1) {
-                        // All columns deleted, remove row keys column
-                        delete columns[table.rowKeysId];
-                        nColumns = 0;
-                    }
-                    if (!nColumns) {
+                    if (!Object.keys(columns).length) {
                         table.rowCount = 0;
+                        this.deleteRowIndexReferences();
                     }
                     if (modifier) {
                         modifier.modifyColumns(table, modifiedColumns, 0, eventDetail);
@@ -590,6 +543,18 @@
                     return deletedColumns;
                 }
             }
+            /**
+             * Deletes the row index references. This is useful when the original table
+             * is deleted, and the references are no longer needed. This table is
+             * then considered an original table or a table that has the same row's
+             * order as the original table.
+             */
+            deleteRowIndexReferences() {
+                delete this.originalRowIndexes;
+                delete this.localRowIndexes;
+                // Here, in case of future need, can be implemented updating of the
+                // modified tables' row indexes references.
+            }
             /**
              * Deletes rows in this table.
              *
@@ -677,8 +642,8 @@
              *
              * @function Highcharts.DataTable#getCell
              *
-             * @param {string} columnNameOrAlias
-             * Column name or alias of the cell to retrieve.
+             * @param {string} columnName
+             * Column name of the cell to retrieve.
              *
              * @param {number} rowIndex
              * Row index of the cell to retrieve.
@@ -686,11 +651,9 @@
              * @return {Highcharts.DataTableCellType|undefined}
              * Returns the cell value or `undefined`.
              */
-            getCell(columnNameOrAlias, rowIndex) {
+            getCell(columnName, rowIndex) {
                 const table = this;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = table.columns[columnNameOrAlias];
+                const column = table.columns[columnName];
                 if (column) {
                     return column[rowIndex];
                 }
@@ -700,8 +663,8 @@
              *
              * @function Highcharts.DataTable#getCellAsBoolean
              *
-             * @param {string} columnNameOrAlias
-             * Column name or alias to fetch.
+             * @param {string} columnName
+             * Column name to fetch.
              *
              * @param {number} rowIndex
              * Row index to fetch.
@@ -709,11 +672,9 @@
              * @return {boolean}
              * Returns the cell value of the row as a boolean.
              */
-            getCellAsBoolean(columnNameOrAlias, rowIndex) {
+            getCellAsBoolean(columnName, rowIndex) {
                 const table = this;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = table.columns[columnNameOrAlias];
+                const column = table.columns[columnName];
                 return !!(column && column[rowIndex]);
             }
             /**
@@ -721,8 +682,8 @@
              *
              * @function Highcharts.DataTable#getCellAsNumber
              *
-             * @param {string} columnNameOrAlias
-             * Column name or alias to fetch.
+             * @param {string} columnName
+             * Column name or to fetch.
              *
              * @param {number} rowIndex
              * Row index to fetch.
@@ -733,11 +694,9 @@
              * @return {number|null}
              * Returns the cell value of the row as a number.
              */
-            getCellAsNumber(columnNameOrAlias, rowIndex, useNaN) {
+            getCellAsNumber(columnName, rowIndex, useNaN) {
                 const table = this;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = table.columns[columnNameOrAlias];
+                const column = table.columns[columnName];
                 let cellValue = (column && column[rowIndex]);
                 switch (typeof cellValue) {
                     case 'boolean':
@@ -753,8 +712,8 @@
              *
              * @function Highcharts.DataTable#getCellAsString
              *
-             * @param {string} columnNameOrAlias
-             * Column name or alias to fetch.
+             * @param {string} columnName
+             * Column name to fetch.
              *
              * @param {number} rowIndex
              * Row index to fetch.
@@ -762,22 +721,20 @@
              * @return {string}
              * Returns the cell value of the row as a string.
              */
-            getCellAsString(columnNameOrAlias, rowIndex) {
+            getCellAsString(columnName, rowIndex) {
                 const table = this;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = table.columns[columnNameOrAlias];
+                const column = table.columns[columnName];
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                 return `${(column && column[rowIndex])}`;
             }
             /**
-             * Fetches the given column by the canonical column name or by an alias.
+             * Fetches the given column by the canonical column name.
              * This function is a simplified wrap of {@link getColumns}.
              *
              * @function Highcharts.DataTable#getColumn
              *
-             * @param {string} columnNameOrAlias
-             * Name or alias of the column to get, alias takes precedence.
+             * @param {string} columnName
+             * Name of the column to get.
              *
              * @param {boolean} [asReference]
              * Whether to return the column as a readonly reference.
@@ -785,11 +742,11 @@
              * @return {Highcharts.DataTableColumn|undefined}
              * A copy of the column, or `undefined` if not found.
              */
-            getColumn(columnNameOrAlias, asReference) {
-                return this.getColumns([columnNameOrAlias], asReference)[columnNameOrAlias];
+            getColumn(columnName, asReference) {
+                return this.getColumns([columnName], asReference)[columnName];
             }
             /**
-             * Fetches the given column by the canonical column name or by an alias, and
+             * Fetches the given column by the canonical column name, and
              * validates the type of the first few cells. If the first defined cell is
              * of type number, it assumes for performance reasons, that all cells are of
              * type number or `null`. Otherwise it will convert all cells to number
@@ -797,8 +754,8 @@
              *
              * @function Highcharts.DataTable#getColumnAsNumbers
              *
-             * @param {string} columnNameOrAlias
-             * Name or alias of the column to get, alias takes precedence.
+             * @param {string} columnName
+             * Name of the column to get.
              *
              * @param {boolean} [useNaN]
              * Whether to use NaN instead of `null` and `undefined`.
@@ -806,16 +763,14 @@
              * @return {Array<(number|null)>}
              * A copy of the column, or an empty array if not found.
              */
-            getColumnAsNumbers(columnNameOrAlias, useNaN) {
+            getColumnAsNumbers(columnName, useNaN) {
                 const table = this, columns = table.columns;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = columns[columnNameOrAlias], columnAsNumber = [];
+                const column = columns[columnName], columnAsNumber = [];
                 if (column) {
                     const columnLength = column.length;
                     if (useNaN) {
                         for (let i = 0; i < columnLength; ++i) {
-                            columnAsNumber.push(table.getCellAsNumber(columnNameOrAlias, i, true));
+                            columnAsNumber.push(table.getCellAsNumber(columnName, i, true));
                         }
                     }
                     else {
@@ -831,7 +786,7 @@
                             }
                         }
                         for (let i = 0; i < columnLength; ++i) {
-                            columnAsNumber.push(table.getCellAsNumber(columnNameOrAlias, i));
+                            columnAsNumber.push(table.getCellAsNumber(columnName, i));
                         }
                     }
                 }
@@ -847,7 +802,6 @@
              */
             getColumnNames() {
                 const table = this, columnNames = Object.keys(table.columns);
-                this.removeRowKeysColumn(columnNames);
                 return columnNames;
             }
             /**
@@ -855,8 +809,8 @@
              *
              * @function Highcharts.DataTable#getColumns
              *
-             * @param {Array<string>} [columnNamesOrAliases]
-             * Column names or aliases to retrieve. Aliases taking precedence.
+             * @param {Array<string>} [columnNames]
+             * Column names to retrieve.
              *
              * @param {boolean} [asReference]
              * Whether to return columns as a readonly reference.
@@ -865,19 +819,35 @@
              * Collection of columns. If a requested column was not found, it is
              * `undefined`.
              */
-            getColumns(columnNamesOrAliases, asReference) {
-                const table = this, tableAliasMap = table.aliases, tableColumns = table.columns, columns = {};
-                columnNamesOrAliases = (columnNamesOrAliases || Object.keys(tableColumns));
-                this.removeRowKeysColumn(columnNamesOrAliases);
-                for (let i = 0, iEnd = columnNamesOrAliases.length, column, columnName; i < iEnd; ++i) {
-                    columnName = columnNamesOrAliases[i];
-                    column = tableColumns[(tableAliasMap[columnName] || columnName)];
+            getColumns(columnNames, asReference) {
+                const table = this, tableColumns = table.columns, columns = {};
+                columnNames = (columnNames || Object.keys(tableColumns));
+                for (let i = 0, iEnd = columnNames.length, column, columnName; i < iEnd; ++i) {
+                    columnName = columnNames[i];
+                    column = tableColumns[columnName];
                     if (column) {
                         columns[columnName] = (asReference ? column : column.slice());
                     }
                 }
                 return columns;
             }
+            /**
+             * Takes the original row index and returns the local row index in the
+             * modified table for which this function is called.
+             *
+             * @param {number} originalRowIndex
+             * Original row index to get the local row index for.
+             *
+             * @return {number|undefined}
+             * Returns the local row index or `undefined` if not found.
+             */
+            getLocalRowIndex(originalRowIndex) {
+                const { localRowIndexes } = this;
+                if (localRowIndexes) {
+                    return localRowIndexes[originalRowIndex];
+                }
+                return originalRowIndex;
+            }
             /**
              * Retrieves the modifier for the table.
              * @private
@@ -888,6 +858,23 @@
             getModifier() {
                 return this.modifier;
             }
+            /**
+             * Takes the local row index and returns the index of the corresponding row
+             * in the original table.
+             *
+             * @param {number} rowIndex
+             * Local row index to get the original row index for.
+             *
+             * @return {number|undefined}
+             * Returns the original row index or `undefined` if not found.
+             */
+            getOriginalRowIndex(rowIndex) {
+                const { originalRowIndexes } = this;
+                if (originalRowIndexes) {
+                    return originalRowIndexes[rowIndex];
+                }
+                return rowIndex;
+            }
             /**
              * Retrieves the row at a given index. This function is a simplified wrap of
              * {@link getRows}.
@@ -897,14 +884,14 @@
              * @param {number} rowIndex
              * Row index to retrieve. First row has index 0.
              *
-             * @param {Array<string>} [columnNamesOrAliases]
-             * Column names or aliases in order to retrieve.
+             * @param {Array<string>} [columnNames]
+             * Column names in order to retrieve.
              *
              * @return {Highcharts.DataTableRow}
              * Returns the row values, or `undefined` if not found.
              */
-            getRow(rowIndex, columnNamesOrAliases) {
-                return this.getRows(rowIndex, 1, columnNamesOrAliases)[0];
+            getRow(rowIndex, columnNames) {
+                return this.getRows(rowIndex, 1, columnNames)[0];
             }
             /**
              * Returns the number of rows in this table.
@@ -923,7 +910,7 @@
              *
              * @function Highcharts.DataTable#getRowIndexBy
              *
-             * @param {string} columnNameOrAlias
+             * @param {string} columnName
              * Column to search in.
              *
              * @param {Highcharts.DataTableCellType} cellValue
@@ -935,11 +922,9 @@
              * @return {number|undefined}
              * Index of the first row matching the cell value.
              */
-            getRowIndexBy(columnNameOrAlias, cellValue, rowIndexOffset) {
+            getRowIndexBy(columnName, cellValue, rowIndexOffset) {
                 const table = this;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = table.columns[columnNameOrAlias];
+                const column = table.columns[columnName];
                 if (column) {
                     const rowIndex = column.indexOf(cellValue, rowIndexOffset);
                     if (rowIndex !== -1) {
@@ -956,14 +941,14 @@
              * @param {number} rowIndex
              * Row index.
              *
-             * @param {Array<string>} [columnNamesOrAliases]
-             * Column names or aliases and their order to retrieve.
+             * @param {Array<string>} [columnNames]
+             * Column names and their order to retrieve.
              *
              * @return {Highcharts.DataTableRowObject}
              * Returns the row values, or `undefined` if not found.
              */
-            getRowObject(rowIndex, columnNamesOrAliases) {
-                return this.getRowObjects(rowIndex, 1, columnNamesOrAliases)[0];
+            getRowObject(rowIndex, columnNames) {
+                return this.getRowObjects(rowIndex, 1, columnNames)[0];
             }
             /**
              * Fetches all or a number of rows.
@@ -976,20 +961,19 @@
              * @param {number} [rowCount]
              * Number of rows to fetch. Defaults to maximal number of rows.
              *
-             * @param {Array<string>} [columnNamesOrAliases]
-             * Column names or aliases and their order to retrieve.
+             * @param {Array<string>} [columnNames]
+             * Column names and their order to retrieve.
              *
              * @return {Highcharts.DataTableRowObject}
              * Returns retrieved rows.
              */
-            getRowObjects(rowIndex = 0, rowCount = (this.rowCount - rowIndex), columnNamesOrAliases) {
-                const table = this, aliases = table.aliases, columns = table.columns, rows = new Array(rowCount);
-                columnNamesOrAliases = (columnNamesOrAliases || Object.keys(columns));
-                this.removeRowKeysColumn(columnNamesOrAliases);
+            getRowObjects(rowIndex = 0, rowCount = (this.rowCount - rowIndex), columnNames) {
+                const table = this, columns = table.columns, rows = new Array(rowCount);
+                columnNames = (columnNames || Object.keys(columns));
                 for (let i = rowIndex, i2 = 0, iEnd = Math.min(table.rowCount, (rowIndex + rowCount)), column, row; i < iEnd; ++i, ++i2) {
                     row = rows[i2] = {};
-                    for (const columnName of columnNamesOrAliases) {
-                        column = columns[(aliases[columnName] || columnName)];
+                    for (const columnName of columnNames) {
+                        column = columns[columnName];
                         row[columnName] = (column ? column[i] : void 0);
                     }
                 }
@@ -1006,19 +990,19 @@
              * @param {number} [rowCount]
              * Number of rows to fetch. Defaults to maximal number of rows.
              *
-             * @param {Array<string>} [columnNamesOrAliases]
-             * Column names or aliases and their order to retrieve.
+             * @param {Array<string>} [columnNames]
+             * Column names and their order to retrieve.
              *
              * @return {Highcharts.DataTableRow}
              * Returns retrieved rows.
              */
-            getRows(rowIndex = 0, rowCount = (this.rowCount - rowIndex), columnNamesOrAliases) {
-                const table = this, aliases = table.aliases, columns = table.columns, rows = new Array(rowCount);
-                columnNamesOrAliases = (columnNamesOrAliases || Object.keys(columns));
+            getRows(rowIndex = 0, rowCount = (this.rowCount - rowIndex), columnNames) {
+                const table = this, columns = table.columns, rows = new Array(rowCount);
+                columnNames = (columnNames || Object.keys(columns));
                 for (let i = rowIndex, i2 = 0, iEnd = Math.min(table.rowCount, (rowIndex + rowCount)), column, row; i < iEnd; ++i, ++i2) {
                     row = rows[i2] = [];
-                    for (const columnName of columnNamesOrAliases) {
-                        column = columns[(aliases[columnName] || columnName)];
+                    for (const columnName of columnNames) {
+                        column = columns[columnName];
                         row.push(column ? column[i] : void 0);
                     }
                 }
@@ -1036,21 +1020,21 @@
                 return this.versionTag;
             }
             /**
-             * Checks for given column names or aliases.
+             * Checks for given column names.
              *
              * @function Highcharts.DataTable#hasColumns
              *
-             * @param {Array<string>} columnNamesOrAliases
-             * Column names of aliases to check.
+             * @param {Array<string>} columnNames
+             * Column names to check.
              *
              * @return {boolean}
              * Returns `true` if all columns have been found, otherwise `false`.
              */
-            hasColumns(columnNamesOrAliases) {
-                const table = this, aliases = table.aliases, columns = table.columns;
-                for (let i = 0, iEnd = columnNamesOrAliases.length, columnName; i < iEnd; ++i) {
-                    columnName = columnNamesOrAliases[i];
-                    if (!columns[columnName] && !aliases[columnName]) {
+            hasColumns(columnNames) {
+                const table = this, columns = table.columns;
+                for (let i = 0, iEnd = columnNames.length, columnName; i < iEnd; ++i) {
+                    columnName = columnNames[i];
+                    if (!columns[columnName]) {
                         return false;
                     }
                 }
@@ -1061,7 +1045,7 @@
              *
              * @function Highcharts.DataTable#hasRowWith
              *
-             * @param {string} columnNameOrAlias
+             * @param {string} columnName
              * Column to search in.
              *
              * @param {Highcharts.DataTableCellType} cellValue
@@ -1070,11 +1054,9 @@
              * @return {boolean}
              * True, if a row has been found, otherwise false.
              */
-            hasRowWith(columnNameOrAlias, cellValue) {
+            hasRowWith(columnName, cellValue) {
                 const table = this;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                const column = table.columns[columnNameOrAlias];
+                const column = table.columns[columnName];
                 if (column) {
                     return (column.indexOf(cellValue) !== -1);
                 }
@@ -1116,29 +1098,21 @@
                 const table = this, columns = table.columns;
                 if (columns[columnName]) {
                     if (columnName !== newColumnName) {
-                        const aliases = table.aliases;
-                        if (aliases[newColumnName]) {
-                            delete aliases[newColumnName];
-                        }
                         columns[newColumnName] = columns[columnName];
                         delete columns[columnName];
-                        if (table.rowKeysId) {
-                            // Ensure that row keys column is last
-                            this.moveRowKeysColumnToLast(columns, table.rowKeysId);
-                        }
                     }
                     return true;
                 }
                 return false;
             }
             /**
-             * Sets a cell value based on the row index and column name or alias.  Will
+             * Sets a cell value based on the row index and column.  Will
              * insert a new column, if not found.
              *
              * @function Highcharts.DataTable#setCell
              *
-             * @param {string} columnNameOrAlias
-             * Column name or alias to set.
+             * @param {string} columnName
+             * Column name to set.
              *
              * @param {number|undefined} rowIndex
              * Row index to set.
@@ -1152,35 +1126,33 @@
              * @emits #setCell
              * @emits #afterSetCell
              */
-            setCell(columnNameOrAlias, rowIndex, cellValue, eventDetail) {
+            setCell(columnName, rowIndex, cellValue, eventDetail) {
                 const table = this, columns = table.columns, modifier = table.modifier;
-                columnNameOrAlias = (table.aliases[columnNameOrAlias] ||
-                    columnNameOrAlias);
-                let column = columns[columnNameOrAlias];
+                let column = columns[columnName];
                 if (column && column[rowIndex] === cellValue) {
                     return;
                 }
                 table.emit({
                     type: 'setCell',
                     cellValue,
-                    columnName: columnNameOrAlias,
+                    columnName: columnName,
                     detail: eventDetail,
                     rowIndex
                 });
                 if (!column) {
-                    column = columns[columnNameOrAlias] = new Array(table.rowCount);
+                    column = columns[columnName] = new Array(table.rowCount);
                 }
                 if (rowIndex >= table.rowCount) {
                     table.rowCount = (rowIndex + 1);
                 }
                 column[rowIndex] = cellValue;
                 if (modifier) {
-                    modifier.modifyCell(table, columnNameOrAlias, rowIndex, cellValue);
+                    modifier.modifyCell(table, columnName, rowIndex, cellValue);
                 }
                 table.emit({
                     type: 'afterSetCell',
                     cellValue,
-                    columnName: columnNameOrAlias,
+                    columnName: columnName,
                     detail: eventDetail,
                     rowIndex
                 });
@@ -1190,8 +1162,8 @@
              *
              * @function Highcharts.DataTable#setColumn
              *
-             * @param {string} columnNameOrAlias
-             * Column name or alias to set.
+             * @param {string} columnName
+             * Column name to set.
              *
              * @param {Highcharts.DataTableColumn} [column]
              * Values to set in the column.
@@ -1205,8 +1177,8 @@
              * @emits #setColumns
              * @emits #afterSetColumns
              */
-            setColumn(columnNameOrAlias, column = [], rowIndex = 0, eventDetail) {
-                this.setColumns({ [columnNameOrAlias]: column }, rowIndex, eventDetail);
+            setColumn(columnName, column = [], rowIndex = 0, eventDetail) {
+                this.setColumns({ [columnName]: column }, rowIndex, eventDetail);
             }
             /**
              * Sets cell values for multiple columns. Will insert new columns, if not
@@ -1215,7 +1187,7 @@
              * @function Highcharts.DataTable#setColumns
              *
              * @param {Highcharts.DataTableColumnCollection} columns
-             * Columns as a collection, where the keys are the column names or aliases.
+             * Columns as a collection, where the keys are the column names.
              *
              * @param {number} [rowIndex]
              * Index of the first row to change. Keep undefined to reset.
@@ -1238,8 +1210,6 @@
                 for (let i = 0, iEnd = columnNames.length, column, columnName; i < iEnd; ++i) {
                     columnName = columnNames[i];
                     column = columns[columnName];
-                    columnName = (table.aliases[columnName] ||
-                        columnName);
                     if (reset) {
                         tableColumns[columnName] = column.slice();
                         table.rowCount = column.length;
@@ -1261,10 +1231,6 @@
                 if (tableModifier) {
                     tableModifier.modifyColumns(table, columns, (rowIndex || 0));
                 }
-                if (table.rowKeysId) {
-                    // Ensure that the row keys column is always last
-                    this.moveRowKeysColumnToLast(tableColumns, table.rowKeysId);
-                }
                 table.emit({
                     type: 'afterSetColumns',
                     columns,
@@ -1273,63 +1239,6 @@
                     rowIndex
                 });
             }
-            /**
-             * Sets the row key column. This column is invisible and the cells
-             * serve as identifiers to the rows they are contained in. Accessing
-             * rows by keys instead of indexes is necessary in cases where rows
-             * are rearranged by a DataModifier (e.g. SortModifier or RangeModifier).
-             *
-             * @function Highcharts.DataTable#setRowKeysColumn
-             *
-             * @param {number} nRows
-             * Number of rows to add to the column.
-             *
-             */
-            setRowKeysColumn(nRows) {
-                const id = this.rowKeysId;
-                if (!id) {
-                    return;
-                }
-                this.columns[id] = [];
-                const keysArray = this.columns[id];
-                for (let i = 0; i < nRows; i++) {
-                    keysArray.push(id + '_' + i);
-                }
-            }
-            /**
-             * Get the row key column.
-             *
-             * @function Highcharts.DataTable#getRowKeysColumn
-             *     *
-             * @return {DataTable.Column|undefined}
-             * Returns row keys if rowKeysId is defined, else undefined.
-             */
-            getRowKeysColumn() {
-                const id = this.rowKeysId;
-                if (id) {
-                    return this.columns[id];
-                }
-            }
-            /**
-             * Get the row index in the original (unmodified) data table.
-             *
-             * @function Highcharts.DataTable#getRowIndexOriginal
-             *
-             * @param {number} idx
-             * Row index in the modified data table.
-             *
-             * @return {string}
-             * Row index in the original data table.
-             */
-            getRowIndexOriginal(idx) {
-                const id = this.rowKeysId;
-                if (id) {
-                    const rowKeyCol = this.columns[id];
-                    const idxOrig = '' + rowKeyCol[idx];
-                    return idxOrig.split('_')[1];
-                }
-                return String(idx);
-            }
             /**
              * Sets or unsets the modifier for the table.
              *
@@ -1381,6 +1290,29 @@
                     throw error;
                 });
             }
+            /**
+             * Sets the original row indexes for the table. It is used to keep the
+             * reference to the original rows when modifying the table.
+             *
+             * @param {Array<number|undefined>} originalRowIndexes
+             * Original row indexes array.
+             *
+             * @param {boolean} omitLocalRowIndexes
+             * Whether to omit the local row indexes calculation. Defaults to `false`.
+             */
+            setOriginalRowIndexes(originalRowIndexes, omitLocalRowIndexes = false) {
+                this.originalRowIndexes = originalRowIndexes;
+                if (omitLocalRowIndexes) {
+                    return;
+                }
+                const modifiedIndexes = this.localRowIndexes = [];
+                for (let i = 0, iEnd = originalRowIndexes.length, originalIndex; i < iEnd; ++i) {
+                    originalIndex = originalRowIndexes[i];
+                    if (defined(originalIndex)) {
+                        modifiedIndexes[originalIndex] = i;
+                    }
+                }
+            }
             /**
              * Sets cell values of a row. Will insert a new row, if no index was
              * provided, or if the index is higher than the total number of table rows.
@@ -1425,7 +1357,7 @@
              * @emits #afterSetRows
              */
             setRows(rows, rowIndex = this.rowCount, eventDetail) {
-                const table = this, aliases = table.aliases, columns = table.columns, columnNames = Object.keys(columns), modifier = table.modifier, rowCount = rows.length;
+                const table = this, columns = table.columns, columnNames = Object.keys(columns), modifier = table.modifier, rowCount = rows.length;
                 table.emit({
                     type: 'setRows',
                     detail: eventDetail,
@@ -1449,7 +1381,6 @@
                         const rowColumnNames = Object.keys(row);
                         for (let j = 0, jEnd = rowColumnNames.length, rowColumnName; j < jEnd; ++j) {
                             rowColumnName = rowColumnNames[j];
-                            rowColumnName = (aliases[rowColumnName] || rowColumnName);
                             if (!columns[rowColumnName]) {
                                 columns[rowColumnName] = new Array(i2 + 1);
                             }
@@ -1464,9 +1395,6 @@
                         columns[columnNames[i]].length = indexRowCount;
                     }
                 }
-                if (this.rowKeysId && !columnNames.includes(this.rowKeysId)) {
-                    this.setRowKeysColumn(rowCount);
-                }
                 if (modifier) {
                     modifier.modifyRows(table, rows, rowIndex);
                 }
@@ -1478,23 +1406,6 @@
                     rows
                 });
             }
-            // The row keys column must always be the last column
-            moveRowKeysColumnToLast(columns, id) {
-                const rowKeyColumn = columns[id];
-                delete columns[id];
-                columns[id] = rowKeyColumn;
-            }
-            // The row keys column must be removed in some methods
-            // (API backwards compatibility)
-            removeRowKeysColumn(columnNamesOrAliases) {
-                if (this.rowKeysId) {
-                    const pos = columnNamesOrAliases.indexOf(this.rowKeysId);
-                    if (pos !== -1) {
-                        // Always the last column
-                        columnNamesOrAliases.pop();
-                    }
-                }
-            }
         }
         /* *
          *
@@ -2246,8 +2157,6 @@
             /**
              * Parse a date and return it as a number.
              *
-             * @function Highcharts.Data#parseDate
-             *
              * @param {string} value
              * Value to parse.
              *
@@ -6325,7 +6234,6 @@
                         table.deleteColumns();
                         converter.parse({ data });
                         table.setColumns(converter.getTable().getColumns());
-                        table.setRowKeysColumn(data.length);
                     }
                     return connector.setModifierOptions(dataModifier).then(() => data);
                 })
@@ -6518,6 +6426,7 @@
          *  - Gøran Slettemark
          *  - Wojciech Chmiel
          *  - Sophie Bremer
+         *  - Jomar Hønsi
          *
          * */
         const { merge, pick } = U;
@@ -6586,6 +6495,9 @@
                     table,
                     url
                 });
+                if (!URL.canParse(url)) {
+                    throw new Error('Invalid URL: ' + url);
+                }
                 return fetch(url)
                     .then((response) => (response.json()))
                     .then((json) => {
@@ -6632,7 +6544,6 @@
         GoogleSheetsConnector.defaultOptions = {
             googleAPIKey: '',
             googleSpreadsheetKey: '',
-            worksheet: 1,
             enablePolling: false,
             dataRefreshRate: 2,
             firstRowAsNames: true
@@ -6664,18 +6575,20 @@
              * @private
              */
             function buildFetchURL(apiKey, sheetKey, options = {}) {
-                return (`https://sheets.googleapis.com/v4/spreadsheets/${sheetKey}/values/` +
-                    (options.onlyColumnNames ?
-                        'A1:Z1' :
-                        buildQueryRange(options)) +
-                    '?alt=json' +
-                    (options.onlyColumnNames ?
-                        '' :
-                        '&dateTimeRenderOption=FORMATTED_STRING' +
-                            '&majorDimension=COLUMNS' +
-                            '&valueRenderOption=UNFORMATTED_VALUE') +
-                    '&prettyPrint=false' +
-                    `&key=${apiKey}`);
+                const url = new URL(`https://sheets.googleapis.com/v4/spreadsheets/${sheetKey}/values/`);
+                const range = options.onlyColumnNames ?
+                    'A1:Z1' : buildQueryRange(options);
+                url.pathname += range;
+                const searchParams = url.searchParams;
+                searchParams.set('alt', 'json');
+                if (!options.onlyColumnNames) {
+                    searchParams.set('dateTimeRenderOption', 'FORMATTED_STRING');
+                    searchParams.set('majorDimension', 'COLUMNS');
+                    searchParams.set('valueRenderOption', 'UNFORMATTED_VALUE');
+                }
+                searchParams.set('prettyPrint', 'false');
+                searchParams.set('key', apiKey);
+                return url.href;
             }
             GoogleSheetsConnector.buildFetchURL = buildFetchURL;
             /**
@@ -7191,6 +7104,7 @@
          *
          *  Authors:
          *  - Sophie Bremer
+         *  - Dawid Dragula
          *
          * */
         const { merge } = U;
@@ -7292,32 +7206,30 @@
              * @return {Promise<Highcharts.DataTable>}
              * Table with `modified` property as a reference.
              */
-            modify(table, eventDetail) {
+            async modify(table, eventDetail) {
                 const modifiers = (this.options.reverse ?
                     this.chain.slice().reverse() :
                     this.chain.slice());
                 if (table.modified === table) {
                     table.modified = table.clone(false, eventDetail);
                 }
-                let promiseChain = Promise.resolve(table);
+                let modified = table;
                 for (let i = 0, iEnd = modifiers.length; i < iEnd; ++i) {
-                    const modifier = modifiers[i];
-                    promiseChain = promiseChain.then((chainTable) => modifier.modify(chainTable.modified, eventDetail));
+                    try {
+                        await modifiers[i].modify(modified, eventDetail);
+                    }
+                    catch (error) {
+                        this.emit({
+                            type: 'error',
+                            detail: eventDetail,
+                            table
+                        });
+                        throw error;
+                    }
+                    modified = modified.modified;
                 }
-                promiseChain = promiseChain.then((chainTable) => {
-                    table.modified.deleteColumns();
-                    table.modified.setColumns(chainTable.modified.getColumns());
-                    return table;
-                });
-                promiseChain = promiseChain['catch']((error) => {
-                    this.emit({
-                        type: 'error',
-                        detail: eventDetail,
-                        table
-                    });
-                    throw error;
-                });
-                return promiseChain;
+                table.modified = modified;
+                return table;
             }
             /**
              * Applies partial modifications of a cell change to the property `modified`
@@ -7815,8 +7727,8 @@
              * @param {Highcharts.DataTable} table
              * Table to extract column from and use as reference.
              *
-             * @param {string} columnNameOrAlias
-             * Name or alias of column to process.
+             * @param {string} columnName
+             * Name of column to process.
              *
              * @param {number} rowIndex
              * Row index to start the replacing process from.
@@ -7824,8 +7736,8 @@
              * @return {Highcharts.DataTableColumn}
              * Returns the processed table column.
              */
-            processColumn(table, columnNameOrAlias, rowIndex = 0) {
-                const alternativeSeparators = this.options.alternativeSeparators, column = (table.getColumn(columnNameOrAlias, true) || [])
+            processColumn(table, columnName, rowIndex = 0) {
+                const alternativeSeparators = this.options.alternativeSeparators, column = (table.getColumn(columnName, true) || [])
                     .slice(rowIndex > 0 ? rowIndex : 0);
                 for (let i = 0, iEnd = column.length, cacheFormula = [], cacheString = '', cell; i < iEnd; ++i) {
                     cell = column[i];
@@ -7919,6 +7831,7 @@
          *
          *  Authors:
          *  - Sophie Bremer
+         *  - Dawid Dragula
          *
          * */
         const { merge } = U;
@@ -7967,6 +7880,7 @@
             modifyTable(table, eventDetail) {
                 const modifier = this;
                 modifier.emit({ type: 'modify', detail: eventDetail, table });
+                let indexes = [];
                 const { additive, ranges, strict } = modifier.options;
                 if (ranges.length) {
                     const modified = table.modified;
@@ -7980,11 +7894,13 @@
                         if (i > 0 && !additive) {
                             modified.deleteRows();
                             modified.setRows(rows);
+                            modified.setOriginalRowIndexes(indexes, true);
                             columns = modified.getColumns();
                             rows = [];
+                            indexes = [];
                         }
                         rangeColumn = (columns[range.column] || []);
-                        for (let j = 0, jEnd = rangeColumn.length, cell, row; j < jEnd; ++j) {
+                        for (let j = 0, jEnd = rangeColumn.length, cell, row, originalRowIndex; j < jEnd; ++j) {
                             cell = rangeColumn[j];
                             switch (typeof cell) {
                                 default:
@@ -8000,17 +7916,24 @@
                             }
                             if (cell >= range.minValue &&
                                 cell <= range.maxValue) {
-                                row = (additive ?
-                                    table.getRow(j) :
-                                    modified.getRow(j));
+                                if (additive) {
+                                    row = table.getRow(j);
+                                    originalRowIndex = table.getOriginalRowIndex(j);
+                                }
+                                else {
+                                    row = modified.getRow(j);
+                                    originalRowIndex = modified.getOriginalRowIndex(j);
+                                }
                                 if (row) {
                                     rows.push(row);
+                                    indexes.push(originalRowIndex);
                                 }
                             }
                         }
                     }
                     modified.deleteRows();
                     modified.setRows(rows);
+                    modified.setOriginalRowIndexes(indexes);
                 }
                 modifier.emit({ type: 'afterModify', detail: eventDetail, table });
                 return table;
@@ -8048,6 +7971,7 @@
          *
          *  Authors:
          *  - Sophie Bremer
+         *  - Dawid Dragula
          *
          * */
         const { merge } = U;
@@ -8263,11 +8187,16 @@
                     modified.setColumns({ [orderInColumn]: column });
                 }
                 else {
+                    const originalIndexes = [];
                     const rows = [];
+                    let rowReference;
                     for (let i = 0; i < rowCount; ++i) {
-                        rows.push(rowReferences[i].row);
+                        rowReference = rowReferences[i];
+                        originalIndexes.push(modified.getOriginalRowIndex(rowReference.index));
+                        rows.push(rowReference.row);
                     }
                     modified.setRows(rows, 0);
+                    modified.setOriginalRowIndexes(originalIndexes);
                 }
                 modifier.emit({ type: 'afterModify', detail: eventDetail, table });
                 return table;