@html-validate/puppeteer-fetch 2.0.0 → 2.1.0

package/dist/index.js

@@ -27,33 +27,27 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // node_modules/argparse/lib/sub.js
 var require_sub = __commonJS({
-  "node_modules/argparse/lib/sub.js"(exports, module2) {
+  "node_modules/argparse/lib/sub.js"(exports2, module2) {
     "use strict";
     var { inspect } = require("util");
     module2.exports = function sub(pattern, ...values) {
       let regex = /%(?:(%)|(-)?(\*)?(?:\((\w+)\))?([A-Za-z]))/g;
       let result = pattern.replace(regex, function(_, is_literal, is_left_align, is_padded, name, format) {
-        if (is_literal)
-          return "%";
+        if (is_literal) return "%";
         let padded_count = 0;
         if (is_padded) {
-          if (values.length === 0)
-            throw new TypeError("not enough arguments for format string");
+          if (values.length === 0) throw new TypeError("not enough arguments for format string");
           padded_count = values.shift();
-          if (!Number.isInteger(padded_count))
-            throw new TypeError("* wants int");
+          if (!Number.isInteger(padded_count)) throw new TypeError("* wants int");
         }
         let str;
         if (name !== void 0) {
           let dict = values[0];
-          if (typeof dict !== "object" || dict === null)
-            throw new TypeError("format requires a mapping");
-          if (!(name in dict))
-            throw new TypeError(`no such key: '${name}'`);
+          if (typeof dict !== "object" || dict === null) throw new TypeError("format requires a mapping");
+          if (!(name in dict)) throw new TypeError(`no such key: '${name}'`);
           str = dict[name];
         } else {
-          if (values.length === 0)
-            throw new TypeError("not enough arguments for format string");
+          if (values.length === 0) throw new TypeError("not enough arguments for format string");
           str = values.shift();
         }
         switch (format) {
@@ -92,7 +86,7 @@ var require_sub = __commonJS({
 
 // node_modules/argparse/lib/textwrap.js
 var require_textwrap = __commonJS({
-  "node_modules/argparse/lib/textwrap.js"(exports, module2) {
+  "node_modules/argparse/lib/textwrap.js"(exports2, module2) {
     "use strict";
     var wordsep_simple_re = /([\t\n\x0b\x0c\r ]+)/;
     var TextWrapper = class {
@@ -335,7 +329,7 @@ var require_textwrap = __commonJS({
 
 // node_modules/argparse/argparse.js
 var require_argparse = __commonJS({
-  "node_modules/argparse/argparse.js"(exports, module2) {
+  "node_modules/argparse/argparse.js"(exports2, module2) {
     "use strict";
     var SUPPRESS = "==SUPPRESS==";
     var OPTIONAL = "?";
@@ -368,28 +362,23 @@ var require_argparse = __commonJS({
       object[name] = value;
     }
     function setdefault(object, name, value) {
-      if (!hasattr(object, name))
-        object[name] = value;
+      if (!hasattr(object, name)) object[name] = value;
       return object[name];
     }
     function delattr(object, name) {
       delete object[name];
     }
     function range(from, to, step = 1) {
-      if (arguments.length === 1)
-        [to, from] = [from, 0];
+      if (arguments.length === 1) [to, from] = [from, 0];
       if (typeof from !== "number" || typeof to !== "number" || typeof step !== "number") {
         throw new TypeError("argument cannot be interpreted as an integer");
       }
-      if (step === 0)
-        throw new TypeError("range() arg 3 must not be zero");
+      if (step === 0) throw new TypeError("range() arg 3 must not be zero");
       let result = [];
       if (step > 0) {
-        for (let i = from; i < to; i += step)
-          result.push(i);
+        for (let i = from; i < to; i += step) result.push(i);
       } else {
-        for (let i = from; i > to; i += step)
-          result.push(i);
+        for (let i = from; i > to; i += step) result.push(i);
       }
       return result;
     }
@@ -404,14 +393,12 @@ var require_argparse = __commonJS({
           result.push(parts[i] + (i + 1 < parts.length ? parts[i + 1] : ""));
         }
       }
-      if (!result[result.length - 1])
-        result.pop();
+      if (!result[result.length - 1]) result.pop();
       return result;
     }
     function _string_lstrip(string, prefix_chars) {
       let idx = 0;
-      while (idx < string.length && prefix_chars.includes(string[idx]))
-        idx++;
+      while (idx < string.length && prefix_chars.includes(string[idx])) idx++;
       return idx ? string.slice(idx) : string;
     }
     function _string_split(string, sep, maxsplit) {
@@ -422,18 +409,15 @@ var require_argparse = __commonJS({
       return result;
     }
     function _array_equal(array1, array2) {
-      if (array1.length !== array2.length)
-        return false;
+      if (array1.length !== array2.length) return false;
       for (let i = 0; i < array1.length; i++) {
-        if (array1[i] !== array2[i])
-          return false;
+        if (array1[i] !== array2[i]) return false;
       }
       return true;
     }
     function _array_remove(array, item) {
       let idx = array.indexOf(item);
-      if (idx === -1)
-        throw new TypeError(sub("%r not in list", item));
+      if (idx === -1) throw new TypeError(sub("%r not in list", item));
       array.splice(idx, 1);
     }
     function _choices_to_array(choices) {
@@ -480,24 +464,19 @@ var require_argparse = __commonJS({
     function _camelcase_alias(_class) {
       for (let name of Object.getOwnPropertyNames(_class.prototype)) {
         let camelcase = name.replace(/\w_[a-z]/g, (s) => s[0] + s[2].toUpperCase());
-        if (camelcase !== name)
-          _alias(_class.prototype, camelcase, name);
+        if (camelcase !== name) _alias(_class.prototype, camelcase, name);
       }
       return _class;
     }
     function _to_legacy_name(key) {
       key = key.replace(/\w_[a-z]/g, (s) => s[0] + s[2].toUpperCase());
-      if (key === "default")
-        key = "defaultValue";
-      if (key === "const")
-        key = "constant";
+      if (key === "default") key = "defaultValue";
+      if (key === "const") key = "constant";
       return key;
     }
     function _to_new_name(key) {
-      if (key === "defaultValue")
-        key = "default";
-      if (key === "constant")
-        key = "const";
+      if (key === "defaultValue") key = "default";
+      if (key === "constant") key = "const";
       key = key.replace(/[A-Z]/g, (c) => "_" + c.toLowerCase());
       return key;
     }
@@ -505,10 +484,8 @@ var require_argparse = __commonJS({
     function _parse_opts(args, descriptor) {
       function get_name() {
         let stack = new Error().stack.split("\n").map((x) => x.match(/^    at (.*) \(.*\)$/)).filter(Boolean).map((m) => m[1]).map((fn) => fn.match(/[^ .]*$/)[0]);
-        if (stack.length && stack[0] === get_name.name)
-          stack.shift();
-        if (stack.length && stack[0] === _parse_opts.name)
-          stack.shift();
+        if (stack.length && stack[0] === get_name.name) stack.shift();
+        if (stack.length && stack[0] === _parse_opts.name) stack.shift();
         return stack.length ? stack[0] : "";
       }
       args = Array.from(args);
@@ -603,8 +580,7 @@ var require_argparse = __commonJS({
       }
       if (missing_positionals.length) {
         let strs = missing_positionals.map(repr);
-        if (strs.length > 1)
-          strs[strs.length - 1] = "and " + strs[strs.length - 1];
+        if (strs.length > 1) strs[strs.length - 1] = "and " + strs[strs.length - 1];
         let str_joined = strs.join(strs.length === 2 ? "" : ", ");
         throw new TypeError(sub(
           "%s() missing %i required positional argument%s: %s",
@@ -1879,22 +1855,14 @@ var require_argparse = __commonJS({
         });
         this._flags = flags;
         this._options = {};
-        if (encoding !== void 0)
-          this._options.encoding = encoding;
-        if (mode !== void 0)
-          this._options.mode = mode;
-        if (autoClose !== void 0)
-          this._options.autoClose = autoClose;
-        if (emitClose !== void 0)
-          this._options.emitClose = emitClose;
-        if (start !== void 0)
-          this._options.start = start;
-        if (end !== void 0)
-          this._options.end = end;
-        if (highWaterMark !== void 0)
-          this._options.highWaterMark = highWaterMark;
-        if (fs3 !== void 0)
-          this._options.fs = fs3;
+        if (encoding !== void 0) this._options.encoding = encoding;
+        if (mode !== void 0) this._options.mode = mode;
+        if (autoClose !== void 0) this._options.autoClose = autoClose;
+        if (emitClose !== void 0) this._options.emitClose = emitClose;
+        if (start !== void 0) this._options.start = start;
+        if (end !== void 0) this._options.end = end;
+        if (highWaterMark !== void 0) this._options.highWaterMark = highWaterMark;
+        if (fs3 !== void 0) this._options.fs = fs3;
       }
       call(string) {
         if (string === "-") {
@@ -1928,10 +1896,9 @@ var require_argparse = __commonJS({
       [util.inspect.custom]() {
         let args = [this._flags];
         let kwargs = Object.entries(this._options).map(([k, v]) => {
-          if (k === "mode")
-            v = { value: v, [util.inspect.custom]() {
-              return "0o" + this.value.toString(8);
-            } };
+          if (k === "mode") v = { value: v, [util.inspect.custom]() {
+            return "0o" + this.value.toString(8);
+          } };
           return [k, v];
         });
         let args_str = [].concat(args.filter((arg) => arg !== -1).map(repr)).concat(kwargs.filter(([, arg]) => arg !== void 0).map(([kw, arg]) => sub("%s=%r", kw, arg))).join(", ");
@@ -3149,19 +3116,16 @@ var require_argparse = __commonJS({
       // Help-printing methods
       // =====================
       print_usage(file = void 0) {
-        if (file === void 0)
-          file = process.stdout;
+        if (file === void 0) file = process.stdout;
         this._print_message(this.format_usage(), file);
       }
       print_help(file = void 0) {
-        if (file === void 0)
-          file = process.stdout;
+        if (file === void 0) file = process.stdout;
         this._print_message(this.format_help(), file);
       }
       _print_message(message, file = void 0) {
         if (message) {
-          if (file === void 0)
-            file = process.stderr;
+          if (file === void 0) file = process.stderr;
           file.write(message);
         }
       }
@@ -3175,8 +3139,7 @@ var require_argparse = __commonJS({
         process.exit(status);
       }
       error(message) {
-        if (this.debug === true)
-          throw new Error(message);
+        if (this.debug === true) throw new Error(message);
         this.print_usage(process.stderr);
         let args = { prog: this.prog, message };
         this.exit(2, sub("%(prog)s: error: %(message)s\n", args));
@@ -3229,19 +3192,19 @@ var require_argparse = __commonJS({
 });
 
 // src/index.ts
-var import_fs = require("fs");
-var import_path = __toESM(require("path"));
-var import_puppeteer = __toESM(require("puppeteer"));
+var import_node_fs = require("node:fs");
+var import_node_path = __toESM(require("node:path"));
 var import_argparse = __toESM(require_argparse());
+var import_puppeteer = require("puppeteer");
 function normalizeUrl(url) {
-  if (url.match(/:\/\//)) {
+  if (/:\/\//.exec(url)) {
     return url;
   } else {
     return `https://${url}`;
   }
 }
 async function run() {
-  const content = await import_fs.promises.readFile(import_path.default.join(__dirname, "../package.json"), "utf-8");
+  const content = await import_node_fs.promises.readFile(import_node_path.default.join(__dirname, "../package.json"), "utf-8");
   const pkg = JSON.parse(content);
   const parser = new import_argparse.ArgumentParser({
     description: pkg.description
@@ -3252,7 +3215,7 @@ async function run() {
   parser.add_argument("url", { help: "URL to fetch", metavar: "URL" });
   const args = parser.parse_args();
   const url = normalizeUrl(args.url);
-  const browser = await import_puppeteer.default.launch({ headless: false });
+  const browser = await (0, import_puppeteer.launch)({ headless: false });
   const page = await browser.newPage();
   await page.goto(url);
   const source = await page.content();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-validate/puppeteer-fetch",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Fetch HTML source from a webpage using Chrome as backend",
   "keywords": [
     "puppeteer",
@@ -14,21 +14,23 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitlab.com/html-validate/puppeteer-fetch.git"
+    "url": "git+https://gitlab.com/html-validate/puppeteer-fetch.git"
   },
   "license": "MIT",
   "author": "David Sveningsson <ext@sidvind.com>",
   "main": "dist/index.js",
-  "bin": "puppeteer-fetch.js",
+  "bin": {
+    "puppeteer-fetch": "puppeteer-fetch.js"
+  },
   "files": [
     "dist",
     "puppeteer-fetch.js"
   ],
   "dependencies": {
-    "puppeteer": "20.1.1"
+    "puppeteer": "24.27.0"
   },
   "engines": {
-    "node": ">= 16",
+    "node": ">= 20",
     "npm": ">= 7"
   },
   "publishConfig": {