@budibase/string-templates 2.17.8 → 2.18.1

package/dist/errors.d.ts

@@ -0,0 +1,4 @@
+export class JsErrorTimeout extends Error {
+    constructor();
+    code: string;
+}

package/dist/index.d.mts

@@ -19,3 +19,4 @@ export const convertToJS: (hbs: any) => string;
 export const setJSRunner: (runner: any) => any;
 export const FIND_ANY_HBS_REGEX: RegExp;
 export const helpersToRemoveForJs: string[];
+export * from "./errors.js";

package/dist/index.d.ts

@@ -15,4 +15,4 @@ 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 { setJSRunner, FIND_ANY_HBS_REGEX, helpersToRemoveForJs };
+export { setJSRunner, FIND_ANY_HBS_REGEX, JsErrorTimeout, helpersToRemoveForJs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.17.8",
+  "version": "2.18.1",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
@@ -11,7 +11,8 @@
       "require": "./src/index.cjs",
       "import": "./dist/bundle.mjs"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./test/utils": "./test/utils.js"
   },
   "files": [
     "dist",
@@ -20,7 +21,7 @@
   ],
   "scripts": {
     "build": "tsc && rollup -c",
-    "dev": "tsc && rollup -cw",
+    "dev": "concurrently \"tsc --watch\" \"rollup -cw\"",
     "test": "jest",
     "manifest": "node ./scripts/gen-collection-info.js"
   },
@@ -34,6 +35,7 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.1.0",
+    "concurrently": "^8.2.2",
     "doctrine": "^3.0.0",
     "jest": "29.7.0",
     "marked": "^4.0.10",
@@ -45,5 +47,5 @@
     "rollup-plugin-terser": "^7.0.2",
     "typescript": "5.2.2"
   },
-  "gitHead": "1e44b9f893e4a4c44e5759837f1354e5c2464341"
+  "gitHead": "bacb888b699e362e38c2be211a2a524e3172c347"
 }

package/src/errors.js

@@ -0,0 +1,11 @@
+class JsErrorTimeout extends Error {
+  code = "ERR_SCRIPT_EXECUTION_TIMEOUT"
+
+  constructor() {
+    super()
+  }
+}
+
+module.exports = {
+  JsErrorTimeout,
+}

package/src/helpers/javascript.js

@@ -42,7 +42,7 @@ module.exports.processJS = (handlebars, context) => {
   try {
     // Wrap JS in a function and immediately invoke it.
     // This is required to allow the final `return` statement to be valid.
-    const js = `function run(){${atob(handlebars)}};run();`
+    const js = `(function(){${atob(handlebars)}})();`
 
     // Our $ context function gets a value from context.
     // We clone the context to avoid mutation in the binding affecting real

package/src/helpers/list.js

@@ -1,29 +1,42 @@
-const externalHandlebars = require("./external")
-const helperList = require("@budibase/handlebars-helpers")
+const { date, duration } = require("./date")
 
-let helpers = undefined
+// https://github.com/evanw/esbuild/issues/56
+const externalCollections = {
+  math: require("@budibase/handlebars-helpers/lib/math"),
+  array: require("@budibase/handlebars-helpers/lib/array"),
+  number: require("@budibase/handlebars-helpers/lib/number"),
+  url: require("@budibase/handlebars-helpers/lib/url"),
+  string: require("@budibase/handlebars-helpers/lib/string"),
+  comparison: require("@budibase/handlebars-helpers/lib/comparison"),
+  object: require("@budibase/handlebars-helpers/lib/object"),
+  regex: require("@budibase/handlebars-helpers/lib/regex"),
+  uuid: require("@budibase/handlebars-helpers/lib/uuid"),
+}
 
 const helpersToRemoveForJs = ["sortBy"]
 module.exports.helpersToRemoveForJs = helpersToRemoveForJs
 
+const addedHelpers = {
+  date: date,
+  duration: duration,
+}
+
+let helpers = undefined
+
 module.exports.getJsHelperList = () => {
   if (helpers) {
     return helpers
   }
 
   helpers = {}
-  let constructed = []
-  for (let collection of externalHandlebars.externalCollections) {
-    constructed.push(helperList[collection]())
-  }
-  for (let collection of constructed) {
+  for (let collection of Object.values(externalCollections)) {
     for (let [key, func] of Object.entries(collection)) {
       // Handlebars injects the hbs options to the helpers by default. We are adding an empty {} as a last parameter to simulate it
       helpers[key] = (...props) => func(...props, {})
     }
   }
-  for (let key of Object.keys(externalHandlebars.addedHelpers)) {
-    helpers[key] = externalHandlebars.addedHelpers[key]
+  for (let key of Object.keys(addedHelpers)) {
+    helpers[key] = addedHelpers[key]
   }
 
   for (const toRemove of helpersToRemoveForJs) {

package/src/index.cjs

@@ -36,3 +36,8 @@ if (!process.env.NO_JS) {
     return vm.run(js)
   })
 }
+
+const errors = require("./errors")
+for (const error in errors) {
+  module.exports[error] = errors[error]
+}

package/src/index.js

@@ -395,4 +395,9 @@ module.exports.convertToJS = hbs => {
 }
 
 module.exports.FIND_ANY_HBS_REGEX = FIND_ANY_HBS_REGEX
+
+const errors = require("./errors")
+// We cannot use dynamic exports, otherwise the typescript file will not be generating it
+module.exports.JsErrorTimeout = errors.JsErrorTimeout
+
 module.exports.helpersToRemoveForJs = helpersToRemoveForJs

package/src/index.mjs

@@ -38,3 +38,5 @@ if (process && !process.env.NO_JS) {
     return vm.runInNewContext(js, context, { timeout: 1000 })
   })
 }
+
+export * from "./errors.js"