CIDR array response reversed to properly deliminated string

whitequark · Jun 10, 2018 · 34149be · 34149be
1 parent 8e69afe
commit 34149be
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/ipaddr.min.js b/ipaddr.min.js
diff --git a/lib/ipaddr.js b/lib/ipaddr.js
@@ -492,11 +492,17 @@
   };
 
   ipaddr.IPv4.parseCIDR = function(string) {
-    var maskLength, match;
+    var maskLength, match, parsed;
     if (match = string.match(/^(.+)\/(\d+)$/)) {
       maskLength = parseInt(match[2]);
       if (maskLength >= 0 && maskLength <= 32) {
-        return [this.parse(match[1]), maskLength];
+        parsed = [this.parse(match[1]), maskLength];
+        Object.defineProperty(parsed, 'toString', {
+          value: function() {
+            return this.join('/');
+          }
+        });
+        return parsed;
       }
     }
     throw new Error("ipaddr: string is not formatted like an IPv4 CIDR range");
@@ -560,11 +566,17 @@
   };
 
   ipaddr.IPv6.parseCIDR = function(string) {
-    var maskLength, match;
+    var maskLength, match, parsed;
     if (match = string.match(/^(.+)\/(\d+)$/)) {
       maskLength = parseInt(match[2]);
       if (maskLength >= 0 && maskLength <= 128) {
-        return [this.parse(match[1]), maskLength];
+        parsed = [this.parse(match[1]), maskLength];
+        Object.defineProperty(parsed, 'toString', {
+          value: function() {
+            return this.join('/');
+          }
+        });
+        return parsed;
       }
     }
     throw new Error("ipaddr: string is not formatted like an IPv6 CIDR range");