@onehat/data 1.21.19 → 1.21.21

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

@@ -0,0 +1,105 @@
+import PropertyTypes from '../../../src/Property/index.js';
+import _ from 'lodash';
+
+describe('MixedProperty', function() {
+
+	beforeEach(function() {
+		const
+			definition = {
+				type: 'mixed',
+				types: [
+					'int',
+					'string',
+				],
+			},
+			Property = PropertyTypes[definition.type];
+		this.property = new Property(definition);
+	});
+
+	it('className', function() {
+		const className = this.property.getClassName();
+		expect(className).to.be.eq('Mixed');
+	});
+
+	it('events are handled properly', function() {
+		this.property.on('change', (property, oldValue, newValue) => {
+			if (property.getCurrentType() === 'int') {
+				expect(oldValue).to.be.eq(null);
+				expect(newValue).to.be.eq(42);
+			} else {
+				expect(oldValue).to.be.eq(null);
+				expect(newValue).to.be.eq('here');
+			}
+		});
+
+		this.property.setValue(42);
+		this.property.setValue('here');
+	});
+
+	describe('direct methods', function() {
+
+		it('getCurrentType', function() {
+			const currentType = this.property.getCurrentType();
+			expect(currentType).to.be.eq('int');
+
+			// switch type
+			this.property.setValue('Hello');
+			const newCurrentType = this.property.getCurrentType();
+			expect(newCurrentType).to.be.eq('string');
+		});
+
+		it('getInternalProperty', function() {
+			const intProperty = this.property.getInternalProperty('int');
+			expect(intProperty).to.be.not.undefined;
+			expect(intProperty.constructor.type).to.be.eq('int');
+
+			// switch type
+			this.property.setValue('Hello');
+			const stringProperty = this.property.getInternalProperty('string');
+			expect(stringProperty).to.be.not.undefined;
+			expect(stringProperty.constructor.type).to.be.eq('string');
+		});
+
+		it('destroy', function() {
+			this.property.destroy();
+			expect(this.property.internalProperties).to.be.empty;
+		});
+
+	});
+
+	it('passes methods to currentProperty', function() {
+		
+		this.property.setValue(42);
+		expect(this.property.getSubmitValue()).to.be.eq(42);
+		expect(this.property.getCurrentType()).to.be.eq('int');
+
+		this.property.setValue('here');
+		expect(this.property.getSubmitValue()).to.be.eq('here');
+		expect(this.property.getCurrentType()).to.be.eq('string');
+
+	});
+
+	it('passes configs to internal properties', function() {
+		const
+			definition = {
+				type: 'mixed',
+				types: [
+					{
+						type: 'date',
+						readFormat: 'YYYY-MM-DD',
+						displayFormat: 'YYYY',
+						submitFormat: 'YYYY-MM',
+					},
+					'string',
+				],
+			},
+			Property = PropertyTypes[definition.type],
+			property = new Property(definition);
+		
+		property.setValue('2025-10-17');
+		expect(property.getSubmitValue()).to.be.eq('2025-10');
+		expect(property.getDisplayValue()).to.be.eq('2025');
+		expect(property.getCurrentType()).to.be.eq('date');
+	});
+
+});

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

