Skip to content

Commit ea9b2a7

Browse files
committed
Parser: improved message when a module cannot be loaded.
This is less confusing because it covers more cases, including when there are not enough file access rights.
1 parent 1985390 commit ea9b2a7

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

src/njs_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ njs_module_require(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
148148

149149
module = njs_module_find(vm, &name, 0);
150150
if (njs_slow_path(module == NULL)) {
151-
njs_error(vm, "Cannot find module \"%V\"", &name);
151+
njs_error(vm, "Cannot load module \"%V\"", &name);
152152

153153
return NJS_ERROR;
154154
}

src/njs_parser.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8114,7 +8114,7 @@ njs_parser_module(njs_parser_t *parser, njs_str_t *name)
81148114
vm = parser->vm;
81158115

81168116
if (name->length == 0) {
8117-
njs_parser_syntax_error(parser, "Cannot find module \"%V\"", name);
8117+
njs_parser_syntax_error(parser, "Cannot load module \"%V\"", name);
81188118
return NULL;
81198119
}
81208120

@@ -8124,13 +8124,14 @@ njs_parser_module(njs_parser_t *parser, njs_str_t *name)
81248124
}
81258125

81268126
if (vm->module_loader == NULL) {
8127-
njs_parser_syntax_error(parser, "Cannot load module \"%V\"", name);
8127+
njs_parser_syntax_error(parser,
8128+
"Module loader callback is not provided");
81288129
return NULL;
81298130
}
81308131

81318132
module = vm->module_loader(vm, vm->module_loader_opaque, name);
81328133
if (module == NULL) {
8133-
njs_parser_syntax_error(parser, "Cannot find module \"%V\"", name);
8134+
njs_parser_syntax_error(parser, "Cannot load module \"%V\"", name);
81348135
return NULL;
81358136
}
81368137

src/test/njs_unit_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18975,7 +18975,7 @@ static njs_unit_test_t njs_test[] =
1897518975
/* require(). */
1897618976

1897718977
{ njs_str("require('unknown_module')"),
18978-
njs_str("Error: Cannot find module \"unknown_module\"") },
18978+
njs_str("Error: Cannot load module \"unknown_module\"") },
1897918979

1898018980
{ njs_str("require()"),
1898118981
njs_str("TypeError: missing path") },
@@ -19045,7 +19045,7 @@ static njs_unit_test_t njs_test[] =
1904519045
njs_str("SyntaxError: Unexpected token \"{\" in 1") },
1904619046

1904719047
{ njs_str("import x from ''"),
19048-
njs_str("SyntaxError: Cannot find module \"\" in 1") },
19048+
njs_str("SyntaxError: Cannot load module \"\" in 1") },
1904919049

1905019050
{ njs_str("export"),
1905119051
njs_str("SyntaxError: Illegal export statement in 1") },

test/shell_test_njs.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ njs_test {
173173
# quiet mode
174174

175175
njs_run {"-q" "test/js/import_chain.t.js"} \
176-
"SyntaxError: Cannot find module \"lib2.js\" in 7"
176+
"SyntaxError: Cannot load module \"lib2.js\" in 7"
177177

178178
# sandboxing
179179

180180
njs_test {
181181
{"var fs = require('fs')\r\n"
182-
"Error: Cannot find module \"fs\"\r\n"}
182+
"Error: Cannot load module \"fs\"\r\n"}
183183
} "-s"
184184

185185
njs_test {

0 commit comments

Comments
 (0)