whatwg-mimetype 2.3.0 → 4.0.0

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 2017–2018 Domenic Denicola <d@domenic.me>
+Copyright © Domenic Denicola <d@domenic.me>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -24,7 +24,7 @@ console.assert(mimeType.isXML() === false);
 
 Parsing is a fairly complex process; see [the specification](https://mimesniff.spec.whatwg.org/#parsing-a-mime-type) for details (and similarly [for serialization](https://mimesniff.spec.whatwg.org/#serializing-a-mime-type)).
 
-This package's algorithms conform to those of the WHATWG [MIME Sniffing Standard](https://mimesniff.spec.whatwg.org/), and is aligned up to commit [126286a](https://github.com/whatwg/mimesniff/commit/126286ab2dcf3e2d541349ed93539a88bf394ad5).
+This package's algorithms conform to those of the WHATWG [MIME Sniffing Standard](https://mimesniff.spec.whatwg.org/), and is aligned up to commit [8e9a7dd](https://github.com/whatwg/mimesniff/commit/8e9a7dd90717c595a4e4d982cd216e4411d33736).
 
 ## `MIMEType` API
 
@@ -52,7 +52,7 @@ As an alternative to the constructor, you can use `MIMEType.parse(string)`. The
 - `toString()` serializes the MIME type to a string
 - `isHTML()`: returns true if this instance represents [a HTML MIME type](https://mimesniff.spec.whatwg.org/#html-mime-type)
 - `isXML()`: returns true if this instance represents [an XML MIME type](https://mimesniff.spec.whatwg.org/#xml-mime-type)
-- `isJavaScript({ allowParameters })`: returns true if this instance represents [a JavaScript MIME type](https://html.spec.whatwg.org/multipage/scripting.html#javascript-mime-type); `allowParameters` can be set to true to allow arbitrary parameters, instead of their presence causing the method to return `false`
+- `isJavaScript({ prohibitParameters })`: returns true if this instance represents [a JavaScript MIME type](https://html.spec.whatwg.org/multipage/scripting.html#javascript-mime-type). `prohibitParameters` can be set to true to disallow any parameters, i.e. to test if the MIME type's serialization is a [JavaScript MIME type essence match](https://mimesniff.spec.whatwg.org/#javascript-mime-type-essence-match).
 
 _Note: the `isHTML()`, `isXML()`, and `isJavaScript()` methods are speculative, and may be removed or changed in future major versions. See [whatwg/mimesniff#48](https://github.com/whatwg/mimesniff/issues/48) for brainstorming in this area. Currently we implement these mainly because they are useful in jsdom._
 

package/lib/mime-type-parameters.js

@@ -0,0 +1,70 @@
+"use strict";
+const {
+  asciiLowercase,
+  solelyContainsHTTPTokenCodePoints,
+  soleyContainsHTTPQuotedStringTokenCodePoints
+} = require("./utils.js");
+
+module.exports = class MIMETypeParameters {
+  constructor(map) {
+    this._map = map;
+  }
+
+  get size() {
+    return this._map.size;
+  }
+
+  get(name) {
+    name = asciiLowercase(String(name));
+    return this._map.get(name);
+  }
+
+  has(name) {
+    name = asciiLowercase(String(name));
+    return this._map.has(name);
+  }
+
+  set(name, value) {
+    name = asciiLowercase(String(name));
+    value = String(value);
+
+    if (!solelyContainsHTTPTokenCodePoints(name)) {
+      throw new Error(`Invalid MIME type parameter name "${name}": only HTTP token code points are valid.`);
+    }
+    if (!soleyContainsHTTPQuotedStringTokenCodePoints(value)) {
+      throw new Error(`Invalid MIME type parameter value "${value}": only HTTP quoted-string token code points are ` +
+                      `valid.`);
+    }
+
+    return this._map.set(name, value);
+  }
+
+  clear() {
+    this._map.clear();
+  }
+
+  delete(name) {
+    name = asciiLowercase(String(name));
+    return this._map.delete(name);
+  }
+
+  forEach(callbackFn, thisArg) {
+    this._map.forEach(callbackFn, thisArg);
+  }
+
+  keys() {
+    return this._map.keys();
+  }
+
+  values() {
+    return this._map.values();
+  }
+
+  entries() {
+    return this._map.entries();
+  }
+
+  [Symbol.iterator]() {
+    return this._map[Symbol.iterator]();
+  }
+};

package/lib/mime-type.js

@@ -1,10 +1,10 @@
 "use strict";
+const MIMETypeParameters = require("./mime-type-parameters.js");
 const parse = require("./parser.js");
 const serialize = require("./serializer.js");
 const {
   asciiLowercase,
-  solelyContainsHTTPTokenCodePoints,
-  soleyContainsHTTPQuotedStringTokenCodePoints
+  solelyContainsHTTPTokenCodePoints
 } = require("./utils.js");
 
 module.exports = class MIMEType {
@@ -76,7 +76,7 @@ module.exports = class MIMEType {
     return serialize(this);
   }
 
-  isJavaScript({ allowParameters = false } = {}) {
+  isJavaScript({ prohibitParameters = false } = {}) {
     switch (this._type) {
       case "text": {
         switch (this._subtype) {
@@ -92,7 +92,7 @@ module.exports = class MIMEType {
           case "livescript":
           case "x-ecmascript":
           case "x-javascript": {
-            return allowParameters || this._parameters.size === 0;
+            return !prohibitParameters || this._parameters.size === 0;
           }
           default: {
             return false;
@@ -105,7 +105,7 @@ module.exports = class MIMEType {
           case "javascript":
           case "x-ecmascript":
           case "x-javascript": {
-            return allowParameters || this._parameters.size === 0;
+            return !prohibitParameters || this._parameters.size === 0;
           }
           default: {
             return false;
@@ -125,67 +125,3 @@ module.exports = class MIMEType {
     return this._subtype === "html" && this._type === "text";
   }
 };
-
-class MIMETypeParameters {
-  constructor(map) {
-    this._map = map;
-  }
-
-  get size() {
-    return this._map.size;
-  }
-
-  get(name) {
-    name = asciiLowercase(String(name));
-    return this._map.get(name);
-  }
-
-  has(name) {
-    name = asciiLowercase(String(name));
-    return this._map.has(name);
-  }
-
-  set(name, value) {
-    name = asciiLowercase(String(name));
-    value = String(value);
-
-    if (!solelyContainsHTTPTokenCodePoints(name)) {
-      throw new Error(`Invalid MIME type parameter name "${name}": only HTTP token code points are valid.`);
-    }
-    if (!soleyContainsHTTPQuotedStringTokenCodePoints(value)) {
-      throw new Error(`Invalid MIME type parameter value "${value}": only HTTP quoted-string token code points are ` +
-                      `valid.`);
-    }
-
-    return this._map.set(name, value);
-  }
-
-  clear() {
-    this._map.clear();
-  }
-
-  delete(name) {
-    name = asciiLowercase(String(name));
-    return this._map.delete(name);
-  }
-
-  forEach(callbackFn, thisArg) {
-    this._map.forEach(callbackFn, thisArg);
-  }
-
-  keys() {
-    return this._map.keys();
-  }
-
-  values() {
-    return this._map.values();
-  }
-
-  entries() {
-    return this._map.entries();
-  }
-
-  [Symbol.iterator]() {
-    return this._map[Symbol.iterator]();
-  }
-}

package/lib/parser.js

@@ -5,7 +5,8 @@ const {
   isHTTPWhitespaceChar,
   solelyContainsHTTPTokenCodePoints,
   soleyContainsHTTPQuotedStringTokenCodePoints,
-  asciiLowercase
+  asciiLowercase,
+  collectAnHTTPQuotedString
 } = require("./utils.js");
 
 module.exports = input => {
@@ -71,35 +72,15 @@ module.exports = input => {
       ++position;
     }
 
-    let parameterValue = "";
+    let parameterValue = null;
     if (input[position] === "\"") {
-      ++position;
-
-      while (true) {
-        while (position < input.length && input[position] !== "\"" && input[position] !== "\\") {
-          parameterValue += input[position];
-          ++position;
-        }
-
-        if (position < input.length && input[position] === "\\") {
-          ++position;
-          if (position < input.length) {
-            parameterValue += input[position];
-            ++position;
-            continue;
-          } else {
-            parameterValue += "\\";
-            break;
-          }
-        } else {
-          break;
-        }
-      }
+      [parameterValue, position] = collectAnHTTPQuotedString(input, position);
 
       while (position < input.length && input[position] !== ";") {
         ++position;
       }
     } else {
+      parameterValue = "";
       while (position < input.length && input[position] !== ";") {
         parameterValue += input[position];
         ++position;

package/lib/serializer.js

@@ -14,7 +14,7 @@ module.exports = mimeType => {
     serialization += "=";
 
     if (!solelyContainsHTTPTokenCodePoints(value) || value.length === 0) {
-      value = value.replace(/(["\\])/g, "\\$1");
+      value = value.replace(/(["\\])/ug, "\\$1");
       value = `"${value}"`;
     }
 

package/lib/utils.js

@@ -1,11 +1,11 @@
 "use strict";
 
 exports.removeLeadingAndTrailingHTTPWhitespace = string => {
-  return string.replace(/^[ \t\n\r]+/, "").replace(/[ \t\n\r]+$/, "");
+  return string.replace(/^[ \t\n\r]+/u, "").replace(/[ \t\n\r]+$/u, "");
 };
 
 exports.removeTrailingHTTPWhitespace = string => {
-  return string.replace(/[ \t\n\r]+$/, "");
+  return string.replace(/[ \t\n\r]+$/u, "");
 };
 
 exports.isHTTPWhitespaceChar = char => {
@@ -13,13 +13,48 @@ exports.isHTTPWhitespaceChar = char => {
 };
 
 exports.solelyContainsHTTPTokenCodePoints = string => {
-  return /^[-!#$%&'*+.^_`|~A-Za-z0-9]*$/.test(string);
+  return /^[-!#$%&'*+.^_`|~A-Za-z0-9]*$/u.test(string);
 };
 
 exports.soleyContainsHTTPQuotedStringTokenCodePoints = string => {
-  return /^[\t\u0020-\u007E\u0080-\u00FF]*$/.test(string);
+  return /^[\t\u0020-\u007E\u0080-\u00FF]*$/u.test(string);
 };
 
 exports.asciiLowercase = string => {
-  return string.replace(/[A-Z]/g, l => l.toLowerCase());
+  return string.replace(/[A-Z]/ug, l => l.toLowerCase());
+};
+
+// This variant only implements it with the extract-value flag set.
+exports.collectAnHTTPQuotedString = (input, position) => {
+  let value = "";
+
+  position++;
+
+  while (true) {
+    while (position < input.length && input[position] !== "\"" && input[position] !== "\\") {
+      value += input[position];
+      ++position;
+    }
+
+    if (position >= input.length) {
+      break;
+    }
+
+    const quoteOrBackslash = input[position];
+    ++position;
+
+    if (quoteOrBackslash === "\\") {
+      if (position >= input.length) {
+        value += "\\";
+        break;
+      }
+
+      value += input[position];
+      ++position;
+    } else {
+      break;
+    }
+  }
+
+  return [value, position];
 };

package/package.json

@@ -8,7 +8,7 @@
     "http",
     "whatwg"
   ],
-  "version": "2.3.0",
+  "version": "4.0.0",
   "author": "Domenic Denicola <d@domenic.me> (https://domenic.me/)",
   "license": "MIT",
   "repository": "jsdom/whatwg-mimetype",
@@ -17,27 +17,29 @@
     "lib/"
   ],
   "scripts": {
-    "test": "jest",
-    "coverage": "jest --coverage",
+    "test": "node --test",
+    "coverage": "c8 node --test --experimental-test-coverage",
     "lint": "eslint .",
     "pretest": "node scripts/get-latest-platform-tests.js"
   },
   "devDependencies": {
-    "eslint": "^5.9.0",
-    "jest": "^23.6.0",
+    "@domenic/eslint-config": "^3.0.0",
+    "c8": "^8.0.1",
+    "eslint": "^8.53.0",
     "printable-string": "^0.3.0",
-    "request": "^2.88.0",
-    "whatwg-encoding": "^1.0.5"
+    "whatwg-encoding": "^3.0.0"
   },
-  "jest": {
-    "coverageDirectory": "coverage",
-    "coverageReporters": [
-      "lcov",
-      "text-summary"
+  "engines": {
+    "node": ">=18"
+  },
+  "c8": {
+    "reporter": [
+      "text",
+      "html"
     ],
-    "testEnvironment": "node",
-    "testMatch": [
-      "<rootDir>/test/**/*.js"
+    "exclude": [
+      "scripts/",
+      "test/"
     ]
   }
 }