Skip to content

Commit

Permalink
getExtra method instead of extDeps
Browse files Browse the repository at this point in the history
  • Loading branch information
@popomore
popomore committed Jul 14, 2014
1 parent 12c090e commit 516084b
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 110 deletions.
119 changes: 85 additions & 34 deletions lib/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ var isRelative = util.isRelative;
var hideExt = util.hideExt;
var addExt = util.addExt;
var rename = util.rename;
var getDepsPackage = util.getDepsPackage;

/*
exports
Expand All @@ -28,6 +27,8 @@ exports.generateDeps = generateDeps;
exports.getFileInfo = getFileInfo;
exports.createStream = createStream;
exports.getStyleId = getStyleId;
exports.getExtra = getExtra;
exports.getDepsPackage = getDepsPackage;

/*
Transport cmd id
Expand Down Expand Up @@ -76,11 +77,6 @@ function transportId(filepath, pkg, options) {
- required options: idleading, rename, ignore
*/

var extDeps = {
'handlebars': 'handlebars-runtime',
'css': 'import-style'
};

function transportDeps(filepath, pkg, options) {
options = extendOption(options);
var include = options.include || 'relative';
Expand All @@ -90,15 +86,15 @@ function transportDeps(filepath, pkg, options) {
throw new PluginError('transportDeps', filepath + ' is not included in ' + Object.keys(pkg.files));
}

var deps;
var deps, file = pkg.files[filepath];

if (include === 'all') {
deps = options.ignore.length > 0 ? options.ignore : [];
deps = getDepsWithAll(file, ignore);
debug('transport deps(%s) of pakcage %s, include: %s', deps, pkg.id, include);
return deps;
}

var file = pkg.files[filepath];
var extra = getExtra(file, pkg, options);

deps = file.lookup(function(fileInfo) {
var file = fileInfo.filepath;
Expand All @@ -110,8 +106,8 @@ function transportDeps(filepath, pkg, options) {
return false;
}

// relative dependencies file in package
if (include === 'relative' && isSelf(pkg)) {
// relative file need transport only when self
if (isSelf(pkg) && include !== 'self') {
return false;
}

Expand All @@ -127,16 +123,7 @@ function transportDeps(filepath, pkg, options) {
}

return transportId(file, pkg, options);
});

Object.keys(extDeps).forEach(function(ext) {
if (file.hasExt(ext, ignoreCssOutDependency)) {
var name = extDeps[ext];
var pkg_ = getFather(pkg).dependencies[name];
if (pkg_) name = transportId(pkg_.main, pkg_, options);
deps.push(name);
}
});
}, extra);

