Merge pull request #26 from BasicPrimitives/valuereader

Fixed performance bug in the value reader

Author: BasicPrimitives

changelog.md

@@ -1,3 +1,5 @@
+#### Version 5.6.2
+* Fixed performance bug in the value reader.
 #### Version 5.6.0
 * Added `placeAssistantsAboveChildren` and `placeAdvisersAboveChildren` properties to `primitives.orgdiagram.Config` & `primitives.orgdiagram.ItemConfig`.
 * Added `levelOffset` property to `primitives.orgdiagram.ItemConfig`.

min/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basicprimitives",
-  "version": "5.6.0",
+  "version": "5.6.2",
   "description": "Basic Primitives Diagrams for JavaScript - data visualization components library that implements organizational chart and multi-parent dependency diagrams, contains implementations of JavaScript Controls and PDF rendering plugins.",
   "main": "primitives.latest.js",
   "scripts": {

min/primitives.latest.js

@@ -1,5 +1,5 @@
 /**
- * @preserve Basic Primitives Diagrams v5.6.0
+ * @preserve Basic Primitives Diagrams v5.6.2
  * Copyright (c) 2013 - 2019 Basic Primitives Inc
  *
  * Non-commercial - Free
@@ -35,7 +35,7 @@
 
 var primitives = {
   common: {
-    version: "5.6.0"
+    version: "5.6.2"
   },
   orgdiagram: {},
   famdiagram: {},
@@ -7017,38 +7017,39 @@ primitives.common.FunctionReader.prototype.read = function (target, source, path
 
 /* /OptionsReaders/ObjectReader.js*/
 primitives.common.ObjectReader = function (dataTemplate, isNullable, defaultValue) {
-	this.dataTemplate = dataTemplate;
-	this.isNullable = isNullable;
-	this.defaultValue = defaultValue;
+  this.dataTemplate = dataTemplate;
+  this.isNullable = isNullable;
+  this.defaultValue = defaultValue;
 };
 
 primitives.common.ObjectReader.prototype.read = function (target, source, path, context) {
-	var result = null,
-		property,
-		propertyDataTemplate;
+  var result = null,
+    isTargetObject = primitives.common.isObject(target),
+    property,
+    propertyDataTemplate;
 
-	if(!source) {
-		source = this.isNullable ? null : this.defaultValue;
-	} 
+  if (!source) {
+    source = this.isNullable ? null : this.defaultValue;
+  }
 
-	if(primitives.common.isObject(source)) {
-		result = {};
+  if (primitives.common.isObject(source)) {
+    result = {};
 
-		for (property in this.dataTemplate) {
-			if (this.dataTemplate.hasOwnProperty(property)) {
-				propertyDataTemplate = this.dataTemplate[property];
+    for (property in this.dataTemplate) {
+      if (this.dataTemplate.hasOwnProperty(property)) {
+        propertyDataTemplate = this.dataTemplate[property];
 
-				result[property] = propertyDataTemplate.read(primitives.common.isObject(target) ? target[property] : null, source[property], path + "-" + property, context);
-			}
-		}
-	} else {
-		result = source;
+        result[property] = propertyDataTemplate.read(isTargetObject ? target[property] : null, source[property], path + "-" + property, context);
+      }
+    }
+  } else {
+    result = source;
 
-		if (target !== source) {
-			context.isChanged = true;
-		}
-	}
-	return result;
+    if (target !== source) {
+      context.isChanged = true;
+    }
+  }
+  return result;
 };
 
 /* /OptionsReaders/ValueReader.js*/
@@ -7067,21 +7068,24 @@ primitives.common.ValueReader = function (acceptedTypes, isNullable, defaultValu
 };
 
 primitives.common.ValueReader.prototype.stringify = function (target) {
-  var processed = [];
-  var result = JSON.stringify(target, function (key, value) {
-    if(key[0] === '_') {
-      return null;
-    }
-    if (value !== null && typeof value == "object") {
-      if (processed.indexOf(value) == -1) {
-        processed.push(value);
-        return value;
+  if (this.hash["object"] == true) {
+    var processed = [];
+    var result = JSON.stringify(target, function (key, value) {
+      if (key[0] === '_') {
+        return null;
       }
-      return null;
-    }
-    return value;
-  });
-  return result;
+      if (value !== null && typeof value == "object") {
+        if (processed.indexOf(value) == -1) {
+          processed.push(value);
+          return value;
+        }
+        return null;
+      }
+      return value;
+    });
+    return result;
+  }
+  return target;
 }
 
 primitives.common.ValueReader.prototype.read = function (target, source, path, context) {
@@ -17237,71 +17241,71 @@ primitives.orgdiagram.ItemsSizesOptionTask = function (optionsTask, defaultConfi
 
 /* /Controls/OrgDiagram/Tasks/Options/LabelsOptionTask.js*/
 primitives.orgdiagram.LabelsOptionTask = function (optionsTask, defaultConfig, defaultItemConfig) {
-	var _data = {},
-		_hash = {};
+  var _data = {},
+    _hash = {};
 
-	var _dataTemplate = new primitives.common.ObjectReader({
-			showLabels: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultConfig.showLabels),
-			labelOffset: new primitives.common.ValueReader(["number"], false, defaultConfig.labelOffset),
-			labelFontSize: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontSize),
-			labelFontFamily: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontFamily),
-			labelFontStyle: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontStyle),
-			labelFontWeight: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontWeight),
-			labelColor: new primitives.common.ValueReader(["string"], false, defaultConfig.labelColor),
-			labelSize: new primitives.common.ObjectReader({
-				width: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.width),
-				height: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.height)
-			}, false, defaultConfig.labelSize),
-			labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultConfig.labelOrientation),
-			labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultConfig.labelPlacement),
-			arrowsDirection: new primitives.common.EnumerationReader(primitives.common.GroupByType, false, defaultConfig.arrowsDirection),
-			items: new primitives.common.ArrayReader(
-				new primitives.common.ObjectReader({
-					id: new primitives.common.ValueReader(["string", "number"], true),
-					label: new primitives.common.ValueReader(["string", "number"], true),
-					showLabel: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultItemConfig.showLabel),
-					labelSize: new primitives.common.ObjectReader({
-						width: new primitives.common.ValueReader(["number"], false, 0),
-						height: new primitives.common.ValueReader(["number"], false, 0)
-					}, true),
-					labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultItemConfig.labelOrientation),
-					labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultItemConfig.labelPlacement)
-				}),
-				true,
-				"id"
-				)
-		});
+  var _dataTemplate = new primitives.common.ObjectReader({
+    showLabels: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultConfig.showLabels),
+    labelOffset: new primitives.common.ValueReader(["number"], false, defaultConfig.labelOffset),
+    labelFontSize: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontSize),
+    labelFontFamily: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontFamily),
+    labelFontStyle: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontStyle),
+    labelFontWeight: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontWeight),
+    labelColor: new primitives.common.ValueReader(["string"], false, defaultConfig.labelColor),
+    labelSize: new primitives.common.ObjectReader({
+      width: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.width),
+      height: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.height)
+    }, false, defaultConfig.labelSize),
+    labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultConfig.labelOrientation),
+    labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultConfig.labelPlacement),
+    arrowsDirection: new primitives.common.EnumerationReader(primitives.common.GroupByType, false, defaultConfig.arrowsDirection),
+    items: new primitives.common.ArrayReader(
+      new primitives.common.ObjectReader({
+        id: new primitives.common.ValueReader(["string", "number"], true),
+        label: new primitives.common.ValueReader(["string", "number", "object"], true),
+        showLabel: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultItemConfig.showLabel),
+        labelSize: new primitives.common.ObjectReader({
+          width: new primitives.common.ValueReader(["number"], false, 0),
+          height: new primitives.common.ValueReader(["number"], false, 0)
+        }, true),
+        labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultItemConfig.labelOrientation),
+        labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultItemConfig.labelPlacement)
+      }),
+      true,
+      "id"
+    )
+  });
 
