refactor(util): break apart util module

Author: adamdbradley

src/clean.ts

@@ -1,5 +1,7 @@
-import { BuildContext, generateContext, Logger } from './util';
+import { BuildContext } from './util/interfaces';
+import { generateContext } from './util/config';
 import { emptyDirSync } from 'fs-extra';
+import { Logger } from './util/logger';
 
 
 export function clean(context?: BuildContext) {

src/cleancss.ts

@@ -1,8 +1,11 @@
 import { join } from 'path';
-
-import { BuildContext, generateContext, fillConfigDefaults, Logger, readFileAsync, TaskInfo, writeFileAsync } from './util';
+import { BuildContext, TaskInfo } from './util/interfaces';
+import { generateContext, fillConfigDefaults } from './util/config';
+import { Logger } from './util/logger';
+import { readFileAsync, writeFileAsync } from './util/helpers';
 import * as cleanCss from 'clean-css';
 
+
 export function cleancss(context?: BuildContext, cleanCssConfig?: CleanCssConfig) {
   context = generateContext(context);
   cleanCssConfig = fillConfigDefaults(context, cleanCssConfig, CLEANCSS_TASK_INFO);
@@ -24,7 +27,7 @@ export function cleancss(context?: BuildContext, cleanCssConfig?: CleanCssConfig
     return logger.finish();
 
   }).catch((err: Error) => {
-    logger.fail(err, err.message);
+    logger.fail(err);
     return Promise.reject(err);
   });
 }

src/closure.ts

