Moving types and classes into separate files

.eslintrc.js

@@ -5,13 +5,16 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module',
   },
-  plugins: ['ember', 'prettier'],
+  plugins: ['ember', 'prettier', '@typescript-eslint'],
   extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
   env: {
     browser: true,
+    node: false,
   },
   rules: {
     'prettier/prettier': 'error',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': 'error',
   },
   overrides: [
     // node files

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "6"
+  - '6'
 
 sudo: false
 dist: trusty
@@ -33,22 +33,21 @@ jobs:
   include:
     # runs linting and tests with current locked deps
 
-    - stage: "Tests"
-      name: "Tests"
+    - stage: 'Tests'
+      name: 'Tests'
       install:
         - yarn install --non-interactive
       script:
-        - yarn lint:hbs
         - yarn lint:js
         - yarn test
 
-    - name: "Floating Dependencies"
+    - name: 'Floating Dependencies'
       script:
         - yarn test
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - stage: "Additional Tests"
+    - stage: 'Additional Tests'
       env: EMBER_TRY_SCENARIO=ember-lts-2.18
     - env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-release

addon/index.ts

@@ -1,150 +1,11 @@
-import { DEBUG } from '@glimmer/env';
-
-type WaiterName = string;
-
-export interface IWaiter {
-  name: WaiterName;
-  waitUntil(): boolean;
-  debugInfo(): unknown[] | undefined | void;
-}
-
-export interface ISimpleWaiterDebugInfo {
-  stack: string | undefined;
-  label: string | undefined;
-}
-
-export class SimpleWaiter<T> implements IWaiter {
-  public name: WaiterName;
-
-  items = new Map<unknown, ISimpleWaiterDebugInfo>();
-
-  constructor(name: WaiterName) {
-    this.name = name;
-  }
-
-  add(item: T, label: string) {
-    this.items.set(item, {
-      stack: new Error().stack,
-      label,
-    });
-  }
-
-  delete(item: T) {
-    this.items.delete(item);
-  }
-
-  waitUntil() {
-    return this.items.size === 0;
-  }
-
-  debugInfo(): ISimpleWaiterDebugInfo[] {
-    let output: ISimpleWaiterDebugInfo[] = [];
-
-    this.items.forEach(item => output.push(item));
-
-    return output;
-  }
-}
-
-class PromiseWaiter<T> implements IWaiter {
-  name = 'promise-waiter';
-  items = new Map<Promise<T>, ISimpleWaiterDebugInfo>();
-
-  add(promise: Promise<T>, label?: string) {
-    this.items.set(promise, {
-      stack: new Error().stack,
-      label,
-    });
-  }
-
-  delete(promise: Promise<T>) {
-    this.items.delete(promise);
-  }
-
-  waitUntil(): boolean {
-    return this.items.size === 0;
-  }
-
-  debugInfo(): ISimpleWaiterDebugInfo[] {
-    let output: ISimpleWaiterDebugInfo[] = [];
-
-    this.items.forEach(item => output.push(item));
-
-    return output;
-  }
-}
-
-const PROMISE_WAITER = new PromiseWaiter();
-export function waitForPromise<T>(promise: Promise<T>, label?: string) {
-  let result = promise;
-
-  if (DEBUG) {
-    PROMISE_WAITER.add(promise, label);
-
-    result = promise.then(
-      value => {
-        PROMISE_WAITER.delete(promise);
-        return value;
-      },
-      error => {
-        PROMISE_WAITER.delete(promise);
-        throw error;
-      }
-    );
-  }
-
-  return result;
-}
-
-const WAITERS = new Set();
-
-export function register(waiter: IWaiter) {
-  WAITERS.add(waiter);
-}
-
-export function unregister(waiter: IWaiter) {
-  WAITERS.delete(waiter);
-}
-
-export function getWaiters(): IWaiter[] {
-  let result: IWaiter[] = [];
-
-  WAITERS.forEach(item => result.push(item));
-
-  return result;
-}
-
-export function reset() {
-  WAITERS.clear();
-}
-
-interface IPendingWaiterState {
-  pending: number;
-  waiters: {
-    [waiterName: string]: true | unknown[];
-  };
-}
-
-export function getPendingWaiterState(): IPendingWaiterState {
-  let result: IPendingWaiterState = {
-    pending: 0,
-    waiters: {},
-  };
-
-  WAITERS.forEach(waiter => {
-    if (waiter.waitUntil()) {
-      result.pending++;
-
-      let debugInfo = waiter.debugInfo();
-      result.waiters[waiter.name] = debugInfo || true;
-    }
-  });
-
-  return result;
-}
-
-export function shouldWait(): boolean {
-  let state = getPendingWaiterState();
-
-  return state.pending > 0;
-}
+export {
+  register,
+  unregister,
+  getWaiters,
+  reset,
+  getPendingWaiterState,
+  shouldWait,
+} from './waiters';
+
+export { SimpleWaiter } from './simple-waiter';
+export { PromiseWaiter, waitForPromise } from './promise-waiter';

addon/promise-waiter.ts

@@ -0,0 +1,52 @@
+import { DEBUG } from '@glimmer/env';
+import { IWaiter, ISimpleWaiterDebugInfo } from './types';
+
+export class PromiseWaiter<T> implements IWaiter {
+  name = 'promise-waiter';
+  items = new Map<Promise<T>, ISimpleWaiterDebugInfo>();
+
+  add(promise: Promise<T>, label?: string) {
+    this.items.set(promise, {
+      stack: new Error().stack,
+      label,
+    });
+  }
+
+  delete(promise: Promise<T>) {
+    this.items.delete(promise);
+  }
+
+  waitUntil(): boolean {
+    return this.items.size === 0;
+  }
+
+  debugInfo(): ISimpleWaiterDebugInfo[] {
+    let output: ISimpleWaiterDebugInfo[] = [];
+
+    this.items.forEach(item => output.push(item));
+
+    return output;
+  }
+}
+
+const PROMISE_WAITER = new PromiseWaiter();
+export function waitForPromise<T>(promise: Promise<T>, label?: string) {
+  let result = promise;
+
+  if (DEBUG) {
+    PROMISE_WAITER.add(promise, label);
+
+    result = promise.then(
+      value => {
+        PROMISE_WAITER.delete(promise);
+        return value;
+      },
+      error => {
+        PROMISE_WAITER.delete(promise);
+        throw error;
+      }
+    );
+  }
+
+  return result;
+}

addon/simple-waiter.ts

@@ -0,0 +1,34 @@
+import { IWaiter, WaiterName, ISimpleWaiterDebugInfo } from './types';
+
+export class SimpleWaiter<T> implements IWaiter {
+  public name: WaiterName;
+
+  items = new Map<unknown, ISimpleWaiterDebugInfo>();
+
+  constructor(name: WaiterName) {
+    this.name = name;
+  }
+
+  add(item: T, label: string) {
+    this.items.set(item, {
+      stack: new Error().stack,
+      label,
+    });
+  }
+
+  delete(item: T) {
+    this.items.delete(item);
+  }
+
+  waitUntil() {
+    return this.items.size === 0;
+  }
+
+  debugInfo(): ISimpleWaiterDebugInfo[] {
+    let output: ISimpleWaiterDebugInfo[] = [];
+
+    this.items.forEach(item => output.push(item));
+
+    return output;
+  }
+}

addon/types/index.ts

@@ -0,0 +1,19 @@
+export type WaiterName = string;
+
+export interface IWaiter {
+  name: WaiterName;
+  waitUntil(): boolean;
+  debugInfo(): unknown[] | undefined | void;
+}
+
+export interface ISimpleWaiterDebugInfo {
+  stack: string | undefined;
+  label: string | undefined;
+}
+
+export interface IPendingWaiterState {
+  pending: number;
+  waiters: {
+    [waiterName: string]: true | unknown[];
+  };
+}

addon/waiters.ts

@@ -0,0 +1,47 @@
+import { IWaiter, IPendingWaiterState } from './types';
+
+const WAITERS = new Set();
+
+export function register(waiter: IWaiter) {
+  WAITERS.add(waiter);
+}
+
+export function unregister(waiter: IWaiter) {
+  WAITERS.delete(waiter);
+}
+
+export function getWaiters(): IWaiter[] {
+  let result: IWaiter[] = [];
+
+  WAITERS.forEach(item => result.push(item));
+
+  return result;
+}
+
+export function reset() {
+  WAITERS.clear();
+}
+
+export function getPendingWaiterState(): IPendingWaiterState {
+  let result: IPendingWaiterState = {
+    pending: 0,
+    waiters: {},
+  };
+
+  WAITERS.forEach(waiter => {
+    if (waiter.waitUntil()) {
+      result.pending++;
+
+      let debugInfo = waiter.debugInfo();
+      result.waiters[waiter.name] = debugInfo || true;
+    }
+  });
+
+  return result;
+}
+
+export function shouldWait(): boolean {
+  let state = getPendingWaiterState();
+
+  return state.pending > 0;
+}