Fix: migrate to urlgrey v2

lib/decodeUri.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv } = require('./utils')
 
 module.exports = (envVarName, defaultUri) => urlgrey(getEnv(envVarName, defaultUri))

lib/unpackApiKeysConfig.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('assert')
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { decodeArray } = require('./utils')
 
 module.exports = (envVarName, defaultUri) => {

lib/unpackKOPPSConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv, typeConversion } = require('./utils')
 
 module.exports = (envVarName, defaultUri, options) => {

lib/unpackLDAPConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv, typeConversion } = require('./utils')
 
 const ldapDefaults = {

lib/unpackMongodbConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv, typeConversion } = require('./utils')
 
 module.exports = (envVarName, defaultUri, options) => {
@@ -14,8 +14,8 @@ module.exports = (envVarName, defaultUri, options) => {
   const outp = {
     username: envObj.username(),
     password: envObj.password(),
-    host: envObj._parsed.host,
-    db: envObj._parsed.pathname && envObj._parsed.pathname.replace(/\//, ''),
+    host: envObj.host(),
+    db: envObj.path() && envObj.path() !== '/' ? envObj.path().replace(/^\//, '') : null,
     uri,
     authDatabase: '',
     ssl: false

lib/unpackNodeApiConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv, typeConversion } = require('./utils')
 
 module.exports = (envVarName, defaultUri, options) => {

lib/unpackRedisConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const qs = require('qs')
 const { getEnv, typeConversion } = require('./utils')
 

lib/unpackSMTPConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv, typeConversion } = require('./utils')
 
 module.exports = (envVarName, defaultUri, options) => {

lib/unpackSQLServerConfig.js

@@ -6,7 +6,7 @@
   Example: file://path/to/your/sqlite.db
 */
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv } = require('./utils')
 
 const _isCorrectURI = (envObj) => /^mssql/.test(envObj.protocol())

lib/unpackSequelizeConfig.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv } = require('./utils')
 const unpackSqliteConfig = require('./unpackSqliteConfig')
 const unpackSQLServerConfig = require('./unpackSQLServerConfig')

lib/unpackSqliteConfig.js

@@ -6,7 +6,7 @@
   Example: file://path/to/your/sqlite.db
 */
 
-const urlgrey = require('urlgrey')
+const urlgrey = require('./urlgrey')
 const { getEnv } = require('./utils')
 
 const _isSqlliteURI = (envObj) => /^sqlite/.test(envObj.protocol())

lib/urlgrey.js

@@ -0,0 +1,79 @@
+'use strict'
+
+const qs = require('qs')
+const urlgreyImport = require('urlgrey')
+
+const parseUrl =
+  typeof urlgreyImport === 'function'
+    ? urlgreyImport
+    : urlgreyImport && typeof urlgreyImport.default === 'function'
+      ? urlgreyImport.default
+      : null
+
+if (!parseUrl) {
+  throw new TypeError('Unsupported urlgrey export shape')
+}
+
+const callGetter = (obj, getterName, legacyName) => {
+  if (typeof obj[getterName] === 'function') {
+    return obj[getterName]()
+  }
+  if (typeof obj[legacyName] === 'function') {
+    return obj[legacyName]()
+  }
+  return undefined
+}
+
+const decodeMaybe = (value) => {
+  if (typeof value !== 'string') {
+    return value
+  }
+  try {
+    return decodeURIComponent(value)
+    // eslint-disable-next-line no-unused-vars
+  } catch (err) {
+    return value
+  }
+}
+
+const normalizeInput = (url) => {
+  if (typeof url === 'string' && url.startsWith('?')) {
+    return `http://localhost/${url}`
+  }
+  return url
+}
+
+module.exports = (url) => {
+  const parsed = parseUrl(normalizeInput(url))
+  const adapted = Object.create(parsed)
+
+  adapted.protocol = () => callGetter(parsed, 'getProtocol', 'protocol')
+  adapted.hostname = () => callGetter(parsed, 'getHostname', 'hostname')
+  adapted.port = () => callGetter(parsed, 'getPort', 'port')
+  adapted.path = () => callGetter(parsed, 'getPath', 'path')
+  adapted.query = () => {
+    const queryString = adapted.queryString()
+    if (!queryString) {
+      return {}
+    }
+    return qs.parse(queryString)
+  }
+  adapted.queryString = () => callGetter(parsed, 'getQueryString', 'queryString')
+  adapted.username = () => decodeMaybe(callGetter(parsed, 'getUsername', 'username'))
+  adapted.password = () => decodeMaybe(callGetter(parsed, 'getPassword', 'password'))
+
+  adapted.host = () => {
+    const hostname = adapted.hostname()
+    const port = adapted.port()
+
+    if (!hostname) {
+      return hostname
+    }
+    if (port === null || port === undefined || port === '') {
+      return hostname
+    }
+    return `${hostname}:${port}`
+  }
+
+  return adapted
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kth-node-configuration",
-  "version": "2.2.0",
+  "version": "3.0.0-0",
   "description": "Configuration module for Node.js projects",
   "main": "lib/index.js",
   "files": [
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "qs": "^6.15.3",
-    "urlgrey": "^0.4.4"
+    "urlgrey": "^2.1.0"
   },
   "author": {
     "name": "KTH",