bundle pass update, exit codes

Author: sinclairzx81

package.json

@@ -1,6 +1,6 @@
 {
  "name": "typescript-bundle",
- "version": "0.8.8",
+ "version": "0.8.9",
  "description": "bundle modular typescript projects for the browser.",
  "main": "./index.js",
  "scripts": {},

readme.md

@@ -101,7 +101,7 @@ typescript-bundle does however mandate the following settings be set. So it is r
  ]
 }
 ```
-note: the ```--moduleResolution``` and ```--outDir``` must be left unset.
+note: the ```--outDir``` must be left unset.
 
 note: the ```files``` should contain only one file path.
 

src/bundle.ts

@@ -30,6 +30,7 @@ import { Options } from "./options"
 import { touch } from "./touch"
 import { watch } from "./watch"
 import { compile } from "./compile"
+import { delay } from "./delay"
 import { shim } from "./shim"
 import { help, version, info, errors, done } from "./help"
 
@@ -43,42 +44,69 @@ import * as path from "path"
  * @returns {Promise<any>} 
  */
 export const bundle = async (options: Options, log: Function) => {
- // run validation, help and version checks.
- if(options.errors.length > 0) return log(errors(options))
- if(options.properties.help) return log(help())
- if(options.properties.version) return log(await version())
-
- // display compiler settings.
- log(info(options))
-
- // if we are loading from a project, then we need to resolve
- // the output file path from the view of the config.
- const outputFile = (options.properties.project === undefined)
- ? path.resolve(process.cwd(), options.properties.outputFile)
- : path.resolve(
- path.dirname(
- path.resolve(process.cwd(), options.properties.project
- ) ), options.properties.outputFile)
- 
-
- // ensure the output file exists.
+ // ----------------------------------------------------------
+ //
+ // run validation, help and version checks.
+ //
+ // ----------------------------------------------------------
+ if(options.errors.length > 0) { return log(errors(options)) }
+ if(options.properties.help) { return log(help()) }
+ if(options.properties.version) { return log(await version()) }
+
+ // ----------------------------------------------------------
+ //
+ // display compiler settings.
+ //
+ // ----------------------------------------------------------
+ log(info(options))
+
+ // ----------------------------------------------------------
+ //
+ // if we are loading from a project, then we need to resolve
+ // the output file path from the view of the config.
+ //
+ // ----------------------------------------------------------
+ const outputFile = (options.properties.project === undefined)
+ ? path.resolve(process.cwd(), options.properties.outputFile)
+ : path.resolve(
+ path.dirname(
+ path.resolve(process.cwd(), options.properties.project
+ ) ), options.properties.outputFile);
+ 
+ // ----------------------------------------------------------
+ //
+ // watch
+ //
+ // ----------------------------------------------------------
+ if (options.properties.watch === true) {
+
+ // ensure the output file exists..
  await touch(outputFile)
+ 
+ // start watcher process..
+ watch(outputFile, () => shim(outputFile, options.properties.exportAs, options.properties.importAs))
+ 
+ // compile..
+ compile (options.command, log)
+ }
+
+ // ----------------------------------------------------------
+ //
+ // standard
+ //
+ // ----------------------------------------------------------
+ else {
+
+ // compile
+ await compile (options.command, log)
+
+ // wait a bit..
+ await delay (100)
 
- // watch output file for changes. (compile on save support)
- const watcher = watch(outputFile, () => {
- shim(outputFile, options.properties.exportAs, options.properties.importAs)
- })
+ // shim
+ await shim (outputFile, options.properties.exportAs, options.properties.importAs)
 
- // run compilation.
- const start = new Date()
- try {
- await compile (options.command, log)
- await shim (outputFile, options.properties.exportAs, options.properties.importAs)
- watcher.close ()
- log(done())
- } catch (e) {
- shim(outputFile, options.properties.exportAs, options.properties.importAs)
- watcher.close()
- log(done())
- }
+ // complete
+ log(done())
+ }
 }

src/compile.ts

@@ -25,15 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 ---------------------------------------------------------------------------*/
-import {shell} from "./shell"
+import { shell } from "./shell"
 
 /**
  * invokes the typescript compiler with the given command.
  * @param {string} command the typescript shell command.
  * @param {Function} log the logging function.
- * @returns {Promise<any>}
+ * @returns {Promise<void>}
  */
-export const compile = async (command: string, log: Function = function() {}) : Promise<any> => {
+export const compile = async (command: string, log: Function = function() {}) : Promise<void> => {
  const exitcode = await shell(command, log)
- if(exitcode !== 0) throw Error("unexpected exit code")
+ if(exitcode !== 0) {
+ process.exit(exitcode)
+ }
 }

src/delay.ts

@@ -0,0 +1,34 @@
+/*--------------------------------------------------------------------------
+
+typescript-bundle - bundle modular typescript projects for the browser
+
+The MIT License (MIT)
+
+Copyright (c) 2016-2017 Haydn Paterson (sinclair) <haydn.developer@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---------------------------------------------------------------------------*/
+
+/**
+ * preforms a simple delay with the given milliseconds.
+ * @param {number} ms the number of milliseconds to delay.
+ * @returns {Promise<void>}
+ */
+export const delay = (ms: number) => new Promise<void>(resolve => setTimeout(() => resolve(), ms))

src/help.ts

@@ -26,8 +26,8 @@ THE SOFTWARE.
 
 ---------------------------------------------------------------------------*/
 
-import {Options} from "./options"
-import {shell} from "./shell"
+import { Options } from "./options"
+import { shell } from "./shell"
 
 const VERSION = "[[[VERSION_STRING]]]"
 

src/shell.ts

@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------------------------*/
 
-import {spawn} from "child_process"
+import { spawn } from "child_process"
 
 /**
  * executes a shell command.

src/watch.ts

@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------------------------*/
 
-import * as fs  from "fs"
+import * as fs from "fs"
 
 /** simple event debouncer */
 class Debounce {