refactor: refactor the app with typescript

Author: axetroy

.gitignore

@@ -55,4 +55,6 @@ jspm_packages
 .vscode
 
 # for test, create a fake home dir
-.home
+.home
+
+build

.npmignore

@@ -69,4 +69,7 @@ docs
 .gitattributes
 .gitignore
 .pullapprove.yml
-.travis.yml
+.travis.yml
+app
+*.map
+*.test.js

app/check-update.ts

@@ -0,0 +1,32 @@
+/**
+ * Created by axetroy on 17-2-15.
+ */
+const path = require('path');
+const axios = require('axios');
+const semver = require('semver');
+const log4js = require('log4js');
+
+const logger = log4js.getLogger('CHECK');
+const pkg = require(path.join(__dirname, '../package.json'));
+
+const npmRegistry = `http://registry.npm.taobao.org`;
+
+export default async function checkNewVersion() {
+  // check the update
+  try {
+    const res: any = await axios.get(`${npmRegistry}/${pkg.name}/latest`, {
+      timeout: 200
+    });
+    const remotePkg = res.data;
+    if (semver.gt(remotePkg.version, pkg.version)) {
+      logger.warn(
+        `Your current version of ${pkg.name} is out of date. The latest version is ${remotePkg
+          .version.red} while you're on ${pkg.version.green}.`
+      );
+      logger.warn(
+        `Checkout change log here ${'https://github.com/gpmer/gpm.js/blob/master/CHANGELOG.md'
+          .green}`
+      );
+    }
+  } catch (err) {}
+}

lib/command/add.js renamed to app/command/add.ts

@@ -2,11 +2,8 @@
  * Created by axetroy on 17-2-14.
  */
 const path = require('path');
-const process = require('process');
 
-const co = require('co');
 const gitUrlParse = require('git-url-parse');
-const Promise = require('bluebird');
 const prettyjson = require('prettyjson');
 const fs = require('fs-extra');
 const _ = require('lodash');
@@ -22,16 +19,29 @@ const __ = require('i18n').__;
 
 const cwd = process.cwd();
 
-const { isExistPath, isLink, normalizePath, runShell } = require('../utils');
-const config = require('../config');
-const plugin = require('../plugin');
-const registry = require('../registry');
-const globalConfig = require('../global-config');
-const Gpmrc = require('../gpmrc');
+import { isExistPath, isLink, normalizePath, runShell } from '../utils';
+import config from '../config';
+import plugin from '../plugin';
+import registry from '../registry';
+import globalConfig from '../global-config';
+import Gpmrc from '../gpmrc';
 
 const ACTION = Symbol('after add repository');
 
