fable 3.1.4 → 3.1.5

package/example_applications/mathematical_playground/Math-Solver-Harness.js

@@ -27,27 +27,27 @@ _Fable.log.info(`Beginning Run-through for Set of Test Expressions....`);
 // An array of equations with expected values
 let _Equations = require(`./Equations.json`);
 // The application state is a plain javascript object we pass into the solver to pull variables from
-let _AppData = require(`./AppData.json`);
-// The manifest is a Manyfest which describes hashes for complex addresses in the application state object
-// For example you can't use "Student[0].Age" as a variable in the expression
-// ...but you can use "Student[0].Age" as an address in the manifest with a hash of "StudentAge"
-// ...and then reference "StudentAge" in the expression.
-let tmpManifestConfiguration = { "Scope":"None", "Descriptors":[] };
-let tmpManifest = _Fable.newManyfest(tmpManifestConfiguration);
-// Run each expression in the Equations.json file through the expression parser.
-for (let i = 0; i < _Equations.Expressions.length; i++)
-{
-	let tmpResultObject = {};
-	let tmpResultValue = _ExpressionParser.solve(_Equations.Expressions[i].Equation, _AppData, tmpResultObject, tmpManifest);
-	console.log(`Expression [${i}]: [${_Equations.Expressions[i].Equation}] ==> ${tmpResultValue}`);
-	console.log(`           Expected: ${_Equations.Expressions[i].ExpectedResult}`);
-	//_Fable.ExpressionParser.Messaging.logFunctionOutcome(tmpResultObject);
+// let _AppData = require(`./AppData.json`);
+// // The manifest is a Manyfest which describes hashes for complex addresses in the application state object
+// // For example you can't use "Student[0].Age" as a variable in the expression
+// // ...but you can use "Student[0].Age" as an address in the manifest with a hash of "StudentAge"
+// // ...and then reference "StudentAge" in the expression.
+// let tmpManifestConfiguration = { "Scope":"None", "Descriptors":[] };
+// let tmpManifest = _Fable.newManyfest(tmpManifestConfiguration);
+// // Run each expression in the Equations.json file through the expression parser.
+// for (let i = 0; i < _Equations.Expressions.length; i++)
+// {
+// 	let tmpResultObject = {};
+// 	let tmpResultValue = _ExpressionParser.solve(_Equations.Expressions[i].Equation, _AppData, tmpResultObject, tmpManifest);
+// 	console.log(`Expression [${i}]: [${_Equations.Expressions[i].Equation}] ==> ${tmpResultValue}`);
+// 	console.log(`           Expected: ${_Equations.Expressions[i].ExpectedResult}`);
+// 	//_Fable.ExpressionParser.Messaging.logFunctionOutcome(tmpResultObject);
 
-	if (tmpResultValue !== _Equations.Expressions[i].ExpectedResult)
-	{
-		console.log(`Error: Equation ${_Equations.Expressions[i].Equation} expected [${_Equations.Expressions[i].ExpectedResult}] but got [${tmpResultValue}]`);
-	}
-}
+// 	if (tmpResultValue !== _Equations.Expressions[i].ExpectedResult)
+// 	{
+// 		console.log(`Error: Equation ${_Equations.Expressions[i].Equation} expected [${_Equations.Expressions[i].ExpectedResult}] but got [${tmpResultValue}]`);
+// 	}
+// }
 
 
 /* * * * * * * * * * * * * * * * *
@@ -60,13 +60,16 @@ let _FruitData = require(`../data/Fruit-Data.json`);
 let _FruitManifestDescription = require(`../data/Fruit-Manyfest.json`);
 let _FruitManifest = _Fable.newManyfest(_FruitManifestDescription);
 
+_Fable.AppData = _FruitData;
 _Fable.log.info(`Beginning Manual Solve with Embedded Fruit Data....`);
 
-// The expression we pass into the solver is just a string
+// // The expression we pass into the solver is just a string
 let tmpExpression = 'HyperMax.HealthIndex = (SUM(Calories) / SUM(Sugar)) * MEDIAN(Fat) + (SQRT(AVG(Protein)) - (PI() + 99))';
+//tmpExpression = `aggregationhistogram("AppData.FruityVice", "family", "nutritions.calories")`;
+tmpExpression = 'Out.Match = FindFirstValueByStringIncludes("AppData.FruityVice", "name", "uria", "id")';
 _Fable.log.info(`Solving tmpExpression: [${tmpExpression}]`);
 
-// This is an object where the parser will write out the results of each phase of the compiler/parser/solver
+// // This is an object where the parser will write out the results of each phase of the compiler/parser/solver
 let tmpExpressionParseOutcome = {};
 let tmpSolverResultsObject = {};
 
@@ -82,7 +85,8 @@ _ExpressionParser.substituteValuesInTokenizedObjects(tmpExpressionParseOutcome.P
 let tmpResultValue = _ExpressionParser.solvePostfixedExpression(tmpExpressionParseOutcome.PostfixSolveList, tmpSolverResultsObject, tmpExpressionParseOutcome, _FruitManifest);
 
 // Now that we have a solved expression and the mapped-in values, show the user the solution
-//_Fable.ExpressionParser.Messaging.logFunctionOutcome(tmpExpressionParseOutcome);
+_Fable.ExpressionParser.Messaging.logFunctionOutcome(tmpExpressionParseOutcome);
+
 
 // Step 6: Look at the results.
 console.log(`Outcome object: ${JSON.stringify(tmpSolverResultsObject)}`);

package/package.json

@@ -1,70 +1,70 @@
 {
-    "name": "fable",
-    "version": "3.1.4",
-    "description": "A service dependency injection, configuration and logging library.",
-    "main": "source/Fable.js",
-    "scripts": {
-        "start": "node source/Fable.js",
-        "coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
-        "test": "./node_modules/.bin/mocha -u tdd -R spec",
-        "build": "npx quack build",
-        "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t fable-image:local",
-        "docker-dev-run": "docker run -it -d --name fable-dev -p 30001:8080 -p 38086:8086 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/fable\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" fable-image:local",
-        "docker-dev-shell": "docker exec -it fable-dev /bin/bash",
-        "tests": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec --grep"
-    },
-    "mocha": {
-        "diff": true,
-        "extension": [
-            "js"
-        ],
-        "package": "./package.json",
-        "reporter": "spec",
-        "slow": "75",
-        "timeout": "5000",
-        "ui": "tdd",
-        "watch-files": [
-            "source/**/*.js",
-            "test/**/*.js"
-        ],
-        "watch-ignore": [
-            "lib/vendor"
-        ]
-    },
-    "browser": {
-        "./source/service/Fable-Service-EnvironmentData.js": "./source/service/Fable-Service-EnvironmentData-Web.js",
-        "./source/service/Fable-Service-FilePersistence.js": "./source/service/Fable-Service-FilePersistence-Web.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/stevenvelozo/fable.git"
-    },
-    "keywords": [
-        "entity",
-        "behavior"
+  "name": "fable",
+  "version": "3.1.5",
+  "description": "A service dependency injection, configuration and logging library.",
+  "main": "source/Fable.js",
+  "scripts": {
+    "start": "node source/Fable.js",
+    "coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
+    "test": "./node_modules/.bin/mocha -u tdd -R spec",
+    "build": "npx quack build",
+    "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t fable-image:local",
+    "docker-dev-run": "docker run -it -d --name fable-dev -p 30001:8080 -p 38086:8086 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/fable\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" fable-image:local",
+    "docker-dev-shell": "docker exec -it fable-dev /bin/bash",
+    "tests": "./node_modules/mocha/bin/_mocha -u tdd --exit -R spec --grep"
+  },
+  "mocha": {
+    "diff": true,
+    "extension": [
+      "js"
     ],
-    "author": "Steven Velozo <steven@velozo.com> (http://velozo.com/)",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/stevenvelozo/fable/issues"
-    },
-    "homepage": "https://github.com/stevenvelozo/fable",
-    "devDependencies": {
-        "quackage": "^1.0.41"
-    },
-    "dependencies": {
-        "async.eachlimit": "^0.5.2",
-        "async.waterfall": "^0.5.2",
-        "big.js": "^6.2.2",
-        "cachetrax": "^1.0.4",
-        "cookie": "^0.6.0",
-        "data-arithmatic": "^1.0.7",
-        "dayjs": "^1.11.13",
-        "fable-log": "^3.0.16",
-        "fable-serviceproviderbase": "^3.0.15",
-        "fable-settings": "^3.0.12",
-        "fable-uuid": "^3.0.11",
-        "manyfest": "^1.0.38",
-        "simple-get": "^4.0.1"
-    }
+    "package": "./package.json",
+    "reporter": "spec",
+    "slow": "75",
+    "timeout": "5000",
+    "ui": "tdd",
+    "watch-files": [
+      "source/**/*.js",
+      "test/**/*.js"
+    ],
+    "watch-ignore": [
+      "lib/vendor"
+    ]
+  },
+  "browser": {
+    "./source/service/Fable-Service-EnvironmentData.js": "./source/service/Fable-Service-EnvironmentData-Web.js",
+    "./source/service/Fable-Service-FilePersistence.js": "./source/service/Fable-Service-FilePersistence-Web.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/stevenvelozo/fable.git"
+  },
+  "keywords": [
+    "entity",
+    "behavior"
+  ],
+  "author": "Steven Velozo <steven@velozo.com> (http://velozo.com/)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/stevenvelozo/fable/issues"
+  },
+  "homepage": "https://github.com/stevenvelozo/fable",
+  "devDependencies": {
+    "quackage": "^1.0.41"
+  },
+  "dependencies": {
+    "async.eachlimit": "^0.5.2",
+    "async.waterfall": "^0.5.2",
+    "big.js": "^6.2.2",
+    "cachetrax": "^1.0.4",
+    "cookie": "^0.6.0",
+    "data-arithmatic": "^1.0.7",
+    "dayjs": "^1.11.13",
+    "fable-log": "^3.0.16",
+    "fable-serviceproviderbase": "^3.0.15",
+    "fable-settings": "^3.0.12",
+    "fable-uuid": "^3.0.11",
+    "manyfest": "^1.0.38",
+    "simple-get": "^4.0.1"
+  }
 }

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

