Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,24 +293,25 @@ export function stringifySetCookie(
_val?: string | StringifyOptions,
_opts?: SerializeOptions,
): string {
const cookie =
typeof _name === "object"
? _name
: { ..._opts, name: _name, value: String(_val) };
const cookie = typeof _name === "object" ? _name : _opts;
const name = typeof _name === "object" ? _name.name : _name;
const rawValue = typeof _name === "object" ? _name.value : String(_val);
const options = typeof _val === "object" ? _val : _opts;
const enc = options?.encode || encodeURIComponent;

if (!cookieNameRegExp.test(cookie.name)) {
throw new TypeError(`argument name is invalid: ${cookie.name}`);
if (!cookieNameRegExp.test(name)) {
throw new TypeError(`argument name is invalid: ${name}`);
}

const value = cookie.value ? enc(cookie.value) : "";
const value = rawValue ? enc(rawValue) : "";

if (!cookieValueRegExp.test(value)) {
throw new TypeError(`argument val is invalid: ${cookie.value}`);
throw new TypeError(`argument val is invalid: ${rawValue}`);
}

let str = cookie.name + "=" + value;
let str = name + "=" + value;

if (!cookie) return str;

if (cookie.maxAge !== undefined) {
if (!Number.isInteger(cookie.maxAge)) {
Expand Down
Loading