@@ -44,6 +44,7 @@ describe('Property', function() {
 					title: null,
 					tooltip: null,
 					viewerType: null,
+					formatter: null,
 				};
 			// console.log(defaults);
 			// console.log(expected);
@@ -81,9 +82,14 @@ describe('Property', function() {
 	
 		it('getDisplayValue & displayValue', function() {
 			this.property.setValue('12');
-			const value = this.property.getDisplayValue();
+			let value = this.property.getDisplayValue();
 			expect(value).to.be.eq(12);
 			expect(value).to.be.eq(this.property.displayValue);
+
+			this.property.setFormatter('FormatInt');
+			this.property.setValue('12345');
+			value = this.property.getDisplayValue();
+			expect(value).to.be.eq('12,345');
 		});
 	
 		it('hasMapping', function() {

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

@@ -38,6 +38,21 @@ describe('OneBuildRepository', function() {
 			expect(r._params.test).to.be.eq(1);
 		});
 
+		it('getBaseParamConditions', function() {
+			const
+				r = this.repository,
+				newConditions = {
+					'conditions[Model.model]': 'test1',
+					'conditions[Model.modelid]': 'test2',
+				};
+
+			r.setBaseParams(newConditions);
+
+			const conditions = r.getBaseParamConditions();
+
+			expect(conditions).to.eql(newConditions);
+		});
+
 		it('hasParam', function() {
 			const r = this.repository;
 			r.setParam('test', 1);

package/cypress/support/e2e.js

@@ -1,2 +1,3 @@
 // https://on.cypress.io/configuration
 import './commands.js';
+import 'cypress-localstorage-commands';

package/cypress/support/index.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

package/cypress.config.js

@@ -1,16 +1,17 @@
 import { defineConfig } from "cypress";
 import webpackPreprocessor from "@cypress/webpack-preprocessor";
+import localstoragePlugin from 'cypress-localstorage-commands/plugin.js';
 
 export default defineConfig({
 	e2e: {
 		experimentalRunAllSpecs: true,
 		chromeWebSecurity: false,
-		setupNodeEvents(on) {
+		setupNodeEvents(on, config) {
 			const options = webpackPreprocessor.defaultOptions;
 			if (!options.module) {
 				options.module = {
 					rules: [],
-				}
+				};
 			}
 			if (!options.module.rules) {
 				options.module.rules = [];
@@ -18,24 +19,25 @@ export default defineConfig({
 			options.module.rules.push({
 				test: /\.(js|jsx|mjs)$/,
 				exclude: [/node_modules\/(?!(@onehat)\/).*/],
-				use: [{
-					loader: 'babel-loader',
-					options: {
-						cacheDirectory: false,
-						presets: [
-							'@babel/preset-env'
-						],
-						plugins: [
-							'@babel/plugin-transform-class-properties',
-							'@babel/plugin-transform-runtime'
-						],
-						sourceType: 'unambiguous',
+				use: [
+					{
+						loader: 'babel-loader',
+						options: {
+							cacheDirectory: false,
+							presets: ['@babel/preset-env'],
+							plugins: [
+								'@babel/plugin-transform-class-properties',
+								'@babel/plugin-transform-runtime',
+							],
+							sourceType: 'unambiguous',
+						},
 					},
-				}],
-
+				],
 			});
 
 			on('file:preprocessor', webpackPreprocessor(options));
+
+			localstoragePlugin(on, config);
 		},
 	}
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.21.19",
+	"version": "1.21.21",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -37,39 +37,38 @@
 	"homepage": "https://github.com/OneHatRepo/data#readme",
 	"dependencies": {
 		"@onehat/events": "^1.6.6",
-		"async-wait-until": "^2.0.12",
-		"accounting-js": "^1.1.1",
-		"axios": "^1.6.2",
-		"chrono-node": "^2.7.3",
+		"accounting-js": "^2.0.3",
+		"async-wait-until": "^2.0.31",
+		"axios": "^1.13.0",
+		"chrono-node": "^2.9.0",
 		"he": "^1.2.0",
-		"js-base64": "^3.7.5",
+		"js-base64": "^3.7.8",
 		"lodash": "^4.17.21",
-		"moment": "^2.29.4",
+		"moment": "^2.30.1",
 		"natsort": "^2.0.3",
 		"numeral": "^2.0.6",
 		"object-hash": "^3.0.0",
-		"qs": "^6.11.2",
+		"qs": "^6.14.0",
 		"relative-time-parser": "^1.0.15",
 		"uuid": "^9.0.1"
 	},
 	"peerDependencies": {
-		"fast-xml-parser": "^4.4.1"
+		"fast-xml-parser": "^4.4.1",
+		"store2": "^2.14.3"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.22.1",
-		"@babel/node": "^7.22.1",
-		"@babel/plugin-transform-class-properties": "^7.22.3",
-		"@babel/plugin-transform-runtime": "^7.22.4",
-		"@babel/preset-env": "^7.22.4",
-		"@babel/register": "^7.21.0",
-		"@babel/runtime": "^7.22.3",
+		"@babel/core": "^7.24.5",
+		"@babel/plugin-transform-class-properties": "^7.24.1",
+		"@babel/plugin-transform-export-namespace-from": "^7.24.1",
+		"@babel/plugin-transform-runtime": "^7.24.3",
+		"@babel/preset-env": "^7.24.5",
+		"@babel/runtime": "^7.24.5",
 		"@cypress/webpack-preprocessor": "^5.17.1",
-		"babel-loader": "^9.1.2",
-		"cypress": "12.15.0",
+		"cypress": "^13.15.2",
+		"cypress-localstorage-commands": "^2.2.7",
 		"ink-docstrap": "^1.3.2",
 		"joi": "^17.9.2",
 		"jsdoc": "^4.0.2",
-		"webpack": "^5.85.0",
 		"yup": "^1.2.0"
 	}
 }

package/src/Entity/Entity.js

@@ -113,17 +113,7 @@ class Entity extends EventEmitter {
 		/**
 		 * @member {boolean} isTree - Whether this Entity is a TreeNode
 		 */
-		this.isTree = schema.model.isTree || false;
-
-		if (this.isTree && !schema.model.parentIdProperty) {
-			throw new Error('parentIdProperty cannot be empty for a TreeNode');
-		}
-		if (this.isTree && this.repository?.isClosureTable && !schema.model.depthProperty) {
-			throw new Error('depthProperty cannot be empty for a Closure Table TreeNode');
-		}
-		if (this.isTree && !schema.model.hasChildrenProperty) {
-			throw new Error('hasChildrenProperty cannot be empty for a TreeNode');
-		}
+		this.isTree = schema.repository.type === 'tree' || false;
 
 		/**
 		 * @member {TreeNode} parent - The parent TreeNode for this TreeNode
@@ -346,7 +336,16 @@ class Entity extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this._createProperties is no longer valid. Entity has been destroyed.');
 		}
-		const propertyDefinitions = this.schema.model.properties;
+		let propertyDefinitions = this.schema.model.properties;
+		if (this.isTree) {
+			const treePropertyDefinitions = [
+				// defaults
+				{ name: 'parentId', mapping: 'parentId', type: 'int', isEditingDisabled: true, isFilteringDisabled: true, },
+				{ name: 'hasChildren', mapping: 'hasChildren', type: 'bool', isEditingDisabled: true, isFilteringDisabled: true, },
+				{ name: 'depth', mapping: 'depth', type: 'int', isEditingDisabled: true, isFilteringDisabled: true, },
+			];
+			propertyDefinitions = _.unionBy(propertyDefinitions, treePropertyDefinitions, 'name'); // propertyDefinitions will override treePropertyDefinitions
+		}
 		let properties = {};
 		_.each(propertyDefinitions, (definition) => {
 			if (!definition.name) {
@@ -1625,16 +1624,16 @@ class Entity extends EventEmitter {
 	/**
 	 * Loads the children of this TreeNode from repository.
 	 */
-	loadChildren = async (depth) => {
+	loadChildren = async (depth = 1) => {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			throw Error('this.loadChildren is no longer valid. TreeNode has been destroyed.');
 		}
-		if (!this.repository?.loadChildNodes) {
-			throw Error('repository.loadChildNodes is not defined.');	
+		if (!this.repository?.loadNode) {
+			throw Error('repository.loadNode is not defined.');	
 		}
 
-		const children = await this.repository.loadChildNodes(this, depth);
+		const children = await this.repository.loadNode(this, depth);
 		this.areChildrenLoaded = true;
 		return children;
 	}
@@ -1642,8 +1641,8 @@ class Entity extends EventEmitter {
 	/**
 	 * Alias for loadChildren
 	 */
-	reloadChildren = () => { // alias
-		return this.loadChildren();
+	reloadChildren = (depth = 1) => { // alias
+		return this.loadChildren(depth);
 	}
 
 	/**
@@ -1768,6 +1767,18 @@ class Entity extends EventEmitter {
 		return parentIds.reverse().join('/');
 	}
 
+	/**
+	 * Gets the model that this entity uses
+	 * @return {string} model
+	 */
+	getModel = () => {
+		if (this.isTree && this.nodeType) {
+			// Trees can have entities of different models
+			return this.nodeType;
+		}
+		return this.repository.getModel();
+	}
+
 	/**
 	 * Moves this TreeNode to another parentId.
 	 */
@@ -1777,7 +1788,7 @@ class Entity extends EventEmitter {
 			throw Error('this.moveTreeNode is no longer valid. TreeNode has been destroyed.');
 		}
 		if (!this.repository?.moveTreeNode) {
-			throw Error('repository.moveTreeNode is not defined.');	
+			throw Error('repository.moveTreeNode is not defined.');
 		}
 
 		return this.repository.moveTreeNode(this, newParentId);
@@ -1789,7 +1800,7 @@ class Entity extends EventEmitter {
 	 */
 	ensureTree = () => {
 		if (!this.isTree) {
-			this.throwError('This Entity is not a tree!');
+			throw Error('This Entity is not a tree!');
 			return false;
 		}
 		return true;
@@ -1820,7 +1831,7 @@ class Entity extends EventEmitter {
 	 * @fires destroy
 	 */
 	destroy = () => {
-		if (this.isFrozen) {
+		if (this.isFrozen || this.isDestroyed) {
 			return;
 		}
 

package/src/OneHatData.js

@@ -56,10 +56,10 @@ export class OneHatData extends EventEmitter {
 		this.repositories = {};
 
 		/**
-		 * @member {Object} uniqueRepositoriesMap - Object map of all unique Repositories, with signature of { mapName: id }
+		 * @member {Object} uniqueRepositoryIdsMap - Object map of all unique Repositories, with signature of { mapName: id }
 		 * @private
 		 */
-		this.uniqueRepositoriesMap = {};
+		this.uniqueRepositoryIdsMap = {};
 		
 		/**
 		 * @member {boolean} isDestroyed - Whether this object has been destroyed
@@ -495,8 +495,8 @@ export class OneHatData extends EventEmitter {
 
 	/**
 	 * Gets or creates a unique repository with the supplied schemaName and name
-	 * @param {string} schemaName - Name of Schema
 	 * @param {string} mapName - Name of unique repository (will be internally mapped to an id)
+	 * @param {string} schemaName - Name of Schema
 	 * @return {Repository} repository
 	 */
 	getOrCreateUniqueRepository = async (mapName, schemaName) => {
@@ -505,7 +505,7 @@ export class OneHatData extends EventEmitter {
 		}
 		
 		// Try to get it
-		const id = this.uniqueRepositoriesMap[mapName];
+		let id = this.uniqueRepositoryIdsMap[mapName];
 		if (id) {
 			return this.getRepositoryById(id);
 		}
@@ -517,8 +517,10 @@ export class OneHatData extends EventEmitter {
 		}
 
 		const repository = await this.createRepository(schemaName);
-		this.uniqueRepositoriesMap[mapName] = repository.id;
+		id = repository.id;
+		repository.name += '-' + id;
 		repository.isUnique = true;
+		this.uniqueRepositoryIdsMap[mapName] = repository.id;
 		return repository;
 	}
 

package/src/Property/Currency.js

@@ -1,7 +1,7 @@
 /** @module Property */
 
 import Property from './Property.js';
-import accounting from 'accounting-js';
+import * as accounting from 'accounting-js';
 import _ from 'lodash';
 
 /**

package/src/Property/Json.js

@@ -126,7 +126,7 @@ JsonProperty.className = 'Json';
 JsonProperty.type = 'json';
 
 
-// For the sake of OneBuild, create an alias of Json, that's Tag
+// For the sake of OneBuild backwards compatibility, create an alias of Json, that's Tag
 export class TagProperty extends JsonProperty {}
 TagProperty.className = 'Tag';
 TagProperty.type = 'tag';