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.

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

[WIP] Speed up handlebars task by lazy evaluating some variables #76

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 46 additions & 28 deletions helpers/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ module.exports = {
getFileContent: function(filePath) {
var requirePath = getRequirePath(filePath);

return getFile(requirePath);
return function() {
return getFile(requirePath);
};
},

getTestScriptPath: function(filePath) {
Expand All @@ -84,32 +86,40 @@ module.exports = {
},

getFormattedHtml: function(content) {
var html = prettify.html(content, {
'indent_char': '\t',
'indent_size': 1
});
return function() {
content = typeof content === 'function' ? content() : content;

return Highlight.highlight('html', html).value;
var html = prettify.html(content, {
'indent_char': '\t',
'indent_size': 1
});

return Highlight.highlight('html', html).value;
};
},

getFormattedHandlebars: function(content) {
var usedPartials = this._getUsedPartialsInTemplate(content),
partialContent;
return function() {
content = typeof content === 'function' ? content() : content;

// Look up content of all partials used in the main template
usedPartials = usedPartials.map((partial) => {
partialContent = getFile(path.resolve('./source/', partial + '.hbs'));
var usedPartials = this._getUsedPartialsInTemplate(content),
partialContent;

// Look up content of all partials used in the main template
usedPartials = usedPartials.map((partial) => {
partialContent = getFile(path.resolve('./source/', partial + '.hbs'));

return {
name: partial,
content: this._getHighlightedTemplate(partialContent)
};
});

return {
name: partial,
content: this._getHighlightedTemplate(partialContent)
content: this._getHighlightedTemplate(content),
partials: usedPartials
};
});

return {
content: this._getHighlightedTemplate(content),
partials: usedPartials
};
}.bind(this);
},

/**
Expand Down Expand Up @@ -155,25 +165,33 @@ module.exports = {
},

getFormattedJson: function(content) {
var formatted = JSON.stringify(content, null, '\t');
return function() {
var formatted = JSON.stringify(content, null, '\t');

return Highlight.highlight('json', formatted).value;
return Highlight.highlight('json', formatted).value;
};
},

getDataMock: function(filePath) {
var requirePath = getRequirePath(filePath),
content = requireNew(requirePath);
var requirePath = getRequirePath(filePath);

return function() {
var content = requireNew(requirePath);

content = JSON.stringify(content, null, '\t');
content = JSON.stringify(content, null, '\t');

return Highlight.highlight('json', content).value;
return Highlight.highlight('json', content).value;
};
},

getDocumentation: function(filePath) {
var requirePath = getRequirePath(filePath),
content = getFile(requirePath);
var requirePath = getRequirePath(filePath);

return marked(content);
return function() {
var content = getFile(requirePath);

return marked(content);
};
},

getColors: function(filePath) {
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/imageversions/imageversions.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/media/media.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/skiplinks/skiplinks.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant,
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/slideshow/slideshow.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant,
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/svgsprite/svgsprite.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/teaser/teaser.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant,
Expand Down
4 changes: 3 additions & 1 deletion source/demo/modules/teasers/teasers.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant,
Expand Down
4 changes: 3 additions & 1 deletion source/modules/.scaffold/scaffold.data.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ var _ = require('lodash'),
}
}, function(variant) {
var variantProps = _.merge({}, data, variant).props,
compiledVariant = handlebarsHelper.Handlebars.compile(template)(variantProps),
compiledVariant = function() {
return handlebarsHelper.Handlebars.compile(template())(variantProps);
},
variantData = _.merge({}, data, variant, {
meta: {
demo: compiledVariant,
Expand Down