Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-10 19:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Template broken after remove semicolons action (#2991)

Browse Source
This commit is contained in:
Michał Lipiński
2017-02-09 20:27:45 +01:00
committed by John-David Dalton
parent f5b2031211
commit 477fdb2cf2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
template.js
View File

@@ -10,9 +10,9 @@ import templateSettings from './templateSettings.js'
import toString from './toString.js' import toString from './toString.js'
/** Used to match empty string literals in compiled template source. */ /** Used to match empty string literals in compiled template source. */
const reEmptyStringLeading = /\b__p \+= ''g const reEmptyStringLeading = /\b__p \+= '';/g
const reEmptyStringMiddle = /\b(__p \+=) '' \+/g const reEmptyStringMiddle = /\b(__p \+=) '' \+/g
const reEmptyStringTrailing = /(__e\(.*?\)|\b__t\)) \+\n''g const reEmptyStringTrailing = /(__e\(.*?\)|\b__t\)) \+\n'';/g
/** /**
* Used to match * Used to match
@@ -81,7 +81,7 @@ const stringEscapes = {
* // Use the HTML "escape" delimiter to escape data property values. * // Use the HTML "escape" delimiter to escape data property values.
* let compiled = template('<b><%- value %></b>') * let compiled = template('<b><%- value %></b>')
* compiled({ 'value': '<script>' }) * compiled({ 'value': '<script>' })
* // => '<b>&ltcript&gt<b>' * // => '<b>&lt;script&gt;</b>'
* *
* // Use the "evaluate" delimiter to execute JavaScript and generate HTML. * // Use the "evaluate" delimiter to execute JavaScript and generate HTML.
* let compiled = template('<% forEach(users, function(user) { %><li><%- user %></li><% })%>') * let compiled = template('<% forEach(users, function(user) { %><li><%- user %></li><% })%>')
@@ -119,9 +119,9 @@ const stringEscapes = {
* let compiled = template('hi <%= data.user %>!', { 'variable': 'data' }) * let compiled = template('hi <%= data.user %>!', { 'variable': 'data' })
* compiled.source * compiled.source
* // => function(data) { * // => function(data) {
* // const __t, __p = '' * // const __t, __p = '';
* // __p += 'hi ' + ((__t = ( data.user )) == null ? '' : __t) + '!' * // __p += 'hi ' + ((__t = ( data.user )) == null ? '' : __t) + '!';
* // return __p * // return __p;
* // } * // }
* *
* // Use custom template delimiters. * // Use custom template delimiters.
@@ -135,7 +135,7 @@ const stringEscapes = {
* fs.writeFileSync(path.join(process.cwd(), 'jst.js'), '\ * fs.writeFileSync(path.join(process.cwd(), 'jst.js'), '\
* const JST = {\ * const JST = {\
* "main": ' + template(mainText).source + '\ * "main": ' + template(mainText).source + '\
* } * };\
* ') * ')
*/ */
function template(string, options, guard) { function template(string, options, guard) {
@@ -196,7 +196,7 @@ function template(string, options, guard) {
} }
if (evaluateValue) { if (evaluateValue) {
isEvaluating = true isEvaluating = true
source += `'n${ evaluateValue }\__p += '` source += `';\n${ evaluateValue };\n__p += '`
} }
if (interpolateValue) { if (interpolateValue) {
source += `' +\n((__t = (${ interpolateValue })) == null ? '' : __t) +\n'` source += `' +\n((__t = (${ interpolateValue })) == null ? '' : __t) +\n'`
@@ -208,7 +208,7 @@ function template(string, options, guard) {
return match return match
}) })
source += "'n" source += "';\n"
// If `variable` is not specified wrap a with-statement around the generated // If `variable` is not specified wrap a with-statement around the generated
// code to add the data object to the top of the scope chain. // code to add the data object to the top of the scope chain.
@@ -219,13 +219,13 @@ function template(string, options, guard) {
// Cleanup code by stripping empty strings. // Cleanup code by stripping empty strings.
source = (isEvaluating ? source.replace(reEmptyStringLeading, '') : source) source = (isEvaluating ? source.replace(reEmptyStringLeading, '') : source)
.replace(reEmptyStringMiddle, '$1') .replace(reEmptyStringMiddle, '$1')
.replace(reEmptyStringTrailing, '$1) .replace(reEmptyStringTrailing, '$1;')
// Frame code as the function body. // Frame code as the function body.
source = `function(${ variable || 'obj' }) {\n` + source = `function(${ variable || 'obj' }) {\n` +
(variable (variable
? '' ? ''
: 'obj || (obj = {})n' : 'obj || (obj = {});\n'
) + ) +
"const __t, __p = ''" + "const __t, __p = ''" +
(isEscaping (isEscaping
@@ -233,9 +233,9 @@ function template(string, options, guard) {
: '' : ''
) + ) +
(isEvaluating (isEvaluating
? ', __j = Array.prototype.joinn' + ? ', __j = Array.prototype.join;\n' +
"function print() { __p += __j.call(arguments, '') }\n" "function print() { __p += __j.call(arguments, '') }\n"
: 'n' : ';\n'
) + ) +
source + source +
'return __p\n}' 'return __p\n}'