Skip to content

fix: trigger filters on events with properties that aren't identifiers #4124

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.

Sign up for GitHub

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

Open
nickhstr wants to merge 1 commit into
base: four-dev
Choose a base branch
from
Open

fix: trigger filters on events with properties that aren't identifiers #4124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/htmx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ var htmx = (() => {
#internalAPI;
#Function = Function;
#AsyncFunction = Object.getPrototypeOf(async function(){}).constructor;
// The names a function parameter can take: identifiers that aren't reserved words
#identifier = /^[$_\p{ID_Start}][$\u200C\u200D\p{ID_Continue}]*$/u;
#reservedWords = new Set(["await", "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", "enum", "export", "extends", "false", "finally", "for", "function", "if", "import", "in", "instanceof", "new", "null", "return", "super", "switch", "this", "throw", "true", "try", "typeof", "var", "void", "while", "with"]);
#ttPolicy = { createHTML: s => s, createScript: s => s };
#actionSelector
#boostSelector = "a,form";
Expand Down Expand Up @@ -903,8 +906,15 @@ var htmx = (() => {
code = detail.code;
Object.assign(args, scope);
Object.assign(args, obj)
let keys = Object.keys(args);
let values = Object.values(args);
let keys = [];
let values = [];
for (let [key, value] of Object.entries(args)) {
// Any other name would make the constructor throw, and code couldn't reference it by bare name anyway
if (this.#identifier.test(key) && !this.#reservedWords.has(key)) {
keys.push(key);
values.push(value);
}
}
let FunctionConstructor = isAsync ? this.#AsyncFunction : this.#Function;
let func = new FunctionConstructor(...keys, expression ? `return (${code})` : code);
return compile ? () => func.call(thisArg, ...values) : func.call(thisArg, ...values);
Expand Down
12 changes: 12 additions & 0 deletions test/tests/attributes/hx-trigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ describe('hx-trigger attribute', function() {
await forRequest()
})

it('filters properly when the event has a property that is not an identifier', async function() {
mockResponse('GET', '/test', 'Called!')
let form = createProcessedHTML('<form hx-get="/test" hx-trigger="evt[foo]">Not Called</form>')
let event = new CustomEvent("evt");
event.foo = true
event['not-an-identifier'] = {}
event.default = true
form.dispatchEvent(event)
fetchMock.calls.length.should.equal(1)
await forRequest()
})

it('filters properly with true expression filter spec', async function() {
mockResponse('GET', '/test', 'Called!')
let form = createProcessedHTML('<form hx-get="/test" hx-trigger="evt[true]">Not Called</form>')
Expand Down