Split giant cookie.ts into multiple files. (#296)

* Quiet IDE warnings about TS v5 deprecations. * Add eslint warning for files over 500 lines. * Split giant cookie.ts into multiple files. * Update main export.
salesforce · Sep 1, 2023 · 3c65660 · 3c65660
1 parent 6486eec
commit 3c65660
Show file tree

Hide file tree

Showing 40 changed files with 2,509 additions and 2,489 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -16,6 +16,7 @@
     // this is only needed because `createPromiseCallback` uses arguments to support the callback-style api
     // we should strongly consider dropping the callback and sync api variants (in say v6) to reduce the
     // surface area and complexity of tough-cookie
-    "prefer-rest-params": "warn"
+    "prefer-rest-params": "warn",
+    "max-lines": ["warn", 500]
   }
 }
diff --git a/lib/__tests__/canonicalDomain.spec.ts b/lib/__tests__/canonicalDomain.spec.ts
@@ -1,4 +1,4 @@
-import { canonicalDomain } from '../cookie'
+import { canonicalDomain } from '../cookie/canonicalDomain'
 
 // port of tests/domain_and_path_test.js (canonicalDomain tests for domain normalization)
 describe('canonicalDomain', () => {

diff --git a/lib/__tests__/cookie.spec.ts b/lib/__tests__/cookie.spec.ts
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import { Cookie } from '../cookie'
+import { Cookie } from '../cookie/cookie'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/cookieJar.spec.ts b/lib/__tests__/cookieJar.spec.ts
@@ -29,14 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import {
-  Cookie,
-  CookieJar,
-  MemoryCookieStore,
-  ParameterError,
-  SerializedCookieJar,
-  Store,
-} from '../cookie'
+import { Cookie } from '../cookie/cookie'
+import { CookieJar } from '../cookie/cookieJar'
+import type { SerializedCookieJar } from '../cookie/constants'
+import { MemoryCookieStore } from '../memstore'
+import { Store } from '../store'
+import { ParameterError } from '../validators'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/cookiePrefixes.spec.ts b/lib/__tests__/cookiePrefixes.spec.ts
@@ -1,4 +1,5 @@
-import { CookieJar, PrefixSecurityEnum } from '../cookie'
+import { PrefixSecurityEnum } from '../cookie/constants'
+import { CookieJar } from '../cookie/cookieJar'
 
 let cookieJar: CookieJar
 const insecureUrl = 'http://www.example.com'

diff --git a/lib/__tests__/cookieSorting.spec.ts b/lib/__tests__/cookieSorting.spec.ts
@@ -1,4 +1,6 @@
-import { Cookie, cookieCompare, CookieJar } from '../cookie'
+import { Cookie } from '../cookie/cookie'
+import { cookieCompare } from '../cookie/cookieCompare'
+import { CookieJar } from '../cookie/cookieJar'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/cookieToAndFromJson.spec.ts b/lib/__tests__/cookieToAndFromJson.spec.ts
@@ -1,4 +1,4 @@
-import { Cookie } from '../cookie'
+import { Cookie } from '../cookie/cookie'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/cookieToString.spec.ts b/lib/__tests__/cookieToString.spec.ts
@@ -1,4 +1,4 @@
-import { Cookie } from '../cookie'
+import { Cookie } from '../cookie/cookie'
 
 describe('Cookie.toString()', () => {
   const parse = (cookieString: string): Cookie => {

diff --git a/lib/__tests__/date.spec.ts b/lib/__tests__/date.spec.ts
@@ -37,7 +37,7 @@ type EquivalenceDateParsingTestCase = {
   [key: string]: string
 }
 
-import { parseDate } from '../cookie'
+import { parseDate } from '../cookie/parseDate'
 
 const dateTests: DateParsingTestCase = {
   'Wed, 09 Jun 2021 10:18:14 GMT': true,

diff --git a/lib/__tests__/defaultPath.spec.ts b/lib/__tests__/defaultPath.spec.ts
@@ -1,4 +1,4 @@
-import { defaultPath } from '../cookie'
+import { defaultPath } from '../cookie/defaultPath'
 
 // port of tests/domain_and_path_test.js (default path tests)
 describe('defaultPath', () => {

diff --git a/lib/__tests__/domainMatch.spec.ts b/lib/__tests__/domainMatch.spec.ts
@@ -1,4 +1,4 @@
-import { domainMatch } from '../cookie'
+import { domainMatch } from '../cookie/domainMatch'
 
 // port of tests/domain_and_path_test.js (domain match tests)
 describe('domainMatch', () => {

diff --git a/lib/__tests__/ietf.spec.ts b/lib/__tests__/ietf.spec.ts
@@ -29,11 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import { CookieJar, parseDate } from '../cookie'
 import url from 'url'
 import parserData from './data/parser'
 import bsdExampleDates from './data/dates/bsd-examples'
 import exampleDates from './data/dates/examples'
+import { CookieJar } from '../cookie/cookieJar'
+import { parseDate } from '../cookie/parseDate'
 
 describe('IETF http state tests', () => {
   describe('Set/get cookie tests', () => {

diff --git a/lib/__tests__/jarSerialization.spec.ts b/lib/__tests__/jarSerialization.spec.ts
@@ -28,16 +28,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
-import {
-  Cookie,
-  CookieJar,
-  MemoryCookieStore,
-  SerializedCookie,
-  SerializedCookieJar,
-  Store,
-  version,
-} from '../cookie'
+import { Cookie } from '../cookie/cookie'
+import { CookieJar } from '../cookie/cookieJar'
+import type { SerializedCookie, SerializedCookieJar } from '../cookie/constants'
+import { MemoryCookieStore } from '../memstore'
+import { Store } from '../store'
+import { version } from '../version'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/lifetime.spec.ts b/lib/__tests__/lifetime.spec.ts
@@ -1,4 +1,4 @@
-import { Cookie } from '../cookie'
+import { Cookie } from '../cookie/cookie'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/memoryCookieStore.spec.ts b/lib/__tests__/memoryCookieStore.spec.ts
@@ -1,4 +1,5 @@
-import { Cookie, MemoryCookieStore } from '../cookie'
+import { Cookie } from '../cookie/cookie'
+import { MemoryCookieStore } from '../memstore'
 
 describe('MemoryCookieStore', () => {
   it('should have no static methods', () => {

diff --git a/lib/__tests__/nodeUtilFallback.spec.ts b/lib/__tests__/nodeUtilFallback.spec.ts
@@ -1,7 +1,8 @@
-import { getCustomInspectSymbol, getUtilInspect } from '../utilHelper'
 import util from 'util'
-import { Cookie, CookieJar, MemoryCookieStore } from '../cookie'
-import { inspectFallback } from '../memstore'
+import { Cookie } from '../cookie/cookie'
+import { CookieJar } from '../cookie/cookieJar'
+import { MemoryCookieStore, inspectFallback } from '../memstore'
+import { getCustomInspectSymbol, getUtilInspect } from '../utilHelper'
 
 jest.useFakeTimers()
 

diff --git a/lib/__tests__/parse.spec.ts b/lib/__tests__/parse.spec.ts
@@ -1,4 +1,4 @@
-import { Cookie } from '../cookie'
+import { Cookie } from '../cookie/cookie'
 import { performance } from 'node:perf_hooks'
 
 describe('Cookie.parse', () => {

diff --git a/lib/__tests__/pathMatch.spec.ts b/lib/__tests__/pathMatch.spec.ts
@@ -1,4 +1,4 @@
-import { pathMatch } from '../cookie'
+import { pathMatch } from '../pathMatch'
 
 // port of tests/domain_and_path_test.js (path match tests)
 describe('pathMatch', () => {

diff --git a/lib/__tests__/permuteDomain.spec.ts b/lib/__tests__/permuteDomain.spec.ts
@@ -1,4 +1,4 @@
-import { permuteDomain } from '../cookie'
+import { permuteDomain } from '../permuteDomain'
 
 // port of tests/domain_and_path_test.js (permute domain tests)
 describe('permuteDomain', () => {

diff --git a/lib/__tests__/permutePath.spec.ts b/lib/__tests__/permutePath.spec.ts
@@ -1,4 +1,5 @@
-import { pathMatch, permutePath } from '../cookie'
+import { permutePath } from '../cookie/permutePath'
+import { pathMatch } from '../pathMatch'
 
 // port of tests/domain_and_path_test.js (permute path tests)
 describe('permutePath', () => {

diff --git a/lib/__tests__/regression.spec.ts b/lib/__tests__/regression.spec.ts
@@ -1,4 +1,5 @@
-import { Cookie, CookieJar } from '../cookie'
+import type { Cookie } from '../cookie/cookie'
+import { CookieJar } from '../cookie/cookieJar'
 
 const url = 'http://www.example.com'
 

diff --git a/lib/__tests__/removeAll.spec.ts b/lib/__tests__/removeAll.spec.ts
@@ -1,12 +1,8 @@
-import {
-  Callback,
-  Cookie,
-  CookieJar,
-  MemoryCookieStore,
-  Store,
-} from '../cookie'
-import spyOn = jest.spyOn
-import SpyInstance = jest.SpyInstance
+import type { Cookie } from '../cookie/cookie'
+import { CookieJar } from '../cookie/cookieJar'
+import { MemoryCookieStore } from '../memstore'
+import { Store } from '../store'
+import type { Callback } from '../utils'
 
 const url = 'http://example.com/index.html'
 
@@ -36,10 +32,7 @@ describe('store removeAllCookies API', () => {
 
       // replace remove cookie behavior to throw an error on the 4th invocation
       const _removeCookie = store.removeCookie.bind(store)
-      const spy: SpyInstance<ReturnType<typeof _removeCookie>> = spyOn(
-        store,
-        'removeCookie',
-      )
+      const spy = jest.spyOn(store, 'removeCookie')
       spy.mockImplementationOnce(
         (domain: string, path: string, key: string, callback: Callback<void>) =>
           _removeCookie.call(store, domain, path, key, callback),
@@ -79,10 +72,7 @@ describe('store removeAllCookies API', () => {
 
       // replace remove cookie behavior to throw an error on the 4th invocation
       const _removeCookie = store.removeCookie.bind(store)
-      const spy: SpyInstance<ReturnType<typeof _removeCookie>> = spyOn(
-        store,
-        'removeCookie',
-      )
+      const spy = jest.spyOn(store, 'removeCookie')
       spy.mockImplementation(
         (
           domain: string,

diff --git a/lib/__tests__/sameSite.spec.ts b/lib/__tests__/sameSite.spec.ts
@@ -1,4 +1,5 @@
-import { Cookie, CookieJar } from '../cookie'
+import { Cookie } from '../cookie/cookie'
+import { CookieJar } from '../cookie/cookieJar'
 
 const url = 'http://example.com/index.html'