@aegis-framework/artemis 0.3.25 → 0.3.29

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aegis-framework/artemis",
-	"version": "0.3.25",
+	"version": "0.3.29",
 	"description": "Aegis Framework Javascript Library",
 	"main": "./dist/index.js",
 	"module": "./dist/artemis.js",
@@ -61,13 +61,13 @@
 		"build:main": "parcel build --target main --no-cache --public-url .",
 		"build:module": "parcel build --target module --no-cache --public-url .",
 		"build:legacy": "parcel build --target legacy --no-cache --public-url .",
-		"watch": "parcel watch ./index.js --no-cache --public-url ."
+		"watch": "parcel watch --target legacy --no-cache --public-url ."
 	},
 	"devDependencies": {
-		"eslint": "^8.5.0",
+		"eslint": "^8.6.0",
 		"jsdoc": "^3.6.5",
 		"jsdoc-to-markdown": "^7.1.0",
-		"parcel": "^2.0.1"
+		"parcel": "^2.1.1"
 	},
 	"files": [
 		"index.js",

package/src/DOM.js

@@ -748,20 +748,17 @@ export class DOM {
 	 */
 	style (properties, value) {
 		for (let i = 0; i < this.collection.length; i++) {
-			if (typeof properties === 'string' && value !== 'undefined') {
+			if (typeof properties === 'string' && typeof value !== 'undefined') {
 				this.collection[i].style[properties] = value;
-
-				return this;
-			} else if (typeof properties === 'string' && value === 'undefined') {
+			} else if (typeof properties === 'string' && typeof value === 'undefined') {
 				return this.collection[i].style[properties];
 			} else if (typeof properties === 'object') {
 				for (const property in properties) {
 					this.collection[i].style[property] = properties[property];
 				}
-
-				return this;
 			}
 		}
+		return this;
 	}
 
 	/**

package/src/SpaceAdapter/IndexedDB.js

@@ -32,9 +32,11 @@ export class IndexedDB {
 		this.name = name;
 		this.version = version;
 		this.store = store;
-		this.props = props;
+		this.props = props || {};
 		this.index = index;
 
+		this.keyPath = props.keyPath || 'id';
+
 		this.upgrades = {};
 
 		if (this.version === '') {
@@ -90,7 +92,7 @@ export class IndexedDB {
 					} else {
 						// Check what upgrade functions have been declared in their respective order
 						const availableUpgrades = Object.keys (this.upgrades).sort ();
-						
+
 						// Find the first update that needs to be applied to the database given
 						// the old version it currently has.
 						const startFrom = availableUpgrades.findIndex (u => {
@@ -138,7 +140,9 @@ export class IndexedDB {
 				const transaction = this.storage.transaction (this.store, 'readwrite').objectStore (this.store);
 				let op;
 				if (key !== null) {
-					op = transaction.put (Object.assign ({}, {id: key}, value));
+					const temp = {};
+					temp[this.keyPath] = key;
+					op = transaction.put (Object.assign ({}, temp, value));
 				} else {
 					op = transaction.add (value);
 				}
@@ -187,7 +191,14 @@ export class IndexedDB {
 				const transaction = this.storage.transaction (this.store).objectStore (this.store);
 				const op = transaction.get (key);
 
-				op.addEventListener ('success', (event) => {resolve (event.target.result);});
+				op.addEventListener ('success', (event) => {
+					const value = event.target.result;
+					if (typeof value !== 'undefined' && value !== null) {
+						resolve (value);
+					} else {
+						reject ();
+					}
+				});
 				op.addEventListener ('error', (event) => {reject (event);});
 			});
 		});
@@ -204,7 +215,16 @@ export class IndexedDB {
 				const transaction = this.storage.transaction (this.store).objectStore (this.store);
 				const op = transaction.getAll ();
 
-				op.addEventListener ('success', (event) => {resolve (event.target.result);});
+				op.addEventListener ('success', (event) => {
+					const results = {};
+					event.target.result.forEach((item) => {
+						const id = item[this.keyPath];
+						delete item[this.keyPath];
+
+						results[id] = item;
+					});
+					resolve (results);
+				});
 				op.addEventListener ('error', (event) => {reject (event);});
 			});
 		});

package/src/SpaceAdapter/RemoteStorage.js

@@ -76,9 +76,11 @@ export class RemoteStorage {
 	 */
 	set (key, value) {
 		return this.open ().then (() => {
-			return this.storage.post (this.endpoint + key, value, this.props).then ((response) => {
-				return Promise.resolve ({ key, response: response.json () });
-			});
+			return this.storage.post (this.endpoint + key, value, this.props)
+				.then ((response) =>  response.json ())
+				.then ((value) => {
+					return Promise.resolve ({ key, value });
+				});
 		});
 	}
 
@@ -93,9 +95,11 @@ export class RemoteStorage {
 	 */
 	update (key, value) {
 		return this.get (key).then ((currentValue) => {
-			return this.storage.put (this.endpoint + key, Object.assign ({}, currentValue, value), this.props).then ((response) => {
-				return Promise.resolve ({ key, response: response.json () });
-			});
+			return this.storage.put (this.endpoint + key, Object.assign ({}, currentValue, value), this.props)
+				.then ((response) =>  response.json ())
+				.then ((value) => {
+					return Promise.resolve ({ key, value });
+				});
 		});
 	}
 
@@ -198,9 +202,11 @@ export class RemoteStorage {
 	 */
 	remove (key) {
 		return this.open ().then (() => {
-			return this.storage.delete (this.endpoint + key, {}, this.props).then ((response) => {
-				return Promise.resolve (key, response.json ());
-			});
+			return this.storage.delete (this.endpoint + key, {}, this.props)
+				.then ((response) =>  response.json ())
+				.then ((value) => {
+					return Promise.resolve (key,value);
+				});
 		});
 	}