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

Renamed sorceDepsFile options to bemdeclFile of deps techs #50

Merged
merged 1 commit into from
Sep 11, 2014
Merged

Renamed sorceDepsFile options to bemdeclFile of deps techs #50

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
* Опции `sourceTarget` и `destTarget` из `bemdecl-from-bemjson` технологии объявлены **deprecated**, вместо них следует использовать `source` и `target` соответственно.
* Опции `bemdeclSources` и `bemdeclTarget` из `merge-bemdecl` технологии объявлены **deprecated**, вместо них следует использовать `sources` и `target` соответственно.
* Опции `sourceNodePath`, `sourceTarget` и `bemdeclTarget` из `provide-bemdecl` технологии объявлены **deprecated**, вместо них следует использовать `node`, `source` и `target` соответственно.
* Опции `bemdeclTarget` и `depsTarget` из `deps` технологии объявлены **deprecated**, вместо них следует использовать `sourceDepsFile` и `target` соответственно.
* Опции `bemdeclTarget` и `depsTarget` из `deps` технологии объявлены **deprecated**, вместо них следует использовать `bemdeclFile` и `target` соответственно.
* Опции `depsSources` и `depsTarget` из `merge-deps` технологии объявлены **deprecated**, вместо них следует использовать `sources` и `target` соответственно.
* Опции `bemdeclTarget` и `depsTarget` из `deps-old` технологии объявлены **deprecated**, вместо них следует использовать `sourceDepsFile` и `target` соответственно.
* Опции `bemdeclTarget` и `depsTarget` из `deps-old` технологии объявлены **deprecated**, вместо них следует использовать `bemdeclFile` и `target` соответственно.
* Опции `sourceNodePath`, `sourceTarget` и `depsTarget` из `provide-deps` технологии объявлены **deprecated**, вместо них следует использовать `node`, `source` и `target` соответственно.
* Опции `subtractFromTarget`, `subtractWhatTarget` и `depsTarget` из `subtract-deps` технологии объявлены **deprecated**, вместо них следует использовать `from`, `what` и `target` соответственно.
* Опция `depsTarget` из `files` технологии объявлена **deprecated**, вместо неё следует использовать `depsFile`.
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ nodeConfig.addTech([require('enb-bem/techs/merge-bemdecl'), {

**Опции**

* *String* **sourceDepsFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* *String* **bemdeclFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* *String* **levelsTarget** — Исходный levels. По умолчанию — `?.levels`.
* *String* **target** — Результирующий deps. По умолчанию — `?.deps.js`.

Expand All @@ -168,7 +168,7 @@ nodeConfig.addTech([require('enb-bem/techs/deps'), {

**Опции**

* *String* **sourceDepsFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* *String* **bemdeclFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* *String* **levelsTarget** — Исходный levels. По умолчанию — `?.levels`.
* *String* **target** — Результирующий deps. По умолчанию — `?.deps.js`.

Expand Down
22 changes: 11 additions & 11 deletions techs/deps-old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* **Опции**
*
* * *String* **sourceDepsFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* * *String* **bemdeclFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* * *String* **levelsTarget** — Исходный levels. По умолчанию — `?.levels`.
* * *String* **target** — Результирующий deps. По умолчанию — `?.deps.js`.
*
Expand Down Expand Up @@ -51,14 +51,14 @@ module.exports = inherit(require('enb/lib/tech/base-tech'), {
}
this._target = this.node.unmaskTargetName(this._target);

this._sourceDepsFile = this.getOption('bemdeclTarget');
if (this._sourceDepsFile) {
this._declFile = this.getOption('bemdeclTarget');
if (this._declFile) {
logger.logOptionIsDeprecated(this._target, 'enb-bem', this.getName(),
'bemdeclTarget', 'sourceDepsFile');
'bemdeclTarget', 'bemdeclFile');
} else {
this._sourceDepsFile = this.getOption('sourceDepsFile', this.node.getTargetName('bemdecl.js'));
this._declFile = this.getOption('bemdeclFile', this.node.getTargetName('bemdecl.js'));
}
this._sourceDepsFile = this.node.unmaskTargetName(this._sourceDepsFile);
this._declFile = this.node.unmaskTargetName(this._declFile);

this._levelsTarget = this.node.unmaskTargetName(
this.getOption('levelsTarget', this.node.getTargetName('levels')));
Expand All @@ -73,17 +73,17 @@ module.exports = inherit(require('enb/lib/tech/base-tech'), {
target = this._target,
targetFilename = node.resolvePath(target),
cache = node.getNodeCache(target),
sourceDepsFilename = this.node.resolvePath(this._sourceDepsFile);
declFilename = this.node.resolvePath(this._declFile);

return this.node.requireSources([this._levelsTarget, this._sourceDepsFile])
return this.node.requireSources([this._levelsTarget, this._declFile])
.spread(function (levels, sourceDeps) {
var depFiles = levels.getFilesBySuffix('deps.js').concat(levels.getFilesBySuffix('deps.yaml'));

if (cache.needRebuildFile('deps-file', targetFilename) ||
cache.needRebuildFile('source-deps-file', sourceDepsFilename) ||
cache.needRebuildFile('decl-file', declFilename) ||
cache.needRebuildFileList('deps-file-list', depFiles)
) {
return requireSourceDeps(sourceDeps, sourceDepsFilename)
return requireSourceDeps(sourceDeps, declFilename)
.then(function (sourceDeps) {
return (new OldDeps(sourceDeps).expandByFS({ levels: levels }))
.then(function (resolvedDeps) {
Expand All @@ -93,7 +93,7 @@ module.exports = inherit(require('enb/lib/tech/base-tech'), {
return vfs.write(targetFilename, str, 'utf8')
.then(function () {
cache.cacheFileInfo('deps-file', targetFilename);
cache.cacheFileInfo('source-deps-file', sourceDepsFilename);
cache.cacheFileInfo('decl-file', declFilename);
cache.cacheFileList('deps-file-list', depFiles);
node.resolveTarget(target, { deps: resultDeps });
});
Expand Down
22 changes: 11 additions & 11 deletions techs/deps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* **Опции**
*
* * *String* **sourceDepsFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* * *String* **bemdeclFile** — Файл с исходными зависимостями. По умолчанию — `?.bemdecl.js`.
* * *String* **levelsTarget** — Исходный levels. По умолчанию — `?.levels`.
* * *String* **target** — Результирующий deps. По умолчанию — `?.deps.js`.
*
Expand Down Expand Up @@ -51,13 +51,13 @@ module.exports = inherit(require('enb/lib/tech/base-tech'), {
}
this._target = this.node.unmaskTargetName(this._target);

this._sourceDepsFile = this.getOption('bemdeclTarget');
if (this._sourceDepsFile) {
logger.logOptionIsDeprecated(this._target, 'enb-bem', this.getName(), 'bemdeclTarget', 'sourceDepsFile');
this._declFile = this.getOption('bemdeclTarget');
if (this._declFile) {
logger.logOptionIsDeprecated(this._target, 'enb-bem', this.getName(), 'bemdeclTarget', 'bemdeclFile');
} else {
this._sourceDepsFile = this.getOption('sourceDepsFile', this.node.getTargetName('bemdecl.js'));
this._declFile = this.getOption('bemdeclFile', this.node.getTargetName('bemdecl.js'));
}
this._sourceDepsFile = this.node.unmaskTargetName(this._sourceDepsFile);
this._declFile = this.node.unmaskTargetName(this._declFile);

this._levelsTarget = this.node.unmaskTargetName(
this.getOption('levelsTarget', this.node.getTargetName('levels')));
Expand All @@ -72,17 +72,17 @@ module.exports = inherit(require('enb/lib/tech/base-tech'), {
target = this._target,
targetFilename = node.resolvePath(target),
cache = node.getNodeCache(target),
sourceDepsFilename = this.node.resolvePath(this._sourceDepsFile);
declFilename = this.node.resolvePath(this._declFile);

return this.node.requireSources([this._levelsTarget, this._sourceDepsFile])
return this.node.requireSources([this._levelsTarget, this._declFile])
.spread(function (levels, sourceDeps) {
var depFiles = levels.getFilesBySuffix('deps.js').concat(levels.getFilesBySuffix('deps.yaml'));

if (cache.needRebuildFile('deps-file', targetFilename) ||
cache.needRebuildFile('source-deps-file', sourceDepsFilename) ||
cache.needRebuildFile('source-deps-file', declFilename) ||
cache.needRebuildFileList('deps-file-list', depFiles)
) {
return requireSourceDeps(sourceDeps, sourceDepsFilename)
return requireSourceDeps(sourceDeps, declFilename)
.then(function (sourceDeps) {
var resolver = new DepsResolver(levels),
decls = resolver.normalizeDeps(sourceDeps);
Expand All @@ -95,7 +95,7 @@ module.exports = inherit(require('enb/lib/tech/base-tech'), {
return vfs.write(targetFilename, str, 'utf8')
.then(function () {
cache.cacheFileInfo('deps-file', targetFilename);
cache.cacheFileInfo('source-deps-file', sourceDepsFilename);
cache.cacheFileInfo('source-deps-file', declFilename);
cache.cacheFileList('deps-file-list', depFiles);
node.resolveTarget(target, { deps: resolvedDeps });
});
Expand Down
32 changes: 16 additions & 16 deletions test/techs/bemdecl-from-deps-by-tech.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'block.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'block.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -191,7 +191,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'block-bool-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'block-bool-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -221,7 +221,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'block-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'block-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -251,7 +251,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elem.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elem.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -281,7 +281,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elems.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elems.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -313,7 +313,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elem-bool-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elem-bool-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -346,7 +346,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elem-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elem-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -379,7 +379,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'loop.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'loop.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -410,7 +410,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'block.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'block.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -440,7 +440,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'block-bool-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'block-bool-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -470,7 +470,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'block-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'block-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -500,7 +500,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elem.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elem.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -530,7 +530,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elems.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elems.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -562,7 +562,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elem-bool-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elem-bool-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -595,7 +595,7 @@ describe('techs', function () {
.then(function (levels) {
bundle.provideTechData('?.levels', levels);

return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'elem-mod.bemdecl.js' });
return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'elem-mod.bemdecl.js' });
})
.spread(function (res) {
bundle.provideTechData('?.deps.js', res);
Expand Down Expand Up @@ -626,7 +626,7 @@ describe('techs', function () {
// it('must throw if loop mustDeps', function (done) {
// bundle.runTech(levelsTech, { levels: mustLevels })
// .then(function () {
// return bundle.runTechAndRequire(depsTech, { sourceDepsFile: 'loop.bemdecl.js' });
// return bundle.runTechAndRequire(depsTech, { bemdeclFile: 'loop.bemdecl.js' });
// })
// .then(function () {
// return bundle.runTechAndGetResults(filesTech);
Expand Down