tough-cookie 5.0.0-rc.2 → 5.0.0-rc.3

package/dist/cookie/canonicalDomain.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canonicalDomain = void 0;
+exports.canonicalDomain = canonicalDomain;
 const punycode_js_1 = require("punycode/punycode.js");
 const constants_1 = require("./constants");
 /**
@@ -49,4 +49,3 @@ function canonicalDomain(domainName) {
     }
     return _str.toLowerCase();
 }
-exports.canonicalDomain = canonicalDomain;

package/dist/cookie/cookie.js

@@ -86,7 +86,6 @@ function trimTerminator(str) {
 }
 function parseCookiePair(cookiePair, looseMode) {
     cookiePair = trimTerminator(cookiePair);
-    validators.validate(validators.isString(cookiePair), cookiePair);
     let firstEq = cookiePair.indexOf('=');
     if (looseMode) {
         if (firstEq === 0) {
@@ -390,7 +389,7 @@ class Cookie {
         // used to break creation ties in cookieCompare():
         Object.defineProperty(this, 'creationIndex', {
             configurable: false,
-            enumerable: false,
+            enumerable: false, // important for assert.deepEqual checks
             writable: true,
             value: ++Cookie.cookiesCreated,
         });

package/dist/cookie/cookieCompare.js

@@ -1,31 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cookieCompare = void 0;
-const utils_1 = require("../utils");
-const validators = __importStar(require("../validators"));
+exports.cookieCompare = cookieCompare;
 /**
  * The maximum timestamp a cookie, in milliseconds. The value is (2^31 - 1) seconds since the Unix
  * epoch, corresponding to 2038-01-19.
@@ -88,8 +63,6 @@ const MAX_TIME = 2147483647000;
  * @public
  */
 function cookieCompare(a, b) {
-    validators.validate(validators.isObject(a), (0, utils_1.safeToString)(a));
-    validators.validate(validators.isObject(b), (0, utils_1.safeToString)(b));
     let cmp;
     // descending for length: b CMP a
     const aPathLen = a.path ? a.path.length : 0;
@@ -109,4 +82,3 @@ function cookieCompare(a, b) {
     cmp = (a.creationIndex || 0) - (b.creationIndex || 0);
     return cmp;
 }
-exports.cookieCompare = cookieCompare;

package/dist/cookie/cookieJar.js

@@ -73,7 +73,6 @@ function getCookieContext(url) {
     }
 }
 function checkSameSiteContext(value) {
-    validators.validate(validators.isNonEmptyString(value), value);
     const context = String(value).toLowerCase();
     if (context === 'none' || context === 'lax' || context === 'strict') {
         return context;
@@ -90,7 +89,6 @@ function checkSameSiteContext(value) {
  * @returns boolean
  */
 function isSecurePrefixConditionMet(cookie) {
-    validators.validate(validators.isObject(cookie), (0, utils_1.safeToString)(cookie));
     const startsWithSecurePrefix = typeof cookie.key === 'string' && cookie.key.startsWith('__Secure-');
     return !startsWithSecurePrefix || cookie.secure;
 }
@@ -106,7 +104,6 @@ function isSecurePrefixConditionMet(cookie) {
  * @returns boolean
  */
 function isHostPrefixConditionMet(cookie) {
-    validators.validate(validators.isObject(cookie));
     const startsWithHostPrefix = typeof cookie.key === 'string' && cookie.key.startsWith('__Host-');
     return (!startsWithHostPrefix ||
         Boolean(cookie.secure &&
@@ -160,12 +157,15 @@ class CookieJar {
         }
         let syncErr = null;
         let syncResult = undefined;
-        fn.call(this, (error, result) => {
-            syncErr = error;
-            syncResult = result;
-        });
-        // These seem to be false positives; it can't detect that the value may be changed in the callback
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition, @typescript-eslint/only-throw-error
+        try {
+            fn.call(this, (error, result) => {
+                syncErr = error;
+                syncResult = result;
+            });
+        }
+        catch (err) {
+            syncErr = err;
+        }
         if (syncErr)
             throw syncErr;
         return syncResult;
@@ -180,26 +180,32 @@ class CookieJar {
         }
         const promiseCallback = (0, utils_1.createPromiseCallback)(callback);
         const cb = promiseCallback.callback;
-        if (typeof url === 'string') {
-            validators.validate(validators.isNonEmptyString(url), callback, (0, utils_1.safeToString)(options));
-        }
-        const context = getCookieContext(url);
-        let err;
-        if (typeof url === 'function') {
-            return promiseCallback.reject(new Error('No URL was specified'));
-        }
-        if (typeof options === 'function') {
-            options = defaultSetCookieOptions;
+        let context;
+        try {
+            if (typeof url === 'string') {
+                validators.validate(validators.isNonEmptyString(url), callback, (0, utils_1.safeToString)(options));
+            }
+            context = getCookieContext(url);
+            if (typeof url === 'function') {
+                return promiseCallback.reject(new Error('No URL was specified'));
+            }
+            if (typeof options === 'function') {
+                options = defaultSetCookieOptions;
+            }
+            validators.validate(typeof cb === 'function', cb);
+            if (!validators.isNonEmptyString(cookie) &&
+                !validators.isObject(cookie) &&
+                cookie instanceof String &&
+                cookie.length == 0) {
+                return promiseCallback.resolve(undefined);
+            }
         }
-        validators.validate(typeof cb === 'function', cb);
-        if (!validators.isNonEmptyString(cookie) &&
-            !validators.isObject(cookie) &&
-            cookie instanceof String &&
-            cookie.length == 0) {
-            return promiseCallback.resolve(undefined);
+        catch (err) {
+            return promiseCallback.reject(err);
         }
         const host = (0, canonicalDomain_1.canonicalDomain)(context.hostname) ?? null;
         const loose = options?.loose || this.enableLooseMode;
+        let err;
         let sameSiteContext = null;
         if (options?.sameSiteContext) {
             sameSiteContext = checkSameSiteContext(options.sameSiteContext);
@@ -432,12 +438,18 @@ class CookieJar {
         }
         const promiseCallback = (0, utils_1.createPromiseCallback)(callback);
         const cb = promiseCallback.callback;
-        if (typeof url === 'string') {
-            validators.validate(validators.isNonEmptyString(url), cb, url);
+        let context;
+        try {
+            if (typeof url === 'string') {
+                validators.validate(validators.isNonEmptyString(url), cb, url);
+            }
+            context = getCookieContext(url);
+            validators.validate(validators.isObject(options), cb, (0, utils_1.safeToString)(options));
+            validators.validate(typeof cb === 'function', cb);
+        }
+        catch (parameterError) {
+            return promiseCallback.reject(parameterError);
         }
-        const context = getCookieContext(url);
-        validators.validate(validators.isObject(options), cb, (0, utils_1.safeToString)(options));
-        validators.validate(typeof cb === 'function', cb);
         const host = (0, canonicalDomain_1.canonicalDomain)(context.hostname);
         const path = context.pathname || '/';
         const secure = context.protocol &&
@@ -526,7 +538,7 @@ class CookieJar {
             }
             cookies = cookies.filter(matchingCookie);
             // sorting of S5.4 part 2
-            if (options && 'sort' in options && options.sort !== false) {
+            if ('sort' in options && options.sort !== false) {
                 cookies = cookies.sort(cookieCompare_1.cookieCompare);
             }
             // S5.4 part 3
@@ -632,8 +644,6 @@ class CookieJar {
      */
     serialize(callback) {
         const promiseCallback = (0, utils_1.createPromiseCallback)(callback);
-        const cb = promiseCallback.callback;
-        validators.validate(typeof cb === 'function', cb);
         let type = this.store.constructor.name;
         if (validators.isObject(type)) {
             type = null;
@@ -834,7 +844,7 @@ class CookieJar {
                     removeErrors.push(removeErr);
                 }
                 completedCount++;
-                if (completedCount === cookies?.length) {
+                if (completedCount === cookies.length) {
                     if (removeErrors[0])
                         cb(removeErrors[0]);
                     else

package/dist/cookie/defaultPath.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultPath = void 0;
+exports.defaultPath = defaultPath;
 /**
  * Given a current request/response path, gives the path appropriate for storing
  * in a cookie. This is basically the "directory" of a "file" in the path, but
@@ -58,4 +58,3 @@ function defaultPath(path) {
     // but not including, the right-most %x2F ("/")."
     return path.slice(0, rightSlash);
 }
-exports.defaultPath = defaultPath;

package/dist/cookie/domainMatch.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.domainMatch = void 0;
+exports.domainMatch = domainMatch;
 const canonicalDomain_1 = require("./canonicalDomain");
 // Dumped from ip-regex@4.0.0, with the following changes:
 // * all capturing groups converted to non-capturing -- "(?:)"
@@ -92,4 +92,3 @@ function domainMatch(domain, cookieDomain, canonicalize) {
     /* "  * The string is a host name (i.e., not an IP address)." */
     return !IP_REGEX_LOWERCASE.test(_str);
 }
-exports.domainMatch = domainMatch;

package/dist/cookie/formatDate.js

@@ -1,31 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDate = void 0;
-const validators = __importStar(require("../validators"));
-const utils_1 = require("../utils");
+exports.formatDate = formatDate;
 /**
  * Format a {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date | Date} into
  * the {@link https://www.rfc-editor.org/rfc/rfc2616#section-3.3.1 | preferred Internet standard format}
@@ -41,7 +16,5 @@ const utils_1 = require("../utils");
  * @public
  */
 function formatDate(date) {
-    validators.validate(validators.isDate(date), (0, utils_1.safeToString)(date));
     return date.toUTCString();
 }
-exports.formatDate = formatDate;

package/dist/cookie/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromJSON = exports.parse = exports.permutePath = exports.parseDate = exports.formatDate = exports.domainMatch = exports.defaultPath = exports.CookieJar = exports.cookieCompare = exports.Cookie = exports.PrefixSecurityEnum = exports.canonicalDomain = exports.version = exports.ParameterError = exports.Store = exports.getPublicSuffix = exports.permuteDomain = exports.pathMatch = exports.MemoryCookieStore = void 0;
+exports.permutePath = exports.parseDate = exports.formatDate = exports.domainMatch = exports.defaultPath = exports.CookieJar = exports.cookieCompare = exports.Cookie = exports.PrefixSecurityEnum = exports.canonicalDomain = exports.version = exports.ParameterError = exports.Store = exports.getPublicSuffix = exports.permuteDomain = exports.pathMatch = exports.MemoryCookieStore = void 0;
+exports.parse = parse;
+exports.fromJSON = fromJSON;
 var memstore_1 = require("../memstore");
 Object.defineProperty(exports, "MemoryCookieStore", { enumerable: true, get: function () { return memstore_1.MemoryCookieStore; } });
 var pathMatch_1 = require("../pathMatch");
@@ -15,7 +17,6 @@ var validators_1 = require("../validators");
 Object.defineProperty(exports, "ParameterError", { enumerable: true, get: function () { return validators_1.ParameterError; } });
 var version_1 = require("../version");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return version_1.version; } });
-var utils_1 = require("../utils");
 var canonicalDomain_1 = require("./canonicalDomain");
 Object.defineProperty(exports, "canonicalDomain", { enumerable: true, get: function () { return canonicalDomain_1.canonicalDomain; } });
 var constants_1 = require("./constants");
@@ -44,7 +45,6 @@ const cookie_2 = require("./cookie");
 function parse(str, options) {
     return cookie_2.Cookie.parse(str, options);
 }
-exports.parse = parse;
 /**
  * {@inheritDoc Cookie.fromJSON}
  * @public
@@ -52,4 +52,3 @@ exports.parse = parse;
 function fromJSON(str) {
     return cookie_2.Cookie.fromJSON(str);
 }
-exports.fromJSON = fromJSON;

package/dist/cookie/parseDate.js

@@ -1,7 +1,7 @@
 "use strict";
 // date-time parsing constants (RFC6265 S5.1.1)
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDate = void 0;
+exports.parseDate = parseDate;
 // eslint-disable-next-line no-control-regex
 const DATE_DELIM = /[\x09\x20-\x2F\x3B-\x40\x5B-\x60\x7B-\x7E]/;
 const MONTH_TO_NUM = {
@@ -321,4 +321,3 @@ function parseDate(cookieDate) {
     }
     return new Date(Date.UTC(year, month, dayOfMonth, hour, minute, second));
 }
-exports.parseDate = parseDate;

package/dist/cookie/permutePath.js

@@ -1,30 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.permutePath = void 0;
-const validators = __importStar(require("../validators"));
+exports.permutePath = permutePath;
 /**
  * Generates the permutation of all possible values that {@link pathMatch} the `path` parameter.
  * The array is in longest-to-shortest order.  Useful when building custom {@link Store} implementations.
@@ -39,7 +15,6 @@ const validators = __importStar(require("../validators"));
  * @public
  */
 function permutePath(path) {
-    validators.validate(validators.isString(path));
     if (path === '/') {
         return ['/'];
     }
@@ -55,4 +30,3 @@ function permutePath(path) {
     permutations.push('/');
     return permutations;
 }
-exports.permutePath = permutePath;

package/dist/getPublicSuffix.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPublicSuffix = void 0;
+exports.getPublicSuffix = getPublicSuffix;
 const tldts_1 = require("tldts");
 // RFC 6761
 const SPECIAL_USE_DOMAINS = ['local', 'example', 'invalid', 'localhost', 'test'];
@@ -69,4 +69,3 @@ function getPublicSuffix(domain, options = {}) {
     if (publicSuffix)
         return publicSuffix;
 }
-exports.getPublicSuffix = getPublicSuffix;

package/dist/pathMatch.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathMatch = void 0;
+exports.pathMatch = pathMatch;
 /**
  * Answers "does the request-path path-match a given cookie-path?" as per {@link https://www.rfc-editor.org/rfc/rfc6265.html#section-5.1.4 | RFC6265 Section 5.1.4}.
  * This is essentially a prefix-match where cookiePath is a prefix of reqPath.
@@ -39,4 +39,3 @@ function pathMatch(reqPath, cookiePath) {
     }
     return false;
 }
-exports.pathMatch = pathMatch;

package/dist/permuteDomain.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.permuteDomain = void 0;
+exports.permuteDomain = permuteDomain;
 const getPublicSuffix_1 = require("./getPublicSuffix");
 /**
  * Generates the permutation of all possible values that {@link domainMatch} the given `domain` parameter. The
@@ -42,4 +42,3 @@ function permuteDomain(domain, allowSpecialUseDomain) {
     }
     return permutations;
 }
-exports.permuteDomain = permuteDomain;

package/dist/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inOperator = exports.createPromiseCallback = exports.safeToString = exports.objectToString = void 0;
+exports.safeToString = exports.objectToString = void 0;
+exports.createPromiseCallback = createPromiseCallback;
+exports.inOperator = inOperator;
 /** Wrapped `Object.prototype.toString`, so that you don't need to remember to use `.call()`. */
 const objectToString = (obj) => Object.prototype.toString.call(obj);
 exports.objectToString = objectToString;
@@ -85,8 +87,6 @@ function createPromiseCallback(cb) {
         },
     };
 }
-exports.createPromiseCallback = createPromiseCallback;
 function inOperator(k, o) {
     return k in o;
 }
-exports.inOperator = inOperator;

package/dist/validators.js

@@ -27,39 +27,40 @@ SOFTWARE.
 
 ************************************************************************************ */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParameterError = exports.validate = exports.isInteger = exports.isObject = exports.isString = exports.isEmptyString = exports.isDate = exports.isNonEmptyString = void 0;
+exports.ParameterError = void 0;
+exports.isNonEmptyString = isNonEmptyString;
+exports.isDate = isDate;
+exports.isEmptyString = isEmptyString;
+exports.isString = isString;
+exports.isObject = isObject;
+exports.isInteger = isInteger;
+exports.validate = validate;
 const utils_1 = require("./utils");
 /* Validation functions copied from check-types package - https://www.npmjs.com/package/check-types */
 /** Determines whether the argument is a non-empty string. */
 function isNonEmptyString(data) {
     return isString(data) && data !== '';
 }
-exports.isNonEmptyString = isNonEmptyString;
 /** Determines whether the argument is a *valid* Date. */
 function isDate(data) {
     return data instanceof Date && isInteger(data.getTime());
 }
-exports.isDate = isDate;
 /** Determines whether the argument is the empty string. */
 function isEmptyString(data) {
     return data === '' || (data instanceof String && data.toString() === '');
 }
-exports.isEmptyString = isEmptyString;
 /** Determines whether the argument is a string. */
 function isString(data) {
     return typeof data === 'string' || data instanceof String;
 }
-exports.isString = isString;
 /** Determines whether the string representation of the argument is "[object Object]". */
 function isObject(data) {
     return (0, utils_1.objectToString)(data) === '[object Object]';
 }
-exports.isObject = isObject;
 /** Determines whether the argument is an integer. */
 function isInteger(data) {
     return typeof data === 'number' && data % 1 === 0;
 }
-exports.isInteger = isInteger;
 /* -- End validation functions -- */
 /**
  * When the first argument is false, an error is created with the given message. If a callback is
@@ -80,7 +81,6 @@ function validate(bool, cbOrMessage, message) {
     else
         throw err;
 }
-exports.validate = validate;
 /**
  * Represents a validation error.
  * @public

package/dist/version.js

@@ -5,4 +5,4 @@ exports.version = void 0;
  * The version of `tough-cookie`
  * @public
  */
-exports.version = '5.0.0-rc.2';
+exports.version = '5.0.0-rc.3';

package/package.json

@@ -52,6 +52,14 @@
     {
       "name": "Sam Thompson",
       "website": "https://github.com/sambthompson"
+    },
+    {
+      "name": "Colin Casey",
+      "website": "https://github.com/colincasey"
+    },
+    {
+      "name": "Will Harney",
+      "website": "https://github.com/wjhsf"
     }
   ],
   "license": "BSD-3-Clause",
@@ -67,7 +75,7 @@
     "RFC6265",
     "RFC2965"
   ],
-  "version": "5.0.0-rc.2",
+  "version": "5.0.0-rc.3",
   "homepage": "https://github.com/salesforce/tough-cookie",
   "repository": {
     "type": "git",
@@ -104,9 +112,9 @@
     "node": ">=16"
   },
   "devDependencies": {
-    "@eslint/js": "^8.57.0",
-    "@microsoft/api-documenter": "^7.23.37",
-    "@microsoft/api-extractor": "^7.42.3",
+    "@eslint/js": "^9.5.0",
+    "@microsoft/api-documenter": "^7.25.3",
+    "@microsoft/api-extractor": "^7.47.0",
     "@types/jest": "^29.5.12",
     "@types/node": "^14.18.63",
     "@types/punycode": "^2.1.4",
@@ -116,18 +124,18 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "genversion": "^3.2.0",
-    "globals": "^14.0.0",
+    "globals": "^15.6.0",
     "jest": "^29.7.0",
-    "prettier": "^3.2.5",
-    "ts-jest": "^29.1.2",
+    "prettier": "^3.3.2",
+    "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
-    "typescript": "4.9.5",
-    "typescript-eslint": "^7.3.1",
+    "typescript": "5.5.2",
+    "typescript-eslint": "^7.13.1",
     "vows": "^0.8.3"
   },
   "dependencies": {
     "punycode": "^2.3.1",
-    "tldts": "^6.1.14",
+    "tldts": "^6.1.28",
     "url-parse": "^1.5.10"
   }
 }