Skip to content

Commit

Permalink
处理注释模板可能被嵌套的情况、增加清理空白行的功能
Browse files Browse the repository at this point in the history
  • Loading branch information
wangjihu committed Nov 10, 2014
1 parent af9bde4 commit a303072
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 53 deletions.
3 changes: 3 additions & 0 deletions bin/jdists
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ var argv = optimist
.alias("o", "output")
.describe('o', 'output file.')
.string('o')
.alias("clean", "clean")
.describe('c', 'clean white space.')
.boolean('c')
.alias("v", "version")
.describe("v", "Print version number and exit.")
.wrap(80)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jdists",
"version": "0.2.1",
"version": "0.2.2",
"description": "JS 区块进行预处理工具",
"main": "src/jdists.js",
"bin": {
Expand Down
54 changes: 47 additions & 7 deletions src/jdists.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ function() {

var crypto = require('crypto');

function clean(text) {
return String(text).replace(/^\s*$/gm, '') // 清除空行
.replace(/\n{2,}/gm, '\n'); // 清除连接的空行
}

/*
* 保证目录存在
* @param{String} dir 目录
Expand Down Expand Up @@ -138,6 +143,34 @@ function() {
return result;
};

/**
* 替换注释模板，并考虑嵌套的情况
* @param{String} code 代码文本
* @return 返回替换后的文本
*/
var replaceFunctionComments = function(code) {
return String(code).replace(
/function\s*\(\s*\)\s*\{\s*\/\*\!?([^]*?)\*\/[\s;]*\}/g,
function(all, text) {

/*<block comment="处理嵌套>*/
var find;
all = all.replace(/([^]{8})(function\s*\(\s*\)\s*\{\s*\/\*\!?[^]*?\*\/[\s;]*\})/g,
function(all, prefix, code) {
find = true;
return prefix + replaceFunctionComments(code);
}
);
if (find) {
return all;
}
/*</block>*/

return JSON.stringify(text);
}
);
};

/**
* 资源合并处理器
*/
Expand Down Expand Up @@ -321,12 +354,7 @@ function() {
);

if (isReplace) {
content = content.replace(
/function\s*\(\s*\)\s*\{\s*\/\*\!?([\s\S]*?)\*\/[\s;]*\}/g, // 处理函数注释字符串
function(all, text) {
return JSON.stringify(text);
}
);
content = replaceFunctionComments(content);
}

return content;
Expand Down Expand Up @@ -397,7 +425,11 @@ function() {
return new Array(all.length + 1).join(' ');
};

blocks[[filename, '']].content = fs.readFileSync(filename);
var content = fs.readFileSync(filename);
if (options.clean) { // 清理空白字符
content = clean(content);
}
blocks[[filename, '']].content = content;

return buildBlock(blocks[[filename, '']].content, readBlock);
};
Expand Down Expand Up @@ -488,6 +520,9 @@ function() {
var params = attrs.slice.split(',');
content = content.slice(params[0], params[1]);
}
if (options.clean) { // 清理空白字符
content = clean(content);
}
return content;
case 'remove': // 必然移除的
return '';
Expand All @@ -500,6 +535,7 @@ function() {

var buildFile = function(filename, options) {
options = options || {};
options.clean = typeof options.clean === 'undefined' ? true : options.clean;
options.remove = options.remove || 'debug,test';
options.trigger = options.trigger || 'release';
options.removeList = String(options.remove).split(',');
Expand All @@ -511,6 +547,10 @@ function() {
loadFile(filename, options); // 预处理，文件
var result = replaceFile(filename, options);

if (options.clean) { // 清理空白字符
result = clean(result);
}

blocks = null;
chain = null; // 引用链

Expand Down
10 changes: 0 additions & 10 deletions test/fixtures/base.output.html
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,27 @@
<html>
<head>
<style>

</style>
</head>
<body>

abcdefghijklmnopqrstuvwxyz
bcdefghijklmnopqrstuvwxy
abcdefghijklmnopqrstuvwxyz
abcdefghijklmnopqrstuvwxyz
abcdefghijklmnopqrstuvwxyz

</body>
<div>可以写在一行</div>
<script>
void function() {


console.log('hello world!');

var render = jhtmls.render("\n<ul>\nforEach(function(item) {\n \n <li>#{item.title}</li>\n});\n<ul>\n");
console.log('hello world!');

var render = jhtmls.render("\n<ul>\nforEach(function(item) {\n \n <li>#{item.title}</li>\n});\n<ul>\n");
console.log('hello world!');

var render = jhtmls.render("\n<ul>\nforEach(function(item) {\n \n <li>#{item.title}</li>\n});\n<ul>\n");
console.log('hello world!');

var render = jhtmls.render("\n<ul>\nforEach(function(item) {\n \n <li>#{item.title}</li>\n});\n<ul>\n");
console.log('hello world!');

var render = jhtmls.render("\n<ul>\nforEach(function(item) {\n \n <li>#{item.title}</li>\n});\n<ul>\n");
console.log('可以写在一行');
}();
Expand Down
3 changes: 0 additions & 3 deletions test/fixtures/base64.output.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
<meta charset="utf-8">
</head>
<body>


<img src='data:image/png;base64,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'>

</body>
</html>
12 changes: 1 addition & 11 deletions test/fixtures/concat.output.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,8 @@
<html>
<head>
<meta charset="utf-8">








<script src="assets/all.js?t=38561ec"></script>

<script src="assets/all.js?t=933ad09"></script>
<link rel="stylesheet" type="text/css" href="assets/all.css?t=397585e">

</head>
<body>
</body>
Expand Down
2 changes: 0 additions & 2 deletions test/fixtures/inline.output.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
<style type="text/css">
body {
border: 1px solid red;

background: url(data:image/png;base64,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);

}
</style>
</head>
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/nested.output.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
void function() {
console.log('start');
console.log('hello world!');

var render = jhtmls.render("\n<ul>\nforEach(function(item) {\n \n <li>#{item.title}</li>\n});\n<ul>\n");
console.log('end');
}();
10 changes: 0 additions & 10 deletions test/fixtures/replace.output.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,12 @@
<head>
</head>
<body>


<div>正式版本</div>

<script>
var ajax = ajax || {};
void function (exports) {


exports.host = 'http://api.baidu.com/1.0/getuser';



console.log('verison: 1.0.0');


}(ajax);
</script>
</body>
Expand Down
14 changes: 14 additions & 0 deletions test/fixtures/template.input.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
void function() {
/**
* version: 1.1.2
*/

var dict = {
a: function() {
/*!
<div>hello</div>
*/
}
};

}();
8 changes: 8 additions & 0 deletions test/fixtures/template.output.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
void function() {
/**
* version: 1.1.2
*/
var dict = {
a: "\n<div>hello</div>\n "
};
}();
8 changes: 0 additions & 8 deletions test/fixtures/trigger.output.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@ void function () {
/*<replace trigger="LAN"
ajax.host = 'host://192.168.1.55:8000/getuser';
/replace>*/

ajax.host = 'host://api.baidu.com/getuser';





var a = 0;
/*<number trigger="LAN"
a += 10;
/number>*/
/*<number
a += 12;
/number>*/

a += 12;

}();

0 comments on commit a303072

Please sign in to comment.