jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added resolve function to allow users to force a calculation to reduce

Browse Source
This commit is contained in:
Stefan Zermatten
2022-02-23 12:58:12 +02:00
parent 52453b46e9
commit 5b6bff91a4
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/imports/parser/parseTree/call.js
View File

@@ -61,8 +61,11 @@ const call = {
}
// Map contant nodes to constants before attempting to run the function
let mappedArgs = resolvedArgs.map(arg => {
if (arg.parseType === 'constant'){
let mappedArgs = resolvedArgs.map((arg, index) => {
if (
arg.parseType === 'constant' &&
func.arguments[index] !== 'parseNode'
){
return arg.value;
} else {
return arg;
@@ -71,7 +74,7 @@ const call = {
try {
// Run the function
let value = func.fn.apply(null, mappedArgs);
let value = func.fn.apply({scope, context}, mappedArgs);
let valueType = typeof value;
if (valueType === 'number' || valueType === 'string' || valueType === 'boolean'){
@@ -132,6 +135,7 @@ const call = {
} else {
type = argumentsExpected[index];
}
if (type === 'parseNode') return;
if (node.parseType !== type && node.valueType !== type) failed = true;
if (failed && fn === 'reduce'){
let typeName = typeof type === 'string' ? type : type.constructor.name;