Merge pull request #54 from shapkarin/fork

#53 count props, add default config, remove filename postfix and test folder

Author: rajikaimal

.reactclirc

@@ -0,0 +1,3 @@
+{
+	"client": "test_folder"
+}

bin/initialize.js

@@ -190,48 +190,21 @@ program
 							paginated: true,
 							choices: ["yes", "no"]
 						},
-						{
-							type: "input",
-							name: "propNo",
-							message: "Number of prop types",
-							paginated: true,
-							validate: function(input) {
-								let regex = /^\d+$/;
-								//return false;
-								if (!regex.test(input)) {
-									return "enter a number";
-								}
-								return true;
-							},
-							when: function(answer) {
-								return answer.propTypes === "yes";
-							}
-						},
 						{
 							type: "input",
 							name: "propNames",
 							message: "Prop names",
 							paginated: true,
 							when: function(answer) {
-								numberOfPropTypes = answer.propNo;
 								return answer.propTypes === "yes";
 							},
 							validate: function(input) {
 								let propNames = input.split(" ");
-								if (
-									propNames.length !==
-									Number(numberOfPropTypes)
-								) {
-									return `enter ${numberOfPropTypes} prop names`;
-								}
-								let regex = /^[a-zA-Z]+$/;
+								numberOfPropTypes = propNames.length;
 
 								if (!checkDuplicates(propNames)) {
 									return "duplicate prop names";
 								}
-								// if(!regex.test(input)) {
-								// 	return 'enter valid name [alpha]'
-								// }
 								return true;
 							}
 						}

lib/config.default.js

@@ -0,0 +1,5 @@
+const defaults = {
+	client: "src"
+}
+
+module.exports = defaults;

lib/generate.js

@@ -14,7 +14,7 @@ generate.prototype.createComponentFile = function(re, componentName, answersInne
 	const _modFile = file.replace(re, componentName);
 	const __modFile = this.createModFile(_modFile, answersInner, componentName);
 	console.log(__modFile);
-	fs.writeFileSync(path.join(process.cwd(), 'src/components', module, componentName + '.react.js'), __modFile, 'utf-8');
+	fs.writeFileSync(path.join(process.cwd(), 'src/components', module, componentName + '.js'), __modFile, 'utf-8');
 }
 
 /**
@@ -29,31 +29,31 @@ generate.prototype.generateComponent = function(type, module, componentName, ans
 	try {
 		if(componentName !== undefined) {
 			const exists = fs.accessSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName), fs.F_OK);
-      cb(`${componentName}.react.js already exists`);
+      cb(`${componentName}.js already exists`);
       return;
 		}
 		else {
-			const exists = fs.accessSync(path.join(process.cwd(), getSourceDirectory(), 'components', module + '.react.js'), fs.F_OK);
-			cb(`${componentName}.react.js already exists`);
+			const exists = fs.accessSync(path.join(process.cwd(), getSourceDirectory(), 'components', module + '.js'), fs.F_OK);
+			cb(`${componentName}.js already exists`);
 			return;
 		}
 	}
 	catch(e) {
-		const file = fs.readFileSync(path.join(__dirname, '..', `templates/components/${type}-component.react.js`), 'utf-8');
+		const file = fs.readFileSync(path.join(__dirname, '..', `templates/components/${type}-component.js`), 'utf-8');
 		const re = /<name>/gi;
 		if(componentName !== undefined) {
 			try {
 				if(answers.propTypes === 'no') {
 					fs.mkdirSync(path.join(process.cwd(), getSourceDirectory(), 'components', module), 0755);
 					const _modFile = file.replace(re, componentName);
-					fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName + '.react.js'), _modFile, 'utf-8');
+					fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName + '.js'), _modFile, 'utf-8');
 					cb(true);
 				}
 				else {
 					fs.mkdirSync(path.join(process.cwd(), getSourceDirectory(), 'components', module), 0755);
 					const _modFile = file.replace(re, componentName);
 					const __modFile = this.createModFile(_modFile, answersInner, componentName);
-					fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName + '.react.js'), __modFile, 'utf-8');
+					fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName + '.js'), __modFile, 'utf-8');
 					cb(true);
 				}
 			}
@@ -64,7 +64,7 @@ generate.prototype.generateComponent = function(type, module, componentName, ans
 				else {
 					const _modFile = file.replace(re, componentName);
 					const __modFile = this.createModFile(_modFile, answersInner, componentName);
-					fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName + '.react.js'), __modFile, 'utf-8');
+					fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module, componentName + '.js'), __modFile, 'utf-8');
 					cb(true);
 				}
 			}
@@ -73,7 +73,7 @@ generate.prototype.generateComponent = function(type, module, componentName, ans
 			try {
 				const _modFile = file.replace(re, module);
 				const __modFile = this.createModFile(_modFile, answersInner, module);
-				fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module + '.react.js'), __modFile, 'utf-8');
+				fs.writeFileSync(path.join(process.cwd(), getSourceDirectory(), 'components', module + '.js'), __modFile, 'utf-8');
 				cb(true);
 			}
 			catch(ex) {

lib/source.js

@@ -1,13 +1,19 @@
 const fs = require("fs.extra");
 const path = require("path");
 
+const defaults = require("./config.default");
+
 /**
  * get source directory file
  */
 const getSourceDirectory = function() {
-	const buffer = fs.readFileSync(path.join(process.cwd(), ".reactclirc"));
-	const jsonContent = JSON.parse(buffer.toString());
-	return jsonContent["client"];
+	try {
+		const buffer = fs.readFileSync(path.join(process.cwd(), ".reactclirc"));
+		const jsonContent = JSON.parse(buffer.toString());
+		return jsonContent["client"];
+	} catch (error) {
+		return defaults["client"];
+	}
 };
 
 module.exports = getSourceDirectory;

templates/components/child-component.react.js renamed to templates/components/child-component.js

@@ -1,30 +1,39 @@
 const assert = require("chai").assert;
 const generateApp = require("../lib/generate");
+const fs = require('fs.extra');
+const path = require('path');
+const rmdir = require("rimraf");
 
 generate = new generateApp();
 
 describe("Create react components", function() {
 	it("should create a parent react component", function(done) {
 		const answers = {
-			componentType: "child",
+			componentType: "parent",
 			propTypes: "yes",
-			propNo: "2",
-			propName: "first",
-			propType: "number"
+			propNames: "title likes"
 		};
 		const answersInner = {
-			first: "string",
-			last: "string"
+			title: "string",
+			likes: "number"
 		};
-		generate.createComponent(
-			"core",
-			"sample",
-			answers,
-			answersInner,
-			function(status) {
-				assert.equal(status, "module doesn't exist");
-				done();
-			}
-		);
+		fs.mkdirp(path.join(process.cwd(), "test_folder/components/"), err => {
+			if (err) throw new Error("failed to create folders");
+			generate.createComponent(
+				"TestComponent",
+				"FileName",
+				answers,
+				answersInner,
+				function(status) {
+					rmdir(path.join(process.cwd(), "test_folder"), err => {
+						if (err) throw new Error("failed to remove folder");
+						else {
+							assert.equal(status, true);
+							done();
+						}
+					});
+				}
+			);
+		});
 	});
 });