| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 4f004ef commit 2a11d50
2 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1446,6 +1446,12 @@ static std::vector<std::string_view> throws_only_in_cjs_error_messages = { | |||
| 1446 | 1446 | "await is only valid in async functions and " | |
| 1447 | 1447 | "the top level bodies of modules"}; | |
| 1448 | 1448 | ||
| 1449 | + static const auto maybe_top_level_await_errors = | ||
| 1450 | + std::array<std::string_view, 2>{ | ||
| 1451 | + "missing ) after argument list", // example: `func(await 1);` | ||
| 1452 | + "SyntaxError: Unexpected" // example: `if(await 1)` | ||
| 1453 | + }; | ||
| 1454 | + | ||
| 1449 | 1455 | // If cached_data is provided, it would be used for the compilation and | |
| 1450 | 1456 | // the on-disk compilation cache from NODE_COMPILE_CACHE (if configured) | |
| 1451 | 1457 | // would be ignored. | |
@@ -1654,6 +1660,16 @@ bool ShouldRetryAsESM(Realm* realm, | |||
| 1654 | 1660 | break; | |
| 1655 | 1661 | } | |
| 1656 | 1662 | } | |
| 1663 | + | ||
| 1664 | + for (const auto& error_message : maybe_top_level_await_errors) { | ||
| 1665 | + if (message_view.find(error_message) != std::string_view::npos) { | ||
| 1666 | + // If the error message is related to top-level await, we can try to | ||
| 1667 | + // compile it as ESM. | ||
| 1668 | + maybe_valid_in_esm = true; | ||
| 1669 | + break; | ||
| 1670 | + } | ||
| 1671 | + } | ||
| 1672 | + | ||
| 1657 | 1673 | if (!maybe_valid_in_esm) { | |
| 1658 | 1674 | return false; | |
| 1659 | 1675 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,78 @@ | |||
| 1 | + import { spawnPromisified } from '../common/index.mjs'; | ||
| 2 | + import { describe, it } from 'node:test'; | ||
| 3 | + import { strictEqual, match } from 'node:assert'; | ||
| 4 | + | ||
| 5 | + describe('unusual top-level await syntax errors', () => { | ||
| 6 | + const expressions = [ | ||
| 7 | + // string | ||
| 8 | + { expression: '""' }, | ||
| 9 | + // number | ||
| 10 | + { expression: '0' }, | ||
| 11 | + // boolean | ||
| 12 | + { expression: 'true' }, | ||
| 13 | + // null | ||
| 14 | + { expression: 'null' }, | ||
| 15 | + // undefined | ||
| 16 | + { expression: 'undefined' }, | ||
| 17 | + // object | ||
| 18 | + { expression: '{}' }, | ||
| 19 | + // array | ||
| 20 | + { expression: '[]' }, | ||
| 21 | + // new | ||
| 22 | + { expression: 'new Date()' }, | ||
| 23 | + // identifier | ||
| 24 | + { initialize: 'const a = 2;', expression: 'a' }, | ||
| 25 | + ]; | ||
| 26 | + it('should not crash the process', async () => { | ||
| 27 | + for (const { expression, initialize } of expressions) { | ||
| 28 | + const wrapperExpressions = [ | ||
| 29 | + `function callAwait() {}; callAwait(await ${expression});`, | ||
| 30 | + `if (await ${expression}) {}`, | ||
| 31 | + `{ key: await ${expression} }`, | ||
| 32 | + `[await ${expression}]`, | ||
| 33 | + `(await ${expression})`, | ||
| 34 | + ]; | ||
| 35 | + for (const wrapperExpression of wrapperExpressions) { | ||
| 36 | + const { code, signal, stdout, stderr } = await spawnPromisified(process.execPath, [ | ||
| 37 | + '--eval', | ||
| 38 | + ` | ||
| 39 | + ${initialize || ''} | ||
| 40 | + ${wrapperExpression} | ||
| 41 | + `, | ||
| 42 | + ]); | ||
| 43 | + | ||
| 44 | + strictEqual(stderr, ''); | ||
| 45 | + strictEqual(stdout, ''); | ||
| 46 | + strictEqual(code, 0); | ||
| 47 | + strictEqual(signal, null); | ||
| 48 | + } | ||
| 49 | + } | ||
| 50 | + }); | ||
| 51 | + | ||
| 52 | + it('should throw the error for unrelated syntax errors', async () => { | ||
| 53 | + const expression = 'foo bar'; | ||
| 54 | + const wrapperExpressions = [ | ||
| 55 | + [`function callSyntaxError() {}; callSyntaxError(${expression});`, /missing \) after argument list/], | ||
| 56 | + [`if (${expression}) {}`, /Unexpected identifier/], | ||
| 57 | + [`{ key: ${expression} }`, /Unexpected identifier/], | ||
| 58 | + [`[${expression}]`, /Unexpected identifier/], | ||
| 59 | + [`(${expression})`, /Unexpected identifier/], | ||
| 60 | + [`const ${expression} = 1;`, /Missing initializer in const declaration/], | ||
| 61 | + ['console.log(\'PI: \' Math.PI);', /missing \) after argument list/], | ||
| 62 | + ['callAwait(await "" "");', /missing \) after argument list/], | ||
| 63 | + ]; | ||
| 64 | + | ||
| 65 | + for (const [wrapperExpression, error] of wrapperExpressions) { | ||
| 66 | + const { code, signal, stdout, stderr } = await spawnPromisified(process.execPath, [ | ||
| 67 | + '--eval', | ||
| 68 | + ` | ||
| 69 | + ${wrapperExpression} | ||
| 70 | + `, | ||
| 71 | + ]); | ||
| 72 | + match(stderr, error); | ||
| 73 | + strictEqual(stdout, ''); | ||
| 74 | + strictEqual(code, 1); | ||
| 75 | + strictEqual(signal, null); | ||
| 76 | + } | ||
| 77 | + }); | ||
| 78 | + }); | ||
| Back | FazBrowse Home | New Git URL |
0 commit comments