Skip to content

fix: maintain outer context #42

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

Merged
merged 1 commit into from
Dec 11, 2019
Merged

fix: maintain outer context #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 28 additions & 47 deletions domUtil/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,22 @@ function getValueFromContext(exp, context) {
function extractElseif(ifExps, sourcesInsideBlock) {
var exps = [ifExps];
var sourcesInsideIf = [];

var otherIfCount = 0;
var start = 0;
var i, len, source;

for (i = 0, len = sourcesInsideBlock.length; i < len; i += 1) {
source = sourcesInsideBlock[i];

if (source.indexOf('elseif') > -1 || source === 'else') {
// eslint-disable-next-line complexity
forEach(sourcesInsideBlock, function(source, index) {
Copy link
Member

@seonim-ryu seonim-ryu Dec 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

source는 문자열 값인거죠??

Copy link
Member Author

@heenakwag heenakwag Dec 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵!

if (source.indexOf('if') === 0) {
otherIfCount += 1;
} else if (source === '/if') {
otherIfCount -= 1;
} else if (!otherIfCount && (source.indexOf('elseif') === 0 || source === 'else')) {
exps.push(source === 'else' ? ['true'] : source.split(' ').slice(1));
sourcesInsideIf.push(sourcesInsideBlock.slice(start, i));
start = i + 1;
sourcesInsideIf.push(sourcesInsideBlock.slice(start, index));
start = index + 1;
}
}
});

sourcesInsideIf.push(sourcesInsideBlock.slice(start));

return {
Expand Down Expand Up @@ -129,9 +132,9 @@ function handleEach(exps, sourcesInsideBlock, context) {
forEach(collection, function(item, key) {
additionalContext[additionalKey] = key;
additionalContext['@this'] = item;
extend(additionalContext, context);
extend(context, additionalContext);

result += compile(sourcesInsideBlock.slice(), additionalContext);
result += compile(sourcesInsideBlock.slice(), context);
});

return result;
Expand All @@ -153,7 +156,7 @@ function handleWith(exps, sourcesInsideBlock, context) {
var additionalContext = {};
additionalContext[alias] = result;

return compile(sourcesInsideBlock, extend(additionalContext, context)) || '';
return compile(sourcesInsideBlock, extend(context, additionalContext)) || '';
}

/**
Expand All @@ -171,25 +174,6 @@ function extractSourcesInsideBlock(sources, start, end) {
return sourcesInsideBlock;
}

/**
* Concatenate the strings between previous and next of the base string in place.
* @param {Array.<string>} sources - array of sources
* @param {number} index - index of base string
* @private
*/
function concatPrevAndNextString(source, index) {
var start = Math.max(index - 1, 0);
var end = Math.min(index + 1, source.length - 1);
var deletedCount = end - start + 1;
var result = source.splice(start, deletedCount).join('');

if (deletedCount < 3) {
source.splice(start, 0, '', result);
} else {
source.splice(start, 0, result);
}
}

/**
* Handle block helper function
* @param {string} helperKeyword - helper keyword (ex. if, each, with)
Expand All @@ -200,37 +184,34 @@ function concatPrevAndNextString(source, index) {
*/
function handleBlockHelper(helperKeyword, sourcesToEnd, context) {
var executeBlockHelper = BLOCK_HELPERS[helperKeyword];
var startBlockIndices = [];
var helperCount = 0;
var index = 0;
var helperCount = 1;
var startBlockIndex = 0;
var endBlockIndex;
var index = startBlockIndex + EXPRESSION_INTERVAL;
var expression = sourcesToEnd[index];
var startBlockIndex;

do {
while (helperCount && isString(expression)) {
if (expression.indexOf(helperKeyword) === 0) {
helperCount += 1;
startBlockIndices.push(index);
} else if (expression.indexOf('/' + helperKeyword) === 0) {
helperCount -= 1;
startBlockIndex = startBlockIndices.pop();

sourcesToEnd[startBlockIndex] = executeBlockHelper(
sourcesToEnd[startBlockIndex].split(' ').slice(1),
extractSourcesInsideBlock(sourcesToEnd, startBlockIndex, index),
context
);
concatPrevAndNextString(sourcesToEnd, startBlockIndex);
index = startBlockIndex - EXPRESSION_INTERVAL;
endBlockIndex = index;
}

index += EXPRESSION_INTERVAL;
expression = sourcesToEnd[index];
} while (helperCount && isString(expression));
}

if (helperCount) {
throw Error(helperKeyword + ' needs {{/' + helperKeyword + '}} expression.');
}

sourcesToEnd[startBlockIndex] = executeBlockHelper(
sourcesToEnd[startBlockIndex].split(' ').slice(1),
extractSourcesInsideBlock(sourcesToEnd, startBlockIndex, endBlockIndex),
context
);

return sourcesToEnd;
}

Expand Down
7 changes: 6 additions & 1 deletion test/template.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ describe('block helper', function() {
expect(function() {
return template('{{each arr}}', {});
}).toThrowError('each needs {{/each}} expression.');

expect(function() {
return template('{{with 1 as one}}', {});
}).toThrowError('with needs {{/with}} expression.');
Expand Down Expand Up @@ -238,6 +237,12 @@ describe('{{each ...}} @this @index @key {{/each}}', function() {
second: [4, 5, 6]
};
expect(template(source, context)).toBe('456456456');

source = '{{each doubleArr}}{{each @this}}{{@this}}{{/each}}{{/each}}';
context = {
doubleArr: [[1, 2, 3], [4, 5, 6]]
};
expect(template(source, context)).toBe('123456');
});
});

Expand Down