functionalscript 0.0.483 → 0.0.484

package/package.json

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

package/text/utf16/module.f.cjs

@@ -2,11 +2,11 @@ const list = require('../../types/list/module.f.cjs')
 const operator = require('../../types/function/operator/module.f.cjs')
 const { contains } = require('../../types/range/module.f.cjs')
 const { fn } = require('../../types/function/module.f.cjs')
-const { map, flat, stateScan, reduce, flatMap } = list
+const { map, flat, stateScan, reduce, flatMap, empty } = list
 
-/** @typedef {u16|undefined} WordOrEof */
+/** @typedef {u16|null} WordOrEof */
 
-/** @typedef {undefined|number} Utf16State */
+/** @typedef {number|null} Utf16State */
 
 /** @typedef {number} u16 */
 
@@ -50,32 +50,32 @@ const utf16ByteToCodePointOp = state => word => {
     if (!u16(word)) {
         return [[0xffffffff], state]
     }
-    if (state === undefined) {
-        if (isBmpCodePoint(word)) { return [[word], undefined] }
+    if (state === null) {
+        if (isBmpCodePoint(word)) { return [[word], null] }
         if (isHighSurrogate(word)) { return [[], word] }
-        return [[word | errorMask], undefined]
+        return [[word | errorMask], null]
     }
     if (isLowSurrogate(word)) {
         const high = state - 0xd800
         const low = word - 0xdc00
-        return [[(high << 10) + low + 0x10000], undefined]
+        return [[(high << 10) + low + 0x10000], null]
     }
-    if (isBmpCodePoint(word)) { return [[state | errorMask, word], undefined] }
+    if (isBmpCodePoint(word)) { return [[state | errorMask, word], null] }
     if (isHighSurrogate(word)) { return [[state | errorMask], word] }
-    return [[state | errorMask, word | errorMask], undefined]
+    return [[state | errorMask, word | errorMask], null]
 }
 
 /** @type {(state: Utf16State) => readonly[list.List<i32>, Utf16State]} */
-const utf16EofToCodePointOp = state => [state === undefined ? undefined : [state | errorMask],  undefined]
+const utf16EofToCodePointOp = state => [state === null ? empty : [state | errorMask],  null]
 
 /** @type {operator.StateScan<WordOrEof, Utf16State, list.List<i32>>} */
-const utf16ByteOrEofToCodePointOp = state => input => input === undefined ? utf16EofToCodePointOp(state) : utf16ByteToCodePointOp(state)(input)
+const utf16ByteOrEofToCodePointOp = state => input => input === null ? utf16EofToCodePointOp(state) : utf16ByteToCodePointOp(state)(input)
 
 /** @type {list.List<WordOrEof>} */
-const eofList = [undefined]
+const eofList = [null]
 
 /** @type {(input: list.List<u16>) => list.List<i32>} */
-const toCodePointList = input => flat(stateScan(utf16ByteOrEofToCodePointOp)(undefined)(flat([input, eofList])))
+const toCodePointList = input => flat(stateScan(utf16ByteOrEofToCodePointOp)(null)(flat([input, eofList])))
 
 /** @type {(s: string) => list.List<u16>} */
 const stringToList = s => {