fable 3.0.145 → 3.0.146

package/example_applications/data/Fruit-Manyfest.json

@@ -2,6 +2,12 @@
 	"Scope": "FruitsOfTheWorld",
 	"Descriptors":
 	{
+		"FruityVice[]":
+		{
+			"Name": "List of Fruits",
+			"Hash": "FruitSet",
+			"DataType": "Array"
+		},
 		"FruityVice[].name":
 		{
 			"Name": "Fruit Name",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fable",
-    "version": "3.0.145",
+    "version": "3.0.146",
     "description": "A service dependency injection, configuration and logging library.",
     "main": "source/Fable.js",
     "scripts": {
@@ -50,7 +50,7 @@
     },
     "homepage": "https://github.com/stevenvelozo/fable",
     "devDependencies": {
-        "quackage": "^1.0.33"
+        "quackage": "^1.0.36"
     },
     "dependencies": {
         "async.eachlimit": "^0.5.2",
@@ -64,7 +64,7 @@
         "fable-serviceproviderbase": "^3.0.15",
         "fable-settings": "^3.0.12",
         "fable-uuid": "^3.0.11",
-        "manyfest": "^1.0.37",
+        "manyfest": "^1.0.38",
         "simple-get": "^4.0.1"
     }
 }

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Base.js

@@ -28,6 +28,10 @@ class ExpressionParserOperationBase extends libFableServiceProviderBase
 		{
 			return 'Token.StateAddress';
 		}
+		else if ((pToken.length > 2) && (pToken[0] === '"') && (pToken[pToken.length-1] === '"'))
+		{
+			return 'Token.String';
+		}
 		else if (this.numberTest.test(pToken))
 		{
 			return 'Token.Constant';

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json

@@ -82,5 +82,9 @@
 	"round": {
 		"Name": "Round",
 		"Address": "fable.Math.roundPrecise"
+	},
+	"valuemapcount": {
+		"Name": "Histogram Count Value Map",
+		"Address": "fable.Math.valueMapCountPrecise"
 	}
 }

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ValueMarshal.js

@@ -119,6 +119,14 @@ class ExpressionParserValueMarshal extends libExpressionParserOperationBase
 					}
 				}
 			}
+			if ((pTokenizedObjects[i].Type === 'Token.String') && !tmpToken.Resolved)
+			{
+				tmpResults.ExpressionParserLog.push(`INFO: ExpressionParser.substituteValuesInTokenizedObjects found a value [${tmpToken.Token}] for the string ${tmpToken.Token} at index ${i}`);
+				if (this.LogNoisiness > 1) this.log.info(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+				tmpToken.Resolved = true;
+				// Take the quotes off the string
+				tmpToken.Value = tmpToken.Token.substring(1, tmpToken.Token.length-1);
+			}
 			if ((pTokenizedObjects[i].Type === 'Token.Constant') && !tmpToken.Resolved)
 			{
 				tmpResults.ExpressionParserLog.push(`INFO: ExpressionParser.substituteValuesInTokenizedObjects found a value [${tmpToken.Token}] for the constant ${tmpToken.Token} at index ${i}`);

package/source/services/Fable-Service-Math.js

@@ -22,6 +22,8 @@ class FableServiceMath extends libFableServiceBase
 		this.serviceType = 'Math';
 
 		this.pi = '3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679';
+
+//		this.manifest = this.fable.newManyfest();
 	}
 
 	/*
@@ -559,6 +561,27 @@ class FableServiceMath extends libFableServiceBase
 		return this.bucketSetPrecise(pValueSet);
 	}
 
+	/**
+	 * 
+	 * @param {Array<Object>} pValueSet - An array of objects
+	 * @param {string} pValueMapAddress - The address in each object to find the value to count in the histogram.  Undefined will be 'Unknown'.
+	 */
+	valueMapCountPrecise(pValueSet, pValueMapAddress)
+	{
+		let tmpHistogram = {};
+
+		this.log.info(`ValueSet is a ${typeof(pValueSet)}`);
+		this.log.info(`ValueMapAddress is ${pValueMapAddress}`);
+
+		return tmpHistogram;
+	}
+
+	valueMapSumPrecise(pValueSet, pValueMapAddress, pValueMapAmount)
+	{
+
+	}
+
+
 	/**
 	 * Sorts the histogram object in ascending order based on the frequencies of the buckets.
 	 * 

package/test/Fable_tests.js

@@ -42,8 +42,6 @@ suite
 						Expect(testFable.settings.Product).to.equal('ApplicationNameHere');
 
 						// Test package anthropology
-						Expect(testFable._PackageFableServiceProvider).to.be.an('object', 'Fable should have a _PackageFableServiceProvider object.');
-						Expect(testFable._PackageFableServiceProvider.name).equal('fable-serviceproviderbase', 'Fable _PackageFableServiceProvider.package.name should be set.');
 						Expect(testFable._Package).to.be.an('object', 'Fable should have a _Package object.');
 						Expect(testFable._Package.name).to.equal('fable', 'Fable _Package.package.name should be set.');
 					}