@budibase/string-templates 2.20.3 → 2.20.4

package/dist/helpers/javascript.d.ts

@@ -1,3 +1,4 @@
 export function setJSRunner(runner: any): any;
+export function removeJSRunner(): void;
 export function setOnErrorLog(delegate: any): any;
 export function processJS(handlebars: any, context: any): string;

package/dist/index.d.ts

@@ -15,4 +15,5 @@ export function doesContainString(template: string, string: string): boolean;
 export function convertToJS(hbs: any): string;
 import { FIND_ANY_HBS_REGEX } from "./utilities";
 import { helpersToRemoveForJs } from "./helpers/list";
+export function defaultJSSetup(): void;
 export { setJSRunner, setOnErrorLog, FIND_ANY_HBS_REGEX, JsErrorTimeout, helpersToRemoveForJs };

package/dist/utilities.d.ts

@@ -1,6 +1,8 @@
 export const FIND_HBS_REGEX: RegExp;
 export const FIND_ANY_HBS_REGEX: RegExp;
 export const FIND_TRIPLE_HBS_REGEX: RegExp;
+export function isBackendService(): boolean;
+export function isJSAllowed(): boolean;
 export function findDoubleHbsInstances(string: any): any;
 export function isAlphaNumeric(char: any): any;
 export function swapStrings(string: any, start: any, length: any, swap: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.20.3",
+  "version": "2.20.4",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.js",
   "module": "dist/bundle.mjs",
@@ -46,5 +46,5 @@
     "rollup-plugin-terser": "^7.0.2",
     "typescript": "5.2.2"
   },
-  "gitHead": "fbfbe40b2e3c16c5b35847e8f60e049301a716f2"
+  "gitHead": "1791e493ef1b7bad157eddb723f67437802658e6"
 }

package/src/helpers/javascript.js

@@ -1,4 +1,4 @@
-const { atob } = require("../utilities")
+const { atob, isBackendService, isJSAllowed } = require("../utilities")
 const cloneDeep = require("lodash.clonedeep")
 const { LITERAL_MARKER } = require("../helpers/constants")
 const { getJsHelperList } = require("./list")
@@ -7,6 +7,9 @@ const { getJsHelperList } = require("./list")
 // This setter is used in the entrypoint (either index.js or index.mjs).
 let runJS
 module.exports.setJSRunner = runner => (runJS = runner)
+module.exports.removeJSRunner = () => {
+  runJS = undefined
+}
 
 let onErrorLog
 module.exports.setOnErrorLog = delegate => (onErrorLog = delegate)
@@ -39,7 +42,7 @@ const getContextValue = (path, context) => {
 
 // Evaluates JS code against a certain context
 module.exports.processJS = (handlebars, context) => {
-  if (process && process.env.NO_JS) {
+  if (!isJSAllowed() || (isBackendService() && !runJS)) {
     throw new Error("JS disabled in environment.")
   }
   try {

package/src/index.js

@@ -2,7 +2,7 @@ const vm = require("vm")
 const handlebars = require("handlebars")
 const { registerAll, registerMinimum } = require("./helpers/index")
 const processors = require("./processors")
-const { atob, btoa } = require("./utilities")
+const { atob, btoa, isBackendService } = require("./utilities")
 const manifest = require("../manifest.json")
 const {
   FIND_HBS_REGEX,
@@ -404,18 +404,25 @@ module.exports.JsErrorTimeout = errors.JsErrorTimeout
 
 module.exports.helpersToRemoveForJs = helpersToRemoveForJs
 
-if (process && !process.env.NO_JS) {
-  /**
-   * Use polyfilled vm to run JS scripts in a browser Env
-   */
-  javascript.setJSRunner((js, context) => {
-    context = {
-      ...context,
-      alert: undefined,
-      setInterval: undefined,
-      setTimeout: undefined,
-    }
-    vm.createContext(context)
-    return vm.runInNewContext(js, context, { timeout: 1000 })
-  })
+function defaultJSSetup() {
+  if (!isBackendService()) {
+    /**
+     * Use polyfilled vm to run JS scripts in a browser Env
+     */
+    javascript.setJSRunner((js, context) => {
+      context = {
+        ...context,
+        alert: undefined,
+        setInterval: undefined,
+        setTimeout: undefined,
+      }
+      vm.createContext(context)
+      return vm.runInNewContext(js, context, { timeout: 1000 })
+    })
+  } else {
+    javascript.removeJSRunner()
+  }
 }
+defaultJSSetup()
+
+module.exports.defaultJSSetup = defaultJSSetup

package/src/utilities.js

@@ -4,6 +4,14 @@ module.exports.FIND_HBS_REGEX = /{{([^{].*?)}}/g
 module.exports.FIND_ANY_HBS_REGEX = /{?{{([^{].*?)}}}?/g
 module.exports.FIND_TRIPLE_HBS_REGEX = /{{{([^{].*?)}}}/g
 
+module.exports.isBackendService = () => {
+  return typeof window === "undefined"
+}
+
+module.exports.isJSAllowed = () => {
+  return process && !process.env.NO_JS
+}
+
 // originally this could be done with a single regex using look behinds
 // but safari does not support this feature
 // original regex: /(?<!{){{[^{}]+}}(?!})/g