From 55c7adb965bc3c6597399c56fd803de5ee69be8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=9D=BE?= <wangsong@corp.netease.com>
Date: Wed, 22 Nov 2017 18:32:20 +0800
Subject: [PATCH 1/6] nek server -k pageid

---
 src/commands/server.js |  31 ++++++++
 src/core/server.js     | 156 +++++++++++++++++++++++++++++++++++++++++
 src/core/util/rc.js    |   1 +
 3 files changed, 188 insertions(+)
 create mode 100644 src/commands/server.js
 create mode 100644 src/core/server.js

diff --git a/src/commands/server.js b/src/commands/server.js
new file mode 100644
index 0000000..9b336e5
--- /dev/null
+++ b/src/commands/server.js
@@ -0,0 +1,31 @@
+const Server = require('../core/server');
+const log = require('../core/util/log');
+
+exports.command = 'server [options]';
+
+exports.desc = 'Fetch Server Code';
+
+exports.builder = {
+  k: {
+    alias: 'key',
+    demand: false,
+    describe: 'Unique id mapped the project and the page configuration json object',
+    type: 'string',
+  },
+  f: {
+    alias: 'force',
+    demand: false,
+    describe: '强制覆盖已经存在的文件',
+    type: 'boolean',
+  },
+};
+
+exports.handler = async (argv) => {
+  const { key, force } = argv;
+  try {
+    const server = new Server(key, force);
+    server.run();
+  } catch (error) {
+    log.red(error);
+  }
+};
diff --git a/src/core/server.js b/src/core/server.js
new file mode 100644
index 0000000..b6305fd
--- /dev/null
+++ b/src/core/server.js
@@ -0,0 +1,156 @@
+const request = require('request-promise');
+const path = require('path');
+const fs = require('fs');
+const mkdirp = require('mkdirp-promise');
+const Handlebars = require('handlebars');
+const { js_beautify, html } = require('js-beautify');
+
+const RouteDirective = require('./directives/route');
+const rc = require('./util/rc');
+const log = require('./util/log');
+const Url2Path = require('./util/url2path');
+
+const ProjectTypes = {
+  NEJ: 1,
+  Webpack: 2,
+  WebpackMul: 3
+};
+/**
+ * Server类
+ * @param key {String} - 页面唯一标识
+ * @param force {Boolean} - 是否强制重写文件
+ * @param meta {Object} - 从Sever获取的页面配置
+ */
+class Server {
+    constructor(key = '', force = false) {
+        this.key = key;
+        this.force = force;
+        this.meta = null;
+    }
+    /**
+     * 步骤：
+     * 1、从Server获取页面配置，包括项目类型（新老项目、单页多页），页面url
+     * 2、从Server获取代码，根据项目类型、页面url写文件
+     * 3、更新路由
+     */
+    async run() {
+        await this.getMeta();
+
+        this.updateRoute();
+        this.render();
+    }
+
+    async getMeta() {
+        if (!this.key) {
+            log.red('请输入页面唯一标识key...');
+            process.exit(1);
+        }
+        try {
+            log.cyan('开始获取项目页面配置数据...');
+            const { data } = await request(`${rc.serverApi}/api/public/page?id=${this.key}`, { json: true });
+            this.meta = {
+                url: data.url,
+                type: data.type,
+                ftl: data.ftl,
+                entry: data.entry,
+                html: data.html,
+                index: data.index,
+                modules: data.modules,
+                modals: data.modals
+            };
+        } catch (err) {
+            log.red(err);
+            log.red('请求页面数据失败，请检查网络...');
+            process.exit(1);
+        }
+    }
+
+    async updateRoute() {
+      const { url, type } = this.meta;
+      if (!url || !type) {
+          log.red('nek server配置中缺少页面url或项目类型');
+          process.exit(1);
+      }
+      const cwd = process.cwd();
+      //type为1，是nej老项目
+      if (type == ProjectTypes.NEJ) {
+          const mokyPath = path.resolve(cwd, rc.urlMaps || 'moky.config.js');
+          const directive = new RouteDirective(mokyPath, url);
+          directive.update();
+      }
+    }
+
+    async _writeFile(dir, filename, content, ext) {
+      const out = path.join(dir, filename);
+      if (fs.existsSync(out) && !this.force) { return log.yellow(`Exist File: ${out}`); }
+      if (this.force) { log.yellow(`Force write: ${out}`); }
+
+      await mkdirp(dir);
+      fs.writeFile(out, this.format(content, ext), () => {});
+
+      log.cyan(`Output File: ${out}`);
+    }
+
+    async writeFtl() {
+        const ftlPath = Url2Path.ftl(this.meta.url);
+        const out = path.join(rc.pageRoot, ftlPath.path);
+        //使用handlebars处理变量
+        const template = Handlebars.compile(this.meta.ftl);
+        const entryPath = Url2Path.js(this.meta.url);
+        const rst = template({ entryPath });
+        this._writeFile(out, `${ftlPath.name}.ftl`, rst);
+    }
+
+    async writeEntry() {
+        const entryPath = Url2Path.js(this.meta.url);
+        const out = path.join(rc.jsRoot, entryPath);
+        this._writeFile(out, 'entry.js', this.meta.entry, 'js');
+    }
+
+    async writeIndex() {
+        const indexPath = Url2Path.js(this.meta.url);
+        const out = path.join(rc.jsRoot, indexPath);
+        if (this.meta.type == ProjectTypes.NEJ) {
+            this._writeFile(path.join(out, 'modules'), 'page.html', this.meta.index.html, 'html');
+            this._writeFile(path.join(out, 'modules'), 'page.js', this.meta.index.js, 'js');
+        } else {
+            this._writeFile(out, 'index.html', this.meta.index.html, 'html');
+            this._writeFile(out, 'index.js', this.meta.index.js, 'js');
+        }
+    }
+
+    async writeDirs(dir) {
+        const dirPath = Url2Path.js(this.meta.url);
+        const out = path.join(rc.jsRoot, dirPath);
+        const dirs = this.meta[dir];
+        for(let dirname in dirs) {
+            this._writeFile(`${out}/${dir}/${dirname}`, 'index.js', dirs[dirname].js, 'js');
+            this._writeFile(`${out}/${dir}/${dirname}`, 'index.html', dirs[dirname].html, 'html');
+        }
+    }
+
+    async render() {
+        this.meta.ftl && this.writeFtl();
+        this.meta.entry && this.writeEntry();
+        this.meta.index && this.writeIndex();
+        this.meta.modules && this.writeDirs('modules');
+        this.meta.modals && this.writeDirs('modals');
+    }
+
+    format(content, ext) {
+        let out = content;
+        if (ext === 'js') {
+            out = js_beautify(content, { indent_size: 4 });
+            out = out.replace(/\/\* beautify ignore:start \*\//gm, '');
+            out = out.replace(/\/\* beautify ignore:end \*\//gm, '');
+            out = out.replace(/^\s*[\r\n]/gm, '');
+            return out;
+        } else if (ext === 'html') {
+            out = html(content);
+        }
+        return content;
+    }
+
+}
+
+module.exports = Server;
diff --git a/src/core/util/rc.js b/src/core/util/rc.js
index a9e7776..a75832d 100644
--- a/src/core/util/rc.js
+++ b/src/core/util/rc.js
@@ -11,6 +11,7 @@ const config = rc('nek', {
   BaseModal: 'pro/components/modal/modal',
   // urlMaps: './moky.urlMaps.js',
   api: 'http://nek.kaolafed.com/api',
+  serverApi: 'http://nek-server.kaolafed.com:3000',
 });
 
 module.exports = config;

From 5eadb83bbd4f90f452fb9dc3be663b6995fcb5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=9D=BE?= <wangsong@corp.netease.com>
Date: Wed, 22 Nov 2017 19:35:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json       |  2 +-
 src/core/server.js | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dabaf86..e26f20a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nek",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Nice Easy Kaoka Project Toolkit.",
   "scripts": {
     "test": "mocha --recursive",
diff --git a/src/core/server.js b/src/core/server.js
index b6305fd..08a59d0 100644
--- a/src/core/server.js
+++ b/src/core/server.js
@@ -96,8 +96,8 @@ class Server {
         const out = path.join(rc.pageRoot, ftlPath.path);
         //使用handlebars处理变量
         const template = Handlebars.compile(this.meta.ftl);
-        const entryPath = Url2Path.js(this.meta.url);
-        const rst = template({ entryPath });
+        const pageName = Url2Path.js(this.meta.url);
+        const rst = template({ pageName });
         this._writeFile(out, `${ftlPath.name}.ftl`, rst);
     }
 
@@ -130,8 +130,10 @@ class Server {
     }
 
     async render() {
-        this.meta.ftl && this.writeFtl();
-        this.meta.entry && this.writeEntry();
+        if (this.meta.type == ProjectTypes.NEJ) {
+            this.meta.ftl && this.writeFtl();
+            this.meta.entry && this.writeEntry();
+        }
         this.meta.index && this.writeIndex();
         this.meta.modules && this.writeDirs('modules');
         this.meta.modals && this.writeDirs('modals');

From 6c26f7d98ec367170e4ebfa68982a5984877d35d Mon Sep 17 00:00:00 2001
From: soonwang <wangsong3635@outlook.com>
Date: Tue, 19 Dec 2017 17:10:33 +0800
Subject: [PATCH 3/6] add mock

---
 src/.editorconfig  |   9 ++
 src/core/server.js | 264 +++++++++++++++++++++++++--------------------
 2 files changed, 156 insertions(+), 117 deletions(-)
 create mode 100644 src/.editorconfig

diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 0000000..9d08a1a
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/src/core/server.js b/src/core/server.js
index 08a59d0..55ce8df 100644
--- a/src/core/server.js
+++ b/src/core/server.js
@@ -3,7 +3,10 @@ const path = require('path');
 const fs = require('fs');
 const mkdirp = require('mkdirp-promise');
 const Handlebars = require('handlebars');
-const { js_beautify, html } = require('js-beautify');
+const {
+  js_beautify,
+  html,
+} = require('js-beautify');
 
 const RouteDirective = require('./directives/route');
 const rc = require('./util/rc');
@@ -13,7 +16,7 @@ const Url2Path = require('./util/url2path');
 const ProjectTypes = {
   NEJ: 1,
   Webpack: 2,
-  WebpackMul: 3
+  WebpackMul: 3,
 };
 /**
  * Server类
@@ -22,136 +25,163 @@ const ProjectTypes = {
  * @param meta {Object} - 从Sever获取的页面配置
  */
 class Server {
-    constructor(key = '', force = false) {
-        this.key = key;
-        this.force = force;
-        this.meta = null;
+  constructor(key = '', force = false) {
+    this.key = key;
+    this.force = force;
+    this.meta = null;
+  }
+  /**
+   * 步骤：
+   * 1、从Server获取页面配置，包括项目类型（新老项目、单页多页），页面url
+   * 2、从Server获取代码，根据项目类型、页面url写文件
+   * 3、更新路由
+   */
+  async run() {
+    await this.getMeta();
+
+    this.updateRoute();
+    this.render();
+  }
+
+  async getMeta() {
+    if (!this.key) {
+      log.red('请输入页面唯一标识key...');
+      process.exit(1);
     }
-    /**
-     * 步骤：
-     * 1、从Server获取页面配置，包括项目类型（新老项目、单页多页），页面url
-     * 2、从Server获取代码，根据项目类型、页面url写文件
-     * 3、更新路由
-     */
-    async run() {
-        await this.getMeta();
-
-        this.updateRoute();
-        this.render();
+    try {
+      log.cyan('开始获取项目页面配置数据...');
+      const { data } = await request(`${rc.serverApi}/api/public/page?id=${this.key}`, {
+        json: true,
+      });
+      this.meta = {
+        url: data.url,
+        type: data.type,
+        ftl: data.ftl,
+        entry: data.entry,
+        html: data.html,
+        index: data.index,
+        modules: data.modules,
+        modals: data.modals,
+        mixins: data.mixins,
+      };
+    } catch (err) {
+      log.red(err);
+      log.red('请求页面数据失败，请检查网络...');
+      process.exit(1);
     }
+  }
 
-    async getMeta() {
-        if (!this.key) {
-            log.red('请输入页面唯一标识key...');
-            process.exit(1);
-        }
-        try {
-            log.cyan('开始获取项目页面配置数据...');
-            const { data } = await request(`${rc.serverApi}/api/public/page?id=${this.key}`, { json: true });
-            this.meta = {
-                url: data.url,
-                type: data.type,
-                ftl: data.ftl,
-                entry: data.entry,
-                html: data.html,
-                index: data.index,
-                modules: data.modules,
-                modals: data.modals
-            };
-        } catch (err) {
-            log.red(err);
-            log.red('请求页面数据失败，请检查网络...');
-            process.exit(1);
-        }
+  async updateRoute() {
+    const { url, type } = this.meta;
+    if (!url || !type) {
+      log.red('nek server配置中缺少页面url或项目类型');
+      process.exit(1);
     }
-
-    async updateRoute() {
-      const { url, type } = this.meta;
-      if (!url || !type) {
-          log.red('nek server配置中缺少页面url或项目类型');
-          process.exit(1);
-      }
-      const cwd = process.cwd();
-      //type为1，是nej老项目
-      if (type == ProjectTypes.NEJ) {
-          const mokyPath = path.resolve(cwd, rc.urlMaps || 'moky.config.js');
-          const directive = new RouteDirective(mokyPath, url);
-          directive.update();
-      }
+    const cwd = process.cwd();
+    // type为1，是nej老项目
+    if (type === ProjectTypes.NEJ) {
+      const mokyPath = path.resolve(cwd, rc.urlMaps || 'moky.config.js');
+      const directive = new RouteDirective(mokyPath, url);
+      directive.update();
     }
+  }
 
-    async _writeFile(dir, filename, content, ext) {
-      const out = path.join(dir, filename);
-      if (fs.existsSync(out) && !this.force) { return log.yellow(`Exist File: ${out}`); }
-      if (this.force) { log.yellow(`Force write: ${out}`); }
-
-      await mkdirp(dir);
-      fs.writeFile(out, this.format(content, ext), () => {});
-
-      log.cyan(`Output File: ${out}`);
+  async _writeFile(dir, filename, content, ext) {
+    const out = path.join(dir, filename);
+    if (fs.existsSync(out) && !this.force) {
+      return log.yellow(`Exist File: ${out}`);
     }
-
-    async writeFtl() {
-        const ftlPath = Url2Path.ftl(this.meta.url);
-        const out = path.join(rc.pageRoot, ftlPath.path);
-        //使用handlebars处理变量
-        const template = Handlebars.compile(this.meta.ftl);
-        const pageName = Url2Path.js(this.meta.url);
-        const rst = template({ pageName });
-        this._writeFile(out, `${ftlPath.name}.ftl`, rst);
+    if (this.force) {
+      log.yellow(`Force write: ${out}`);
     }
 
-    async writeEntry() {
-        const entryPath = Url2Path.js(this.meta.url);
-        const out = path.join(rc.jsRoot, entryPath);
-        this._writeFile(out, 'entry.js', this.meta.entry, 'js');
+    await mkdirp(dir);
+    fs.writeFile(out, this.format(content, ext), () => {});
+
+    log.cyan(`Output File: ${out}`);
+  }
+
+  async writeFtl() {
+    const ftlPath = Url2Path.ftl(this.meta.url);
+    const out = path.join(rc.pageRoot, ftlPath.path);
+    // 使用handlebars处理变量
+    const template = Handlebars.compile(this.meta.ftl);
+    const pageName = Url2Path.js(this.meta.url);
+    const rst = template({ pageName });
+    this._writeFile(out, `${ftlPath.name}.ftl`, rst);
+  }
+
+  async writeEntry() {
+    const entryPath = Url2Path.js(this.meta.url);
+    const out = path.join(rc.jsRoot, entryPath);
+    this._writeFile(out, 'entry.js', this.meta.entry, 'js');
+  }
+
+  async writeIndex() {
+    const indexPath = Url2Path.js(this.meta.url);
+    const out = path.join(rc.jsRoot, indexPath);
+    if (this.meta.type === ProjectTypes.NEJ) {
+      this._writeFile(path.join(out, 'modules'), 'page.html', this.meta.index.html, 'html');
+      this._writeFile(path.join(out, 'modules'), 'page.js', this.meta.index.js, 'js');
+      this.writeMock(this.meta.index.url, this.meta.index.mock);
+    } else {
+      this._writeFile(out, 'index.html', this.meta.index.html, 'html');
+      this._writeFile(out, 'index.js', this.meta.index.js, 'js');
     }
-
-    async writeIndex() {
-        const indexPath = Url2Path.js(this.meta.url);
-        const out = path.join(rc.jsRoot, indexPath);
-        if (this.meta.type == ProjectTypes.NEJ) {
-            this._writeFile(path.join(out, 'modules'), 'page.html', this.meta.index.html, 'html');
-            this._writeFile(path.join(out, 'modules'), 'page.js', this.meta.index.js, 'js');
-        } else {
-            this._writeFile(out, 'index.html', this.meta.index.html, 'html');
-            this._writeFile(out, 'index.js', this.meta.index.js, 'js');
-        }
+  }
+
+  async writeDirs(dir) {
+    const dirPath = Url2Path.js(this.meta.url);
+    const out = path.join(rc.jsRoot, dirPath);
+    const dirs = this.meta[dir];
+    /* eslint guard-for-in: "error" */
+    for (let dirname in dirs) {
+      if (dirs.hasOwnProperty(dirname)) {
+        this._writeFile(`${out}/${dir}/${dirname}`, 'index.js', dirs[dirname].js, 'js');
+        this._writeFile(`${out}/${dir}/${dirname}`, 'index.html', dirs[dirname].html, 'html');
+        this.writeMock(dirs[dirname].url, dirs[dirname].mock);
+      }
     }
-
-    async writeDirs(dir) {
-        const dirPath = Url2Path.js(this.meta.url);
-        const out = path.join(rc.jsRoot, dirPath);
-        const dirs = this.meta[dir];
-        for(let dirname in dirs) {
-            this._writeFile(`${out}/${dir}/${dirname}`, 'index.js', dirs[dirname].js, 'js');
-            this._writeFile(`${out}/${dir}/${dirname}`, 'index.html', dirs[dirname].html, 'html');
-        }
+  }
+
+  async writeMock(url, data) {
+    if (url && data) {
+      const mockRoot = rc.mockRoot || path.join((rc.webRoot || './'), 'moky_mock');
+      const mockPath = path.parse(url);
+      if (mockPath.dir[0] === '/') {
+        mockPath.dir = mockPath.dir.slice(1);
+      }
+      this._writeFile(path.join(mockRoot, 'async_mock', 'get', mockPath.dir), `${mockPath.name}.json`, data, 'js');
+      this._writeFile(path.join(mockRoot, 'async_mock', 'post', mockPath.dir), `${mockPath.name}.json`, data, 'js');
     }
+  }
 
-    async render() {
-        if (this.meta.type == ProjectTypes.NEJ) {
-            this.meta.ftl && this.writeFtl();
-            this.meta.entry && this.writeEntry();
-        }
-        this.meta.index && this.writeIndex();
-        this.meta.modules && this.writeDirs('modules');
-        this.meta.modals && this.writeDirs('modals');
+  async render() {
+    if (this.meta.type === ProjectTypes.NEJ) {
+      this.meta.ftl && this.writeFtl();
+      this.meta.entry && this.writeEntry();
     }
-
-    format(content, ext) {
-        let out = content;
-        if (ext === 'js') {
-            out = js_beautify(content, { indent_size: 4 });
-            out = out.replace(/\/\* beautify ignore:start \*\//gm, '');
-            out = out.replace(/\/\* beautify ignore:end \*\//gm, '');
-            out = out.replace(/^\s*[\r\n]/gm, '');
-            return out;
-        } else if (ext === 'html') {
-            out = html(content);
-        }
-        return content;
+    this.meta.index && this.writeIndex();
+    this.meta.modules && this.writeDirs('modules');
+    this.meta.modals && this.writeDirs('modals');
+    this.meta.mixins && this.writeDirs('mixins');
+  }
+
+  format(content, ext) {
+    let out = content;
+    if (ext === 'js') {
+      out = js_beautify(content, {
+        indent_size: 4,
+      });
+      out = out.replace(/\/\* beautify ignore:start \*\//gm, '');
+      out = out.replace(/\/\* beautify ignore:end \*\//gm, '');
+      out = out.replace(/^\s*[\r\n]/gm, '');
+      return out;
+    } else if (ext === 'html') {
+      out = html(content);
     }
+    return content;
+  }
 
 }
 

From da0392be02239d318e6cf2cd2b5b5fe308038c3b Mon Sep 17 00:00:00 2001
From: soonwang <wangsong3635@outlook.com>
Date: Tue, 19 Dec 2017 19:33:24 +0800
Subject: [PATCH 4/6] Add mixins

---
 package.json       |  2 +-
 src/core/server.js | 51 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index e26f20a..8ab3202 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nek",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Nice Easy Kaoka Project Toolkit.",
   "scripts": {
     "test": "mocha --recursive",
diff --git a/src/core/server.js b/src/core/server.js
index 55ce8df..b411f92 100644
--- a/src/core/server.js
+++ b/src/core/server.js
@@ -87,6 +87,9 @@ class Server {
   }
 
   async _writeFile(dir, filename, content, ext) {
+    if (!content) {
+      return;
+    }
     const out = path.join(dir, filename);
     if (fs.existsSync(out) && !this.force) {
       return log.yellow(`Exist File: ${out}`);
@@ -102,6 +105,9 @@ class Server {
   }
 
   async writeFtl() {
+    if (!this.meta.ftl) {
+      return;
+    }
     const ftlPath = Url2Path.ftl(this.meta.url);
     const out = path.join(rc.pageRoot, ftlPath.path);
     // 使用handlebars处理变量
@@ -112,36 +118,42 @@ class Server {
   }
 
   async writeEntry() {
+    if (!this.meta.entry) {
+      return;
+    }
     const entryPath = Url2Path.js(this.meta.url);
     const out = path.join(rc.jsRoot, entryPath);
     this._writeFile(out, 'entry.js', this.meta.entry, 'js');
   }
 
   async writeIndex() {
+    if (!this.meta.index) {
+      return;
+    }
     const indexPath = Url2Path.js(this.meta.url);
     const out = path.join(rc.jsRoot, indexPath);
     if (this.meta.type === ProjectTypes.NEJ) {
       this._writeFile(path.join(out, 'modules'), 'page.html', this.meta.index.html, 'html');
       this._writeFile(path.join(out, 'modules'), 'page.js', this.meta.index.js, 'js');
-      this.writeMock(this.meta.index.url, this.meta.index.mock);
     } else {
       this._writeFile(out, 'index.html', this.meta.index.html, 'html');
       this._writeFile(out, 'index.js', this.meta.index.js, 'js');
     }
+    this.writeMock(this.meta.index.url, this.meta.index.mock);
   }
 
   async writeDirs(dir) {
     const dirPath = Url2Path.js(this.meta.url);
     const out = path.join(rc.jsRoot, dirPath);
     const dirs = this.meta[dir];
-    /* eslint guard-for-in: "error" */
-    for (let dirname in dirs) {
-      if (dirs.hasOwnProperty(dirname)) {
-        this._writeFile(`${out}/${dir}/${dirname}`, 'index.js', dirs[dirname].js, 'js');
-        this._writeFile(`${out}/${dir}/${dirname}`, 'index.html', dirs[dirname].html, 'html');
-        this.writeMock(dirs[dirname].url, dirs[dirname].mock);
-      }
+    if (!dirs) {
+      return;
     }
+    Object.keys(dirs).forEach((dirname) => {
+      this._writeFile(`${out}/${dir}/${dirname}`, 'index.js', dirs[dirname].js, 'js');
+      this._writeFile(`${out}/${dir}/${dirname}`, 'index.html', dirs[dirname].html, 'html');
+      this.writeMock(dirs[dirname].url, dirs[dirname].mock);
+    });
   }
 
   async writeMock(url, data) {
@@ -156,15 +168,26 @@ class Server {
     }
   }
 
+  async writeMixins() {
+    if (!this.meta.mixins) {
+      return;
+    }
+    const dirPath = Url2Path.js(this.meta.url);
+    const out = path.join(rc.jsRoot, dirPath);
+    Object.keys(this.meta.mixins).forEach((item) => {
+      this._writeFile(`${out}/mixins`, `${item}.js`, this.meta.mixins[item], 'js');
+    });
+  }
+
   async render() {
     if (this.meta.type === ProjectTypes.NEJ) {
-      this.meta.ftl && this.writeFtl();
-      this.meta.entry && this.writeEntry();
+      this.writeFtl();
+      this.writeEntry();
     }
-    this.meta.index && this.writeIndex();
-    this.meta.modules && this.writeDirs('modules');
-    this.meta.modals && this.writeDirs('modals');
-    this.meta.mixins && this.writeDirs('mixins');
+    this.writeIndex();
+    this.writeDirs('modules');
+    this.writeDirs('modals');
+    this.writeMixins();
   }
 
   format(content, ext) {

From 4915c79989b8664f5d036a68973d0f5563438115 Mon Sep 17 00:00:00 2001
From: soonwang <wangsong3635@outlook.com>
Date: Tue, 2 Jan 2018 14:55:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mixins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json        |  2 +-
 src/core/server.js  | 16 +++++++++++++++-
 src/core/util/rc.js |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 8ab3202..547b38a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nek",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Nice Easy Kaoka Project Toolkit.",
   "scripts": {
     "test": "mocha --recursive",
diff --git a/src/core/server.js b/src/core/server.js
index b411f92..852d5db 100644
--- a/src/core/server.js
+++ b/src/core/server.js
@@ -55,6 +55,7 @@ class Server {
       });
       this.meta = {
         url: data.url,
+        title: data.title,
         type: data.type,
         ftl: data.ftl,
         entry: data.entry,
@@ -113,7 +114,7 @@ class Server {
     // 使用handlebars处理变量
     const template = Handlebars.compile(this.meta.ftl);
     const pageName = Url2Path.js(this.meta.url);
-    const rst = template({ pageName });
+    const rst = template({ pageName, title: this.meta.title });
     this._writeFile(out, `${ftlPath.name}.ftl`, rst);
   }
 
@@ -152,6 +153,7 @@ class Server {
     Object.keys(dirs).forEach((dirname) => {
       this._writeFile(`${out}/${dir}/${dirname}`, 'index.js', dirs[dirname].js, 'js');
       this._writeFile(`${out}/${dir}/${dirname}`, 'index.html', dirs[dirname].html, 'html');
+      this.writeMixin(out, `${out}/${dir}/${dirname}`, dirs[dirname].mixin);
       this.writeMock(dirs[dirname].url, dirs[dirname].mock);
     });
   }
@@ -168,6 +170,17 @@ class Server {
     }
   }
 
+  async writeMixin(dir, dirname, mixin) {
+    if (!mixin) {
+      return;
+    }
+    if (Object.keys(this.meta.modules).length === 1) {
+      this._writeFile(`${dir}/mixins`, 'list.action.js', mixin, 'js');
+    } else {
+      this._writeFile(`${dirname}/mixins`, 'list.action.js', mixin, 'js');
+    }
+  }
+
   async writeMixins() {
     if (!this.meta.mixins) {
       return;
@@ -201,6 +214,7 @@ class Server {
       out = out.replace(/^\s*[\r\n]/gm, '');
       return out;
     } else if (ext === 'html') {
+      content.replace(/<\/?ns-empty>/g, '');
       out = html(content);
     }
     return content;
diff --git a/src/core/util/rc.js b/src/core/util/rc.js
index a75832d..3506493 100644
--- a/src/core/util/rc.js
+++ b/src/core/util/rc.js
@@ -11,7 +11,7 @@ const config = rc('nek', {
   BaseModal: 'pro/components/modal/modal',
   // urlMaps: './moky.urlMaps.js',
   api: 'http://nek.kaolafed.com/api',
-  serverApi: 'http://nek-server.kaolafed.com:3000',
+  serverApi: 'http://nek-server.kaolafed.com',
 });
 
 module.exports = config;

From eb200732eb8f0f3d9b8aeea4bd5444e8fe893ebc Mon Sep 17 00:00:00 2001
From: soonwang <wangsong3635@outlook.com>
Date: Tue, 2 Jan 2018 15:45:10 +0800
Subject: [PATCH 6/6] beautify html

---
 package.json       | 2 +-
 src/core/server.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 547b38a..e8e24b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nek",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Nice Easy Kaoka Project Toolkit.",
   "scripts": {
     "test": "mocha --recursive",
diff --git a/src/core/server.js b/src/core/server.js
index 852d5db..b7c721f 100644
--- a/src/core/server.js
+++ b/src/core/server.js
@@ -214,8 +214,9 @@ class Server {
       out = out.replace(/^\s*[\r\n]/gm, '');
       return out;
     } else if (ext === 'html') {
-      content.replace(/<\/?ns-empty>/g, '');
+      content = content.replace(/<\/?ns-empty>/g, '');
       out = html(content);
+      return out;
     }
     return content;
   }