@baleada/logic 0.20.17 → 0.20.21

package/lib/index.cjs

@@ -2058,18 +2058,21 @@ class Completeable {
   }
   complete(completion, options = {}) {
     this.completing();
-    const { select } = { ...defaultCompleteOptions, ...options }, textBefore = this.getTextBefore(), textAfter = this.getTextAfter(), completedString = textBefore + completion + textAfter, completedSelection = (() => {
+    const { select } = { ...defaultCompleteOptions, ...options }, before = this.getBefore(), after = this.getAfter(), completedString = before + completion + after, completedSelection = (() => {
+      if (isFunction(select)) {
+        return select({ before, completion, after });
+      }
       switch (select) {
         case "completion":
           return {
-            start: textBefore.length,
-            end: `${textBefore}${completion}`.length,
+            start: before.length,
+            end: `${before}${completion}`.length,
             direction: this.selection.direction
           };
         case "completionEnd":
           return {
-            start: `${textBefore}${completion}`.length,
-            end: `${textBefore}${completion}`.length,
+            start: `${before}${completion}`.length,
+            end: `${before}${completion}`.length,
             direction: this.selection.direction
           };
       }
@@ -2079,7 +2082,7 @@ class Completeable {
     this.completed();
     return this;
   }
-  getTextBefore() {
+  getBefore() {
     switch (this.segmentFrom) {
       case "start":
         return "";
@@ -2089,7 +2092,7 @@ class Completeable {
         return this.string.slice(0, this.dividerIndices.before + 1);
     }
   }
-  getTextAfter() {
+  getAfter() {
     switch (this.segmentTo) {
       case "end":
         return "";
@@ -2756,6 +2759,14 @@ class Navigateable {
     return this;
   }
   navigate(location) {
+    this._navigate(location);
+    this.navigated();
+    return this;
+  }
+  navigated() {
+    this.computedStatus = "navigated";
+  }
+  _navigate(location) {
     const ensuredLocation = (() => {
       if (location < 0) {
         return 0;
@@ -2766,11 +2777,6 @@ class Navigateable {
       return location;
     })();
     this.computedLocation = ensuredLocation;
-    this.navigated();
-    return this;
-  }
-  navigated() {
-    this.computedStatus = "navigated";
   }
   next(options = {}) {
     const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, lastLocation = this.array.length - 1, newLocation = (() => {
@@ -2788,9 +2794,13 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this.navigate(newLocation);
+    this._navigate(newLocation);
+    this.nexted();
     return this;
   }
+  nexted() {
+    this.computedStatus = "navigated to next";
+  }
   previous(options = {}) {
     const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, newLocation = (() => {
       if (this.location - distance >= 0) {
@@ -2807,22 +2817,38 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this.navigate(newLocation);
+    this._navigate(newLocation);
+    this.previoused();
     return this;
   }
+  previoused() {
+    this.computedStatus = "navigated to previous";
+  }
   random() {
     const newLocation = Math.floor(Math.random() * this.array.length);
-    this.navigate(newLocation);
+    this._navigate(newLocation);
+    this.randomed();
     return this;
   }
+  randomed() {
+    this.computedStatus = "navigated to random";
+  }
   first() {
-    this.navigate(0);
+    this._navigate(0);
+    this.firsted();
     return this;
   }
+  firsted() {
+    this.computedStatus = "navigated to first";
+  }
   last() {
-    this.navigate(this.array.length - 1);
+    this._navigate(this.array.length - 1);
+    this.lasted();
     return this;
   }
+  lasted() {
+    this.computedStatus = "navigated to last";
+  }
 }
 
 const defaultOptions$1 = {
@@ -2892,7 +2918,7 @@ class Pickable {
       this.omitted();
       return this;
     }
-    const omits = ensureIndices(indexOrIndices), filter = createFilter((pick) => !lazyCollections.find((omit) => pick === omit)(omits));
+    const omits = ensureIndices(indexOrIndices), filter = createFilter((pick) => isUndefined(lazyCollections.find((omit) => pick === omit)(omits)));
     this.computedPicks = filter(this.computedPicks);
     this.omitted();
     return this;

package/lib/index.d.ts

@@ -157,7 +157,11 @@ declare type CompleteableOptions = {
 };
 declare type CompleteableStatus = 'constructing' | 'ready' | 'completing' | 'completed';
 declare type CompleteOptions = {
-    select?: 'completion' | 'completionEnd';
+    select?: 'completion' | 'completionEnd' | (({ before, completion, after }: {
+        before: string;
+        completion: string;
+        after: string;
+    }) => Completeable['selection']);
 };
 declare class Completeable {
     private segmentFrom;
@@ -199,11 +203,9 @@ declare class Completeable {
     private setDividerIndices;
     private toPreviousMatch;
     private toNextMatch;
-    complete(completion: string, options?: {
-        select?: 'completion' | 'completionEnd';
-    }): this;
-    private getTextBefore;
-    private getTextAfter;
+    complete(completion: string, options?: CompleteOptions): this;
+    private getBefore;
+    private getAfter;
     private completing;
     private completed;
 }
@@ -701,7 +703,7 @@ declare class Grantable<DescriptorType extends PermissionDescriptor> {
 declare type NavigateableOptions = {
     initialLocation?: number;
 };
-declare type NavigateableStatus = 'ready' | 'navigated';
+declare type NavigateableStatus = 'ready' | 'navigated' | 'navigated to next' | 'navigated to previous' | 'navigated to random' | 'navigated to first' | 'navigated to last';
 declare class Navigateable<Item> {
     constructor(array: Item[], options?: NavigateableOptions);
     private computedStatus;
@@ -718,17 +720,23 @@ declare class Navigateable<Item> {
     setLocation(location: number): this;
     navigate(location: number): this;
     private navigated;
+    private _navigate;
     next(options?: {
         distance?: number;
         loops?: boolean;
     }): this;
+    private nexted;
     previous(options?: {
         distance?: number;
         loops?: boolean;
     }): this;
+    private previoused;
     random(): this;
+    private randomed;
     first(): this;
+    private firsted;
     last(): this;
+    private lasted;
 }
 
 declare type PickableOptions = {

package/lib/index.js

@@ -2047,18 +2047,21 @@ class Completeable {
   }
   complete(completion, options = {}) {
     this.completing();
-    const { select } = { ...defaultCompleteOptions, ...options }, textBefore = this.getTextBefore(), textAfter = this.getTextAfter(), completedString = textBefore + completion + textAfter, completedSelection = (() => {
+    const { select } = { ...defaultCompleteOptions, ...options }, before = this.getBefore(), after = this.getAfter(), completedString = before + completion + after, completedSelection = (() => {
+      if (isFunction(select)) {
+        return select({ before, completion, after });
+      }
       switch (select) {
         case "completion":
           return {
-            start: textBefore.length,
-            end: `${textBefore}${completion}`.length,
+            start: before.length,
+            end: `${before}${completion}`.length,
             direction: this.selection.direction
           };
         case "completionEnd":
           return {
-            start: `${textBefore}${completion}`.length,
-            end: `${textBefore}${completion}`.length,
+            start: `${before}${completion}`.length,
+            end: `${before}${completion}`.length,
             direction: this.selection.direction
           };
       }
@@ -2068,7 +2071,7 @@ class Completeable {
     this.completed();
     return this;
   }
-  getTextBefore() {
+  getBefore() {
     switch (this.segmentFrom) {
       case "start":
         return "";
@@ -2078,7 +2081,7 @@ class Completeable {
         return this.string.slice(0, this.dividerIndices.before + 1);
     }
   }
-  getTextAfter() {
+  getAfter() {
     switch (this.segmentTo) {
       case "end":
         return "";
@@ -2745,6 +2748,14 @@ class Navigateable {
     return this;
   }
   navigate(location) {
+    this._navigate(location);
+    this.navigated();
+    return this;
+  }
+  navigated() {
+    this.computedStatus = "navigated";
+  }
+  _navigate(location) {
     const ensuredLocation = (() => {
       if (location < 0) {
         return 0;
@@ -2755,11 +2766,6 @@ class Navigateable {
       return location;
     })();
     this.computedLocation = ensuredLocation;
-    this.navigated();
-    return this;
-  }
-  navigated() {
-    this.computedStatus = "navigated";
   }
   next(options = {}) {
     const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, lastLocation = this.array.length - 1, newLocation = (() => {
@@ -2777,9 +2783,13 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this.navigate(newLocation);
+    this._navigate(newLocation);
+    this.nexted();
     return this;
   }
+  nexted() {
+    this.computedStatus = "navigated to next";
+  }
   previous(options = {}) {
     const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, newLocation = (() => {
       if (this.location - distance >= 0) {
@@ -2796,22 +2806,38 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this.navigate(newLocation);
+    this._navigate(newLocation);
+    this.previoused();
     return this;
   }
+  previoused() {
+    this.computedStatus = "navigated to previous";
+  }
   random() {
     const newLocation = Math.floor(Math.random() * this.array.length);
-    this.navigate(newLocation);
+    this._navigate(newLocation);
+    this.randomed();
     return this;
   }
+  randomed() {
+    this.computedStatus = "navigated to random";
+  }
   first() {
-    this.navigate(0);
+    this._navigate(0);
+    this.firsted();
     return this;
   }
+  firsted() {
+    this.computedStatus = "navigated to first";
+  }
   last() {
-    this.navigate(this.array.length - 1);
+    this._navigate(this.array.length - 1);
+    this.lasted();
     return this;
   }
+  lasted() {
+    this.computedStatus = "navigated to last";
+  }
 }
 
 const defaultOptions$1 = {
@@ -2881,7 +2907,7 @@ class Pickable {
       this.omitted();
       return this;
     }
-    const omits = ensureIndices(indexOrIndices), filter = createFilter((pick) => !find((omit) => pick === omit)(omits));
+    const omits = ensureIndices(indexOrIndices), filter = createFilter((pick) => isUndefined(find((omit) => pick === omit)(omits)));
     this.computedPicks = filter(this.computedPicks);
     this.omitted();
     return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baleada/logic",
-  "version": "0.20.17",
+  "version": "0.20.21",
   "description": "UI logic for the Baleada toolkit",
   "main": "lib/index.cjs",
   "module": "lib/index.js",