Skip to content

Commit

Permalink
src,test: expand test coverage for urlpattern and fix error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jasnell authored and targos committed Feb 5, 2025
1 parent edb194b commit 93d0beb
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/node_url_pattern.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
46 changes: 46 additions & 0 deletions test/parallel/test-urlpattern-types.js
Original file line number Diff line number Diff line change
@@ -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',
});

0 comments on commit 93d0beb

Please sign in to comment.