build cleanup and output declarations

Author: lynchbomb

ember-cli-build.js

@@ -20,78 +20,87 @@ module.exports = function (app) {
     })
   ]);
 
+  const qunit = new Funnel(path.dirname(require.resolve('qunit')), {
+    annotation: 'tests/qunit.{js,css}',
+    destDir: 'tests',
+    files: ['qunit.css', 'qunit.js']
+  });
+
+  const loader = new Funnel(path.dirname(require.resolve('loader.js')), {
+    annotation: 'tests/loader.js',
+    destDir: 'tests',
+    files: ['loader.js']
+  });
+
+  const tests = new Funnel(__dirname + '/tests', {
+    destDir: 'tests',
+    files: ['index.html']
+  });
+
   const compiled = typescript(src, {
     throwOnError: process.env.EMBER_ENV === 'production',
   });
 
+  const compiledDeclarations = typescript('lib', {
+    tsconfig: {
+      compilerOptions: {
+        "declaration": true,
+      }
+    }
+  });
+
   const backburner = new Rollup(compiled, {
+    annotation: 'backburner.js',
     rollup: {
       input: 'lib/index.js',
-      output: {
+      output: [{
         file: 'es6/backburner.js',
         format: 'es',
         sourcemap: true
-      },
-      format: 'es',
+      }, {
+        file: 'named-amd/backburner.js',
+        exports: 'named',
+        format: 'amd',
+        amd: { id: 'backburner' },
+        sourcemap: true
+      }, {
+        file: 'backburner.js',
+        format: 'cjs',
+        sourcemap: true,
+        exports: 'named'
+      }],
       plugins: [
-        loadWithInlineMap()
+        loadWithInlineMap(),
+        buble()
       ]
     }
   });
 
+  const amdTests = new Rollup(compiled, {
+    annotation: 'named-amd/tests.js',
+    rollup: {
+      input: 'tests/index.js',
+      external: ['backburner'],
+      plugins: [
+        loadWithInlineMap(),
+        buble()
+      ],
+      output: [{
+        file: 'named-amd/tests.js',
+        format: 'amd',
+        amd: { id: 'backburner-tests' },
+        sourcemap: true
+      }]
+    }
+  });
+
   return new MergeTrees([
     backburner,
-    new Rollup(compiled, {
-      rollup: {
-        input: 'lib/index.js',
-        plugins: [
-          loadWithInlineMap(),
-          buble()
-        ],
-        output: [{
-          file: 'named-amd/backburner.js',
-          exports: 'named',
-          format: 'amd',
-          amd: { id: 'backburner' },
-          sourcemap: true
-        }, {
-          file: 'backburner.js',
-          format: 'cjs',
-          sourcemap: true
-        }]
-      }
-    }),
-    new Rollup(compiled, {
-      annotation: 'named-amd/tests.js',
-      rollup: {
-        input: 'tests/index.js',
-        external: ['backburner'],
-        plugins: [
-          loadWithInlineMap(),
-          buble()
-        ],
-        output: [{
-          file: 'named-amd/tests.js',
-          format: 'amd',
-          amd: { id: 'backburner-tests' },
-          sourcemap: true
-        }]
-      }
-    }),
-    new Funnel(path.dirname(require.resolve('qunit')), {
-      annotation: 'tests/qunit.{js,css}',
-      destDir: 'tests',
-      files: ['qunit.css', 'qunit.js']
-    }),
-    new Funnel(path.dirname(require.resolve('loader.js')), {
-      annotation: 'tests/loader.js',
-      destDir: 'tests',
-      files: ['loader.js']
-    }),
-    new Funnel(__dirname + '/tests', {
-      destDir: 'tests',
-      files: ['index.html']
-    })
+    compiledDeclarations,
+    amdTests,
+    qunit,
+    loader,
+    tests
   ], {
     annotation: 'dist'
   });

lib/backburner/deferred-action-queues.ts

@@ -1,4 +1,7 @@
 import Queue, { QUEUE_STATE } from './queue';
