issue-171 Replace process flow (single replace works)

Author: dhilt

src/component/inputs/adapter.ts

@@ -113,7 +113,8 @@ const INSERT_METHOD_PARAMS: ICommonProps<AdapterInsertParams> = {
     validators: [FUNC_WITH_X_ARGUMENTS(1), ONE_OF_MUST([AdapterInsertParams.before])]
   },
   [AdapterInsertParams.decrease]: {
-    validators: [BOOLEAN]
+    validators: [BOOLEAN],
+    defaultValue: false
   },
 };
 

src/component/processes/adapter/insert.ts

@@ -2,36 +2,34 @@ import { getBaseAdapterProcess } from './_base';
 import { Scroller } from '../../scroller';
 import { Item } from '../../classes/item';
 import {
-  AdapterProcess, ProcessStatus, AdapterInsertOptions, ItemsPredicate, IValidatedData
+  AdapterProcess, ProcessStatus, AdapterInsertOptions, ItemsPredicate
 } from '../../interfaces/index';
 
 export default class Insert extends getBaseAdapterProcess(AdapterProcess.insert) {
 
   static run(scroller: Scroller, options: AdapterInsertOptions) {
 
-    const { data } = Insert.parseInput(scroller, options);
-    if (!data.isValid) {
+    const { params } = Insert.parseInput(scroller, options);
+    if (!params) {
       return;
     }
 
-    const next = Insert.doInsert(scroller, data);
+    const shouldInsert = Insert.doInsert(scroller, params);
 
     scroller.workflow.call({
       process: Insert.process,
-      status: next ? ProcessStatus.next : ProcessStatus.done
+      status: shouldInsert ? ProcessStatus.next : ProcessStatus.done
     });
   }
 
-  static doInsert(scroller: Scroller, { params }: IValidatedData): boolean {
-    const { buffer } = scroller;
+  static doInsert(scroller: Scroller, params: AdapterInsertOptions): boolean {
     const { before, after, items, decrease } = params;
-    const method: ItemsPredicate = before.isSet ? before.value : after.value;
-    const found = buffer.items.find(item => method(item.get()));
+    const method = (before || after) as ItemsPredicate;
+    const found = scroller.buffer.items.find(item => method(item.get()));
     if (!found) {
       return false;
     }
-    const decrement = decrease.isSet && decrease.value;
-    return Insert.simulateFetch(scroller, found, items.value, before.isSet, decrement);
+    return Insert.simulateFetch(scroller, found, items, !!before, !!decrease);
   }
 
   static simulateFetch(

src/component/processes/adapter/remove.ts

@@ -11,15 +11,15 @@ export default class Remove extends getBaseAdapterProcess(AdapterProcess.remove)
       return;
     }
 
-    const shouldRemove = Remove.removeItems(scroller, params);
+    const shouldRemove = Remove.doRemove(scroller, params);
 
     scroller.workflow.call({
       process: Remove.process,
       status: shouldRemove ? ProcessStatus.next : ProcessStatus.done
     });
   }
 
-  static removeItems(scroller: Scroller, params: AdapterRemoveOptions, sequenceOnly = false): boolean {
+  static doRemove(scroller: Scroller, params: AdapterRemoveOptions, sequenceOnly = false): boolean {
     const shouldRemove = Remove.removeBufferedItems(scroller, params);
     const shouldRemoveVirtual = Remove.removeVirtualItems(scroller, params, sequenceOnly);
 

src/component/processes/adapter/replace.ts

@@ -1,7 +1,8 @@
 import { getBaseAdapterProcess } from './_base';
 import { Scroller } from '../../scroller';
-import { AdapterProcess, ProcessStatus, AdapterReplaceOptions } from '../../interfaces/index';
+import { AdapterProcess, ProcessStatus, AdapterReplaceOptions, AdapterInsertOptions } from '../../interfaces/index';
 import Remove from './remove';
+import Insert from './insert';
 
 export default class Replace extends getBaseAdapterProcess(AdapterProcess.replace) {
 
@@ -11,7 +12,7 @@ export default class Replace extends getBaseAdapterProcess(AdapterProcess.replac
       return;
     }
 
-    const shouldRemove = Remove.removeItems(scroller, params, true);
+    const shouldRemove = Remove.doRemove(scroller, params, true);
     if (!shouldRemove) {
       scroller.logger.log(() => 'no items to replace (not found)');
       return scroller.workflow.call({
@@ -20,9 +21,22 @@ export default class Replace extends getBaseAdapterProcess(AdapterProcess.replac
       });
     }
 
+    const insertOptions: AdapterInsertOptions = {
+      items: params.items,
+      before: params.predicate,
+      decrease: false
+    };
+    const shouldInsert = Insert.doInsert(scroller, insertOptions);
+    if (!shouldInsert) {
+      return scroller.workflow.call({
+        process: Replace.process,
+        status: ProcessStatus.done
+      });
+    }
+
     scroller.workflow.call({
       process: Replace.process,
-      status: ProcessStatus.done
+      status: ProcessStatus.next
     });
   }
 

src/component/workflow-transducer.ts

@@ -135,6 +135,7 @@ export const runStateMachine = ({
         case AdapterProcess.append:
         case AdapterProcess.check:
         case AdapterProcess.insert:
+        case AdapterProcess.replace:
           run(Render)();
           break;
         case AdapterProcess.remove:
@@ -181,6 +182,9 @@ export const runStateMachine = ({
           case AdapterProcess.remove:
             run(Adjust)();
             break;
+          case AdapterProcess.replace:
+            run(Clip)();
+            break;
           default:
             run(PreClip)();
         }

tests/adapter.remove.spec.ts

@@ -145,20 +145,21 @@ const doRemove = async (config: TestBedConfig, misc: Misc, byId = false) => {
 
 const shouldRemove = (config: TestBedConfig, byId = false) => (misc: Misc) => async (done: Function) => {
   await misc.relaxNext();
-  const bufferSizeBeforeRemove = misc.scroller.buffer.size;
+  const { size: bufferSizeBeforeRemove, minIndex, maxIndex, absMinIndex, absMaxIndex } = misc.scroller.buffer;
   const { remove: indexList, increase } = config.custom;
-  const { minIndex, maxIndex } = misc.scroller.buffer;
   const viewportSizeBeforeRemove = misc.getScrollableSize();
   const sizeToRemove = indexList.length * misc.getItemSize();
   const deltaSize = viewportSizeBeforeRemove - sizeToRemove;
 
   const loopPendingSub = misc.adapter.loopPending$.subscribe(loopPending => {
     if (!loopPending) { // when the first loop after the Remove is done
       const len = indexList.length;
-      const { minIndex: min, maxIndex: max, size } = misc.scroller.buffer;
+      const { size, minIndex: min, maxIndex: max, absMinIndex: absMin, absMaxIndex: absMax } = misc.scroller.buffer;
       expect(size).toEqual(bufferSizeBeforeRemove - len);
       expect(min).toBe(minIndex + (increase ? len : 0));
       expect(max).toBe(maxIndex - (increase ? 0 : len));
+      expect(absMin).toBe(absMinIndex + (increase ? len : 0));
+      expect(absMax).toBe(absMaxIndex - (increase ? 0 : len));
       expect(deltaSize).toEqual(misc.getScrollableSize());
       loopPendingSub.unsubscribe();
     }

tests/adapter.replace.spec.ts

@@ -63,7 +63,6 @@ const getDatasourceClass = (settings: Settings) =>
       if (itemToReplace) {
         Object.assign(itemToReplace, item);
       }
-      // console.log('RUN', this.data);
     }
   };
 
@@ -79,15 +78,11 @@ const shouldReplace = (config: TestBedConfig) => (misc: Misc) => async (done: Fu
   newItem.text += '*';
 
   replaceOne(indexToReplace, newItem);
-  await adapter.remove(({ $index }) => $index === indexToReplace);
-  await adapter.insert({
-    before: ({ $index }) => $index === indexToReplace,
+
+  await adapter.replace({
+    predicate: ({ $index }) => $index === indexToReplace,
     items: [newItem]
   });
-  // await adapter.replace({
-  //   predicate: ({ $index }) => $index === indexToReplace,
-  //   items: [newItem]
-  // });
 
   await misc.scrollMinMax();
   adapter.fix({ scrollPosition });