Creating size property to mimic the underlying Map better & updat…

…ing tests

README.md

@@ -360,6 +360,11 @@ _Array_
 
 Array representing the order of `this.data`.
 
+**size**
+_Number_
+
+Total records in the DataStore.
+
 **total**
 _Number_
 

lib/haro.js

@@ -4,7 +4,7 @@
  * @author Jason Mulligan <jason.mulligan@avoidwork.com>
  * @copyright 2018
  * @license BSD-3-Clause
- * @version 4.0.4
+ * @version 4.1.0
  */
 "use strict";
 
@@ -339,7 +339,7 @@
 			this.patch = patch;
 			this.pattern = pattern;
 			this.source = source;
-			this.total = 0;
+			this.size = this.total = 0;
 			this.uri = "";
 			this.worker = null;
 			this.versions = new Map();
@@ -391,7 +391,7 @@
 
 		clear () {
 			this.beforeClear();
-			this.total = 0;
+			this.size = this.total = 0;
 			this.data.clear();
 			this.indexes.clear();
 			this.versions.clear();
@@ -431,6 +431,7 @@
 				delIndex(this.index, this.indexes, this.delimiter, key, og, this.pattern);
 				this.data.delete(key);
 				--this.total;
+				this.size = this.total;
 			}, async () => {
 				this.ondelete(key, batch, retry, lazyLoad);
 
@@ -663,7 +664,7 @@
 				this.data.clear();
 				this.indexes.clear();
 				each(data, datum => this.data.set(this.key ? datum[this.key] : uuid() || uuid(), datum));
-				this.total = this.data.size;
+				this.size = this.total = this.data.size;
 			} else {
 				throw new Error("Invalid type");
 			}
