functionalscript 0.0.280 → 0.0.281

package/package.json

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

package/test.js

@@ -9,6 +9,7 @@ require('./io/commonjs/test')
 require('./commonjs/package/dependencies/test')
 require('./commonjs/package/test')
 require('./commonjs/path/test')
+require('./types/function/compare/test')
 
 /** @type {() => never} */
 const assert = () => { throw 'assert' }

package/types/btree/test.js

@@ -2,7 +2,7 @@ const btree = require('.')
 const { getVisitor, setVisitor, values } = btree
 const json = require('../../json')
 const { sort } = require('../object')
-const { cmp } = require('../function/compare') 
+const { stringCmp } = require('../function/compare')
 const list = require('../list')
 
 /** @type {(sequence: list.List<json.Unknown>) => string} */
@@ -10,7 +10,7 @@ const stringify = sequence => json.stringify(sort)(list.toArray(sequence))
 
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => {
-    const result = setVisitor(cmp(value))(node)(() => value)
+    const result = setVisitor(stringCmp(value))(node)(() => value)
     switch (result[0]) {
         case 'replace': case 'overflow': { return result[1] }
         default: { return node }
@@ -43,7 +43,7 @@ const set = node => value => {
     let _map = ['a']
     _map = set(_map)('b')
     _map = set(_map)('c')
-    const result = getVisitor(cmp('b'))(_map)
+    const result = getVisitor(stringCmp('b'))(_map)
     if (result === undefined) { throw result }
 }
 
@@ -52,7 +52,7 @@ const set = node => value => {
     let _map = ['a']
     _map = set(_map)('b')
     _map = set(_map)('c')
-    const result = getVisitor(cmp('e'))(_map)
+    const result = getVisitor(stringCmp('e'))(_map)
     if (result !== undefined) { throw result }
 }
 

package/types/function/compare/index.js

@@ -3,7 +3,7 @@
 
 /**
  * @template T
- * @typedef {import('../../array').Array2<T>} Array2 
+ * @typedef {import('../../array').Array2<T>} Array2
  */
 
 /** @typedef {-1|0|1} Sign */
@@ -22,8 +22,14 @@ const index5 = cmp => ([v0, v1]) => {
     return /** @type {Index5} */ (_0 <= 0 ? _0 + 1 : cmp(v1) + 3)
 }
 
+/** @type {<T>(a: T) => (b: T) => Sign} */
+const unsafeCmp = a => b => a < b ? -1 : a === b ? 0 : 1
+
 /** @type {(a: string) => (b: string) => Sign} */
-const cmp = a => b => a < b ? -1 : a === b ? 0 : 1
+const stringCmp = unsafeCmp
+
+/** @type {(a: number) => (b: number) => Sign} */
+const numberCmp = unsafeCmp
 
 module.exports = {
     /** @readonly */
@@ -31,5 +37,7 @@ module.exports = {
     /** @readonly */
     index5,
     /** @readonly */
-    cmp,
+    stringCmp,
+    /** @readonly */
+    numberCmp,
 }

package/types/function/compare/test.js

@@ -0,0 +1,13 @@
+const _ = require('.')
+
+{
+    const result = _.numberCmp(4)(5)
+    if (result !== -1) { throw result }
+}
+
+{
+    const result = _.stringCmp('3')('4')
+    if (result !== -1) { throw result }
+}
+
+module.exports = {}

package/types/map/index.js

@@ -2,7 +2,7 @@ const option = require("../option")
 const btree = require('../btree')
 const { getVisitor, setVisitor, values } = require("../btree")
 const compare = require("../function/compare")
-const { cmp } = require("../function/compare")
+const { stringCmp } = require("../function/compare")
 const list = require("../list")
 
 /** @typedef {compare.Sign} Sign */
@@ -33,7 +33,7 @@ const list = require("../list")
  */
 
 /** @type {(a: string) => <T>(b: Entry<T>) => Sign} */
-const keyCmp = a => ([b]) => cmp(a)(b)
+const keyCmp = a => ([b]) => stringCmp(a)(b)
 
 /** @type {(name: string) => <T>(map: Map<T>) => T|undefined} */
 const at = name => map => {