@onehat/data 1.22.3 → 1.22.5

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/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.22.3",
+	"version": "1.22.5",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -37,8 +37,8 @@
 	"homepage": "https://github.com/OneHatRepo/data#readme",
 	"dependencies": {
 		"@onehat/events": "^1.6.6",
-		"async-wait-until": "^2.0.12",
 		"accounting-js": "^1.1.1",
+		"async-wait-until": "^2.0.12",
 		"axios": "^1.6.2",
 		"chrono-node": "^2.7.3",
 		"he": "^1.2.0",
@@ -57,20 +57,18 @@
 		"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/Property/Property.js

@@ -1,6 +1,7 @@
 /** @module Property */
 
 import EventEmitter from '@onehat/events';
+import Formatters from '../Util/Formatters.js';
 import _ from 'lodash';
 
 /**
@@ -137,6 +138,12 @@ export default class Property extends EventEmitter {
 		 */
 		defaultValue: null,
 
+		/**
+		 * @member {string} formatter - The name of the formatter to use for this property
+		 * @private
+		 */
+		formatter: null,
+
 	};
 
 	/**
@@ -278,6 +285,9 @@ export default class Property extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this.getDisplayValue is no longer valid. Property has been destroyed.');
 		}
+		if (this.formatter) {
+			return Formatters[this.formatter](this.parsedValue);
+		}
 		return this.parsedValue;
 	}
 
@@ -428,6 +438,17 @@ export default class Property extends EventEmitter {
 		return value;
 	}
 
+	/**
+	 * Sets the formatter for this Property.
+	 * @param {*} formatter 
+	 */
+	setFormatter(formatter) {
+		if (this.isDestroyed) {
+			throw Error('this.setFormatter is no longer valid. Property has been destroyed.');
+		}
+		this.formatter = formatter;
+	}
+
 
 
 

package/src/Repository/Tree.js

@@ -186,26 +186,31 @@ class TreeRepository extends OneBuildRepository {
 					this.throwError(message);
 					return;
 				}
+
 				
 				// Set the current entities
-				const oThis = this;
-				const children = _.map(root, (data) => {
-					const entity = Repository._createEntity(oThis.schema, data, this, true);
-					oThis._relayEntityEvents(entity);
-					return entity;
+				const children = [];
+				_.each(root, (data) => {
+					if (data.id === treeNode.id) {
+						// This is the node we're loading, so update it directly
+						treeNode.loadOriginalData(data);
+						return null;
+					}
+					const entity = Repository._createEntity(this.schema, data, this, true);
+					this._relayEntityEvents(entity);
+					children.push(entity);
 				});
-
-				this.entities = this.entities.concat(children);
-
-				this.assembleTreeNodes();
-				
-				this._setPaginationVars();
+				if (children.length) {
+					this.entities = this.entities.concat(children);
+					this.assembleTreeNodes();
+					this._setPaginationVars();
+				}
 
 				this.rehash();
 				// this.emit('changeData', this.entities);
 				this.emit('load', this);
 
-				return children;
+				return treeNode;
 			})
 			.finally(() => {
 				this.markLoading(false);