feat: allow :port shortcut, close #28

Author: bahmutov

.travis.yml

@@ -16,6 +16,7 @@ script:
   - npm run demo3
   - npm run demo4
   - npm run demo5
+  - npm run demo6
 after_success:
   - npm run travis-deploy-once "npm run semantic-release"
 branches:

package-lock.json

@@ -80,6 +80,7 @@
     "demo3": "node bin/start.js start-with-child http://127.0.0.1:9000 test",
     "demo4": "node bin/start.js 9000",
     "demo5": "node bin/start.js start-with-child 9000",
+    "demo6": "node bin/start.js :9000",
     "travis-deploy-once": "travis-deploy-once"
   },
   "devDependencies": {

package.json

@@ -27,6 +27,10 @@ describe('utils', () => {
       la(isUrlOrPort('6006'))
       la(isUrlOrPort(8080))
     })
+
+    it('allows :port string', () => {
+      la(isUrlOrPort(':6006'))
+    })
   })
 
   context('normalizeUrl', () => {
@@ -42,9 +46,13 @@ describe('utils', () => {
       la(normalizeUrl(8080) === 'http://localhost:8080')
     })
 
+    it('changes :port to localhost', () => {
+      la(normalizeUrl(':6006') === 'http://localhost:6006')
+    })
+
     it('returns original argument if does not know what to do', () => {
-      la(normalizeUrl('foo') === 'foo')
-      la(normalizeUrl(808000) === 808000)
+      la(normalizeUrl('foo') === 'foo', normalizeUrl('foo'))
+      la(normalizeUrl(808000) === 808000, normalizeUrl(808000))
     })
   })
 })

src/start-server-and-test-spec.js

@@ -1,14 +1,42 @@
 const is = require('check-more-types')
 
-const isUrlOrPort = s => is.url(s) || is.port(parseInt(s))
+const isUrlOrPort = s => {
+  if (is.url(s)) {
+    return s
+  }
+  if (is.number(s)) {
+    return is.port(s)
+  }
+  if (!is.string(s)) {
+    return false
+  }
+  if (s[0] === ':') {
+    const withoutColon = s.substr(1)
+    return is.port(parseInt(withoutColon))
+  }
+  return is.port(parseInt(s))
+}
 
 const normalizeUrl = s => {
   if (is.url(s)) {
     return s
   }
+
+  if (is.number(s) && is.port(s)) {
+    return `http://localhost:${s}`
+  }
+
+  if (!is.string(s)) {
+    return s
+  }
+
   if (is.port(parseInt(s))) {
     return `http://localhost:${s}`
   }
+
+  if (s[0] === ':') {
+    return `http://localhost${s}`
+  }
   // for anything else, return original argument
   return s
 }