fix: unecessary error wrapping in browser bundles

harttle · Aug 22, 2023 · 9bbfa3c · 9bbfa3c
1 parent 96f136c
commit 9bbfa3c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/parser/parser.ts b/src/parser/parser.ts
@@ -48,7 +48,7 @@ export class Parser {
       }
       return new HTML(token)
     } catch (e) {
-      if (e instanceof LiquidError) throw e
+      if (LiquidError.is(e)) throw e
       throw new ParseError(e as Error, token)
     }
   }

diff --git a/src/util/error.ts b/src/util/error.ts
@@ -2,6 +2,11 @@ import * as _ from './underscore'
 import { Token } from '../tokens/token'
 import { Template } from '../template/template'
 
+/**
+ * targeting ES5, extends Error won't create a proper prototype chain, need a trait to kee track of classes
+ */
+const TRAIT = '__liquidClass__'
+
 export abstract class LiquidError extends Error {
   private token!: Token
   public context = ''
@@ -14,6 +19,7 @@ export abstract class LiquidError extends Error {
     super(typeof err === 'string' ? err : err.message)
     if (typeof err !== 'string') Object.defineProperty(this, 'originalError', { value: err, enumerable: false })
     Object.defineProperty(this, 'token', { value: token, enumerable: false })
+    Object.defineProperty(this, TRAIT, { value: 'LiquidError', enumerable: false })
   }
   protected update () {
     Object.defineProperty(this, 'context', { value: mkContext(this.token), enumerable: false })
@@ -22,6 +28,9 @@ export abstract class LiquidError extends Error {
       '\n' + this.stack
     if (this.originalError) this.stack += '\nFrom ' + this.originalError.stack
   }
+  static is (obj: unknown): obj is LiquidError {
+    return obj?.[TRAIT] === 'LiquidError'
+  }
 }
 
 export class TokenizationError extends LiquidError {

diff --git a/test/e2e/browser.spec.ts b/test/e2e/browser.spec.ts
@@ -7,4 +7,18 @@ describe('browser', function () {
       message: 'output "{{huh" not closed, line:1, col:1'
     })
   })
+  it('should throw tokenization error for invalid filter syntax', async () => {
+    const engine = new LiquidUMD()
+    const message = 'expected filter name, line:1, col:10'
+    const stack = [
+      '>> 1| {{ foo | ^ }}',
+      '               ^',
+      `TokenizationError: ${message}`
+    ].join('\n')
+    await expect(engine.parseAndRender('{{ foo | ^ }}')).rejects.toMatchObject({
+      message,
+      stack: expect.stringContaining(stack),
+      name: 'TokenizationError'
+    })
+  })
 })