fix: Match properly when using / in include/exclude (#5)

Author: Niko Lehtovirta

package-lock.json

@@ -30,15 +30,15 @@
     "handlebars": "^4.7.6",
     "inquirer": "^7.1.0",
     "js-yaml": "^3.13.1",
-    "micromatch": "^4.0.2",
+    "picomatch": "^2.2.2",
     "yargs": "^15.1.0"
   },
   "devDependencies": {
     "@types/diff": "^4.0.2",
     "@types/inquirer": "^6.5.0",
     "@types/js-yaml": "^3.12.2",
-    "@types/micromatch": "^4.0.1",
     "@types/node": "^13.7.0",
+    "@types/picomatch": "^2.2.1",
     "@types/yargs": "^15.0.3",
     "@typescript-eslint/eslint-plugin": "^2.20.0",
     "@typescript-eslint/parser": "^2.20.0",

package.json

@@ -15,3 +15,10 @@ test('Validate match log', t => {
   const excl = ['*dev*'];
   t.deepEqual(match(str, inc, excl), false);
 });
+
+test('Validate log group match with /', t => {
+  const str = '/aws/lambda/lambda-dev';
+  const inc: string[] = [];
+  const excl = ['/aws/*/lambda-dev'];
+  t.deepEqual(match(str, inc, excl), false);
+});

src/lib/utils/match.spec.ts

@@ -1,6 +1,23 @@
-import { isMatch } from 'micromatch';
+import { isMatch } from 'picomatch';
+
+// This fix is needed for picomatch library
+// Otherwise there will be error when matching log groups for example
+function fixMatchString(str: string): string {
+  return str.replace(/\//g, '-');
+}
+
+function matchIncluded(str: string, included: string[]): boolean {
+  return included.length === 0 || isMatch(str, included);
+}
+
+function matchExcluded(str: string, excluded: string[]): boolean {
+  return excluded.length === 0 || !isMatch(str, excluded);
+}
 
 export default function match(str: string, include: string[], exclude: string[]): boolean {
-  const matchStr = str.replace(/\//g, '-');
-  return (include.length === 0 || isMatch(matchStr, include)) && (exclude.length === 0 || !isMatch(matchStr, exclude));
+  const matchStr = fixMatchString(str);
+  const included = include.map(str => fixMatchString(str));
+  const excluded = exclude.map(str => fixMatchString(str));
+
+  return matchIncluded(matchStr, included) && matchExcluded(matchStr, excluded);
 }