From 8659ccfc8b9515231a5d355f2bf6bbd2d5a293d1 Mon Sep 17 00:00:00 2001
From: Dave Stewart <dave@davestewart.co.uk>
Date: Sat, 30 Oct 2021 18:41:11 +0100
Subject: [PATCH] Fix rollup plugin defaults

---
 package.json                |  2 +-
 src/plugins/rollup/index.js |  2 +-
 src/plugins/rollup/tests.js | 25 ++++++++++++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index bdd3c0e..0e81043 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alias-hq",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "description": "The end-to-end solution for configuring, refactoring, maintaining and using path aliases",
   "main": "src/index.js",
   "bin": "bin/alias-hq",
diff --git a/src/plugins/rollup/index.js b/src/plugins/rollup/index.js
index ed3a407..34b9824 100644
--- a/src/plugins/rollup/index.js
+++ b/src/plugins/rollup/index.js
@@ -6,7 +6,6 @@ const defaults = {
 
 // @see https://github.com/rollup/plugins/tree/master/packages/alias
 function callback (name, config, options) {
-  options = { ...defaults, ...options }
   const { rootUrl, baseUrl } = config
   name = name
     .replace(/\/\*$/, '')
@@ -26,6 +25,7 @@ function callback (name, config, options) {
 }
 
 module.exports = function (config, options) {
+  options = { ...defaults, ...options }
   return options.format === 'object'
     ? toObject(callback, config, options)
     : toArray(callback, config, options)
diff --git a/src/plugins/rollup/tests.js b/src/plugins/rollup/tests.js
index e9b253d..0a8f0cf 100644
--- a/src/plugins/rollup/tests.js
+++ b/src/plugins/rollup/tests.js
@@ -1,20 +1,27 @@
 const { abs } = require('../../utils')
 
+const expected = {
+  '@': abs(''),
+  '@packages': abs('../packages'),
+  '@classes': abs('classes'),
+  '@app': abs('app'),
+  '@data': abs('app/data'),
+  '@services': abs('app/services'),
+  '@views': abs('app/views'),
+}
+
 module.exports = [
+  function () {
+    const label = 'default'
+    const options = {}
+    return { label, options, expected }
+  },
+
   function () {
     const label = 'object'
     const options = {
       format: 'object'
     }
-    const expected = {
-      '@': abs(''),
-      '@packages': abs('../packages'),
-      '@classes': abs('classes'),
-      '@app': abs('app'),
-      '@data': abs('app/data'),
-      '@services': abs('app/services'),
-      '@views': abs('app/views'),
-    }
     return { label, options, expected }
   },