feat: remove whitespace before stack trace lines

discue · Dec 4, 2023 · 4507068 · 4507068
1 parent 23990e1
commit 4507068
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -137,8 +137,8 @@ const result = await executor('process.exit(0)')
 //     "message": "process is not defined",
 //     "stack": [
 //       "ReferenceError: process is not defined",
-//       "    at userSuppliedScript (file:///user-supplied-script.js:1:1)",
-//       "    at runtime.js:38:24"
+//       "at userSuppliedScript (file:///user-supplied-script.js:1:1)",
+//       "at runtime.js:38:24"
 //     ]
 //   },
 //   "durationMillis": 1
@@ -165,9 +165,9 @@ eval(1+1)
 //     "message": "\"eval\" is not allowed in this context.",
 //     "stack": [
 //       "Error: \"eval\" is not allowed in this context.",
-//       "    at global.<computed> (file:///code-generation.js:1:19)",
-//       "    at userSuppliedScript (file:///user-supplied-script.js:2:9)",
-//       "    at runtime.js:38:24"
+//       "at global.<computed> (file:///code-generation.js:1:19)",
+//       "at userSuppliedScript (file:///user-supplied-script.js:2:9)",
+//       "at runtime.js:38:24"
 //     ]
 //   },
 //   "durationMillis": 0

diff --git a/lib/script-handler-runner.js b/lib/script-handler-runner.js
@@ -48,7 +48,7 @@
             cause: e.cause,
             code: e.code,
             message: e.message,
-            stack: e.stack.split('\n')
+            stack: e.stack.split('\n').map(line => line.trim())
         }, { reference: true })
     } finally {
         const end = Date.now()

diff --git a/test/spec/index.spec.js b/test/spec/index.spec.js
@@ -97,19 +97,19 @@ describe('FunctionExecutor', () => {
     it('sets line number 1 correctly in stack trace', async () => {
         const { result, error } = await run('global["String"].a="a"; return global["String"].a', { a: 1, b: 3 })
         expect(result).to.be.undefined
-        expect(error.stack).to.include("    at userSuppliedScript (file:///user-supplied-script.js:1:19)")
+        expect(error.stack).to.include("at userSuppliedScript (file:///user-supplied-script.js:1:19)")
     })
 
     it('sets line number 2 correctly in stack trace', async () => {
         const { result, error } = await run(`
         global["String"].a="a"; return global["String"].a
         `, { a: 1, b: 3 })
         expect(result).to.be.undefined
-        expect(error.stack).to.include("    at userSuppliedScript (file:///user-supplied-script.js:2:27)")
+        expect(error.stack).to.include("at userSuppliedScript (file:///user-supplied-script.js:2:27)")
     })
 
     it('does not provide NodeJS globals like process', async () => {
-        const {result, error} = await run(`process.exit(0)`)
+        const { result, error } = await run(`process.exit(0)`)
         expect(result).to.be.undefined
         expect(error.message).to.equal('process is not defined')
     })
@@ -119,7 +119,7 @@ describe('FunctionExecutor', () => {
         global["String"].a="a"; return global["String"].a
         `, { a: 1, b: 3 })
         expect(result).to.be.undefined
-        expect(error.stack).to.include("    at userSuppliedScript (file:///user-supplied-script.js:2:27)")
+        expect(error.stack).to.include("at userSuppliedScript (file:///user-supplied-script.js:2:27)")
     })
 
     it('is aware of all v8 globals', async () => {
@@ -149,9 +149,11 @@ describe('FunctionExecutor', () => {
     })
 
     it('does not allow execution of eval', async () => {
-        let { result, error } = await run(`
+        let res;
+        let { result, error } = res = await run(`
         eval(1+1)
         `)
+        console.log(JSON.stringify(res, null, 2))
         expect(result).to.be.undefined
         expect(error.message).to.equal('"eval" is not allowed in this context.')
     })