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

Jump to bottom

fix: match should enforce array input #835

Merged
merged 2 commits into from
Aug 24, 2023
Merged

fix: match should enforce array input #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d4815
fix: match should enforce array input
dominique-pfister Aug 24, 2023
350a7d0
chore(test): fix expected output
dominique-pfister Aug 24, 2023
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
6 changes: 6 additions & 0 deletions packages/helix-shared-indexer/src/index-resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ const helpers = {
// todo: maybe base on function ?
const result = [];
const regex = new RegExp(re, 'g');

if (!Array.isArray(elements)) {
// eslint-disable-next-line no-param-reassign
elements = [elements];
}
elements.forEach((el) => {
let m;
const content = typeof el === 'string' ? el : toText(el);
Expand All @@ -77,6 +82,7 @@ const helpers = {
return [text.split(/\s+/g).slice(start, end).join(' ')];
},
replace: (s, searchValue, replaceValue) => [s.replace(searchValue, replaceValue)],
replaceAll: (s, searchValue, replaceValue) => [s.replaceAll(searchValue, replaceValue)],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

introduce replaceAll which does replace all occurrences, as stated wrongly in the documentation about replace

};

function evaluate(expression, context) {
Expand Down
18 changes: 14 additions & 4 deletions packages/helix-shared-indexer/test/index-resource.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,18 @@ indices:
select: head > meta[name="x-source-hash"]
value: |
attribute(el, 'content')
external-path:
first-segment:
select: none
value: |
replace(path, '/test/specs/', '/')
match(path, '^/([^/]+)/')
replace-path:
select: none
value: |
replace(path, 'ab', 'z')
replaceAll-path:
select: none
value: |
replaceAll(path, 'ab', 'z')
paragraph:
select: main > div:nth-of-type(5)
value: |
Expand Down Expand Up @@ -151,14 +159,13 @@ describe('Index Resource Tests', () => {
it('indexing a resource', async () => {
const config = await new IndexConfig().withSource(INDEX).init();
const headers = new Headers({ 'last-modified': 'Mon, 22 Feb 2021 15:28:00 GMT' });
const record = indexResource('/path', { body: BODY, headers }, config.indices[0], console);
const record = indexResource('/abc/de/ab/fg/abcd', { body: BODY, headers }, config.indices[0], console);
assert.deepEqual(record, {
author: 'Max',
'bad-selector': '',
'call-unknown-function': '',
'condition-unsupported': '',
date: 44313,
'external-path': '/path',
'last-modified': 1614007680,
'last-modified-raw': 'Mon, 22 Feb 2021 15:28:00 GMT',
'match-simple': '',
Expand All @@ -167,6 +174,9 @@ describe('Index Resource Tests', () => {
'missing-header': '',
'non-array-words': 'Mon, 22 Feb 2021 15:28:00 GMT',
paragraph: '\n <p>consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua</p>\n ',
'first-segment': 'abc',
'replace-path': '/zc/de/ab/fg/abcd',
'replaceAll-path': '/zc/de/z/fg/zcd',
sourceHash: 'JJYxCM1NDG4ahJm9f',
teaser: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua Ut',
title: 'I feel good',
Expand Down
Loading