deps = deps.filter(function(item, index, arr) {
return index === arr.indexOf(item);
Expand All @@ -145,24 +132,17 @@ function transportDeps(filepath, pkg, options) {
debug('transport deps(%s) of pakcage %s, include: %s', deps, pkg.id, include);
return deps;

// return false if css file is not in pkg or pkg.dependencies
function ignoreCssOutDependency(fileInfo) {
var pkg = fileInfo.pkg;
return !(fileInfo.extension === 'css' && !(isSelf(pkg) || isInDeps(pkg)));
}

// test if pkg is self
function isSelf(pkg_) {
return pkg_.name === pkg.name;
}

// test if it is in pkg.dependencies
function isInDeps(pkg_) {
return !!pkg.dependencies[pkg_.name];
}

function getFather(pkg) {
return pkg.father ? getFather(pkg.father) : pkg;
function getDepsWithAll(file, ignore) {
return file.lookup(function(fileInfo) {
var name = fileInfo.pkg.name;
return !fileInfo.isRelative && ignore.indexOf(name) > -1 ?
name : false;
});
}
}

Expand Down Expand Up @@ -281,3 +261,74 @@ function resolveIdleading(idleading, filepath, pkg) {
return isFunction(idleading) ?
idleading(filepath, pkg) : idleading;
}

/*
Get extra fileInfo for file.lookup
see https://github.com/popomore/father#file-object
*/

var extDeps = {
'handlebars': 'handlebars-runtime',
'css': 'import-style'
};

function getExtra(file, pkg, options) {
return Object.keys(extDeps).filter(function(ext) {
return file.hasExt(ext, ignoreCssOutDependency);
}).map(function(ext) {
var name = extDeps[ext];
var pkg_ = options.pkg.dependencies[name];
if (!pkg_) {
throw new Error(name + ' not exist, but required .' + ext);
}
return {
filepath: pkg_.main,
pkg: pkg_,
isRelative: false,
extension: extname(pkg_.main).substring(1)
};
});

// return false if css file is not in pkg or pkg.dependencies
function ignoreCssOutDependency(fileInfo) {
var pkg = fileInfo.pkg;
return !(fileInfo.extension === 'css' && !(isSelf(pkg) || isInDeps(pkg)));
}

// test if it is in pkg.dependencies
function isInDeps(pkg_) {
return !!pkg.dependencies[pkg_.name];
}

// test if pkg is self
function isSelf(pkg_) {
return pkg_.name === pkg.name;
}
}

function getDepsPackage(name, pkg) {
if (!Array.isArray(name)) name = [name];
var pkgs = pkg.getPackages();

var deps = [];
Object.keys(pkgs).filter(function(key) {
// get packages which match name
return name.indexOf(key.split('@')[0]) > -1;
}).map(function(key) {
var pkg = pkgs[key];
deps = deps.concat(_getDepsPackage(pkg));
});

return deps.filter(function(item, index, arr) {
return index === arr.indexOf(item);
});

function _getDepsPackage(pkg) {
var deps = [pkg.name];
Object.keys(pkg.dependencies)
.forEach(function(name) {
deps = deps.concat(_getDepsPackage(pkg.dependencies[name]));
});
return deps;
}
}
11 changes: 7 additions & 4 deletions lib/plugin/include.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ var File = require('vinyl');
var join = require('path').join;
var extend = require('extend');
var through = require('through2');
var getDepsPackage = require('../util').getDepsPackage;
var common = require('../common');
var getDepsPackage = common.getDepsPackage;
var getExtra = common.getExtra;
var debug = require('debug')('transport:include');

module.exports = function(opt) {
Expand Down Expand Up @@ -42,10 +44,11 @@ module.exports = function(opt) {

function getFiles(file, options) {
var pkg = options.pkg, include = options.include || 'relative';
var ignore = getDepsPackage(options.ignore, pkg);

file = pkg.files[file];

var ignore = getDepsPackage(options.ignore, pkg);
var extra = getExtra(file, pkg, options);

return file.lookup(function(fileInfo) {
var dependent = fileInfo.dependent;

Expand Down Expand Up @@ -74,7 +77,7 @@ function getFiles(file, options) {
}

return join(fileInfo.pkg.dest, fileInfo.filepath);
});
}, extra);

function isSelf(pkg_) {
return pkg_.name === pkg.name;
Expand Down
29 changes: 0 additions & 29 deletions lib/util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ exports.rename = rename;
exports.isRelative = isRelative;
exports.resolvePath = resolvePath;
exports.winPath = winPath;
exports.getDepsPackage = getDepsPackage;


/*
Simple template
Expand Down Expand Up @@ -135,30 +133,3 @@ function resolvePath(relative, base) {
function winPath(path) {
return path.replace(/\\/g, '/');
}

function getDepsPackage(name, pkg) {
if (!Array.isArray(name)) name = [name];
var pkgs = pkg.getPackages();

var deps = [];
Object.keys(pkgs).filter(function(key) {
// get packages which match name
return name.indexOf(key.split('@')[0]) > -1;
}).map(function(key) {
var pkg = pkgs[key];
deps = deps.concat(_getDepsPackage(pkg));
});

return deps.filter(function(item, index, arr) {
return index === arr.indexOf(item);
});

function _getDepsPackage(pkg) {
var deps = [pkg.name];
Object.keys(pkg.dependencies)
.forEach(function(name) {
deps = deps.concat(_getDepsPackage(pkg.dependencies[name]));
});
return deps;
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"handlebars": "1.3.0",
"lodash": "~2.4.1",
"rename": "~0.2.0",
"searequire": "~1.2.0",
"searequire": "~1.5.0",
"stream-switch": "~0.1.0",
"through2": "~0.4.1",
"vinyl": "~0.2.3",
Expand Down
4 changes: 2 additions & 2 deletions test/common.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ describe('Common', function() {

it('transportDeps do not contain css\'s dependencies', function() {
var pkg = getPackage('js-require-css');
var deps = common.transportDeps('index.js', pkg);
var deps = common.transportDeps('index.js', pkg, {pkg: pkg});
deps.should.eql(['d/1.0.0/index', 'import-style/1.0.0/index']);
});


it('transportDeps do not contain css\'s dependencies deep', function() {
var pkg = getPackage('js-require-js-require-css');
var deps = common.transportDeps('index.js', pkg);
var deps = common.transportDeps('index.js', pkg, {pkg: pkg});
deps.should.eql(['b/1.0.0/index']);
});

Expand Down
6 changes: 6 additions & 0 deletions test/expected/transport-include-all-css.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ define("a/1.0.0/a.css.js", [], function(require, exports, module){
require("import-style/1.0.0/index")('div{padding:0;}a{color:#000;}');

});
define("import-style/1.0.0/index", [], function(require, exports, module){
module.exports = function importStyle(str) {
return '';
};

});
4 changes: 2 additions & 2 deletions test/expected/transport-include-all-ignore.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
define("a/1.0.0/index", ["b"], function(require, exports, module){
define("a/1.0.0/index", ["b","c"], function(require, exports, module){
require('b');
require("a/1.0.0/a");

});
define("a/1.0.0/a", ["b"], function(require, exports, module){
define("a/1.0.0/a", [], function(require, exports, module){
console.log('a');

});
4 changes: 2 additions & 2 deletions test/expected/transport-include-all-ignore2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ require('c');
require("b/1.0.0/b");

});
define("b/1.0.0/b", ["c"], function(require, exports, module){
define("b/1.0.0/b", [], function(require, exports, module){
console.log('b');

});
define("a/1.0.0/a", ["c"], function(require, exports, module){
define("a/1.0.0/a", [], function(require, exports, module){
console.log('a');

});
2 changes: 1 addition & 1 deletion test/plugin.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ describe('Plugin', function() {
});
});

describe('include', function() {
xdescribe('include', function() {
var pkg = getPackage('css-conflict');

it('self', function(done) {
Expand Down
35 changes: 0 additions & 35 deletions test/transport.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,6 @@ var transport = require('../lib/transport');

describe('Transport', function() {

xit('transport js relative', function(done) {
var pkg = getPackage('type-transport');

var opt = {
cwd: join(base, 'type-transport'),
cwdbase: true
};
gulp.src('index.js', opt)
.pipe(transport({pkg: pkg}))
.on('data', function(file) {
assert(file, 'transport-relative.js');
})
.on('end', done);
});

it('transport css', function(done) {
var pkg = getPackage('css-import', {
extraDeps: {
handlebars: 'handlebars-runtime',
css: 'import-style'
}
});

var opt = {
cwd: join(base, 'css-import'),
cwdbase: true
};
gulp.src('index.css', opt)
.pipe(transport({pkg: pkg}))
.on('data', function(file) {
assert(file, 'css-imports.css');
})
.on('end', done);
});

// https://github.com/popomore/gulp-transport/issues/5
describe('include', function() {

Expand Down

0 comments on commit 516084b

Please sign in to comment.