Fix subtitle for some package results (#24)

index.js

@@ -1,6 +1,7 @@
 'use strict';
 const alfy = require('alfy');
-const dateFormat = require('date-format');
+
+const cmdSubtitle = require('./source/cmd-subtitle');
 
 // Do not boost exact matches by default, unless specified by the input
 const q = /boost-exact:[^\s]+/.test(alfy.input) ? alfy.input : `${alfy.input} boost-exact:false`;
@@ -26,7 +27,7 @@ alfy.fetch('https://api.npms.io/v2/search', {
 						subtitle: 'Open the npm page instead of the GitHub repo'
 					},
 					cmd: {
-						subtitle: `${pkg.version} published at ${dateFormat('yyyy-dd-MM', new Date(pkg.date))} by ${(pkg.author && pkg.author.name) || pkg.publisher.username}`
+						subtitle: cmdSubtitle(pkg)
 					}
 				},
 				quicklookurl: pkg.links.repository && `${pkg.links.repository}#readme`

package.json

@@ -38,6 +38,7 @@
   "devDependencies": {
     "alfy-test": "^0.3.0",
     "ava": "*",
+    "semver-regex": "^2.0.0",
     "xo": "*"
   }
 }

source/cmd-subtitle.js

@@ -0,0 +1,23 @@
+const dateFormat = require('date-format');
+
+/**
+ * @param {object} pgk - A single package from the npms API
+ * @returns {string} - The command-modifier subtitle for the package
+ */
+const cmdSubtitle = ({author, date, publisher, version}) => {
+	let subtitle = `${version}`;
+
+	if (date) {
+		subtitle += ` published at ${dateFormat('yyyy-dd-MM', new Date(date))}`;
+	}
+
+	if (author) {
+		subtitle += ` by ${(author && author.name)}`;
+	} else if (publisher) {
+		subtitle += ` by ${publisher.username}`;
+	}
+
+	return subtitle;
+};
+
+module.exports = cmdSubtitle;

test.js

@@ -1,15 +1,16 @@
 import test from 'ava';
 import alfyTest from 'alfy-test';
+import semverRegex from 'semver-regex';
 
 test(async t => {
 	const alfy = alfyTest();
 
-	const result = await alfy('boost-exact:true chalk');  // Ensure chalk is first
+	const result = await alfy('boost-exact:true chalk'); // Ensure chalk is first
 	delete result[0].mods.cmd;
 
 	t.deepEqual(result[0], {
 		title: 'chalk',
-		subtitle: 'Terminal string styling done right. Much color',
+		subtitle: 'Terminal string styling done right',
 		arg: 'https://github.com/chalk/chalk',
 		mods:
 		{
@@ -22,3 +23,21 @@ test(async t => {
 		quicklookurl: 'https://github.com/chalk/chalk#readme'
 	});
 });
+
+test('command-modifier subtitle with date and author', async t => {
+	const alfy = alfyTest();
+
+	const result = await alfy('boost-exact:true chalk');
+	const {subtitle} = result[0].mods.cmd;
+
+	t.regex(subtitle, new RegExp(`${semverRegex().source} published at.*by.*`));
+});
+
+test('command-modifier subtitle without date and author', async t => {
+	const alfy = alfyTest();
+
+	const result = await alfy('boost-exact:true @types/consola');
+	const {subtitle} = result[0].mods.cmd;
+
+	t.regex(subtitle, semverRegex());
+});