Removes multimatch, uses metalsmith.match. Simplified & refactored

Author: webketje

lib/index.js

@@ -1,10 +1,6 @@
 'use strict'
 
-const package_name = '@metalsmith/default-values'
-const debug_lib = require('debug')
-const debug = debug_lib(package_name)
-
-const multimatch = require('multimatch')
+const debug = require('debug')('@metalsmith/default-values')
 const set_defaults = require('./set_defaults')
 
 /**
@@ -28,27 +24,23 @@ const defaultDefaultsSet = {
  **/
 
 function initDefaultValues(options) {
-  options = (options || []).map(defaultsSet => Object.assign({}, defaultDefaultsSet, defaultsSet))
+  const defaultSets = (options || []).map(defaultsSet => Object.assign({}, defaultDefaultsSet, defaultsSet))
   return function defaultValues(files, metalsmith, done) {
     debug('Running with options: %O ', options)
 
-    // Loop through files
-    Object.keys(files).forEach(function (file) {
-      // Loop through configurations
-      options.forEach(function (item) {
-        if (!item.set_defaults) {
-          // initialise set_defaults function
-          item.set_defaults = set_defaults(item.defaults)
-        }
-
-        debug('Checking: %s; Against: %s', file, item.pattern)
-        if (multimatch(file, item.pattern).length) {
-          debug('Passed - Will set defaults if required')
-
-          // Set defaults if required
-          item.set_defaults(files[file])
-        }
-      })
+    // Loop through configurations
+    defaultSets.forEach(function ({ pattern, defaults }) {
+      const matches = metalsmith.match(pattern)
+      debug('Matched %s files to pattern %s: %o', matches.length, pattern, matches)
+      if (matches.length) {
+        matches.forEach(file => {
+          set_defaults(defaults)(files[file])
+          debug('Defaults set for file %s, the resulting metadata is: %O', file, Object.keys(defaults).reduce((resulting, prop) => {
+            resulting[prop] = files[file][prop]
+            return resulting
+          }, {}))
+        })
+      }
     })
 
     done()

lib/set_defaults.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const debug = require('debug')('@metalsmith/default-values:set-defaults')
 const get = require('lodash.get')
 const set = require('lodash.set')
 
@@ -13,16 +12,10 @@ const set = require('lodash.set')
  * @return {function} Takes an object and sets defaults
  */
 const set_defaults = (defaults) => (item) => {
-  debug('defaults: %o', defaults)
   Object.keys(defaults).forEach((key) => {
     const value = get(item, key)
     const default_value = defaults[key]
 
-    // For more verbose debugging enable the following
-    // debug('key: %s', key);
-    // debug('default: %s', defaults[key]);
-    // debug('value: %s', value);
-
     if (value === void 0 || value === null) {
       if (typeof default_value === 'function') {
         set(item, key, default_value(item))

package-lock.json

@@ -39,8 +39,7 @@
   "dependencies": {
     "debug": "^4.2.0",
     "lodash.get": "^4.4.2",
-    "lodash.set": "^4.3.2",
-    "multimatch": "^5.0.0"
+    "lodash.set": "^4.3.2"
   },
   "devDependencies": {
     "auto-changelog": "^2.3.0",