@onehat/data 1.20.9 → 1.21.1

package/cypress/e2e/Entity.cy.js

@@ -471,11 +471,11 @@ describe('Entity', function() {
 		});
 
 		it('hash', function() {
-			expect(this.entity.hash).to.be.eq(5365087438356619);
+			expect(this.entity.hash).to.be.eq('40aa53cc3f0cffef350ce784537eebeacf270b45');
 
 			// change a property & check again
 			this.entity.foo = 3;
-			expect(this.entity.hash).to.be.eq(358445507972157);
+			expect(this.entity.hash).to.be.eq('6b8d327b573da8133ec2ff39acc9e15efd152afb');
 		});
 
 	});

package/cypress/e2e/Property/Base64.cy.js

@@ -10,11 +10,45 @@ describe('Base64Property', function() {
 		this.property = new Property(definition);
 	});
 
-	it('className', function() {
-		const className = this.property.getClassName();
-		expect(className).to.be.eq('Base64');
+	describe('class', function() {
+
+		it('className', function() {
+			const className = this.property.getClassName();
+			expect(className).to.be.eq('Base64');
+		});
+
+		it('getStaticDefaults', function() {
+			const
+				PropertyType = PropertyTypes['base64'],
+				defaults = PropertyType.getStaticDefaults(),
+				expected = {
+					allowNull: true,
+					defaultValue: null,
+					depends: null,
+					editorType: null,
+					fieldGroup: null,
+					filterType: null,
+					isEditingDisabled: false,
+					isFilteringDisabled: false,
+					isForeignModel: false,
+					isSortable: false, // mod
+					isTempId: false,
+					isVirtual: false,
+					mapping: null,
+					name: null,
+					submitAsString: false,
+					title: null,
+					tooltip: null,
+					viewerType: null,
+				};
+			// console.log(defaults);
+			// console.log(expected);
+			expect(defaults).to.be.eql(expected);
+		});
+		
 	});
 
+
 	describe('custom functions', function() {
 
 		it('encode', function() {

package/cypress/e2e/Property/Boolean.cy.js

@@ -17,6 +17,36 @@ describe('BooleanProperty', function() {
 			expect(className).to.be.eq('Boolean');
 		});
 
+		it('getStaticDefaults', function() {
+			const
+				PropertyType = PropertyTypes['bool'],
+				defaults = PropertyType.getStaticDefaults(),
+				expected = {
+					allowNull: true,
+					defaultValue: false, // mod
+					depends: null,
+					editorType: null,
+					fieldGroup: null,
+					filterType: null,
+					isEditingDisabled: false,
+					isFilteringDisabled: false,
+					isForeignModel: false,
+					isSortable: true,
+					isTempId: false,
+					isVirtual: false,
+					mapping: null,
+					name: null,
+					submitAsString: false,
+					submitAsInt: false, // new
+					title: null,
+					tooltip: null,
+					viewerType: null,
+				};
+			// console.log(defaults);
+			// console.log(expected);
+			expect(defaults).to.be.eql(expected);
+		});
+
 		it('default value', function() {
 			const property = this.property,
 				rawValue = property.getDefaultValue();

package/cypress/e2e/Property/Currency.cy.js

@@ -17,6 +17,47 @@ describe('CurrencyProperty', function() {
 			expect(className).to.be.eq('Currency');
 		});
 
+		it('getStaticDefaults', function() {
+			const
+				PropertyType = PropertyTypes['currency'],
+				defaults = PropertyType.getStaticDefaults(),
+				expected = {
+					allowNull: true,
+					defaultValue: 0.00, // mod
+					depends: null,
+					editorType: null,
+					fieldGroup: null,
+					filterType: null,
+					isEditingDisabled: false,
+					isFilteringDisabled: false,
+					isForeignModel: false,
+					isSortable: true,
+					isTempId: false,
+					isVirtual: false,
+					mapping: null,
+					name: null,
+					submitAsString: true, // mod
+					title: null,
+					tooltip: null,
+					viewerType: null,
+
+					displayOptions: {
+						symbol: "$",
+						format: '%s%v',
+						decimal: '.' ,
+						thousand: ',',
+						precision: 2,
+						grouping: 3,
+						stripZeros: false,
+						fallback: 0,
+					},
+					omitZeros: false, // new
+				};
+			// console.log(defaults);
+			// console.log(expected);
+			expect(defaults).to.be.eql(expected);
+		});
+
 		it('default value', function() {
 			expect(this.property.submitValue).to.be.eq('0.00');
 

package/cypress/e2e/Property/Date.cy.js

@@ -15,6 +15,39 @@ describe('DateProperty', function() {
 		expect(className).to.be.eq('Date');
 	});
 
+	it('getStaticDefaults', function() {
+		const
+			PropertyType = PropertyTypes['date'],
+			defaults = PropertyType.getStaticDefaults(),
+			expected = {
+				allowNull: true,
+				defaultValue: null,
+				depends: null,
+				editorType: null,
+				fieldGroup: null,
+				filterType: null,
+				isEditingDisabled: false,
+				isFilteringDisabled: false,
+				isForeignModel: false,
+				isSortable: true,
+				isTempId: false,
+				isVirtual: false,
+				mapping: null,
+				name: null,
+				submitAsString: false,
+				title: null,
+				tooltip: null,
+				viewerType: null,
+
+				readFormat: 'YYYY-MM-DD', // new
+				displayFormat: 'MMM DD, YYYY', // new
+				submitFormat: 'YYYY-MM-DD', // new
+			};
+		// console.log(defaults);
+		// console.log(expected);
+		expect(defaults).to.be.eql(expected);
+	});
+
 	it('overrides displayFormat', function() {
 		const definition = {
 				type: 'date',

package/cypress/e2e/Property/DateTime.cy.js

@@ -15,6 +15,39 @@ describe('DateTimeProperty', function() {
 		expect(className).to.be.eq('DateTime');
 	});
 
+	it('getStaticDefaults', function() {
+		const
+			PropertyType = PropertyTypes['datetime'],
+			defaults = PropertyType.getStaticDefaults(),
+			expected = {
+				allowNull: true,
+				defaultValue: null,
+				depends: null,
+				editorType: null,
+				fieldGroup: null,
+				filterType: null,
+				isEditingDisabled: false,
+				isFilteringDisabled: false,
+				isForeignModel: false,
+				isSortable: true,
+				isTempId: false,
+				isVirtual: false,
+				mapping: null,
+				name: null,
+				submitAsString: false,
+				title: null,
+				tooltip: null,
+				viewerType: null,
+
+				readFormat: 'YYYY-MM-DDTHH:mm:ss', // new
+				displayFormat: 'MMM DD, YYYY - HH:mm:ss', // new
+				submitFormat: 'YYYY-MM-DD HH:mm:ss', // new
+			};
+		// console.log(defaults);
+		// console.log(expected);
+		expect(defaults).to.be.eql(expected);
+	});
+
 	describe('parse', function() {
 
 		it('parse YYYY-MM-DD', function() {

package/cypress/e2e/Property/Float.cy.js

@@ -18,6 +18,37 @@ describe('FloatProperty', function() {
 			expect(className).to.be.eq('Float');
 		});
 
+		it('getStaticDefaults', function() {
+			const
+				PropertyType = PropertyTypes['float'],
+				defaults = PropertyType.getStaticDefaults(),
+				expected = {
+					allowNull: true,
+					defaultValue: null,
+					depends: null,
+					editorType: null,
+					fieldGroup: null,
+					filterType: null,
+					isEditingDisabled: false,
+					isFilteringDisabled: false,
+					isForeignModel: false,
+					isSortable: true,
+					isTempId: false,
+					isVirtual: false,
+					mapping: null,
+					name: null,
+					submitAsString: false,
+					title: null,
+					tooltip: null,
+					viewerType: null,
+
+					precision: 2, // new
+				};
+			// console.log(defaults);
+			// console.log(expected);
+			expect(defaults).to.be.eql(expected);
+		});
+
 		// it('default value', function() {
 		// 	const property = this.property,
 		// 		rawValue = property.getDefaultValue();

package/cypress/e2e/Property/Integer.cy.js

@@ -19,6 +19,37 @@ describe('IntegerProperty', function() {
 			expect(className).to.be.eq('Integer');
 		});
 
+		it('getStaticDefaults', function() {
+			const
+				PropertyType = PropertyTypes['int'],
+				defaults = PropertyType.getStaticDefaults(),
+				expected = {
+					allowNull: true,
+					defaultValue: null,
+					depends: null,
+					editorType: null,
+					fieldGroup: null,
+					filterType: null,
+					isEditingDisabled: false,
+					isFilteringDisabled: false,
+					isForeignModel: false,
+					isSortable: true,
+					isTempId: false,
+					isVirtual: false,
+					mapping: null,
+					name: null,
+					submitAsString: false,
+					title: null,
+					tooltip: null,
+					viewerType: null,
+
+					idStartsAt: 100 * 1000 * 1000 * 1000, // new
+				};
+			// console.log(defaults);
+			// console.log(expected);
+			expect(defaults).to.be.eql(expected);
+		});
+
 		it('newId', function() {
 			const id1 = this.property.newId();
 			expect(id1.valueOf()).to.be.eq(this.property.idStartsAt);

package/cypress/e2e/Property/Json.cy.js

@@ -16,6 +16,35 @@ describe('JsonProperty', function() {
 		expect(className).to.be.eq('Json');
 	});
 
+	it('getStaticDefaults', function() {
+		const
+			PropertyType = PropertyTypes['json'],
+			defaults = PropertyType.getStaticDefaults(),
+			expected = {
+				allowNull: true,
+				defaultValue: null,
+				depends: null,
+				editorType: null,
+				fieldGroup: null,
+				filterType: null,
+				isEditingDisabled: false,
+				isFilteringDisabled: false,
+				isForeignModel: false,
+				isSortable: false, // mod
+				isTempId: false,
+				isVirtual: false,
+				mapping: null,
+				name: null,
+				submitAsString: true, // mod
+				title: null,
+				tooltip: null,
+				viewerType: null,
+			};
+		// console.log(defaults);
+		// console.log(expected);
+		expect(defaults).to.be.eql(expected);
+	});
+
 	describe('parse', function() {
 
 		it('good json data', function() {

package/cypress/e2e/Property/PercentInt.cy.js

@@ -16,6 +16,38 @@ describe('PercentProperty', function() {
 		expect(className).to.be.eq('PercentInt');
 	});
 
+	it('getStaticDefaults', function() {
+		const
+			PropertyType = PropertyTypes['percentint'],
+			defaults = PropertyType.getStaticDefaults(),
+			expected = {
+				allowNull: true,
+				defaultValue: null,
+				depends: null,
+				editorType: null,
+				fieldGroup: null,
+				filterType: null,
+				isEditingDisabled: false,
+				isFilteringDisabled: false,
+				isForeignModel: false,
+				isSortable: true,
+				isTempId: false,
+				isVirtual: false,
+				mapping: null,
+				name: null,
+				submitAsString: false,
+				title: null,
+				tooltip: null,
+				viewerType: null,
+
+				precision: 2, // from Float superclass
+				omitZeros: false, // new
+			};
+		// console.log(defaults);
+		// console.log(expected);
+		expect(defaults).to.be.eql(expected);
+	});
+
 	it('format', function() {
 		this.property.setValue('12.325');
 		expect(this.property.displayValue).to.be.eq('12.325%');

package/cypress/e2e/Property/Property.cy.js

@@ -21,6 +21,35 @@ describe('Property', function() {
 			expect(this.property.getClassName()).to.be.eq('Integer');
 		});
 
+		it('getStaticDefaults', function() {
+			const
+				PropertyType = PropertyTypes['auto'],
+				defaults = PropertyType.getStaticDefaults(),
+				expected = {
+					allowNull: true,
+					defaultValue: null,
+					depends: null,
+					editorType: null,
+					fieldGroup: null,
+					filterType: null,
+					isEditingDisabled: false,
+					isFilteringDisabled: false,
+					isForeignModel: false,
+					isSortable: true,
+					isTempId: false,
+					isVirtual: false,
+					mapping: null,
+					name: null,
+					submitAsString: false,
+					title: null,
+					tooltip: null,
+					viewerType: null,
+				};
+			// console.log(defaults);
+			// console.log(expected);
+			expect(defaults).to.be.eql(expected);
+		});
+
 	});
 
 	describe('getters', function() {

package/cypress/e2e/Property/Time.cy.js

@@ -15,6 +15,39 @@ describe('TimeProperty', function() {
 		expect(className).to.be.eq('Time');
 	});
 
+	it('getStaticDefaults', function() {
+		const
+			PropertyType = PropertyTypes['time'],
+			defaults = PropertyType.getStaticDefaults(),
+			expected = {
+				allowNull: true,
+				defaultValue: null,
+				depends: null,
+				editorType: null,
+				fieldGroup: null,
+				filterType: null,
+				isEditingDisabled: false,
+				isFilteringDisabled: false,
+				isForeignModel: false,
+				isSortable: true,
+				isTempId: false,
+				isVirtual: false,
+				mapping: null,
+				name: null,
+				submitAsString: false,
+				title: null,
+				tooltip: null,
+				viewerType: null,
+
+				readFormat: 'HH:mm:ss', // new
+				displayFormat: 'HH:mm:ss', // new
+				submitFormat: 'HH:mm:ss', // new
+			};
+		// console.log(defaults);
+		// console.log(expected);
+		expect(defaults).to.be.eql(expected);
+	});
+
 	describe('parse', function() {
 
 		it('parse HH:mm:ss', function() {

package/cypress/e2e/Repository/Repository.cy.js

@@ -232,25 +232,32 @@ describe('Repository Base', function() {
 		});
 
 		it('sort by non-existant field', function() {
-			let didError = false;
-			try {
-				this.repository.sort('foo');
-			} catch(err) {
-				expect(err).to.match(/Sorting property does not exist/);
-				didError = true;
-			}
-			expect(didError).to.be.true;
+			let failed = false,
+				message;
+
+			this.repository.on('error', (msg) => {
+				failed = true;
+				message = msg;
+			});
+			this.repository.sort('foo');
+
+			expect(failed).to.be.true;
+			expect(message).to.be.match(/Sorting property does not exist/);
 		});
 
 		it('sort by non-sortable field', function() {
-			let didError = false;
-			try {
-				this.repository.sort('json');
-			} catch(err) {
-				expect(err).to.match(/Sorting property type is not sortable/);
-				didError = true;
-			}		
-			expect(didError).to.be.true;
+
+			let failed = false,
+				message;
+
+			this.repository.on('error', (msg) => {
+				failed = true;
+				message = msg;
+			});
+			this.repository.sort('json');
+
+			expect(failed).to.be.true;
+			expect(message).to.be.match(/Sorting property type is not sortable/);
 		});
 
 		it('getSortField', function() {

package/cypress/e2e/Schema.cy.js

@@ -52,8 +52,8 @@ describe('Schema', function() {
 				users__last_login: null,
 			};
 
-		console.log('defaultValues', defaultValues);
-		console.log('expectedDefaultValues', expectedDefaultValues);
+		// console.log('defaultValues', defaultValues);
+		// console.log('expectedDefaultValues', expectedDefaultValues);
 
 		expect(defaultValues).to.be.eql(expectedDefaultValues);
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.20.9",
+	"version": "1.21.1",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Integration/Browser/Repository/Cookie.js

@@ -18,7 +18,7 @@ class CookieRepository extends OfflineRepository {
 		_.merge(this, config);
 	}
 
-	_storageGetValue = (name) => {
+	_storageGetValue(name) {
 		try {
 			
 			if (this.debugMode) {
@@ -69,7 +69,7 @@ class CookieRepository extends OfflineRepository {
 		}
 	}
 
-	_storageSetValue = (name, value) => {
+	_storageSetValue(name, value) {
 		try {
 			if (!_.isString(value)) {
 				value = JSON.stringify(value);
@@ -121,7 +121,7 @@ class CookieRepository extends OfflineRepository {
 		}
 	}
 
-	_storageDeleteValue = (name) => {
+	_storageDeleteValue(name) {
 		try {
 			if (this.debugMode) {
 				console.log(this.name, 'Cookie.delete', name);
@@ -157,7 +157,7 @@ class CookieRepository extends OfflineRepository {
 		}
 	}
 
-	clearAll = async () => {
+	async clearAll() {
 		await this.load([]);
 	}
 

package/src/Integration/Browser/Repository/IndexedDB.js

@@ -18,7 +18,7 @@ class IndexedDBRepository extends OfflineRepository {
 		_.merge(this, config);
 	}
 
-	_storageGetValue = (name) => {
+	_storageGetValue(name) {
 		const result = store.getItem(this._namespace(name));
 		let value;
 		try {
@@ -30,18 +30,18 @@ class IndexedDBRepository extends OfflineRepository {
 		return value;
 	}
 
-	_storageSetValue = (name, value) => {
+	_storageSetValue(name, value) {
 		if (!_.isString(value)) {
 			value = JSON.stringify(value);
 		}
 		return store.setItem(this._namespace(name), value);
 	}
 
-	_storageDeleteValue = (name) => {
+	_storageDeleteValue(name) {
 		return store.removeItem(this._namespace(name));
 	}
 
-	_clearAll = async () => {
+	async _clearAll() {
 		store.clear();
 		this._keyedEntities = {};
 		this.reload();

package/src/Integration/Browser/Repository/LocalStorage.js

@@ -22,7 +22,7 @@ class LocalStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageGetValue = (name) => {
+	_storageGetValue(name){
 		try {
 			
 			if (this.debugMode) {
@@ -53,7 +53,7 @@ class LocalStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageSetValue = (name, value) => {
+	_storageSetValue(name, value) {
 		try {
 			if (this.debugMode) {
 				console.log(this.name, 'LocalStorage.set', name, value);
@@ -72,7 +72,7 @@ class LocalStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageDeleteValue = (name) => {
+	_storageDeleteValue(name) {
 		try {
 			if (_.isNil(name) || (_.isString(name) && name === '')) {
 				return;
@@ -92,7 +92,7 @@ class LocalStorageRepository extends OfflineRepository {
 		}
 	}
 
-	clearAll = () => {
+	clearAll() {
 		return this._store.clearAll();
 	}
 

package/src/Integration/Browser/Repository/SecureLocalStorage.js

@@ -22,7 +22,7 @@ class SecureLocalStorageRepository extends LocalStorageRepository {
 		this.passphrase = config.passphrase;
 	}
 
-	_storageGetValue = (name) => {
+	_storageGetValue(name) {
 		try {
 			
 			if (this.debugMode) {
@@ -58,7 +58,7 @@ class SecureLocalStorageRepository extends LocalStorageRepository {
 		}
 	}
 
-	_storageSetValue = (name, value) => {
+	_storageSetValue(name, value) {
 		try {
 			if (this.debugMode) {
 				console.log(this.name, 'LocalStorage.set', name, value);

package/src/Integration/Browser/Repository/SecureSessionStorage.js

@@ -22,7 +22,7 @@ class SecureSessionStorageRepository extends SessionStorageRepository {
 		this.passphrase = config.passphrase;
 	}
 
-	_storageGetValue = (name) => {
+	_storageGetValue(name) {
 
 		// BEGIN MOD
 		let result = this._store.session(name);
@@ -41,7 +41,7 @@ class SecureSessionStorageRepository extends SessionStorageRepository {
 		return value;
 	}
 
-	_storageSetValue = (name, value) => {
+	_storageSetValue(name, value) {
 		if (!_.isString(value)) {
 			value = JSON.stringify(value);
 		}