fix: modified imports to work when esModuleInterop is disabled

taskforcesh#129

src/classes/child-pool.ts

@@ -1,12 +1,11 @@
-import childProcess, { ChildProcess } from 'child_process';
-import path from 'path';
+import { ChildProcess, fork } from 'child_process';
+import * as path from 'path';
 import { forEach, values, flatten } from 'lodash';
-import getPort from 'get-port';
-import fs from 'fs';
+import * as getPort from 'get-port';
+import * as fs from 'fs';
 import { promisify } from 'util';
 
 const stat = promisify(fs.stat);
-const fork = childProcess.fork;
 
 export interface ChildProcessExt extends ChildProcess {
   processFile?: string;

src/classes/job.ts

@@ -1,4 +1,4 @@
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { debuglog } from 'util';
 import { RetryErrors } from '../enums';
 import { BackoffOptions, JobsOptions, WorkerOptions } from '../interfaces';
@@ -92,7 +92,7 @@ export class Job<T = any, R = any> {
     const multi = client.multi();
 
     for (const job of jobInstances) {
-      job.addJob(<IORedis.Redis>(multi as unknown));
+      job.addJob(<Redis.Redis>(multi as unknown));
     }
 
     const result = (await multi.exec()) as [null | Error, string][];
@@ -454,15 +454,15 @@ export class Job<T = any, R = any> {
     );
   }
 
-  private addJob(client: IORedis.Redis): string {
+  private addJob(client: Redis.Redis): string {
     const queue = this.queue;
 
     const jobData = this.asJSON();
 
     return Scripts.addJob(client, queue, jobData, this.opts, this.id);
   }
 
-  private saveAttempt(multi: IORedis.Pipeline, err: Error) {
+  private saveAttempt(multi: Redis.Pipeline, err: Error) {
     this.attemptsMade++;
     this.stacktrace = this.stacktrace || [];
 

src/classes/redis-connection.ts

@@ -1,14 +1,14 @@
 import { EventEmitter } from 'events';
-import IORedis, { Redis } from 'ioredis';
+import * as Redis from 'ioredis';
 import * as semver from 'semver';
 import { load } from '../commands';
 import { ConnectionOptions, RedisOptions } from '../interfaces';
 import { isRedisInstance } from '../utils';
 
 export class RedisConnection extends EventEmitter {
   static minimumVersion = '5.0.0';
-  private _client: Redis;
-  private initializing: Promise<Redis>;
+  private _client: Redis.Redis;
+  private initializing: Promise<Redis.Redis>;
   private closing: boolean;
 
   constructor(private opts?: ConnectionOptions) {
@@ -24,7 +24,7 @@ export class RedisConnection extends EventEmitter {
         ...opts,
       };
     } else {
-      this._client = <Redis>opts;
+      this._client = <Redis.Redis>opts;
     }
 
     this.initializing = this.init();
@@ -38,7 +38,7 @@ export class RedisConnection extends EventEmitter {
    * Waits for a redis client to be ready.
    * @param {Redis} redis client
    */
-  static async waitUntilReady(client: IORedis.Redis) {
+  static async waitUntilReady(client: Redis.Redis) {
     return new Promise(function(resolve, reject) {
       if (client.status === 'ready') {
         resolve();
@@ -60,14 +60,14 @@ export class RedisConnection extends EventEmitter {
     });
   }
 
-  get client(): Promise<Redis> {
+  get client(): Promise<Redis.Redis> {
     return this.initializing;
   }
 
   private async init() {
     const opts = this.opts as RedisOptions;
     if (!this._client) {
-      this._client = new IORedis(opts);
+      this._client = new Redis(opts);
     }
 
     await RedisConnection.waitUntilReady(this._client);

src/classes/timer-manager.ts

@@ -1,4 +1,4 @@
-import uuid from 'uuid';
+import * as uuid from 'uuid';
 
 /**
  * Keeps track on timers created with setTimeout to help clearTimeout

src/classes/worker.ts

@@ -1,14 +1,14 @@
-import fs from 'fs';
-import { Redis } from 'ioredis';
-import path from 'path';
+import * as fs from 'fs';
+import * as Redis from 'ioredis';
+import * as path from 'path';
 import { Processor, WorkerOptions } from '../interfaces';
 import { QueueBase, Repeat } from './';
 import { ChildPool, pool } from './child-pool';
 import { Job } from './job';
 import { RedisConnection } from './redis-connection';
 import sandbox from './sandbox';
 import { Scripts } from './scripts';
-import uuid from 'uuid';
+import * as uuid from 'uuid';
 import { TimerManager } from './timer-manager';
 import { isRedisInstance } from '../utils';
 
@@ -53,7 +53,7 @@ export class Worker<T = any> extends QueueBase {
 
     this.blockingConnection = new RedisConnection(
       isRedisInstance(opts.connection)
-        ? (<Redis>opts.connection).duplicate()
+        ? (<Redis.Redis>opts.connection).duplicate()
         : opts.connection,
     );
     this.blockingConnection.on('error', this.emit.bind(this));

src/commands/index.ts

@@ -12,7 +12,7 @@
  */
 'use strict';
 
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 
 const path = require('path');
 const util = require('util');
@@ -30,7 +30,7 @@ interface Command {
   };
 }
 
-export const load = async function(client: IORedis.Redis) {
+export const load = async function(client: Redis.Redis) {
   const scripts = await loadScripts(__dirname);
 
   scripts.forEach((command: Command) => {

src/interfaces/queue-options.ts

@@ -1,6 +1,6 @@
 import { JobsOptions } from '../interfaces';
 
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { ConnectionOptions } from './redis-options';
 
 export enum ClientType {
@@ -10,7 +10,7 @@ export enum ClientType {
 
 export interface QueueBaseOptions {
   connection?: ConnectionOptions;
-  client?: IORedis.Redis;
+  client?: Redis.Redis;
   prefix?: string; // prefix for all queue keys.
 }
 

src/interfaces/redis-options.ts

@@ -1,7 +1,7 @@
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 
-export type RedisOptions = IORedis.RedisOptions & {
+export type RedisOptions = Redis.RedisOptions & {
   skipVersionCheck?: boolean;
 };
 
-export type ConnectionOptions = RedisOptions | IORedis.Redis;
+export type ConnectionOptions = RedisOptions | Redis.Redis;

src/test/test_bulk.ts

@@ -1,6 +1,6 @@
 import { Queue, Worker, Job } from '../classes';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
 import { removeAllQueueData } from '../utils';
@@ -16,7 +16,7 @@ describe('bulk jobs', () => {
 
   afterEach(async function() {
     await queue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should process jobs', async () => {

src/test/test_clean.ts

@@ -1,7 +1,7 @@
 import { Queue, QueueEvents, Worker } from '../classes';
 import { delay, removeAllQueueData } from '@src/utils';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { after } from 'lodash';
 import { beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
@@ -21,7 +21,7 @@ describe('Cleaner', () => {
   afterEach(async function() {
     await queue.close();
     await queueEvents.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should clean an empty queue', async () => {
@@ -127,7 +127,7 @@ describe('Cleaner', () => {
     });
     await worker.waitUntilReady();
 
-    const client = new IORedis();
+    const client = new Redis();
 
     await queue.add('test', { some: 'data' });
     await queue.add('test', { some: 'data' });

src/test/test_compat.ts

@@ -6,7 +6,7 @@ import { Job, Worker } from '@src/classes';
 import { Queue3 } from '@src/classes/compat';
 import { delay, removeAllQueueData } from '@src/utils';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { after } from 'lodash';
 import { afterEach, beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
@@ -24,7 +24,7 @@ describe('Compat', function() {
 
     afterEach(async function() {
       await queue.close();
-      await removeAllQueueData(new IORedis(), queueName);
+      await removeAllQueueData(new Redis(), queueName);
     });
 
     it('should get waiting jobs', async function() {
@@ -294,7 +294,7 @@ describe('Compat', function() {
 
     afterEach(async function() {
       await queue.close();
-      await removeAllQueueData(new IORedis(), queueName);
+      await removeAllQueueData(new Redis(), queueName);
     });
 
     it('should emit waiting when a job has been added', function(done) {
@@ -403,7 +403,7 @@ describe('Compat', function() {
 
     afterEach(async function() {
       await queue.close();
-      await removeAllQueueData(new IORedis(), queueName);
+      await removeAllQueueData(new Redis(), queueName);
     });
 
     // it('should pause a queue until resumed', async () => {

src/test/test_connection.ts

@@ -1,4 +1,4 @@
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { Queue, QueueEvents, Job, Worker } from '@src/classes';
 
 import { v4 } from 'uuid';
@@ -16,7 +16,7 @@ describe('connection', () => {
 
   afterEach(async () => {
     await queue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should recover from a connection loss', async () => {

src/test/test_delay.ts

@@ -1,7 +1,7 @@
 import { Queue, Job } from '@src/classes';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { v4 } from 'uuid';
 import { Worker } from '@src/classes/worker';
 import { QueueEvents } from '@src/classes/queue-events';
@@ -21,7 +21,7 @@ describe('Delayed jobs', function() {
 
   afterEach(async function() {
     await queue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should process a delayed job only after delayed time', async function() {

src/test/test_events.ts

@@ -2,7 +2,7 @@ import { Queue } from '@src/classes';
 import { QueueEvents } from '@src/classes/queue-events';
 import { Worker } from '@src/classes/worker';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
 import { delay, removeAllQueueData } from '@src/utils';
@@ -23,7 +23,7 @@ describe('events', function() {
   afterEach(async function() {
     await queue.close();
     await queueEvents.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should emit waiting when a job has been added', async function() {
@@ -169,7 +169,7 @@ describe('events', function() {
     expect(eventsLength).to.be.equal(1);
 
     await trimmedQueue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should trim events manually', async () => {
@@ -194,6 +194,6 @@ describe('events', function() {
     expect(eventsLength).to.be.equal(0);
 
     await trimmedQueue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 });

src/test/test_getters.ts

@@ -5,7 +5,7 @@
 import { Queue, Job } from '@src/classes';
 import { describe, beforeEach, it } from 'mocha';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { v4 } from 'uuid';
 import { Worker } from '@src/classes/worker';
 import { after } from 'lodash';
@@ -23,7 +23,7 @@ describe('Jobs getters', function() {
 
   afterEach(async function() {
     await queue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   it('should get waiting jobs', async function() {

src/test/test_job.ts

@@ -7,7 +7,7 @@ import { Worker } from '@src/classes/worker';
 import { JobsOptions } from '@src/interfaces';
 import { delay, removeAllQueueData } from '@src/utils';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { after } from 'lodash';
 import { afterEach, beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
@@ -23,7 +23,7 @@ describe('Job', function() {
 
   afterEach(async () => {
     await queue.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   describe('.create', function() {

src/test/test_pause.ts

@@ -2,7 +2,7 @@ import { Job, Queue } from '@src/classes';
 import { QueueEvents, QueueScheduler } from '../classes';
 import { Worker } from '@src/classes/worker';
 import { expect } from 'chai';
-import IORedis from 'ioredis';
+import * as Redis from 'ioredis';
 import { beforeEach, describe, it } from 'mocha';
 import { v4 } from 'uuid';
 import { delay, removeAllQueueData } from '@src/utils';
@@ -22,7 +22,7 @@ describe('Pause', function() {
   afterEach(async function() {
     await queue.close();
     await queueEvents.close();
-    await removeAllQueueData(new IORedis(), queueName);
+    await removeAllQueueData(new Redis(), queueName);
   });
 
   // Skipped since some side effect makes this test fail