Commit 4299cd5

Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will return `null` if the input cannot be parsed as opposed to throwing the way the constructor does. Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #64965 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5

5 files changed

Lines changed: 55 additions & 23 deletions

File tree

‎doc/api/util.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML

‎lib/internal/data_url.js‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.

‎lib/internal/inspector/network.js‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,

‎lib/internal/mime.js‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
StringPrototypeIndexOf,
1111
StringPrototypeSlice,
1212
StringPrototypeToLowerCase,
13+
Symbol,
1314
SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
#type;
336342
#subtype;
337343
#parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){

‎test/parallel/test-mime-api.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 4299cd5
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
util: add non-throwing MIMEType.parse
Similar to `URL.parse(...)`, the `MIMEType.parse(...)` API will
return `null` if the input cannot be parsed as opposed to throwing
the way the constructor does.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: #64965
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 0cf7993 commit 4299cd5
5 files changed
Lines changed: 55 additions & 23 deletions
File tree
‎doc/api/util.md‎
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,18 @@ console.log(JSON.stringify(myMIMES));
18961896
// Prints: ["image/png", "image/gif"]
18971897
```
18981898

1899+
### `MIMEType.parse(string)`
1900+
1901+
<!--
1902+
added: REPLACEME
1903+
-->
1904+
1905+
*`string` {string} The input MIME to parse
1906+
* Returns: {MIMEType|null}
1907+
1908+
Attempts to parse the given `string` as a MIMEType. If the string cannot be
1909+
parsed, `null` is returned.
1910+
18991911
## Class: `util.MIMEParams`
19001912

19011913
<!-- YAML
‎lib/internal/data_url.js‎
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ function dataURLProcessor(dataURL) {
117117
// mimeType.
118118
// 14. If mimeTypeRecord is failure, then set
119119
// mimeTypeRecord to text/plain;charset=US-ASCII.
120-
letmimeTypeRecord;
121-
122-
try{
123-
mimeTypeRecord=newMIMEType(mimeType);
124-
}catch{
125-
mimeTypeRecord=newMIMEType('text/plain;charset=US-ASCII');
126-
}
120+
constmimeTypeRecord=MIMEType.parse(mimeType)||
121+
newMIMEType('text/plain;charset=US-ASCII');
127122

128123
// 15. Return a new data: URL struct whose MIME
129124
// type is mimeTypeRecord and body is body.
‎lib/internal/inspector/network.js‎
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,9 @@ function getNextRequestId() {
5252
};
5353

5454
functionsniffMimeType(contentType){
55-
letmimeType;
56-
letcharset;
57-
try{
58-
constmimeTypeObj=newMIMEType(contentType);
59-
mimeType=StringPrototypeToLowerCase(mimeTypeObj.essence||'');
60-
charset=StringPrototypeToLowerCase(mimeTypeObj.params.get('charset')||'');
61-
}catch{
62-
mimeType='';
63-
charset='';
64-
}
55+
constmimeTypeObj=MIMEType.parse(contentType);
56+
constmimeType=StringPrototypeToLowerCase(mimeTypeObj?.essence||'');
57+
constcharset=StringPrototypeToLowerCase(mimeTypeObj?.params.get('charset')||'');
6558

6659
return{
6760
__proto__: null,
‎lib/internal/mime.js‎
Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const {
1010
 StringPrototypeIndexOf,
1111
 StringPrototypeSlice,
1212
 StringPrototypeToLowerCase,
13+
 Symbol,
1314
 SymbolIterator,
1415
}=primordials;
1516
const{
17+
ERR_ILLEGAL_CONSTRUCTOR,
1618
ERR_INVALID_MIME_SYNTAX,
1719
}=require('internal/errors').codes;
1820

@@ -22,6 +24,8 @@ const NOT_HTTP_QUOTED_STRING_CODE_POINT = /[^\t\u0020-~\u0080-\u00FF]/g;
2224
constEND_BEGINNING_WHITESPACE=/[^\r\n\t]|$/;
2325
constSTART_ENDING_WHITESPACE=/[\r\n\t]*$/;
2426

27+
constkNoThrow=Symbol('kNoThrow');
28+
2529
functiontoASCIILower(str){
2630
// eslint-disable-next-line no-control-regex
2731
if(!/[^\x00-\x7f]/.test(str))returnStringPrototypeToLowerCase(str);
@@ -39,7 +43,7 @@ function toASCIILower(str) {
3943
constSOLIDUS='/';
4044
constSEMICOLON=';';
4145

42-
functionparseTypeAndSubtype(str){
46+
functionparseTypeAndSubtype(str,noThrow=null){
4347
// Skip only HTTP whitespace from start
4448
letposition=SafeStringPrototypeSearch(str,END_BEGINNING_WHITESPACE);
4549
// read until '/'
@@ -50,6 +54,7 @@ function parseTypeAndSubtype(str) {
5054
constinvalidTypeIndex=SafeStringPrototypeSearch(trimmedType,
5155
NOT_HTTP_TOKEN_CODE_POINT);
5256
if(trimmedType===''||invalidTypeIndex!==-1||typeEnd===-1){
57+
if(noThrow===kNoThrow)returnnull;
5358
thrownewERR_INVALID_MIME_SYNTAX('type',str,invalidTypeIndex);
5459
}
5560
// skip type and '/'
@@ -72,6 +77,7 @@ function parseTypeAndSubtype(str) {
7277
constinvalidSubtypeIndex=SafeStringPrototypeSearch(trimmedSubtype,
7378
NOT_HTTP_TOKEN_CODE_POINT);
7479
if(trimmedSubtype===''||invalidSubtypeIndex!==-1){
80+
if(noThrow===kNoThrow)returnnull;
7581
thrownewERR_INVALID_MIME_SYNTAX('subtype',str,invalidSubtypeIndex);
7682
}
7783
constsubtype=toASCIILower(trimmedSubtype);
@@ -335,12 +341,24 @@ class MIMEType {
335341
 #type;
336342
 #subtype;
337343
 #parameters;
338-
constructor(string){
344+
constructor(string,noThrowSymbol=null){
339345
string=`${string}`;
340-
constdata=parseTypeAndSubtype(string);
341-
this.#type =data[0];
342-
this.#subtype =data[1];
343-
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
346+
// noThrowSymbol can be null or kNoThrow, but not any other value
347+
if(noThrowSymbol!=null&&noThrowSymbol!==kNoThrow){
348+
thrownewERR_ILLEGAL_CONSTRUCTOR();
349+
}
350+
constdata=parseTypeAndSubtype(string,noThrowSymbol);
351+
if(data!=null){
352+
this.#type =data[0];
353+
this.#subtype =data[1];
354+
this.#parameters =instantiateMimeParams(StringPrototypeSlice(string,data[2]));
355+
}
356+
}
357+
358+
// Like the constructor, but returns null instead of throwing on invalid input.
359+
staticparse(string){
360+
constmt=newMIMEType(string,kNoThrow);
361+
returnmt.type ? mt : null;
344362
}
345363

346364
gettype(){
‎test/parallel/test-mime-api.js‎
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,17 @@ assert.throws(() => params.set('x', `x${NOT_HTTP_QUOTED_STRING_CODE_POINT}`), /p
185185
assert.strictEqual(params.has('foo'),false);
186186
assert.deepStrictEqual([...params],[]);
187187
}
188+
189+
{
190+
// Non-throwing MimeType.parse, works for valid
191+
constmime=MIMEType.parse('text/plain;Charset=value');
192+
assert.strictEqual(mime.params.get('Charset'),'value');
193+
assert.strictEqual(mime.params.get('charset'),'value');
194+
assert.strictEqual(mime.params.get('CHARSET'),'value');
195+
assert.strictEqual(mime.params.has('Charset'),true);
196+
assert.strictEqual(`${mime.params}`,'charset=value');
197+
198+
// Returns null on Invalid
199+
constinvalidMime=MIMEType.parse('text plain');
200+
assert.strictEqual(invalidMime,null);
201+
}
0 commit comments
Comments
 (0)