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

Improved table data display #6

Merged
merged 9 commits into from
Jan 17, 2025
Merged

Improved table data display #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e418497
Improve array presentation and column formatting.
ozppupbg Dec 27, 2024
c28fdd3
Make local JSON content actually work by removing "#qj-" headers.
ozppupbg Dec 27, 2024
086929c
Remove debug console.log statements
ozppupbg Dec 27, 2024
3e31b61
Allow filters over top-level arrays.
ozppupbg Dec 27, 2024
d99b742
Fix field filters with new condition
ozppupbg Dec 27, 2024
748ea16
Fix qj-format matching new-lines
ozppupbg Dec 27, 2024
dc5c8c9
Fix display of objects without column format
ozppupbg Dec 27, 2024
6264f75
Added support for multi field text templates
ozppupbg Dec 27, 2024
ba39149
Template format requires custom name
ozppupbg Dec 28, 2024
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
21 changes: 18 additions & 3 deletions src/functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export function parseQuery(query) {
const parts = query.split('.');
return parts.map(part => {
const match = part.match(/(\w+)\[(.*)\]/);
const parsed = parts.map(part => {
const match = part.match(/(\w*)\[(.*)\]/);
if (match) {
return {
type: 'filter',
Expand All @@ -14,6 +14,17 @@ export function parseQuery(query) {
name: part
};
});
let first = true;
for (const q of parsed) {
if (first) {
first = false;
} else {
if (q.type === "filter" && !q.field) {
throw Error(`Filter without field: ${query}`);
}
}
}
return parsed;
}

function parseCondition(condition) {
Expand Down Expand Up @@ -60,7 +71,11 @@ export function executeQuery(json, parsedQuery) {
result = result[part.name];
} else if (part.type === 'filter') {
const { conditions, operators } = parseCondition(part.condition);
const filteredResult = result[part.field].filter(item => {
let arr = result;
if (part.field) {
arr = result[part.field];
}
const filteredResult = arr.filter(item => {
return evaluateConditions(item, conditions, operators);
});
// Store the filtered result in finalResult
Expand Down
Loading