🤖 Merge PR DefinitelyTyped#74517 [@types/ioredis-mock] Use export = for CJS module compatibility by @rhnorskov

Author: rhnorskov

attw.json

@@ -148,7 +148,6 @@
         "input-moment",
         "inputmask",
         "intl-unofficial-duration-unit-format",
-        "ioredis-mock",
         "iput",
         "itemsjs",
         "itowns",

types/ioredis-mock/index.d.ts

@@ -1,29 +1,31 @@
 import ioredis = require("ioredis");
 
-export type RedisOptions = { data?: Record<string, unknown> } & ioredis.RedisOptions;
+declare namespace redisMock {
+    type RedisOptions = { data?: Record<string, unknown> } & ioredis.RedisOptions;
 
-export type RedisClusterOptions = {
-    redisOptions: Omit<
-        RedisOptions,
-        "port" | "host" | "path" | "sentinels" | "retryStrategy" | "enableOfflineQueue" | "readOnly"
-    >;
-} & ioredis.ClusterOptions;
+    type RedisClusterOptions = {
+        redisOptions: Omit<
+            RedisOptions,
+            "port" | "host" | "path" | "sentinels" | "retryStrategy" | "enableOfflineQueue" | "readOnly"
+        >;
+    } & ioredis.ClusterOptions;
 
-export interface ClusterConstructor {
-    new(startupNodes: ioredis.ClusterNode[], options?: RedisClusterOptions): ioredis.Cluster;
-}
+    interface ClusterConstructor {
+        new(startupNodes: ioredis.ClusterNode[], options?: RedisClusterOptions): ioredis.Cluster;
+    }
 
-export interface Constructor {
-    new(port: number, host: string, options: RedisOptions): ioredis.Redis;
-    new(path: string, options: RedisOptions): ioredis.Redis;
-    new(port: number, options: RedisOptions): ioredis.Redis;
-    new(port: number, host: string): ioredis.Redis;
-    new(options: RedisOptions): ioredis.Redis;
-    new(port: number): ioredis.Redis;
-    new(path: string): ioredis.Redis;
-    new(): ioredis.Redis;
-    Cluster: ClusterConstructor;
+    interface Constructor {
+        new(port: number, host: string, options: RedisOptions): ioredis.Redis;
+        new(path: string, options: RedisOptions): ioredis.Redis;
+        new(port: number, options: RedisOptions): ioredis.Redis;
+        new(port: number, host: string): ioredis.Redis;
+        new(options: RedisOptions): ioredis.Redis;
+        new(port: number): ioredis.Redis;
+        new(path: string): ioredis.Redis;
+        new(): ioredis.Redis;
+        Cluster: ClusterConstructor;
+    }
 }
 
-export const redisMock: Constructor;
-export { redisMock as default };
+declare const redisMock: redisMock.Constructor;
+export = redisMock;

types/ioredis-mock/ioredis-mock-tests.ts

@@ -1,4 +1,4 @@
-import IORedis, { RedisOptions } from "ioredis-mock";
+import IORedis = require("ioredis-mock");
 
 // see https://www.npmjs.com/package/ioredis-mock for MockRedisInput input
 // see https://github.com/luin/ioredis/tree/master/examples
@@ -61,7 +61,7 @@ redis.hgetall("myhash").then(res => console.log(res));
 // All arguments are passed directly to the redis server:
 redis.set("key", 100, "EX", 10); // set's key to value 100 and expires it after 10 seconds
 
-const options: RedisOptions = {};
+const options: IORedis.RedisOptions = {};
 console.log(options.port);
 
 const f = async () => {