@budibase/server 1.0.219-alpha.7 → 1.0.219

package/dist/utilities/fileSystem/index.js

@@ -17,7 +17,7 @@ const { ObjectStoreBuckets } = require("../../constants");
 const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, } = require("./utilities");
 const { updateClientLibrary } = require("./clientLibrary");
 const env = require("../../environment");
-const { USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, } = require("../../db/utils");
+const { USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX, } = require("../../db/utils");
 const MemoryStream = require("memorystream");
 const { getAppId } = require("@budibase/backend-core/context");
 const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
@@ -98,17 +98,6 @@ exports.apiFileReturn = contents => {
     fs.writeFileSync(path, contents);
     return fs.createReadStream(path);
 };
-exports.defineFilter = excludeRows => {
-    if (excludeRows) {
-        return doc => !(doc._id.includes(USER_METDATA_PREFIX) ||
-            doc._id.includes(LINK_USER_METADATA_PREFIX) ||
-            doc._id.includes(TABLE_ROW_PREFIX));
-    }
-    else if (!excludeRows) {
-        return doc => !(doc._id.includes(USER_METDATA_PREFIX) ||
-            doc._id.includes(LINK_USER_METADATA_PREFIX));
-    }
-};
 /**
  * Local utility to back up the database state for an app, excluding global user
  * data or user relationships.
@@ -116,8 +105,9 @@ exports.defineFilter = excludeRows => {
  * @param {object} config Config to send to export DB
  * @returns {*} either a string or a stream of the backup
  */
