lib/npm: fix naming

Author: zackschuster

lib/npm.js

@@ -1,7 +1,7 @@
 'use strict'
 const execa = require('execa')
 const npa = require('npm-package-arg')
-const validatePackageName = require('validate-npm-package-name')
+const validateNpmPackageName = require('validate-npm-package-name')
 
 // Remove npm env vars from the commands, this
 // is so it respects the directory it is run in,
@@ -14,7 +14,8 @@ const env = Object.keys(process.env).reduce((e, key) => {
   return e
 }, {})
 
-module.exports.install = (deps = [], opts = {}) => {
+module.exports.install = install
+function install (deps = [], opts = {}) {
   if (!deps || !deps.length) {
     return Promise.resolve()
   }
@@ -38,12 +39,12 @@ module.exports.install = (deps = [], opts = {}) => {
     cwd: opts.directory || process.cwd(),
     stdio: opts.silent ? 'ignore' : 'pipe'
   })
-}
+};
 
 const packageTypes = ['tag', 'git', 'version', 'range', 'file', 'directory', 'remote']
 
 module.exports.normalizePackageName = normalizePackageName
-async function normalizePackageName (name, opts = {}) {
+function normalizePackageName (name, opts = {}) {
   const allowedTypes = opts.allowedTypes || packageTypes
   const pkg = npa(name)
 
@@ -64,42 +65,43 @@ async function normalizePackageName (name, opts = {}) {
     case 'tag':
     case 'version':
     case 'range':
-      validName(pkg)
+      validateName(pkg)
       break
   }
 
   return pkg
 }
 
-function validName (pkg) {
+function validateName (pkg) {
   // Manual check because the validate package just says "name cannot be null"
   if (!pkg.name) {
     throw new Error(`Invalid package name (${pkg.raw} - name cannot be empty)`)
   }
 
-  const v = validatePackageName(pkg.name)
+  const v = validateNpmPackageName(pkg.name)
   if (v.errors || v.warnings) {
     const msg = (v.errors && v.errors[0]) || (v.warnings || v.warnings[0])
     throw new Error(`Invalid package name (${pkg.raw}${msg ? ` - ${msg}` : ''})`)
   }
 }
 
-module.exports.validatePackageNames = validatePackageSpec
+module.exports.validatePackageSpec = validatePackageSpec
 function validatePackageSpec (name, opts = {}) {
   const names = Array.isArray(name) ? name : [name]
   for (let i = 0; i < names.length; i++) {
     try {
-      normalizePackageName(names[i])
+      validatePackageName(names[i])
     } catch (e) {
       return e
     }
   }
   return true
-}
+};
 
-module.exports.validatePackageName = async function (name) {
+module.exports.validatePackageName = validatePackageName
+function validatePackageName (name) {
   try {
-    await normalizePackageName(name, {
+    normalizePackageName(name, {
       allowedTypes: ['tag', 'range', 'version']
     })
   } catch (e) {