gm3 1.1.2 → 1.1.4

package/README.md

@@ -4,7 +4,8 @@
 
 ## Getting Started
 
-使用gm3需要现在全局安装npm包
+
+可以使用gm3全局安装npm包，直接执行 gm3 生成对应内容
 
 ### 环境基础
 
@@ -12,9 +13,14 @@
 
 2.安装gm3
 
+* 通过代码调用: `require('gm3')`
+```
+npm install gm3 
 ```
-npm install -g gm3       # or [url of this repository]
 
+* 全局使用 `gm3`
+```
+npm install -g gm3       # or [url of this repository]
 ```
 
 ### 开发指南
@@ -152,10 +158,11 @@ partOne，partTwo，partThree都是html文本。采用<%-%>，语法参考 [EJS]
  ***template*** 由包名和版本号组成。固定格式引用。   
  ***data*** 填充该template的json数据，会覆盖模板的默认数据。可以为空，为空则用默认数据。
 
-## 指令
+## 指令 -- gm3
 
 ```
 Usage: gm3 [options]
+default: gm3 = gm3 -b
 
 Gm help.
 
@@ -168,6 +175,12 @@ Gm help.
   -a, --append-array          Appends intead of replaces an array
   -b, --build                 Compile && build file
   -i, --install[=MODULES]     Install templates
+  -v, --version               Output version information and exit
+
+Report bugs to <wyyxdgm@163.com>.
+
+```
+<!--
   -A, --auth[=USER:PASS]      User auth by name and password
   -s, --search[=key1:key2:...]  
                               Search by keys
@@ -175,11 +188,7 @@ Gm help.
   -I, --info                  Show local infos
   -V, --verbose               Makes output more verbose
   -h, --help                  Display this help message and exit