@@ -788,6 +789,7 @@
 
 				if (!this.data.has(key)) {
 					++this.total;
+					this.size = this.total;
 					method = "post";
 
 					if (this.versioning) {
@@ -1066,7 +1068,7 @@
 	}
 
 	factory.transform = cast;
-	factory.version = "4.0.4";
+	factory.version = "4.1.0";
 
 	// Node, AMD & window supported
 	if (typeof exports !== "undefined") {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "haro",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "Harō is a modern immutable DataStore",
   "main": "lib/haro.js",
   "scripts": {

src/haro.js

@@ -21,7 +21,7 @@
 			this.patch = patch;
 			this.pattern = pattern;
 			this.source = source;
-			this.total = 0;
+			this.size = this.total = 0;
 			this.uri = "";
 			this.worker = null;
 			this.versions = new Map();
@@ -73,7 +73,7 @@
 
 		clear () {
 			this.beforeClear();
-			this.total = 0;
+			this.size = this.total = 0;
 			this.data.clear();
 			this.indexes.clear();
 			this.versions.clear();
@@ -113,6 +113,7 @@
 				delIndex(this.index, this.indexes, this.delimiter, key, og, this.pattern);
 				this.data.delete(key);
 				--this.total;
+				this.size = this.total;
 			}, async () => {
 				this.ondelete(key, batch, retry, lazyLoad);
 
@@ -345,7 +346,7 @@
 				this.data.clear();
 				this.indexes.clear();
 				each(data, datum => this.data.set(this.key ? datum[this.key] : uuid() || uuid(), datum));
-				this.total = this.data.size;
+				this.size = this.total = this.data.size;
 			} else {
 				throw new Error("Invalid type");
 			}
@@ -470,6 +471,7 @@
 
 				if (!this.data.has(key)) {
 					++this.total;
+					this.size = this.total;
 					method = "post";
 
 					if (this.versioning) {

test/offline.js

@@ -8,8 +8,9 @@ exports.empty = {
 		done();
 	},
 	test: function (test) {
-		test.expect(2);
+		test.expect(3);
 		test.equal(this.store.total, 0, "Should be '0'");
+		test.equal(this.store.size, 0, "Should be '0'");
 		test.equal(this.store.data.size, 0, "Should be '0'");
 		test.done();
 	}
@@ -23,11 +24,13 @@ exports.create = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(4);
+		test.expect(6);
 		test.equal(this.store.total, 0, "Should be '0'");
+		test.equal(this.store.size, 0, "Should be '0'");
 		test.equal(this.store.data.size, 0, "Should be '0'");
 		this.store.set(null, data[0]).then(function () {
 			test.equal(self.store.total, 1, "Should be '1'");
+			test.equal(self.store.size, 1, "Should be '1'");
 			test.equal(self.store.data.size, 1, "Should be '1'");
 			test.done();
 		}, function () {
@@ -44,11 +47,13 @@ exports["create (batch)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(11);
+		test.expect(13);
 		test.equal(this.store.total, 0, "Should be '0'");
+		test.equal(this.store.size, 0, "Should be '0'");
 		test.equal(this.store.data.size, 0, "Should be '0'");
 		this.store.batch(data, "set").then(function () {
 			test.equal(self.store.total, 6, "Should be '6'");
+			test.equal(self.store.size, 6, "Should be '6'");
 			test.equal(self.store.data.size, 6, "Should be '6'");
 			test.equal(self.store.registry.length, 6, "Should be '6'");
 			test.equal(self.store.limit(0, 2)[1][0], self.store.get(self.store.registry[1])[0], "Should be a match");
@@ -82,11 +87,13 @@ exports["update (batch)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(14);
+		test.expect(17);
 		test.equal(this.store.total, 0, "Should be '0'");
+		test.equal(this.store.size, 0, "Should be '0'");
 		test.equal(this.store.data.size, 0, "Should be '0'");
 		this.store.batch(data, "set").then(function () {
 			test.equal(self.store.total, 6, "Should be '6'");
+			test.equal(self.store.size, 6, "Should be '6'");
 			test.equal(self.store.data.size, 6, "Should be '6'");
 			test.equal(self.store.registry.length, 6, "Should be '6'");
 
@@ -95,6 +102,7 @@ exports["update (batch)"] = {
 			throw e;
 		}).then(function () {
 			test.equal(self.store.total, 6, "Should be '6'");
+			test.equal(self.store.size, 6, "Should be '6'");
 			test.equal(self.store.data.size, 6, "Should be '6'");
 			test.equal(self.store.registry.length, 6, "Should be '6'");
 			test.equal(self.store.limit(0, 2)[1][0], self.store.get(self.store.registry[1])[0], "Should be a match");
@@ -129,11 +137,12 @@ exports["read (valid)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(4);
+		test.expect(5);
 		this.store.set(null, data[0]).then(function (arg) {
 			var record = self.store.get(arg[0]);
 
 			test.equal(self.store.total, 1, "Should be '1'");
+			test.equal(self.store.size, 1, "Should be '1'");
 			test.equal(self.store.data.size, 1, "Should be '1'");
 			test.equal(Object.keys(record[1]).length, 19, "Should be a '19'");
 			test.equal(record[1].name, "Decker Merrill", "Should be a match");
@@ -152,9 +161,10 @@ exports["read (invalid)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(3);
+		test.expect(4);
 		this.store.set(null, data[0]).then(function () {
 			test.equal(self.store.total, 1, "Should be '1'");
+			test.equal(self.store.size, 1, "Should be '1'");
 			test.equal(self.store.data.size, 1, "Should be '1'");
 			test.equal(self.store.get("abc"), undefined, "Should be 'undefined'");
 			test.done();
@@ -466,7 +476,7 @@ exports.delete = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(3);
+		test.expect(4);
 		this.store.set(null, data[0]).then(function (arg) {
 			test.equal(arg[1].name, "Decker Merrill", "Should be a match");
 
@@ -477,6 +487,7 @@ exports.delete = {
 			throw e;
 		}).then(function () {
 			test.equal(self.store.total, 0, "Should be '0'");
+			test.equal(self.store.size, 0, "Should be '0'");
 			test.equal(self.store.data.size, 0, "Should be '0'");
 			test.done();
 		}, function () {
@@ -493,7 +504,7 @@ exports["delete (batch)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(3);
+		test.expect(4);
 		this.store.batch(data, "set").then(function (arg) {
 			test.equal(arg[0][1].name, "Decker Merrill", "Should be a match");
 
@@ -504,6 +515,7 @@ exports["delete (batch)"] = {
 			throw e;
 		}).then(function () {
 			test.equal(self.store.total, 4, "Should be '4'");
+			test.equal(self.store.size, 4, "Should be '4'");
 			test.equal(self.store.data.size, 4, "Should be '4'");
 			test.done();
 		}, function () {
@@ -635,9 +647,10 @@ exports["override (records)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(3);
+		test.expect(4);
 		this.store.override(data, "records").then(function () {
 			test.equal(self.store.total, 6, "Should be a '6'");
+			test.equal(self.store.size, 6, "Should be a '6'");
 			test.equal(self.store.registry.length, 6, "Should be a '6'");
 			test.equal(self.store.data.size, 6, "Should be a '6'");
 			test.done();

test/online.js

@@ -2,6 +2,8 @@ const path = require("path"),
 	haro = require(path.join(__dirname, "..", "lib", "haro")),
 	data = require(path.join(__dirname, "data.json"));
 
+process.env.NODE_NO_WARNINGS = 1;
+
 require("tenso")({
 	security: {
 		csrf: false
@@ -11,27 +13,17 @@ require("tenso")({
 	},
 	routes: {
 		get: {
-			"/": function (req, res) {
-				res.send(["data"]);
-			},
-			"/data.*": function (req, res) {
-				res.send(data);
-			}
+			"/": ["data"],
+			"/data(/)?.*": (req, res) => res.send(data)
 		},
 		put: {
-			"/data.*": function (req, res) {
-				res.send(req.body);
-			}
+			"/data(/)?.*": (req, res) => res.send(req.body)
 		},
 		post: {
-			"/data.*": function (req, res) {
-				res.send(req.body, 201);
-			}
+			"/data(/)?.*": (req, res) => res.send(req.body, 201)
 		},
 		"delete": {
-			"/data.*": function (req, res) {
-				res.send({success: true});
-			}
+			"/data(/)?.*": (req, res) => res.send({success: true})
 		}
 	}
 });
@@ -44,12 +36,14 @@ exports.setUri = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(5);
+		test.expect(7);
 		test.equal(this.store.total, 0, "Should be '0'");
+		test.equal(this.store.size, 0, "Should be '0'");
 		test.equal(this.store.data.size, 0, "Should be '0'");
 		this.store.setUri("http://localhost:8000/data?page_size=10").then(function (args) {
 			test.equal(args.length, 6, "Should be '6'");
 			test.equal(self.store.total, 6, "Should be '6'");
+			test.equal(self.store.size, 6, "Should be '6'");
 			test.equal(self.store.data.size, 6, "Should be '6'");
 			test.done();
 		}, function () {
@@ -90,15 +84,17 @@ exports["delete (wired)"] = {
 	test: function (test) {
 		var self = this;
 
-		test.expect(3);
+		test.expect(5);
 		this.store.setUri("http://localhost:8000/data/?page_size=10").then(function (args) {
 			test.equal(self.store.total, 6, "Should be a match");
+			test.equal(self.store.size, 6, "Should be a match");
 
 			return self.store.del(args[0][0]);
 		}, function (e) {
 			throw e;
 		}).then(function () {
 			test.equal(self.store.total, self.store.data.size, "Should be a match");
+			test.equal(self.store.size, self.store.data.size, "Should be a match");
 			test.equal(self.store.data.size, 5, "Should be a match");
 			test.done();
 		}, function () {