resolv-conf 2.0.0 → 3.0.4

package/lib/defaults.d.ts

@@ -181,7 +181,7 @@ export type KnownResolvOptions = {
 export type ResolvOptions = KnownResolvOptions & Record<string, any>;
 export type ResolvError = {
     text: string;
-    location: import('peggy').LocationRange;
+    location: import("peggy").LocationRange;
 };
 export type GatheredLines = {
     /**

package/lib/defaults.js

@@ -1,4 +1,4 @@
-import os from 'os';
+import os from 'node:os';
 
 /**
  * Address/Mask combinations.

package/lib/index.d.ts

@@ -8,7 +8,7 @@
  * @param {string} [fileName]
  * @returns {ResolvResults}
  */
-export function parse(text: string, fileName?: string | undefined): ResolvResults;
+export function parse(text: string, fileName?: string): ResolvResults;
 /**
  * Parse the contents of a file like resolv.conf.
  *
@@ -16,5 +16,5 @@ export function parse(text: string, fileName?: string | undefined): ResolvResult
  *   and parse.
  * @returns {Promise<ResolvResults>} The parsed contents of the file.
  */
-export function parseFile(fileName?: string | undefined): Promise<ResolvResults>;
-export type ResolvResults = import('./defaults.js').ResolvResults;
+export function parseFile(fileName?: string): Promise<ResolvResults>;
+export type ResolvResults = import("./defaults.js").ResolvResults;

package/lib/index.js

@@ -19,7 +19,6 @@ export function parse(text, fileName = '/etc/resolv.conf') {
     });
   } catch (er) {
     if (er instanceof SyntaxError) {
-      // @ts-expect-error See https://github.com/peggyjs/peggy/issues/477
       er.message = er.format([{
         source: fileName,
         text,

package/lib/resolv.peg.d.ts

@@ -1,11 +1,11 @@
 declare const peg$allowedStartRules: string[];
-declare function peg$SyntaxError(message: any, expected: any, found: any, location: any): Error;
-declare class peg$SyntaxError {
+declare class peg$SyntaxError extends SyntaxError {
+    static buildMessage(expected: any, found: any): string;
     constructor(message: any, expected: any, found: any, location: any);
+    expected: any;
+    found: any;
+    location: any;
     format(sources: any): string;
 }
-declare namespace peg$SyntaxError {
-    function buildMessage(expected: any, found: any): string;
-}
 declare function peg$parse(input: any, options: any): any;
 export { peg$allowedStartRules as StartRules, peg$SyntaxError as SyntaxError, peg$parse as parse };

package/lib/resolv.peg.js

@@ -1,4 +1,4 @@
-// @generated by Peggy 4.0.2.
+// @generated by Peggy 5.0.6.
 //
 // https://peggyjs.org/
 
@@ -8,312 +8,300 @@
 import net from 'net'
 import {resolv, gather, maybeNum} from './defaults.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);
-  }
-  self.expected = expected;
-  self.found = found;
-  self.location = location;
-  self.name = "SyntaxError";
-  return self;
-}
+class peg$SyntaxError extends SyntaxError {
+  constructor(message, expected, found, location) {
+    super(message);
+    this.expected = expected;
+    this.found = found;
+    this.location = location;
+    this.name = "SyntaxError";
+  }
 
-peg$subclass(peg$SyntaxError, Error);
+  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;
+      }
+    }
+    return str;
+  }
 
-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);
-}
+  static buildMessage(expected, found) {
+    function hex(ch) {
+      return ch.codePointAt(0).toString(16).toUpperCase();
+    }
 
-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;
-      }
-    }
-    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;
-};
+    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;
+    }
+
+    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)));
+    }
+
+    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)));
+    }
+
+    const DESCRIBE_EXPECTATION_FNS = {
+      literal(expectation) {
+        return "\"" + literalEscape(expectation.text) + "\"";
+      },
 
-peg$SyntaxError.buildMessage = function(expected, found) {
-  var DESCRIBE_EXPECTATION_FNS = {
-    literal: function(expectation) {
-      return "\"" + literalEscape(expectation.text) + "\"";
-    },
+      class(expectation) {
+        const escapedParts = expectation.parts.map(
+          part => (Array.isArray(part)
+            ? classEscape(part[0]) + "-" + classEscape(part[1])
+            : classEscape(part))
+        );
 
-    class: function(expectation) {
-      var escapedParts = expectation.parts.map(function(part) {
-        return Array.isArray(part)
-          ? classEscape(part[0]) + "-" + classEscape(part[1])
-          : classEscape(part);
-      });
+        return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+      },
 
-      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
-    },
+      any() {
+        return "any character";
+      },
 
-    any: function() {
-      return "any character";
-    },
+      end() {
+        return "end of input";
+      },
 
-    end: function() {
-      return "end of input";
-    },
+      other(expectation) {
+        return expectation.description;
+      },
+    };
 
-    other: function(expectation) {
-      return expectation.description;
+    function describeExpectation(expectation) {
+      return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
     }
-  };
-
-  function hex(ch) {
-    return ch.charCodeAt(0).toString(16).toUpperCase();
-  }
-
-  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); });
-  }
 
