Merge pull request #1820 from angular-fullstack/feat/gen-stream-write-through-babel

Stream files through babel while writing

Author: Awk34

Diff for: app/generator.js

@@ -7,6 +7,9 @@ import {Base} from 'yeoman-generator';
 import {genBase} from '../generator-base';
 import insight from '../insight-init';
 import {exec} from 'child_process';
+import babelStream from 'gulp-babel';
+import beaufityStream from 'gulp-beautify';
+import filter from 'gulp-filter';
 
 export default class Generator extends Base {
   constructor(...args) {
@@ -119,6 +122,12 @@ export default class Generator extends Base {
               }[val];
             }
           }, {
+          // TODO: enable once Babel setup supports Flow
+          //   type: 'confirm',
+          //   name: 'flow',
+          //   message: 'Would you like to use Flow types with Babel?',
+          //   when: answers => answers.transpiler === 'babel'
+          // }, {
             type: 'list',
             name: 'markup',
             message: 'What would you like to write markup with?',
@@ -152,6 +161,9 @@ export default class Generator extends Base {
             this.filters[answers.transpiler] = true;
             insight.track('transpiler', answers.transpiler);
 
+            this.filters.flow = !!answers.flow;
+            insight.track('flow', !!answers.flow);
+
             this.filters[answers.markup] = true;
             insight.track('markup', answers.markup);
 
@@ -425,15 +437,67 @@ export default class Generator extends Base {
   get writing() {
     return {
       generateProject: function() {
+        /**
+         * var tap = require('gulp-tap');
+           this.registerTransformStream([
+              extensionFilter,
+              tap(function(file, t) {
+                  var contents = file.contents.toString();
+                  contents = beautify_js(contents, config);
+                  file.contents = new Buffer(contents);
+              }),
+              //prettifyJs(config),
+              extensionFilter.restore
+           ]);
+         */
+
+        let babelPlugins = [
+          'babel-plugin-syntax-flow',
+          'babel-plugin-syntax-class-properties'
+        ];
+
+        // TODO: enable once Babel setup supports Flow
+        // if(this.filters.babel && !this.filters.flow) {
+          babelPlugins.push('babel-plugin-transform-flow-strip-types');
+        // }
+
+        const jsFilter = filter(['client/**/*.js'], {restore: true});
+        this.registerTransformStream([
+          jsFilter,
+          babelStream({
+            plugins: babelPlugins.map(require.resolve),
+            /* Babel get's confused about these if you're using an `npm link`ed
+                generator-angular-fullstack, thus the `require.resolve` */
+            // retainLines: true,
+            babelrc: false  // don't grab the generator's `.babelrc`
+          }),
+          beaufityStream({
+            "indent_size": 2,
+            "indent_char": " ",
+            "indent_level": 0,
+            "indent_with_tabs": false,
+            "preserve_newlines": true,
+            "max_preserve_newlines": 10,
+            "jslint_happy": false,
+            "space_after_anon_function": false,
+            "brace_style": "collapse",
+            "keep_array_indentation": false,
+            "keep_function_indentation": false,
+            "space_before_conditional": true,
+            "break_chained_methods": true,
+            "eval_code": false,
+            "unescape_strings": false,
+            "wrap_line_length": 100,
+            "wrap_attributes": "auto",
+            "wrap_attributes_indent_size": 4,
+            "end_with_newline": true
+          }),
+          jsFilter.restore
+        ]);
+
         let self = this;
         this.sourceRoot(path.join(__dirname, './templates'));
-        this.processDirectory('.', '.', function(dest) {
-          if(self.filters.ts && dest.indexOf('client') > -1 && dest.indexOf('.json') === -1) {
-            dest = dest.replace('.js', '.ts');
-          }
-
-          return dest;
-        });
+        this.processDirectory('.', '.');
       },
       generateEndpoint: function() {
         var models;

Diff for: app/templates/client/components/auth(auth)/auth.service.js

@@ -20,7 +20,7 @@ function AuthService($location, $http, $cookies, $q, appConfig, Util, User) {
      * @param  {Function} callback - optional, function(error, user)
      * @return {Promise}
      */
-    login({email, password}, callback) {
+    login({email, password}, callback: Function) {
       return $http.post('/auth/local', {
         email: email,
         password: password

Diff for: package.json

@@ -35,12 +35,18 @@
   },
   "dependencies": {
     "babel-core": "^6.7.0",
+    "babel-plugin-syntax-class-properties": "^6.5.0",
+    "babel-plugin-syntax-flow": "^6.5.0",
     "babel-plugin-transform-class-properties": "^6.6.0",
+    "babel-plugin-transform-flow-strip-types": "^6.7.0",
     "babel-preset-es2015": "^6.6.0",
     "babel-register": "^6.6.5",
     "chalk": "^1.1.0",
     "generator-ng-component": "~0.2.1",
     "glob": "^7.0.3",
+    "gulp-babel": "^6.1.2",
+    "gulp-beautify": "^2.0.0",
+    "gulp-filter": "^4.0.0",
     "insight": "~0.8.1",
     "lodash": "^4.6.1",
     "underscore.string": "^3.1.1",

Diff for: util.js

@@ -105,14 +105,10 @@ function templateIsUsable(self, filteredFile) {
   return true;
 }
 
-function defaultIteratee(dest) {
-  return dest;
-}
-
 /**
  * 
  */
-export function processDirectory(source, destination, iteratee = defaultIteratee) {
+export function processDirectory(source, destination) {
   var self = this;
   var root = path.isAbsolute(source) ? source : path.join(self.sourceRoot(), source);
   var files = expandFiles('**', { dot: true, cwd: root });
@@ -132,7 +128,9 @@ export function processDirectory(source, destination, iteratee = defaultIteratee
     src = path.join(root, f);
     dest = path.join(destination, name);
 
-    dest = iteratee(dest);
+    if(self.filters.ts && dest.indexOf('client') > -1 && dest.indexOf('.json') === -1) {
+      dest = dest.replace('.js', '.ts');
+    }
 
     if(path.basename(dest).indexOf('_') === 0) {
       stripped = path.basename(dest).replace(/^_/, '');