src,test: expand test coverage for urlpattern and fix error

jasnell · targos · commit 93d0beb6c875 · 2025-02-05T10:35:26.000+01:00
PR-URL: #56878 Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
diff --git a/src/node_url_pattern.cc b/src/node_url_pattern.cc
@@ -104,13 +104,14 @@ URLPatternRegexProvider::regex_search(std::string_view input,
       return std::nullopt;
     }
 
+    // V8 checks that the regexp exec result is one of the correct types.
+    DCHECK_IMPLIES(!entry->IsUndefined(), entry->IsString());
+
     if (entry->IsUndefined()) {
       result.emplace_back(std::nullopt);
     } else if (entry->IsString()) {
       Utf8Value utf8_entry(isolate, entry.As<String>());
       result.emplace_back(utf8_entry.ToString());
-    } else {
-      UNREACHABLE("v8::RegExp::Exec return a non-string, non-undefined value.");
     }
   }
   return result;
@@ -191,7 +192,8 @@ void URLPattern::New(const FunctionCallbackInfo<Value>& args) {
         return;
       }
     } else {
-      THROW_ERR_MISSING_ARGS(env, "baseURL or options must be provided");
+      THROW_ERR_INVALID_ARG_TYPE(env,
+                                 "second argument must be a string or object");
       return;
     }
 
diff --git a/test/parallel/test-urlpattern-types.js b/test/parallel/test-urlpattern-types.js
@@ -0,0 +1,46 @@
+'use strict';
+
+require('../common');
+
+const { URLPattern } = require('url');
+const { throws } = require('assert');
+
+// Verifies that calling URLPattern with no new keyword throws.
+throws(() => URLPattern(), {
+  code: 'ERR_CONSTRUCT_CALL_REQUIRED',
+});
+
+// Verifies that type checks are performed on the arguments.
+throws(() => new URLPattern(1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+throws(() => new URLPattern({}, 1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+throws(() => new URLPattern({}, '', 1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+throws(() => new URLPattern({}, { ignoreCase: '' }), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+const pattern = new URLPattern();
+
+throws(() => pattern.exec(1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+throws(() => pattern.exec('', 1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+throws(() => pattern.test(1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});
+
+throws(() => pattern.test('', 1), {
+  code: 'ERR_INVALID_ARG_TYPE',
+});

Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,14 @@ URLPatternRegexProvider::regex_search(std::string_view input,`
`104`	`104`	`return std::nullopt;`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ // V8 checks that the regexp exec result is one of the correct types.`
	`108`	`+ DCHECK_IMPLIES(!entry->IsUndefined(), entry->IsString());`
	`109`	`+`
`107`	`110`	`if (entry->IsUndefined()) {`
`108`	`111`	`result.emplace_back(std::nullopt);`
`109`	`112`	`} else if (entry->IsString()) {`
`110`	`113`	`Utf8Value utf8_entry(isolate, entry.As<String>());`
`111`	`114`	`result.emplace_back(utf8_entry.ToString());`
`112`		`- } else {`
`113`		`- UNREACHABLE("v8::RegExp::Exec return a non-string, non-undefined value.");`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`	`return result;`
`@@ -191,7 +192,8 @@ void URLPattern::New(const FunctionCallbackInfo<Value>& args) {`
`191`	`192`	`return;`
`192`	`193`	`}`
`193`	`194`	`} else {`
`194`		`- THROW_ERR_MISSING_ARGS(env, "baseURL or options must be provided");`
	`195`	`+ THROW_ERR_INVALID_ARG_TYPE(env,`
	`196`	`+ "second argument must be a string or object");`
`195`	`197`	`return;`
`196`	`198`	`}`
`197`	`199`