refactoring: write in more TypeScript way

bump up version to 0.3.0

Rakefile

@@ -3,12 +3,6 @@ include FileUtils
 
 BIN_DIR = './node_modules/.bin'.freeze
 
-def cp_paths(paths, dest)
-  paths.each do |p|
-    cp_r p, dest
-  end
-end
-
 def cmd_exists?(cmd)
   File.exists?(cmd) && File.executable?(cmd)
 end
@@ -71,7 +65,7 @@ task :asar => %i(build) do
 end
 
 task :run => %i(dep asar) do
-  system "#{BIN_DIR}/electron app.asar README.md"
+  sh "#{BIN_DIR}/electron app.asar README.md"
 end
 
 task :clean do

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Shiba",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "authors": [
     "rhysd <[email protected]>"
   ],

package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiba",
   "productName": "Shiba",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "Live markdown previewer with linter",
   "main": "./build/src/browser/mainu.js",
   "bin": {

src/browser/config.ts

@@ -3,7 +3,16 @@ import path = require('path');
 import fs = require('fs');
 import app = require('app');
 
-export function load(): any/*TODO*/ {
+export interface Config {
+    linter: string;
+    file_ext: string[];
+    width: number;
+    height: number;
+    shortcuts: Object;
+    lint_options?: any;
+}
+
+export function load(): Config {
     if (this.user_config) {
         return this.user_config;
     }
@@ -29,13 +38,12 @@ export function load(): any/*TODO*/ {
             'M':         'PageBottom',
             'Home':      'PageTop',
             'End':       'PageBottom',
-            'Shift+J':   'PageBottom',
             'Control+P': 'ChangePath',
             'Control+L': 'Lint'
         }
     };
 
-    function mergeConfig(c1, c2) {
+    function mergeConfig(c1: Config, c2: Config) {
         for (const k in c2) {
             const v2 = c2[k];
 

src/browser/emoji.ts

@@ -1,6 +1,6 @@
 import path = require('path');
 
-const EMOJI = new Set([
+const EMOJI = new Set<string>([
     '+1',
     '-1',
     '100',
@@ -887,7 +887,7 @@ const EMOJI = new Set([
 
 const REGEX_EMOJI = /:(\w+):/g;
 
-export function replaceAll(str) {
+export function replaceAll(str: string): string {
     let replacer = function(match, name) {
         if (EMOJI.has(name)) {
             return `<img src="../images/emoji/${name}.png" title="${match}" height="16px"></img>`;

src/browser/initial_path.ts

@@ -1,8 +1,8 @@
 import fs = require('fs');
 import path = require('path');
 
-export = function() {
-    function defaultPath() {
+export = function(): string {
+    function defaultPath(): string {
         const cwd = process.cwd();
         if (process.platform === 'darwin' && cwd === '/') {
             const doc_dir = path.join(process.env.HOME, 'Documents');

src/browser/keyshortcuts.ts

@@ -9,9 +9,9 @@ class KeyShortCuts {
         this.shortcuts = {};
 
         // Note: Generating below function in 'for' loop make jshint angry
-        let quit_app = function() { browser_window.close(); };
-        let toggle_devtools = function() { browser_window.toggleDevTools(); };
-        const key_receiver_for = function(s: string) {
+        let quit_app = () => browser_window.close();
+        let toggle_devtools = () => browser_window.toggleDevTools();
+        const key_receiver_for = function(s: string): () => void {
             return function() {
                 sender.send('keyinput', s);
             };

src/browser/linter.ts

@@ -1,5 +1,10 @@
+interface Message {
+    header: string;
+    body: string;
+}
+
 class Linter {
-    lint: any;
+    lint: (filename: string, content: string, callback: (msgs: Message[]) => void) => void;
     lint_url: string;
     mdl: any;
     mdast: any;
@@ -40,7 +45,7 @@ class Linter {
             const is_space = /\s+/;
             const messages = result.toString()
                             .split("\n")
-                            .map(function(msg){
+                            .map(function(msg: string): Message {
                                 const m = msg.match(is_space);
                                 if (!m) {
                                     return {header: '', body: msg};
@@ -64,7 +69,7 @@ class Linter {
             }
 
             callback(
-                file.messages.map(function(m){
+                file.messages.map(function(m): Message {
                     // Note:
                     // Should I include m.ruleId to check the detail of message?
                     // I don't include it now because message gets too long.

src/browser/mainu.ts

@@ -3,8 +3,8 @@ import path = require('path');
 import ipc = require('ipc');
 import BrowserWindow = require('browser-window');
 import menu = require('./menu');
-const config = require('./config').load();
 import KeyShortcuts = require('./keyshortcuts');
+const config = require('./config').load();
 
 require('crash-reporter').start();
 

src/browser/menu.ts

@@ -1,7 +1,7 @@
 import Menu = require('menu');
 import open = require('open');
 
-export function build(main_window) {
+export function build(main_window: GitHubElectron.BrowserWindow) {
     const template = [
         {
             label: 'Shiba',

src/browser/watcher.ts

@@ -25,7 +25,7 @@ marked.setOptions({
 });
 
 class Watcher {
-    config: any/*TODO*/;
+    config: config.Config;
     linter: Linter;
     file_watcher: fs.FSWatcher;