@baleada/logic 0.20.24 → 0.20.28

package/lib/index.cjs

@@ -2719,6 +2719,7 @@ class Grantable {
 const defaultOptions$2 = {
   initialLocation: 0
 };
+const defaultNavigateOptions = { allow: "possible" };
 const defaultNextAndPreviousOptions = {
   distance: 1,
   loops: true
@@ -2758,28 +2759,36 @@ class Navigateable {
     this.navigate(location);
     return this;
   }
-  navigate(location) {
-    this._navigate(location);
+  navigate(location, options = {}) {
+    const { allow } = { ...defaultNavigateOptions, ...options };
+    this._navigate(location, { allow });
     this.navigated();
     return this;
   }
   navigated() {
     this.computedStatus = "navigated";
   }
-  _navigate(location) {
+  _navigate(location, options = {}) {
+    const { allow } = { ...defaultNavigateOptions, ...options };
     const ensuredLocation = (() => {
-      if (location < 0) {
-        return 0;
-      }
-      if (location > this.array.length - 1) {
-        return Math.max(this.array.length - 1, 0);
+      if (allow === "possible") {
+        if (location < 0 && allow === "possible") {
+          return 0;
+        }
+        if (location > this.array.length - 1) {
+          return Math.max(this.array.length - 1, 0);
+        }
       }
       return location;
     })();
     this.computedLocation = ensuredLocation;
   }
   next(options = {}) {
-    const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, lastLocation = this.array.length - 1, newLocation = (() => {
+    const { distance, loops, allow } = { ...defaultNextAndPreviousOptions, ...defaultNavigateOptions, ...options }, newLocation = (() => {
+      if (allow === "any") {
+        return this.location + distance;
+      }
+      const lastLocation = this.array.length - 1;
       if (this.location + distance <= lastLocation) {
         return this.location + distance;
       }
@@ -2794,7 +2803,7 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this._navigate(newLocation);
+    this._navigate(newLocation, { allow });
     this.nexted();
     return this;
   }
@@ -2802,7 +2811,10 @@ class Navigateable {
     this.computedStatus = "navigated to next";
   }
   previous(options = {}) {
-    const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, newLocation = (() => {
+    const { distance, loops, allow } = { ...defaultNextAndPreviousOptions, ...defaultNavigateOptions, ...options }, newLocation = (() => {
+      if (allow === "any") {
+        return this.location - distance;
+      }
       if (this.location - distance >= 0) {
         return this.location - distance;
       }
@@ -2817,7 +2829,7 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this._navigate(newLocation);
+    this._navigate(newLocation, { allow });
     this.previoused();
     return this;
   }
@@ -2877,10 +2889,10 @@ class Pickable {
     this.pick(indices);
   }
   get first() {
-    return Math.min(...this.picks);
+    return this.computedFirst;
   }
   get last() {
-    return Math.max(...this.picks);
+    return this.computedLast;
   }
   get oldest() {
     return this.picks[0];
@@ -2939,6 +2951,8 @@ class Pickable {
           return new Pipeable(this.picks).pipe(createSlice({ from: 0, to: this.picks.length - possibleWithoutDuplicates.length }), createConcat(possibleWithoutDuplicates));
       }
     });
+    this.computedFirst = Math.min(...this.picks);
+    this.computedLast = Math.max(...this.picks);
     this.picked();
     return this;
   }
@@ -2948,11 +2962,15 @@ class Pickable {
   omit(indexOrIndices) {
     if (isUndefined(indexOrIndices)) {
       this.computedPicks = [];
+      this.computedFirst = void 0;
+      this.computedLast = void 0;
       this.omitted();
       return this;
     }
-    const omits = ensureIndices(indexOrIndices), filter = createFilter((pick) => isUndefined(lazyCollections.find((omit) => pick === omit)(omits)));
-    this.computedPicks = filter(this.computedPicks);
+    const omits = ensureIndices(indexOrIndices);
+    this.computedPicks = createFilter((pick) => isUndefined(lazyCollections.find((omit) => pick === omit)(omits)))(this.computedPicks);
+    this.computedFirst = Math.min(...this.picks);
+    this.computedLast = Math.max(...this.picks);
     this.omitted();
     return this;
   }

package/lib/index.d.ts

@@ -704,6 +704,13 @@ declare type NavigateableOptions = {
     initialLocation?: number;
 };
 declare type NavigateableStatus = 'ready' | 'navigated' | 'navigated to next' | 'navigated to previous' | 'navigated to random' | 'navigated to first' | 'navigated to last';
+declare type NavigateOptions = {
+    allow?: 'possible' | 'any';
+};
+declare type NextAndPreviousOptions = {
+    distance?: number;
+    loops?: boolean;
+};
 declare class Navigateable<Item> {
     constructor(array: Item[], options?: NavigateableOptions);
     private computedStatus;
@@ -718,18 +725,12 @@ declare class Navigateable<Item> {
     get item(): Item;
     setArray(array: Item[]): this;
     setLocation(location: number): this;
-    navigate(location: number): this;
+    navigate(location: number, options?: NavigateOptions): this;
     private navigated;
     private _navigate;
-    next(options?: {
-        distance?: number;
-        loops?: boolean;
-    }): this;
+    next(options?: NextAndPreviousOptions & NavigateOptions): this;
     private nexted;
-    previous(options?: {
-        distance?: number;
-        loops?: boolean;
-    }): this;
+    previous(options?: NextAndPreviousOptions & NavigateOptions): this;
     private previoused;
     random(): this;
     private randomed;
@@ -753,7 +754,9 @@ declare class Pickable<Item> {
     private computedPicks;
     get picks(): number[];
     set picks(indices: number[]);
+    computedFirst: number;
     get first(): number;
+    computedLast: number;
     get last(): number;
     get oldest(): number;
     get newest(): number;

package/lib/index.js

@@ -2708,6 +2708,7 @@ class Grantable {
 const defaultOptions$2 = {
   initialLocation: 0
 };
+const defaultNavigateOptions = { allow: "possible" };
 const defaultNextAndPreviousOptions = {
   distance: 1,
   loops: true
@@ -2747,28 +2748,36 @@ class Navigateable {
     this.navigate(location);
     return this;
   }
-  navigate(location) {
-    this._navigate(location);
+  navigate(location, options = {}) {
+    const { allow } = { ...defaultNavigateOptions, ...options };
+    this._navigate(location, { allow });
     this.navigated();
     return this;
   }
   navigated() {
     this.computedStatus = "navigated";
   }
-  _navigate(location) {
+  _navigate(location, options = {}) {
+    const { allow } = { ...defaultNavigateOptions, ...options };
     const ensuredLocation = (() => {
-      if (location < 0) {
-        return 0;
-      }
-      if (location > this.array.length - 1) {
-        return Math.max(this.array.length - 1, 0);
+      if (allow === "possible") {
+        if (location < 0 && allow === "possible") {
+          return 0;
+        }
+        if (location > this.array.length - 1) {
+          return Math.max(this.array.length - 1, 0);
+        }
       }
       return location;
     })();
     this.computedLocation = ensuredLocation;
   }
   next(options = {}) {
-    const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, lastLocation = this.array.length - 1, newLocation = (() => {
+    const { distance, loops, allow } = { ...defaultNextAndPreviousOptions, ...defaultNavigateOptions, ...options }, newLocation = (() => {
+      if (allow === "any") {
+        return this.location + distance;
+      }
+      const lastLocation = this.array.length - 1;
       if (this.location + distance <= lastLocation) {
         return this.location + distance;
       }
@@ -2783,7 +2792,7 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this._navigate(newLocation);
+    this._navigate(newLocation, { allow });
     this.nexted();
     return this;
   }
@@ -2791,7 +2800,10 @@ class Navigateable {
     this.computedStatus = "navigated to next";
   }
   previous(options = {}) {
-    const { distance, loops } = { ...defaultNextAndPreviousOptions, ...options }, newLocation = (() => {
+    const { distance, loops, allow } = { ...defaultNextAndPreviousOptions, ...defaultNavigateOptions, ...options }, newLocation = (() => {
+      if (allow === "any") {
+        return this.location - distance;
+      }
       if (this.location - distance >= 0) {
         return this.location - distance;
       }
@@ -2806,7 +2818,7 @@ class Navigateable {
         return newLocation2;
       })();
     })();
-    this._navigate(newLocation);
+    this._navigate(newLocation, { allow });
     this.previoused();
     return this;
   }
@@ -2866,10 +2878,10 @@ class Pickable {
     this.pick(indices);
   }
   get first() {
-    return Math.min(...this.picks);
+    return this.computedFirst;
   }
   get last() {
-    return Math.max(...this.picks);
+    return this.computedLast;
   }
   get oldest() {
     return this.picks[0];
@@ -2928,6 +2940,8 @@ class Pickable {
           return new Pipeable(this.picks).pipe(createSlice({ from: 0, to: this.picks.length - possibleWithoutDuplicates.length }), createConcat(possibleWithoutDuplicates));
       }
     });
+    this.computedFirst = Math.min(...this.picks);
+    this.computedLast = Math.max(...this.picks);
     this.picked();
     return this;
   }
@@ -2937,11 +2951,15 @@ class Pickable {
   omit(indexOrIndices) {
     if (isUndefined(indexOrIndices)) {
       this.computedPicks = [];
+      this.computedFirst = void 0;
+      this.computedLast = void 0;
       this.omitted();
       return this;
     }
-    const omits = ensureIndices(indexOrIndices), filter = createFilter((pick) => isUndefined(find((omit) => pick === omit)(omits)));
-    this.computedPicks = filter(this.computedPicks);
+    const omits = ensureIndices(indexOrIndices);
+    this.computedPicks = createFilter((pick) => isUndefined(find((omit) => pick === omit)(omits)))(this.computedPicks);
+    this.computedFirst = Math.min(...this.picks);
+    this.computedLast = Math.max(...this.picks);
     this.omitted();
     return this;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baleada/logic",
-  "version": "0.20.24",
+  "version": "0.20.28",
   "description": "UI logic for the Baleada toolkit",
   "main": "lib/index.cjs",
   "module": "lib/index.js",
@@ -66,7 +66,7 @@
     "@types/resize-observer-browser": "^0.1.5",
     "bezier-easing": "^2.1.0",
     "dompurify": "^2.2.6",
-    "fast-fuzzy": "^1.10.8",
+    "fast-fuzzy": "^1.11.1",
     "lazy-collections": "^0.8.0",
     "perfect-freehand": "^1.0.4",
     "polygon-clipping": "^0.15.3"