asset-resolver - npm Package Compare versions

Comparing version 0.1.1 to 0.2.0

index.js

 /**
  * Created by ben on 17.09.15.
  */
-var resolver = require('./lib/resolver');
-var toarray = require('lodash.toarray');
-var defaults = require('lodash.defaults');
-var map = require('lodash.map');
-var pluck = require('lodash.pluck');
+var os = require('os');
+var toarray = require('lodash/toArray');
+var defaults = require('lodash/defaults');
+var map = require('lodash/map');
 var debug = require('debug')('asset-resolver');
 var Promise = require('bluebird');
-var os = require('os');
+var resolver = require('./lib/resolver');
 
@@ -25,3 +24,3 @@ module.exports.getResource = function (file, opts) {
 
-	opts.base = toarray(opts.base);
+	opts.base = resolver.glob(toarray(opts.base));
 
@@ -31,3 +30,3 @@ return Promise.any(map(opts.base, function (base) {
 	})).catch(Promise.AggregateError, function (errs) {
-		var msg = ['The file "' + file + '" could not be resolved because of:'].concat(pluck(errs, 'message'));
+		var msg = ['The file "' + file + '" could not be resolved because of:'].concat(map(errs, 'message'));
 		debug(msg);
@@ -34,0 +33,0 @@ return Promise.reject(new Error(msg.join(os.EOL)));

lib/resolver.js

@@ -5,2 +5,3 @@ /**
 var fs = require('fs');
+var path = require('path');
 var url = require('url');
@@ -10,5 +11,6 @@ var request = require('request');
 var Promise = require('bluebird');
-var path = require('path');
 var debug = require('debug')('asset-resolver');
-var result = require('lodash.result');
+var result = require('lodash/result');
+var reduce = require('lodash/reduce');
+var globby = require('globby');
 var cache = {};
@@ -107,5 +109,14 @@
 
+function glob(base) {
+	return reduce(base, function (res, val) {
+		if (isUrl(val)) {
+			res.push(val);
+			return res;
+		}
+		return res.concat(globby.sync([val]));
+	}, []);
+}
+
 function getResource(base, file, opts) {
 	var resource = join(base, file);
-
 	if (cache[resource]) {
@@ -124,1 +135,2 @@ return cache[resource].then(handle(opts.filter));
 module.exports.getResource = getResource;
+module.exports.glob = glob;

package.json

 {
   "name": "asset-resolver",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Find an asset in a set of locations",
@@ -17,3 +17,4 @@ "license": "MIT",
   "scripts": {
-    "test": "xo && mocha test/test.js --timeout 10000"
+    "test": "xo && nyc mocha test/test.js --timeout 10000",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls"
   },
@@ -26,29 +27,26 @@ "files": [
   "keywords": [
-    "cli-app",
-    "cli",
-    ""
+    "asset",
+    "resolve"
   ],
   "dependencies": {
-    "bluebird": "^2.10.1",
-    "debug": "^2.2.0",
-    "filesize": "^3.1.3",
-    "hash": "^0.2.0",
-    "lodash.defaults": "^3.1.2",
-    "lodash.foreach": "^3.0.3",
-    "lodash.map": "^3.1.4",
-    "lodash.pluck": "^3.1.2",
-    "lodash.result": "^3.1.2",
-    "lodash.toarray": "^3.0.2",
-    "meow": "^3.3.0",
-    "mime": "^1.3.4",
-    "object": "^0.1.1",
-    "request": "^2.63.0"
+    "bluebird": "3.3.5",
+    "debug": "2.2.0",
+    "filesize": "3.3.0",
+    "globby": "^4.0.0",
+    "hash": "0.2.0",
+    "lodash": "4.12.0",
+    "meow": "3.7.0",
+    "mime": "1.3.4",
+    "object": "0.1.1",
+    "request": "2.71.0"
   },
   "devDependencies": {
-    "chai": "^3.3.0",
-    "es6-promise": "^3.0.2",
-    "finalhandler": "^0.4.0",
-    "mocha": "^2.3.3",
-    "serve-static": "^1.10.0",
-    "xo": "^0.7.1"
+    "chai": "3.5.0",
+    "coveralls": "^2.11.9",
+    "es6-promise": "3.1.2",
+    "finalhandler": "0.4.1",
+    "mocha": "^2.3.4",
+    "nyc": "^6.4.4",
+    "serve-static": "1.10.2",
+    "xo": "0.13.0"
   },
@@ -55,0 +53,0 @@ "xo": {

readme.md

@@ -1,2 +0,2 @@
-# asset-resolver [![Build Status](https://travis-ci.org/bezoerb/asset-resolver.svg?branch=master)](https://travis-ci.org/bezoerb/asset-resolver)
+# asset-resolver [![Build Status](https://travis-ci.org/bezoerb/asset-resolver.svg?branch=master)](https://travis-ci.org/bezoerb/asset-resolver) [![Coverage Status](https://coveralls.io/repos/github/bezoerb/asset-resolver/badge.svg?branch=master)](https://coveralls.io/github/bezoerb/asset-resolver?branch=master)
 
@@ -44,5 +44,5 @@ > Helper module to find an asset in a set of locations
 Required: `false`
-Example: `['http://domain.de/', 'http://domain.de/styles', 'app/images']` 
+Example: `['http://domain.de/', 'http://domain.de/styles', 'app/images', '**/images/']` 
 
-List of directories/urls where we should start looking for assets. 
+List of directories/urls where we should start looking for assets (supports globbing on directories). 
 
@@ -49,0 +49,0 @@ ##### filter

No alert changes

Improved metrics

Dependency count

10

decreased by-28.57%

Worsened metrics

Total package byte prevSize

7968

decreased by-3.17%

Dev dependency count

8

increased by33.33%

Number of package files

5

decreased by-16.67%

Lines of code

146

decreased by-8.75%

Dependency changes

• + Addedglobby@^4.0.0

• + Addedlodash@4.12.0

• + Addedansi-regex@2.1.1(transitive)

• + Addedansi-styles@2.2.1(transitive)

• + Addedarray-union@1.0.2(transitive)

• + Addedarray-uniq@1.0.3(transitive)

• + Addedarrify@1.0.1(transitive)

• + Addedassert-plus@0.2.0(transitive)

• + Addedasync@2.6.4(transitive)

• + Addedaws-sign2@0.6.0(transitive)

• + Addedbalanced-match@1.0.2(transitive)

• + Addedbl@1.1.2(transitive)

• + Addedbluebird@3.3.5(transitive)

• + Addedboom@2.10.1(transitive)

• + Addedbrace-expansion@1.1.11(transitive)

• + Addedcaseless@0.11.0(transitive)

• + Addedchalk@1.1.3(transitive)

• + Addedcommander@2.20.3(transitive)

• + Addedconcat-map@0.0.1(transitive)

• + Addedcore-util-is@1.0.3(transitive)

• + Addedcryptiles@2.0.5(transitive)

• + Addeddebug@2.2.0(transitive)

• + Addedescape-string-regexp@1.0.5(transitive)

• + Addedfilesize@3.3.0(transitive)

• + Addedform-data@1.0.1(transitive)

• + Addedgenerate-function@2.3.1(transitive)

• + Addedgenerate-object-property@1.2.0(transitive)

• + Addedglob@6.0.4(transitive)

• + Addedglobby@4.1.0(transitive)

• + Addedhar-validator@2.0.6(transitive)

• + Addedhas-ansi@2.0.0(transitive)

• + Addedhash@0.2.0(transitive)

• + Addedhawk@3.1.3(transitive)

• + Addedhoek@2.16.3(transitive)

• + Addedhttp-signature@1.1.1(transitive)

• + Addedinflight@1.0.6(transitive)

• + Addedinherits@2.0.4(transitive)

• + Addedis-my-ip-valid@1.0.1(transitive)

• + Addedis-my-json-valid@2.20.6(transitive)

• + Addedis-property@1.0.2(transitive)

• + Addedisarray@1.0.0(transitive)

• + Addedjsonpointer@5.0.1(transitive)

• + Addedlodash@4.12.04.17.21(transitive)

• + Addedmime@1.3.4(transitive)

• + Addedminimatch@3.1.2(transitive)

• + Addedms@0.7.1(transitive)

• + Addednode-uuid@1.4.8(transitive)

• + Addedoauth-sign@0.8.2(transitive)

• + Addedonce@1.4.0(transitive)

• + Addedpath-is-absolute@1.0.1(transitive)

• + Addedprocess-nextick-args@1.0.7(transitive)

• + Addedqs@6.1.2(transitive)

• + Addedreadable-stream@2.0.6(transitive)

• + Addedrequest@2.71.0(transitive)

• + Addedsntp@1.0.9(transitive)

• + Addedstring_decoder@0.10.31(transitive)

• + Addedstringstream@0.0.6(transitive)

• + Addedstrip-ansi@3.0.1(transitive)

• + Addedsupports-color@2.0.0(transitive)

• + Addedtough-cookie@2.2.2(transitive)

• + Addedtunnel-agent@0.4.3(transitive)

• + Addedutil-deprecate@1.0.2(transitive)

• + Addedwrappy@1.0.2(transitive)

• + Addedxtend@4.0.2(transitive)

• - Removedlodash.defaults@^3.1.2

• - Removedlodash.foreach@^3.0.3

• - Removedlodash.map@^3.1.4

• - Removedlodash.pluck@^3.1.2

• - Removedlodash.result@^3.1.2

• - Removedlodash.toarray@^3.0.2

• - Removedajv@6.12.6(transitive)

• - Removedasynckit@0.4.0(transitive)

• - Removedaws-sign2@0.7.0(transitive)

• - Removedbluebird@2.11.0(transitive)

• - Removedcaseless@0.12.0(transitive)

• - Removeddebug@2.6.9(transitive)

• - Removedfast-deep-equal@3.1.3(transitive)

• - Removedfast-json-stable-stringify@2.1.0(transitive)

• - Removedfilesize@3.6.1(transitive)

• - Removedform-data@2.3.3(transitive)

• - Removedhar-schema@2.0.0(transitive)

• - Removedhar-validator@5.1.5(transitive)

• - Removedhash@0.2.1(transitive)

• - Removedhttp-signature@1.2.0(transitive)

• - Removedjson-schema-traverse@0.4.1(transitive)

• - Removedlodash._arraycopy@3.0.0(transitive)

• - Removedlodash._arrayeach@3.0.0(transitive)

• - Removedlodash._arraymap@3.0.0(transitive)

• - Removedlodash._baseassign@3.2.0(transitive)

• - Removedlodash._basecallback@3.3.1(transitive)

• - Removedlodash._basecopy@3.0.1(transitive)

• - Removedlodash._baseeach@3.0.4(transitive)

• - Removedlodash._baseget@3.7.2(transitive)

• - Removedlodash._baseisequal@3.0.7(transitive)

• - Removedlodash._baseslice@3.0.3(transitive)

• - Removedlodash._basevalues@3.0.0(transitive)

• - Removedlodash._bindcallback@3.0.1(transitive)

• - Removedlodash._createassigner@3.1.1(transitive)

• - Removedlodash._getnative@3.9.1(transitive)

• - Removedlodash._isiterateecall@3.0.9(transitive)

• - Removedlodash._topath@3.8.1(transitive)

• - Removedlodash.assign@3.2.0(transitive)

• - Removedlodash.defaults@3.1.2(transitive)

• - Removedlodash.foreach@3.0.3(transitive)

• - Removedlodash.isarguments@3.1.0(transitive)

• - Removedlodash.isarray@3.0.4(transitive)

• - Removedlodash.isfunction@3.0.9(transitive)

• - Removedlodash.istypedarray@3.0.6(transitive)

• - Removedlodash.keys@3.1.2(transitive)

• - Removedlodash.map@3.1.4(transitive)

• - Removedlodash.pairs@3.0.1(transitive)

• - Removedlodash.pluck@3.1.2(transitive)

• - Removedlodash.restparam@3.6.1(transitive)

• - Removedlodash.result@3.1.2(transitive)

• - Removedlodash.toarray@3.0.2(transitive)

• - Removedmime@1.6.0(transitive)

• - Removedms@2.0.0(transitive)

• - Removedoauth-sign@0.9.0(transitive)

• - Removedperformance-now@2.1.0(transitive)

• - Removedpsl@1.9.0(transitive)

• - Removedpunycode@2.3.1(transitive)

• - Removedqs@6.5.3(transitive)

• - Removedrequest@2.88.2(transitive)

• - Removedsafe-buffer@5.2.1(transitive)

• - Removedtough-cookie@2.5.0(transitive)

• - Removedtunnel-agent@0.6.0(transitive)

• - Removeduri-js@4.4.1(transitive)

• - Removeduuid@3.4.0(transitive)

• Updatedbluebird@3.3.5

• Updateddebug@2.2.0

• Updatedfilesize@3.3.0

• Updatedhash@0.2.0

• Updatedmeow@3.7.0

• Updatedmime@1.3.4

• Updatedobject@0.1.1

• Updatedrequest@2.71.0