From 97fcb7645486f2f39007a196b697a43dffd9dcfc Mon Sep 17 00:00:00 2001
From: Thaum Rystra <stefanzermatten@gmail.com>
Date: Wed, 13 May 2020 10:42:20 +0200
Subject: [PATCH] Added if function

---
 app/client/main.js                                       | 5 +++--
 .../computation/afterComputation/evaluateString.js       | 2 +-
 .../api/creature/computation/evaluateCalculation.js      | 2 +-
 .../utility/replaceBareSymbolsWithValueAccessor.js       | 2 +-
 app/imports/math.js                                      | 9 +++++++++
 app/server/main.js                                       | 8 ++++----
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 app/imports/math.js

diff --git a/app/client/main.js b/app/client/main.js
index c6da8c92..959fa76f 100644
--- a/app/client/main.js
+++ b/app/client/main.js
@@ -1,2 +1,3 @@
-import "/imports/ui/vueSetup.js";
-import "/imports/ui/styles/stylesIndex.js";
+import '/imports/ui/vueSetup.js';
+import '/imports/ui/styles/stylesIndex.js';
+import '/imports/ui/styles/stylesIndex.js';
diff --git a/app/imports/api/creature/computation/afterComputation/evaluateString.js b/app/imports/api/creature/computation/afterComputation/evaluateString.js
index 7ae41b28..9c3150e0 100644
--- a/app/imports/api/creature/computation/afterComputation/evaluateString.js
+++ b/app/imports/api/creature/computation/afterComputation/evaluateString.js
@@ -1,4 +1,4 @@
-import * as math from 'mathjs';
+import math from '/imports/math.js';
 import  replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js';
 
 export default function evaluateString(string, scope){
diff --git a/app/imports/api/creature/computation/evaluateCalculation.js b/app/imports/api/creature/computation/evaluateCalculation.js
index a39199bd..6a001857 100644
--- a/app/imports/api/creature/computation/evaluateCalculation.js
+++ b/app/imports/api/creature/computation/evaluateCalculation.js
@@ -1,6 +1,6 @@
 import  replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js';
 import computeStat from '/imports/api/creature/computation/computeStat.js';
-import * as math from 'mathjs';
+import math from '/imports/math.js';
 
 export default function evaluateCalculation(string, memo){
   if (!string) return string;
diff --git a/app/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js b/app/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js
index d3686c13..4c48eb8e 100644
--- a/app/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js
+++ b/app/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js
@@ -1,4 +1,4 @@
-import * as math from 'mathjs';
+import math from '/imports/math.js';
 
 export default function replaceBareSymbolsWithValueAccessor(node, path) {
   if (node.isFunctionNode){
diff --git a/app/imports/math.js b/app/imports/math.js
new file mode 100644
index 00000000..8ab9dcc9
--- /dev/null
+++ b/app/imports/math.js
@@ -0,0 +1,9 @@
+import { create, all } from 'mathjs';
+const math = create(all);
+math.import({
+  'if': function(pred, a, b) {
+      return pred ? a : b;
+  }
+});
+
+export default math;
diff --git a/app/server/main.js b/app/server/main.js
index b4cfce7b..626512ff 100644
--- a/app/server/main.js
+++ b/app/server/main.js
@@ -1,4 +1,4 @@
-import "/imports/server/publications/index.js";
-import "/imports/api/parenting/deleteRemovedDocuments.js";
-import "/imports/server/config/simpleSchemaDebug.js";
-import "/imports/api/parenting/organizeMethods.js";
+import '/imports/server/publications/index.js';
+import '/imports/api/parenting/deleteRemovedDocuments.js';
+import '/imports/server/config/simpleSchemaDebug.js';
+import '/imports/api/parenting/organizeMethods.js';