diff --git a/lib/index.js b/lib/index.js index 2d95199..86a6fdb 100644 --- a/lib/index.js +++ b/lib/index.js @@ -11,7 +11,9 @@ var _steps = require("./steps"); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; } +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } + +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } try { _asyncToGenerator( diff --git a/lib/questions/type.js b/lib/questions/type.js index 7ab2d32..c6bba59 100644 --- a/lib/questions/type.js +++ b/lib/questions/type.js @@ -8,7 +8,7 @@ var type = { type: "list", name: "type", message: "Which starter kit would you like to generate?", - choices: ["React", "Others (Coming soon..)"], + choices: ["React", "Angular", "Others (Coming soon..)"], filter: function filter(val) { return val.toLowerCase(); } diff --git a/lib/steps/copyFiles.js b/lib/steps/copyFiles.js index f58dbb5..8fdd210 100644 --- a/lib/steps/copyFiles.js +++ b/lib/steps/copyFiles.js @@ -15,7 +15,9 @@ var _utils = require("./../utils"); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; } +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } + +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } var copyFiles = /*#__PURE__*/ diff --git a/lib/steps/getName.js b/lib/steps/getName.js index d077c97..9bd4138 100644 --- a/lib/steps/getName.js +++ b/lib/steps/getName.js @@ -19,7 +19,9 @@ var _utils = require("./../utils"); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; } +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } + +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } var getName = /*#__PURE__*/ diff --git a/lib/steps/getType.js b/lib/steps/getType.js index f8a1b9b..bf14609 100644 --- a/lib/steps/getType.js +++ b/lib/steps/getType.js @@ -13,7 +13,9 @@ var _questions = _interopRequireDefault(require("./../questions")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; } +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } + +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } var getType = /*#__PURE__*/ @@ -58,7 +60,7 @@ function () { return _context.abrupt("return", getType()); case 12: - if (!(type === "react")) { + if (!(type === "react" || type === "angular")) { _context.next = 14; break; } @@ -66,9 +68,10 @@ function () { return _context.abrupt("return", type); case 14: - throw new Error("An incorrect answer was given, please try again"); + console.log(_chalk.default.red.bold("An incorrect answer was given, please try again")); + return _context.abrupt("return", getType()); - case 15: + case 16: case "end": return _context.stop(); } diff --git a/lib/utils/install.js b/lib/utils/install.js index 4ba8fd8..b26bd87 100644 --- a/lib/utils/install.js +++ b/lib/utils/install.js @@ -9,7 +9,9 @@ var _execa = _interopRequireDefault(require("execa")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; } +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } + +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } var shouldUseYarn = /*#__PURE__*/ diff --git a/src/questions/type.js b/src/questions/type.js index 0f16ecc..aaec182 100644 --- a/src/questions/type.js +++ b/src/questions/type.js @@ -2,7 +2,7 @@ const type = { type: "list", name: "type", message: "Which starter kit would you like to generate?", - choices: ["React", "Others (Coming soon..)"], + choices: ["React", "Angular", "Others (Coming soon..)"], filter: val => val.toLowerCase() }; diff --git a/src/steps/getType.js b/src/steps/getType.js index c2663ba..9b0eacf 100644 --- a/src/steps/getType.js +++ b/src/steps/getType.js @@ -15,11 +15,12 @@ const getType = async argParserType => { return getType(); } - if (type === "react") { + if (type === "react" || type === "angular") { return type; } - throw new Error("An incorrect answer was given, please try again"); + console.log(chalk.red.bold(`An incorrect answer was given, please try again`)); + return getType(); }; export default getType;