functionalscript 0.0.468 → 0.0.469

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.468",
+  "version": "0.0.469",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/types/range_map/module.f.cjs

@@ -1,6 +1,7 @@
 const sortedList = require("../sorted_list/module.f.cjs")
 const { genericMerge } = sortedList
 const list = require("../list/module.f.cjs")
+const { next } = list
 const option = require("../option/module.f.cjs")
 const { cmp } = require('../number/module.f.cjs')
 const operator = require("../function/operator/module.f.cjs")
@@ -50,7 +51,7 @@ const reduceOp = union => equal => state => ([aItem, aMax]) => ([bItem, bMax])
 /** @type {<T>(equal: operator.Equal<T>) => sortedList.TailReduce<Entry<T>, RangeState<T>>} */
 const tailReduce = equal => state => tail => {
   if (state === undefined) { return tail }
-  const tailResult = list.next(tail)
+  const tailResult = next(tail)
   if (tailResult === undefined) { return [state] }
   if (equal(state[0])(tailResult.first[0])) { return tailResult }
   return { first: state, tail: tailResult }

package/types/sorted_list/module.f.cjs

@@ -3,12 +3,18 @@ const list = require('../list/module.f.cjs')
 const option = require('../option/module.f.cjs')
 const { next } = list
 const { identity } = require('../function/module.f.cjs')
+const range = require('../range/module.f.cjs')
 
 /**
  * @template T
  * @typedef {list.List<T>} SortedList
  */
 
+/**
+ * @template T
+ * @typedef {readonly T[]} SortedArray
+ */
+
 /**
  * @template T
  * @typedef {(a: T) => (b: T) => compare.Sign} Cmp
@@ -78,9 +84,33 @@ const cmpReduce = cmp => () => a => b => {
 /** @type {() => <T>(tail: list.List<T>) => list.List<T>} */
 const mergeTail = () => identity
 
+/** @type {<T>(cmp: Cmp<T>) => (value: T) => (array: SortedArray<T>) =>  T|undefined} */
+const find = cmp => value => array => {
+    let b = 0
+    let e = array.length - 1
+    while (true) {
+        if (e - b < 0) return undefined
+        const mid = b + (e - b >> 1)
+        const sign = cmp(value)(array[mid])
+        switch(sign) {
+            case -1: {
+                 e = mid - 1
+                 break
+            }
+            case 0: { return value }
+            case 1: {
+                 b = mid + 1
+                 break
+            }
+        }
+    }
+}
+
 module.exports = {
     /** @readonly */
     merge,
     /** @readonly */
-    genericMerge
+    genericMerge,
+    /** @readonly */
+    find
 }

package/types/sorted_list/test.f.cjs

@@ -29,5 +29,23 @@ module.exports = {
             const len = length(result)
             if (len != n) { throw result }
         }
+    ],
+    find: [
+        () => {
+            const result = _.find(unsafeCmp)(0)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (result !== 0) { throw result }
+        },
+        () => {
+            const result = _.find(unsafeCmp)(3)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (result !== undefined) { throw result }
+        },
+        () => {
+            const result = _.find(unsafeCmp)(77)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (result !== undefined) { throw result }
+        },
+        () => {
+            const result = _.find(unsafeCmp)(80)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (result !== 80) { throw result }
+        }
     ]
 }

package/types/sorted_set/module.f.cjs

@@ -1,9 +1,7 @@
 const compare = require("../function/compare/module.f.cjs")
 const { toArray } = require("../list/module.f.cjs")
 const sortedList = require("../sorted_list/module.f.cjs")
-const { merge, genericMerge } = sortedList
-const list = require("../list/module.f.cjs")
-const option = require("../option/module.f.cjs")
+const { merge, genericMerge, find } = sortedList
 
 /**
  * @template T
@@ -34,9 +32,14 @@ const intersectReduce = cmp => state => a => b => {
 
 const intersectTail = () => () => undefined
 
+/** @type {<T>(cmp: Cmp<T>) => (value: T) => (set: SortedSet<T>) => boolean} */
+const has = cmp => value => set => find(cmp)(value)(set) === value
+
 module.exports = {
     /** @readonly */
     union,
     /** @readonly */
-    intersect
+    intersect,
+    /** @readonly */
+    has
 }

package/types/sorted_set/test.f.cjs

@@ -40,5 +40,23 @@ module.exports = {
             const result = stringify(toArray(_.intersect(unsafeCmp)([1, 2, 3])([])))
             if (result !== '[]') { throw result }
         }
+    ],
+    has: [
+        () => {
+            const result = _.has(unsafeCmp)(0)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (!result) { throw result }
+        },
+        () => {
+            const result = _.has(unsafeCmp)(3)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (result) { throw result }
+        },
+        () => {
+            const result = _.has(unsafeCmp)(77)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (result) { throw result }
+        },
+        () => {
+            const result = _.has(unsafeCmp)(80)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
+            if (!result) { throw result }
+        }
     ]
 }