@onehat/data 1.20.9 → 1.21.0

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

@@ -24,7 +24,7 @@ class SessionStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageGetValue = (name) => {
+	_storageGetValue(name) {
 		const result = this._store.session(name);
 		let value;
 		try {
@@ -36,18 +36,18 @@ class SessionStorageRepository extends OfflineRepository {
 		return value;
 	}
 
-	_storageSetValue = (name, value) => {
+	_storageSetValue(name, value) {
 		if (!_.isString(value)) {
 			value = JSON.stringify(value);
 		}
 		return this._store.session(name, value);
 	}
 
-	_storageDeleteValue = (name) => {
+	_storageDeleteValue(name) {
 		return this._store.session.remove(name);
 	}
 
-	clearAll = () => {
+	clearAll() {
 		return this._store.session.clearAll();
 	}
 

package/src/Integration/ReactNative/Repository/AsyncStorage.js

@@ -21,7 +21,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		_.merge(this, config);
 	}
 
-	_storageGetValue = async (name) => {
+	async _storageGetValue(name) {
 		try {
 			
 			if (this.debugMode) {
@@ -51,7 +51,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageGetMultiple = async (keys) => {
+	async _storageGetMultiple(keys) {
 		try {
 
 			if (keys.length === 0) {
@@ -115,7 +115,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageSetValue = async (name, value) => {
+	async _storageSetValue(name, value) {
 		try {
 			if (!_.isString(value)) {
 				value = JSON.stringify(value);
@@ -134,7 +134,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageSetMultiple = async (values) => {
+	async _storageSetMultiple(values) {
 		try {
 			const converted = [],
 				keys = [];
@@ -166,7 +166,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageDeleteValue = async (name) => {
+	async _storageDeleteValue(name) {
 		try {
 			if (_.isNil(name) || (_.isString(name) && name === '')) {
 				return;
@@ -186,7 +186,7 @@ class AsyncStorageRepository extends OfflineRepository {
 		}
 	}
 
-	_storageDeleteMultiple = async (keys) => {
+	async _storageDeleteMultiple(keys) {
 		try {
 			if (_.isNil(keys) || (_.isArray(keys) && !keys.length)) {
 				return;
@@ -206,12 +206,12 @@ class AsyncStorageRepository extends OfflineRepository {
 		}
 	}
 
-	clearAll = async () => {
+	async clearAll() {
 		await this.load([]);
 		await this.clearLastSync();
 	}
 
-	getAllKeys = async () => {
+	async getAllKeys() {
 		return await AsyncStorage.getAllKeys();
 	}
 

package/src/Integration/ReactNative/Repository/SecureStore.js

@@ -20,7 +20,7 @@ class SecureStoreRepository extends OfflineRepository {
 		_.merge(this, config);
 	}
 
-	_storageGetValue = async (name) => {
+	async _storageGetValue(name) {
 		try {
 			
 			if (this.debugMode) {
@@ -72,7 +72,7 @@ class SecureStoreRepository extends OfflineRepository {
 		}
 	}
 
-	_storageSetValue = async (name, value) => {
+	async _storageSetValue(name, value) {
 		try {
 			if (!_.isString(value)) {
 				value = JSON.stringify(value);
@@ -123,7 +123,7 @@ class SecureStoreRepository extends OfflineRepository {
 		}
 	}
 
-	_storageDeleteValue = async (name) => {
+	async _storageDeleteValue(name) {
 		try {
 			if (this.debugMode) {
 				console.log(this.name, 'SecureStore.delete', name);
@@ -160,7 +160,7 @@ class SecureStoreRepository extends OfflineRepository {
 		}
 	}
 
-	clearAll = async () => {
+	async clearAll() {
 		await this.load([]);
 	}
 

package/src/Property/Base64.js

@@ -11,23 +11,33 @@ import _ from 'lodash';
  */
 export default class Base64Property extends Property {
 
-	constructor(config = {}) {
-		super(...arguments);
-		const defaults = {
-			isSortable: false,
-		};		
-		_.merge(this, defaults, config);
-		this._originalConfig = config;
+	static defaults = {
+		isSortable: false,
+	};
+
+	constructor(config = {}, entity) {
+		config = _.merge({}, Base64Property.defaults, config);
+		super(config, entity);
+	}
+
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, Base64Property.defaults, defaults);
 	}
 
-	encode = (value) => {
+	encode(value) {
 		return Base64.encode(value);
 	}
 
 	/**
 	 * Decodes to UTF-8 string
 	 */
-	decode = (value) => {
+	decode(value) {
 		return Base64.decode(value);
 	}
 
@@ -35,11 +45,11 @@ export default class Base64Property extends Property {
 	 * Decodes to bytes, which is compatible with browser's built-in atob()
 	 * (Which is absent in node)
 	 */
-	atob = (value) => {
+	atob(value) {
 		return Base64.atob(value);
 	}
 
-	btoa = (value) => {
+	btoa(value) {
 		return Base64.btoa(value);
 	}
 

package/src/Property/Boolean.js

@@ -11,19 +11,27 @@ import _ from 'lodash';
  */
 export default class BooleanProperty extends Property {
 
-	constructor(config = {}) {
-		super(...arguments);
+	static defaults = {
+		submitAsInt: false,
+		defaultValue: false,
+	};
 
-		const defaults = {
-			submitAsString: false,
-			submitAsInt: false,
-			defaultValue: false,
-		};
+	constructor(config = {}, entity) {
+		config = _.merge({}, BooleanProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, BooleanProperty.defaults, defaults);
 	}
 
-	parse = (value) => {
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}
@@ -33,14 +41,14 @@ export default class BooleanProperty extends Property {
 		return Parsers.ParseBool(value);
 	}
 
-	getDisplayValue = () => {
+	getDisplayValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
 		return Formatters.FormatBoolAsYesNo(this.parsedValue);
 	}
 
-	getSubmitValue = () => {
+	getSubmitValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getSubmitValue is no longer valid. Property has been destroyed.');
 		}
@@ -53,7 +61,7 @@ export default class BooleanProperty extends Property {
 		return Parsers.ParseBool(this.parsedValue); // Use a Parser instead of a Formatter to make sure we submit it as an actual boolean primitive value
 	}
 
-	toggle = () => {
+	toggle() {
 		if (this.isDestroyed) {
 			throw Error('this.toggle is no longer valid. Property has been destroyed.');
 		}

package/src/Property/Currency.js

@@ -10,29 +10,38 @@ import _ from 'lodash';
  */
 export default class CurrencyProperty extends Property {
 	
-	constructor(config = {}) {
-		super(...arguments);
+	static defaults = {
+		displayOptions: {
+			symbol: "$",
+			format: '%s%v',
+			decimal: '.' ,
+			thousand: ',',
+			precision: 2,
+			grouping: 3,
+			stripZeros: false,
+			fallback: 0,
+		},
+		submitAsString: true, // NOTE, we want to use the accounting.toFixed() method by default
+		defaultValue: 0.00,
+		omitZeros: false, // Should we omit any .00 at the end?
+	};
 
-		const defaults = {
-			displayOptions: {
-				symbol: "$",
-				format: '%s%v',
-				decimal: '.' ,
-				thousand: ',',
-				precision: 2,
-				grouping: 3,
-				stripZeros: false,
-				fallback: 0,
-			},
-			submitAsString: true, // NOTE, we want to use the accounting.toFixed() method by default
-			defaultValue: 0.00,
-			omitZeros: false, // Should we omit any .00 at the end?
-		};
+	constructor(config = {}, entity) {
+		config = _.merge({}, CurrencyProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, CurrencyProperty.defaults, defaults);
 	}
 
-	parse = (value) => {
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}
@@ -42,7 +51,7 @@ export default class CurrencyProperty extends Property {
 		return accounting.unformat(value);
 	}
 
-	getDisplayValue = () => {
+	getDisplayValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
@@ -54,7 +63,7 @@ export default class CurrencyProperty extends Property {
 		return ret;
 	}
 
-	getSubmitValue = () => {
+	getSubmitValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getSubmitValue is no longer valid. Property has been destroyed.');
 		}

package/src/Property/Date.js

@@ -11,16 +11,25 @@ import _ from 'lodash';
  */
 export default class DateProperty extends Property {
 	
-	constructor(config = {}) {
-		super(...arguments);
+	static defaults = {
+		readFormat: 'YYYY-MM-DD',
+		displayFormat: 'MMM DD, YYYY',
+		submitFormat: 'YYYY-MM-DD',
+	};
 
-		const defaults = {
-			readFormat: 'YYYY-MM-DD',
-			displayFormat: 'MMM DD, YYYY',
-			submitFormat: 'YYYY-MM-DD',
-		};
+	constructor(config = {}, entity) {
+		config = _.merge({}, DateProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, DateProperty.defaults, defaults);
 	}
 
 	/**
@@ -41,7 +50,7 @@ export default class DateProperty extends Property {
 	 * @param {any} value
 	 * @return {moment} parsedValue
 	 */
-	parse = (value) => {
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}
@@ -61,32 +70,32 @@ export default class DateProperty extends Property {
 		return result;
 	}
 
-	getDisplayValue = () => {
+	getDisplayValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
 		return Formatters.FormatDate(this.parsedValue, this.displayFormat);
 	}
 
-	getSubmitValue = () => {
+	getSubmitValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getSubmitValue is no longer valid. Property has been destroyed.');
 		}
 		return Formatters.FormatDate(this.parsedValue, this.submitFormat);
 	}
 
-	getValueFormattedAs = (format) => {
+	getValueFormattedAs(format) {
 		if (this.isDestroyed) {
 			throw Error('this.getValueFormattedAs is no longer valid. Property has been destroyed.');
 		}
 		return Formatters.FormatDate(this.parsedValue, format);
 	}
 
-	getMoment = () => {
+	getMoment() {
 		return this.getParsedValue();
 	}
 
-	isToday = () => {
+	isToday() {
 		return this.getMoment().isSame(new Date(), 'day');
 	}
 };

package/src/Property/DateTime.js

@@ -9,18 +9,27 @@ import _ from 'lodash';
  */
 export default class DateTimeProperty extends DateProperty {
 
-	constructor(config = {}) {
-		super(...arguments);
+	static defaults = {
+		readFormat: 'YYYY-MM-DDTHH:mm:ss', // ISO 8601
+		displayFormat: 'MMM DD, YYYY - HH:mm:ss',
+		submitFormat: 'YYYY-MM-DD HH:mm:ss',
+	};
 
-		const defaults = {
-			readFormat: 'YYYY-MM-DDTHH:mm:ss', // ISO 8601
-			displayFormat: 'MMM DD, YYYY - HH:mm:ss',
-			submitFormat: 'YYYY-MM-DD HH:mm:ss',
-		};
+	constructor(config = {}, entity) {
+		config = _.merge({}, DateTimeProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, DateTimeProperty.defaults, defaults);
 	}
-	
+
 };
 
 DateTimeProperty.className = 'DateTime';

package/src/Property/File.js

@@ -8,10 +8,6 @@ import _ from 'lodash';
  * @extends Base64Property
  */
 export default class FileProperty extends Base64Property {
-	constructor(config = {}) {
-		super(...arguments);
-		_.merge(this, config);
-	}
  
 	get urlencoded() {
 		return encodeURIComponent(this.displayValue);

package/src/Property/Float.js

@@ -10,18 +10,27 @@ import _ from 'lodash';
  */
 export default class FloatProperty extends Property {
 	
-	constructor(config = {}) {
-		super(...arguments);
-
-		const defaults = {
-			precision: 2,
-			// defaultValue: 0.00,
-		};
+	static defaults = {
+		precision: 2,
+		// defaultValue: 0.00,
+	};
+
+	constructor(config = {}, entity) {
+		config = _.merge({}, FloatProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, FloatProperty.defaults, defaults);
 	}
 
-	setPrecision = (precision) => {
+	setPrecision(precision) {
 		this.precision = precision;
 		this.parsedValue = this.parse(this.rawValue);
 	}
@@ -31,7 +40,7 @@ export default class FloatProperty extends Property {
 	 * @param {any} value
 	 * @return {string} parsedValue
 	 */
-	parse = (value) => {
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}

package/src/Property/Integer.js

@@ -12,18 +12,27 @@ let lastId = 0;
  */
 export default class IntegerProperty extends Property {
 
-	constructor(config = {}) {
-		super(...arguments);
+	static defaults = {
+		// defaultValue: 0,
+		idStartsAt: 100 * 1000 * 1000 * 1000, // 100 billion
+	};
 
-		const defaults = {
-			// defaultValue: 0,
-			idStartsAt: 100 * 1000 * 1000 * 1000, // 100 billion
-		};
-		
-		_.merge(this, defaults, config);
+	constructor(config = {}, entity) {
+		config = _.merge({}, IntegerProperty.defaults, config);
+		super(config, entity);
 	}
 
-	parse = (value) => {
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, IntegerProperty.defaults, defaults);
+	}
+
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}
@@ -37,7 +46,7 @@ export default class IntegerProperty extends Property {
 	 * Generates a new id
 	 * Mainly for temporary, in-memory usage
 	 */
-	newId = () => {
+	newId() {
 		let id,
 			hasId = false;
 

package/src/Property/Json.js

@@ -26,21 +26,30 @@ import _ from 'lodash';
  */
 export default class JsonProperty extends Property {
 	
-	constructor(config = {}) {
-		super(...arguments);
-
-		const defaults = {
-			submitAsString: true,
-			isSortable: false,
-		};
+	static defaults = {
+		submitAsString: true,
+		isSortable: false,
+	};
+
+	constructor(config = {}, entity) {
+		config = _.merge({}, JsonProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, JsonProperty.defaults, defaults);
 	}
 
 	/**
 	 * Validates a JSON string
 	 */
-	isValid = (value) => {
+	isValid(value) {
 		try {
 			JSON.parse(value);
 		} catch (e) {
@@ -49,7 +58,7 @@ export default class JsonProperty extends Property {
 		return true;
 	}
 
-	parse = (value) => {
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}
@@ -71,7 +80,7 @@ export default class JsonProperty extends Property {
 		return ret;
 	}
 
-	getDisplayValue = () => {
+	getDisplayValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
@@ -88,7 +97,7 @@ export default class JsonProperty extends Property {
 		return this.parsedValue;
 	}
 
-	getSubmitValue = () => {
+	getSubmitValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getSubmitValue is no longer valid. Property has been destroyed.');
 		}
@@ -107,7 +116,7 @@ export default class JsonProperty extends Property {
 	 * Utility function - gets the JSON string in a way that is safe to display in HTML.
 	 * i.e. It enables us to show a JSON string in HTML *without its contents being interpreted as HTML*
 	 */
-	getAsHtmlSafe = () => {
+	getAsHtmlSafe() {
 		const str = JSON.stringify(this.parsedValue);
 		return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 	}

package/src/Property/Percent.js

@@ -11,7 +11,7 @@ import _ from 'lodash';
  */
 export default class PercentProperty extends PercentIntProperty {
 
-	parse = (value) => {
+	parse(value) {
 		if (this.isDestroyed) {
 			throw Error('this.parse is no longer valid. Property has been destroyed.');
 		}
@@ -29,7 +29,7 @@ export default class PercentProperty extends PercentIntProperty {
 		return parsed;
 	}
 	
-	getDisplayValue = () => {
+	getDisplayValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}

package/src/Property/PercentInt.js

@@ -10,17 +10,26 @@ import _ from 'lodash';
  */
 export default class PercentIntProperty extends FloatProperty {
 
-	constructor(config = {}) {
-		super(...arguments);
+	static defaults = {
+		omitZeros: false, // Should we omit any .00 at the end?
+	};
 
-		const defaults = {
-			omitZeros: false, // Should we omit any .00 at the end?
-		};
+	constructor(config = {}, entity) {
+		config = _.merge({}, PercentIntProperty.defaults, config);
+		super(config, entity);
+	}
 
-		_.merge(this, defaults, config);
+	/**
+	 * Returns the default configuration for this PropertyType, going up the hierarchy.
+	 * @param {Object} defaults - The default configuration to merge with
+	 * @returns {Object} The default configuration
+	 */
+	static getStaticDefaults(defaults = {}) {
+		const superDefaults = super.getStaticDefaults();
+		return _.merge({}, superDefaults, PercentIntProperty.defaults, defaults);
 	}
 	
-	getDisplayValue = () => {
+	getDisplayValue() {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}