@onehat/data 1.22.16 → 1.22.18

package/package.json

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

package/src/Entity/Entity.js

@@ -115,16 +115,6 @@ class Entity extends EventEmitter {
 		 */
 		this.isTree = schema.repository.type === 'tree' || 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');
-		}
-
 		/**
 		 * @member {TreeNode} parent - The parent TreeNode for this TreeNode
 		 * @public
@@ -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) {

package/src/Schema/Schema.js

@@ -75,19 +75,19 @@ export default class Schema extends EventEmitter {
 				 * @member {string} parentIdProperty - name of parent_id Property (e.g. 'categories__parent_id' for Adjacency Lists, and parent_id for Closure Tables)
 				 * For trees only
 				 */
-				parentIdProperty: null,
+				parentIdProperty: 'parentId',
 
 				/**
 				 * @member {string} depthIdProperty - name of depth Property (e.g. 'categories__depth' for Adjacency Lists, and depth for Closure Tables)
 				 * For trees only
 				 */
-				depthProperty: null,
+				depthProperty: 'depth',
 
 				/**
 				 * @member {string} hasChildrenProperty - name of hasChildren Property (e.g. 'categories__has_children' for Adjacency Lists, and has_children for Closure Tables)
 				 * For trees only
 				 */
-				hasChildrenProperty: null,
+				hasChildrenProperty: 'hasChildren',
 
 				/**
 				 * @member {boolean} isAdjacencyList - Whether this tree is an Adjacency List