handsontable 18.0.0 → 18.1.0-rc1

package/plugins/nestedRows/ui/collapsing.mjs

@@ -1,9 +1,62 @@
+function _check_private_redeclaration(obj, privateCollection) {
+    if (privateCollection.has(obj)) {
+        throw new TypeError("Cannot initialize the same private elements twice on an object");
+    }
+}
+function _class_private_method_get(receiver, privateSet, fn) {
+    if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
+    return fn;
+}
+function _class_private_method_init(obj, privateSet) {
+    _check_private_redeclaration(obj, privateSet);
+    privateSet.add(obj);
+}
 import { stopImmediatePropagation } from '../../../helpers/dom/event.mjs';
+import { throwWithCause } from '../../../helpers/errors.mjs';
 import { arrayEach } from '../../../helpers/array.mjs';
 import { rangeEach } from '../../../helpers/number.mjs';
 import { eventTargetEl, hasClass } from '../../../helpers/dom/element.mjs';
 import BaseUI from './_base.mjs';
 import HeadersUI from './headers.mjs';
+const actionDictionary = new Map([
+    [
+        'collapse',
+        {
+            beforeHook: 'beforeRowCollapse',
+            afterHook: 'afterRowCollapse'
+        }
+    ],
+    [
+        'expand',
+        {
+            beforeHook: 'beforeRowExpand',
+            afterHook: 'afterRowExpand'
+        }
+    ]
+]);
+var /**
+   * Builds the collapsed-parents list the grid will hold once the action finishes.
+   *
+   * @param {number[]} currentCollapsedRows Physical indexes of the currently collapsed parents.
+   * @param {number[]} parents Physical indexes of the parents being collapsed or expanded.
+   * @param {boolean} isCollapse `true` for a collapse, `false` for an expand.
+   * @returns {number[]} Physical row indexes, sorted ascending.
+   */ _getDestinationCollapsedRows = /*#__PURE__*/ new WeakSet(), /**
+   * Checks whether the physical row index points at a row that can be collapsed, meaning it exists
+   * and has children.
+   *
+   * @param {number} parent Physical row index.
+   * @returns {boolean}
+   */ _isCollapsibleParent = /*#__PURE__*/ new WeakSet(), /**
+   * Compares the collapsed-parents list against a snapshot taken before an action ran.
+   *
+   * @param {number[]} snapshot Physical row indexes captured before the action.
+   * @returns {boolean} `true` when nothing changed.
+   */ _isSameCollapsedState = /*#__PURE__*/ new WeakSet(), /**
+   * Physical row indexes of every top-level row that has children.
+   *
+   * @returns {number[]}
+   */ _getTopLevelParents = /*#__PURE__*/ new WeakSet();
 /**
  * Class responsible for the UI for collapsing and expanding groups.
  *
@@ -30,9 +83,15 @@ import HeadersUI from './headers.mjs';
             rowObject = this.dataManager.getDataObject(row);
             rowIndex = row;
         }
-        if (rowObject && this.dataManager.hasChildren(rowObject)) {
+        const hasChildren = !!rowObject && this.dataManager.hasChildren(rowObject);
+        if (hasChildren) {
             arrayEach(rowObject.__children, (elem)=>{
-                rowsToCollapse.push(this.dataManager.getRowIndex(elem) ?? -1);
+                const childIndex = this.dataManager.getRowIndex(elem);
+                // Skip children the cache does not know about - `getRowIndex` returns `null` for a row
+                // object that is no longer part of the current nested structure.
+                if (childIndex !== null) {
+                    rowsToCollapse.push(childIndex);
+                }
             });
         }
         rowsToTrim = this.collapseRows(rowsToCollapse, true, false);
@@ -42,7 +101,9 @@ import HeadersUI from './headers.mjs';
         if (forceRender) {
             this.renderAndAdjust();
         }
-        if (this.collapsedRows.indexOf(rowIndex) === -1) {
+        // Only a row that actually has children can be collapsed. Without this check pressing Enter on a
+        // leaf row header would record that leaf as a collapsed parent.
+        if (hasChildren && rowIndex !== null && this.collapsedRows.indexOf(rowIndex) === -1) {
             this.collapsedRows.push(rowIndex);
         }
         return rowsToTrim;
@@ -106,9 +167,11 @@ import HeadersUI from './headers.mjs';
         if (this.dataManager.hasChildren(parentIndex)) {
             const parentObject = this.dataManager.getDataObject(parentIndex);
             arrayEach(parentObject.__children ?? [], (elem)=>{
-                const elemIndex = this.dataManager.getRowIndex(elem) ?? -1;
-                rowsToTrim.push(elemIndex);
-                this.collapseChildRows(elemIndex, rowsToTrim);
+                const elemIndex = this.dataManager.getRowIndex(elem);
+                if (elemIndex !== null) {
+                    rowsToTrim.push(elemIndex);
+                    this.collapseChildRows(elemIndex, rowsToTrim);
+                }
             });
         }
         if (doTrimming) {
@@ -157,9 +220,11 @@ import HeadersUI from './headers.mjs';
             const parentObject = this.dataManager.getDataObject(parentIndex);
             arrayEach(parentObject.__children ?? [], (elem)=>{
                 if (!this.isAnyParentCollapsed(elem)) {
-                    const elemIndex = this.dataManager.getRowIndex(elem) ?? -1;
-                    rowsToUntrim.push(elemIndex);
-                    this.expandChildRows(elemIndex, rowsToUntrim);
+                    const elemIndex = this.dataManager.getRowIndex(elem);
+                    if (elemIndex !== null) {
+                        rowsToUntrim.push(elemIndex);
+                        this.expandChildRows(elemIndex, rowsToUntrim);
+                    }
                 }
             });
         }
@@ -186,11 +251,18 @@ import HeadersUI from './headers.mjs';
             rowObject = this.dataManager.getDataObject(row);
             rowIndex = row;
         }
-        this.collapsedRows.splice(this.collapsedRows.indexOf(rowIndex), 1);
+        const collapsedIndex = rowIndex === null ? -1 : this.collapsedRows.indexOf(rowIndex);
+        // `indexOf` returns -1 for a row that is not collapsed, and `splice(-1, 1)` would drop the last
+        // tracked parent instead of doing nothing.
+        if (collapsedIndex > -1) {
+            this.collapsedRows.splice(collapsedIndex, 1);
+        }
         if (rowObject && this.dataManager.hasChildren(rowObject)) {
             arrayEach(rowObject.__children, (elem)=>{
-                const childIndex = this.dataManager.getRowIndex(elem) ?? -1;
-                rowsToExpand.push(childIndex);
+                const childIndex = this.dataManager.getRowIndex(elem);
+                if (childIndex !== null) {
+                    rowsToExpand.push(childIndex);
+                }
             });
         }
         rowsToUntrim = this.expandRows(rowsToExpand, true, false);
@@ -221,30 +293,117 @@ import HeadersUI from './headers.mjs';
         }
     }
     /**
+   * Returns the physical indexes of the parent rows that are collapsed right now.
+   *
+   * The list is sorted ascending so hook payloads are stable and comparable between calls.
+   *
+   * @returns {number[]} Physical row indexes of collapsed parents.
+   */ getCollapsedParents() {
+        return this.collapsedRows.slice().sort((a, b)=>a - b);
+    }
+    /**
+   * Collapses or expands the given parent rows and fires the matching pair of hooks.
+   *
+   * This is the single choke point for every collapse and expand in the plugin - the row header
+   * button, the Enter shortcut, and the public plugin methods all run through it, so all of them
+   * produce the same state change and the same hooks.
+   *
+   * @param {number[]} parents Physical row indexes of the parents to act on.
+   * @param {string} action Either `'collapse'` or `'expand'`.
+   * @param {boolean} [shouldRunHooks=true] `false` skips both hooks - used when replaying state that the
+   * user already chose, such as restoring after an `updateSettings` call.
+   * @returns {boolean} `true` if the collapsed state actually changed.
+   * @fires Hooks#beforeRowCollapse
+   * @fires Hooks#afterRowCollapse
+   * @fires Hooks#beforeRowExpand
+   * @fires Hooks#afterRowExpand
+   */ toggleCollapsedRows(parents, action, shouldRunHooks = true) {
+        return this.applyCollapsedRowsChange(parents, action, shouldRunHooks).performed;
+    }
+    /**
+   * Same as `toggleCollapsedRows`, but it also reports whether a `before*` hook blocked the action.
+   *
+   * A caller that performs two passes needs that apart from `performed`: `performed` is `false` both
+   * when a hook blocked the change and when there was simply nothing to do, and those two cases call
+   * for opposite decisions.
+   *
+   * @param {number[]} parents Physical row indexes of the parents to act on.
+   * @param {string} action Either `'collapse'` or `'expand'`.
+   * @param {boolean} [shouldRunHooks=true] `false` skips both hooks.
+   * @returns {{performed: boolean, vetoed: boolean}} `performed` says the collapsed state changed,
+   * `vetoed` says a `before*` hook returned `false`.
+   * @fires Hooks#beforeRowCollapse
+   * @fires Hooks#afterRowCollapse
+   * @fires Hooks#beforeRowExpand
+   * @fires Hooks#afterRowExpand
+   */ applyCollapsedRowsChange(parents, action, shouldRunHooks = true) {
+        const actionTranslator = actionDictionary.get(action);
+        if (!actionTranslator) {
+            throwWithCause(`Unsupported action is passed (${action}).`);
+        }
+        if (!Array.isArray(parents)) {
+            return {
+                performed: false,
+                vetoed: false
+            };
+        }
+        const isCollapse = action === 'collapse';
+        const currentCollapsedRows = this.getCollapsedParents();
+        // The action is possible only when every index points at a row that really has children. An
+        // impossible action still reports through the hooks, matching the CollapsibleColumns plugin.
+        const actionPossible = parents.length > 0 && parents.every((parent)=>_class_private_method_get(this, _isCollapsibleParent, isCollapsibleParent).call(this, parent));
+        const destinationCollapsedRows = _class_private_method_get(this, _getDestinationCollapsedRows, getDestinationCollapsedRows).call(this, currentCollapsedRows, parents, isCollapse);
+        if (shouldRunHooks) {
+            const isActionAllowed = this.hot.runHooks(actionTranslator.beforeHook, currentCollapsedRows, destinationCollapsedRows, actionPossible);
+            if (isActionAllowed === false) {
+                return {
+                    performed: false,
+                    vetoed: true
+                };
+            }
+        }
+        if (actionPossible) {
+            if (isCollapse) {
+                this.collapseMultipleChildren(parents, false, true);
+            } else {
+                this.expandMultipleChildren(parents, false, true);
+            }
+        }
+        const isActionPerformed = !_class_private_method_get(this, _isSameCollapsedState, isSameCollapsedState).call(this, currentCollapsedRows);
+        if (isActionPerformed) {
+            this.renderAndAdjust();
+        }
+        if (shouldRunHooks) {
+            this.hot.runHooks(actionTranslator.afterHook, currentCollapsedRows, destinationCollapsedRows, actionPossible, isActionPerformed);
+        }
+        return {
+            performed: isActionPerformed,
+            vetoed: false
+        };
+    }
+    /**
    * Collapse all collapsable rows.
    */ collapseAll() {
-        const data = this.dataManager.getData();
-        const parentsToCollapse = [];
-        arrayEach(data, (elem)=>{
-            if (this.dataManager.hasChildren(elem)) {
-                parentsToCollapse.push(elem);
-            }
-        });
-        this.collapseMultipleChildren(parentsToCollapse);
-        this.renderAndAdjust();
+        this.toggleCollapsedRows(_class_private_method_get(this, _getTopLevelParents, getTopLevelParents).call(this), 'collapse');
     }
     /**
    * Expand all collapsable rows.
+   *
+   * Acts on the top-level parents, which leaves a parent that was collapsed inside another one
+   * collapsed. Use `NestedRows#expandAll` to expand every level.
    */ expandAll() {
-        const data = this.dataManager.getData();
-        const parentsToExpand = [];
-        arrayEach(data, (elem)=>{
-            if (this.dataManager.hasChildren(elem)) {
-                parentsToExpand.push(elem);
-            }
-        });
-        this.expandMultipleChildren(parentsToExpand);
-        this.renderAndAdjust();
+        this.toggleCollapsedRows(_class_private_method_get(this, _getTopLevelParents, getTopLevelParents).call(this), 'expand');
+    }
+    /**
+   * Collapsed parents ordered from the shallowest to the deepest, so an ancestor is always handled
+   * before its own descendants.
+   *
+   * @returns {number[]} Physical row indexes.
+   */ getCollapsedParentsShallowestFirst() {
+        return this.getCollapsedParents().map((row)=>({
+                row,
+                level: this.dataManager.getRowLevel(row) ?? 0
+            })).sort((a, b)=>a.level - b.level).map(({ row })=>row);
     }
     /**
    * Trim rows.
@@ -285,8 +444,8 @@ import HeadersUI from './headers.mjs';
         }
         if (rowObj && this.dataManager.hasChildren(rowObj)) {
             arrayEach(rowObj.__children, (elem)=>{
-                const rowIndex = this.dataManager.getRowIndex(elem) ?? -1;
-                if (!this.plugin.collapsedRowsMap.getValueAtIndex(rowIndex)) {
+                const rowIndex = this.dataManager.getRowIndex(elem);
+                if (rowIndex === null || !this.plugin.collapsedRowsMap.getValueAtIndex(rowIndex)) {
                     allCollapsed = false;
                     return false;
                 }
@@ -304,8 +463,8 @@ import HeadersUI from './headers.mjs';
         let parent = rowObj;
         while(parent !== null){
             parent = this.dataManager.getRowParent(parent);
-            const parentIndex = this.dataManager.getRowIndex(parent) ?? -1;
-            if (this.collapsedRows.indexOf(parentIndex) > -1) {
+            const parentIndex = this.dataManager.getRowIndex(parent);
+            if (parentIndex !== null && this.collapsedRows.indexOf(parentIndex) > -1) {
                 return true;
             }
         }
@@ -323,11 +482,9 @@ import HeadersUI from './headers.mjs';
         }
         const row = this.translateTrimmedRow(coords.row);
         if (hasClass(eventTargetEl(event), HeadersUI.CSS_CLASSES.button)) {
-            if (this.areChildrenCollapsed(row)) {
-                this.expandChildren(row);
-            } else {
-                this.collapseChildren(row);
-            }
+            this.toggleCollapsedRows([
+                row
+            ], this.areChildrenCollapsed(row) ? 'expand' : 'collapse');
             stopImmediatePropagation(event);
         }
     }
@@ -361,7 +518,7 @@ import HeadersUI from './headers.mjs';
     /**
    * Initializes the collapsing UI component and sets up the stash mechanism for preserving collapsed row state across operations.
    */ constructor(nestedRowsPlugin, hotInstance){
-        super(nestedRowsPlugin, hotInstance);
+        super(nestedRowsPlugin, hotInstance), _class_private_method_init(this, _getDestinationCollapsedRows), _class_private_method_init(this, _isCollapsibleParent), _class_private_method_init(this, _isSameCollapsedState), _class_private_method_init(this, _getTopLevelParents);
         /**
      * Reference to the TrimRows plugin.
      */ this.dataManager = this.plugin.dataManager;
@@ -395,4 +552,41 @@ import HeadersUI from './headers.mjs';
         };
     }
 }