@@ -129,6 +129,16 @@
 		"Address": "fable.Utility.getInternalValueByHash"
 	},
 
+	"findfirstvaluebyexactmatch": {
+		"Name": "find + map on array of objects?",
+		"Address": "fable.Utility.findFirstValueByExactMatchInternal"
+	},
+
+	"findfirstvaluebystringincludes": {
+		"Name": "find + map on array of objects?",
+		"Address": "fable.Utility.findFirstValueByStringIncludesInternal"
+	},
+
 	"entryinset": {
 		"Name": "Entry in Set",
 		"Address": "fable.Math.entryInSet"
@@ -220,4 +230,4 @@
 		"Name": "Create Value Object by Hashes",
 		"Address": "fable.Utility.createValueObjectByHashes"
 	}
-}
+}

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

@@ -371,6 +371,31 @@ class FableServiceUtility extends libFableServiceBase
 		return undefined;
 	}
 
+	/**
+	 * Find the first value in an object that contains a specific value
+	 * @param {string} pFableAddress - The address in the fable object to pull the value from
+	 * @param {string} pValueToMatchAddress - The manyfest hash/address of the value to match
+	 * @param {string} pValueToMatch - The value to match
+	 * @param {string} pValueAddress - The manyfest hash/address of the value to return
+	 * @returns {any} - The value from the object
+	 */
+	findFirstValueByStringIncludesInternal(pFableAddress, pValueToMatchAddress, pValueToMatch, pValueAddress)
+	{
+		// Lazily create a manifest if it doesn't exist
+		if (!this.manifest)
+		{
+			this.manifest = this.fable.newManyfest();
+		}
+
+		if (typeof(pFableAddress) != 'string')
+		{
+			return undefined;
+		}
+		let tmpObjectArray = this.manifest.getValueByHash(this.fable, pFableAddress);
+
+		return this.findFirstValueByStringIncludes(tmpObjectArray, pValueToMatchAddress, pValueToMatch, pValueAddress);
+	}
+
 	/**
 	 * Find the first value in an object that contains a specific value
 	 * @param {array} pObjectArray - The array of objects to search
@@ -402,6 +427,31 @@ class FableServiceUtility extends libFableServiceBase
 
 		return undefined;
 	}
+
+	/**
+	 * Find the first value in an object that contains a specific value
+	 * @param {string} pFableAddress - The address in the fable object to pull the value from
+	 * @param {string} pValueToMatchAddress - The manyfest hash/address of the value to match
+	 * @param {string} pValueToMatch - The value to match
+	 * @param {string} pValueAddress - The manyfest hash/address of the value to return
+	 * @returns {any} - The value from the object
+	 */
+	findFirstValueByExactMatchInternal(pFableAddress, pValueToMatchAddress, pValueToMatch, pValueAddress)
+	{
+		// Lazily create a manifest if it doesn't exist
+		if (!this.manifest)
+		{
+			this.manifest = this.fable.newManyfest();
+		}
+
+		if (typeof(pFableAddress) != 'string')
+		{
+			return undefined;
+		}
+		let tmpObjectArray = this.manifest.getValueByHash(this.fable, pFableAddress);
+
+		return this.findFirstValueByExactMatch(tmpObjectArray, pValueToMatchAddress, pValueToMatch, pValueAddress);
+	}
 }
 
 module.exports = FableServiceUtility;