-
-
Notifications
You must be signed in to change notification settings - Fork 161
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add stringify method to mirror parse #214
Open
blakeembrey
wants to merge
2
commits into
master
Choose a base branch
from
be/stringify-method
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -89,17 +89,19 @@ export interface ParseOptions { | |
decode?: (str: string) => string | undefined; | ||
} | ||
|
||
/** | ||
* Cookies object. | ||
*/ | ||
export type Cookies = Record<string, string | undefined>; | ||
|
||
/** | ||
* Parse a cookie header. | ||
* | ||
* Parse the given cookie header string into an object | ||
* The object has the various cookies as keys(names) => values | ||
*/ | ||
export function parse( | ||
str: string, | ||
options?: ParseOptions, | ||
): Record<string, string | undefined> { | ||
const obj: Record<string, string | undefined> = new NullObject(); | ||
export function parse(str: string, options?: ParseOptions): Cookies { | ||
const obj: Cookies = new NullObject(); | ||
const len = str.length; | ||
// RFC 6265 sec 4.1.1, RFC 2616 2.2 defines a cookie name consists of one char minimum, plus '='. | ||
if (len < 2) return obj; | ||
|
@@ -155,6 +157,46 @@ function endIndex(str: string, index: number, min: number) { | |
return min; | ||
} | ||
|
||
export interface StringifyOptions { | ||
/** | ||
* Specifies a function that will be used to encode a [cookie-value](https://datatracker.ietf.org/doc/html/rfc6265#section-4.1.1). | ||
* Since value of a cookie has a limited character set (and must be a simple string), this function can be used to encode | ||
* a value into a string suited for a cookie's value, and should mirror `decode` when parsing. | ||
* | ||
* @default encodeURIComponent | ||
*/ | ||
encode?: (str: string) => string; | ||
} | ||
|
||
/** | ||
* Stringifies an object into a HTTP `Cookie` header. | ||
*/ | ||
export function stringify( | ||
cookies: Cookies, | ||
options?: StringifyOptions, | ||
): string { | ||
const enc = options?.encode || encodeURIComponent; | ||
const cookieStrings: string[] = []; | ||
|
||
for (const [name, val] of Object.entries(cookies)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might be slower than |
||
if (val === undefined) continue; | ||
|
||
if (!cookieNameRegExp.test(name)) { | ||
throw new TypeError(`cookie name is invalid: ${name}`); | ||
} | ||
|
||
const value = enc(val); | ||
|
||
if (!cookieValueRegExp.test(value)) { | ||
throw new TypeError(`cookie val is invalid: ${val}`); | ||
} | ||
jonchurch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
cookieStrings.push(`${name}=${value}`); | ||
} | ||
|
||
return cookieStrings.join("; "); | ||
} | ||
|
||
/** | ||
* Serialize options. | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import { describe, expect, it } from "vitest"; | ||
import { stringify } from "./index.js"; | ||
|
||
describe("stringify", () => { | ||
it("should stringify object", () => { | ||
expect(stringify({ key: "value" })).toEqual("key=value"); | ||
}); | ||
|
||
it("should stringify objects with multiple entries", () => { | ||
expect(stringify({ a: "1", b: "2" })).toEqual("a=1; b=2"); | ||
}); | ||
|
||
it("should ignore undefined values", () => { | ||
expect(stringify({ a: "1", b: undefined })).toEqual("a=1"); | ||
}); | ||
|
||
it("should error on invalid keys", () => { | ||
expect(() => stringify({ "test=": "" })).toThrow(/cookie name is invalid/); | ||
}); | ||
|
||
it("should error on invalid values", () => { | ||
expect(() => stringify({ test: ";" }, { encode: (x) => x })).toThrow( | ||
/cookie val is invalid/, | ||
); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.