+function getDestinationCollapsedRows(currentCollapsedRows, parents, isCollapse) {
+    const collapsible = parents.filter((parent)=>_class_private_method_get(this, _isCollapsibleParent, isCollapsibleParent).call(this, parent));
+    if (isCollapse) {
+        const destination = currentCollapsedRows.slice();
+        collapsible.forEach((parent)=>{
+            if (destination.indexOf(parent) === -1) {
+                destination.push(parent);
+            }
+        });
+        return destination.sort((a, b)=>a - b);
+    }
+    return currentCollapsedRows.filter((parent)=>collapsible.indexOf(parent) === -1);
+}
+function isCollapsibleParent(parent) {
+    if (!Number.isInteger(parent) || parent < 0) {
+        return false;
+    }
+    const rowObject = this.dataManager.getDataObject(parent);
+    return !!rowObject && this.dataManager.hasChildren(rowObject);
+}
+function isSameCollapsedState(snapshot) {
+    const current = this.getCollapsedParents();
+    return current.length === snapshot.length && current.every((row, index)=>row === snapshot[index]);
+}
+function getTopLevelParents() {
+    const data = this.dataManager.getData() ?? [];
+    const parents = [];
+    arrayEach(data, (elem)=>{
+        if (this.dataManager.hasChildren(elem)) {
+            const rowIndex = this.dataManager.getRowIndex(elem);
+            if (rowIndex !== null) {
+                parents.push(rowIndex);
+            }
+        }
+    });
+    return parents;
+}
 export default CollapsingUI;

