unexpectedly 3.0.3 → 4.0.0

package/index.js

@@ -1,6 +1,7 @@
 import {Runner, SKIPPED} from './runner.js';
 import {hexlify, mapObj} from './utils.js';
 import Mocha from 'mocha';
+// eslint-disable-next-line n/prefer-import/assert-strict
 import assert from 'node:assert';
 import fs from 'node:fs/promises';
 import {parse} from './testFile.peg.js';

package/package.json

@@ -1,9 +1,18 @@
 {
   "name": "unexpectedly",
-  "version": "3.0.3",
+  "version": "4.0.0",
   "description": "Keep a bunch of test cases in a file, with their expected results",
   "main": "index.js",
   "type": "module",
+  "files": [
+    "index.js",
+    "runner.js",
+    "testFile.peg.js",
+    "utils.js",
+    "version.js",
+    "vendor/",
+    "bin/"
+  ],
   "bin": {
     "unexpectedly": "bin/unexpectedly.js"
   },
@@ -23,11 +32,18 @@
   },
   "license": "MPL-2.0",
   "dependencies": {
-    "@peggyjs/from-mem": "3.1.1",
-    "commander": "14.0.0",
-    "mocha": "^11.7.1"
+    "@peggyjs/from-mem": "4.0.0",
+    "commander": "^15.0.0",
+    "mocha": "^12.0.3"
+  },
+  "packageManager": "pnpm@12.14.0",
+  "pnpm": {
+    "overrides": {
+      "mocha@11.7.5>diff": "8.0.3",
+      "mocha@11.7.5>serialize-javascript": "7.0.4"
+    }
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

package/testFile.peg.js

@@ -1,4 +1,4 @@
-// @generated by Peggy 5.0.6.
+// @generated by Peggy 5.1.1.
 //
 // https://peggyjs.org/
 
@@ -61,10 +61,9 @@ class peg$SyntaxError extends SyntaxError {
       return s;
     }
 
-    function literalEscape(s) {
+    function escape(s, special) {
       return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g,  "\\\"")
+        .replace(special, "\\$&")
         .replace(/\0/g, "\\0")
         .replace(/\t/g, "\\t")
         .replace(/\n/g, "\\n")
@@ -73,18 +72,12 @@ class peg$SyntaxError extends SyntaxError {
         .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
     }
 
+    function literalEscape(s) {
+      return escape(s, /[\\"]/g);
+    }
+
     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)));
+      return escape(s, /[\\\]^-]/g);
     }
 
     const DESCRIBE_EXPECTATION_FNS = {
@@ -189,14 +182,6 @@ function peg$parse(input, options) {
   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);
@@ -289,6 +274,7 @@ function peg$parse(input, options) {
   let peg$silentFails = options.peg$silentFails | 0;
 
   let peg$result;
+  let peg$charCode;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -592,22 +578,7 @@ function peg$parse(input, options) {
     s1 = peg$parseresults();
     if (s1 !== peg$FAILED) {
       s2 = [];
-      s3 = peg$currPos;
-      s4 = peg$parseLWS();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parsechunk();
-        if (s5 !== peg$FAILED) {
-          s3 = s5;
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
+      for (;;) {
         s3 = peg$currPos;
         s4 = peg$parseLWS();
         if (s4 !== peg$FAILED) {
@@ -622,6 +593,8 @@ function peg$parse(input, options) {
           peg$currPos = s3;
           s3 = peg$FAILED;
         }
+        if (s3 === peg$FAILED) { break; }
+        s2.push(s3);
       }
       s3 = peg$parsecomment();
       if (s3 === peg$FAILED) {
@@ -687,10 +660,10 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      s3 = peg$parsedqchar();
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
+      for (;;) {
         s3 = peg$parsedqchar();
+        if (s3 === peg$FAILED) { break; }
+        s2.push(s3);
       }
       if (input.charCodeAt(peg$currPos) === 34) {
         s3 = peg$c3;
@@ -721,10 +694,10 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         s2 = [];
-        s3 = peg$parsesqchar();
-        while (s3 !== peg$FAILED) {
-          s2.push(s3);
+        for (;;) {
           s3 = peg$parsesqchar();
+          if (s3 === peg$FAILED) { break; }
+          s2.push(s3);
         }
         if (input.charCodeAt(peg$currPos) === 39) {
           s3 = peg$c4;
@@ -755,10 +728,10 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           s2 = [];
-          s3 = peg$parsebqchar();
-          while (s3 !== peg$FAILED) {
-            s2.push(s3);
+          for (;;) {
             s3 = peg$parsebqchar();
+            if (s3 === peg$FAILED) { break; }
+            s2.push(s3);
           }
           if (input.charCodeAt(peg$currPos) === 96) {
             s3 = peg$c5;
@@ -806,25 +779,18 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = [];
-        s2 = input.charAt(peg$currPos);
-        if (peg$r0.test(s2)) {
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e8); }
-        }
-        if (s2 !== peg$FAILED) {
-          while (s2 !== peg$FAILED) {
-            s1.push(s2);
-            s2 = input.charAt(peg$currPos);
-            if (peg$r0.test(s2)) {
-              peg$currPos++;
-            } else {
-              s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e8); }
-            }
+        for (;;) {
+          s2 = input.charAt(peg$currPos);
+          if (s2 !== "" && !(peg$charCode = s2.charCodeAt(0), peg$charCode === 92 || peg$charCode === 34)) {
+            peg$currPos++;
+          } else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e8); }
           }
-        } else {
+          if (s2 === peg$FAILED) { break; }
+          s1.push(s2);
+        }
+        if (s1.length < 1) {
           s1 = peg$FAILED;
         }
         if (s1 !== peg$FAILED) {
@@ -865,25 +831,18 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = [];
-        s2 = input.charAt(peg$currPos);
-        if (peg$r1.test(s2)) {
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e11); }
-        }
-        if (s2 !== peg$FAILED) {
-          while (s2 !== peg$FAILED) {
-            s1.push(s2);
-            s2 = input.charAt(peg$currPos);
-            if (peg$r1.test(s2)) {
-              peg$currPos++;
-            } else {
-              s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e11); }
-            }
+        for (;;) {
+          s2 = input.charAt(peg$currPos);
+          if (s2 !== "" && !(peg$charCode = s2.charCodeAt(0), peg$charCode === 92 || peg$charCode === 39)) {
+            peg$currPos++;
+          } else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e11); }
           }
-        } else {
+          if (s2 === peg$FAILED) { break; }
+          s1.push(s2);
+        }
+        if (s1.length < 1) {
           s1 = peg$FAILED;
         }
         if (s1 !== peg$FAILED) {
@@ -924,25 +883,18 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = [];
-        s2 = input.charAt(peg$currPos);
-        if (peg$r2.test(s2)) {
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e14); }
-        }
-        if (s2 !== peg$FAILED) {
-          while (s2 !== peg$FAILED) {
-            s1.push(s2);
-            s2 = input.charAt(peg$currPos);
-            if (peg$r2.test(s2)) {
-              peg$currPos++;
-            } else {
-              s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e14); }
-            }
+        for (;;) {
+          s2 = input.charAt(peg$currPos);
+          if (s2 !== "" && !(peg$charCode = s2.charCodeAt(0), peg$charCode === 92 || peg$charCode === 96)) {
+            peg$currPos++;
+          } else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e14); }
           }
