src: throw ERR_MISSING_MODULE in module_wrap.cc

joyeecheung · joyeecheung · commit 02dc307ae2f5 · 2018-04-19T12:12:58.000+08:00
PR-URL: nodejs#20121 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -685,8 +685,7 @@ void ModuleWrap::Resolve(const FunctionCallbackInfo<Value>& args) {
   Maybe<URL> result = node::loader::Resolve(env, specifier_std, url);
   if (result.IsNothing() || (result.FromJust().flags() & URL_FLAGS_FAILED)) {
     std::string msg = "Cannot find module " + specifier_std;
-    env->ThrowError(msg.c_str());
-    return;
+    return node::THROW_ERR_MISSING_MODULE(env, msg.c_str());
   }
 
   args.GetReturnValue().Set(result.FromJust().ToObject(env));
diff --git a/src/node_errors.h b/src/node_errors.h
@@ -21,6 +21,7 @@ namespace node {
   V(ERR_INDEX_OUT_OF_RANGE, RangeError)                                      \
   V(ERR_INVALID_ARG_TYPE, TypeError)                                         \
   V(ERR_MEMORY_ALLOCATION_FAILED, Error)                                     \
+  V(ERR_MISSING_MODULE, Error)                                               \
   V(ERR_STRING_TOO_LONG, Error)                                              \
   V(ERR_BUFFER_TOO_LARGE, Error)
 

Original file line number	Diff line number	Diff line change
`@@ -685,8 +685,7 @@ void ModuleWrap::Resolve(const FunctionCallbackInfo<Value>& args) {`
`685`	`685`	`Maybe<URL> result = node::loader::Resolve(env, specifier_std, url);`
`686`	`686`	`if (result.IsNothing() \|\| (result.FromJust().flags() & URL_FLAGS_FAILED)) {`
`687`	`687`	`std::string msg = "Cannot find module " + specifier_std;`
`688`		`- env->ThrowError(msg.c_str());`
`689`		`- return;`
	`688`	`+ return node::THROW_ERR_MISSING_MODULE(env, msg.c_str());`
`690`	`689`	`}`
`691`	`690`
`692`	`691`	`args.GetReturnValue().Set(result.FromJust().ToObject(env));`