-  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); });
-  }
+    function describeExpected(expected) {
+      const descriptions = expected.map(describeExpectation);
+      descriptions.sort();
 
-  function describeExpectation(expectation) {
-    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
-  }
+      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;
+      }
 
-  function describeExpected(expected) {
-    var descriptions = expected.map(describeExpectation);
-    var i, j;
+      switch (descriptions.length) {
+        case 1:
+          return descriptions[0];
 
-    descriptions.sort();
+        case 2:
+          return descriptions[0] + " or " + descriptions[1];
 
-    if (descriptions.length > 0) {
-      for (i = 1, j = 1; i < descriptions.length; i++) {
-        if (descriptions[i - 1] !== descriptions[i]) {
-          descriptions[j] = descriptions[i];
-          j++;
-        }
+        default:
+          return descriptions.slice(0, -1).join(", ")
+            + ", or "
+            + descriptions[descriptions.length - 1];
       }
-      descriptions.length = j;
     }
 
-    switch (descriptions.length) {
-      case 1:
-        return descriptions[0];
-
-      case 2:
-        return descriptions[0] + " or " + descriptions[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 = { lines: peg$parselines };
-  var peg$startRuleFunction = peg$parselines;
-
-  var peg$c0 = "nameserver";
-  var peg$c1 = "search";
-  var peg$c2 = "domain";
-  var peg$c3 = "options";
-  var peg$c4 = ":";
-  var peg$c5 = "sortlist";
-  var peg$c6 = "/";
-  var peg$c7 = "port";
-  var peg$c8 = "timeout";
-  var peg$c9 = "search_order";
-  var peg$c10 = "lookup";
-  var peg$c11 = "file";
-  var peg$c12 = "yp";
-  var peg$c13 = "bind";
-  var peg$c14 = "family";
-  var peg$c15 = "inet";
-  var peg$c16 = "::";
-  var peg$c17 = ".";
-  var peg$c18 = "\r\n";
-
-  var peg$r0 = /^[;#]/;
-  var peg$r1 = /^[^\r\n]/;
-  var peg$r2 = /^[0-9]/;
-  var peg$r3 = /^[46]/;
-  var peg$r4 = /^[^#;\r\n]/;
-  var peg$r5 = /^[0-9a-fA-F:.]/;
-  var peg$r6 = /^[0-9a-f:]/i;
-  var peg$r7 = /^[0-9a-f]/i;
-  var peg$r8 = /^[A-Z0-9_\-]/i;
-  var peg$r9 = /^[^ :#;,\t\r\n]/;
-  var peg$r10 = /^[ \t]/;
-  var peg$r11 = /^[\n\r]/;
-
-  var peg$e0 = peg$otherExpectation("comment");
-  var peg$e1 = peg$classExpectation([";", "#"], false, false);
-  var peg$e2 = peg$classExpectation(["\r", "\n"], true, false);
-  var peg$e3 = peg$literalExpectation("nameserver", false);
-  var peg$e4 = peg$literalExpectation("search", false);
-  var peg$e5 = peg$literalExpectation("domain", false);
-  var peg$e6 = peg$literalExpectation("options", false);
-  var peg$e7 = peg$literalExpectation(":", false);
-  var peg$e8 = peg$literalExpectation("sortlist", false);
-  var peg$e9 = peg$literalExpectation("/", false);
-  var peg$e10 = peg$literalExpectation("port", false);
-  var peg$e11 = peg$literalExpectation("timeout", false);
-  var peg$e12 = peg$classExpectation([["0", "9"]], false, false);
-  var peg$e13 = peg$literalExpectation("search_order", false);
-  var peg$e14 = peg$literalExpectation("lookup", false);
-  var peg$e15 = peg$literalExpectation("file", false);
-  var peg$e16 = peg$literalExpectation("yp", false);
-  var peg$e17 = peg$literalExpectation("bind", false);
-  var peg$e18 = peg$literalExpectation("family", false);
-  var peg$e19 = peg$literalExpectation("inet", false);
-  var peg$e20 = peg$classExpectation(["4", "6"], false, false);
-  var peg$e21 = peg$classExpectation(["#", ";", "\r", "\n"], true, false);
-  var peg$e22 = peg$classExpectation([["0", "9"], ["a", "f"], ["A", "F"], ":", "."], false, false);
-  var peg$e23 = peg$literalExpectation("::", false);
-  var peg$e24 = peg$literalExpectation(".", false);
-  var peg$e25 = peg$classExpectation([["0", "9"], ["a", "f"], ":"], false, true);
-  var peg$e26 = peg$classExpectation([["0", "9"], ["a", "f"]], false, true);
-  var peg$e27 = peg$classExpectation([["A", "Z"], ["0", "9"], "_", "-"], false, true);
-  var peg$e28 = peg$classExpectation([" ", ":", "#", ";", ",", "\t", "\r", "\n"], true, false);
-  var peg$e29 = peg$anyExpectation();
-  var peg$e30 = peg$otherExpectation("optional whitespace");
-  var peg$e31 = peg$classExpectation([" ", "\t"], false, false);
-  var peg$e32 = peg$otherExpectation("whitespace");
-  var peg$e33 = peg$otherExpectation("EOL");
-  var peg$e34 = peg$literalExpectation("\r\n", false);
-  var peg$e35 = peg$classExpectation(["\n", "\r"], false, false);
-
-  var peg$f0 = function(lines) {
-  return resolv(gather(lines), ports);
-};
-  var peg$f1 = function() { return undefined; };
-  var peg$f2 = function(nameserver) { return { nameserver } };
-  var peg$f3 = function(search) {
-    return { search };
+  const peg$FAILED = {};
+  const peg$source = options.grammarSource;
+
+  const peg$startRuleFunctions = {
+    lines: peg$parselines,
   };
-  var peg$f4 = function(search) { return { search } };
-  var peg$f5 = function(options) { return { options } };
-  var peg$f6 = function(n, v) { return [n.replace('-', '_'), maybeNum(v)] };
-  var peg$f7 = function(sortlist) { return { sortlist } };
-  var peg$f8 = function(address, mask) { return { address, mask } };
-  var peg$f9 = function(port) {
+  let peg$startRuleFunction = peg$parselines;
+
+  const peg$c0 = "nameserver";
+  const peg$c1 = "search";
+  const peg$c2 = "domain";
+  const peg$c3 = "options";
+  const peg$c4 = ":";
+  const peg$c5 = "sortlist";
+  const peg$c6 = "/";
+  const peg$c7 = "port";
+  const peg$c8 = "timeout";
+  const peg$c9 = "search_order";
+  const peg$c10 = "lookup";
+  const peg$c11 = "file";
+  const peg$c12 = "yp";
+  const peg$c13 = "bind";
+  const peg$c14 = "family";
+  const peg$c15 = "inet";
+  const peg$c16 = "::";
+  const peg$c17 = ".";
+  const peg$c18 = "\r\n";
+
+  const peg$r0 = /^[;#]/;
+  const peg$r1 = /^[^\r\n]/;
+  const peg$r2 = /^[0-9]/;
+  const peg$r3 = /^[46]/;
+  const peg$r4 = /^[^#;\r\n]/;
+  const peg$r5 = /^[0-9a-fA-F:.]/;
+  const peg$r6 = /^[0-9a-f:]/i;
+  const peg$r7 = /^[0-9a-f]/i;
+  const peg$r8 = /^[A-Z0-9_\-]/i;
+  const peg$r9 = /^[^ :#;,\t\r\n]/;
+  const peg$r10 = /^[ \t]/;
+  const peg$r11 = /^[\n\r]/;
+
+  const peg$e0 = peg$otherExpectation("comment");
+  const peg$e1 = peg$classExpectation([";", "#"], false, false, false);
+  const peg$e2 = peg$classExpectation(["\r", "\n"], true, false, false);
+  const peg$e3 = peg$literalExpectation("nameserver", false);
+  const peg$e4 = peg$literalExpectation("search", false);
+  const peg$e5 = peg$literalExpectation("domain", false);
+  const peg$e6 = peg$literalExpectation("options", false);
+  const peg$e7 = peg$literalExpectation(":", false);
+  const peg$e8 = peg$literalExpectation("sortlist", false);
+  const peg$e9 = peg$literalExpectation("/", false);
+  const peg$e10 = peg$literalExpectation("port", false);
+  const peg$e11 = peg$literalExpectation("timeout", false);
+  const peg$e12 = peg$classExpectation([["0", "9"]], false, false, false);
+  const peg$e13 = peg$literalExpectation("search_order", false);
+  const peg$e14 = peg$literalExpectation("lookup", false);
+  const peg$e15 = peg$literalExpectation("file", false);
+  const peg$e16 = peg$literalExpectation("yp", false);
+  const peg$e17 = peg$literalExpectation("bind", false);
+  const peg$e18 = peg$literalExpectation("family", false);
+  const peg$e19 = peg$literalExpectation("inet", false);
+  const peg$e20 = peg$classExpectation(["4", "6"], false, false, false);
+  const peg$e21 = peg$classExpectation(["#", ";", "\r", "\n"], true, false, false);
+  const peg$e22 = peg$classExpectation([["0", "9"], ["a", "f"], ["A", "F"], ":", "."], false, false, false);
+  const peg$e23 = peg$literalExpectation("::", false);
+  const peg$e24 = peg$literalExpectation(".", false);
+  const peg$e25 = peg$classExpectation([["0", "9"], ["a", "f"], ":"], false, true, false);
+  const peg$e26 = peg$classExpectation([["0", "9"], ["a", "f"]], false, true, false);
+  const peg$e27 = peg$classExpectation([["A", "Z"], ["0", "9"], "_", "-"], false, true, false);
+  const peg$e28 = peg$classExpectation([" ", ":", "#", ";", ",", "\t", "\r", "\n"], true, false, false);
+  const peg$e29 = peg$anyExpectation();
+  const peg$e30 = peg$classExpectation([" ", "\t"], false, false, false);
+  const peg$e31 = peg$otherExpectation("whitespace");
+  const peg$e32 = peg$otherExpectation("EOL");
+  const peg$e33 = peg$literalExpectation("\r\n", false);
+  const peg$e34 = peg$classExpectation(["\n", "\r"], false, false, false);
+
+  function peg$f0(lines) {
+    return resolv(gather(lines), ports);
+  }
+  function peg$f1() {    return undefined;  }
+  function peg$f2(nameserver) {    return { nameserver }  }
+  function peg$f3(search) {
+    return { search };
+  }
+  function peg$f4(search) {    return { search }  }
+  function peg$f5(options) {    return { options }  }
+  function peg$f6(n, v) {    return [n.replace('-', '_'), maybeNum(v)]  }
+  function peg$f7(sortlist) {    return { sortlist }  }
+  function peg$f8(address, mask) {    return { address, mask }  }
+  function peg$f9(port) {
     ports[''] = port;
-  };
-  var peg$f10 = function(n) {
+  }
+  function peg$f10(n) {
     return { timeout: parseInt(n, 10) }
-  };
-  var peg$f11 = function(n) {
+  }
+  function peg$f11(n) {
     return { search_order: parseInt(n, 10) }
-  };
-  var peg$f12 = function(lookup) {
+  }
+  function peg$f12(lookup) {
     return { lookup }
-  };
-  var peg$f13 = function(family) {
+  }
+  function peg$f13(family) {
     return { family }
-  };
-  var peg$f14 = function(name, val) { return {
-    errors: {text: text(), location: location()}}
-  };
-  var peg$f15 = function(addr) { return net.isIP(addr) };
-  var peg$f16 = function(v6, v4) { return net.isIPv6(`${v6}::${v4}`) };
-  var peg$f17 = function(v6, v4) {
-      const v6addr = `${v6}::${v4}`
-      ports[v6addr] = ports[v4];
-      delete ports[v4];
-      return v6addr;
-    };
-  var peg$f18 = function(addr, port) {
-      ports[addr] = port;
-      return addr;
-    };
-  var peg$f19 = function(addr) { return net.isIPv6(addr) };
-  var peg$f20 = function(addr, port) {
-      ports[addr] = port;
-      return addr
-    };
-  var peg$f21 = function(n) { return (parseInt(n, 10) < 256) };
-  var peg$f22 = function(n) {
-  const num = parseInt(n, 10)
-  if (num > 65535) {
-    error('Invalid port number');
   }
-  return num;
-};
-  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;
+  function peg$f14(name, val) {    return {
+       errors: {text: text(), location: location()}}
+  }
+  function peg$f15(addr) {    return net.isIP(addr)  }
+  function peg$f16(v6, v4) {    return net.isIPv6(`${v6}::${v4}`)  }
+  function peg$f17(v6, v4) {
+    const v6addr = `${v6}::${v4}`
+    ports[v6addr] = ports[v4];
+    delete ports[v4];
+    return v6addr;
+  }
+  function peg$f18(addr, port) {
+    ports[addr] = port;
+    return addr;
+  }
+  function peg$f19(addr) {    return net.isIPv6(addr)  }
+  function peg$f20(addr, port) {
+    ports[addr] = port;
+    return addr
+  }
+  function peg$f21(n) {    return (parseInt(n, 10) < 256)  }
+  function peg$f22(n) {
+    const num = parseInt(n, 10)
+    if (num > 65535) {
+      error('Invalid port number');
+    }
+    return num;
+  }
+  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;
 
-  var peg$result;
+  let peg$result;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -335,7 +323,7 @@ function peg$parse(input, options) {
     return {
       source: peg$source,
       start: peg$savedPos,
-      end: peg$currPos
+      end: peg$currPos,
     };
   }
 
@@ -363,12 +351,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() {
@@ -380,12 +376,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;
@@ -400,7 +396,7 @@ function peg$parse(input, options) {
       details = peg$posDetailsCache[p];
       details = {
         line: details.line,
-        column: details.column
+        column: details.column,
       };
 
       while (p < pos) {
@@ -421,21 +417,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);
@@ -469,7 +465,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselines() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = [];
@@ -496,7 +492,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselineComment() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$parses();
@@ -515,7 +511,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseline() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$parsenameserver();
@@ -773,7 +769,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsecomment() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     peg$silentFails++;
     s0 = peg$currPos;
@@ -819,7 +815,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsenameserver() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 10) === peg$c0) {
@@ -853,7 +849,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesearch() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 6) === peg$c1) {
@@ -911,7 +907,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsedomain() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 6) === peg$c2) {
@@ -945,7 +941,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoptions() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 7) === peg$c3) {
@@ -1008,7 +1004,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseoption() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parsename();
@@ -1049,7 +1045,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesortlist() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 8) === peg$c5) {
@@ -1112,7 +1108,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipNetmask() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     s1 = peg$parseip();
@@ -1153,7 +1149,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseport() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 4) === peg$c7) {
@@ -1187,7 +1183,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsetimeout() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 7) === peg$c8) {
@@ -1248,7 +1244,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesearch_order() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 12) === peg$c9) {
@@ -1309,7 +1305,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselookup() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 6) === peg$c10) {
@@ -1367,7 +1363,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselookupApproach() {
-    var s0;
+    let s0;
 
     if (input.substr(peg$currPos, 4) === peg$c11) {
       s0 = peg$c11;
@@ -1399,7 +1395,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsefamily() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    let s0, s1, s2, s3, s4, s5, s6;
 
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 6) === peg$c14) {
@@ -1461,7 +1457,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseaddressFamily() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1501,7 +1497,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseunknown() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$parsename();
@@ -1538,7 +1534,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseip() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1592,7 +1588,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipWithPort() {
-    var s0;
+    let s0;
 
     s0 = peg$parseipv4withPort();
     if (s0 === peg$FAILED) {
@@ -1603,7 +1599,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipv6withPort() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$parseipv6();
@@ -1678,7 +1674,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipv6wColon() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1732,7 +1728,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipv6() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     s1 = [];
@@ -1747,7 +1743,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipv6char() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = input.charAt(peg$currPos);
     if (peg$r7.test(s0)) {
@@ -1799,7 +1795,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipv4withPort() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$parseipv4();
@@ -1838,7 +1834,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseipv4() {
-    var s0, s1, s2, s3, s4, s5;
+    let s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1893,7 +1889,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsebyte() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1947,7 +1943,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseportNum() {
-    var s0, s1, s2, s3;
+    let s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = peg$currPos;
@@ -1988,7 +1984,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsename() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     s1 = [];
@@ -2023,7 +2019,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parsesearchDomain() {
-    var s0, s1, s2;
+    let s0, s1, s2;
 
     s0 = peg$currPos;
     s1 = [];
@@ -2058,7 +2054,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parselineEnd() {
-    var s0, s1, s2, s3, s4;
+    let s0, s1, s2, s3, s4;
 
     s0 = peg$currPos;
     s1 = peg$parses();
@@ -2097,7 +2093,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parses() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -2106,7 +2102,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2115,18 +2111,16 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e31); }
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
     }
     peg$silentFails--;
-    s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e30); }
 
     return s0;
   }
 
   function peg$parseS() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     s0 = [];
@@ -2135,7 +2129,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
@@ -2145,7 +2139,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e31); }
+          if (peg$silentFails === 0) { peg$fail(peg$e30); }
         }
       }
     } else {
@@ -2154,14 +2148,14 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
 
     return s0;
   }
 
   function peg$parseeol() {
-    var s0, s1;
+    let s0, s1;
 
     peg$silentFails++;
     if (input.substr(peg$currPos, 2) === peg$c18) {
@@ -2169,7 +2163,7 @@ function peg$parse(input, options) {
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s0 === peg$FAILED) {
       s0 = input.charAt(peg$currPos);
@@ -2177,13 +2171,13 @@ 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$e34); }
       }
     }
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
 
     return s0;
@@ -2196,30 +2190,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/package.json

@@ -1,14 +1,9 @@
 {
   "name": "resolv-conf",
-  "version": "2.0.0",
+  "version": "3.0.4",
   "description": "Parse resolv.conf files",
   "main": "./lib/index.js",
   "type": "module",
-  "scripts": {
-    "test": "c8 ava",
-    "lint": "eslint .",
-    "build": "peggy --format es -o lib/resolv.peg.js lib/resolv.pegjs && tsc"
-  },
   "keywords": [
     "resolv",
     "resolv.conf",
@@ -26,21 +21,7 @@
   "bugs": "https://github.com/hildjj/resolv-conf/issues",
   "author": "Joe Hildebrand <joe-github@cursive.net>",
   "license": "MIT",
-  "devDependencies": {
-    "@cto.af/eslint-config": "^4.0.2",
-    "@peggyjs/coverage": "1.1.0",
-    "@types/node": "20.12.10",
-    "ava": "^6.1.3",
-    "c8": "^9.1.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-jsdoc": "^48.2.3",
-    "eslint-plugin-node": "^11.1.0",
-    "peggy": "^4.0.2",
-    "pegjs-backtrace": "^0.2.1",
-    "typescript": "^5.4.5"
-  },
-  "packageManager": "pnpm@9.1.0",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }