ts: command.start

Author: shakyShane

lib/bin.ts

@@ -92,7 +92,6 @@ function runFromCli() {
  * @returns {any}
  */
 function handleNoCommand(argv, input, yargs) {
-
     const processed = processStart(yargs);
     const paths = input.map(path => {
         const resolved = resolve(path);
@@ -112,7 +111,7 @@ function handleNoCommand(argv, input, yargs) {
         withErrors.forEach(item => {
             logger.unprefixed("error", printErrors(item.errors));
         });
-        return  process.exit(1);
+        return process.exit(1);
     }
 
     const serveStaticPaths = withoutErrors
@@ -134,7 +133,7 @@ function handleNoCommand(argv, input, yargs) {
             proxy,
             serveStatic: serveStaticPaths
         };
-        return handleIncoming('start', yargs.reset());
+        return handleIncoming("start", yargs.reset());
     }
 
     /**
@@ -155,7 +154,11 @@ function handleNoCommand(argv, input, yargs) {
  */
 function handleCli(opts) {
     opts.cb = opts.cb || utils.defaultCallback;
-    return require(`./cli/command.${opts.cli.input[0]}`)(opts);
+    const m = require(`./cli/command.${opts.cli.input[0]}`);
+    if (m.default) {
+        return m.default(opts);
+    }
+    return m(opts);
 }
 
 export default handleCli;
@@ -164,10 +167,7 @@ function processStart(yargs) {
     return yargs
         .usage("Usage: $0 start [options]")
         .options(startOpts)
-        .example(
-            "$0 start -s app",
-            "- Use the App directory to serve files"
-        )
+        .example("$0 start -s app", "- Use the App directory to serve files")
         .example("$0 start -p www.bbc.co.uk", "- Proxy an existing website")
         .help().argv;
 }

lib/cli/cli-options.js

@@ -1,5 +1,3 @@
-"use strict";
-
 var path = require("path");
 var url = require("url");
 var _ = require("../lodash.custom");
@@ -11,6 +9,8 @@ var immDefs = Immutable.fromJS(defaultConfig);
 
 var opts = exports;
 
+opts.explodeFilesArg = string => string.split(",").map(item => item.trim());
+
 /**
  * @type {{wrapPattern: Function}}
  */

lib/cli/command.start.js lib/cli/command.start.tslib/cli/command.start.js renamed to lib/cli/command.start.ts

@@ -1,10 +1,8 @@
-"use strict";
-
-var path = require("path");
-var fs = require("fs");
-var _ = require("../lodash.custom");
-var utils = require("../utils");
-var opts = require("./cli-options").utils;
+import * as path from "path";
+import { existsSync } from "fs";
+import * as utils from "../utils";
+import { explodeFilesArg } from "./cli-options";
+const _ = require("../lodash.custom");
 
 /**
  * $ browser-sync start <options>
@@ -15,28 +13,26 @@ var opts = require("./cli-options").utils;
  * @param opts
  * @returns {Function}
  */
-module.exports = function(opts) {
-    var flags = preprocessFlags(opts.cli.flags);
-    var maybepkg = path.resolve(process.cwd(), "package.json");
-    var input = flags;
+export default function(opts) {
+    const flags = preprocessFlags(opts.cli.flags);
+    const maybepkg = path.resolve(process.cwd(), "package.json");
+    let input = flags;
 
     if (flags.config) {
-        var maybeconf = path.resolve(process.cwd(), flags.config);
-        if (fs.existsSync(maybeconf)) {
-            var conf = require(maybeconf);
+        const maybeconf = path.resolve(process.cwd(), flags.config);
+        if (existsSync(maybeconf)) {
+            const conf = require(maybeconf);
             input = _.merge({}, conf, flags);
         } else {
             utils.fail(
                 true,
-                new Error(
-                    "Configuration file '" + flags.config + "' not found"
-                ),
+                new Error(`Configuration file '${flags.config}' not found`),
                 opts.cb
             );
         }
     } else {
-        if (fs.existsSync(maybepkg)) {
-            var pkg = require(maybepkg);
+        if (existsSync(maybepkg)) {
+            const pkg = require(maybepkg);
             if (pkg["browser-sync"]) {
                 console.log("> Configuration obtained from package.json");
                 input = _.merge({}, pkg["browser-sync"], flags);
@@ -47,16 +43,17 @@ module.exports = function(opts) {
     return require("../")
         .create("cli")
         .init(input, opts.cb);
-};
+}
 
 /**
  * @param flags
  * @returns {*}
  */
 function preprocessFlags(flags) {
-    return [stripUndefined, legacyFilesArgs].reduce(function(flags, fn) {
-        return fn.call(null, flags);
-    }, flags);
+    return [stripUndefined, legacyFilesArgs].reduce(
+        (flags, fn) => fn.call(null, flags),
+        flags
+    );
 }
 
 /**
@@ -66,8 +63,8 @@ function preprocessFlags(flags) {
  * @returns {*}
  */
 function stripUndefined(subject) {
-    return Object.keys(subject).reduce(function(acc, key) {
-        var value = subject[key];
+    return Object.keys(subject).reduce((acc, key) => {
+        const value = subject[key];
         if (typeof value === "undefined") {
             return acc;
         }
@@ -82,9 +79,10 @@ function stripUndefined(subject) {
  */
 function legacyFilesArgs(flags) {
     if (flags.files && flags.files.length) {
-        flags.files = flags.files.reduce(function(acc, item) {
-            return acc.concat(opts.explodeFilesArg(item));
-        }, []);
+        flags.files = flags.files.reduce(
+            (acc, item) => acc.concat(explodeFilesArg(item)),
+            []
+        );
     }
     return flags;
 }