@onehat/data 1.22.31 → 1.22.32

package/package.json

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

package/src/Property/Mixed.js

@@ -38,21 +38,12 @@ export default class MixedProperty extends EventEmitter {
 
 		super(config, entity);
 
-		// Apply config to this instance (similar to how Property does it)
-		_.merge(this, config);
-		this._originalConfig = config;
-		this._entity = entity;
-
 		this.registerEvents([
 			'change',
 			'changeValidity',
 			'destroy',
 		]);
 
-		this.rawValue = null;
-		this.parsedValue = null;
-		this.isDestroyed = false;
-
 		this.types = config.types;
 		this.currentType = this.types[0].type || this.types[0];
 		this.internalProperties = new Map();
@@ -440,7 +431,7 @@ export default class MixedProperty extends EventEmitter {
 			defaultValue: null,
 			formatter: null,
 		};
-		
+
 		// If types are configured, use the first type's default value
 		if (defaults.types && Array.isArray(defaults.types) && defaults.types.length > 0) {
 			const
@@ -459,7 +450,7 @@ export default class MixedProperty extends EventEmitter {
 			}
 		}
 		
-		return _.merge({}, mixedPropertyDefaults, defaults);
+		return _.merge({}, defaults);
 	}
 }
 

package/src/Repository/Repository.js

@@ -1138,9 +1138,15 @@ export default class Repository extends EventEmitter {
 			entity = Repository._createEntity(this.schema, data, this, isPersisted, isDelayedSave, this.isRemotePhantomMode);
 		}
 		this._relayEntityEvents(entity);
-		if (this.isTree && data.parentId) {
-			// Trees need new node to be added as first child of parent
-			const ix = this.getIxById(data.parentId) +1;
+		if (this.isTree) {
+			let ix = 1; // default to beginning
+			if (data.previousSiblingId) {
+				// new node to be added as next sibling of previousSiblingId
+				ix = this.getIxById(data.previousSiblingId) +1;
+			} else if (data.parentId) {
+				// new node to be added as first child of parent
+				ix = this.getIxById(data.parentId) +1;
+			}
 			this.entities = [
 				...this.entities.slice(0, ix),
 				entity,

package/src/Repository/Tree.js

@@ -371,7 +371,7 @@ class TreeRepository extends OneBuildRepository {
 	getRootNodes() {
 		this.ensureTree();
 		if (this.isDestroyed) {
-			this.throwError('this.loadRootNodes is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getRootNodes is no longer valid. Repository has been destroyed.');
 			return;
 		}