-function* add(repo, options) {
+interface Argv$ {
+  repo: string;
+}
+
+interface Options$ {
+  nolog?: boolean;
+  unixify?: boolean;
+  force?: boolean;
+  name?: string;
+  plugin?: string;
+  ignoreRc: boolean;
+}
+
+async function add(repo: string, options: Options$) {
   const gitInfo = gitUrlParse(repo);
 
   if (!gitInfo || !gitInfo.owner || !gitInfo.name) {
@@ -52,11 +62,11 @@ function* add(repo, options) {
   );
 
   let confirmCover = false;
-  if (yield isExistPath(repoDir)) {
+  if (await isExistPath(repoDir)) {
     if (options.force) {
       confirmCover = true;
     } else {
-      confirmCover = (yield prompt({
+      confirmCover = (await prompt({
         type: 'confirm',
         name: 'result',
         message: __('commands.add.log.confirm_cover', {
@@ -71,10 +81,10 @@ function* add(repo, options) {
     }
   }
 
-  yield fs.ensureDir(baseDir);
-  yield fs.ensureDir(sourceDir);
-  yield fs.ensureDir(ownerDir);
-  yield fs.ensureDir(randomTemp);
+  await fs.ensureDir(baseDir);
+  await fs.ensureDir(sourceDir);
+  await fs.ensureDir(ownerDir);
+  await fs.ensureDir(randomTemp);
 
   try {
     const git = which.sync('git');
@@ -89,16 +99,16 @@ function* add(repo, options) {
     throw err;
   }
 
-  yield runShell(`git clone ${gitInfo.href}`, {
+  await runShell(`git clone ${gitInfo.href}`, {
     cwd: randomTemp,
     stdio: 'inherit'
   });
 
   // if it's a link, then unlink first
-  if (yield isLink(repoDir)) yield fs.unlink(repoDir);
-  yield fs.remove(repoDir);
-  yield fs.move(tempDir, repoDir);
-  yield fs.remove(randomTemp);
+  if (await isLink(repoDir)) await fs.unlink(repoDir);
+  await fs.remove(repoDir);
+  await fs.move(tempDir, repoDir);
+  await fs.remove(randomTemp);
 
   /**
    * parse the .gpmrc
@@ -109,18 +119,18 @@ function* add(repo, options) {
    */
   if (!options.ignoreRc) {
     const gpmrc = new Gpmrc();
-    yield gpmrc.load(repoDir);
+    await gpmrc.load(repoDir);
     if (gpmrc.exist) {
       const alias = gpmrc.rc.name;
       if (alias && alias !== gitInfo.name) {
         let newRepoDir = path.join(
           ownerDir,
           _.isString(options.name) ? options.name : alias
         );
-        yield fs.move(repoDir, newRepoDir);
+        await fs.move(repoDir, newRepoDir);
         repoDir = newRepoDir;
       }
-      yield gpmrc.runHook('add', { cwd: repoDir }).catch(err => {
+      await gpmrc.runHook('add', { cwd: repoDir }).catch(err => {
         console.error(err);
         return Promise.resolve();
       });
@@ -129,7 +139,7 @@ function* add(repo, options) {
 
   const entity = _.extend({}, gitInfo, { path: repoDir });
   delete entity.toString;
-  yield registry.add(entity);
+  await registry.add(entity);
 
   if (!options.nolog) {
     let finallyPath = normalizePath(repoDir, options);
@@ -159,7 +169,7 @@ function* add(repo, options) {
         name: ('gpm-plugin-' + plugin.name).green
       })
     );
-    yield new Promise(function(resolve, reject) {
+    await new Promise(function(resolve, reject) {
       if (!_.isFunction(plugin.add)) {
         reject(
           new Error(
@@ -185,7 +195,7 @@ function* add(repo, options) {
   process.chdir(cwd);
 }
 
-module.exports = function(argv, options) {
+export default async function(argv: Argv$, options: Options$) {
   plugin.load(ACTION, options.plugin);
-  return co.wrap(add)(argv.repo, options);
-};
+  return await add(argv.repo, options);
+}

app/command/clean.ts

@@ -0,0 +1,37 @@
+/**
+ * Created by axetroy on 17-2-14.
+ */
+const fs = require('fs-extra');
+const log4js = require('log4js');
+const logger = log4js.getLogger('CLEAN');
+
+import config from '../config';
+
+import relinkHandler from './relink';
+
+interface Argv$ {}
+
+interface Options$ {
+  nolog?: boolean;
+  unixify?: boolean;
+  force?: boolean;
+}
+
+async function clean(argv: Argv$, options: Options$) {
+  try {
+    await fs.emptyDir(config.paths.temp);
+  } catch (err) {
+    throw new Error(
+      `${err + ''}\n May be you don't have permission to access ${config.paths
+        .temp}, try to delete in manual`
+    );
+  }
+  // auto generate file again
+  await relinkHandler(argv, { nolog: options.nolog });
+  !options.nolog &&
+    logger.info(`clean ${config.paths.temp.green.underline} success`);
+}
+
+export default async function(argv: Argv$, options: Options$) {
+  return await clean(argv, options);
+}

lib/command/config.js renamed to app/command/config.ts

@@ -3,19 +3,29 @@
  */
 
 const path = require('path');
-const process = require('process');
 
-const co = require('co');
 const prettyjson = require('prettyjson');
 const fs = require('fs-extra');
 const log4js = require('log4js');
 const logger = log4js.getLogger('CONFIG');
 const __ = require('i18n').__;
 
-const config = require('../config');
-const globalConfig = require('../global-config');
+import config from '../config';
+import globalConfig from '../global-config';
 
-function* configHandler(argv, options) {
+export interface Argv$ {
+  key?: string;
+  value?: string;
+  action: string;
+}
+
+interface Options$ {
+  nolog?: boolean;
+  unixify?: boolean;
+  force?: boolean;
+}
+
+async function configHandler(argv: Argv$, options: Options$) {
   const { action, key, value } = argv;
   let output = void 0;
 
@@ -27,32 +37,36 @@ function* configHandler(argv, options) {
       break;
     case 'GET':
       if (!key)
-        return !options.nolog &&
-          logger.error(__('commands.config.log.require_key'));
+        return (
+          !options.nolog && logger.error(__('commands.config.log.require_key'))
+        );
       output = globalConfig.get(key);
       !options.nolog && logger.info(`${key}: ${output}`);
       break;
     case 'SET':
       if (!key)
-        return !options.nolog &&
-          logger.error(__('commands.config.log.require_key'));
+        return (
+          !options.nolog && logger.error(__('commands.config.log.require_key'))
+        );
       if (!value)
-        return !options.nolog &&
-          logger.error(__('commands.config.log.require_val'));
-      output = yield globalConfig.set(key, value);
+        return (
+          !options.nolog && logger.error(__('commands.config.log.require_val'))
+        );
+      output = await globalConfig.set(key, value);
       !options.nolog &&
         process.stdout.write(prettyjson.render(globalConfig.entity) + '\n');
       break;
     case 'REMOVE':
       if (!key)
-        return !options.nolog &&
-          logger.error(__('commands.config.log.require_key'));
-      output = yield globalConfig.remove(key);
+        return (
+          !options.nolog && logger.error(__('commands.config.log.require_key'))
+        );
+      output = await globalConfig.remove(key);
       !options.nolog &&
         process.stdout.write(prettyjson.render(globalConfig.entity) + '\n');
       break;
     case 'RESET':
-      output = yield globalConfig.reset();
+      output = await globalConfig.reset();
       !options.nolog && logger.info(__('commands.config.log.info_reset'));
       !options.nolog &&
         process.stdout.write(prettyjson.render(globalConfig.entity) + '\n');
@@ -72,6 +86,6 @@ function* configHandler(argv, options) {
   return output;
 }
 
-module.exports = function(argv = {}, options = {}) {
-  return co.wrap(configHandler)(argv, options);
-};
+export default async function(argv: Argv$, options: Options$) {
+  return configHandler(argv, options);
+}

lib/command/find.js renamed to app/command/find.ts

@@ -1,9 +1,7 @@
 /**
  * Created by axetroy on 17-2-14.
  */
-const process = require('process');
 const path = require('path');
-const Promise = require('bluebird');
 const prettyjson = require('prettyjson');
 const inquirer = require('inquirer');
 const _ = require('lodash');
@@ -13,19 +11,28 @@ const log4js = require('log4js');
 const __ = require('i18n').__;
 
 const logger = log4js.getLogger('FIND');
-const config = require('../config');
-const { normalizePath } = require('../utils');
-const registry = require('../registry');
+import config from '../config';
+import registry from '../registry';
+import { normalizePath } from '../utils';
 
-function decoratorIndex(repo) {
-  repo.__index__ = `${repo.source.red}:${('@' + repo.owner).yellow}/${repo.name.green}(${path.relative(config.paths.home, repo.path)})`;
+interface Argv$ {}
+
+interface Options$ {
+  nolog?: boolean;
+  unixify?: boolean;
+  force?: boolean;
+}
+
+export function decoratorIndex(repo) {
+  repo.__index__ = `${repo.source.red}:${('@' + repo.owner).yellow}/${repo.name
+    .green}(${path.relative(config.paths.home, repo.path)})`;
   return repo;
 }
 
-function* search(argv, options) {
+export default async function search(argv: Argv$, options: Options$) {
   let repositories = registry.repositories.map(decoratorIndex);
 
-  const answer = yield inquirer.prompt([
+  const answer = await inquirer.prompt([
     {
       name: 'repository',
       message: __('commands.find.log.info_type_to_search') + ':',
@@ -57,9 +64,3 @@ function* search(argv, options) {
     logger.warn(__('global.tips.copy_fail'));
   }
 }
-
-module.exports = function(argv, options) {
-  return search(argv, options);
-};
-
-module.exports.decoratorIndex = decoratorIndex;