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

В версии 0.4.0 стал неверно собираться клиентский bh с использованием bh-client-module #24

Merged
merged 5 commits into from
Dec 22, 2014
Merged

В версии 0.4.0 стал неверно собираться клиентский bh с использованием bh-client-module #24

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2aebf8
Fix issue with modules and deps
Dec 15, 2014
6468006
Remove _defineModule
Dec 15, 2014
fbe285a
Update old code to fix the problem
Dec 15, 2014
9d015f8
Restore 0.2.3 code
Dec 20, 2014
d47b41d
Fix codestyle errors
Dec 20, 2014
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
82 changes: 52 additions & 30 deletions lib/bh-client-processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,14 @@ module.exports = {
*/
buildModule: function (targetPath, bhEngine, inputSources, dependencies, jsAttrName, jsAttrScheme,
useSourceMap, mimic) {
var file = new File(targetPath, useSourceMap),
libNames,
depNames,
libPrepares;
var file = new File(targetPath, useSourceMap);

if (dependencies) {
libNames = Object.keys(dependencies);
libPrepares = this._buildLibPrepares(dependencies);
depNames = libNames.map(function (libName) {
return dependencies[libName];
});
}

file.writeLine('(function () {');
this._concatFile(file, bhEngine, inputSources, libPrepares, jsAttrName, jsAttrScheme);
this._defineModule('bh', file, depNames, libNames);
this._defineModule('bh', file, dependencies, bhEngine, inputSources, jsAttrName, jsAttrScheme, true);

if (mimic) {
this._defineModule(mimic, file, depNames, libNames);
this._defineModule(mimic, file, { bh: 'bh' });
}

file.writeLine('})()');

return file;
},

Expand All @@ -62,10 +47,8 @@ module.exports = {
* @returns {string}
*/
build: function (targetPath, bhEngine, inputSources, dependencies, jsAttrName, jsAttrScheme, useSourceMap, mimic) {
var file = new File(targetPath, useSourceMap),
libPrepares = this._buildLibPrepares(dependencies);

return this._concatFile(file, bhEngine, inputSources, libPrepares, jsAttrName, jsAttrScheme, mimic);
var file = new File(targetPath, useSourceMap);
return this._concatFile(file, bhEngine, inputSources, dependencies, jsAttrName, jsAttrScheme, mimic);
},

_buildLibPrepares: function (dependencies) {
Expand All @@ -76,7 +59,20 @@ module.exports = {
});
},

_concatFile: function (file, bhEngine, inputSources, libPrepares, jsAttrName, jsAttrScheme, mimic) {
/**
* Builds standalone client code
* @param {Object} file enb-source-map/lib/file instance
* @param {Object} bhEngine
* @param {Array} inputSources
* @param {Object} dependencies example: {libName: "dependencyName"}
* @param {String} jsAttrName
* @param {String} jsAttrScheme
* @param {String} [mimic]
* @returns {Object} enb-source-map/lib/file instance
*/
_concatFile: function (file, bhEngine, inputSources, dependencies, jsAttrName, jsAttrScheme, mimic) {
var libPrepares = this._buildLibPrepares(dependencies);

file.writeFileContent(bhEngine.filename, bhEngine.content);
file.writeLine('var bh = new BH();');
file.writeLine('bh.setOptions({');
Expand All @@ -90,11 +86,9 @@ module.exports = {
file.writeLine('}');
}

if (libPrepares) {
libPrepares.forEach(function (libPrepare) {
file.writeLine(libPrepare);
});
}
libPrepares.forEach(function (libPrepare) {
file.writeLine(libPrepare);
});

inputSources.forEach(function (inputSource) {
file.writeLine('// begin: ' + inputSource.relPath);
Expand All @@ -105,12 +99,40 @@ module.exports = {
return file;
},

_defineModule: function (name, file, depNames, libNames) {
/**
* Builds ym client code
* @param {String} name module name
* @param {Object} file enb-source-map/lib/file instance
* @param {Object} dependencies example: {libName: "dependencyName"}
* @param {Object} bhEngine
* @param {Array} inputSources
* @param {String} jsAttrName
* @param {String} jsAttrScheme
* @param {Boolean} shouldConcatFile if set concat standalone module contents
* @returns {Object} enb-source-map/lib/file instance
*/
_defineModule: function (name, file, dependencies, bhEngine, inputSources, jsAttrName,
jsAttrScheme, shouldConcatFile) {
var libNames,
depNames;

if (dependencies) {
libNames = Object.keys(dependencies);
depNames = libNames.map(function (libName) {
return dependencies[libName];
});
}

file.writeLine('modules.define(\'' + name + '\'' +
(depNames ? ', ' + JSON.stringify(depNames) : '') +
', function(provide' + (libNames && libNames.length ? ', ' + libNames.join(', ') : '') + ') {'
);
file.writeLine('provide(bh);');

if (shouldConcatFile) {
this._concatFile(file, bhEngine, inputSources, dependencies, jsAttrName, jsAttrScheme);
}

file.writeLine(' provide(bh);');
file.writeLine('});');
}
};