-	function process() {
-		var context = {
-			isChanged: false,
-			hash: _hash
-		};
+  function process() {
+    var context = {
+      isChanged: false,
+      hash: _hash
+    };
 
-		_data = _dataTemplate.read(_data, optionsTask.getOptions(), "options", context);
+    _data = _dataTemplate.read(_data, optionsTask.getOptions(), "options", context);
 
-		return context.isChanged;
-	}
+    return context.isChanged;
+  }
 
-	function getItemsOptions() {
-		return _hash["options-items"];
-	}
+  function getItemsOptions() {
+    return _hash["options-items"];
+  }
 
-	function getItemOptions(itemid) {
-		return _hash["options-items"][itemid];
-	}
+  function getItemOptions(itemid) {
+    return _hash["options-items"][itemid];
+  }
 
-	function getOptions() {
-		return _data;
-	}
+  function getOptions() {
+    return _data;
+  }
 
-	return {
-		process: process,
-		getItemOptions: getItemOptions,
-		getItemsOptions: getItemsOptions,
-		getOptions: getOptions,
-		description: "Checks items labels options."
-	};
+  return {
+    process: process,
+    getItemOptions: getItemOptions,
+    getItemsOptions: getItemsOptions,
+    getOptions: getOptions,
+    description: "Checks items labels options."
+  };
 };
 
 /* /Controls/OrgDiagram/Tasks/Options/LayoutOptionsTask.js*/