@shortfuse/materialdesignweb 0.8.0 → 0.9.1

package/core/CompositionAdapter.js

@@ -1,9 +1,22 @@
 import { createEmptyComment } from './optimizations.js';
 
 /**
+ * @template T
+ * @typedef {import('./Composition.js').default<T>} Composition
+ */
+
+/**
+ * @template T
+ * @typedef {import('./Composition.js').RenderOptions<T>} RenderOptions
+ */
+
+/**
+ * @template T
  * @typedef {Object} DomAdapterCreateOptions
  * @prop {Comment} anchorNode
  * @prop {(...args:any[]) => HTMLElement} [create]
+ * @prop {Composition<T>} composition
+ * @prop {RenderOptions<T>} renderOptions
  */
 
 /**
@@ -16,8 +29,9 @@ import { createEmptyComment } from './optimizations.js';
  * @prop {Comment} [comment]
  */
 
+/** @template T */
 export default class CompositionAdapter {
-  /** @param {DomAdapterCreateOptions} options */
+  /** @param {DomAdapterCreateOptions<T>} options */
   constructor(options) {
     this.anchorNode = options.anchorNode;
 
@@ -37,12 +51,11 @@ export default class CompositionAdapter {
      */
     this.needsArrayKeyFastPath = false;
 
+    /** @type {Composition<T>} */
     this.composition = options.composition;
+    /** @type {RenderOptions<T>} */
     this.renderOptions = options.renderOptions;
 
-    this.pendingRemoves = [];
-    // Batch objects
-
     /** @type {Map<any, ItemMetadata>} */
     this.metadataCache = null;
 
@@ -55,6 +68,11 @@ export default class CompositionAdapter {
     this.batchEndIndex = null;
   }
 
+  /**
+   * @param {Partial<T>} changes
+   * @param {T} data
+   * @return {import('./Composition.js').RenderDraw<T>}
+   */
   render(changes, data) {
     return this.composition.render(changes, data, this.renderOptions);
   }
@@ -66,7 +84,7 @@ export default class CompositionAdapter {
 
   writeBatch() {
     if (!this.queuedElements.length) return;
-    /** @type {Comment|Element} */
+    /** @type {Comment|Element|Document} */
     const previousSibling = this.metadata[this.batchStartIndex - 1]?.domNode ?? this.anchorNode;
     previousSibling.after(...this.queuedElements);
     this.queuedElements.length = 0;
@@ -78,7 +96,7 @@ export default class CompositionAdapter {
     this.needsArrayKeyFastPath = false;
     this.batchStartIndex = null;
     this.batchEndIndex = null;
-    if (this.metadataCache !== null) {
+    if (this.metadataCache) {
       for (const { domNode } of this.metadataCache.values()) {
         domNode.remove();
       }
@@ -94,10 +112,10 @@ export default class CompositionAdapter {
     domNode.remove();
 
     // Don't release in case we may need it later
-    if (this.metadataCache === null) {
-      this.metadataCache = new Map([[key, metadata]]);
-    } else {
+    if (this.metadataCache) {
       this.metadataCache.set(key, metadata);
+    } else {
+      this.metadataCache = new Map([[key, metadata]]);
     }
   }
 
@@ -138,9 +156,8 @@ export default class CompositionAdapter {
         return;
       }
 
-      if (this.metadataCache === null) {
-        this.metadataCache = new Map();
-      }
+      // eslint-disable-next-line no-multi-assign
+      const metadataCache = (this.metadataCache ??= new Map());
 
       // If not same key. Scan key list.
       // Can avoid checking before current index. Will always be after current
@@ -155,18 +172,18 @@ export default class CompositionAdapter {
         // New key
         // console.log('new key?', 'should be at', newIndex);
         // Was key removed in this batch?
-        if (this.metadataCache.has(key)) {
+        if (metadataCache.has(key)) {
           // console.log('inserting removed element', 'at', newIndex);
           // (Optimistic insert)
           // Key was removed and should be here instead
           // If should have been replace, will correct next step
-          const previousMetadata = this.metadataCache.get(key);
+          const previousMetadata = metadataCache.get(key);
           this.metadata.splice(newIndex, 0, previousMetadata);
           this.keys.splice(newIndex, 0, key);
 
           const previousSibling = this.metadata[newIndex - 1]?.domNode ?? this.anchorNode;
           previousSibling.after(previousMetadata.domNode);
-          this.metadataCache.delete(key);
+          metadataCache.delete(key);
           return;
         }
 
@@ -176,7 +193,7 @@ export default class CompositionAdapter {
         // Allows multiple inserts to batch instead of one-by-one
 
         // console.log('completely new key', 'removing old. will replace', newIndex);
-        this.metadataCache.set(metadataAtIndex.key, metadataAtIndex);
+        metadataCache.set(currentKey, metadataAtIndex);
 
         // Continue to PUT below
       } else {
@@ -220,14 +237,14 @@ export default class CompositionAdapter {
 
         // Don't release in case we may need it later
         // console.debug('Caching key', key);
-        this.metadataCache.set(metadataAtIndex.key, metadataAtIndex);
+        metadataCache.set(currentKey, metadataAtIndex);
 
         return;
       }
     }
 
     const render = this.render(changes, data);
-    const element = render.target;
+    const element = /** @type {Element} */ (render.target);
 
     this.metadata[newIndex] = {
       render,