Handle undefined and use same output format as EvalJavascript.js

anthroid · Mar 24, 2021 · 79d1a49 · 79d1a49
1 parent 75760ea
commit 79d1a49
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Scripts/jsToPhp.js b/Scripts/jsToPhp.js
@@ -10,16 +10,22 @@
 **/
 
 function main(state) {
+  const js = state.text.replace(/\n\n\/\/ Result:[\s\S]*$/, '');
+  let output = '';
   try {
-    const result = new Function(`return ${state.text}`)();
-    state.text = convert(result) + ';';
+    const result = new Function(`return ${js}`)();
+    output = convert(result) + ';';
   } catch (error) {
     state.postError(error.message);
   }
+  state.text = js + "\n\n// Result:\n\n" + output;
 }
 
 const toPHP = function (value, indentation) {
   switch (typeof value) {
+    case 'undefined':
+      value = null;
+      break;
     case 'object':
       if(value !== null) {
         value = convert(value, indentation + 1);