Auto-generated commit

Author: stdlib-bot

CHANGELOG.md

@@ -150,6 +150,7 @@
 
 ### Bug Fixes
 
+-   [`8cdfd62`](https://github.com/stdlib-js/stdlib/commit/8cdfd621717a7a41428526107a42364a921b07ae) - ensure proper cache invalidation
 -   [`f53879d`](https://github.com/stdlib-js/stdlib/commit/f53879de98a2f80792d3d97c7748fd7425800aac) - ensure support for outer accessor arrays
 -   [`5741019`](https://github.com/stdlib-js/stdlib/commit/57410198f53879784c97784af6bbe0b482b235ae) - ensure accessor support for provided fields
 -   [`2a0ea7f`](https://github.com/stdlib-js/stdlib/commit/2a0ea7feb22806685fef9eac8a32d7012dab7adc) - use correct package names in package.json
@@ -241,6 +242,7 @@ A total of 32 issues were closed in this release:
 
 <details>
 
+-   [`8cdfd62`](https://github.com/stdlib-js/stdlib/commit/8cdfd621717a7a41428526107a42364a921b07ae) - **fix:** ensure proper cache invalidation _(by Athan Reines)_
 -   [`d5a7391`](https://github.com/stdlib-js/stdlib/commit/d5a73912f19ca4825ce2f361fa4a37d193030ee3) - **feat:** add `rekey` to namespace _(by Athan Reines)_
 -   [`74dc3c3`](https://github.com/stdlib-js/stdlib/commit/74dc3c37f9b0c66051ba2ab143035cb3a4460970) - **feat:** add `array/base/rekey` _(by Athan Reines)_
 -   [`25a75d7`](https://github.com/stdlib-js/stdlib/commit/25a75d7ca2026a01c949a10d04a3a668b40e2e13) - **feat:** add `groupValuesOnKey` to namespace _(by Athan Reines)_

base/nested2views/lib/main.js

@@ -23,6 +23,7 @@
 // MODULES //
 
 var setNonEnumerableReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
+var setNonEnumerable = require( '@stdlib/utils/define-nonenumerable-property' );
 var setReadWriteAccessor = require( '@stdlib/utils/define-read-write-accessor' );
 var resolveGetter = require( './../../../base/resolve-getter' );
 var accessors = require( './../../../base/accessors' );
@@ -99,13 +100,15 @@ function nested2views( arr, fields ) {
 	* @private
 	* @constructor
 	* @param {Collection} arr - nested array
+	* @param {NonNegativeInteger} i - element index
 	* @returns {Datum} datum instance
 	*/
-	function Datum( arr ) {
+	function Datum( arr, i ) {
 		var acc = accessors( arr ).accessors;
-		setNonEnumerableReadOnly( this, '_arr', arr );
-		setNonEnumerableReadOnly( this, '_get', acc[ 0 ] );
-		setNonEnumerableReadOnly( this, '_set', acc[ 1 ] );
+		setNonEnumerable( this, '_arr', arr );
+		setNonEnumerable( this, '_get', acc[ 0 ] );
+		setNonEnumerable( this, '_set', acc[ 1 ] );
+		setNonEnumerableReadOnly( this, '_i', i );
 		return this;
 	}
 
@@ -114,16 +117,37 @@ function nested2views( arr, fields ) {
 		setReadWriteAccessor( Datum.prototype, keys[ i ], getValue( i ), setValue( i ) ); // eslint-disable-line max-len
 	}
 
+	// Define a method for ensuring that cached references are up-to-date:
+	setNonEnumerableReadOnly( Datum.prototype, '_updateCache', updateCache );
+
 	// Ensure that the returned array correctly serializes to JSON:
 	setNonEnumerableReadOnly( Datum.prototype, 'toJSON', toJSON );
 
 	// Create a list of composite views...
 	out = [];
 	for ( i = 0; i < M; i++ ) {
-		out.push( new Datum( oget( arr, i ) ) );
+		out.push( new Datum( oget( arr, i ), i ) );
 	}
 	return out;
 
+	/**
+	* Updates cached references, if necessary.
+	*
+	* @private
+	*/
+	function updateCache() {
+		var acc;
+		var ref;
+
+		ref = oget( arr, this._i );
+		if ( ref !== this._arr ) {
+			acc = accessors( ref ).accessors;
+			this._arr = ref;
+			this._get = acc[ 0 ];
+			this._set = acc[ 1 ];
+		}
+	}
+
 	/**
 	* Returns an accessor for returning the value associated with a field.
 	*
@@ -141,6 +165,7 @@ function nested2views( arr, fields ) {
 		* @returns {*} result
 		*/
 		function get() {
+			this._updateCache();
 			return this._get( this._arr, idx );
 		}
 	}
@@ -162,6 +187,7 @@ function nested2views( arr, fields ) {
 		* @param {*} value - value to set
 		*/
 		function set( value ) {
+			this._updateCache();
 			this._set( this._arr, idx, value );
 		}
 	}

base/nested2views/test/test.js

@@ -227,3 +227,65 @@ tape( 'the function returns views on the input arrays (accessors)', function tes
 
 	t.end();
 });
+
+tape( 'the function supports outer array mutation (indexed)', function test( t ) {
+	var actual;
+	var fields;
+	var tmp;
+	var x;
+
+	fields = [ 'x', 'y' ];
+
+	x = [ [ 1, 2 ], [ 3, 4 ] ];
+
+	actual = nested2views( x, fields );
+
+	t.strictEqual( actual[ 0 ].x, 1, 'returns expected value' );
+	t.strictEqual( actual[ 0 ].y, 2, 'returns expected value' );
+
+	t.strictEqual( actual[ 1 ].x, 3, 'returns expected value' );
+	t.strictEqual( actual[ 1 ].y, 4, 'returns expected value' );
+
+	tmp = x[ 0 ];
+	x[ 0 ] = x[ 1 ];
+	x[ 1 ] = tmp;
+
+	t.strictEqual( actual[ 0 ].x, 3, 'returns expected value' );
+	t.strictEqual( actual[ 0 ].y, 4, 'returns expected value' );
+
+	t.strictEqual( actual[ 1 ].x, 1, 'returns expected value' );
+	t.strictEqual( actual[ 1 ].y, 2, 'returns expected value' );
+
+	t.end();
+});
+
+tape( 'the function supports outer array mutation (accessors)', function test( t ) {
+	var actual;
+	var fields;
+	var tmp;
+	var x;
+
+	fields = [ 'x', 'y' ];
+
+	x = [ [ 1, 2 ], [ 3, 4 ] ];
+
+	actual = nested2views( toAccessorArray( x ), fields );
+
+	t.strictEqual( actual[ 0 ].x, 1, 'returns expected value' );
+	t.strictEqual( actual[ 0 ].y, 2, 'returns expected value' );
+
+	t.strictEqual( actual[ 1 ].x, 3, 'returns expected value' );
+	t.strictEqual( actual[ 1 ].y, 4, 'returns expected value' );
+
+	tmp = x[ 0 ];
+	x[ 0 ] = x[ 1 ];
+	x[ 1 ] = tmp;
+
+	t.strictEqual( actual[ 0 ].x, 3, 'returns expected value' );
+	t.strictEqual( actual[ 0 ].y, 4, 'returns expected value' );
+
+	t.strictEqual( actual[ 1 ].x, 1, 'returns expected value' );
+	t.strictEqual( actual[ 1 ].y, 2, 'returns expected value' );
+
+	t.end();
+});