feat(generators/*): ensure prompted-for data is ungrudgingly massaged…

… to fit the expected representation patterns
marviq · Mar 3, 2017 · 62b8343 · 62b8343
1 parent 2532218
commit 62b8343
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/generators/api/index.js b/generators/api/index.js
@@ -86,7 +86,7 @@ var ApiGenerator = Generator.extend(
                             ,   validate:   youtil.isIdentifier
                             ,   filter: function ( value )
                                 {
-                                    return _.lowerFirst( _.trim( value ).replace( /api$/i, '' ));
+                                    return _.camelCase( _.lowerFirst( _.trim( value ).replace( /api$/i, '' )));
                                 }
                             }
                         ,   {

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -156,11 +156,15 @@ var AppGenerator = Generator.extend(
                             ,   name:       'packageName'
                             ,   message:    'What is the name of this app you so desire?'
                             ,   default:
-                                    (
+                                    _.kebabCase(
                                         youtil.definedToString( this.options.packageName )
-                                    ||  _.kebabCase( youtil.definedToString( this.appname ))
+                                    ||  youtil.definedToString( this.appname )
                                     )
                             ,   validate:   youtil.isNpmName
+                            ,   filter: function ( value )
+                                {
+                                    return _.kebabCase( _.trim( value ));
+                                }
                             }
                         ,   {
                                 type:       'input'

diff --git a/generators/collection/index.js b/generators/collection/index.js
@@ -100,7 +100,7 @@ var CollectionGenerator = Generator.extend(
                             ,   validate:   youtil.isIdentifier
                             ,   filter: function ( value )
                                 {
-                                    return _.lowerFirst( _.trim( value ).replace( /collection$/i, '' ));
+                                    return _.camelCase( _.lowerFirst( _.trim( value ).replace( /collection$/i, '' )));
                                 }
                             }
                         ,   {

diff --git a/generators/model/index.js b/generators/model/index.js
@@ -134,7 +134,7 @@ var ModelGenerator = Generator.extend(
                             ,   validate:   youtil.isIdentifier
                             ,   filter: function ( value )
                                 {
-                                    return _.lowerFirst( _.trim( value ).replace( /model$/i, '' ));
+                                    return _.camelCase( _.lowerFirst( _.trim( value ).replace( /model$/i, '' )));
                                 }
                             }
                         ,   {

diff --git a/generators/view/index.js b/generators/view/index.js
@@ -84,7 +84,7 @@ var ViewGenerator = Generator.extend(
                             ,   validate:   youtil.isIdentifier
                             ,   filter: function ( value )
                                 {
-                                    return _.lowerFirst( _.trim( value ).replace( /view$/i, '' ));
+                                    return _.camelCase( _.lowerFirst( _.trim( value ).replace( /view$/i, '' )));
                                 }
                             }
                         ,   {