[MINIFY]: test for javascript added

Signed-off-by: ashish <[email protected]>

Author: pateash

package-lock.json

@@ -17,6 +17,7 @@
     "jshashes": "^1.0.7",
     "minify": "^4.1.3",
     "nyc": "^14.1.1",
+    "ora": "^4.0.2",
     "signale": "^1.4.0",
     "tslib": "^1.10.0"
   },

package.json

@@ -1,5 +1,7 @@
 import {Command, flags} from '@oclif/command'
 
+const MinifyJs = require('minify')
+
 import Logger from '../utilities/logger'
 import Utilities from '../utilities/utilities'
 
@@ -26,8 +28,11 @@ export default class Minify extends Command {
     args.string = this.getFileString(args)
     flags.type = this.getFileType(flags, args)
 
-    // this.checkParameters(flags, args)
+    Logger.info(this, `reading file: ${args.file}`)
+    Logger.info(this, `file type: ${flags.type}`)
 
+    this.checkParameters(flags, args)
+    this.minifyString(flags, args)
   }
 
   // this will get file type either from flags.type or file extension ( if flag is not given)
@@ -36,9 +41,8 @@ export default class Minify extends Command {
       return this.getFileTypeFromExtension(flags.type)
 
     let fileExtensionRegex = /\w+\.([a-z]+)/
-
-    args.s
-
+    let extension = args.file.match(fileExtensionRegex)[1]
+    return this.getFileTypeFromExtension(extension)
   }
 
   private getFileTypeFromExtension(extension: string) {
@@ -68,7 +72,33 @@ export default class Minify extends Command {
     Logger.error(this, 'File path not passed')
   }
 
-  // private checkParameters(flags: unknown, args: { [p: string]: any }) {
-  //   if(validFileType)
-  // }
+  // tslint:disable-next-line:no-unused
+  private checkParameters(flags: unknown, args: { [p: string]: any }) {
+    if (args.file === undefined || args.file === '')
+      Logger.error(this, 'File path is empty')
+    // others already checked
+  }
+
+  //TODO: add image compression also
+  //TODO: add error handling also
+  private minifyString(flags: any, args: any) {
+    Logger.progressStart(this, 'minifying...')
+
+    let output = ''
+    // setTimeout(() => { //TODO: can add spinner for bigger files using promise
+    switch (flags.type) {
+    case Minify.JS:
+      output = MinifyJs.js(args.string); break
+    case Minify.CSS:
+      output = MinifyJs.css(args.string); break
+    case Minify.HTML:
+      output = MinifyJs.html(args.string); break
+    default:
+      Logger.error(this, 'Invalid Minifier Type')
+    }
+    Logger.progressStop(this, 'minified')
+    // }, 1000)
+    Logger.success(this, `\n${output}`)
+
+  }
 }

src/commands/minify.ts

@@ -1,8 +1,11 @@
 // tslint:disable-next-line:file-name-casing
+import * as Ora from 'ora'
 import * as signale from 'signale'
 
 // tslint:disable-next-line:no-unnecessary-class
 export default class Logger {
+  static spinner: any
+
   // uses signale for logging withoug thisRef
   // tslint:disable-next-line:no-unused
   public static success(thisRef: any, message: string) {
@@ -16,6 +19,17 @@ export default class Logger {
     signale.error(`${message}`)
     thisRef.exit(0) //added to exit command
   }
+  // tslint:disable-next-line:no-unused
+  public static progressStart(thisRef: any, message: string) {
+    // signale.watch(`${message}`)
+    Logger.spinner = Ora(message)
+    Logger.spinner.start()
+  }
+
+  // tslint:disable-next-line:no-unused
+  public static progressStop(thisRef: any, message: string) {
+    Logger.spinner.succeed(message)
+  }
 
   // public static logSuccess(thisRef: any, message: string) {
   //   thisRef.log(` ›   Success: ${message}`)

src/utilities/logger.ts

@@ -16,4 +16,20 @@ describe('minify', () => {
     .it('Invalid File Type', ctx => {
       expect(ctx.stdout).to.contain('Invalid File Type')
     })
+
+  test
+    .stdout()
+    .command(['minify', 'test/resources/test.js'])
+    .it('Minify Js', ctx => {
+      expect(ctx.stdout).to.contain('console.log("lorem ipsum");let x=10;x<10?console.log("x is less than: "+x):x>10?console.log("x is more than: "+x):console.log("x is equals to: "+x);')
+    })
+
+  // using flag -f
+  test
+    .stdout()
+    .command(['minify', '-f', 'test/resources/test.js'])
+    .it('Minify Js with Flag', ctx => {
+      expect(ctx.stdout).to.contain('console.log("lorem ipsum");let x=10;x<10?console.log("x is less than: "+x):x>10?console.log("x is more than: "+x):console.log("x is equals to: "+x);')
+    })
+
 })

test/commands/minify.test.ts

@@ -0,0 +1,9 @@
+<html>
+<head>
+  <title>TEST</title>
+</head>
+<body>
+<h1>heading</h1>
+<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci aperiam, at cupiditate delectus deleniti fugiat, harum ipsa labore laboriosam magni nulla obcaecati quae repellendus. Distinctio eum impedit iure laborum voluptatem?</p>
+</body>
+</html>

test/resources/test.html

@@ -0,0 +1,9 @@
+console.log('lorem ipsum');
+let x = 10;
+
+if(x<10)
+  console.log('x is less than: '+x);
+else if(x>10)
+  console.log('x is more than: '+x);
+else
+  console.log('x is equals to: '+x);