Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix JS_DetectModule if the first statement is an await #517

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Fix JS_DetectModule if the first statement is an await #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jobs:
build\${{matrix.buildType}}\qjs.exe tests\test_std.js
build\${{matrix.buildType}}\qjs.exe tests\test_worker.js
build\${{matrix.buildType}}\qjs.exe tests\test_queue_microtask.js
build\${{matrix.buildType}}\qjs.exe tests\test_module_detect.js
build\${{matrix.buildType}}\function_source.exe

windows-clang:
Expand Down Expand Up @@ -241,6 +242,7 @@ jobs:
build\${{matrix.buildType}}\qjs.exe tests\test_std.js
build\${{matrix.buildType}}\qjs.exe tests\test_worker.js
build\${{matrix.buildType}}\qjs.exe tests\test_queue_microtask.js
build\${{matrix.buildType}}\qjs.exe tests\test_module_detect.js
build\${{matrix.buildType}}\function_source.exe

windows-ninja:
Expand Down Expand Up @@ -274,6 +276,7 @@ jobs:
build\qjs.exe tests\test_std.js
build\qjs.exe tests\test_worker.js
build\qjs.exe tests\test_queue_microtask.js
build\qjs.exe tests\test_module_detect.js
build\function_source.exe

windows-mingw:
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ test: $(QJS)
$(QJS) tests/test_std.js
$(QJS) tests/test_worker.js
$(QJS) tests/test_queue_microtask.js
$(QJS) tests/test_module_detect.js

testconv: $(BUILD_DIR)/test_conv
$(BUILD_DIR)/test_conv
Expand Down
11 changes: 9 additions & 2 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20007,6 +20007,9 @@ static int simple_next_token(const uint8_t **pp, BOOL no_line_terminator)
p[2] == 'c' && p[3] == 't' && p[4] == 'i' &&
p[5] == 'o' && p[6] == 'n' && !lre_js_is_ident_next(p[7])) {
return TOK_FUNCTION;
} else if (c == 'a' && p[0] == 'w' && p[1] == 'a' &&
p[2] == 'i' && p[3] == 't' && !lre_js_is_ident_next(p[4])) {
return TOK_AWAIT;
}
return TOK_IDENT;
}
Expand Down Expand Up @@ -20048,8 +20051,11 @@ static void skip_shebang(const uint8_t **pp, const uint8_t *buf_end)
/* return true if 'input' contains the source of a module
(heuristic). 'input' must be a zero terminated.

Heuristic: skip comments and expect 'import' keyword not followed
by '(' or '.' or export keyword.
Heuristic:
- Skip comments
- Expect 'import' keyword not followed by '(' or '.'
- Expect 'export' keyword
- Expect 'await' keyword
*/
/* input is pure ASCII or UTF-8 encoded source code */
BOOL JS_DetectModule(const char *input, size_t input_len)
Expand All @@ -20062,6 +20068,7 @@ BOOL JS_DetectModule(const char *input, size_t input_len)
case TOK_IMPORT:
tok = simple_next_token(&p, FALSE);
return (tok != '.' && tok != '(');
case TOK_AWAIT:
case TOK_EXPORT:
return TRUE;
default:
Expand Down
5 changes: 5 additions & 0 deletions tests/test_module_detect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// This needs to be parsed as a module or will throw SyntaxError.
//

await 0;

Loading