fix(pattern): add Generic to NoopPattern (#211)

src/pattern/src/pattern.ts

@@ -9,13 +9,13 @@ export interface PatternShape<T extends LokiPatternType = string> {
   executeOnLogs(logs: Array<string>): LokiLiteralPattern<T>[];
 }
 
-export class NoopPattern implements PatternShape {
-  compile(): (log: string) => [] | [log: string] {
-    return (log) => [log];
+export class NoopPattern<T extends LokiPatternType = string> implements PatternShape<T> {
+  compile(): (log: string) => [] | [log: LokiLiteralPattern<T>] {
+    return (log) => [log as LokiLiteralPattern<T>];
   }
 
-  executeOnLogs(logs: Array<string>): LokiLiteralPattern<string>[] {
-    return logs;
+  executeOnLogs(logs: Array<string>): LokiLiteralPattern<T>[] {
+    return logs as LokiLiteralPattern<T>[];
   }
 }
 
@@ -46,7 +46,7 @@ export class Pattern<T extends LokiPatternType> implements PatternShape<T> {
     return (log) => {
       const match = new RegExp(exprStr).exec(log);
 
-      return match === null ? [] : [match.groups as LokiLiteralPattern<T>];
+      return match === null ? [] : [match.groups as unknown as LokiLiteralPattern<T>];
     };
   }
 

src/pattern/src/types.ts

@@ -30,10 +30,6 @@ type ExtractPattern<Pattern extends string> = Pattern extends `${infer _}<${infe
   Name extends "_" ? never : Trim<Name> : never;
 
 export type LokiPatternType = string | Array<string> | ReadonlyArray<string>;
-export type LokiLiteralPattern<T extends LokiPatternType> = ConvertEmptyRecord<
-  Simplify<
-    TupleToObject<
-      Split<ArrayToString<T>, ">">
-    >
-  >
->;
+export type LokiLiteralPattern<T extends LokiPatternType> = ConvertEmptyRecord<Simplify<
+  TupleToObject<Split<ArrayToString<T>, ">">>
+>>;

src/pattern/test/types/index.test-d.ts

@@ -2,7 +2,11 @@
 import { expectType, expectAssignable } from "tsd";
 
 // Import Internal Dependencies
-import { Pattern, NoopPattern, PatternShape } from "../../src/pattern";
+import {
+  Pattern,
+  PatternShape,
+  NoopPattern
+} from "../../src/pattern";
 
 expectType<Pattern<string>>(new Pattern("foobar"));
 
@@ -22,6 +26,8 @@ expectType<(log: string) => [] | [log: { foobar: string }]>(new Pattern("<_> <fo
 expectType<string[]>(new Pattern("invalid pattern should return string").executeOnLogs([]));
 expectType<string[]>(new NoopPattern().executeOnLogs([]));
 
+expectAssignable<PatternShape<string>>(new NoopPattern() || new Pattern("<foobar>"));
 expectAssignable<PatternShape<string>>(new NoopPattern());
 expectAssignable<PatternShape<string>>(new Pattern("foobar"));
+expectAssignable<PatternShape<string>>(new Pattern(["foobar", "yo"]));
 expectAssignable<PatternShape<"<_> <foobar>">>(new Pattern("<_> <foobar>"));