Merge pull request #7 from php-flasher/fix/execute-js-callback-from-string

Execute js callback function from string

Author: Younes Khoubza

src/flasher.ts

@@ -4,9 +4,10 @@ import {
   Envelope,
   FlasherResponseOptions,
   QueueableInterface,
-  ResponseContext,
+  ResponseContext, FlasherOptions,
 } from './interfaces';
 import TemplateFactory from './template';
+import { parseFunction } from './functions';
 
 export default class Flasher {
   private static instance: Flasher;
@@ -26,6 +27,7 @@ export default class Flasher {
   }
 
   public render(response: FlasherResponse): void {
+    response = this.parseResponse(response);
     this.addStyles(response.styles, () => {
       this.addScripts(response.scripts, () => {
         this.renderOptions(response.options);
@@ -127,4 +129,24 @@ export default class Flasher {
     return typeof object.addEnvelope === 'function'
       && typeof object.renderQueue === 'function';
   }
+
+  private parseResponse(response: FlasherResponse): FlasherResponse {
+    Object.entries(response.options).forEach(([handler, options]) => {
+      response.options[handler] = this.parseOptions(options);
+    });
+
+    response.envelopes.forEach(envelope => {
+      envelope.notification.options = this.parseOptions(envelope.notification.options);
+    });
+
+    return response;
+  }
+
+  private parseOptions(options: FlasherOptions): FlasherOptions {
+    Object.entries(options).forEach(([key, value]) => {
+      options[key] = parseFunction(value);
+    });
+
+    return options;
+  }
 }

src/functions.ts

@@ -0,0 +1,18 @@
+export function parseFunction(func: any): any {
+  if (typeof func !== 'string') {
+    return func;
+  }
+
+  const match = func.match(/^function(?:.+)?(?:\s+)?\((.+)?\)(?:\s+|\n+)?\{(?:\s+|\n+)?((?:.|\n)+)\}$/m);
+
+  if (!match) {
+    return func;
+  }
+
+  const args = match[1]?.split(',').map(arg => arg.trim()) ?? [];
+  const body = match[2];
+
+  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/no-implied-eval
+  return new Function(...args, body);
+}