-        } else {
+          if (s2 === peg$FAILED) { break; }
+          s1.push(s2);
+        }
+        if (s1.length < 1) {
           s1 = peg$FAILED;
         }
         if (s1 !== peg$FAILED) {
@@ -975,25 +927,18 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       s3 = [];
-      s4 = input.charAt(peg$currPos);
-      if (peg$r3.test(s4)) {
-        peg$currPos++;
-      } else {
-        s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e16); }
-      }
-      if (s4 !== peg$FAILED) {
-        while (s4 !== peg$FAILED) {
-          s3.push(s4);
-          s4 = input.charAt(peg$currPos);
-          if (peg$r3.test(s4)) {
-            peg$currPos++;
-          } else {
-            s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e16); }
-          }
+      for (;;) {
+        s4 = input.charAt(peg$currPos);
+        if ((peg$charCode = s4.charCodeAt(0), (peg$charCode >= 97 && peg$charCode <= 102) || (peg$charCode >= 65 && peg$charCode <= 70) || (peg$charCode >= 48 && peg$charCode <= 57))) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e16); }
         }
-      } else {
+        if (s4 === peg$FAILED) { break; }
+        s3.push(s4);
+      }
+      if (s3.length < 1) {
         s3 = peg$FAILED;
       }
       if (s3 !== peg$FAILED) {
@@ -1021,13 +966,12 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    s2 = peg$parsewchar();
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = peg$parsewchar();
-      }
-    } else {
+    for (;;) {
+      s2 = peg$parsewchar();
+      if (s2 === peg$FAILED) { break; }
+      s1.push(s2);
+    }
+    if (s1.length < 1) {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
@@ -1044,37 +988,29 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = [];
-    s1 = peg$parseqchar();
-    if (s1 !== peg$FAILED) {
-      while (s1 !== peg$FAILED) {
-        s0.push(s1);
-        s1 = peg$parseqchar();
-      }
-    } else {
+    for (;;) {
+      s1 = peg$parseqchar();
+      if (s1 === peg$FAILED) { break; }
+      s0.push(s1);
+    }
+    if (s0.length < 1) {
       s0 = peg$FAILED;
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = [];
-      s2 = input.charAt(peg$currPos);
-      if (peg$r4.test(s2)) {
-        peg$currPos++;
-      } else {
-        s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e18); }
-      }
-      if (s2 !== peg$FAILED) {
-        while (s2 !== peg$FAILED) {
-          s1.push(s2);
-          s2 = input.charAt(peg$currPos);
-          if (peg$r4.test(s2)) {
-            peg$currPos++;
-          } else {
-            s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e18); }
-          }
+      for (;;) {
+        s2 = input.charAt(peg$currPos);
+        if (s2 !== "" && !(peg$charCode = s2.charCodeAt(0), peg$charCode === 32 || peg$charCode === 35 || peg$charCode === 58 || peg$charCode === 39 || peg$charCode === 34 || peg$charCode === 9 || peg$charCode === 13 || peg$charCode === 10)) {
+          peg$currPos++;
+        } else {
+          s2 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e18); }
         }
-      } else {
+        if (s2 === peg$FAILED) { break; }
+        s1.push(s2);
+      }
+      if (s1.length < 1) {
         s1 = peg$FAILED;
       }
       if (s1 !== peg$FAILED) {
@@ -1239,22 +1175,16 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         s4 = [];
-        s5 = input.charAt(peg$currPos);
-        if (peg$r5.test(s5)) {
-          peg$currPos++;
-        } else {
-          s5 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e28); }
-        }
-        while (s5 !== peg$FAILED) {
-          s4.push(s5);
+        for (;;) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r5.test(s5)) {
+          if (s5 !== "" && !(peg$charCode = s5.charCodeAt(0), peg$charCode === 13 || peg$charCode === 10)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e28); }
           }
