Comparing version 1.1.0 to 1.2.1
@@ -5,4 +5,5 @@ { | ||
"object-curly-spacing": 0, | ||
"no-unused-expressions": 0 | ||
"no-unused-expressions": 0, | ||
"quote-props": 0 | ||
} | ||
} |
@@ -34,2 +34,11 @@ 'use strict'; | ||
function extractComposerJson(json, fieldName) { | ||
return _get__('_').map(json[fieldName], function (version, name) { | ||
return { | ||
name: name, | ||
version: version | ||
}; | ||
}); | ||
} | ||
function extractNodeOrBower(json, fieldName) { | ||
@@ -44,2 +53,15 @@ return _get__('_').map(json[fieldName], function (version, name) { | ||
function detectComposer(root) { | ||
var configPath = _get__('path').join(root, 'composer.json'); | ||
var composerJson = JSON.parse(_get__('fs').readFileSync(configPath)); | ||
var projectName = composerJson.name; | ||
return { | ||
type: 'php (composer)', | ||
projectName: projectName, | ||
require: _get__('extractComposerJson')(composerJson, 'require'), | ||
'require-dev': _get__('extractComposerJson')(composerJson, 'require-dev') | ||
}; | ||
} | ||
function detectNode(root) { | ||
@@ -75,27 +97,38 @@ var configPath = _get__('path').join(root, 'package.json'); | ||
if (options.recursive) { | ||
var walker = _get__('walk').walk(options.path, { | ||
followLinks: false, | ||
filters: ['node_modules', 'bower_components', '.git'] | ||
}); | ||
var _ret = function () { | ||
var walker = _get__('walk').walk(options.path, { | ||
followLinks: false, | ||
filters: ['node_modules', 'bower_components', '.git'] | ||
}); | ||
walker.on('file', function (root, fstat, next) { | ||
if (fstat.name === 'package.json') { | ||
deps.push(_get__('detectNode')(root)); | ||
} | ||
walker.on('file', function (root, fstat, next) { | ||
if (fstat.name === 'package.json') { | ||
deps.push(_get__('detectNode')(root)); | ||
} | ||
if (fstat.name === 'bower.json') { | ||
deps.push(_get__('detectBower')(root)); | ||
} | ||
next(); | ||
}); | ||
if (fstat.name === 'bower.json') { | ||
deps.push(_get__('detectBower')(root)); | ||
} | ||
return new (_get__('Promise'))(function (resolve) { | ||
walker.on('end', function () { | ||
return resolve(deps); | ||
if (fstat.name === 'composer.json') { | ||
deps.push(_get__('detectComposer')(root)); | ||
} | ||
next(); | ||
}); | ||
}); | ||
return { | ||
v: new (_get__('Promise'))(function (resolve) { | ||
walker.on('end', function () { | ||
return resolve(deps); | ||
}); | ||
}) | ||
}; | ||
}(); | ||
if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v; | ||
} | ||
var packageJsonPath = options.path + '/package.json'; | ||
var bowerJsonPath = options.path + '/bower.json'; | ||
var packageJsonPath = _get__('path').join(options.path, 'package.json'); | ||
var bowerJsonPath = _get__('path').join(options.path, 'bower.json'); | ||
var composerJsonPath = _get__('path').join(options.path, 'composer.json'); | ||
@@ -110,2 +143,6 @@ if (_get__('fs').existsSync(packageJsonPath)) { | ||
if (_get__('fs').existsSync(composerJsonPath)) { | ||
deps.push(_get__('detectComposer')(options.path)); | ||
} | ||
return _get__('Promise').resolve(deps); | ||
@@ -150,2 +187,5 @@ } | ||
case 'extractComposerJson': | ||
return extractComposerJson; | ||
case 'extractNodeOrBower': | ||
@@ -163,2 +203,5 @@ return extractNodeOrBower; | ||
case 'detectComposer': | ||
return detectComposer; | ||
case 'Promise': | ||
@@ -165,0 +208,0 @@ return _bluebird2.default; |
@@ -47,2 +47,12 @@ 'use strict'; | ||
} | ||
}, | ||
composer: { | ||
require: { | ||
title: _get__('chalk').underline.cyan, | ||
item: _get__('chalk').cyan | ||
}, | ||
'require-dev': { | ||
title: _get__('chalk').underline.yellow, | ||
item: _get__('chalk').yellow | ||
} | ||
} | ||
@@ -60,5 +70,2 @@ }; | ||
var dependencies = deps.dependencies; | ||
var devDependencies = deps.devDependencies; | ||
if (deps.type === 'node') { | ||
@@ -68,7 +75,7 @@ if (deps.dependencies.length > 0) { | ||
console.log(titleColor(deps.projectName + ' - package.json (dependencies)')); | ||
console.log(_get__('table')(_get__('_').map(dependencies, function (dep) { | ||
console.log(_get__('table')(_get__('_').map(deps.dependencies, function (dep) { | ||
var itemColor = _get__('colorMap').node.dependencies.item; | ||
return [itemColor(dep.name), itemColor(dep.version)]; | ||
}))); | ||
console.log(_get__('os').EOL); | ||
process.stdout.write(_get__('os').EOL); | ||
} | ||
@@ -79,7 +86,7 @@ | ||
console.log(_titleColor(deps.projectName + ' - package.json (devDependencies)')); | ||
console.log(_get__('table')(_get__('_').map(devDependencies, function (dep) { | ||
console.log(_get__('table')(_get__('_').map(deps.devDependencies, function (dep) { | ||
var itemColor = _get__('colorMap').node.devDependencies.item; | ||
return [itemColor(dep.name), itemColor(dep.version)]; | ||
}))); | ||
console.log(_get__('os').EOL); | ||
process.stdout.write(_get__('os').EOL); | ||
} | ||
@@ -90,7 +97,7 @@ } else if (deps.type === 'bower') { | ||
console.log(_titleColor2(deps.projectName + ' - bower.json (dependencies)')); | ||
console.log(_get__('table')(_get__('_').map(dependencies, function (dep) { | ||
console.log(_get__('table')(_get__('_').map(deps.dependencies, function (dep) { | ||
var itemColor = _get__('colorMap').bower.dependencies.item; | ||
return [itemColor(dep.name), itemColor(dep.version)]; | ||
}))); | ||
console.log(_get__('os').EOL); | ||
process.stdout.write(_get__('os').EOL); | ||
} | ||
@@ -101,8 +108,28 @@ | ||
console.log(_titleColor3(deps.projectName + ' - bower.json (devDependencies)')); | ||
console.log(_get__('table')(_get__('_').map(devDependencies, function (dep) { | ||
console.log(_get__('table')(_get__('_').map(deps.devDependencies, function (dep) { | ||
var itemColor = _get__('colorMap').bower.devDependencies.item; | ||
return [itemColor(dep.name), itemColor(dep.version)]; | ||
}))); | ||
console.log(_get__('os').EOL); | ||
process.stdout.write(_get__('os').EOL); | ||
} | ||
} else if (deps.type === 'php (composer)') { | ||
if (deps.require.length > 0) { | ||
var _titleColor4 = _get__('colorMap').composer.require.title; | ||
console.log(_titleColor4(deps.projectName + ' - composer.json (require)')); | ||
console.log(_get__('table')(_get__('_').map(deps.require, function (dep) { | ||
var itemColor = _get__('colorMap').composer.require.item; | ||
return [itemColor(dep.name), itemColor(dep.version)]; | ||
}))); | ||
process.stdout.write(_get__('os').EOL); | ||
} | ||
if (deps['require-dev'].length > 0) { | ||
var _titleColor5 = _get__('colorMap').composer['require-dev'].title; | ||
console.log(_titleColor5(deps.projectName + ' - composer.json (require-dev)')); | ||
console.log(_get__('table')(_get__('_').map(deps['require-dev'], function (dep) { | ||
var itemColor = _get__('colorMap').composer['require-dev'].item; | ||
return [itemColor(dep.name), itemColor(dep.version)]; | ||
}))); | ||
process.stdout.write(_get__('os').EOL); | ||
} | ||
} | ||
@@ -109,0 +136,0 @@ } |
{ | ||
"name": "deedee", | ||
"version": "1.1.0", | ||
"version": "1.2.1", | ||
"description": "A tool for detecting project dependencies.", | ||
@@ -5,0 +5,0 @@ "license": "MIT", |
@@ -14,2 +14,3 @@ # deedee | ||
- [x] Bower | ||
- [x] PHP (Composer) | ||
- [ ] Inline `<script>` tags | ||
@@ -16,0 +17,0 @@ - [ ] CSS `@import` |
@@ -8,4 +8,2 @@ /* global describe, it */ | ||
import '../lib/deedee-cli.js'; | ||
import config from '../package.json'; | ||
@@ -12,0 +10,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
190451
24
828
73
0