🐛 fix: Correctly wrap measure of middle tree...

when creating trees from digits and small lists.

Fixes #73.

Author: make-github-pseudonymous-again

package.json

@@ -18,7 +18,56 @@
       "@babel/preset-env"
     ],
     "env": {
+      "test": {
+        "presets": [
+          "babel-preset-power-assert"
+        ],
+        "plugins": [
+          [
+            "transform-remove-console",
+            {
+              "exclude": [
+                "log",
+                "error",
+                "warn"
+              ]
+            }
+          ]
+        ],
+        "sourceMaps": "inline"
+      },
       "development": {
+        "presets": [
+          "babel-preset-power-assert"
+        ],
+        "plugins": [
+          [
+            "transform-remove-console",
+            {
+              "exclude": [
+                "log",
+                "error",
+                "warn"
+              ]
+            }
+          ]
+        ],
+        "sourceMaps": "inline"
+      },
+      "production": {
+        "plugins": [
+          "babel-plugin-unassert",
+          [
+            "transform-remove-console",
+            {
+              "exclude": [
+                "log",
+                "error",
+                "warn"
+              ]
+            }
+          ]
+        ],
         "sourceMaps": "inline"
       }
     }
@@ -37,6 +86,9 @@
     "@babel/register": "7.10.4",
     "argparse": "1.0.10",
     "ava": "3.9.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-plugin-unassert": "^3.0.1",
+    "babel-preset-power-assert": "^3.0.0",
     "benchmark": "2.1.4",
     "coveralls": "3.1.0",
     "esdoc": "1.1.0",
@@ -47,6 +99,7 @@
     "microtime": "3.0.0",
     "np": "6.2.5",
     "nyc": "15.1.0",
+    "power-assert": "^1.6.1",
     "regenerator-runtime": "^0.13.5",
     "xo": "0.32.1"
   },
@@ -72,7 +125,7 @@
     "url": "https://github.com/aureooms/js-fingertree"
   },
   "scripts": {
-    "build": "rm -rf lib && babel src -d lib",
+    "build": "babel --delete-dir-on-start --env-name production src -d lib",
     "cover": "nyc --reporter=lcov npm test",
     "esdoc": "esdoc",
     "prepare": "npm run build",

src/0-core/_fast/_from_digit.js

@@ -1,10 +1,16 @@
 import {One, Two, Three, Four} from '../../1-digit';
 import {Empty, Single, Deep} from '../../3-tree';
+import {cache} from '../measure';
 
 export function _from_digit(M, digit) {
 	if (digit instanceof One) return new Single(M, digit.a);
 	if (digit instanceof Two || digit instanceof Three || digit instanceof Four) {
-		return new Deep(M, digit.init(), new Empty(M), new One(digit.last()));
+		return new Deep(
+			M,
+			digit.init(),
+			new Empty(cache(M)),
+			new One(digit.last())
+		);
 	}
 
 	// Potential optimization by commenting out this section

src/0-core/_fast/_from_small_list.js

@@ -1,5 +1,6 @@
 import {Empty, Single, Deep} from '../../3-tree';
 import {One, Two} from '../../1-digit';
+import {cache} from '../measure';
 
 export function _from_small_list(M, list) {
 	switch (list.length) {
@@ -8,12 +9,17 @@ export function _from_small_list(M, list) {
 		case 1:
 			return new Single(M, list[0]);
 		case 2:
-			return new Deep(M, new One(list[0]), new Empty(M), new One(list[1]));
+			return new Deep(
+				M,
+				new One(list[0]),
+				new Empty(cache(M)),
+				new One(list[1])
+			);
 		case 3:
 			return new Deep(
 				M,
 				new Two(list[0], list[1]),
-				new Empty(M),
+				new Empty(cache(M)),
 				new One(list[2])
 			);
 		default:

src/2-node/2-Node2.js

@@ -41,7 +41,3 @@ Node2.prototype.push = function (value) {
 Node2.prototype.cons = function (value) {
 	throw new Error('trying to call cons of Node2');
 };
-
-export function node2(M, a, b) {
-	return new Node2(M.plus(M.measure(a), M.measure(b)), a, b);
-}

src/2-node/3-Node3.js

@@ -42,12 +42,3 @@ Node3.prototype.push = function (value) {
 Node3.prototype.cons = function (value) {
 	throw new Error('trying to call cons of Node3');
 };
-
-export function node3(M, a, b, c) {
-	return new Node3(
-		M.plus(M.measure(a), M.plus(M.measure(b), M.measure(c))),
-		a,
-		b,
-		c
-	);
-}

src/2-node/index.js

@@ -1,2 +1,4 @@
 export * from './2-Node2';
 export * from './3-Node3';
+export * from './node2';
+export * from './node3';

src/2-node/node2.js

@@ -0,0 +1,15 @@
+import assert from 'assert';
+
+import {CachedMeasure} from '../0-core';
+import {Node2} from './2-Node2';
+import {Node3} from './3-Node3';
+
+export function node2(M, a, b) {
+	assert(
+		!(a instanceof Node2 || a instanceof Node3) || M instanceof CachedMeasure
+	);
+	assert(
+		a instanceof Node2 || a instanceof Node3 || !(M instanceof CachedMeasure)
+	);
+	return new Node2(M.plus(M.measure(a), M.measure(b)), a, b);
+}

src/2-node/node3.js

@@ -0,0 +1,20 @@
+import assert from 'assert';
+
+import {CachedMeasure} from '../0-core';
+import {Node2} from './2-Node2';
+import {Node3} from './3-Node3';
+
+export function node3(M, a, b, c) {
+	assert(
+		!(a instanceof Node2 || a instanceof Node3) || M instanceof CachedMeasure
+	);
+	assert(
+		a instanceof Node2 || a instanceof Node3 || !(M instanceof CachedMeasure)
+	);
+	return new Node3(
+		M.plus(M.measure(a), M.plus(M.measure(b), M.measure(c))),
+		a,
+		b,
+		c
+	);
+}

src/3-tree/implementations/2-Deep.js

@@ -6,12 +6,16 @@ import {
 	_from_small_list,
 	_deepL,
 	_deepR,
+	CachedMeasure,
 	Split
 } from '../../0-core';
 import {One, Two, Four} from '../../1-digit';
-import {delay} from '../../4-lazy';
+import {delay, Lazy} from '../../4-lazy';
+
+import assert from 'assert';
 
 export function Deep(M, left, middle, right) {
+	assert(middle instanceof Lazy || middle.M instanceof CachedMeasure);
 	this.M = M;
 	this.left = left;
 	this.middle = middle;

test/src/github-issue-73.js

@@ -0,0 +1,27 @@
+import test from 'ava';
+
+import {Measures} from '@aureooms/js-measure';
+const {COUNTER} = Measures;
+
+import {map, list, chain, range, reversed} from '@aureooms/js-itertools';
+
+import {gt} from '@aureooms/js-predicate';
+
+import {empty, from} from '../../src';
+
+function set(tree, index, value) {
+	if (index < 0 || index >= tree.measure())
+		throw new Error(`wrong index '${index}'`);
+
+	const split = tree.splitTree((m) => m > index, tree.M.zero());
+
+	return split.left.push(value).concat(split.right);
+}
+
+test('github issue #73', (t) => {
+	let T = from(COUNTER, 'abcde');
+	T = set(T, 2, 'C');
+	t.deepEqual(list(T), list('abCde'));
+	T = set(T, 2, 'Z');
+	t.deepEqual(list(T), list('abZde'));
+});