Fix undefined li count (#792)

* Fix undefined li_count assignment

* Fix eslint environments and enable no-undef linting

* Add changelog bits.

Author: gijsk

.eslintrc.js

@@ -1,9 +1,14 @@
+/* eslint-env node */
 "use strict";
 
 module.exports = {
   "parserOptions": {
     "ecmaVersion": 6
   },
+  "env": {
+    "es6": true,
+    "shared-node-browser": true,
+  },
   "rules": {
     // Braces only needed for multi-line arrow function blocks
     // "arrow-body-style": [2, "as-needed"],
@@ -146,7 +151,7 @@ module.exports = {
     "no-trailing-spaces": 2,
 
     // No using undeclared variables
-    // "no-undef": 2,
+    "no-undef": 2,
 
     // Error on newline where a semicolon is needed
     "no-unexpected-multiline": 2,

CHANGELOG.md

@@ -11,6 +11,9 @@ may change this output. Patch version increments will only do so in ways that ar
 strict improvements (e.g. from empty strings or exceptions to something more
 reasonable).
 
+## [Unreleased]
+- Fixed [undefined `li_count` variable breaking use of readability in Cloudflare workers](https://github.com/mozilla/readability/issues/791)
+
 ## [0.4.3] - 2023-03-22
 
 - Fixed [`aria-modal` cookie dialogs interfering with readability](https://github.com/mozilla/readability/pull/746)

JSDOMParser.js

@@ -1,4 +1,3 @@
-/*eslint-env es6:false*/
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -874,10 +873,11 @@
 
   JSDOMParser.prototype = {
     error: function(m) {
-      if (typeof dump !== "undefined") {
-        dump("JSDOMParser error: " + m + "\n");
-      } else if (typeof console !== "undefined") {
+      if (typeof console !== "undefined") {
         console.log("JSDOMParser error: " + m + "\n");
+      } else if (typeof dump !== "undefined") {
+        /* global dump */
+        dump("JSDOMParser error: " + m + "\n");
       }
       this.errorState += m + "\n";
     },
@@ -1192,5 +1192,6 @@
 })(this);
 
 if (typeof module === "object") {
+  /* global module */
   module.exports = this.JSDOMParser;
 }

Readability-readerable.js

@@ -1,4 +1,3 @@
-/* eslint-env es6:false */
 /*
  * Copyright (c) 2010 Arc90 Inc
  *
@@ -104,5 +103,6 @@ function isProbablyReaderable(doc, options = {}) {
 }
 
 if (typeof module === "object") {
+  /* global module */
   module.exports = isProbablyReaderable;
 }

Readability.js

@@ -1,4 +1,3 @@
-/*eslint-env es6:false*/
 /*
  * Copyright (c) 2010 Arc90 Inc
  *
@@ -74,12 +73,7 @@ function Readability(doc, options) {
       return `<${node.localName} ${attrPairs}>`;
     };
     this.log = function () {
-      if (typeof dump !== "undefined") {
-        var msg = Array.prototype.map.call(arguments, function(x) {
-          return (x && x.nodeName) ? logNode(x) : x;
-        }).join(" ");
-        dump("Reader: (Readability) " + msg + "\n");
-      } else if (typeof console !== "undefined") {
+      if (typeof console !== "undefined") {
         let args = Array.from(arguments, arg => {
           if (arg && arg.nodeType == this.ELEMENT_NODE) {
             return logNode(arg);
@@ -88,6 +82,12 @@ function Readability(doc, options) {
         });
         args.unshift("Reader: (Readability)");
         console.log.apply(console, args);
+      } else if (typeof dump !== "undefined") {
+        /* global dump */
+        var msg = Array.prototype.map.call(arguments, function(x) {
+          return (x && x.nodeName) ? logNode(x) : x;
+        }).join(" ");
+        dump("Reader: (Readability) " + msg + "\n");
       }
     };
   } else {
@@ -2147,7 +2147,7 @@ Readability.prototype = {
               return haveToRemove;
             }
           }
-          li_count = node.getElementsByTagName("li").length;
+          let li_count = node.getElementsByTagName("li").length;
           // Only allow the list to remain if every li contains an image
           if (img == li_count) {
             return false;
@@ -2296,5 +2296,6 @@ Readability.prototype = {
 };
 
 if (typeof module === "object") {
+  /* global module */
   module.exports = Readability;
 }

index.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 var Readability = require("./Readability");
 var isProbablyReaderable = require("./Readability-readerable");
 

test/generate-testcase.js

@@ -1,3 +1,5 @@
+/* eslint-env node, mocha */
+
 var debug = false;
 
 var path = require("path");

test/test-isProbablyReaderable.js

@@ -1,3 +1,5 @@
+/* eslint-env node, mocha */
+
 var JSDOM = require("jsdom").JSDOM;
 var chai = require("chai");
 chai.config.includeStack = true;

test/test-jsdomparser.js

@@ -1,3 +1,5 @@
+/* eslint-env node, mocha */
+
 var chai = require("chai");
 chai.config.includeStack = true;
 var expect = chai.expect;

test/test-readability.js

@@ -1,3 +1,5 @@
+/* eslint-env node, mocha */
+
 var JSDOM = require("jsdom").JSDOM;
 var chai = require("chai");
 var sinon = require("sinon");