wildcard - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

component.json

@@ -5,3 +5,3 @@ {
   "description": "Wildcard matching tools",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "keywords": [
@@ -8,0 +8,0 @@ "wildcard",

index.js

@@ -32,4 +32,6 @@ /* jshint node: true */
 function WildcardMatcher(text, separator) {
+  this.text = text = text || '';
+  this.hasWild = ~text.indexOf('*');
   this.separator = separator;
-  this.parts = (text || '').split(separator);
+  this.parts = text.split(separator);
 }
@@ -45,8 +47,19 @@
   if (typeof input == 'string' || input instanceof String) {
-    testParts = (input || '').split(this.separator);
-    for (ii = 0; matches && ii < partsCount; ii++) {
-      matches = parts[ii] === '*' || parts[ii] === testParts[ii];      
+    if (!this.hasWild && this.text != input) {
+      matches = false;
+    } else {
+      testParts = (input || '').split(this.separator);
+      for (ii = 0; matches && ii < partsCount; ii++) {
+        if (parts[ii] === '*')  {
+          continue;
+        } else if (ii < testParts.length) {
+          matches = parts[ii] === testParts[ii];
+        } else {
+          matches = false;
+        }
+      }
+
+      // If matches, then return the component parts
+      matches = matches && testParts;
     }
-    // If matches, then return the component parts
-    matches = matches && testParts;
   }
@@ -53,0 +66,0 @@ else if (typeof input.splice == 'function') {

package.json

@@ -9,3 +9,3 @@ {
   ],
-  "version": "1.1.0",
+  "version": "1.1.1",
   "dependencies": {},
@@ -12,0 +12,0 @@ "devDependencies": {

test/strings.js

@@ -6,3 +6,3 @@ var test = require('tape'),
 
-    t.plan(5);
+    t.plan(6);
     t.ok(wildcard('foo.*', 'foo.bar'), 'foo.* should match foo.bar');
@@ -13,2 +13,3 @@ t.ok(wildcard('foo.*', 'foo'), 'foo.* should match foo');
     t.notOk(wildcard('a.*.c', 'a.b'), 'a.*.c should not match a.b');
+    t.notOk(wildcard('a', 'a.b.c'), 'a should not match a.b.c');
 });
@@ -15,0 +16,0 @@

No alert changes

Improved metrics

Total package byte prevSize

11330

increased by3.24%

Lines of code

266

increased by5.14%

No dependency changes