fix: handle keyspace in RedisChannel#test method

Author: aleclarson

src/channel.ts

@@ -3,6 +3,7 @@ import { isString } from "radashi";
 import { RedisKey, RedisKeyspace } from "./key";
 import { MessageEvent } from "./subscriber";
 import { RedisTransform } from "./transform";
+import { resolveName } from "./utils/resolve-name";
 
 /**
  * Channels use the `SUBSCRIBE` command.
@@ -33,21 +34,19 @@ export class RedisChannel<
     name: K extends RedisKeyspace<infer Key> ? Key : string | number,
     schema: TSchema = this.schema,
   ) {
-    return new RedisChannel<any>(
-      `${isString(this.name) ? this.name : this.name.name}:${name}`,
-      schema,
-    );
+    return new RedisChannel<any>(`${resolveName(this)}:${name}`, schema);
   }
 
   /**
    * Returns true if the event originated from this channel or a
    * subchannel.
    */
   test(event: MessageEvent<any>): event is MessageEvent<T> {
+    const name = resolveName(this);
     return (
       event.key === this ||
-      event.channel === this.name ||
-      event.channel.startsWith(this.name + ":")
+      event.channel === name ||
+      event.channel.startsWith(name + ":")
     );
   }
 }

src/key.ts

@@ -1,10 +1,10 @@
 import * as Type from "@sinclair/typebox/type";
 import { StaticEncode, TObject, TSchema } from "@sinclair/typebox/type";
 import { Decode, Encode } from "@sinclair/typebox/value";
-import { isString } from "radashi";
 import { RedisValue } from "./command";
 import { RedisTransform } from "./transform";
 import { JSONPath, resolveSchemaForJSONPath } from "./utils/json-path";
+import { resolveName } from "./utils/resolve-name";
 
 /**
  * Represents a namespace of keys in a Redis database.
@@ -59,10 +59,7 @@ export abstract class RedisKey<
       schema: TSchema,
     ) => any;
 
-    return new RedisKey(
-      `${isString(this.name) ? this.name : this.name.name}:${name}`,
-      schema,
-    );
+    return new RedisKey(`${resolveName(this)}:${name}`, schema);
   }
 }
 

src/utils/resolve-name.ts

@@ -0,0 +1,6 @@
+import { isString } from "radashi";
+import { RedisKeyspace } from "../key";
+
+export function resolveName(key: { name: string | RedisKeyspace }) {
+  return isString(key.name) ? key.name : key.name.name;
+}