+import {
+  IQueueItem
+} from './interfaces';
 
 export default class DeferredActionQueues {
   public queues: { [name: string]: Queue } = {};
@@ -25,7 +28,7 @@ export default class DeferredActionQueues {
     @param {Any} stack
     @return queue
   */
-  public schedule(queueName: string, target: any, method: any, args: any, onceFlag: boolean, stack: any) {
+  public schedule(queueName: string, target: any, method: any, args: any, onceFlag: boolean, stack: any): IQueueItem {
     let queues = this.queues;
     let queue = queues[queueName];
 

lib/backburner/interfaces.ts

@@ -0,0 +1,7 @@
+export interface IQueueItem {
+  queue: Object;
+  target: any;
+  method: any;
+}
+
+export type Timer = string | number;

lib/backburner/queue.ts

@@ -3,6 +3,10 @@ import {
   getOnError
 } from './utils';
 
+import {
+  IQueueItem
+} from './interfaces';
+
 export const enum QUEUE_STATE {
   Pause = 1
 }
@@ -134,7 +138,7 @@ export default class Queue {
     return false;
   }
 
-  public push(target, method, args, stack) {
+  public push(target, method, args, stack): IQueueItem {
     this._queue.push(target, method, args, stack);
 
     return {
@@ -144,7 +148,7 @@ export default class Queue {
     };
   }
 
-  public pushUnique(target, method, args, stack) {
+  public pushUnique(target, method, args, stack): IQueueItem {
     let localQueueMap = this.targetQueues.get(target);
 
     if (localQueueMap === undefined) {

lib/index.ts

@@ -19,8 +19,7 @@ import DeferredActionQueues from './backburner/deferred-action-queues';
 import iteratorDrain, { Iterable } from './backburner/iterator-drain';
 
 import Queue, { QUEUE_STATE } from './backburner/queue';
-
-type Timer = string | number;
+import { IQueueItem, Timer } from './backburner/interfaces';
 
 const noop = function() {};
 
@@ -371,7 +370,7 @@ export default class Backburner {
     @param {Iterable} an iterable of functions to execute
     @return method result
   */
-  public scheduleIterable(queueName: string, iterable: () => Iterable) {
+  public scheduleIterable(queueName: string, iterable: () => Iterable): IQueueItem {
     scheduleIterableCount++;
     let stack = this.DEBUG ? new Error() : undefined;
     return this._ensureInstance().schedule(queueName, null, iteratorDrain, [iterable], false, stack);

package.json

@@ -6,6 +6,7 @@
   "author": "Erik Bryn",
   "main": "dist/backburner.js",
   "jsnext:main": "dist/backburner.js",
+  "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/BackburnerJS/backburner.js.git"
@@ -25,7 +26,7 @@
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^3.0.0",
     "broccoli-rollup": "^2.1.0",
-    "broccoli-typescript-compiler": "^2.2.0",
+    "broccoli-typescript-compiler": "^2.3.0",
     "do-you-even-bench": "^1.0.5",
     "ember-cli": "^3.0.2",
     "ember-cli-dependency-checker": "^2.1.0",
@@ -34,6 +35,6 @@
     "loader.js": "^4.6.0",
     "qunit": "^2.6.0",
     "rollup-plugin-buble": "^0.19.2",
-    "tslint": "^5.9.1"
+    "tslint": "^5.10.0",
   }
 }

tsconfig.json

@@ -12,8 +12,8 @@
       "backburner": ["lib/index.ts"]
     }
   },
-  "files": [
+  "file": [
     "lib/index.ts",
     "tests/index.ts"
   ]
-}
+}

tslint.json

@@ -13,7 +13,7 @@
     "prefer-const": false,
     "max-line-length": [false],
     "variable-name": [true, "ban-keywords", "check-format", "allow-leading-underscore"],
-    "ban-types": {}
+    "ban-types": {},
   },
   "jsRules": {
     "quotemark": [true, "single", "avoid-escape"],