functionalscript 0.0.285 → 0.0.286

package/package.json

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

package/types/array/index.js

@@ -54,6 +54,18 @@ const seq = require('../list')
 
 /** @typedef {0|1|2|3|4} Index5 */
 
+/**
+ * @template T
+ * @typedef {T extends Array1<infer _> ? Index1 :
+ *  T extends Array2<infer _> ? Index2 :
+ *  T extends Array3<infer _> ? Index3 :
+ *  T extends Array4<infer _> ? Index4 :
+ *  T extends Array5<infer _> ? Index5 :
+ *  T extends readonly (infer _)[] ? number :
+ *  never
+ * } KeyOf
+ */
+
 /** @type {<T>(_: readonly T[]) => readonly T[]} */
 const uncheckTail = a => a.slice(1)
 

package/types/btree/find/index.js

@@ -1,7 +1,7 @@
 const _ = require('..')
-const { todo } = require('../../../dev')
 const list = require('../../list')
 const cmp = require('../../function/compare')
+const array = require('../../array')
 
 /**
  * @template T
@@ -56,7 +56,10 @@ const child = item => {
 
 /**
  * @template T
- * @typedef {readonly[First<T>, Path<T>]} Result<T>
+ * @typedef {{
+ *  readonly first: First<T>,
+ *  readonly tail: Path<T>
+ * }} Result<T>
  */
 
 /** @type {<T>(c: cmp.Compare<T>) => (node: _.Node<T>) => Result<T>} */
@@ -66,23 +69,28 @@ const find = c => {
     /** @typedef {typeof c extends cmp.Compare<infer T> ? T : never} T */
     /** @type {(prior: Path<T>) => (node: _.Node<T>) => Result<T>} */
     const f = tail => node => {
-        /** @type {(first: PathItem<T>) => Result<T>} */
-        const append = first => f({ first, tail })(child(first))
+        /** @type {(index: array.KeyOf<typeof node>) => Result<T>} */
+        const append = index => {
+            const first = /** @type {PathItem<T>} */([index, node])
+            return f({ first, tail })(child(first))
+        }
+        /** @type {(index: array.KeyOf<typeof node>) => Result<T>} */
+        const done = index => ({ first: /** @type {First<T>} */([index, node]), tail })
         switch (node.length) {
-            case 1: { return [[i3(node[0]), node], tail] }
-            case 2: { return [[i5(node), node], tail] }
+            case 1: { return done(i3(node[0])) }
+            case 2: { return done(i5(node)) }
             case 3: {
                 const i = i3(node[1])
                 switch (i) {
-                    case 0: case 2: { return append([i, node]) }
-                    case 1: { return [[i, node], tail] }
+                    case 0: case 2: { return append(i) }
+                    case 1: { return done(i) }
                 }
             }
             case 5: {
                 const i = i5([node[1], node[3]])
                 switch (i) {
-                    case 0: case 2: case 4: { return append([i, node]) }
-                    case 1: case 3: { return [[i, node], tail]}
+                    case 0: case 2: case 4: { return append(i) }
+                    case 1: case 3: { return done(i) }
                 }
             }
         }

package/types/btree/find/test.js

@@ -7,9 +7,6 @@ const { stringCmp } = require('../../function/compare')
 
 const jsonStr = json.stringify(sort)
 
-// /** @type {(sequence: list.List<json.Unknown>) => string} */
-// const arrayStr = sequence => jsonStr(list.toArray(sequence))
-
 /** @type {(node: btree.Node<string>) => (value: string) => btree.Node<string>} */
 const set = node => value => {
     const result = btree.setVisitor(stringCmp(value))(node)(() => value)
@@ -20,7 +17,7 @@ const set = node => value => {
 }
 
 /** @type {(r: _.Result<json.Unknown>) => string} */
-const str = ([r, path]) => jsonStr([r[0], list.toArray(list.map(x => x[0])(path))])
+const str = r => jsonStr(list.toArray(list.map(x => x[0])(r)))
 
 /** @type {(i: string) => (m: btree.Node<string>) => string} */
 const find = i => m => str(_.find(stringCmp(i))(m))
@@ -37,86 +34,86 @@ const find = i => m => str(_.find(stringCmp(i))(m))
     //
     {
         const r = find("0")(_map)
-        if (r !== '[0,[0,0]]') { throw r }
+        if (r !== '[0,0,0]') { throw r }
     }
     {
         const r = find("1")(_map)
-        if (r !== '[1,[0,0]]') { throw r }
+        if (r !== '[1,0,0]') { throw r }
     }
     {
         const r = find("10")(_map)
-        if (r !== '[2,[0,0]]') { throw r }
+        if (r !== '[2,0,0]') { throw r }
     }
     {
         const r = find("100")(_map)
-        if (r !== '[3,[0,0]]') { throw r }
+        if (r !== '[3,0,0]') { throw r }
     }
     {
         const r = find("12")(_map)
-        if (r !== '[4,[0,0]]') { throw r }
+        if (r !== '[4,0,0]') { throw r }
     }
     {
         const r = find("16")(_map)
-        if (r !== '[1,[0]]') { throw r }
+        if (r !== '[1,0]') { throw r }
     }
     {
         const r = find("17")(_map)
-        if (r !== '[0,[2,0]]') { throw r }
+        if (r !== '[0,2,0]') { throw r }
     }
     {
         const r = find("25")(_map)
-        if (r !== '[1,[2,0]]') { throw r }
+        if (r !== '[1,2,0]') { throw r }
     }
     {
         const r = find("26")(_map)
-        if (r !== '[2,[2,0]]') { throw r }
+        if (r !== '[2,2,0]') { throw r }
     }
     {
         const r = find("36")(_map)
-        if (r !== '[3,[2,0]]') { throw r }
+        if (r !== '[3,2,0]') { throw r }
     }
     {
         const r = find("37")(_map)
-        if (r !== '[4,[2,0]]') { throw r }
+        if (r !== '[4,2,0]') { throw r }
     }
     {
         const r = find("4")(_map)
-        if (r !== '[1,[]]') { throw r }
+        if (r !== '[1]') { throw r }
     }
     {
         const r = find("41")(_map)
-        if (r !== '[0,[0,2]]') { throw r }
+        if (r !== '[0,0,2]') { throw r }
     }
     {
         const r = find("49")(_map)
-        if (r !== '[1,[0,2]]') { throw r }
+        if (r !== '[1,0,2]') { throw r }
     }
     {
         const r = find("5")(_map)
-        if (r !== '[2,[0,2]]') { throw r }
+        if (r !== '[2,0,2]') { throw r }
     }
     {
         const r = find("64")(_map)
-        if (r !== '[1,[2]]') { throw r }
+        if (r !== '[1,2]') { throw r }
     }
     {
         const r = find("65")(_map)
-        if (r !== '[0,[2,2]]') { throw r }
+        if (r !== '[0,2,2]') { throw r }
     }
     {
         const r = find("81")(_map)
-        if (r !== '[1,[2,2]]') { throw r }
+        if (r !== '[1,2,2]') { throw r }
     }
     {
         const r = find("85")(_map)
-        if (r !== '[2,[2,2]]') { throw r }
+        if (r !== '[2,2,2]') { throw r }
     }
     {
         const r = find("9")(_map)
-        if (r !== '[3,[2,2]]') { throw r }
+        if (r !== '[3,2,2]') { throw r }
     }
     {
         const r = find("91")(_map)
-        if (r !== '[4,[2,2]]') { throw r }
+        if (r !== '[4,2,2]') { throw r }
     }
 }