Error name (#84)

* Update index.js

* fix tests

* fix code

* fix options null

index.js

@@ -15,8 +15,10 @@ function plugin (fn, options = {}) {
 
   fn[Symbol.for('skip-override')] = true
 
+  const pluginName = (options && options.name) || checkName(fn)
+
   if (typeof options === 'string') {
-    checkVersion(options)
+    checkVersion(options, pluginName)
     options = {}
   }
 
@@ -25,13 +27,13 @@ function plugin (fn, options = {}) {
   }
 
   if (!options.name) {
-    options.name = checkName(fn)
+    options.name = pluginName
   }
 
   fn[Symbol.for('fastify.display-name')] = options.name
 
   if (options.fastify) {
-    checkVersion(options.fastify)
+    checkVersion(options.fastify, pluginName)
   }
 
   fn[Symbol.for('plugin-meta')] = options
@@ -49,7 +51,7 @@ function checkName (fn) {
   }
 }
 
-function checkVersion (version) {
+function checkVersion (version, pluginName) {
   if (typeof version !== 'string') {
     throw new TypeError(`fastify-plugin expects a version string, instead got '${typeof version}'`)
   }
@@ -62,7 +64,7 @@ function checkVersion (version) {
   }
 
   if (fastifyVersion && !semver.satisfies(fastifyVersion, version)) {
-    throw new Error(`fastify-plugin - expected '${version}' fastify version, '${fastifyVersion}' is installed`)
+    throw new Error(`fastify-plugin: ${pluginName} - expected '${version}' fastify version, '${fastifyVersion}' is installed`)
   }
 }
 

test/test.js

@@ -108,7 +108,7 @@ test('should throw if the fastify version does not satisfies the plugin requeste
     fp(plugin, { fastify: '1000.1000.1000' })
     t.fail()
   } catch (e) {
-    t.is(e.message, `fastify-plugin - expected '1000.1000.1000' fastify version, '${v}' is installed`)
+    t.is(e.message, `fastify-plugin: plugin - expected '1000.1000.1000' fastify version, '${v}' is installed`)
   }
 })
 
@@ -182,7 +182,23 @@ test('should throw if the fastify version does not satisfies the plugin requeste
     fp(plugin, { fastify: '1000.1000.1000' })
     t.fail()
   } catch (e) {
-    t.is(e.message, `fastify-plugin - expected '1000.1000.1000' fastify version, '${v}' is installed`)
+    t.is(e.message, `fastify-plugin: plugin - expected '1000.1000.1000' fastify version, '${v}' is installed`)
+  }
+})
+
+test('should throw if the fastify version does not satisfies the plugin requested version - plugin name', t => {
+  t.plan(1)
+
+  function plugin (fastify, opts, next) {
+    next()
+  }
+
+  const v = require('fastify/package.json').version.replace(/-rc\.\d+/, '')
+  try {
+    fp(plugin, { name: 'this-is-an-awesome-name', fastify: '1000.1000.1000' })
+    t.fail()
+  } catch (e) {
+    t.is(e.message, `fastify-plugin: this-is-an-awesome-name - expected '1000.1000.1000' fastify version, '${v}' is installed`)
   }
 })