@onehat/data 1.17.0 → 1.17.3

package/cypress/{integration/Config.spec.js → e2e/Config.cy.js}

@@ -155,7 +155,7 @@ describe('Config options', function() {
 
 	});
 
-	it.only('Replace this.method with config.method', function() {
+	it('Replace this.method with config.method', function() {
 		
 		class Base {
 			constructor(config = {}) {

package/cypress/{integration/Entity.spec.js → e2e/Entity.cy.js}

@@ -471,11 +471,11 @@ describe('Entity', function() {
 		});
 
 		it('hash', function() {
-			expect(this.entity.hash).to.be.eq(4635951664292355);
+			expect(this.entity.hash).to.be.eq(5365087438356619);
 
 			// change a property & check again
 			this.entity.foo = 3;
-			expect(this.entity.hash).to.be.eq(1510366977941323);
+			expect(this.entity.hash).to.be.eq(358445507972157);
 		});
 
 	});
@@ -900,4 +900,86 @@ describe('Entity', function() {
 		});
 	});
 
+	describe('tree', function() {
+
+		// Needed for all tree tests...
+		const
+			schema = new Schema({
+				name: 'nodes',
+				model: {
+					idProperty: 'id',
+					displayProperty: 'display',
+					parentIdProperty: 'parent_id',
+					depthProperty: 'depth',
+					hasChildrenProperty: 'hasChildren',
+					isTree: true,
+					isClosureTable: true,
+					properties: [
+						{ name: 'id', type: 'int' },
+						{ name: 'display' },
+						{ name: 'parent_id', type: 'int' },
+						{ name: 'depth', type: 'int' },
+						{ name: 'hasChildren', type: 'bool' },
+					],
+				},
+			}),
+			data = {
+				id: 2,
+				display: 'Child 1',
+				parent_id: 1,
+				depth: 1,
+				hasChildren: true,
+			},
+			creatEntity = async () => {
+				const entity = new Entity(schema, data);
+				entity.initialize();
+				return entity;
+			},
+			destoryEntity = (entity) => {
+				entity.destroy();
+			};
+
+		it('magic properties', function() {
+			(async () => {
+				const entity = await creatEntity();
+
+				expect(entity.parentId).to.be.eq(1);
+				expect(entity.depth).to.be.eq(1);
+				expect(entity.hasChildren).to.be.true;
+				
+				destoryEntity(entity);
+			})();
+		});
+
+		it('parents/children', function() {
+			(async () => {
+				const entity = await creatEntity();
+				
+				const parent = this.entity;
+				entity.parent = parent;
+				expect(entity.parent).to.be.eq(parent);
+				
+				const children = [this.entity];
+				entity.children = children;
+				expect(entity.children).to.be.eq(children);
+
+				destoryEntity(entity);
+			})();
+		});
+
+		it('ensureTree', function() {
+			(async () => {
+				const entity = await creatEntity();
+				
+				expect(entity.ensureTree()).to.be.true;
+
+				entity.isTree = false;
+				expect(entity.ensureTree()).to.be.false;
+
+				destoryEntity(entity);
+			})();
+		});
+
+	});
+
 });

package/cypress/{integration/Repository/Ajax.spec.js → e2e/Repository/Ajax.cy.js}

