Replaced all format strings with ES6 template literals

JamesMessinger · JamesMessinger · commit fcf64c1370d4 · 2019-06-11T05:10:19.000-05:00
diff --git a/lib/dereference.js b/lib/dereference.js
@@ -2,7 +2,7 @@
 
 const $Ref = require("./ref");
 const Pointer = require("./pointer");
-const ono = require("ono");
+const { ono } = require("ono");
 const url = require("./util/url");
 
 module.exports = dereference;
@@ -143,7 +143,7 @@ function dereference$Ref ($ref, path, pathFromRoot, parents, $refs, options) {
 function foundCircularReference (keyPath, $refs, options) {
   $refs.circular = true;
   if (!options.dereference.circular) {
-    throw ono.reference("Circular $ref pointer found at %s", keyPath);
+    throw ono.reference(`Circular $ref pointer found at ${keyPath}`);
   }
   return true;
 }
diff --git a/lib/index.js b/lib/index.js
@@ -9,7 +9,7 @@ const bundle = require("./bundle");
 const dereference = require("./dereference");
 const url = require("./util/url");
 const maybe = require("call-me-maybe");
-const ono = require("ono");
+const { ono } = require("ono");
 
 module.exports = $RefParser;
 module.exports.YAML = require("./util/yaml");
@@ -71,7 +71,7 @@ $RefParser.prototype.parse = function (path, schema, options, callback) {
   let promise;
 
   if (!args.path && !args.schema) {
-    let err = ono("Expected a file path, URL, or object. Got %s", args.path || args.schema);
+    let err = ono(`Expected a file path, URL, or object. Got ${args.path || args.schema}`);
     return maybe(args.callback, Promise.reject(err));
   }
 
@@ -111,7 +111,7 @@ $RefParser.prototype.parse = function (path, schema, options, callback) {
   return promise
     .then((result) => {
       if (!result || typeof result !== "object" || Buffer.isBuffer(result)) {
-        throw ono.syntax('"%s" is not a valid JSON Schema', me.$refs._root$Ref.path || result);
+        throw ono.syntax(`"${me.$refs._root$Ref.path || result}" is not a valid JSON Schema`);
       }
       else {
         me.schema = result;
diff --git a/lib/parse.js b/lib/parse.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const ono = require("ono");
+const { ono } = require("ono");
 const url = require("./util/url");
 const plugins = require("./util/plugins");
 
@@ -79,7 +79,7 @@ function readFile (file, options) {
         reject(err);
       }
       else {
-        reject(ono.syntax('Unable to resolve $ref pointer "%s"', file.url));
+        reject(ono.syntax(`Unable to resolve $ref pointer "${file.url}"`));
       }
     }
   }));
@@ -115,7 +115,7 @@ function parseFile (file, options) {
 
     function onParsed (parser) {
       if (!parser.plugin.allowEmpty && isEmpty(parser.result)) {
-        reject(ono.syntax('Error parsing "%s" as %s. \nParsed value is empty', file.url, parser.plugin.name));
+        reject(ono.syntax(`Error parsing "${file.url}" as ${parser.plugin.name}. \nParsed value is empty`));
       }
       else {
         resolve(parser);
@@ -125,10 +125,10 @@ function parseFile (file, options) {
     function onError (err) {
       if (err) {
         err = err instanceof Error ? err : new Error(err);
-        reject(ono.syntax(err, "Error parsing %s", file.url));
+        reject(ono.syntax(err, `Error parsing ${file.url}`));
       }
       else {
-        reject(ono.syntax("Unable to parse %s", file.url));
+        reject(ono.syntax(`Unable to parse ${file.url}`));
       }
     }
   }));
diff --git a/lib/pointer.js b/lib/pointer.js
@@ -4,7 +4,7 @@ module.exports = Pointer;
 
 const $Ref = require("./ref");
 const url = require("./util/url");
-const ono = require("ono");
+const { ono } = require("ono");
 const slashes = /\//g;
 const tildes = /~/g;
 const escapedSlash = /~1/g;
@@ -84,7 +84,7 @@ Pointer.prototype.resolve = function (obj, options) {
 
     let token = tokens[i];
     if (this.value[token] === undefined) {
-      throw ono.syntax('Error resolving $ref pointer "%s". \nToken "%s" does not exist.', this.originalPath, token);
+      throw ono.syntax(`Error resolving $ref pointer "${this.originalPath}". \nToken "${token}" does not exist.`);
     }
     else {
       this.value = this.value[token];
@@ -171,7 +171,7 @@ Pointer.parse = function (path) {
   }
 
   if (pointer[0] !== "") {
-    throw ono.syntax('Invalid $ref pointer "%s". Pointers must begin with "#/"', pointer);
+    throw ono.syntax(`Invalid $ref pointer "${pointer}". Pointers must begin with "#/"`);
   }
 
   return pointer.slice(1);
@@ -264,7 +264,7 @@ function setValue (pointer, token, value) {
     }
   }
   else {
-    throw ono.syntax('Error assigning $ref pointer "%s". \nCannot set "%s" of a non-object.', pointer.path, token);
+    throw ono.syntax(`Error assigning $ref pointer "${pointer.path}". \nCannot set "${token}" of a non-object.`);
   }
   return value;
 }
diff --git a/lib/refs.js b/lib/refs.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const ono = require("ono");
+const { ono } = require("ono");
 const $Ref = require("./ref");
 const url = require("./util/url");
 
@@ -111,7 +111,7 @@ $Refs.prototype.set = function (path, value) {
   let $ref = this._$refs[withoutHash];
 
   if (!$ref) {
-    throw ono('Error resolving $ref pointer "%s". \n"%s" not found.', path, withoutHash);
+    throw ono(`Error resolving $ref pointer "${path}". \n"${withoutHash}" not found.`);
   }
 
   $ref.set(absPath, value);
@@ -149,7 +149,7 @@ $Refs.prototype._resolve = function (path, options) {
   let $ref = this._$refs[withoutHash];
 
   if (!$ref) {
-    throw ono('Error resolving $ref pointer "%s". \n"%s" not found.', path, withoutHash);
+    throw ono(`Error resolving $ref pointer "${path}". \n"${withoutHash}" not found.`);
   }
 
   return $ref.resolve(absPath, options, path);
diff --git a/lib/resolvers/file.js b/lib/resolvers/file.js
@@ -1,6 +1,6 @@
 "use strict";
 const fs = require("fs");
-const ono = require("ono");
+const { ono } = require("ono");
 const url = require("../util/url");
 
 module.exports = {
@@ -40,23 +40,23 @@ module.exports = {
         path = url.toFileSystemPath(file.url);
       }
       catch (err) {
-        reject(ono.uri(err, "Malformed URI: %s", file.url));
+        reject(ono.uri(err, `Malformed URI: ${file.url}`));
       }
 
       // console.log('Opening file: %s', path);
 
       try {
         fs.readFile(path, (err, data) => {
           if (err) {
-            reject(ono(err, 'Error opening file "%s"', path));
+            reject(ono(err, `Error opening file "${path}"`));
           }
           else {
             resolve(data);
           }
         });
       }
       catch (err) {
-        reject(ono(err, 'Error opening file "%s"', path));
+        reject(ono(err, `Error opening file "${path}"`));
       }
     }));
   }
diff --git a/lib/resolvers/http.js b/lib/resolvers/http.js
@@ -2,7 +2,7 @@
 
 const http = require("http");
 const https = require("https");
-const ono = require("ono");
+const { ono } = require("ono");
 const url = require("../util/url");
 
 module.exports = {
@@ -102,15 +102,15 @@ function download (u, httpOptions, redirects) {
     get(u, httpOptions)
       .then((res) => {
         if (res.statusCode >= 400) {
-          throw ono({ status: res.statusCode }, "HTTP ERROR %d", res.statusCode);
+          throw ono({ status: res.statusCode }, `HTTP ERROR ${res.statusCode}`);
         }
         else if (res.statusCode >= 300) {
           if (redirects.length > httpOptions.redirects) {
-            reject(ono({ status: res.statusCode }, "Error downloading %s. \nToo many redirects: \n  %s",
-              redirects[0], redirects.join(" \n  ")));
+            reject(ono({ status: res.statusCode },
+              `Error downloading ${redirects[0]}. \nToo many redirects: \n  ${redirects.join(" \n  ")}`));
           }
           else if (!res.headers.location) {
-            throw ono({ status: res.statusCode }, "HTTP %d redirect with no location header", res.statusCode);
+            throw ono({ status: res.statusCode }, `HTTP ${res.statusCode} redirect with no location header`);
           }
           else {
             // console.log('HTTP %d redirect %s -> %s', res.statusCode, u.href, res.headers.location);
@@ -123,7 +123,7 @@ function download (u, httpOptions, redirects) {
         }
       })
       .catch((err) => {
-        reject(ono(err, "Error downloading", u.href));
+        reject(ono(err, `Error downloading ${u.href}`));
       });
   }));
 }
diff --git a/lib/util/yaml.js b/lib/util/yaml.js
@@ -2,7 +2,7 @@
 "use strict";
 
 const yaml = require("js-yaml");
-const ono = require("ono");
+const { ono } = require("ono");
 
 /**
  * Simple YAML parsing functions, similar to {@link JSON.parse} and {@link JSON.stringify}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`"use strict";`
`2`	`2`
`3`		`-const ono = require("ono");`
	`3`	`+const { ono } = require("ono");`
`4`	`4`	`const url = require("./util/url");`
`5`	`5`	`const plugins = require("./util/plugins");`
`6`	`6`
`@@ -79,7 +79,7 @@ function readFile (file, options) {`
`79`	`79`	`reject(err);`
`80`	`80`	`}`
`81`	`81`	`else {`
`82`		`- reject(ono.syntax('Unable to resolve $ref pointer "%s"', file.url));`
	`82`	+ reject(ono.syntax(`Unable to resolve $ref pointer "${file.url}"`));
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}));`
`@@ -115,7 +115,7 @@ function parseFile (file, options) {`
`115`	`115`
`116`	`116`	`function onParsed (parser) {`
`117`	`117`	`if (!parser.plugin.allowEmpty && isEmpty(parser.result)) {`
`118`		`- reject(ono.syntax('Error parsing "%s" as %s. \nParsed value is empty', file.url, parser.plugin.name));`
	`118`	+ reject(ono.syntax(`Error parsing "${file.url}" as ${parser.plugin.name}. \nParsed value is empty`));
`119`	`119`	`}`
`120`	`120`	`else {`
`121`	`121`	`resolve(parser);`
`@@ -125,10 +125,10 @@ function parseFile (file, options) {`
`125`	`125`	`function onError (err) {`
`126`	`126`	`if (err) {`
`127`	`127`	`err = err instanceof Error ? err : new Error(err);`
`128`		`- reject(ono.syntax(err, "Error parsing %s", file.url));`
	`128`	+ reject(ono.syntax(err, `Error parsing ${file.url}`));
`129`	`129`	`}`
`130`	`130`	`else {`
`131`		`- reject(ono.syntax("Unable to parse %s", file.url));`
	`131`	+ reject(ono.syntax(`Unable to parse ${file.url}`));
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}));`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ module.exports = Pointer;`
`4`	`4`
`5`	`5`	`const $Ref = require("./ref");`
`6`	`6`	`const url = require("./util/url");`
`7`		`-const ono = require("ono");`
	`7`	`+const { ono } = require("ono");`
`8`	`8`	`const slashes = /\//g;`
`9`	`9`	`const tildes = /~/g;`
`10`	`10`	`const escapedSlash = /~1/g;`
`@@ -84,7 +84,7 @@ Pointer.prototype.resolve = function (obj, options) {`
`84`	`84`
`85`	`85`	`let token = tokens[i];`
`86`	`86`	`if (this.value[token] === undefined) {`
`87`		`- throw ono.syntax('Error resolving $ref pointer "%s". \nToken "%s" does not exist.', this.originalPath, token);`
	`87`	+ throw ono.syntax(`Error resolving $ref pointer "${this.originalPath}". \nToken "${token}" does not exist.`);
`88`	`88`	`}`
`89`	`89`	`else {`
`90`	`90`	`this.value = this.value[token];`
`@@ -171,7 +171,7 @@ Pointer.parse = function (path) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if (pointer[0] !== "") {`
`174`		`- throw ono.syntax('Invalid $ref pointer "%s". Pointers must begin with "#/"', pointer);`
	`174`	+ throw ono.syntax(`Invalid $ref pointer "${pointer}". Pointers must begin with "#/"`);
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`return pointer.slice(1);`
`@@ -264,7 +264,7 @@ function setValue (pointer, token, value) {`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`	`else {`
`267`		`- throw ono.syntax('Error assigning $ref pointer "%s". \nCannot set "%s" of a non-object.', pointer.path, token);`
	`267`	+ throw ono.syntax(`Error assigning $ref pointer "${pointer.path}". \nCannot set "${token}" of a non-object.`);
`268`	`268`	`}`
`269`	`269`	`return value;`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`"use strict";`
`2`	`2`	`const fs = require("fs");`
`3`		`-const ono = require("ono");`
	`3`	`+const { ono } = require("ono");`
`4`	`4`	`const url = require("../util/url");`
`5`	`5`
`6`	`6`	`module.exports = {`
`@@ -40,23 +40,23 @@ module.exports = {`
`40`	`40`	`path = url.toFileSystemPath(file.url);`
`41`	`41`	`}`
`42`	`42`	`catch (err) {`
`43`		`- reject(ono.uri(err, "Malformed URI: %s", file.url));`
	`43`	+ reject(ono.uri(err, `Malformed URI: ${file.url}`));
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// console.log('Opening file: %s', path);`
`47`	`47`
`48`	`48`	`try {`
`49`	`49`	`fs.readFile(path, (err, data) => {`
`50`	`50`	`if (err) {`
`51`		`- reject(ono(err, 'Error opening file "%s"', path));`
	`51`	+ reject(ono(err, `Error opening file "${path}"`));
`52`	`52`	`}`
`53`	`53`	`else {`
`54`	`54`	`resolve(data);`
`55`	`55`	`}`
`56`	`56`	`});`
`57`	`57`	`}`
`58`	`58`	`catch (err) {`
`59`		`- reject(ono(err, 'Error opening file "%s"', path));`
	`59`	+ reject(ono(err, `Error opening file "${path}"`));
`60`	`60`	`}`
`61`	`61`	`}));`
`62`	`62`	`}`