fable 3.0.128 → 3.0.130

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/debug/Harness.js +13 -18
  2. package/dist/fable.compatible.js +102 -107
  3. package/dist/fable.compatible.min.js +2 -2
  4. package/dist/fable.compatible.min.js.map +1 -1
  5. package/dist/fable.js +102 -107
  6. package/dist/fable.min.js +2 -2
  7. package/dist/fable.min.js.map +1 -1
  8. package/package.json +5 -5
  9. package/source/Fable-Browser-Shim.js +1 -1
  10. package/source/Fable.js +11 -11
  11. package/source/services/Fable-Service-DataFormat.js +6 -6
  12. package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Base.js +2 -2
  13. package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer.js +1 -1
  14. package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Linter.js +2 -2
  15. package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Postfix.js +4 -4
  16. package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-SolvePostfixedExpression.js +3 -3
  17. package/source/services/Fable-Service-FilePersistence.js +2 -2
  18. package/source/services/Fable-Service-MetaTemplate/MetaTemplate-StringParser.js +101 -39
  19. package/source/services/Fable-Service-MetaTemplate/MetaTemplate-WordTree.js +14 -8
  20. package/source/services/Fable-Service-MetaTemplate.js +6 -14
  21. package/source/services/Fable-Service-Operation.js +1 -1
  22. package/source/services/Fable-Service-ProgressTime.js +7 -7
  23. package/source/services/Fable-Service-ProgressTrackerSet.js +11 -11
  24. package/source/services/Fable-Service-RestClient.js +4 -4
  25. package/source/services/Fable-Service-Utility.js +1 -1
  26. package/test/MetaTemplating_tests.js +21 -1
package/debug/Harness.js CHANGED
@@ -6,25 +6,30 @@ let testFable = new libFable({"Product": "Ti"});
6
6
  testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
7
7
 
8
8
  let tmpExpression = '';
9
- tmpExpression = 'Result = 5+3 - sqrt(75 / (3 + Depth) * Width)^ 3';
10
- //tmpExpression = 'Result = (160 * PR * Z) / (C / 100) * PR * Z + (160 * (1 - C / 100))';
9
+ //tmpExpression = 'Result = 5+3 - sqrt(75 / (3 + Depth) * Width)^ 3';
10
+ tmpExpression = 'Result = (160 * PR * Z) / (C / 100) * PR * Z + (160 * (1 - C / 100))';
11
11
  //tmpExpression = "Result = (160 * PR * Z) / (C / 100) * PR * Z + (160 * (1 - C / 100))";
12
12
  //tmpExpression = '1.5 * sqrt(8 * 2.423782342^2) / 10';
13
-
13
+ //tmpExpression = 'Result = sqrt(100 * (C + 30)) + sin(Depth - Width) / 10';
14
14
  let tmpSimpleDataObject = { "PR": 1.5, "Z": "20.036237", "C": -13, Depth: 100.203, Width: 10.5};
15
15
 
16
16
  testFable.log.info(`tmpExpression: ${tmpExpression}`);
17
17
 
18
18
  let tmpResultsObject = {};
19
-
20
19
  let complexTokenizedResults = testFable.ExpressionParser.tokenize(tmpExpression, tmpResultsObject);
21
20
  let complexLintedResults = testFable.ExpressionParser.lintTokenizedExpression(complexTokenizedResults, tmpResultsObject);
22
21
  let complexPostfixedResults = testFable.ExpressionParser.buildPostfixedSolveList(complexTokenizedResults, tmpResultsObject);
23
22
  testFable.ExpressionParser.substituteValuesInTokenizedObjects(tmpResultsObject.PostfixTokenObjects, tmpSimpleDataObject);
23
+ for (let i = 0; i < tmpResultsObject.PostfixSolveList.length; i++)
24
+ {
25
+ let tmpToken = tmpResultsObject.PostfixSolveList[i];
26
+ console.log(`${i}: ${tmpToken.VirtualSymbolName} = ${getTokenString(tmpToken.LeftValue)} ${tmpToken.Operation.Token} ${getTokenString(tmpToken.RightValue)}`)
27
+ }
28
+ let tmpResultValue = testFable.ExpressionParser.solvePostfixedExpression(tmpResultsObject.PostfixSolveList, tmpSimpleDataObject, tmpResultsObject);
29
+ console.log(`Result: ${tmpResultValue}`);
30
+ console.log('QED');
24
31
 
25
- //testFable.log.info(`Full Results:\n--\n${JSON.stringify(tmpResultsObject,null,4)}\n--\n`);
26
- //testFable.log.info(`Postfix: ${JSON.stringify(complexPostfixedResults,null,4)}`);
27
- getTokenString = (pToken) =>
32
+ function getTokenString(pToken)
28
33
  {
29
34
  switch (pToken.Type)
30
35
  {
@@ -36,14 +41,4 @@ getTokenString = (pToken) =>
36
41
  default:
37
42
  return pToken.Token;
38
43
  }
39
-
40
- }
41
- for (let i = 0; i < tmpResultsObject.PostfixSolveList.length; i++)
42
- {
43
- let tmpToken = tmpResultsObject.PostfixSolveList[i];
44
- console.log(`${i}: ${tmpToken.VirtualSymbolName} = ${getTokenString(tmpToken.LeftValue)} ${tmpToken.Operation.Token} ${getTokenString(tmpToken.RightValue)}`)
45
- }
46
-
47
- let tmpResultValue = testFable.ExpressionParser.solvePostfixedExpression(tmpResultsObject.PostfixSolveList, tmpSimpleDataObject, tmpResultsObject);
48
- console.log(`Result: ${tmpResultValue}`);
49
- console.log('QED');
44
+ }