From 2117a639457a614dcfb0172189678fe4416d31fa Mon Sep 17 00:00:00 2001
From: ThaumRystra <9525416+ThaumRystra@users.noreply.github.com>
Date: Thu, 9 Nov 2023 18:43:13 +0200
Subject: [PATCH] Removed evaluateCalculation.js

---
 .../computeByType/computeCalculation.js           |  1 -
 .../computeByType/computePointBuy.js              |  5 ++++-
 .../computation/utility/evaluateCalculation.js    | 15 ---------------
 .../ui/properties/forms/PointBuySpendForm.vue     |  4 ++--
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 app/imports/api/engine/computation/utility/evaluateCalculation.js

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js
index 68c9bb46..fccc4616 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js
@@ -37,7 +37,6 @@ export function resolveCalculationNode(calculation, parseNode, scope) {
   calculation.valueNode = resultNode;
 }
 
-
 function linkCalculationEffects(node, computation) {
   const calcObj = node.data;
   delete calcObj.effectIds;
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js b/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js
index ae7577fb..93227e15 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js
@@ -1,4 +1,5 @@
 import { has } from 'lodash';
+import resolveCalculationNode from 'imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js';
 
 export default function computePointBuy(computation, node) {
   const prop = node.data;
@@ -25,7 +26,9 @@ export default function computePointBuy(computation, node) {
     }
     // Evaluate the cost function
     if (!costFunction) return;
-    evaluateCalculation(costFunction, { ...computation.scope, value: row.value });
+    resolveCalculationNode(costFunction, costFunction.parseNode, {
+      ...computation.scope, value: row.value
+    });
     // Write calculation errors
     costFunction.errors?.forEach(error => {
       if (error?.message) {
diff --git a/app/imports/api/engine/computation/utility/evaluateCalculation.js b/app/imports/api/engine/computation/utility/evaluateCalculation.js
deleted file mode 100644
index 83653102..00000000
--- a/app/imports/api/engine/computation/utility/evaluateCalculation.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import resolve, { toPrimitiveOrString } from '/imports/parser/resolve.js';
-console.warn('evaluateCalculation is deprecated use resolveCalculationNode instead')
-// TODO everywhere this is used, replace with more specific code to recalculate fields
-export default function evaluateCalculation(calculation, scope, givenContext) {
-  const parseNode = calculation.parseNode;
-  const fn = calculation._parseLevel;
-  const calculationScope = { ...calculation._localScope, ...scope };
-  const { result: resultNode, context } = resolve(fn, parseNode, calculationScope, givenContext);
-  calculation.errors = context.errors;
-  calculation.valueNode = resultNode;
-  calculation.value = toPrimitiveOrString(resultNode);
-  // remove the working fields
-  delete calculation._parseLevel;
-  delete calculation._localScope;
-}
diff --git a/app/imports/client/ui/properties/forms/PointBuySpendForm.vue b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
index 5fbbaf28..de268236 100644
--- a/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
+++ b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
@@ -93,7 +93,7 @@
 <script lang="js">
 import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
-import evaluateCalculation from '/imports/api/engine/computation/utility/evaluateCalculation.js';
+import resolveCalculationNode from 'imports/api/engine/computation/computeComputation/computeByType/computeCalculation.js';
 import { Tracker } from 'meteor/tracker'
 
 export default {
@@ -120,7 +120,7 @@ export default {
       const costFunction = EJSON.clone(row.cost || this.model.cost);
       if (!costFunction?.parseNode) return;
       if (costFunction) costFunction.parseLevel = 'reduce';
-      evaluateCalculation(costFunction, { value });
+      resolveCalculationNode(costFunction, costFunction.parseNode, { value });
       if (Number.isFinite(costFunction.value)) {
         newSpent += costFunction.value;
         if (this.useEstimate) this.estimatedCost = newSpent;