functionalscript 0.0.487 → 0.0.489

package/types/sorted_list/test.f.cjs

@@ -37,11 +37,11 @@ module.exports = {
         },
         () => {
             const result = _.find(unsafeCmp)(3)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         },
         () => {
             const result = _.find(unsafeCmp)(77)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         },
         () => {
             const result = _.find(unsafeCmp)(80)([0, 10, 20, 30, 40, 50, 60, 70, 80, 90])

package/types/sorted_set/module.f.cjs

@@ -21,17 +21,17 @@ const union = cmp => a => b => toArray(merge(cmp)(a)(b))
 /** @type {<T>(cmp: Cmp<T>) => (a: SortedSet<T>) => (b: SortedSet<T>) => SortedSet<T>} */
 const intersect = cmp => a => b => toArray(intersectMerge(cmp)(a)(b))
 
+const tailReduce = () => () => null
+
 /** @type {<T>(cmp: Cmp<T>) => (a: sortedList.SortedList<T>) => (b: sortedList.SortedList<T>) => sortedList.SortedList<T>} */
-const intersectMerge = cmp => genericMerge({ reduceOp: intersectReduce(cmp), tailReduce: intersectTail })(undefined)
+const intersectMerge = cmp => genericMerge({ reduceOp: intersectReduce(cmp), tailReduce })(null)
 
 /** @type {<T,S>(cmp: Cmp<T>) => sortedList.ReduceOp<T,S>} */
 const intersectReduce = cmp => state => a => b => {
     const sign = cmp(a)(b)
-    return [sign === 0 ? a : undefined, sign, state]
+    return [sign === 0 ? a : null, sign, state]
 }
 
-const intersectTail = () => () => undefined
-
 /** @type {<T>(cmp: Cmp<T>) => (value: T) => (set: SortedSet<T>) => boolean} */
 const has = cmp => value => set => find(cmp)(value)(set) === value
 

package/types/sorted_set/test.f.cjs

@@ -33,7 +33,6 @@ module.exports = {
     intersect: [
         () => {
             const result = stringify(toArray(_.intersect(unsafeCmp)([2, 3, 4])([1, 3, 5])))
-            // console.log(result)
             if (result !== '[3]') { throw result }
         },
         () => {

package/types/string_set/module.f.cjs

@@ -18,13 +18,13 @@ const { compose } = require('../function/module.f.cjs')
 /** @type {(value: string) => (set: StringSet) => boolean} */
 const contains = value => {
     const f = find(cmp(value))
-    return s => s !== undefined && isFound(f(s).first)
+    return s => s !== null && isFound(f(s).first)
 }
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
 const set = value => btreeSet(cmp(value))(() => value)
 
-const fromValues = fold(set)(undefined)
+const fromValues = fold(set)(null)
 
 /** @type {(value: string) => (s: StringSet) => StringSet} */
 const remove = compose(cmp)(btreeRemove)

package/types/string_set/test.f.cjs

@@ -2,12 +2,12 @@ const _ = require('./module.f.cjs')
 
 module.exports = {
     contains: () => {
-        const r = _.set('hello')(undefined)
+        const r = _.set('hello')(null)
         if (!_.contains('hello')(r)) { throw r }
         if (_.contains('hello1')(r)) { throw r }
     },
     remove: () => {
-        let r = _.set('hello')(undefined)
+        let r = _.set('hello')(null)
         r = _.set('world')(r)
         r = _.set('HELLO')(r)
         r = _.set('WORLD!')(r)
@@ -29,6 +29,6 @@ module.exports = {
         if (_.contains('HELLO')(r)) { throw r }
         if (!_.contains('WORLD!')(r)) { throw r }
         r = _.remove('WORLD!')(r)
-        if (r !== undefined) { throw r }
+        if (r !== null) { throw r }
     }
 }

package/types/option/module.f.cjs

@@ -1,17 +0,0 @@
-/**
- * @template T
- * @typedef {T|undefined} Option
- */
-
-/** @type {<T, R>(f: (value: T) => R) => (value: T|undefined) => R|undefined} */
-const map = f => value => value === undefined ? undefined : f(value)
-
-/** @type {<T, R>(f: (_: T) => R) => (none: () => R) => (_: T|undefined) => R|undefined} */
-const match = f => none => value => value === undefined ? none() : f(value)
-
-module.exports = {
-    /** @readonly */
-    map,
-    /** @readonly */
-    match,
-}