@@ -1,4 +1,6 @@
-import { BuildContext, generateContext, fillConfigDefaults, Logger, TaskInfo } from './util';
+import { BuildContext, TaskInfo } from './util/interfaces';
+import { generateContext, fillConfigDefaults } from './util/config';
+import { Logger } from './util/logger';
 
 
 export function closure(context?: BuildContext, closureConfig?: ClosureConfig) {

src/copy.ts

@@ -1,5 +1,7 @@
-import { BuildContext, BuildOptions, fillConfigDefaults, generateContext, Logger, replacePathVars, TaskInfo } from './util';
+import { BuildContext, BuildOptions, TaskInfo } from './util/interfaces';
+import { fillConfigDefaults, generateContext, replacePathVars } from './util/config';
 import { copy as fsCopy } from 'fs-extra';
+import { Logger } from './util/logger';
 
 
 export function copy(context?: BuildContext, copyConfig?: CopyConfig) {
@@ -10,6 +12,7 @@ export function copy(context?: BuildContext, copyConfig?: CopyConfig) {
 
   return runCopy(context, copyConfig).then(() => {
     return logger.finish();
+
   }).catch((err: Error) => {
     logger.fail(err);
     return Promise.reject(err);

src/index.ts

@@ -10,7 +10,9 @@ export { sass, sassUpdate } from './sass';
 export { transpile } from './transpile';
 export { uglifyjs } from './uglifyjs';
 export { watch } from './watch';
-export * from './util';
+export * from './util/config';
+export * from './util/helpers';
+export * from './util/interfaces';
 
 
 export function run(task: string) {

src/lint.ts

@@ -1,6 +1,8 @@
-import { BuildContext, generateContext, getConfigValueDefaults, getNodeBinExecutable, Logger, TaskInfo } from './util';
-import { join } from 'path';
 import { access } from 'fs';
+import { BuildContext, TaskInfo } from './util/interfaces';
+import { generateContext, getConfigValueDefaults, getNodeBinExecutable } from './util/config';
+import { join } from 'path';
+import { Logger } from './util/logger';
 
 
 export function lint(context?: BuildContext, tsConfigPath?: string) {

src/minify.ts

@@ -1,6 +1,8 @@
+import { BuildContext } from './util/interfaces';
 import { cleancss } from './cleancss';
 import { closure, isClosureSupported } from './closure';
-import { BuildContext, generateContext, Logger } from './util';
+import { generateContext } from './util/config';
+import { Logger } from './util/logger';
 import { uglifyjs } from './uglifyjs';
 
 
@@ -25,6 +27,7 @@ export function minify(context?: BuildContext) {
 
   return Promise.all(promises).then(() => {
     return logger.finish();
+
   }).catch((err: Error) => {
     logger.fail(err);
     return Promise.reject(err);

src/sass.ts

@@ -1,6 +1,8 @@
 import { basename, dirname, join, sep } from 'path';
-import { BuildContext, BuildOptions, fillConfigDefaults, generateContext, generateBuildOptions, Logger, replacePathVars, TaskInfo } from './util';
+import { BuildContext, BuildOptions, TaskInfo } from './util/interfaces';
+import { fillConfigDefaults, generateContext, generateBuildOptions, replacePathVars } from './util/config';
 import { getModulePathsCache } from './bundle';
+import { Logger } from './util/logger';
 import { readdirSync, writeFile } from 'fs';
 
 

src/spec/util.spec.ts

@@ -1,5 +1,7 @@
-import { BuildContext, generateContext, generateBuildOptions, getConfigValueDefaults, fillConfigDefaults } from '../util';
-import { addArgv, setEnvVar, setProcessArgs, setProcessEnv, setCwd } from '../util';
+import { BuildContext } from '../util/interfaces';
+import { generateContext, generateBuildOptions, getConfigValueDefaults, fillConfigDefaults } from '../util/config';
+import { addArgv, setProcessEnvVar, setProcessArgs, setProcessEnv, setCwd } from '../util/config';
+
 
 describe('util', () => {
 
@@ -43,30 +45,30 @@ describe('util', () => {
       addArgv('fullArgValue');
       addArgv('-s');
       addArgv('shortArgValue');
-      setEnvVar('npm_package_config_envVar', 'myNPMConfigVal');
-      setEnvVar('envVar', 'myProcessEnvVar');
+      setProcessEnvVar('npm_package_config_envVar', 'myNPMConfigVal');
+      setProcessEnvVar('envVar', 'myProcessEnvVar');
       const val = getConfigValueDefaults('--full', '-s', 'envVar', 'defaultValue', context);
       expect(val).toEqual('fullArgValue');
     });
 
     it('should get arg short value', () => {
       addArgv('-s');
       addArgv('shortArgValue');
-      setEnvVar('npm_package_config_envVar', 'myNPMConfigVal');
-      setEnvVar('envVar', 'myProcessEnvVar');
+      setProcessEnvVar('npm_package_config_envVar', 'myNPMConfigVal');
+      setProcessEnvVar('envVar', 'myProcessEnvVar');
       const val = getConfigValueDefaults('--full', '-s', 'envVar', 'defaultValue', context);
       expect(val).toEqual('shortArgValue');
     });
 
     it('should get npm config value', () => {
-      setEnvVar('npm_package_config_envVar', 'myNPMConfigVal');
-      setEnvVar('envVar', 'myProcessEnvVar');
+      setProcessEnvVar('npm_package_config_envVar', 'myNPMConfigVal');
+      setProcessEnvVar('envVar', 'myProcessEnvVar');
       const val = getConfigValueDefaults('--full', '-s', 'envVar', 'defaultValue', context);
       expect(val).toEqual('myNPMConfigVal');
     });
 
     it('should get envVar value', () => {
-      setEnvVar('envVar', 'myProcessEnvVar');
+      setProcessEnvVar('envVar', 'myProcessEnvVar');
       const val = getConfigValueDefaults('--full', '-s', 'envVar', 'defaultValue', context);
       expect(val).toEqual('myProcessEnvVar');
     });

src/uglifyjs.ts

@@ -1,6 +1,10 @@
+import { BuildContext, TaskInfo } from './util/interfaces';
+import { fillConfigDefaults, generateContext } from './util/config';
 import { join } from 'path';
+import { Logger } from './util/logger';
+import { writeFileAsync } from './util/helpers';
 import * as uglify from 'uglify-js';
-import { BuildContext, generateContext, fillConfigDefaults, Logger, TaskInfo, writeFileAsync } from './util';
+
 
 export function uglifyjs(context?: BuildContext, uglifyJsConfig?: UglifyJsConfig) {
   context = generateContext(context);
@@ -10,38 +14,46 @@ export function uglifyjs(context?: BuildContext, uglifyJsConfig?: UglifyJsConfig
 
   return runUglify(context, uglifyJsConfig).then(() => {
     return logger.finish();
+
   }).catch((err: Error) => {
     logger.fail(err);
     return Promise.reject(err);
   });
 }
 
+
 function runUglify(context: BuildContext, uglifyJsConfig: UglifyJsConfig): Promise<any> {
   try {
     // provide a full path for the config options
     uglifyJsConfig.sourceFile = join(context.buildDir, uglifyJsConfig.sourceFile);
     uglifyJsConfig.inSourceMap = join(context.buildDir, uglifyJsConfig.inSourceMap);
     uglifyJsConfig.destFileName = join(context.buildDir, uglifyJsConfig.destFileName);
+
     const minifiedOutputPath = join(context.buildDir, uglifyJsConfig.outSourceMap);
     const minifyOutput: uglify.MinifyOutput = runUglifyInternal(uglifyJsConfig);
-    let writeFilePromises: Promise<any>[] = [];
-    writeFilePromises.push(writeFileAsync(uglifyJsConfig.destFileName, minifyOutput.code));
-    writeFilePromises.push(writeFileAsync(minifiedOutputPath, minifyOutput.map));
+
+    const writeFilePromises: Promise<any>[] = [
+      writeFileAsync(uglifyJsConfig.destFileName, minifyOutput.code),
+      writeFileAsync(minifiedOutputPath, minifyOutput.map)
+    ];
+
     return Promise.all(writeFilePromises);
+
   } catch (ex) {
     return Promise.reject(ex);
   }
 }
 
-function runUglifyInternal(uglifyJsConfig: UglifyJsConfig): uglify.MinifyOutput {
 
+function runUglifyInternal(uglifyJsConfig: UglifyJsConfig): uglify.MinifyOutput {
   return uglify.minify(uglifyJsConfig.sourceFile, {
     compress: uglifyJsConfig.compress,
     mangle: uglifyJsConfig.mangle,
     outSourceMap: uglifyJsConfig.outSourceMap
   });
 }
 
+
 const UGLIFY_TASK_INFO: TaskInfo = {
   fullArgConfig: '--uglifyjs',
   shortArgConfig: '-u',