package/plugins/nestedRows/ui/contextMenu.js

@@ -18,15 +18,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -34,9 +31,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {
@@ -66,18 +61,12 @@ function _getRequireWildcardCache(nodeInterop) {
     })(nodeInterop);
 }
 function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
+    if (!nodeInterop && obj && obj.__esModule) return obj;
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") return {
+        default: obj
+    };
     var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
+    if (cache && cache.has(obj)) return cache.get(obj);
     var newObj = {
         __proto__: null
     };
@@ -85,17 +74,12 @@ function _interop_require_wildcard(obj, nodeInterop) {
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
             var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
+            if (desc && (desc.get || desc.set)) Object.defineProperty(newObj, key, desc);
+            else newObj[key] = obj[key];
         }
     }
     newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
+    if (cache) cache.set(obj, newObj);
     return newObj;
 }
 var /**

package/plugins/nestedRows/ui/contextMenu.mjs

@@ -4,15 +4,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -20,9 +17,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {

package/plugins/notification/notification.js

@@ -34,15 +34,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -50,9 +47,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {
@@ -69,9 +64,7 @@ function _class_private_field_set(receiver, privateMap, value) {
     return value;
 }
 function _class_private_method_get(receiver, privateSet, fn) {
-    if (!privateSet.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
+    if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
 }
 function _class_private_method_init(obj, privateSet) {
@@ -87,18 +80,12 @@ function _getRequireWildcardCache(nodeInterop) {
     })(nodeInterop);
 }
 function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
+    if (!nodeInterop && obj && obj.__esModule) return obj;
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") return {
+        default: obj
+    };
     var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
+    if (cache && cache.has(obj)) return cache.get(obj);
     var newObj = {
         __proto__: null
     };
@@ -106,17 +93,12 @@ function _interop_require_wildcard(obj, nodeInterop) {
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
             var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
+            if (desc && (desc.get || desc.set)) Object.defineProperty(newObj, key, desc);
+            else newObj[key] = obj[key];
         }
     }
     newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
+    if (cache) cache.set(obj, newObj);
     return newObj;
 }
 const PLUGIN_KEY = 'notification';

package/plugins/notification/notification.mjs

@@ -4,15 +4,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -20,9 +17,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {
@@ -39,9 +34,7 @@ function _class_private_field_set(receiver, privateMap, value) {
     return value;
 }
 function _class_private_method_get(receiver, privateSet, fn) {
-    if (!privateSet.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
+    if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
 }
 function _class_private_method_init(obj, privateSet) {

package/plugins/notification/ui.js

@@ -17,15 +17,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -33,9 +30,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {

package/plugins/notification/ui.mjs

@@ -4,15 +4,12 @@ function _check_private_redeclaration(obj, privateCollection) {
     }
 }
 function _class_apply_descriptor_get(receiver, descriptor) {
-    if (descriptor.get) {
-        return descriptor.get.call(receiver);
-    }
+    if (descriptor.get) return descriptor.get.call(receiver);
     return descriptor.value;
 }
 function _class_apply_descriptor_set(receiver, descriptor, value) {
-    if (descriptor.set) {
-        descriptor.set.call(receiver, value);
-    } else {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
         if (!descriptor.writable) {
             throw new TypeError("attempted to set read only private field");
         }
@@ -20,9 +17,7 @@ function _class_apply_descriptor_set(receiver, descriptor, value) {
     }
 }
 function _class_extract_field_descriptor(receiver, privateMap, action) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to " + action + " private field on non-instance");
-    }
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
     return privateMap.get(receiver);
 }
 function _class_private_field_get(receiver, privateMap) {