-  -v, --version               Output version information and exit
-
-Report bugs to <wyyxdgm@163.com>.
-
-```
+-->
 
 **举例**
 
@@ -254,3 +263,24 @@ console.log(gm3Str);
 
  * EJS: https://github.com/mde/ejs
 
+## TODO
+
+cli support completely
+
+```
+  -d, --directory[=DIR]       The directory to be builded, default is current
+                                directory
+  -o, --output[=PATH]         Write the builded content to the target file
+  -m, --main[=PATH]           defind the entry file
+  -a, --append-array          Appends intead of replaces an array
+  -b, --build                 Compile && build file
+  -i, --install[=MODULES]     Install templates
+  -A, --auth[=USER:PASS]      User auth by name and password
+  -s, --search[=key1:key2:...]  
+                              Search by keys
+  -p, --publish               Publish package
+  -I, --info                  Show local infos
+  -V, --verbose               Makes output more verbose
+  -h, --help                  Display this help message and exit
+  -v, --version               Output version information and exit
+```

package/lib/index.js

@@ -4,4 +4,4 @@ module.exports.auth = util.auth;
 module.exports.info = util.info;
 module.exports.publish = util.publish;
 module.exports.search = util.search;
-module.exports.build = (conf) => util.buildStr(conf.dir || '', conf.appendArray, conf);
+module.exports.build = (conf) => util.buildJsStr(conf.dir || '', conf.appendArray, conf);

package/lib/util.js

@@ -254,6 +254,99 @@ let buildStr = (baseDir, appendArray = true, conf) => {
 	return require('pretty')(htmlStr);
 }
 
+/**
+ * buildJsStr - 使用 js-beautify 格式化 JavaScript 代码
+ */
+let buildJsStr = (baseDir, appendArray = true, conf) => {
+	let {
+		htmlContent,
+		json,
+		filePath,
+		conf2
+	} = load(baseDir, undefined, conf) || {};
+	/**
+	 * init gmComponents by load gm_components
+	 */
+	let gmComponents = {};
+	let _gm_path = path.join(baseDir, 'gm_components');
+	if (fs.existsSync(_gm_path)) {
+		fs.readdirSync(_gm_path).forEach((moduleDir) => {
+			let _p = path.join(baseDir, 'gm_components', moduleDir);
+			if (__verbose) console.log(LOG_TITLE, 'Load'.yellow, baseDir ? path.relative(baseDir, _p) : _p);
+			gmComponents[moduleDir] = load(_p, baseDir) || {};
+		});
+	}
+
+	let resolveKey = (o, k) => {
+		let v = o[k];
+		if (_.isObject(v) && v.$template) { //template
+			let moduleComponent = gmComponents[v.$template];
+			if (!moduleComponent) return console.log(`no template: ${v.$template}`.red);
+			let data = deepExtend(moduleComponent.json, v.$data, appendArray);
+			for (key in data) {
+				data[key] = resolveKey(data, key);
+			}
+			if (__verbose) console.log(LOG_TITLE, 'Render'.yellow, v.$template);
+			try {
+				return ejs.render(moduleComponent.htmlContent, data, {
+					root: baseDir,
+					filename: moduleComponent.filePath
+				});
+			} catch (e) {
+				let lint = ejsLint(moduleComponent.htmlContent, data);
+				console.log('RenderError'.red, e, lint);
+				if (__verbose) console.error(moduleComponent.htmlContent, data);
+			}
+		} else if (_.isArray(v)) {
+			return _.map(v, e => resolveKey({
+				k: e
+			}, 'k'));
+		} else {
+			return v;
+		}
+	}
+	for (key in json) {
+		json[key] = resolveKey(json, key);
+	}
+	let jsStr;
+	try {
+		jsStr = ejs.render(htmlContent, json, {
+			root: baseDir,
+			filename: filePath
+		});
+	} catch (e) {
+		let lint = ejsLint(htmlContent, json);
+		console.log('RenderError'.red, e, lint);
+		if (__verbose) console.error(htmlContent, json);
+	}
+	// 使用 js-beautify 格式化 JavaScript 代码
+	return require('js-beautify').js(jsStr, {
+		indent_size: 4,
+		indent_char: ' ',
+		indent_with_tabs: false,
+		editorconfig: false,
+		eol: '\n',
+		end_with_newline: false,
+		indent_level: 0,
+		preserve_newlines: true,
+		max_preserve_newlines: 2,
+		space_in_paren: false,
+		space_in_empty_paren: false,
+		jslint_happy: false,
+		space_after_anon_function: false,
+		space_after_named_function: false,
+		brace_style: 'collapse',
+		unindent_chained_methods: false,
+		break_chained_methods: false,
+		keep_array_indentation: false,
+		unescape_strings: false,
+		wrap_line_length: 150,
+		e4x: false,
+		comma_first: false,
+		operator_position: 'before-newline'
+	});
+}
+
 let build = (baseDir, target, appendArray = true, main) => {
 	let firstConf = {
 		main: main
@@ -321,5 +414,6 @@ module.exports = {
 	deepExtend,
 	init,
 	build,
-	buildStr
+	buildStr,
+	buildJsStr
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm3",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "constructing your world by snippets",
   "main": "lib/index.js",
   "scripts": {
@@ -9,16 +9,31 @@
   "bin": {
     "gm3": "./bin/gm.js"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/wyyxdgm/gm3.git"
+  },
+  "keywords": [
+    "ejs",
+    "template",
+    "json2html",
+    "gm3"
+  ],
   "author": "wyyxdgm@163.com",
   "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/wyyxdgm/gm3/issues"
+  },
+  "homepage": "https://github.com/wyyxdgm/gm3#readme",
   "dependencies": {
-    "ejs": "^2.6.1",
-    "underscore": "^1.9.1",
     "argp": "^1.0.4",
     "colors": "^1.3.2",
+    "ejs": "^2.6.1",
     "ejs-lint": "^0.3.0",
     "git-clone-repo": "^1.0.0",
+    "js-beautify": "^1.15.4",
     "ncp": "^2.0.0",
-    "pretty": "^2.0.0"
+    "pretty": "^2.0.0",
+    "underscore": "^1.9.1"
   }
 }