v8r 0.10.0 → 0.11.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 📦 [0.11.1](https://www.npmjs.com/package/v8r/v/0.11.1) - 2022-03-03
+
+* Fix: call minimatch with `{dot: true}`, fixes [#174](https://github.com/chris48s/v8r/issues/174)
+
+## 📦 [0.11.0](https://www.npmjs.com/package/v8r/v/0.11.0) - 2022-02-27
+
+* Drop compatibility with node 12, now requires node `^14.13.1 || >=15.0.0`
+* Upgrade to got 12 internally
+* Call ajv with `allErrors` flag
+
+## 📦 [0.10.1](https://www.npmjs.com/package/v8r/v/0.10.1) - 2022-01-06
+
+* Fix `--version` flag when installed globally in some environments
+
 ## 📦 [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:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v8r",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "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\"",
@@ -29,11 +29,11 @@
     "chalk": "^5.0.0",
     "flat-cache": "^3.0.4",
     "glob": "^7.2.0",
-    "got": "^11.8.0",
+    "got": "^12.0.1",
     "is-url": "^1.2.4",
     "js-yaml": "^4.0.0",
     "json5": "^2.2.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^5.0.1",
     "yargs": "^17.0.1"
   },
   "devDependencies": {
@@ -42,14 +42,14 @@
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-mocha": "^10.0.3",
     "eslint-plugin-prettier": "^4.0.0",
     "mocha": "^9.0.0",
     "nock": "^13.0.4",
     "prettier": "^2.1.2"
   },
   "engines": {
-    "node": "^12.20.0 || ^14.13.1 || >=15.0.0"
+    "node": "^14.13.1 || >=15.0.0"
   },
   "type": "module",
   "keywords": [

package/src/ajv.js

@@ -11,7 +11,7 @@ import addFormats from "ajv-formats";
 
 function _ajvFactory(schema, cache) {
   const resolver = (url) => cache.fetch(url);
-  const opts = { loadSchema: resolver, strict: "log" };
+  const opts = { allErrors: true, loadSchema: resolver, strict: "log" };
 
   if (
     typeof schema["$schema"] === "string" ||

package/src/catalogs.js

@@ -0,0 +1,68 @@
+import minimatch from "minimatch";
+import path from "path";
+import { validate } from "./ajv.js";
+import { getFromUrlOrFile } from "./io.js";
+import logging from "./logging.js";
+
+const SCHEMASTORE_CATALOG_SCHEMA_URL =
+  "https://json.schemastore.org/schema-catalog.json";
+
+async function getSchemaUrlForFilename(catalogs, filename, cache) {
+  for (const [i, catalogLocation] of catalogs.entries()) {
+    const catalog = await getFromUrlOrFile(catalogLocation, cache);
+    const catalogSchema = await getFromUrlOrFile(
+      SCHEMASTORE_CATALOG_SCHEMA_URL,
+      cache
+    );
+
+    // Validate the catalog
+    const valid = await validate(catalog, catalogSchema, cache);
+    if (!valid || catalog.schemas === undefined) {
+      throw new Error(`Malformed catalog at ${catalogLocation}`);
+    }
+
+    const { schemas } = catalog;
+    const matches = getSchemaMatchesForFilename(schemas, filename);
+    logging.debug(`Searching for schema in ${catalogLocation} ...`);
+    if (matches.length === 1) {
+      logging.info(`Found schema in ${catalogLocation} ...`);
+      return matches[0].url; // Match found. We're done.
+    }
+    if (matches.length === 0 && i < catalogs.length - 1) {
+      continue; // No match found. Try the next catalog in the array.
+    }
+    if (matches.length > 1) {
+      // We found >1 matches in the same catalog. This is always a hard error.
+      const matchesLog = matches
+        .map((match) => `  ${match.description}: ${match.url}`)
+        .join("\n");
+      logging.info(
+        `Found multiple possible schemas for ${filename}. Possible matches:\n${matchesLog}`
+      );
+    }
+    // Either we found >1 matches in the same catalog or we found 0 matches
+    // in the last catalog and there are no more catalogs left to try.
+    throw new Error(`Could not find a schema to validate ${filename}`);
+  }
+}
+
+function getSchemaMatchesForFilename(schemas, filename) {
+  const matches = [];
+  schemas.forEach(function (schema) {
+    if ("fileMatch" in schema) {
+      if (schema.fileMatch.includes(path.basename(filename))) {
+        matches.push(schema);
+        return;
+      }
+      for (const glob of schema.fileMatch) {
+        if (minimatch(path.normalize(filename), glob, { dot: true })) {
+          matches.push(schema);
+          break;
+        }
+      }
+    }
+  });
+  return matches;
+}
+
+export { getSchemaMatchesForFilename, getSchemaUrlForFilename };

package/src/cli.js

@@ -1,23 +1,21 @@
 import flatCache from "flat-cache";
 import fs from "fs";
-import isUrl from "is-url";
-import minimatch from "minimatch";
+import { createRequire } from "module";
 import os from "os";
 import path from "path";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { validate } from "./ajv.js";
 import { Cache } from "./cache.js";
+import { getSchemaUrlForFilename } from "./catalogs.js";
 import { getFiles } from "./glob.js";
+import { getFromUrlOrFile } from "./io.js";
 import logging from "./logging.js";
 import { parseFile } from "./parser.js";
 
 const SCHEMASTORE_CATALOG_URL =
   "https://www.schemastore.org/api/json/catalog.json";
 
-const SCHEMASTORE_CATALOG_SCHEMA_URL =
-  "https://json.schemastore.org/schema-catalog.json";
-
 const EXIT = {
   VALID: 0,
   ERROR: 1,
@@ -27,70 +25,6 @@ const EXIT = {
 
 const CACHE_DIR = path.join(os.tmpdir(), "flat-cache");
 
-async function getFromUrlOrFile(location, cache) {
-  return isUrl(location)
-    ? await cache.fetch(location)
-    : JSON.parse(await fs.promises.readFile(location, "utf8"));
-}
-
-async function getSchemaUrlForFilename(catalogs, filename, cache) {
-  for (const [i, catalogLocation] of catalogs.entries()) {
-    const catalog = await getFromUrlOrFile(catalogLocation, cache);
-    const catalogSchema = await getFromUrlOrFile(
-      SCHEMASTORE_CATALOG_SCHEMA_URL,
-      cache
-    );
-
-    // Validate the catalog
-    const valid = await validate(catalog, catalogSchema, cache);
-    if (!valid || catalog.schemas === undefined) {
-      throw new Error(`Malformed catalog at ${catalogLocation}`);
-    }
-
-    const { schemas } = catalog;
-    const matches = getSchemaMatchesForFilename(schemas, filename);
-    logging.debug(`Searching for schema in ${catalogLocation} ...`);
-    if (matches.length === 1) {
-      logging.info(`Found schema in ${catalogLocation} ...`);
-      return matches[0].url; // Match found. We're done.
-    }
-    if (matches.length === 0 && i < catalogs.length - 1) {
-      continue; // No match found. Try the next catalog in the array.
-    }
-    if (matches.length > 1) {
-      // We found >1 matches in the same catalog. This is always a hard error.
-      const matchesLog = matches
-        .map((match) => `  ${match.description}: ${match.url}`)
-        .join("\n");
-      logging.info(
-        `Found multiple possible schemas for ${filename}. Possible matches:\n${matchesLog}`
-      );
-    }
-    // Either we found >1 matches in the same catalog or we found 0 matches
-    // in the last catalog and there are no more catalogs left to try.
-    throw new Error(`Could not find a schema to validate ${filename}`);
-  }
-}
-
-function getSchemaMatchesForFilename(schemas, filename) {
-  const matches = [];
-  schemas.forEach(function (schema) {
-    if ("fileMatch" in schema) {
-      if (schema.fileMatch.includes(path.basename(filename))) {
-        matches.push(schema);
-        return;
-      }
-      for (const glob of schema.fileMatch) {
-        if (minimatch(path.normalize(filename), glob)) {
-          matches.push(schema);
-          break;
-        }
-      }
-    }
-  });
-  return matches;
-}
-
 function secondsToMilliseconds(seconds) {
   return seconds * 1000;
 }
@@ -202,9 +136,7 @@ function parseArgs(argv) {
     .version(
       // Workaround for https://github.com/yargs/yargs/issues/1934
       // TODO: remove once fixed
-      JSON.parse(
-        fs.readFileSync(new URL("../package.json", import.meta.url).pathname)
-      ).version
+      createRequire(import.meta.url)("../package.json").version
     )
     .option("verbose", {
       alias: "v",

package/src/io.js

@@ -0,0 +1,10 @@
+import fs from "fs";
+import isUrl from "is-url";
+
+async function getFromUrlOrFile(location, cache) {
+  return isUrl(location)
+    ? await cache.fetch(location)
+    : JSON.parse(await fs.promises.readFile(location, "utf8"));
+}
+
+export { getFromUrlOrFile };