-const backupAppData = (appId, config, includeRows) => __awaiter(void 0, void 0, void 0, function* () {
-    return yield exports.exportDB(appId, Object.assign(Object.assign({}, config), { filter: exports.defineFilter(includeRows) }));
+const backupAppData = (appId, config) => __awaiter(void 0, void 0, void 0, function* () {
+    return yield exports.exportDB(appId, Object.assign(Object.assign({}, config), { filter: doc => !(doc._id.includes(USER_METDATA_PREFIX) ||
+            doc._id.includes(LINK_USER_METADATA_PREFIX)) }));
 });
 /**
  * Takes a copy of the database state for an app to the object store.
@@ -133,8 +123,8 @@ exports.performBackup = (appId, backupName) => __awaiter(void 0, void 0, void 0,
  * @param {string} appId The ID of the app which is to be backed up.
  * @returns {*} a readable stream of the backup which is written in real time
  */
-exports.streamBackup = (appId, includeRows) => __awaiter(void 0, void 0, void 0, function* () {
-    return yield backupAppData(appId, { stream: true }, includeRows);
+exports.streamBackup = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+    return yield backupAppData(appId, { stream: true });
 });
 /**
  * Exports a DB to either file or a variable (memory).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.219-alpha.7",
+  "version": "1.0.219",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.219-alpha.7",
-    "@budibase/client": "^1.0.219-alpha.7",
-    "@budibase/pro": "1.0.219-alpha.6",
-    "@budibase/string-templates": "^1.0.219-alpha.7",
-    "@budibase/types": "^1.0.219-alpha.7",
+    "@budibase/backend-core": "^1.0.219",
+    "@budibase/client": "^1.0.219",
+    "@budibase/pro": "1.0.218",
+    "@budibase/string-templates": "^1.0.219",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -136,7 +135,6 @@
     "pouchdb-replication-stream": "1.2.9",
     "redis": "4",
     "server-destroy": "1.0.1",
-    "snowflake-promise": "^4.5.0",
     "svelte": "3.44.1",
     "swagger-parser": "10.0.3",
     "to-json-schema": "0.2.5",
@@ -152,6 +150,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
+    "@budibase/types": "^1.0.219",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
@@ -195,5 +194,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "57e5d6fa3b84deffdd8ec86c3b1b9ff8ebaab101"
+  "gitHead": "231b038a3c99f730dd27a595f870663dd84b7837"
 }

package/src/api/controllers/application.ts

@@ -45,12 +45,10 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 import { syncGlobalUsers } from "./user"
 const { app: appCache } = require("@budibase/backend-core/cache")
 import { cleanupAutomations } from "../../automations/utils"
-import { checkAppMetadata } from "../../automations/logging"
 const {
   getAppDB,
   getProdAppDB,
   updateAppId,
-  doInAppContext,
 } = require("@budibase/backend-core/context")
 import { getUniqueRows } from "../../utilities/usageQuota/rows"
 import { quotas } from "@budibase/pro"
@@ -194,7 +192,7 @@ export const fetch = async (ctx: any) => {
     }
   }
 
-  ctx.body = await checkAppMetadata(apps)
+  ctx.body = apps
 }
 
 export const fetchAppDefinition = async (ctx: any) => {
@@ -550,24 +548,22 @@ export const sync = async (ctx: any, next: any) => {
 }
 
 const updateAppPackage = async (appPackage: any, appId: any) => {
-  return doInAppContext(appId, async () => {
-    const db = getAppDB()
-    const application = await db.get(DocumentTypes.APP_METADATA)
+  const db = getAppDB()
+  const application = await db.get(DocumentTypes.APP_METADATA)
 
-    const newAppPackage = { ...application, ...appPackage }
-    if (appPackage._rev !== application._rev) {
-      newAppPackage._rev = application._rev
-    }
+  const newAppPackage = { ...application, ...appPackage }
+  if (appPackage._rev !== application._rev) {
+    newAppPackage._rev = application._rev
+  }
 
-    // the locked by property is attached by server but generated from
-    // Redis, shouldn't ever store it
-    delete newAppPackage.lockedBy
+  // the locked by property is attached by server but generated from
+  // Redis, shouldn't ever store it
+  delete newAppPackage.lockedBy
 
-    await db.put(newAppPackage)
-    // remove any cached metadata, so that it will be updated
-    await appCache.invalidateAppMetadata(appId)
-    return newAppPackage
-  })
+  await db.put(newAppPackage)
+  // remove any cached metadata, so that it will be updated
+  await appCache.invalidateAppMetadata(appId)
+  return newAppPackage
 }
 
 const createEmptyAppPackage = async (ctx: any, app: any) => {

package/src/api/controllers/automation.js

@@ -1,10 +1,6 @@
 const actions = require("../../automations/actions")
 const triggers = require("../../automations/triggers")
-const {
-  getAutomationParams,
-  generateAutomationID,
-  DocumentTypes,
-} = require("../../db/utils")
+const { getAutomationParams, generateAutomationID } = require("../../db/utils")
 const {
   checkForWebhooks,
   updateTestHistory,
@@ -13,14 +9,8 @@ const {
 const { deleteEntityMetadata } = require("../../utilities")
 const { MetadataTypes } = require("../../constants")
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis")
-const {
-  getAppDB,
-  getProdAppDB,
-  doInAppContext,
-} = require("@budibase/backend-core/context")
+const { getAppDB } = require("@budibase/backend-core/context")
 const { events } = require("@budibase/backend-core")
-const { app } = require("@budibase/backend-core/cache")
-const { automations } = require("@budibase/pro")
 
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
@@ -193,29 +183,6 @@ exports.destroy = async function (ctx) {
   await events.automation.deleted(oldAutomation)
 }
 
-exports.logSearch = async function (ctx) {
-  ctx.body = await automations.logs.logSearch(ctx.request.body)
-}
-
-exports.clearLogError = async function (ctx) {
-  const { automationId, appId } = ctx.request.body
-  await doInAppContext(appId, async () => {
-    const db = getProdAppDB()
-    const metadata = await db.get(DocumentTypes.APP_METADATA)
-    if (!automationId) {
-      delete metadata.automationErrors
-    } else if (
-      metadata.automationErrors &&
-      metadata.automationErrors[automationId]
-    ) {
-      delete metadata.automationErrors[automationId]
-    }
-    await db.put(metadata)
-    await app.invalidateAppMetadata(metadata.appId, metadata)
-    ctx.body = { message: `Error logs cleared.` }
-  })
-}
-
 exports.getActionList = async function (ctx) {
   ctx.body = ACTION_DEFS
 }

package/src/api/controllers/backup.js

@@ -3,12 +3,11 @@ const { events, context } = require("@budibase/backend-core")
 const { DocumentTypes } = require("../../db/utils")
 
 exports.exportAppDump = async function (ctx) {
-  let { appId, excludeRows } = ctx.query
+  const { appId } = ctx.query
   const appName = decodeURI(ctx.query.appname)
-  excludeRows = excludeRows === "true"
   const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
   ctx.attachment(backupIdentifier)
-  ctx.body = await streamBackup(appId, excludeRows)
+  ctx.body = await streamBackup(appId)
 
   await context.doInAppContext(appId, async () => {
     const appDb = context.getAppDB()

package/src/api/controllers/query/index.ts

@@ -8,8 +8,6 @@ import { QUERY_THREAD_TIMEOUT } from "../../../environment"
 import { getAppDB } from "@budibase/backend-core/context"
 import { quotas } from "@budibase/pro"
 import { events } from "@budibase/backend-core"
-import { getCookie } from "@budibase/backend-core/utils"
-import { Cookies, Configs } from "@budibase/backend-core/constants"
 
 const Runner = new Thread(ThreadType.QUERY, {
   timeoutMs: QUERY_THREAD_TIMEOUT || 10000,
@@ -112,21 +110,6 @@ export async function find(ctx: any) {
   ctx.body = query
 }
 
-//Required to discern between OIDC OAuth config entries
-function getOAuthConfigCookieId(ctx: any) {
-  if (ctx.user.providerType === Configs.OIDC) {
-    return getCookie(ctx, Cookies.OIDC_CONFIG)
-  }
-}
-
-function getAuthConfig(ctx: any) {
-  const authCookie = getCookie(ctx, Cookies.Auth)
-  let authConfigCtx: any = {}
-  authConfigCtx["configId"] = getOAuthConfigCookieId(ctx)
-  authConfigCtx["sessionId"] = authCookie ? authCookie.sessionId : null
-  return authConfigCtx
-}
-
 export async function preview(ctx: any) {
   const db = getAppDB()
 
@@ -136,8 +119,6 @@ export async function preview(ctx: any) {
   // this stops dynamic variables from calling the same query
   const { fields, parameters, queryVerb, transformer, queryId } = query
 
-  const authConfigCtx: any = getAuthConfig(ctx)
-
   try {
     const runFn = () =>
       Runner.run({
@@ -148,11 +129,8 @@ export async function preview(ctx: any) {
         parameters,
         transformer,
         queryId,
-        ctx: {
-          user: ctx.user,
-          auth: { ...authConfigCtx },
-        },
       })
+
     const { rows, keys, info, extra } = await quotas.addQuery(runFn)
     await events.query.previewed(datasource, query)
     ctx.body = {
@@ -172,8 +150,6 @@ async function execute(ctx: any, opts = { rowsOnly: false }) {
   const query = await db.get(ctx.params.queryId)
   const datasource = await db.get(query.datasourceId)
 
-  const authConfigCtx: any = getAuthConfig(ctx)
-
   const enrichedParameters = ctx.request.body.parameters || {}
   // make sure parameters are fully enriched with defaults
   if (query && query.parameters) {
@@ -196,10 +172,6 @@ async function execute(ctx: any, opts = { rowsOnly: false }) {
         parameters: enrichedParameters,
         transformer: query.transformer,
         queryId: ctx.params.queryId,
-        ctx: {
-          user: ctx.user,
-          auth: { ...authConfigCtx },
-        },
       })
 
     const { rows, pagination, extra } = await quotas.addQuery(runFn)

package/src/api/controllers/row/external.js

@@ -155,44 +155,34 @@ exports.validate = async () => {
 }
 
 exports.exportRows = async ctx => {
-  const { datasourceId } = breakExternalTableId(ctx.params.tableId)
+  const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId)
   const db = getAppDB()
-  const format = ctx.query.format
-  const { columns } = ctx.request.body
+  let format = ctx.query.format
   const datasource = await db.get(datasourceId)
   if (!datasource || !datasource.entities) {
     ctx.throw(400, "Datasource has not been configured for plus API.")
   }
+  const tables = datasource.entities
+  const table = tables[tableName]
   ctx.request.body = {
     query: {
       oneOf: {
-        _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
+        [table.primaryDisplay]: ctx.request.body.rows.map(
+          id => breakRowIdField(id)[0]
+        ),
       },
     },
   }
 
   let result = await exports.search(ctx)
-  let rows = []
-
-  // Filter data to only specified columns if required
-  if (columns && columns.length) {
-    for (let i = 0; i < result.rows.length; i++) {
-      rows[i] = {}
-      for (let column of columns) {
-        rows[i][column] = result.rows[i][column]
-      }
-    }
-  } else {
-    rows = result.rows
-  }
 
-  let headers = Object.keys(rows[0])
+  let headers = Object.keys(result.rows[0])
   const exporter = exporters[format]
   const filename = `export.${format}`
 
   // send down the file
   ctx.attachment(filename)
-  return apiFileReturn(exporter(headers, rows))
+  return apiFileReturn(exporter(headers, result.rows))
 }
 
 exports.fetchEnrichedRow = async ctx => {

package/src/api/controllers/row/internalSearch.js

@@ -17,7 +17,6 @@ class QueryBuilder {
       notEqual: {},
       empty: {},
       notEmpty: {},
-      oneOf: {},
       ...base,
     }
     this.limit = 50
@@ -113,11 +112,6 @@ class QueryBuilder {
     return this
   }
 
-  addOneOf(key, value) {
-    this.query.oneOf[key] = value
-    return this
-  }
-
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -226,28 +220,6 @@ class QueryBuilder {
     if (this.query.notEmpty) {
       build(this.query.notEmpty, key => `${key}:["" TO *]`)
     }
-    if (this.query.oneOf) {
-      build(this.query.oneOf, (key, value) => {
-        if (!Array.isArray(value)) {
-          if (typeof value === "string") {
-            value = value.split(",")
-          } else {
-            return ""
-          }
-        }
-        let orStatement = `${builder.preprocess(
-          value[0],
-          allPreProcessingOpts
-        )}`
-        for (let i = 1; i < value.length; i++) {
-          orStatement += ` OR ${builder.preprocess(
-            value[i],
-            allPreProcessingOpts
-          )}`
-        }
-        return `${key}:(${orStatement})`
-      })
-    }
     return query
   }
 

package/src/api/controllers/row/utils.js

@@ -64,9 +64,6 @@ exports.validate = async ({ tableId, row, table }) => {
     // Validate.js doesn't seem to handle array
     if (type === FieldTypes.ARRAY && row[fieldName]) {
       if (row[fieldName].length) {
-        if (!Array.isArray(row[fieldName])) {
-          row[fieldName] = row[fieldName].split(",")
-        }
         row[fieldName].map(val => {
           if (
             !constraints.inclusion.includes(val) &&

package/src/api/index.js

@@ -72,10 +72,7 @@ router.use(async (ctx, next) => {
       error,
     }
     ctx.log.error(err)
-    // unauthorised errors don't provide a useful trace
-    if (!env.isTest()) {
-      console.trace(err)
-    }
+    console.trace(err)
   }
 })
 

package/src/api/routes/automation.js

@@ -51,16 +51,6 @@ router
     automationValidator(false),
     controller.create
   )
-  .post(
-    "/api/automations/logs/search",
-    authorized(BUILDER),
-    controller.logSearch
-  )
-  .delete(
-    "/api/automations/logs",
-    authorized(BUILDER),
-    controller.clearLogError
-  )
   .delete(
     "/api/automations/:id/:rev",
     paramResource("id"),

package/src/api/routes/tests/query.spec.js

@@ -346,170 +346,4 @@ describe("/queries", () => {
       expect(contents).toBe(null)
     })
   })
-
-  describe("Current User Request Mapping", () => {
-    
-    async function previewGet(datasource, fields, params) {
-      return config.previewQuery(request, config, datasource, fields, params)
-    }
-
-    async function previewPost(datasource, fields, params) {
-      return config.previewQuery(request, config, datasource, fields, params, "create")
-    }
-
-    it("should parse global and query level header mappings", async () => {
-      const userDetails = config.getUserDetails()
-
-      const datasource = await config.restDatasource({
-        defaultHeaders: {
-          "test": "headerVal",
-          "emailHdr": "{{[user].[email]}}"
-        }
-      })
-      const res = await previewGet(datasource, {
-        path: "www.google.com",
-        queryString: "email={{[user].[email]}}",
-        headers: {
-          queryHdr : "{{[user].[firstName]}}",
-          secondHdr : "1234"
-        }
-      })
-
-      const parsedRequest = JSON.parse(res.body.extra.raw)
-      expect(parsedRequest.opts.headers).toEqual({
-        "test": "headerVal",
-        "emailHdr": userDetails.email,
-        "queryHdr": userDetails.firstName,
-        "secondHdr" : "1234"
-      })
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?email=" + userDetails.email)
-    })
-
-    it("should bind the current user to query parameters", async () => {
-      const userDetails = config.getUserDetails()
-  
-      const datasource = await config.restDatasource()
-  
-      const res = await previewGet(datasource, {
-        path: "www.google.com",
-        queryString: "test={{myEmail}}&testName={{myName}}&testParam={{testParam}}",
-      }, {
-        "myEmail" : "{{[user].[email]}}",
-        "myName" : "{{[user].[firstName]}}",
-        "testParam" : "1234"
-      })
-  
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?test=" + userDetails.email + 
-        "&testName=" + userDetails.firstName + "&testParam=1234")
-    })
-
-    it("should bind the current user the request body - plain text", async () => {
-      const userDetails = config.getUserDetails()
-      const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "This is plain text and this is my email: {{[user].[email]}}. This is a test param: {{testParam}}",
-        bodyType: "text"
-      }, {
-        "testParam" : "1234"
-      })
-
-      const parsedRequest = JSON.parse(res.body.extra.raw)
-      expect(parsedRequest.opts.body).toEqual(`This is plain text and this is my email: ${userDetails.email}. This is a test param: 1234`)
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
-    })
-
-    it("should bind the current user the request body - json", async () => {
-      const userDetails = config.getUserDetails()
-      const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}",
-        bodyType: "json"
-      }, {
-        "testParam" : "1234",
-        "userRef" : "{{[user].[firstName]}}"
-      })
-
-      const parsedRequest = JSON.parse(res.body.extra.raw)
-      const test = `{"email":"${userDetails.email}","queryCode":1234,"userRef":"${userDetails.firstName}"}`
-      expect(parsedRequest.opts.body).toEqual(test)
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
-    })
-   
-    it("should bind the current user the request body - xml", async () => {
-      const userDetails = config.getUserDetails()
-      const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "<note> <email>{{[user].[email]}}</email> <code>{{testParam}}</code> " + 
-          "<ref>{{userId}}</ref> <somestring>testing</somestring> </note>",
-        bodyType: "xml"
-      }, {
-        "testParam" : "1234",
-        "userId" : "{{[user].[firstName]}}"
-      })
-
-      const parsedRequest = JSON.parse(res.body.extra.raw)
-      const test = `<note> <email>${userDetails.email}</email> <code>1234</code> <ref>${userDetails.firstName}</ref> <somestring>testing</somestring> </note>`
-        
-      expect(parsedRequest.opts.body).toEqual(test)
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
-    })
-
-    it("should bind the current user the request body - form-data", async () => {
-      const userDetails = config.getUserDetails()
-      const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}",
-        bodyType: "form"
-      }, {
-        "testParam" : "1234",
-        "userRef" : "{{[user].[firstName]}}"
-      })
-
-      const parsedRequest = JSON.parse(res.body.extra.raw)
-
-      const emailData = parsedRequest.opts.body._streams[1]
-      expect(emailData).toEqual(userDetails.email)
-
-      const queryCodeData = parsedRequest.opts.body._streams[4]
-      expect(queryCodeData).toEqual("1234")
-
-      const userRef = parsedRequest.opts.body._streams[7]
-      expect(userRef).toEqual(userDetails.firstName)
-
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
-    })
-
-    it("should bind the current user the request body - encoded", async () => {
-      const userDetails = config.getUserDetails()
-      const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}",
-        bodyType: "encoded"
-      }, {
-        "testParam" : "1234",
-        "userRef" : "{{[user].[firstName]}}"
-      })
-      const parsedRequest = JSON.parse(res.body.extra.raw)
-      
-      expect(parsedRequest.opts.body.email).toEqual(userDetails.email)
-      expect(parsedRequest.opts.body.queryCode).toEqual("1234")
-      expect(parsedRequest.opts.body.userRef).toEqual(userDetails.firstName)
-    })
-
-  });
 })

package/src/automations/automationUtils.js

@@ -1,10 +1,5 @@
 const { getTable } = require("../api/controllers/table/utils")
-const {
-  findHBSBlocks,
-  decodeJSBinding,
-  isJSBinding,
-  encodeJSBinding,
-} = require("@budibase/string-templates")
+const { findHBSBlocks } = require("@budibase/string-templates")
 
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
@@ -82,21 +77,11 @@ exports.getError = err => {
 }
 
 exports.substituteLoopStep = (hbsString, substitute) => {
-  let blocks = []
-  let checkForJS = isJSBinding(hbsString)
-  if (checkForJS) {
-    hbsString = decodeJSBinding(hbsString)
-    blocks.push(hbsString)
-  } else {
-    blocks = findHBSBlocks(hbsString)
-  }
+  let blocks = findHBSBlocks(hbsString)
   for (let block of blocks) {
+    let oldBlock = block
     block = block.replace(/loop/, substitute)
-    if (checkForJS) {
-      hbsString = encodeJSBinding(block)
-    } else {
-      hbsString = block
-    }
+    hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block)
   }
 
   return hbsString