Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: End of JavaScript comments are not parsed #83

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix: End of JavaScript comments are not parsed #83

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e1412e
Merge branch 'master' of github.com:jsoverson/preprocess
anseki Jul 18, 2015
e7a741e
Fix: End of JavaScript comments are not parsed
anseki Jul 19, 2015
b353bc5
Rename vars
anseki Jul 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 105 additions & 47 deletions lib/regexrules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,145 @@

var
SP = '[ \\t]',
NL_OPTIONAL = '(?:' + SP + '*\\n)?',
NLS_OPTIONAL = '(?:' + SP + '*\\n+)?',
IND = '^(.*?)', // indent (all cols from 0 col)

ARGS = SP + '+(.+?)', // require separator(SPs)
ARGS_OPTIONAL = '(?:' + ARGS + ')?',
FUNC = ARGS + SP + '*\\((.*)\\)', // Not `\\((.*?)\\)`

// ======================== html
HTML_START = '<!--' + SP + '*', // include inside SPs
HTML_SP_START = SP + '*' + HTML_START,
HTML_IND_START = IND + HTML_START,
HTML_END = SP + '*(?:-->|!>)', // include inside SPs
HTML_END_NL = HTML_END + NL_OPTIONAL,
HTML_END_NLS = HTML_END + NLS_OPTIONAL,

// ======================== js
_JS_START1 = '//',
_JS_START2 = '/\\*',
JS_START1 = _JS_START1 + SP + '*', // include inside SPs
JS_START2 = _JS_START2 + SP + '*', // include inside SPs
JS_START = '(?:' + _JS_START1 + '|' + _JS_START2 + ')' + SP + '*', // include inside SPs
JS_SP_START = SP + '*' + JS_START,
JS_IND_START1 = IND + JS_START1,
JS_IND_START2 = IND + JS_START2,
JS_END_LINE = SP + '*(?:\\*\\*|\\*/|$)', // include inside SPs
_JS_END = '(?:\\*\\*|\\*/)',
JS_END = SP + '*' + _JS_END, // include inside SPs
JS_END_NL = SP + '*(?:' + _JS_END + NL_OPTIONAL + '|(?:\\n|$))', // include inside SPs
JS_END_NLS = SP + '*(?:' + _JS_END + NLS_OPTIONAL + '|(?:\\n+|$))', // include inside SPs

// ======================== coffee
COFFEE_START = '#+' + SP + '*', // include inside SPs
COFFEE_SP_START = SP + '*' + COFFEE_START,
COFFEE_IND_START = IND + COFFEE_START,
COFFEE_END_LINE = SP + '*$', // include inside SPs
COFFEE_END_NL = SP + '*(?:\\n|$)', // include inside SPs
COFFEE_END_NLS = SP + '*(?:\\n+|$)', // include inside SPs

// ======================== directives
DIR_ECHO = '@echo' + ARGS,
DIR_EXEC = '@exec' + FUNC,
DIR_INCLUDE = '@include(?!-)' + ARGS,
DIR_INCLUDE_STATIC = '@include-static' + ARGS,
DIR_EXCLUDE_START = '@exclude' + ARGS_OPTIONAL,
DIR_EXCLUDE_END = '@endexclude',
DIR_EXTEND_START = '@extend(?!able)' + ARGS,
DIR_EXTEND_END = '@endextend',
DIR_EXTENDABLE = '@extendable',
DIR_IF_START = '@(ifndef|ifdef|if)' + ARGS,
DIR_IF_END = '@endif',
DIR_FOREACH_START = '@foreach' + ARGS,
DIR_FOREACH_END = '@endfor'
;

