Skip to content
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

Modification to syntax.js parser RegEx to provide better Unicode support #4390

Closed
wants to merge 8 commits into from
Closed

Modification to syntax.js parser RegEx to provide better Unicode support #4390

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4dbc6fa
changing regEx for parsing chips to support unicode characters
AndyKilmory Jan 6, 2025
63099f9
removing commented out previous version of parserRe
AndyKilmory Jan 8, 2025
a01da44
Merge branch 'main' into t2062-special-chars
AndyKilmory Jan 8, 2025
17a0805
docker compose changes
AndyKilmory Jan 9, 2025
da4e5a1
Merge branch 't2062-special-chars' of github.com:bbc/grid into t2062-…
AndyKilmory Jan 9, 2025
27fdb35
reverting docker compose
AndyKilmory Jan 9, 2025
9aa92ab
additional revisions to query syntax regex to handle quoted field names
AndyKilmory Jan 13, 2025
c587e4f
reverting setup.sh
AndyKilmory Jan 13, 2025
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
15 changes: 10 additions & 5 deletions kahuna/public/js/search/structured-query/syntax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import {getLabel, getCollection} from '../../search-query/query-syntax';

// Line too long for eslint, but can't break it down..
/*eslint-disable max-len */
const parserRe = /(-?)(?:(?:([a-zA-Z@><]+):|(#)|(~))(?:([^ "']+)|"([^"]+)"|'([^']+)')|([a-zA-Z0-9]+)|"([^"]*)"|'([^']*)')/g;
//const parserRe = /(-?)(?:(?:([\p{L}@><]+):|(#)|(~))(?:([^ "']+)|"([^"]+)"|'([^']+)')|([\p{L}0-9]+)|"([^"]*)"|'([^']*)')/gu;
const parserRe = /(-?)(?:(?:([\p{L}@><]+):|"([^"]+)":|'([^']+)':|(#)|(~))(?:([^ "']+)|"([^"]+)"|'([^']+)')|([\p{L}0-9]+)|"([^"]*)"|'([^']*)')/gu;
/*eslint-enable max-len */
const falsyValuesToEmptyString = (value) => {
if (!value){
Expand All @@ -23,10 +24,14 @@ export function structureQuery(query) {
}
while ((m = parserRe.exec(query)) !== null) {
const sign = m[1];
const field = m[2];
const symbol = m[3] || m[4];
const value = m[5] || m[6] || m[7];
const text = m[8] || m[9] || m[10];
//const field = m[2];
//const symbol = m[3] || m[4];
//const value = m[5] || m[6] || m[7];
//const text = m[8] || m[9] || m[10];
const field = m[2] || m[3] || m[4];
const symbol = m[5] || m[6];
const value = m[7] || m[8] || m[9];
const text = m[10] || m[11] || m[12];
const key = {
'#': 'label',
'~': 'collection'
Expand Down
Loading