Improve regexp to extract casters (fix #126)

loris · Oct 26, 2021 · bc4f0cf · bc4f0cf
1 parent bebf5b6
commit bc4f0cf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -12,7 +12,9 @@ const builtInCasters = {
 const parseValue = (value, key, options) => {
   // Match type casting operators like string(true)
   const casters = { ...builtInCasters, ...options.casters };
-  const casting = value.match(/^(\w+)\((.*)\)$/);
+  const castersList = Object.keys(casters).join('|');
+  const castersRegexp = new RegExp(`^(${castersList})\\(([^)]*)\\)$`);
+  const casting = value.match(castersRegexp);
   if (casting && casters[casting[1]]) {
     return casters[casting[1]](casting[2]);
   }

diff --git a/test/index.js b/test/index.js
@@ -185,12 +185,24 @@ test('filter: $in operator (multiple keys)', (t) => {
   t.deepEqual(res.filter, { key: { $in: ['a', 'b'] } });
 });
 
+test('filter: $in operator (multiple keys), with casters', (t) => {
+  const res = aqp('key=string(1)&key=string(2)');
+  t.truthy(res);
+  t.deepEqual(res.filter, { key: { $in: ['1', '2'] } });
+});
+
 test('filter: $in operator (comma-separated)', (t) => {
   const res = aqp('key=a,b');
   t.truthy(res);
   t.deepEqual(res.filter, { key: { $in: ['a', 'b'] } });
 });
 
+test('filter: $in operator (comma-separated), with casters', (t) => {
+  const res = aqp('key=string(1),string(2)');
+  t.truthy(res);
+  t.deepEqual(res.filter, { key: { $in: ['1', '2'] } });
+});
+
 test('filter: $in operator (comma-separated regexes)', (t) => {
   const res = aqp('key=/a/,/b/');
   t.truthy(res);