feat: add glob matching

bin/yaml-merge

@@ -2,12 +2,10 @@
 
 'use strict';
 
-const resolve = require('path').resolve;
 const yamlMerge = require('../index.js');
 
 const files = process.argv
   .slice(2)
-  .map((path) => resolve(path));
 const outputFile = yamlMerge(...files);
 
 process.stdout.write(outputFile);

index.js

@@ -2,6 +2,7 @@
 
 const readFileSync = require('fs').readFileSync;
 const jsYaml = require('js-yaml');
+const glob = require('glob');
 const _ = require('lodash');
 
 function readAsJSON(fileName) {
@@ -18,7 +19,10 @@ function readAsJSON(fileName) {
  * @return {string} the output YAML file
  */
 function yamlMerge(...from) {
-  const files = from.map((path) => readAsJSON(path));
+  const files = from
+    .reduce((arr, el) => arr.concat(glob.sync(el)), [])
+    .map((path) => readAsJSON(path));
+
   const outputJSON = _.mergeWith({}, ...files, (objValue, srcValue) => {
     if (Array.isArray(objValue) && Array.isArray(srcValue)) {
       return [...objValue, ...srcValue];

package.json

@@ -18,6 +18,7 @@
     "index.js"
   ],
   "dependencies": {
+    "glob": "^7.1.7",
     "js-yaml": "^4.0.0",
     "lodash": "^4.17.20"
   },

test/lib-test.js

@@ -3,6 +3,7 @@
 'use strict';
 
 const resolve = require('path').resolve;
+const join = require('path').join;
 const expect = require('chai').expect;
 const stripIndent = require('common-tags').stripIndent;
 const merge = require('../index.js');
@@ -11,6 +12,10 @@ function fixtureFiles(...names) {
   return names.map((fileName) => resolve(__dirname, './fixtures', fileName));
 }
 
+function globFiles(...globs) {
+  return globs.map((glob) => join(__dirname, './fixtures', glob));
+}
+
 describe('merge logic', function () {
   it('merges multiple YAML files', function () {
     const output = merge(...fixtureFiles('basic/a.yml', 'basic/b.yml'));
@@ -60,3 +65,33 @@ describe('merge logic', function () {
     );
   });
 });
+
+describe('glob logic', function () {
+  it('merges multiple YAML files', function () {
+    const output = merge(...globFiles('basic/*.yml'));
+
+    expect(output).to.equal(
+      stripIndent`
+      a:
+        foo: bar
+      b:
+        foo: bar
+    ` + '\n'
+    );
+  });
+
+  it('merges multiple YAML files (to glob or not to glob)', function () {
+    const output = merge(...globFiles('basic/*.yml', 'merge/a.yml'));
+
+    expect(output).to.equal(
+      stripIndent`
+      a:
+        foo: bar
+      b:
+        foo: bar
+      key:
+        first_value: a
+    ` + '\n'
+    );
+  });
+});

yarn.lock

@@ -1483,6 +1483,18 @@ glob@7.1.6, glob@^7.0.0, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"