+          if (s5 === peg$FAILED) { break; }
+          s4.push(s5);
         }
         peg$savedPos = s0;
         s0 = peg$f20();
@@ -1276,22 +1206,16 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
-    s2 = input.charAt(peg$currPos);
-    if (peg$r6.test(s2)) {
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
-    }
-    while (s2 !== peg$FAILED) {
-      s1.push(s2);
+    for (;;) {
       s2 = input.charAt(peg$currPos);
-      if (peg$r6.test(s2)) {
+      if ((peg$charCode = s2.charCodeAt(0), peg$charCode === 32 || peg$charCode === 9)) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
+      if (s2 === peg$FAILED) { break; }
+      s1.push(s2);
     }
     peg$savedPos = s0;
     s1 = peg$f21();
@@ -1307,22 +1231,16 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
-    s2 = input.charAt(peg$currPos);
-    if (peg$r7.test(s2)) {
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
-    }
-    while (s2 !== peg$FAILED) {
-      s1.push(s2);
+    for (;;) {
       s2 = input.charAt(peg$currPos);
-      if (peg$r7.test(s2)) {
+      if ((peg$charCode = s2.charCodeAt(0), peg$charCode === 32 || peg$charCode === 9 || peg$charCode === 13 || peg$charCode === 10)) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
+      if (s2 === peg$FAILED) { break; }
+      s1.push(s2);
     }
     peg$savedPos = s0;
     s1 = peg$f22();
@@ -1338,25 +1256,18 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
-    s2 = input.charAt(peg$currPos);
-    if (peg$r6.test(s2)) {
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
-    }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = input.charAt(peg$currPos);
-        if (peg$r6.test(s2)) {
-          peg$currPos++;
-        } else {
-          s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e29); }
-        }
+    for (;;) {
+      s2 = input.charAt(peg$currPos);
+      if ((peg$charCode = s2.charCodeAt(0), peg$charCode === 32 || peg$charCode === 9)) {
+        peg$currPos++;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
-    } else {
+      if (s2 === peg$FAILED) { break; }
+      s1.push(s2);
+    }
+    if (s1.length < 1) {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {

package/version.js

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

package/eslint.config.js

@@ -1,26 +0,0 @@
-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/testFile.peggy

@@ -1,111 +0,0 @@
-{{
-import { mapObj } from './utils.js'
-}}
-
-{
-  let vars = {};
-}
-start
-  = all:(WS @line? _)|.., EOL| {
-    return all.filter(t => t && t.hasOwnProperty('expected'));
-  }
-
-line
-  = var
-  / comment
-  / test
-  / '' // hack
-
-var
-  = '#!' env:"!"? _ name:chunk _ ':' _ value:(@val _)? {
-    if (!value) {
-      const start = location().start;
-      value = {
-        value: undefined,
-        line: start.line,
-        column: start.column,
-      }
-    }
-    value.env = Boolean(env);
-    vars = {
-      ...vars,
-      [name]: value
-    }
-  }
-
-val
-  = value:chunk {
-    const start = location().start;
-    return { value, line: start.line, column: start.column}
-  }
-
-test
-  = expected:results inputs:(LWS @chunk)* comment? {
-    const start = location().start;
-    return { expected, inputs, vars, line: start.line, column: start.column }
-  }
-
-results
-  = "!" { return options.EXCEPTION || "!" }
-  / chunk
-
-chunk
-  = quoted
-  / hex
-  / word
-
-quoted
-  = '"' info:dqchar* '"' { return info.join('') }
-  / "'" info:sqchar* "'" { return info.join('') }
-  / "`" info:bqchar* "`" { return info.join('') }
-
-dqchar "characters that go inside double quotes, including escaped dquotes"
-  = '\\"' { return '"' }
-  / qchar
-  / $[^\\"]+
-
-sqchar "characters that go inside single quotes, including escaped squotes"
-  = "\\'" { return "'" }
-  / qchar
-  / $[^\\']+
-
-bqchar "characters that go inside back quotes, including escaped bquotes"
-  = "\\`" { return "`" }
-  / qchar
-  / $[^\\`]+
-
-hex
-  = '0x' hx:$[a-fA-F0-9]+ { return '0x' + hx.toLowerCase(hx) }
-
-word
-  = chars:wchar+ { return chars.join('') }
-
-wchar "words can contain quoted bits"
-  = qchar+
-  / $[^ #:'"\t\r\n]+
-
-qchar "other quoted characters, as needed"
-  = '\\\\' { return '\\' }
-  / '\\r' { return '\r' }
-  / '\\n' { return '\n' }
-  / '\\t' { return '\t' }
-  / '\\#' { return '#' }
-  / '\\:' { return ':' }
-  / '\\ ' { return ' ' }
-
-comment
-  = WS "#" !"!" [^\r\n]* { return undefined }
-
-_ "optional whitespace"
-  = [ \t]* { return undefined }
-
-WS "optional whitespace, including newlines"
-  = [ \t\r\n]* { return undefined}
-
-LWS "required whitespace"
-  = [ \t]+ { return undefined }
-
-EOL "End of line"
-  = '\n'
-  / '\r\n'
-  / '\r'