functionalscript 0.0.336 → 0.0.337

package/json/tokenizer/index.js

@@ -390,10 +390,12 @@ const tokenizeEofOp = state => {
 /** @type {operator.StateScan<CharCodeOrEof, TokenizerState, list.List<JsonToken>>} */
 const tokenizeOp = state => input => input === undefined ? tokenizeEofOp(state) : tokenizeCharCodeOp(state)(input)
 
-/** @type {(input: list.List<CharCodeOrEof>) => list.List<JsonToken>} */
-const tokenize = input => list.flat(list.stateScan(tokenizeOp)({kind: 'initial'})(input))
+const initial = list.stateScan(tokenizeOp)({ kind: 'initial' })
+
+/** @type {(input: list.List<number>) => list.List<JsonToken>} */
+const tokenize = input => list.flat(initial(list.concat(/** @type {list.List<CharCodeOrEof>} */(input))([undefined])))
 
 module.exports = {
     /** @readonly */
-    tokenize,
+    tokenize
 }

package/json/tokenizer/test.js

@@ -3,23 +3,10 @@ const list = require('../../types/list/index.js')
 const json = require('../index.js')
 const { sort } = require('../../types/object/index.js')
 
-/** @type {(s: string) => list.List<tokenizer.CharCodeOrEof>} */
-const toCharacters = s =>
-{
-    /** @type {list.List<tokenizer.CharCodeOrEof>} */
-    const charCodes = list.toCharCodes(s)
-    return list.concat(charCodes)([undefined])
-}
-
 /** @type {(s: string) => readonly tokenizer.JsonToken[]} */
-const tokenizeString = s =>
-{
-    const characters = toCharacters(s)
-    return list.toArray(tokenizer.tokenize(characters))
-}
+const tokenizeString = s => list.toArray(tokenizer.tokenize(list.toCharCodes(s)))
 
-/** @type {(a: readonly tokenizer.JsonToken[]) => string} */
-const stringify = a => json.stringify(sort)(a)
+const stringify = json.stringify(sort)
 
 {
     const result = tokenizeString('')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.336",
+  "version": "0.0.337",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {