unexpectedly 2.0.0 → 3.0.3

package/bin/unexpectedly.js

@@ -1,25 +1,17 @@
 #!/usr/bin/env -S node --experimental-vm-modules --no-warnings
-/* eslint-disable no-console */
-
-import {Command, Option} from 'commander';
-import fs from 'node:fs/promises';
+import {Command} from 'commander';
 import {suite} from '../index.js';
+import {version} from '../version.js';
 
 let failures = 0;
 
 async function main() {
-  const pkg = JSON.parse(await fs.readFile(
-    new URL('../package.json', import.meta.url),
-    'utf-8'
-  ));
-
   const program = new Command();
   const opts = program
-    .version(pkg.version)
-    .argument('[...file]', 'Files or directories to test', './test/')
+    .version(version)
+    .argument('[file...]', 'Files or directories to test', './test/')
     .option('-d,--defaultScript <replacement>', 'Find the script from the file name.  Replace `$<base>` with the basename of the file.', '../$<base>.js')
     .option('-f,--function <functionName>', 'Use this function for testing in the associated script', 'test')
-    .addOption(new Option('-s,--silent18', 'Silently skip mjs tests on node 18.').hideHelp())
     .parse()
     .opts();
 

package/eslint.config.js

@@ -0,0 +1,26 @@
+import base from '@cto.af/eslint-config';
+import mocha from '@cto.af/eslint-config/mocha.js';
+import mod from '@cto.af/eslint-config/module.js';
+
+export default [
+  {
+    ignores: [
+      'docs/**',
+      'coverage/**',
+      '**/*.peg.js',
+      '**/*.d.ts',
+      'test/pkg_bad/package.json',
+    ],
+  },
+  ...base,
+  ...mod,
+  ...mocha,
+  {
+    files: [
+      'test/**/*.js',
+    ],
+    rules: {
+      'n/no-top-level-await': 'off',
+    },
+  },
+];

package/index.js

@@ -116,29 +116,38 @@ export async function suite(target = '.', options = {}) {
         opts.lineOffset = pt.vars.inline.line - 1;
         opts.columnOffset = pt.vars.inline.column;
       } else {
-        opts.filename = pt.vars.script ?
-          path.resolve(dir, pt.vars.script.value) :
-          path.resolve(dir,
-            f.replace(/(?<base>[^\\/]*)\.tests?$/, options.defaultScript));
+        if (pt.vars.script) {
+          opts.filename = path.resolve(dir, pt.vars.script.value);
+        } else {
+          // Avoid a previous ReDOS regexp.
+          const p = path.parse(f);
+          if (/^\.tests?$/.test(p.ext)) {
+            delete p.base;
+            delete p.ext;
+            p.name = p.name.replace(/^(?<base>.*)$/, options.defaultScript);
+            opts.filename = path.resolve(dir, path.format(p));
+          } else {
+            opts.filename = path.resolve(dir, f);
+          }
+        }
         text = await fs.readFile(opts.filename, 'utf8');
       }
       if (pt.vars.timeout) {
         msuite.timeout(parseInt(pt.vars.timeout.value, 10));
       }
       opts.context = mapObj(
-        Object.entries(pt.vars).filter(([k, v]) => !v.env),
+        Object.entries(pt.vars).filter(([_k, v]) => !v.env),
         ([key, value]) => [key, value.value]
       );
       opts.env = mapObj(
-        Object.entries(pt.vars).filter(([k, v]) => v.env),
+        Object.entries(pt.vars).filter(([_k, v]) => v.env),
         ([key, value]) => [key, value.value]
       );
-      opts.silent18 = Boolean(options.silent18);
 
       const runner = new Runner(opts);
 
       const firstLine = (pt.expected === EXCEPTION) ? `! ${pt.inputs[0]}` : pt.expected.split(/\n/)[0];
-      const t = new Mocha.Test(`line ${pt.line}: ${firstLine || '""'}`, async() => {
+      const t = new Mocha.Test(`line ${pt.line}: ${firstLine || '""'}`, async () => {
         let actual = null;
         try {
           actual = await runner.run(text, {
@@ -165,7 +174,7 @@ export async function suite(target = '.', options = {}) {
     }
   }
 
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve, _reject) => {
     mocha.run(resolve);
   });
 }

package/package.json

@@ -1,18 +1,9 @@
 {
   "name": "unexpectedly",
-  "version": "2.0.0",
+  "version": "3.0.3",
   "description": "Keep a bunch of test cases in a file, with their expected results",
   "main": "index.js",
   "type": "module",
-  "scripts": {
-    "build": "peggy -o testFile.peg.js --format es testFile.peggy",
-    "pretest": "npm run build",
-    "test": "c8 npm run runtests",
-    "runtests": "mocha && bin/unexpectedly.js -s test test/pkg_mjs/test test/pkg_cjs/test",
-    "lint": "eslint --ext js,cjs,mjs . bin/*",
-    "ci": "npm run lint && npm run test",
-    "clean": "rimraf coverage testFile.peg.js"
-  },
   "bin": {
     "unexpectedly": "bin/unexpectedly.js"
   },
@@ -32,22 +23,11 @@
   },
   "license": "MPL-2.0",
   "dependencies": {
-    "@peggyjs/from-mem": "1.3.0",
-    "commander": "12.0.0",
-    "mocha": "^10.3.0",
-    "semver": "7.6.0"
-  },
-  "devDependencies": {
-    "@cto.af/eslint-config": "3.1.0",
-    "c8": "9.1.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-jsdoc": "48.2.0",
-    "peggy": "^4.0.2",
-    "rimraf": "5.0.5",
-    "zx": "7.2.3"
+    "@peggyjs/from-mem": "3.1.1",
+    "commander": "14.0.0",
+    "mocha": "^11.7.1"
   },
-  "packageManager": "pnpm@8.15.4",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }

package/runner.js

@@ -1,15 +1,12 @@
 import GrammarLocation from './vendor/peggy/grammar-location.cjs';
 import fromMem from '@peggyjs/from-mem';
 import path from 'node:path';
-import semver from 'semver';
 
 const PREFIX_MJS = 'export default ';
 const PREFIX_CJS = 'module.exports = ';
 const PREFIX_MJS_LEN = PREFIX_MJS.length;
 const PREFIX_CJS_LEN = PREFIX_CJS.length;
 
-const is20 = semver.satisfies(process.version, '>=20.8');
-
 export const SKIPPED = Symbol('SKIPPED');
 
 /**
@@ -28,7 +25,6 @@ export class Runner {
   #env;
   #filename;
   #lineOffset;
-  #silent18;
   #testFunction;
   #type;
   #skipped;
@@ -39,7 +35,6 @@ export class Runner {
     columnOffset = 0,
     context = {},
     env = {},
-    silent18 = false,
     testFunction = 'test',
     type = 'guess',
   } = {}) {
@@ -52,7 +47,6 @@ export class Runner {
     this.#context = context;
     this.#columnOffset = columnOffset;
     this.#lineOffset = lineOffset;
-    this.#silent18 = silent18;
     this.#skipped = null;
     this.#type = type;
     this.#testFunction = testFunction;
@@ -69,11 +63,6 @@ export class Runner {
 
     let columnOffset = this.#columnOffset;
     if (format === 'es') {
-      if (this.#silent18 && !is20) {
-        this.#skipped = true;
-        return SKIPPED;
-      }
-
       if (text.indexOf('export') === -1) {
         text = PREFIX_MJS + text; // Most common case
         columnOffset -= PREFIX_MJS_LEN;

package/testFile.peg.js

@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.2.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -6,252 +6,239 @@
 
 import { mapObj } from './utils.js'
 
-function peg$subclass(child, parent) {
-  function C() { this.constructor = child; }
-  C.prototype = parent.prototype;
-  child.prototype = new C();
-}
-
-function peg$SyntaxError(message, expected, found, location) {
-  var self = Error.call(this, message);
-  // istanbul ignore next Check is a necessary evil to support older environments
-  if (Object.setPrototypeOf) {
-    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
   }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
-
-peg$subclass(peg$SyntaxError, Error);
-
-function peg$padEnd(str, targetLength, padString) {
-  padString = padString || " ";
-  if (str.length > targetLength) { return str; }
-  targetLength -= str.length;
-  padString += padString.repeat(targetLength);
-  return str + padString.slice(0, targetLength);
-}
 
-peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
-  if (this.location) {
-    var src = null;
-    var k;
-    for (k = 0; k < sources.length; k++) {
-      if (sources[k].source === this.location.source) {
-        src = sources[k].text.split(/\r\n|\n|\r/g);
-        break;
+  format(sources) {
+    let str = "Error: " + this.message;
+    if (this.location) {
+      let src = null;
+      const st = sources.find(s => s.source === this.location.source);
+      if (st) {
+        src = st.text.split(/\r\n|\n|\r/g);
+      }
+      const s = this.location.start;
+      const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+        ? this.location.source.offset(s)
+        : s;
+      const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+      if (src) {
+        const e = this.location.end;
+        const filler = "".padEnd(offset_s.line.toString().length, " ");
+        const line = src[s.line - 1];
+        const last = s.line === e.line ? e.column : line.length + 1;
+        const hatLen = (last - s.column) || 1;
+        str += "\n --> " + loc + "\n"
+            + filler + " |\n"
+            + offset_s.line + " | " + line + "\n"
+            + filler + " | " + "".padEnd(s.column - 1, " ")
+            + "".padEnd(hatLen, "^");
+      } else {
+        str += "\n at " + loc;
       }
     }
-    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
-    if (src) {
-      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
-      var line = src[s.line - 1];
-      var last = s.line === e.line ? e.column : line.length + 1;
-      var hatLen = (last - s.column) || 1;
-      str += "\n --> " + loc + "\n"
-          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
-          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
-          + peg$padEnd("", hatLen, "^");
-    } else {
-      str += "\n at " + loc;
-    }
+    return str;
   }
-  return str;
-};
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
 
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+    const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+      ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+      : null;
+    function unicodeEscape(s) {
+      if (nonPrintable) {
+        return s.replace(nonPrintable,  ch => "\\u{" + hex(ch) + "}");
+      }
+      return s;
+    }
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+    function literalEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g,  "\\\"")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-    any: function() {
-      return "any character";
-    },
+    function classEscape(s) {
+      return unicodeEscape(s
+        .replace(/\\/g, "\\\\")
+        .replace(/\]/g, "\\]")
+        .replace(/\^/g, "\\^")
+        .replace(/-/g,  "\\-")
+        .replace(/\0/g, "\\0")
+        .replace(/\t/g, "\\t")
+        .replace(/\n/g, "\\n")
+        .replace(/\r/g, "\\r")
+        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
+        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+    }
 
-    end: function() {
-      return "end of input";
-    },
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-    other: function(expectation) {
-      return expectation.description;
-    }
-  };
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-  function literalEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/"/g,  "\\\"")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+      any() {
+        return "any character";
+      },
 
-  function classEscape(s) {
-    return s
-      .replace(/\\/g, "\\\\")
-      .replace(/\]/g, "\\]")
-      .replace(/\^/g, "\\^")
-      .replace(/-/g,  "\\-")
-      .replace(/\0/g, "\\0")
-      .replace(/\t/g, "\\t")
-      .replace(/\n/g, "\\n")
-      .replace(/\r/g, "\\r")
-      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
-      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
-  }
+      end() {
+        return "end of input";
+      },
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+    }
 
-    descriptions.sort();
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
+      if (descriptions.length > 0) {
+        let j = 1;
+        for (let i = 1; i < descriptions.length; i++) {
+          if (descriptions[i - 1] !== descriptions[i]) {
+            descriptions[j] = descriptions[i];
+            j++;
+          }
         }
+        descriptions.length = j;
       }
-      descriptions.length = j;
-    }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-      case 2:
-        return descriptions[0] + " or " + descriptions[1];
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-      default:
-        return descriptions.slice(0, -1).join(", ")
-          + ", or "
-          + descriptions[descriptions.length - 1];
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
+      }
     }
-  }
 
-  function describeFound(found) {
-    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
-  }
+    function describeFound(found) {
+      return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+    }
 
-  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
-};
+    return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+  }
+}
 
 function peg$parse(input, options) {
   options = options !== undefined ? options : {};
 
-  var peg$FAILED = {};
-  var peg$source = options.grammarSource;
-
-  var peg$startRuleFunctions = { start: peg$parsestart };
-  var peg$startRuleFunction = peg$parsestart;
-
-  var peg$c0 = "#!";
-  var peg$c1 = "!";
-  var peg$c2 = ":";
-  var peg$c3 = "\"";
-  var peg$c4 = "'";
-  var peg$c5 = "`";
-  var peg$c6 = "\\\"";
-  var peg$c7 = "\\'";
-  var peg$c8 = "\\`";
-  var peg$c9 = "0x";
-  var peg$c10 = "\\\\";
-  var peg$c11 = "\\r";
-  var peg$c12 = "\\n";
-  var peg$c13 = "\\t";
-  var peg$c14 = "\\#";
-  var peg$c15 = "\\:";
-  var peg$c16 = "\\ ";
-  var peg$c17 = "#";
-  var peg$c18 = "\n";
-  var peg$c19 = "\r\n";
-  var peg$c20 = "\r";
-
-  var peg$r0 = /^[^\\"]/;
-  var peg$r1 = /^[^\\']/;
-  var peg$r2 = /^[^\\`]/;
-  var peg$r3 = /^[a-fA-F0-9]/;
-  var peg$r4 = /^[^ #:'"\t\r\n]/;
-  var peg$r5 = /^[^\r\n]/;
-  var peg$r6 = /^[ \t]/;
-  var peg$r7 = /^[ \t\r\n]/;
-
-  var peg$e0 = peg$literalExpectation("#!", false);
-  var peg$e1 = peg$literalExpectation("!", false);
-  var peg$e2 = peg$literalExpectation(":", false);
-  var peg$e3 = peg$literalExpectation("\"", false);
-  var peg$e4 = peg$literalExpectation("'", false);
-  var peg$e5 = peg$literalExpectation("`", false);
-  var peg$e6 = peg$otherExpectation("characters that go inside double quotes, including escaped dquotes");
-  var peg$e7 = peg$literalExpectation("\\\"", false);
-  var peg$e8 = peg$classExpectation(["\\", "\""], true, false);
-  var peg$e9 = peg$otherExpectation("characters that go inside single quotes, including escaped squotes");
-  var peg$e10 = peg$literalExpectation("\\'", false);
-  var peg$e11 = peg$classExpectation(["\\", "'"], true, false);
-  var peg$e12 = peg$otherExpectation("characters that go inside back quotes, including escaped bquotes");
-  var peg$e13 = peg$literalExpectation("\\`", false);
-  var peg$e14 = peg$classExpectation(["\\", "`"], true, false);
-  var peg$e15 = peg$literalExpectation("0x", false);
-  var peg$e16 = peg$classExpectation([["a", "f"], ["A", "F"], ["0", "9"]], false, false);
-  var peg$e17 = peg$otherExpectation("words can contain quoted bits");
-  var peg$e18 = peg$classExpectation([" ", "#", ":", "'", "\"", "\t", "\r", "\n"], true, false);
-  var peg$e19 = peg$otherExpectation("other quoted characters, as needed");
-  var peg$e20 = peg$literalExpectation("\\\\", false);
-  var peg$e21 = peg$literalExpectation("\\r", false);
-  var peg$e22 = peg$literalExpectation("\\n", false);
-  var peg$e23 = peg$literalExpectation("\\t", false);
-  var peg$e24 = peg$literalExpectation("\\#", false);
-  var peg$e25 = peg$literalExpectation("\\:", false);
-  var peg$e26 = peg$literalExpectation("\\ ", false);
-  var peg$e27 = peg$literalExpectation("#", false);
-  var peg$e28 = peg$classExpectation(["\r", "\n"], true, false);
-  var peg$e29 = peg$otherExpectation("optional whitespace");
-  var peg$e30 = peg$classExpectation([" ", "\t"], false, false);
-  var peg$e31 = peg$otherExpectation("optional whitespace, including newlines");
-  var peg$e32 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
-  var peg$e33 = peg$otherExpectation("required whitespace");
-  var peg$e34 = peg$otherExpectation("End of line");
-  var peg$e35 = peg$literalExpectation("\n", false);
-  var peg$e36 = peg$literalExpectation("\r\n", false);
-  var peg$e37 = peg$literalExpectation("\r", false);
-
-  var peg$f0 = function(all) {
-    return all.filter(t => t && t.hasOwnProperty('expected'));
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
+
+  const peg$startRuleFunctions = {
+    start: peg$parsestart,
   };
-  var peg$f1 = function(env, name, value) {
+  let peg$startRuleFunction = peg$parsestart;
+
+  const peg$c0 = "#!";
+  const peg$c1 = "!";
+  const peg$c2 = ":";
+  const peg$c3 = "\"";
+  const peg$c4 = "'";
+  const peg$c5 = "`";
+  const peg$c6 = "\\\"";
+  const peg$c7 = "\\'";
+  const peg$c8 = "\\`";
+  const peg$c9 = "0x";
+  const peg$c10 = "\\\\";
+  const peg$c11 = "\\r";
+  const peg$c12 = "\\n";
+  const peg$c13 = "\\t";
+  const peg$c14 = "\\#";
+  const peg$c15 = "\\:";
+  const peg$c16 = "\\ ";
+  const peg$c17 = "#";
+  const peg$c18 = "\n";
+  const peg$c19 = "\r\n";
+  const peg$c20 = "\r";
+
+  const peg$r0 = /^[^\\"]/;
+  const peg$r1 = /^[^\\']/;
+  const peg$r2 = /^[^\\`]/;
+  const peg$r3 = /^[a-fA-F0-9]/;
+  const peg$r4 = /^[^ #:'"\t\r\n]/;
+  const peg$r5 = /^[^\r\n]/;
+  const peg$r6 = /^[ \t]/;
+  const peg$r7 = /^[ \t\r\n]/;
+
+  const peg$e0 = peg$literalExpectation("#!", false);
+  const peg$e1 = peg$literalExpectation("!", false);
+  const peg$e2 = peg$literalExpectation(":", false);
+  const peg$e3 = peg$literalExpectation("\"", false);
+  const peg$e4 = peg$literalExpectation("'", false);
+  const peg$e5 = peg$literalExpectation("`", false);
+  const peg$e6 = peg$otherExpectation("characters that go inside double quotes, including escaped dquotes");
+  const peg$e7 = peg$literalExpectation("\\\"", false);
+  const peg$e8 = peg$classExpectation(["\\", "\""], true, false, false);
+  const peg$e9 = peg$otherExpectation("characters that go inside single quotes, including escaped squotes");
+  const peg$e10 = peg$literalExpectation("\\'", false);
+  const peg$e11 = peg$classExpectation(["\\", "'"], true, false, false);
+  const peg$e12 = peg$otherExpectation("characters that go inside back quotes, including escaped bquotes");
+  const peg$e13 = peg$literalExpectation("\\`", false);
+  const peg$e14 = peg$classExpectation(["\\", "`"], true, false, false);
+  const peg$e15 = peg$literalExpectation("0x", false);
+  const peg$e16 = peg$classExpectation([["a", "f"], ["A", "F"], ["0", "9"]], false, false, false);
+  const peg$e17 = peg$otherExpectation("words can contain quoted bits");
+  const peg$e18 = peg$classExpectation([" ", "#", ":", "'", "\"", "\t", "\r", "\n"], true, false, false);
+  const peg$e19 = peg$otherExpectation("other quoted characters, as needed");
+  const peg$e20 = peg$literalExpectation("\\\\", false);
+  const peg$e21 = peg$literalExpectation("\\r", false);
+  const peg$e22 = peg$literalExpectation("\\n", false);
+  const peg$e23 = peg$literalExpectation("\\t", false);
+  const peg$e24 = peg$literalExpectation("\\#", false);
+  const peg$e25 = peg$literalExpectation("\\:", false);
+  const peg$e26 = peg$literalExpectation("\\ ", false);
+  const peg$e27 = peg$literalExpectation("#", false);
+  const peg$e28 = peg$classExpectation(["\r", "\n"], true, false, false);
+  const peg$e29 = peg$classExpectation([" ", "\t"], false, false, false);
+  const peg$e30 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false, false);
+  const peg$e31 = peg$otherExpectation("required whitespace");
+  const peg$e32 = peg$otherExpectation("End of line");
+  const peg$e33 = peg$literalExpectation("\n", false);
+  const peg$e34 = peg$literalExpectation("\r\n", false);
+  const peg$e35 = peg$literalExpectation("\r", false);
+
+  function peg$f0(all) {
+    return all.filter(t => t && t.hasOwnProperty('expected'));
+  }
+  function peg$f1(env, name, value) {
     if (!value) {
       const start = location().start;
       value = {
@@ -265,43 +252,43 @@ function peg$parse(input, options) {
       ...vars,
       [name]: value
     }
-  };
-  var peg$f2 = function(value) {
+  }
+  function peg$f2(value) {
     const start = location().start;
     return { value, line: start.line, column: start.column}
-  };
-  var peg$f3 = function(expected, inputs) {
+  }
+  function peg$f3(expected, inputs) {
     const start = location().start;
     return { expected, inputs, vars, line: start.line, column: start.column }
-  };
-  var peg$f4 = function() { return options.EXCEPTION || "!" };
-  var peg$f5 = function(info) { return info.join('') };
-  var peg$f6 = function(info) { return info.join('') };
-  var peg$f7 = function(info) { return info.join('') };
-  var peg$f8 = function() { return '"' };
-  var peg$f9 = function() { return "'" };
-  var peg$f10 = function() { return "`" };
-  var peg$f11 = function(hx) { return '0x' + hx.toLowerCase(hx) };
-  var peg$f12 = function(chars) { return chars.join('') };
-  var peg$f13 = function() { return '\\' };
-  var peg$f14 = function() { return '\r' };
-  var peg$f15 = function() { return '\n' };
-  var peg$f16 = function() { return '\t' };
-  var peg$f17 = function() { return '#' };
-  var peg$f18 = function() { return ':' };
-  var peg$f19 = function() { return ' ' };
-  var peg$f20 = function() { return undefined };
-  var peg$f21 = function() { return undefined };
-  var peg$f22 = function() { return undefined};
-  var peg$f23 = function() { return undefined };
-  var peg$currPos = options.peg$currPos | 0;
-  var peg$savedPos = peg$currPos;
-  var peg$posDetailsCache = [{ line: 1, column: 1 }];
-  var peg$maxFailPos = peg$currPos;
-  var peg$maxFailExpected = options.peg$maxFailExpected || [];
-  var peg$silentFails = options.peg$silentFails | 0;
-
-  var peg$result;
+  }
+  function peg$f4() {    return options.EXCEPTION || "!"  }
+  function peg$f5(info) {    return info.join('')  }
+  function peg$f6(info) {    return info.join('')  }
+  function peg$f7(info) {    return info.join('')  }
+  function peg$f8() {    return '"'  }
+  function peg$f9() {    return "'"  }
+  function peg$f10() {    return "`"  }
+  function peg$f11(hx) {    return '0x' + hx.toLowerCase(hx)  }
+  function peg$f12(chars) {    return chars.join('')  }
+  function peg$f13() {    return '\\'  }
+  function peg$f14() {    return '\r'  }
+  function peg$f15() {    return '\n'  }
+  function peg$f16() {    return '\t'  }
+  function peg$f17() {    return '#'  }
+  function peg$f18() {    return ':'  }
+  function peg$f19() {    return ' '  }
+  function peg$f20() {    return undefined  }
+  function peg$f21() {    return undefined  }
+  function peg$f22() {    return undefined  }
+  function peg$f23() {    return undefined  }
+  let peg$currPos = options.peg$currPos | 0;
+  let peg$savedPos = peg$currPos;
+  const peg$posDetailsCache = [{ line: 1, column: 1 }];
+  let peg$maxFailPos = peg$currPos;
+  let peg$maxFailExpected = options.peg$maxFailExpected || [];
+  let peg$silentFails = options.peg$silentFails | 0;
+
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -323,7 +310,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -351,12 +338,20 @@ function peg$parse(input, options) {
     throw peg$buildSimpleError(message, location);
   }
 
+  function peg$getUnicode(pos = peg$currPos) {
+    const cp = input.codePointAt(pos);
+    if (cp === undefined) {
+      return "";
+    }
+    return String.fromCodePoint(cp);
+  }
+
   function peg$literalExpectation(text, ignoreCase) {
-    return { type: "literal", text: text, ignoreCase: ignoreCase };
+    return { type: "literal", text, ignoreCase };
   }
 
-  function peg$classExpectation(parts, inverted, ignoreCase) {
-    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+    return { type: "class", parts, inverted, ignoreCase, unicode };
   }
 
   function peg$anyExpectation() {
@@ -368,12 +363,12 @@ function peg$parse(input, options) {
   }
 
   function peg$otherExpectation(description) {
-    return { type: "other", description: description };
+    return { type: "other", description };
   }
 
   function peg$computePosDetails(pos) {
-    var details = peg$posDetailsCache[pos];
-    var p;
+    let details = peg$posDetailsCache[pos];
+    let p;
 
     if (details) {
       return details;
@@ -388,7 +383,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -409,21 +404,21 @@ function peg$parse(input, options) {
   }
 
   function peg$computeLocation(startPos, endPos, offset) {
-    var startPosDetails = peg$computePosDetails(startPos);
-    var endPosDetails = peg$computePosDetails(endPos);
+    const startPosDetails = peg$computePosDetails(startPos);
+    const endPosDetails = peg$computePosDetails(endPos);
 
-    var res = {
+    const res = {
       source: peg$source,
       start: {
         offset: startPos,
         line: startPosDetails.line,
-        column: startPosDetails.column
+        column: startPosDetails.column,
       },
       end: {
         offset: endPos,
         line: endPosDetails.line,
-        column: endPosDetails.column
-      }
+        column: endPosDetails.column,
+      },
     };
     if (offset && peg$source && (typeof peg$source.offset === "function")) {
       res.start = peg$source.offset(res.start);
@@ -457,7 +452,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsestart() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = [];
@@ -495,7 +490,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseline() {
-    var s0;
+    let s0;
 
     s0 = peg$parsevar();
     if (s0 === peg$FAILED) {
@@ -512,7 +507,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsevar() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 2) === peg$c0) {
@@ -577,7 +572,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseval() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     s1 = peg$parsechunk();
@@ -591,7 +586,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetest() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parseresults();
@@ -643,7 +638,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseresults() {
-    var s0, s1;
+    let s0, s1;
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 33) {
@@ -666,7 +661,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsechunk() {
-    var s0;
+    let s0;
 
     s0 = peg$parsequoted();
     if (s0 === peg$FAILED) {
@@ -680,7 +675,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsequoted() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
@@ -790,7 +785,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedqchar() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -849,7 +844,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesqchar() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -908,7 +903,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebqchar() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -967,7 +962,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsehex() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 2) === peg$c9) {
@@ -1022,7 +1017,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseword() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1045,7 +1040,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsewchar() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = [];
@@ -1098,7 +1093,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseqchar() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1214,7 +1209,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecomment() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parseWS();
@@ -1276,7 +1271,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parse_() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1286,7 +1281,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -1295,21 +1290,19 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
     }
     peg$savedPos = s0;
     s1 = peg$f21();
     s0 = s1;
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e29); }
 
     return s0;
   }
 
   function peg$parseWS() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1319,7 +1312,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -1328,21 +1321,19 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
     }
     peg$savedPos = s0;
     s1 = peg$f22();
     s0 = s1;
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e31); }
 
     return s0;
   }
 
   function peg$parseLWS() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -1352,7 +1343,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -1362,7 +1353,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e30); }
+          if (peg$silentFails === 0) { peg$fail(peg$e29); }
         }
       }
     } else {
@@ -1376,14 +1367,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
 
     return s0;
   }
 
   function peg$parseEOL() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     if (input.charCodeAt(peg$currPos) === 10) {
@@ -1391,7 +1382,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s0 === peg$FAILED) {
       if (input.substr(peg$currPos, 2) === peg$c19) {
@@ -1399,7 +1390,7 @@ function peg$parse(input, options) {
         peg$currPos += 2;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e36); }
+        if (peg$silentFails === 0) { peg$fail(peg$e34); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 13) {
@@ -1407,14 +1398,14 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e37); }
+          if (peg$silentFails === 0) { peg$fail(peg$e35); }
         }
       }
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
 
     return s0;
@@ -1425,30 +1416,36 @@ function peg$parse(input, options) {
 
   peg$result = peg$startRuleFunction();
 
-  if (options.peg$library) {
-    return /** @type {any} */ ({
-      peg$result,
-      peg$currPos,
-      peg$FAILED,
-      peg$maxFailExpected,
-      peg$maxFailPos
-    });
-  }
-  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
-    return peg$result;
-  } else {
+  const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+  function peg$throw() {
     if (peg$result !== peg$FAILED && peg$currPos < input.length) {
       peg$fail(peg$endExpectation());
     }
 
     throw peg$buildStructuredError(
       peg$maxFailExpected,
-      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null,
       peg$maxFailPos < input.length
         ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
         : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
     );
   }
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos,
+      peg$success,
+      peg$throw: peg$success ? undefined : peg$throw,
+    });
+  }
+  if (peg$success) {
+    return peg$result;
+  } else {
+    peg$throw();
+  }
 }
 
 const peg$allowedStartRules = [

package/vendor/peggy/grammar-location.cjs

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 /**
  * When used as a grammarSource, allows grammars embedded in larger files to
@@ -40,9 +40,9 @@ class GrammarLocation {
   offset(loc) {
     return {
       line: loc.line + this.start.line - 1,
-      column: (loc.line === 1)
-        ? loc.column + this.start.column - 1
-        : loc.column,
+      column: (loc.line === 1) ?
+        loc.column + this.start.column - 1 :
+        loc.column,
       offset: loc.offset + this.start.offset,
     };
   }
@@ -56,7 +56,7 @@ class GrammarLocation {
    *   original start.
    */
   static offsetStart(range) {
-    if (range.source && (typeof range.source.offset === "function")) {
+    if (range.source && (typeof range.source.offset === 'function')) {
       return range.source.offset(range.start);
     }
     return range.start;
@@ -71,7 +71,7 @@ class GrammarLocation {
    *   original end.
    */
   static offsetEnd(range) {
-    if (range.source && (typeof range.source.offset === "function")) {
+    if (range.source && (typeof range.source.offset === 'function')) {
       return range.source.offset(range.end);
     }
     return range.end;

package/version.js

@@ -0,0 +1,4 @@
+// Generated by package-extract v3.1.3
+// Do not modify by hand.
+
+export const version = '3.0.3';