feat: Added build --as-needed to watch and rebuild

package.json

@@ -37,6 +37,7 @@
   "dependencies": {
     "babel-polyfill": "6.7.4",
     "bunyan": "1.8.0",
+    "debounce": "1.0.0",
     "es6-error": "2.1.0",
     "es6-promisify": "4.0.0",
     "firefox-profile": "0.3.12",
@@ -47,6 +48,7 @@
     "source-map-support": "0.4.0",
     "stream-to-promise": "1.1.0",
     "tmp": "0.0.28",
+    "watchpack": "1.0.1",
     "yargs": "4.6.0",
     "zip-dir": "1.0.2"
   },

src/cmd/build.js

@@ -4,6 +4,7 @@ import minimatch from 'minimatch';
 import {createWriteStream} from 'fs';
 import streamToPromise from 'stream-to-promise';
 
+import defaultSourceWatcher from '../watcher';
 import {zipDir} from '../util/zip-dir';
 import getValidatedManifest from '../util/manifest';
 import {prepareArtifactsDir} from '../util/artifacts';
@@ -12,49 +13,74 @@ import {createLogger} from '../util/logger';
 const log = createLogger(__filename);
 
 
-export default function build(
-    {sourceDir, artifactsDir}: Object,
-    {manifestData, fileFilter}: Object = {}): Promise {
+function defaultPackageCreator(
+    {manifestData, sourceDir, fileFilter, artifactsDir}) {
 
-  log.info(`Building web extension from ${sourceDir}`);
+  return new Promise(
+    (resolve) => {
+      if (manifestData) {
+        log.debug(`Using manifest id=${manifestData.applications.gecko.id}`);
+        resolve(manifestData);
+      } else {
+        resolve(getValidatedManifest(sourceDir));
+      }
+    })
+    .then((manifestData) => {
+      return zipDir(
+        sourceDir, {
+          filter: (...args) => fileFilter.wantFile(...args),
+        })
+        .then((buffer) => {
+          let packageName = safeFileName(
+            `${manifestData.name}-${manifestData.version}.xpi`);
+          let extensionPath = path.join(artifactsDir, packageName);
+          let stream = createWriteStream(extensionPath);
+          let promisedStream = streamToPromise(stream);
+
+          stream.write(buffer, () => stream.end());
+
+          return promisedStream
+            .then(() => {
+              log.info(`Your web extension is ready: ${extensionPath}`);
+              return {extensionPath};
+            });
+        });
+    });
+}
 
-  let resolveManifest;
-  if (manifestData) {
-    log.debug(`Using manifest id=${manifestData.applications.gecko.id}`);
-    resolveManifest = Promise.resolve(manifestData);
-  } else {
-    resolveManifest = getValidatedManifest(sourceDir);
-  }
 
-  if (!fileFilter) {
-    fileFilter = new FileFilter();
-  }
+export default function build(
+    {sourceDir, artifactsDir, asNeeded}: Object,
+    {manifestData, fileFilter=new FileFilter(),
+     onSourceChange=defaultSourceWatcher,
+     packageCreator=defaultPackageCreator}
+    : Object = {}): Promise {
 
-  return resolveManifest
-    .then((manifestData) =>
-      Promise.all([
-        prepareArtifactsDir(artifactsDir),
-        zipDir(sourceDir, {
-          filter: (...args) => fileFilter.wantFile(...args),
-        }),
-      ])
-      .then((results) => {
-        let [artifactsDir, buffer] = results;
-        let packageName = safeFileName(
-          `${manifestData.name}-${manifestData.version}.xpi`);
-        let extensionPath = path.join(artifactsDir, packageName);
-        let stream = createWriteStream(extensionPath);
-        let promisedStream = streamToPromise(stream);
-
-        stream.write(buffer, () => stream.end());
-
-        return promisedStream
-          .then(() => {
-            log.info(`Your web extension is ready: ${extensionPath}`);
-            return {extensionPath};
-          });
-      })
-    );
+  const rebuildAsNeeded = asNeeded; // alias for `build --as-needed`
+  log.info(`Building web extension from ${sourceDir}`);
+
+  const createPackage = () => packageCreator({
+    manifestData, sourceDir, fileFilter, artifactsDir,
+  });
+
+  return prepareArtifactsDir(artifactsDir)
+    .then(() => createPackage())
+    .then((result) => {
+      if (rebuildAsNeeded) {
+        log.info('Rebuilding when files change...');
+        onSourceChange({
+          sourceDir, artifactsDir,
+          onChange: () => {
+            return createPackage().catch((error) => {
+              log.error(error.stack);
+              throw error;
+            });
+          },
+          shouldWatchFile: (...args) => fileFilter.wantFile(...args),
+        });
+      }
+      return result;
+    });
 }
 
 
@@ -86,7 +112,7 @@ export class FileFilter {
   wantFile(path: string): boolean {
     for (const test of this.filesToIgnore) {
       if (minimatch(path, test)) {
-        log.debug(`Not including file ${path} in ZIP archive`);
+        log.debug(`FileFilter: ignoring file ${path}`);
         return false;
       }
     }

src/program.js

@@ -142,7 +142,12 @@ Example: $0 --help run.
   program
     .command('build',
              'Create a web extension package from source',
-             commands.build, {})
+             commands.build, {
+      'as-needed': {
+        describe: 'Watch for file changes and re-build as needed',
+        type: 'boolean',
+      },
+    })
     .command('sign',
              'Sign the web extension so it can be installed in Firefox',
              commands.sign, {

src/watcher.js

@@ -0,0 +1,41 @@
+/* @flow */
+import Watchpack from 'watchpack';
+import debounce from 'debounce';
+
+import {createLogger} from './util/logger';
+
+const log = createLogger(__filename);
+
+
+export default function onSourceChange(
+    {sourceDir, artifactsDir, onChange, shouldWatchFile}: Object): Watchpack {
+  // TODO: For network disks, we would need to add {poll: true}.
+  const watcher = new Watchpack();
+
+  const onFileChange = (filePath) => {
+    proxyFileChanges({artifactsDir, onChange, filePath, shouldWatchFile});
+  };
+  const executeImmediately = true;
+  watcher.on('change', debounce(onFileChange, 1000, executeImmediately));
+
+  log.debug(`Watching for file changes in ${sourceDir}`);
+  watcher.watch([], [sourceDir], Date.now());
+
+  // TODO: support windows See:
+  // http://stackoverflow.com/questions/10021373/what-is-the-windows-equivalent-of-process-onsigint-in-node-js
+  process.on('SIGINT', () => watcher.close());
+  return watcher;
+}
+
+
+export function proxyFileChanges(
+    {artifactsDir, onChange, filePath, shouldWatchFile=() => true}
+    : Object) {
+  if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {
+    log.debug(`Ignoring change to: ${filePath}`);
+  } else {
+    log.info(`Changed: ${filePath}`);
+    log.debug(`Last change detection: ${(new Date()).toTimeString()}`);
+    onChange();
+  }
+}