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

Fixed computation dependency aggregation broken by refactoring

Browse Source
This commit is contained in:
Stefan Zermatten
2021-02-11 16:27:22 +02:00
parent dc4808c70a
commit eb2dd3bba1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/imports/api/creature/computation/engine/evaluateCalculation.js
View File

@@ -44,8 +44,11 @@ export default function evaluateCalculation({
} }
// Replace constants with their parsed constant // Replace constants with their parsed constant
let failed = replaceConstants({calc, memo, prop, dependencies, errors}) let replaceResults = replaceConstants({
if (failed){ calc, memo, prop, dependencies, errors
});
dependencies = replaceResults.dependencies;
if (replaceResults.failed){
return { return {
context: {errors}, context: {errors},
result: new ConstantNode({value: string, type: 'string'}), result: new ConstantNode({value: string, type: 'string'}),
@@ -54,7 +57,7 @@ export default function evaluateCalculation({
} }
// Ensure all symbol nodes are defined and computed // Ensure all symbol nodes are defined and computed
computeSymbols({calc, memo, prop, dependencies}) dependencies = computeSymbols({calc, memo, prop, dependencies})
// Evaluate // Evaluate
let context = new CompilationContext(); let context = new CompilationContext();
@@ -102,7 +105,10 @@ function replaceConstants({calc, memo, prop, dependencies, errors}){
message: `${name} is a constant property with parsing errors` message: `${name} is a constant property with parsing errors`
}); });
}); });
return !!constFailed.length; return {
failed: !!constFailed.length,
dependencies,
};
} }
// Ensure all symbol nodes are defined and computed // Ensure all symbol nodes are defined and computed
@@ -128,4 +134,5 @@ function computeSymbols({calc, memo, prop, dependencies}){
} }
} }
}); });
return dependencies;
} }