Merge pull request #551 from level420/fix-issue-548-options-in-customcode-context

Make userOptions of the chart available within customCode context

Author: PaulDalek

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.0.2
+
+_Fixes:_
+
+- Made chart userOptions available within `customCode` as variable `options` [(#551)](https://github.com/highcharts/node-export-server/issues/551).
+
 # 4.0.1
 
 _Hotfix_:

lib/highcharts.js

@@ -41,11 +41,6 @@ export async function triggerExport(chartOptions, options, displayErrors) {
   // prevent from polluting other exports that can happen on the same page
   Highcharts.setOptionsObj = merge(false, {}, getOptions());
 
-  // Trigger custom code
-  if (options.customLogic.customCode) {
-    new Function(options.customLogic.customCode)();
-  }
-
   // By default animation is disabled
   const chart = {
     animation: false
@@ -100,6 +95,11 @@ export async function triggerExport(chartOptions, options, displayErrors) {
   const userOptions = options.export.strInj
     ? new Function(`return ${options.export.strInj}`)()
     : chartOptions;
+  
+  // Trigger custom code
+  if (options.customLogic.customCode) {
+    new Function('options', options.customLogic.customCode)(userOptions);
+  }
 
   // Merge the globalOptions, themeOptions, options from the wrapped
   // setOptions function and user options to create the final options object