Merge pull request #64 from shapkarin/issue_60

Define propTypes in propNames input (prop:type or prop:type*)

Author: rajikaimal

README.md

@@ -70,6 +70,9 @@ If you leave that empty generator creates folder with module name, and index.js
 
 * `-f` Generate only file and use module as filename
 
+#### Define propNames
+At "Prop names" question you can use "*" to mark as required `title*` and also you can define type `title:string` and sure you can write `title:string*`
+If you didn't define a type cli will ask you to choose it from the list.
 
 ---------------------------------------
 

bin/initialize.js

@@ -178,14 +178,13 @@ program
             {
               type: 'input',
               name: 'propNames',
-              message: 'Prop names (place "*" at the end each name that required)',
+              message: 'Prop names',
               paginated: true,
               when: function(answer) {
                 return answer.propTypes === 'yes';
               },
               validate: function(input) {
                 let propNames = input.split(' ');
-                numberOfPropTypes = propNames.length;
 
                 if (!checkDuplicates(propNames)) {
                   return 'duplicate prop names';
@@ -217,6 +216,20 @@ program
             } else {
               let opts = [];
               let propNames = answers.propNames.split(' ');
+              const withTypes = {};
+
+              for (prop of propNames){
+                if(/:/.test(prop)){
+                  const [name, type, required] = prop.match(/^[a-z0-9]+|(?<=:).[a-z0-9]+|\*$/ig);
+                  const key = name + (required ? '*' : '');
+                  withTypes[key] = type
+                }
+              }
+
+              propNames = propNames.filter(function(prop) {
+                return !/:/.test(prop);
+              });
+              numberOfPropTypes = propNames.length;
 
               for (
                 let count = 0;
@@ -241,11 +254,12 @@ program
                 opts.push(propTypeChoice);
               }
               inquirer.prompt(opts).then(function(answersInner) {
+                const __answersInner = {...withTypes, ...answersInner};
                 generate.createComponent(
                   modulename,
                   name,
                   answers,
-                  answersInner,
+                  __answersInner,
                   options.file,
                   function(status) {
                     if (status) {

lib/generate.js

@@ -106,12 +106,11 @@ generate.prototype.createModFile = function(_modFile, answersInner, componentNam
  * @param {string} componentName - component name
  */
 generate.prototype.generatePropTypesSet = function(answersInner, componentName) {
-	let __propTypes = {},
-		match;
+	let __propTypes = {};
 
 	for(let propName in answersInner) {
-		match = propName.match(/^[a-z0-9]+|\*$/gi);
-		__propTypes[match[0]] = `React.PropTypes.${answersInner[propName]}${match[1] ? '.isRequired' : ''}`;
+		const [prop, required] = propName.match(/^[a-z0-9]+|\*$/gi);
+		__propTypes[prop] = `React.PropTypes.${answersInner[propName]}${required ? '.isRequired' : ''}`;
 	}
 
 	const _answersInner = JSON.stringify(__propTypes, null, 2);

package.json

@@ -2,6 +2,9 @@
     "name": "react-scaffolder",
     "version": "0.3.2",
     "description": "Scaffolding tool for React",
+    "engines": {
+      "node": ">=5.12.0"
+    },
     "bin": {
         "react": "./bin/initialize.js"
     },