engineOptions: exportName and requires tests

lib/bundle.js

@@ -11,13 +11,22 @@ var compileCommonJS = require('./compile-commonjs'),
  * @param {Object}   options                        Options.
  * @param {String}   opts.dirname                   Path to a directory with compiled file.
  * @param {String}   [options.exportName=BEMHTML]   Name for exports.
- * @param {Object}   [options.requires={}]          Names for dependencies.
+ * @param {Object}   [options.requires={}]          Deprecated. Fallback for backward
+ *                                                  compatibility, use options.engineOptions.requires
  * @returns {String}
  */
 exports.compile = function (code, options) {
     options || (options = {});
 
-    var requires = options.requires || {};
+    var requires;
+
+    if (options.requires) {
+        requires = options.requires;
+    } else if (options.engineOptions && options.engineOptions.requires) {
+        requires = options.engineOptions.requires;
+    } else {
+        requires = {};
+    }
 
     return compileCommonJS(requires, options.dirname)
         .then(function (commonJSModules) {

techs/bem-xjst.js

@@ -125,11 +125,14 @@ module.exports = buildFlow.create()
             engineOptions.exportName || (engineOptions.exportName = this._exportName);
 
             if (this._requires) {
-                this.node.getLogger().logOptionIsDeprecated(this.node.unmaskTargetName(this._target),
-                    'enb-bemxjst', this.getName(), 'requires', 'engineOptions.requires',
-                    ' It will be removed in v9.0.0.');
-
-                engineOptions.requires || (engineOptions.requires = this._requires);
+                this.node.getLogger().logOptionIsDeprecated(
+                    this.node.unmaskTargetName(this._target),
+                    'enb-bemxjst',
+                    this.getName(),
+                    'requires',
+                    'engineOptions.requires',
+                    ' It will be removed in v9.0.0.'
+                );
             }
 
             engineOptions.sourceMap = { from: this._target };

test/techs/bemhtml.test.js

@@ -1,12 +1,17 @@
 var fs = require('fs'),
     path = require('path'),
     mock = require('mock-fs'),
+    assert = require('assert'),
     MockNode = require('mock-enb/lib/mock-node'),
     Tech = require('../../techs/bemhtml'),
     loadDirSync = require('mock-enb/utils/dir-utils').loadDirSync,
     FileList = require('enb/lib/file-list'),
     bundlePath = path.resolve('lib/bundle.js'),
-    sinon = require('sinon');
+    sinon = require('sinon'),
+    utils = require('../utils'),
+    run = function (code) {
+        return utils.run(code, { runtime: 'node' });
+    };
 
 describe('bemhtml', function () {
     before(function () {
@@ -235,6 +240,32 @@ describe('bemhtml', function () {
                     res.BEMHTML.apply(bemjson).must.be(html);
                 });
         });
+
+        it('must support engineOptions.exportName fallback for backward compatibility', function () {
+            var blocks = { 'b.bemhtml.js': 'block("b").tag()("span")' };
+
+            return build(blocks, { engineOptions: { exportName: 'htmlMaker' } })
+                .spread(function (res) {
+                    assert(res.htmlMaker, 'No BEMHTML exported as htmlMaker');
+
+                    res
+                        .htmlMaker
+                        .apply({ block: 'b' })
+                        .must.be('<span class="b"></span>');
+                });
+        });
+
+        it('must support engineOptions.requires', function () {
+            var code = 'global.text = "Hello world!"',
+                options = {
+                    engineOptions: { requires: { text: { globals: 'text' } } }
+                };
+
+            return utils.compileBundle(code, options)
+                .then(run)
+                .then(utils.getLibs)
+                .should.become({ text: 'Hello world!' });
+        });
     });
 
     describe('compat', function () {

test/techs/bemtree.test.js

@@ -5,7 +5,12 @@ var fs = require('fs'),
     Tech = require('../../techs/bemtree'),
     loadDirSync = require('mock-enb/utils/dir-utils').loadDirSync,
     FileList = require('enb/lib/file-list'),
-    bundlePath = path.resolve('lib/bundle.js');
+    bundlePath = path.resolve('lib/bundle.js'),
+    assert = require('assert'),
+    utils = require('../utils'),
+    run = function (code) {
+        return utils.run(code, { runtime: 'node' });
+    };
 
 describe('bemtree', function () {
     before(function () {
@@ -138,6 +143,33 @@ describe('bemtree', function () {
                     res.BEMTREE.apply(data).must.eql(bemjson);
                 });
         });
+
+        it('must support engineOptions.exportName fallback for backward compatibility', function () {
+            var blocks = { 'b.bemtree.js': 'block("b").content()("test")' };
+
+            return build(blocks, { engineOptions: { exportName: 'bemtreeMaker' } })
+                .spread(function (res) {
+                    assert(res.bemtreeMaker, 'No BEMTREE exported as bemtreeMaker');
+
+                    res
+                        .bemtreeMaker
+                        .apply({ block: 'b' })
+                        .content
+                        .must.be('test');
+                });
+        });
+
+        it('must support engineOptions.requires', function () {
+            var code = 'global.text = "Hello world!"',
+                options = {
+                    engineOptions: { requires: { text: { globals: 'text' } } }
+                };
+
+            return utils.compileBundle(code, options)
+                .then(run)
+                .then(utils.getLibs)
+                .should.become({ text: 'Hello world!' });
+        });
     });
 
     describe('compat', function () {

test/unit/bundle--browser+ym.test.js

@@ -12,7 +12,7 @@ describe('bundle --browser+ym', function () {
         it('must get dependency from global scope', function () {
             var code = 'window.text = "Hello world!"',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             globals: 'text'
                         }
@@ -28,7 +28,7 @@ describe('bundle --browser+ym', function () {
         it('must get dependency from global scope using dot-delimited key', function () {
             var code = 'window.text = { text: "Hello world!" };',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             globals: 'text.text'
                         }
@@ -44,7 +44,7 @@ describe('bundle --browser+ym', function () {
         it('must require dependency from ym', function () {
             var code = 'modules.define("text", [], function (provide) { provide("Hello world!"); })',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             ym: 'text'
                         }
@@ -77,7 +77,7 @@ describe('bundle --browser+ym', function () {
 
         it('must require module from CommonJS', function () {
             var options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         fake: {
                             commonJS: 'fake'
                         }
@@ -100,7 +100,7 @@ describe('bundle --browser+ym', function () {
                     '});'
                 ].join(EOL),
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         fake: {
                             ym: 'text',
                             commonJS: 'fake'

test/unit/bundle--browser.test.js

@@ -19,7 +19,7 @@ describe('bundle --browser', function () {
         it('must get dependency from global scope', function () {
             var code = 'window.text = "Hello world!"',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             globals: 'text'
                         }
@@ -35,7 +35,7 @@ describe('bundle --browser', function () {
         it('must get dependency from global scope using dot-delimited key', function () {
             var code = 'window.text = { text: "Hello world!" };',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             globals: 'text.text'
                         }
@@ -68,7 +68,7 @@ describe('bundle --browser', function () {
 
         it('must require module from CommonJS', function () {
             var options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         fake: {
                             commonJS: 'fake'
                         }
@@ -87,7 +87,7 @@ describe('bundle --browser', function () {
         it('must get dependency from global scope if it also is presented in CommonJS', function () {
             var code = 'window.fake = { getText: function () { return "globals"; } };',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         fake: {
                             globals: 'fake',
                             commonJS: 'fake'

test/unit/bundle--node.test.js

@@ -19,7 +19,7 @@ describe('bundle --node', function () {
         it('must get dependency from global scope', function () {
             var code = 'global.text = "Hello world!"',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             globals: 'text'
                         }
@@ -35,7 +35,7 @@ describe('bundle --node', function () {
         it('must get dependency from global scope using dot-delimited key', function () {
             var code = 'global.text = { text: "Hello world!" };',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         text: {
                             globals: 'text.text'
                         }
@@ -68,7 +68,7 @@ describe('bundle --node', function () {
 
         it('must require module from CommonJS', function () {
             var options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         fake: {
                             commonJS: 'fake'
                         }
@@ -87,7 +87,7 @@ describe('bundle --node', function () {
         it('must get dependency from CommonJS if it also is presented in global scope', function () {
             var code = 'global.fake = { getText: function () { return "globals"; } };',
                 options = {
-                    requires: {
+                    requires: { // fallback for backward compatibility, use engineOptions.requires
                         fake: {
                             globals: 'fake',
                             commonJS: 'fake'