@onehat/data 1.22.44 → 1.22.46

package/package.json

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

package/src/Entity/Entity.js

@@ -1537,7 +1537,7 @@ class Entity extends EventEmitter {
 	/**
 	 * Gets the "hasChildren" Property object for this TreeNode.
 	 * This is the Property whose value represents whether this TreeNode has any children.
-	 * @return {Property} parentId Property
+	 * @return {Property} hasChildren Property
 	 */
 	getHasChildrenProperty = () => {
 		this.ensureTree();
@@ -1553,7 +1553,7 @@ class Entity extends EventEmitter {
 	 * Gets the hasChildren value for this TreeNode.
 	 * It does this by getting the hasChildren property's submitValue.
 	 * It doesn't look at some value created by client on the TreeNode.
-	 * @return {any} parentId - The parentId
+	 * @return {any} hasChildren - The hasChildren value
 	 */
 	getHasChildren = () => {
 		this.ensureTree();
@@ -1570,12 +1570,54 @@ class Entity extends EventEmitter {
 
 	/**
 	 * Getter of hasChildren for this TreeNode.
-	 * @return {any} parentId - The parentId
+	 * @return {any} hasChildren - The hasChildren value
 	 */
 	get hasChildren() {
 		return this.getHasChildren();
 	}
 
+	/**
+	 * Gets the "hasChildrenOfOtherNodeTypes" Property object for this TreeNode.
+	 * This is the Property whose value represents whether this TreeNode has any children of other node types.
+	 * @return {Property} hasChildrenOfOtherNodeTypes Property
+	 */
+	getHasChildrenOfOtherNodeTypesProperty = () => {
+		this.ensureTree();
+		if (this.isDestroyed) {
+			throw Error('this.getHasChildrenOfOtherNodeTypesProperty is no longer valid. TreeNode has been destroyed.');
+		}
+
+		const hasChildrenOfOtherNodeTypesProperty = this.getSchema()?.model.hasChildrenOfOtherNodeTypesProperty;
+		return this.getProperty(hasChildrenOfOtherNodeTypesProperty);
+	}
+
+	/**
+	 * Gets the hasChildrenOfOtherNodeTypes value for this TreeNode.
+	 * It does this by getting the hasChildrenOfOtherNodeTypes property's submitValue.
+	 * It doesn't look at some value created by client on the TreeNode.
+	 * @return {any} hasChildrenOfOtherNodeTypes - The hasChildrenOfOtherNodeTypes value
+	 */
+	getHasChildrenOfOtherNodeTypes = () => {
+		this.ensureTree();
+		if (this.isDestroyed) {
+			throw Error('this.getHasChildrenOfOtherNodeTypes is no longer valid. TreeNode has been destroyed.');
+		}
+
+		if (!_.isEmpty(this.children)) {
+			return true; // In case the hasChildrenOfOtherNodeTypesProperty is stale. i.e. That property came from server, and we now have children here
+		}
+
+		return this.getHasChildrenOfOtherNodeTypesProperty()?.getSubmitValue();
+	}
+
+	/**
+	 * Getter of hasChildrenOfOtherNodeTypes for this TreeNode.
+	 * @return {any} hasChildrenOfOtherNodeTypes - The hasChildrenOfOtherNodeTypes value
+	 */
+	get hasChildrenOfOtherNodeTypes() {
+		return this.getHasChildrenOfOtherNodeTypes();
+	}
+
 	/**
 	 * Getter of parent TreeNode for this TreeNode.
 	 * @return {TreeNode} parent - The parent TreeNode

package/src/Property/Integer.js

@@ -1,6 +1,7 @@
 /** @module Property */
 
 import Property from './Property.js';
+import Formatters from '../Util/Formatters.js';
 import Parsers from '../Util/Parsers.js';
 import _ from 'lodash';
 
@@ -15,6 +16,7 @@ export default class IntegerProperty extends Property {
 	static defaults = {
 		// defaultValue: 0,
 		idStartsAt: 100 * 1000 * 1000 * 1000, // 100 billion
+		formatter: 'FormatInt',
 	};
 
 	constructor(config = {}, entity) {

package/src/Schema/Schema.js

@@ -89,6 +89,12 @@ export default class Schema extends EventEmitter {
 				 */
 				hasChildrenProperty: 'hasChildren',
 
+				/**
+				 * @member {string} hasChildrenOfOtherNodeTypesProperty - name of hasChildrenOfOtherNodeTypes Property (e.g. 'categories__has_children_of_other_node_types' for Adjacency Lists, and has_children_of_other_node_types for Closure Tables)
+				 * For trees only
+				 */
+				hasChildrenOfOtherNodeTypesProperty: 'hasChildrenOfOtherNodeTypes',
+
 				/**
 				 * @member {boolean} isAdjacencyList - Whether this tree is an Adjacency List
 				 */