Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Merge branch 'main' into fix-numberlike-kv-with-plus
  • Loading branch information
dmaccormack authored Nov 22, 2023
commit b15da3914c6fe6075a15b62fe7d26e3db377b285
4 changes: 2 additions & 2 deletions src/JsonURL.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ const RX_AQF_DECODE_ESCAPE = /(![\s\S]?)/g;
// DO NOT PUT //g ON THESE!!!
//
const RX_ENCODE_STRING_SAFE =
/^[-A-Za-z0-9._~!$*;=@?/ ][-A-Za-z0-9._~!$*;=@?/' ]*$/;
const RX_ENCODE_STRING_QSAFE = /^[-A-Za-z0-9._~!$*,;=@?/(): ]+$/;
/^[-A-Za-z0-9._~!$*;@?/ ][-A-Za-z0-9._~!$*;@?/' ]*$/;
const RX_ENCODE_STRING_QSAFE = /^[-A-Za-z0-9._~!$*,;@?/(): ]+$/;
const RX_ENCODE_NUMBER = /^-?\d+(?:\.\d+)?(?:[eE][-]?\d+)?$/;
const RX_ENCODE_NUMBER_PLUS = /^-?\d+(?:\.\d+)?[eE]\+\d+$/;
const RX_ENCODE_NUMBER_SPACE = /^-?\d+(?:\.\d+)?[eE] \d+$/;
Expand Down
1 change: 1 addition & 0 deletions test/parseLiteral.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ test.each([
["-e+1", "-e 1", undefined, undefined],
["1e%2B1", "1e+1", "1e+1", "1e+1"],
["%26true", "&true", undefined, undefined],
["%3Dtrue", "=true", undefined, undefined],
])("JsonURL.parseLiteral(%p)", (text, value, aqfValue, impliedStrValue) => {
let keyValue = typeof value === "string" ? value : text;
if (aqfValue === undefined) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.