v8r 0.9.0 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 📦 [0.10.0](https://www.npmjs.com/package/v8r/v/0.10.0) - 2022-01-03
+
+* Accept multiple filenames or globs as positional args. e.g:
+  ```bash
+  v8r file1.json file2.json 'dir/*.yaml'
+  ```
+
 ## 📦 [0.9.0](https://www.npmjs.com/package/v8r/v/0.9.0) - 2021-12-27
 
 * Accept glob pattern instead of filename. It is now possible to validate multiple files at once. e.g:

package/README.md

@@ -25,15 +25,17 @@ v8r <filename>
 
 ### Validating files
 
-v8r can validate JSON or YAML files. You can pass either a single filename or a glob pattern:
+v8r can validate JSON or YAML files. You can pass filenames or glob patterns:
 
 ```bash
 # single filename
 $ v8r package.json
 
+# multiple files
+$ v8r file1.json file2.json
+
 # glob patterns
-$ v8r '**/.eslintrc.yml'
-$ v8r '{file1.json,file2.json}'
+$ v8r 'dir/*.yml' 'dir/*.yaml'
 ```
 
 [DigitalOcean's Glob Tool](https://www.digitalocean.com/community/tools/glob) can be used to help construct glob patterns
@@ -78,7 +80,7 @@ This can be used to specify different custom schemas for multiple file patterns.
 ## Exit codes
 
 * v8r always exits with code `0` when:
-    * The input glob pattern matched one or more files, all input files were validated against a schema, and all input files were **valid**
+    * The input glob pattern(s) matched one or more files, all input files were validated against a schema, and all input files were **valid**
     * `v8r` was called with `--help` or `--version` flags
 
 * By default v8r exits with code `1` when an error was encountered trying to validate one or more input files. For example:
@@ -90,8 +92,8 @@ This can be used to specify different custom schemas for multiple file patterns.
     This behaviour can be modified using the `--ignore-errors` flag. When invoked with `--ignore-errors` v8r will exit with code `0` even if one of these errors was encountered while attempting validation. A non-zero exit code will only be issued if validation could be completed successfully and the file was invalid.
 
 * v8r always exits with code `98` when:
-    * The input glob pattern was invalid
-    * The input glob pattern was valid but did not match any files
+    * An input glob pattern was invalid
+    * An input glob pattern was valid but did not match any files
 
 * v8r always exits with code `99` when:
     * The input glob pattern matched one or more files, one or more input files were validated against a schema and the input file was **invalid**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v8r",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A command-line JSON and YAML validator that's on your wavelength",
   "scripts": {
     "test": "V8R_CACHE_NAME=v8r-test c8 --reporter=text mocha \"src/**/*.spec.js\"",

package/src/cli.js

@@ -152,11 +152,16 @@ function mergeResults(results, ignoreErrors) {
 
 function Validator() {
   return async function (args) {
-    const filenames = await getFiles(args.pattern);
-    if (filenames.length === 0) {
-      logging.error(`Pattern '${args.pattern}' did not match any files`);
-      return EXIT.NOTFOUND;
+    let filenames = [];
+    for (const pattern of args.patterns) {
+      const matches = await getFiles(pattern);
+      if (matches.length === 0) {
+        logging.error(`Pattern '${pattern}' did not match any files`);
+        return EXIT.NOTFOUND;
+      }
+      filenames = filenames.concat(matches);
     }
+
     const ttl = secondsToMilliseconds(args.cacheTtl || 0);
     const cache = new Cache(getFlatCache(), ttl);
 
@@ -185,11 +190,12 @@ async function cli(args) {
 function parseArgs(argv) {
   return yargs(hideBin(argv))
     .command(
-      "$0 <pattern>",
+      "$0 <patterns..>",
       "Validate local json/yaml files against schema(s)",
       (yargs) => {
-        yargs.positional("pattern", {
-          describe: "Glob pattern describing local file or files to validate",
+        yargs.positional("patterns", {
+          describe:
+            "One or more filenames or glob patterns describing local file or files to validate",
         });
       }
     )
@@ -212,8 +218,8 @@ function parseArgs(argv) {
       describe:
         "Local path or URL of a schema to validate against. " +
         "If not supplied, we will attempt to find an appropriate schema on " +
-        "schemastore.org using the filename. If passed with a glob pattern " +
-        "that matches multiple files, all matching files will be validated " +
+        "schemastore.org using the filename. If passed with glob pattern(s) " +
+        "matching multiple files, all matching files will be validated " +
         "against this schema",
     })
     .option("catalogs", {