@@ -91,7 +91,7 @@ describe('OneBuildRepository', function() {
 			r.setValuelessParam('conditions[field IS NOT NULL]');
 
 			expect(r._params.conditions.field).to.be.eq(1);
-			expect(r._params.conditions[0]).to.be.eq('field IS NOT NULL');
+			expect(r._params.conditions.undefined).to.be.eq('field IS NOT NULL');
 		});
 
 		it('clearParams', function() {

package/cypress/{integration/Repository/Memory.spec.js → e2e/Repository/Memory.cy.js}

@@ -281,7 +281,7 @@ describe('MemoryRepository', function() {
 			expect(_.size(this.repository.getRawValues())).to.be.eq(5);
 			expect(_.size(this.repository.getOriginalData())).to.be.eq(5);
 			expect(_.size(this.repository.getParsedValues())).to.be.eq(5);
-			expect(this.repository.getByIx(2).value).to.be.eq('five');
+			expect(this.repository.getByIx(4).value).to.be.eq('five');
 			expect(_.size(this.repository.getNonPersisted())).to.be.eq(0);
 			expect(_.size(this.repository.getPhantom())).to.be.eq(0);
 			expect(_.size(this.repository.getDirty())).to.be.eq(0);

package/cypress/{integration/Repository/OneBuild.spec.js → e2e/Repository/OneBuild.cy.js}

@@ -66,12 +66,21 @@ describe('OneBuildRepository', function() {
 	it('401', function() {
 		cy.wrap((async () => {
 
-			let loggedOut = false;
+			let loggedOut = false,
+				isError = false;
 			this.oneHatData.on('logout', function() { // NOTE: We are listening to the global oneHatData object, not just the individual repository
 				loggedOut = true;
 			});
-			await this.repository.load();
-			expect(loggedOut).to.be.true;
+			try {
+				await this.repository.load();
+			} catch(e) {
+				isError = true;
+			}
+			if (!isError) {
+				expect(loggedOut).to.be.true;
+			} else {
+				throw Error('404 error! Maybe set baseUrl?')
+			}
 
 		})());
 	});

package/cypress/{integration/Repository/Repository.spec.js → e2e/Repository/Repository.cy.js}

@@ -1050,7 +1050,7 @@ describe('Repository Base', function() {
 
 	});
 
-	describe('options', function() {
+	describe('misc', function() {
 		it('setOptions', function() {
 
 			this.repository.setOptions({
@@ -1061,11 +1061,232 @@ describe('Repository Base', function() {
 			
 			expect(this.repository.api.baseURL).to.be.eq('test123');
 		});
+
+		it('toString', function() {
+			const str = this.repository.toString();
+			expect(str).to.be.eq('NullRepository {bar} - foo');
+		});
 	});
 
-	it('toString', function() {
-		const str = this.repository.toString();
-		expect(str).to.be.eq('NullRepository {bar} - foo');
+	describe('tree', function() {
+
+		// Needed for all tree tests...
+		const
+			schema = new Schema({
+				name: 'nodes',
+				model: {
+					idProperty: 'id',
+					displayProperty: 'display',
+					parentIdProperty: 'parent_id',
+					depthProperty: 'depth',
+					hasChildrenProperty: 'hasChildren',
+					isTree: true,
+					isClosureTable: true,
+					properties: [
+						{ name: 'id', type: 'int', },
+						{ name: 'display', },
+						{ name: 'parent_id', type: 'int', },
+						{ name: 'depth', type: 'int', },
+						{ name: 'hasChildren', type: 'bool', },
+					],
+				},
+				repository: 'memory',
+			}),
+			Repository = RepositoryTypes.memory,
+			data = [
+				{
+					id: 1,
+					display: 'Root',
+					parent_id: null,
+					depth: 0,
+					hasChildren: true,
+					isChildrenLoaded: true,
+				},
+				{
+					id: 2,
+					display: 'Child 1',
+					parent_id: 1,
+					depth: 1,
+					hasChildren: true,
+					isChildrenLoaded: true,
+				},
+				{
+					id: 3,
+					display: 'Child 2',
+					parent_id: 1,
+					depth: 1,
+					isChildrenLoaded: true,
+				},
+				{
+					id: 4,
+					display: 'Grandchild',
+					parent_id: 2,
+					depth: 2,
+					isChildrenLoaded: true,
+				},
+			],
+			creatRepository = async () => {
+				const repository = new Repository({
+					id: 'tree',
+					schema,
+					isAutoLoad: true,
+					isAutoSave: true,
+					isPaginated: true,
+					data,
+				});
+				await repository.initialize();
+				return repository;
+			},
+			destoryRepository = (repository) => {
+				repository.destroy();
+			};
+
+		it('TreeNode (Entity) tests', function() {
+			(async () => {
+				const repository = await creatRepository();
+				repository.assembleTreeNodes();
+
+				const
+					id1 = repository.getById(1),
+					id2 = repository.getById(2),
+					id3 = repository.getById(3),
+					id4 = repository.getById(4);
+
+				// hasChildren
+				expect(id2.hasChildren).to.be.true;
+				expect(id4.hasChildren).to.be.false;
+
+				// getParent
+				expect(id2.getParent()).to.be.eq(id1);
+				expect(id1.getParent()).to.be.null;
+
+				// getChildren
+				let children = await id2.getChildren();
+				expect(children).to.be.eql([id4]);
+				
+				children = await id3.getChildren();
+				expect(children).to.be.empty;
+				
+				// hasThisChild
+				let hasThisChild = await id2.hasThisChild(id3);
+				expect(hasThisChild).to.be.false;
+				
+				hasThisChild = await id2.hasThisChild(id4);
+				expect(hasThisChild).to.be.true;
+
+				// loadChildren (& reloadChildren)
+				// this needs to be on OneBuild spec
+
+				// getPrevousSibling
+				let sibling = await id2.getPrevousSibling();
+				expect(sibling).to.be.null;
+
+				sibling = await id3.getPrevousSibling();
+				expect(sibling).to.be.eq(id2);
+
+				sibling = await id3.getNextSibling();
+				expect(sibling).to.be.null;
+
+				sibling = await id2.getNextSibling();
+				expect(sibling).to.be.eq(id3);
+
+				// getChildAt
+				let child = await id1.getChildAt(0);
+				expect(child).to.be.eq(id2);
+				
+				child = await id1.getChildAt(1);
+				expect(child).to.be.eq(id3);
+				
+				child = await id1.getChildAt(2);
+				expect(child).to.be.null;
+				
+				// getFirstChild
+				child = await id1.getFirstChild();
+				expect(child).to.be.eq(id2);
+
+				child = await id4.getFirstChild();
+				expect(child).to.be.null;
+				
+				// getLastChild
+				child = await id1.getLastChild();
+				expect(child).to.be.eq(id3);
+
+				child = await id4.getLastChild();
+				expect(child).to.be.null;
+				
+				destoryRepository(repository);
+			})();
+		});
+
+		it('getRootNodes', function() {
+			(async () => {
+				const repository = await creatRepository();
+				repository.assembleTreeNodes();
+
+				const
+					id1 = repository.getById(1);
+
+				const rootNodes = repository.getRootNodes();
+				expect(rootNodes).to.be.eql([id1]);
+				
+				destoryRepository(repository);
+			})();
+		});
+
+		it('assembleTreeNodes', function() {
+			(async () => {
+				const repository = await creatRepository();
+
+				const
+					id1 = repository.getById(1),
+					id2 = repository.getById(2),
+					id3 = repository.getById(3),
+					id4 = repository.getById(4);
+
+				// Verify no children or parents
+				expect(id2.parent).to.be.null;
+				expect(id2.children).to.be.empty;
+
+				repository.assembleTreeNodes();
+
+				// Now check that they are populated
+				expect(id2.parent).to.be.eq(id1);
+				expect(id2.children).to.be.eql([id4]);
+
+				// Re-assemble them
+				repository.assembleTreeNodes();
+
+				// check them again
+				expect(id2.parent).to.be.eq(id1);
+				expect(id2.children).to.be.eql([id4]);
+				
+				destoryRepository(repository);
+			})();
+		});
+
+		it('removeTreeNode', function() {
+			(async () => {
+				const repository = await creatRepository();
+				repository.assembleTreeNodes();
+
+				const
+					id1 = repository.getById(1),
+					id2 = repository.getById(2),
+					id3 = repository.getById(3),
+					id4 = repository.getById(4);
+
+				const before = repository.getEntities();
+				expect(before.length).to.be.eq(4);
+
+				repository.removeTreeNode(id2);
+
+				const after = repository.getEntities();
+				expect(after.length).to.be.eq(2);
+				
+				destoryRepository(repository);
+			})();
+		});
+
 	});
 
 });

package/cypress/plugins/index.js

@@ -1,32 +1,2 @@
-const webpack = require('@cypress/webpack-preprocessor'),
-	webpackOptions = {
-		mode: 'development',
-		devtool: 'cheap-module-source-map', // See https://survivejs.com/webpack/building/source-maps/
-		module: {
-			rules: [
-				{
-					test: /\.(js|jsx|mjs)$/,
-					exclude: /node_modules\/(?!(@onehat)\/).*/,
-					loader: 'babel-loader',
-					options: {
-						cacheDirectory: false,
-						presets: [
-							'@babel/preset-env'
-						],
-						plugins: [
-							'@babel/plugin-proposal-class-properties',
-							'@babel/plugin-transform-runtime'
-						],
-						sourceType: 'unambiguous',
-					},
-				}
-			]
-		}
-	};
-
-module.exports = (on, config) => {
-	on('file:preprocessor', webpack({
-		webpackOptions,
-		watchOptions: {}, 
-	}));
-};
+module.exports = (on) => {
+}

package/cypress.config.js

@@ -0,0 +1,42 @@
+import { defineConfig } from "cypress";
+import webpackPreprocessor from "@cypress/webpack-preprocessor";
+import Webpack from "webpack";
+
+export default defineConfig({
+	e2e: {
+		experimentalRunAllSpecs: true,
+		chromeWebSecurity: false,
+		setupNodeEvents(on) {
+			const options = webpackPreprocessor.defaultOptions;
+			if (!options.module) {
+				options.module = {
+					rules: [],
+				}
+			}
+			if (!options.module.rules) {
+				options.module.rules = [];
+			}
+			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',
+					},
+				}],
+
+			});
+
+			on('file:preprocessor', webpackPreprocessor(options));
+		},
+	}
+});

package/package.json

@@ -1,11 +1,12 @@
 {
 	"name": "@onehat/data",
-	"version": "1.17.0",
+	"version": "1.17.3",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
 	"scripts": {
-		"test": "npx cypress open --config-file ../cypress.json",
+		"test": "npx cypress open",
+		"test2": "DEBUG=cypress:* npx cypress open",
 		"docs": "jsdoc -c ./jsdoc.json -t ./node_modules/ink-docstrap/template -R README.md"
 	},
 	"repository": {
@@ -35,37 +36,36 @@
 	},
 	"homepage": "https://github.com/OneHatRepo/data#readme",
 	"dependencies": {
-		"@onehat/events": "^1.6.5",
+		"@onehat/events": "^1.6.6",
 		"accounting-js": "^1.1.1",
-		"axios": "^1.2.1",
-		"chrono-node": "^2.4.2",
-		"fast-xml-parser": "^4.0.12",
+		"axios": "^1.4.0",
+		"chrono-node": "^2.6.3",
+		"fast-xml-parser": "^4.2.2",
 		"he": "^1.2.0",
-		"js-base64": "^3.7.3",
+		"js-base64": "^3.7.5",
 		"lodash": "^4.17.21",
 		"moment": "^2.29.4",
 		"natsort": "^2.0.3",
 		"numeral": "^2.0.6",
-		"qs": "^6.11.0",
+		"qs": "^6.11.2",
 		"relative-time-parser": "^1.0.15",
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.20.5",
-		"@babel/node": "^7.20.5",
-		"@babel/plugin-proposal-class-properties": "^7.18.6",
+		"@babel/core": "^7.22.1",
+		"@babel/node": "^7.22.1",
+		"@babel/plugin-transform-class-properties": "^7.22.3",
 		"@babel/plugin-transform-runtime": "^7.19.6",
-		"@babel/preset-env": "^7.20.2",
-		"@babel/register": "^7.18.9",
-		"@babel/runtime": "^7.20.6",
-		"@cypress/webpack-preprocessor": "^5.16.0",
-		"babel-loader": "^8.0.2",
-		"cypress": "5.2.0",
+		"@babel/preset-env": "^7.22.4",
+		"@babel/register": "^7.21.0",
+		"@babel/runtime": "^7.22.3",
+		"@cypress/webpack-preprocessor": "^5.17.1",
+		"babel-loader": "^9.1.2",
+		"cypress": "12.13.0",
 		"ink-docstrap": "^1.3.2",
-		"jsdoc": "^4.0.0",
-		"webpack": "^5.76.0",
-		"joi": "^17.7.0",
-		"yup": "^0.32.11"
-
+		"joi": "^17.9.2",
+		"jsdoc": "^4.0.2",
+		"webpack": "^5.85.0",
+		"yup": "^1.2.0"
 	}
 }