module.exports = {
simple : {
echo : "^@echo[ \t]+(.*?)[ \t]*$",
exec : "^@exec[ \t]+(\\S+)[ \t]*\\((.*)\\)[ \t]*$",
include : "^(.*)@include(?!-)[ \t]+(.*?)[ \t]*$", // allow prefix characters to specify the indent level of included file
'include-static' : "^(.*)@include-static[ \t]+(.*?)[ \t]*$"
echo : '^' + DIR_ECHO + SP + '*$',
exec : '^' + DIR_EXEC + SP + '*$',
include : IND + DIR_INCLUDE + SP + '*$',
// allow prefix characters to specify the indent level of included file
'include-static' : IND + DIR_INCLUDE_STATIC + SP + '*$'
},
html : {
echo : "<!--[ \t]*@echo[ \t]+(.*?)[ \t]*(?:-->|!>)",
exec : "<!--[ \t]*@exec[ \t]+(\\S+)[ \t]*\\((.*)\\)[ \t]*(?:-->|!>)",
include : "(.*)<!--[ \t]*@include(?!-)[ \t]+(.*?)[ \t]*(?:-->|!>)",
'include-static' : "(.*)<!--[ \t]*@include-static[ \t]+(.*?)[ \t]*(?:-->|!>)",
echo : HTML_START + DIR_ECHO + HTML_END,
exec : HTML_START + DIR_EXEC + HTML_END,
include : HTML_IND_START + DIR_INCLUDE + HTML_END,
'include-static' : HTML_IND_START + DIR_INCLUDE_STATIC + HTML_END,
exclude : {
start : "[ \t]*<!--[ \t]*@exclude(?:[ \t]+(.*?))?[ \t]*(?:-->|!>)(?:[ \t]*\n+)?",
end : "[ \t]*<!--[ \t]*@endexclude[ \t]*(?:-->|!>)(?:[ \t]*\n)?"
start : HTML_SP_START + DIR_EXCLUDE_START + HTML_END_NLS,
end : HTML_SP_START + DIR_EXCLUDE_END + HTML_END_NL
},
extend : {
start : "[ \t]*<!--[ \t]*@extend(?!able)[ \t]+(.*?)[ \t]*(?:-->|!>)(?:[ \t]*\n+)?",
end : "[ \t]*<!--[ \t]*@endextend[ \t]*(?:-->|!>)(?:[ \t]*\n)?"
start : HTML_SP_START + DIR_EXTEND_START + HTML_END_NLS,
end : HTML_SP_START + DIR_EXTEND_END + HTML_END_NL
},
extendable : "<!--[ \t]*@extendable[ \t]*(?:-->|!>)",
extendable : HTML_SP_START + DIR_EXTENDABLE + HTML_END,
if : {
start : "[ \t]*<!--[ \t]*@(ifndef|ifdef|if)[ \t]+(.*?)[ \t]*(?:-->|!>)(?:[ \t]*\n+)?",
end : "[ \t]*<!(?:--)?[ \t]*@endif[ \t]*(?:-->|!>)(?:[ \t]*\n)?"
start : HTML_SP_START + DIR_IF_START + HTML_END_NLS,
end : HTML_SP_START + DIR_IF_END + HTML_END_NL
},
foreach : {
start : "[ \t]*<!--[ \t]*@foreach[ \t]+(.*?)[ \t]*(?:-->|!>)(?:[ \t]*\n+)?",
end : "[ \t]*<!(?:--)?[ \t]*@endfor[ \t]*(?:-->|!>)(?:[ \t]*\n)?"
start : HTML_SP_START + DIR_FOREACH_START + HTML_END_NLS,
end : HTML_SP_START + DIR_FOREACH_END + HTML_END_NL
}
},
js : {
echo : [
"/\\*[ \t]*@echo[ \t]+(.*?)[ \t]*\\*(?:\\*|/)",
"//[ \t]*@echo[ \t]+(.*?)[ \t]*$"
JS_START1 + DIR_ECHO + JS_END_LINE,
JS_START2 + DIR_ECHO + JS_END_LINE
],
exec : "(?://|/\\*)[ \t]*@exec[ \t]+(\\S+)[ \t]*\\((.*)\\)[ \t]*(?:\\*(?:\\*|/))?",
exec : JS_START + DIR_EXEC + JS_END_LINE,
include : [
"^(.*)/\\*[ \t]*@include(?!-)[ \t]+(.*?)[ \t]*\\*(?:\\*|/)",
"^(.*)//[ \t]*@include(?!-)[ \t]+(.*?)[ \t]*$"
JS_IND_START1 + DIR_INCLUDE + JS_END_LINE,
JS_IND_START2 + DIR_INCLUDE + JS_END_LINE
],
'include-static': [
"^(.*)/\\*[ \t]*@include-static[ \t]+(.*?)[ \t]*\\*(?:\\*|/)",
"^(.*)//[ \t]*@include-static[ \t]+(.*?)[ \t]*$"
'include-static' : [
JS_IND_START1 + DIR_INCLUDE_STATIC + JS_END_LINE,
JS_IND_START2 + DIR_INCLUDE_STATIC + JS_END_LINE
],
exclude : {
start : "[ \t]*(?://|/\\*)[ \t]*@exclude(?:[ \t]+([^\n*]*))?[ \t]*(?:\\*(?:\\*|/))?(?:[ \t]*\n+)?",
end : "[ \t]*(?://|/\\*)[ \t]*@endexclude[ \t]*(?:\\*(?:\\*|/))?(?:[ \t]*\n)?"
start : JS_SP_START + DIR_EXCLUDE_START + JS_END_NLS,
end : JS_SP_START + DIR_EXCLUDE_END + JS_END_NL
},
extend : {
start : "[ \t]*(?://|/\\*)[ \t]*@extend(?!able)[ \t]+([^\n*]*)(?:\\*(?:\\*|/))?(?:[ \t]*\n+)?",
end : "[ \t]*(?://|/\\*)[ \t]*@endextend[ \t]*(?:\\*(?:\\*|/))?(?:[ \t]*\n)?"
start : JS_SP_START + DIR_EXTEND_START + JS_END_NLS,
end : JS_SP_START + DIR_EXTEND_END + JS_END_NL
},
extendable : "[ \t]*(?://|/\\*)[ \t]*@extendable[ \t]*(?:\\*/)?",
extendable : JS_SP_START + DIR_EXTENDABLE + JS_END_LINE,
if : {
start : "[ \t]*(?://|/\\*)[ \t]*@(ifndef|ifdef|if)[ \t]+([^\n*]*)(?:\\*(?:\\*|/))?(?:[ \t]*\n+)?",
end : "[ \t]*(?://|/\\*)[ \t]*@endif[ \t]*(?:\\*(?:\\*|/))?(?:[ \t]*\n)?"
start : JS_SP_START + DIR_IF_START + JS_END_NLS,
end : JS_SP_START + DIR_IF_END + JS_END_NL
},
foreach : {
start : "[ \t]*(?://|/\\*)[ \t]*@foreach[ \t]+([^\n*]*)(?:\\*(?:\\*|/))?(?:[ \t]*\n+)?",
end : "[ \t]*(?://|/\\*)[ \t]*@endfor[ \t]*(?:\\*(?:\\*|/))?(?:[ \t]*\n)?"
start : JS_SP_START + DIR_FOREACH_START + JS_END_NLS,
end : JS_SP_START + DIR_FOREACH_END + JS_END_NL
}
},
coffee : {
echo : "#+[ \t]*@echo[ \t]+(.*?)[ \t]*$",
exec : "#+[ \t]*@exec[ \t]+(\\S+)[ \t]*\\((.*)\\)[ \t]*$",
include : "^(.*?)#+[ \t]*@include(?!-)[ \t]+(.*?)[ \t]*$",
'include-static' : "^(.*?)#+[ \t]*@include-static[ \t]+(.*?)[ \t]*$",
echo : COFFEE_START + DIR_ECHO + COFFEE_END_LINE,
exec : COFFEE_START + DIR_EXEC + COFFEE_END_LINE,
include : COFFEE_IND_START + DIR_INCLUDE + COFFEE_END_LINE,
'include-static' : COFFEE_IND_START + DIR_INCLUDE_STATIC + COFFEE_END_LINE,
exclude : {
start : "^[ \t]*#+[ \t]*@exclude(?:[ \t]+(.*?))?[ \t]*\n+",
end : "^[ \t]*#+[ \t]*@endexclude[ \t]*\n?"
start : COFFEE_SP_START + DIR_EXCLUDE_START + COFFEE_END_NLS,
end : COFFEE_SP_START + DIR_EXCLUDE_END + COFFEE_END_NL
},
extend : {
start : "^[ \t]*#+[ \t]*@extend(?!able)[ \t]+(.*?)\n+",
end : "^[ \t]*#+[ \t]*@endextend[ \t]*\n?"
start : COFFEE_SP_START + DIR_EXTEND_START + COFFEE_END_NLS,
end : COFFEE_SP_START + DIR_EXTEND_END + COFFEE_END_NL
},
extendable : "^[ \t]*#+[ \t]*@extendable[ \t]*$",
extendable : COFFEE_SP_START + DIR_EXTENDABLE + COFFEE_END_LINE,
if : {
start : "^[ \t]*#+[ \t]*@(ifndef|ifdef|if)[ \t]+(.*?)[ \t]*\n+",
end : "^[ \t]*#+[ \t]*@endif[ \t]*\n?"
start : COFFEE_SP_START + DIR_IF_START + COFFEE_END_NLS,
end : COFFEE_SP_START + DIR_IF_END + COFFEE_END_NL
},
foreach : {
start : "^[ \t]*#+[ \t]*@foreach[ \t]+(.*?)[ \t]*\n+",
end : "^[ \t]*#+[ \t]*@endfor[ \t]*\n?"
start : COFFEE_SP_START + DIR_FOREACH_START + COFFEE_END_NLS,
end : COFFEE_SP_START + DIR_FOREACH_END + COFFEE_END_NL
}
}
};
Expand Down