sqlmath 2022.4.28 → 2022.5.20

package/jslint.mjs

@@ -1,14 +1,15 @@
 // #!/usr/bin/env node
 // JSLint
-// Original Author: Douglas Crockford (https://www.jslint.com).
 
+// The Unlicense
+//
 // This is free and unencumbered software released into the public domain.
-
+//
 // Anyone is free to copy, modify, publish, use, compile, sell, or
 // distribute this software, either in source code form or as a compiled
 // binary, for any purpose, commercial or non-commercial, and by any
 // means.
-
+//
 // In jurisdictions that recognize copyright laws, the author or authors
 // of this software dedicate any and all copyright interest in the
 // software to the public domain. We make this dedication for the benefit
@@ -16,7 +17,7 @@
 // successors. We intend this dedication to be an overt act of
 // relinquishment in perpetuity of all present and future rights to this
 // software under copyright law.
-
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -24,7 +25,7 @@
 // OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
-
+//
 // For more information, please refer to <https://unlicense.org/>
 
 
@@ -92,8 +93,11 @@
 // WARNING: JSLint will hurt your feelings.
 
 /*jslint beta, node*/
-
 /*property
+    excludeList,
+    globExclude,
+    import_meta_url, includeList,
+    pathnameList,
     JSLINT_BETA, NODE_V8_COVERAGE, a, all, argv, arity, artifact,
     assertErrorThrownAsync, assertJsonEqual, assertOrThrow, assign, async, b,
     beta, bitwise, block, body, browser, c, calls, catch, catch_list,
@@ -164,7 +168,7 @@ let jslint_charset_ascii = (
     + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
     + "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
 );
-let jslint_edition = "v2022.5.1-beta";
+let jslint_edition = "v2022.6.1-beta";
 let jslint_export;                      // The jslint object to be exported.
 let jslint_fudge = 1;                   // Fudge starting line and starting
                                         // ... column to 1.
@@ -251,6 +255,9 @@ let jslint_rgx_token = new RegExp(
     + ")"
     + "(.*)$"
 );
+let jslint_rgx_url_search_window_jslint = (
+    /[&?]window_jslint=1(?:$|&)/m
+);
 let jslint_rgx_weird_property = (
     /^_|\$|Sync$|_$/m
 );
@@ -349,6 +356,224 @@ async function fsWriteFileWithParents(pathname, data) {
     console.error("wrote file " + pathname);
 }
 
+function globExclude({
+    excludeList = [],
+    includeList = [],
+    pathnameList = []
+}) {
+
+// This function will
+// 1. Exclude pathnames in <pathnameList> that don't match glob-patterns in
+//    <includeList>.
+// 2. Exclude pathnames in <pathnameList> that match glob-patterns in
+//    <excludeList>.
+
+    function globAssertNotWeird(list, name) {
+
+// This function will check if <list> of strings contain weird characters.
+
+        [
+            [
+                "\n", (
+                    /^.*?([\u0000-\u0007\r]).*/gm
+                )
+            ],
+            [
+                "\r", (
+                    /^.*?([\n]).*/gm
+                )
+            ]
+        ].forEach(function ([
+            separator, rgx
+        ]) {
+            list.join(separator).replace(rgx, function (match0, char) {
+                throw new Error(
+                    "Weird character "
+                    + JSON.stringify(char)
+                    + " found in " + name + " "
+                    + JSON.stringify(match0)
+                );
+            });
+        });
+    }
+
+    function globToRegexp(pattern) {
+
+// This function will translate glob <pattern> to javascript-regexp,
+// which javascript can then use to "glob" pathnames.
+
+        let ii = 0;
+        let isClass = false;
+        let strClass = "";
+        let strRegex = "";
+        pattern = pattern.replace((
+            /\/\/+/g
+        ), "/");
+        pattern = pattern.replace((
+            /\*\*\*+/g
+        ), "**");
+        pattern.replace((
+            /\\\\|\\\[|\\\]|\[|\]|./g
+        ), function (match0) {
+            switch (match0) {
+            case "[":
+                if (isClass) {
+                    strClass += "[";
+                    return;
+                }
+                strClass += "\u0000";
+                strRegex += "\u0000";
+                isClass = true;
+                return;
+            case "]":
+                if (isClass) {
+                    isClass = false;
+                    return;
+                }
+                strRegex += "]";
+                return;
+            default:
+                if (isClass) {
+                    strClass += match0;
+                    return;
+                }
+                strRegex += match0;
+            }
+            return "";
+        });
+        strClass += "\u0000";
+
+// An expression "[!...]" matches a single character, namely any character that
+// is not matched by the expression obtained by removing the first '!' from it.
+// (Thus, "[!a-]" matches any single character except 'a', and '-'.)
+
+        strClass = strClass.replace((
+            /\u0000!/g
+        ), "\u0000^");
+
+// One may include '-' in its literal meaning by making it the first or last
+// character between the brackets.
+
+        strClass = strClass.replace((
+            /\u0000-/g
+        ), "\u0000\\-");
+        strClass = strClass.replace((
+            /-\u0000/g
+        ), "\\-\u0000");
+
+// Escape brackets '[', ']' in character class.
+
+        strClass = strClass.replace((
+            /[\[\]]/g
+        ), "\\$&");
+
+// https://stackoverflow.com/questions/3561493
+// /is-there-a-regexp-escape-function-in-javascript
+// $()*+-./?[\]^{|}
+
+        strRegex = strRegex.replace((
+            // ignore [-/]
+            /[$()*+.?\[\\\]\^{|}]/g
+        ), "\\$&");
+
+// Expand wildcard '**/*'.
+
+        strRegex = strRegex.replace((
+            /\\\*\\\*\/(?:\\\*)+/g
+        ), ".*?");
+
+// Expand wildcard '**'.
+
+        strRegex = strRegex.replace((
+            /(^|\/)\\\*\\\*(\/|$)/gm
+        ), "$1.*?$2");
+
+// Expand wildcard '*'.
+
+        strRegex = strRegex.replace((
+            /(?:\\\*)+/g
+        ), "[^\\/]*?");
+
+// Expand wildcard '?'.
+
+        strRegex = strRegex.replace((
+            /\\\?/g
+        ), "[^\\/]");
+
+// Expand directory-with-trailing-slash '.../'.
+
+        strRegex = strRegex.replace((
+            /\/$/gm
+        ), "\\/.*?");
+
+// Merge strClass into strRegex.
+
+        ii = 0;
+        strClass = strClass.split("\u0000");
+        strRegex = strRegex.replace((
+            /\u0000/g
+        ), function () {
+            ii += 1;
+            if (strClass[ii] === "") {
+                return "";
+            }
+            return "[" + strClass[ii] + "]";
+        });
+
+// Change strRegex from string to regexp.
+
+        strRegex = new RegExp("^" + strRegex + "$", "gm");
+        return strRegex;
+    }
+
+// Validate excludeList, includeList, pathnameList.
+
+    globAssertNotWeird(excludeList, "pattern");
+    globAssertNotWeird(includeList, "pattern");
+    globAssertNotWeird(pathnameList, "pathname");
+
+// Optimization
+// Concat pathnames into a single, newline-separated string,
+// whose pathnames can all be filtered with a single, regexp-pass.
+
+    pathnameList = pathnameList.join("\n");
+
+// 1. Exclude pathnames in <pathnameList> that don't match glob-patterns in
+//    <includeList>.
+
+    if (includeList.length > 0) {
+        includeList = includeList.map(globToRegexp);
+        includeList.forEach(function (pattern) {
+            pathnameList = pathnameList.replace(pattern, "\u0000$&");
+        });
+        pathnameList = pathnameList.replace((
+            /^[^\u0000].*/gm
+        ), "");
+        pathnameList = pathnameList.replace((
+            /^\u0000+/gm
+        ), "");
+    }
+
+// 2. Exclude pathnames in <pathnameList> that match glob-patterns in
+//    <excludeList>.
+
+    excludeList = excludeList.map(globToRegexp);
+    excludeList.forEach(function (pattern) {
+        pathnameList = pathnameList.replace(pattern, "");
+    });
+
+// Split newline-separated pathnames back to list.
+
+    pathnameList = pathnameList.split("\n").filter(function (elem) {
+        return elem;
+    });
+    return {
+        excludeList,
+        includeList,
+        pathnameList
+    };
+}
+
 function htmlEscape(str) {
 
 // This function will make <str> html-safe by escaping & < >.
@@ -1537,6 +1762,7 @@ async function jslint_cli({
     console_error,
     console_log,
     file,
+    import_meta_url,
     mode_cli,
     mode_noop,
     option,
@@ -1705,11 +1931,26 @@ async function jslint_cli({
         return count;
     }
 
+// PR-396 - window.jslint
+// Check import.meta.url for directive to export jslint to window-object.
+// Useful for ES5-era browser-scripts that rely on window.jslint,
+// like CodeMirror.
+//
+// Example usage:
+// <script type="module" src="./jslint.mjs?window_jslint=1"></script>
+
+    import_meta_url = import_meta_url || jslint_import_meta_url;
+    if (
+        jslint_rgx_url_search_window_jslint.test(import_meta_url)
+        && (typeof globalThis === "object" && globalThis)
+    ) {
+        globalThis.jslint = jslint;
+    }
+
 // Feature-detect nodejs.
 
     if (!(
-        typeof process === "object"
-        && process
+        (typeof process === "object" && process)
         && process.versions
         && typeof process.versions.node === "string"
         && !mode_noop
@@ -1735,7 +1976,7 @@ async function jslint_cli({
                 ).test(process_argv[1])
                 || mode_cli
             )
-            && moduleUrl.fileURLToPath(jslint_import_meta_url)
+            && moduleUrl.fileURLToPath(import_meta_url)
             === modulePath.resolve(process_argv[1])
         )
         && !mode_cli
@@ -1881,7 +2122,9 @@ async function jslint_cli({
         option
     });
     if (mode_report) {
-        await fsWriteFileWithParents(mode_report, jslint_report(result));
+        result = jslint.jslint_report(result);
+        result = `<body class="JSLINT_ JSLINT_REPORT_">\n${result}</body>\n`;
+        await fsWriteFileWithParents(mode_report, result);
     }
     process_exit(exit_code);
     return exit_code;
@@ -8969,6 +9212,7 @@ function jslint_report({
 
 // This function will create human-readable, html-report
 // for warnings, properties, and functions from jslint-result-object.
+//
 // Example usage:
 //  let result = jslint("console.log('hello world')");
 //  let html = jslint_report(result);
@@ -9001,7 +9245,6 @@ function jslint_report({
         );
     }
 
-    html += "<div class=\"JSLINT_\" id=\"JSLINT_REPORT_HTML\">\n";
     html += String(`
 <style class="JSLINT_REPORT_STYLE">
 /* jslint utility2:true */
@@ -9150,19 +9393,38 @@ pyNj+JctcQLXenBOCms46aMkenIx45WpXqxxVJQLz/vgpmAVa0fmDv6Pue9xVTBPfVxCUGfj\
 /7xoEqvL+2E8VOyCTuT/7j269Zy4jUtN+g4="
     ) format("woff2");
 }
-*,
-*:after,
-*:before {
+.JSLINT_,
+.JSLINT_ address,
+.JSLINT_ button,
+.JSLINT_ cite,
+.JSLINT_ dd,
+.JSLINT_ dfn,
+.JSLINT_ dl,
+.JSLINT_ dt,
+.JSLINT_ fieldset,
+.JSLINT_ fieldset > div,
+.JSLINT_ input,
+.JSLINT_ label,
+.JSLINT_ legend,
+.JSLINT_ ol,
+.JSLINT_ samp,
+.JSLINT_ style,
+.JSLINT_ textarea,
+.JSLINT_ ul {
     border: 0;
     box-sizing: border-box;
     margin: 0;
     padding: 0;
 }
+/* disable text inflation algorithm used on some smartphones and tablets */
 .JSLINT_ {
     -ms-text-size-adjust: none;
     -webkit-text-size-adjust: none;
     text-size-adjust: none;
 }
+.JSLINT_REPORT_ div {
+    box-sizing: border-box;
+}
 /*csslint ignore:end*/
 
 /* css - jslint_report - font */
@@ -9196,7 +9458,7 @@ pyNj+JctcQLXenBOCms46aMkenIx45WpXqxxVJQLz/vgpmAVa0fmDv6Pue9xVTBPfVxCUGfj\
 }
 
 /* css - jslint_report - general */
-body {
+.JSLINT_ {
     background: antiquewhite;
 }
 .JSLINT_ fieldset {
@@ -9533,7 +9795,6 @@ body {
     });
     html += "</div>\n";
     html += "</fieldset>\n";
-    html += "</div>\n";
     return html;
 }
 
@@ -10349,11 +10610,11 @@ async function v8CoverageReportCreate({
 // 3. Create html-coverage-reports in <coverageDir>.
 
     let cwd;
+    let excludeList = [];
     let exitCode = 0;
     let fileDict;
-    let fileExcludeList = [];
-    let fileIncludeList = [];
-    let fileIncludeNodeModules;
+    let includeList = [];
+    let modeIncludeNodeModules;
     let processArgElem;
     let promiseList = [];
     let v8CoverageObj;
@@ -10378,9 +10639,19 @@ async function v8CoverageReportCreate({
 <style>
 /* jslint utility2:true */
 /*csslint ignore:start*/
-* {
-box-sizing: border-box;
-    font-family: consolas, menlo, monospace;
+.coverage,
+.coverage a,
+.coverage div,
+.coverage pre,
+.coverage span,
+.coverage table,
+.coverage tbody,
+.coverage td,
+.coverage th,
+.coverage thead,
+.coverage tr {
+    box-sizing: border-box;
+    font-family: monospace;
 }
 /*csslint ignore:end*/
 
@@ -10526,6 +10797,7 @@ body {
         }
         txtBorder = (
             "+" + "-".repeat(padPathname + 2) + "+"
+            + "-".repeat(padLines + 2) + "+"
             + "-".repeat(padLines + 2) + "+\n"
         );
         txt = "";
@@ -10533,7 +10805,8 @@ body {
         txt += txtBorder;
         txt += (
             "| " + String("Files covered").padEnd(padPathname, " ") + " | "
-            + String("Lines").padStart(padLines, " ") + " |\n"
+            + String("Lines").padStart(padLines, " ") + " | "
+            + String("Remaining").padStart(padLines, " ") + " |\n"
         );
         txt += txtBorder;
         fileList.forEach(function ({
@@ -10613,7 +10886,8 @@ body {
                 + String("./" + pathname).padEnd(padPathname, " ") + " | "
                 + String(
                     modeCoverageIgnoreFile + " " + coveragePct + " %"
-                ).padStart(padLines, " ") + " |\n"
+                ).padStart(padLines, " ") + " | "
+                + " ".repeat(padLines) + " |\n"
             );
             txt += (
                 "| " + "*".repeat(
@@ -10621,6 +10895,9 @@ body {
                 ).padEnd(padPathname, "_") + " | "
                 + String(
                     linesCovered + " / " + linesTotal
+                ).padStart(padLines, " ") + " | "
+                + String(
+                    (linesTotal - linesCovered) + " / " + linesTotal
                 ).padStart(padLines, " ") + " |\n"
             );
             txt += txtBorder;
@@ -10784,21 +11061,6 @@ ${String(count || "-0").padStart(7, " ")}
         ), txt));
     }
 
-    function pathnameRelativeCwd(pathname) {
-
-// This function will if <pathname> is inside <cwd>,
-// return it relative to <cwd>, else empty-string.
-
-        pathname = modulePath.resolve(pathname).replace((
-            /\\/g
-        ), "/");
-        if (!pathname.startsWith(cwd)) {
-            return;
-        }
-        pathname = pathname.slice(cwd.length);
-        return pathname;
-    }
-
 /*
 function sentinel() {}
 */
@@ -10830,28 +11092,28 @@ function sentinel() {}
         processArgElem[1] = processArgElem.slice(1).join("=");
         switch (processArgElem[0]) {
 
-// PR-371 - add cli-option `--exclude=aa,bb`
+// PR-371
+// Add cli-option `--exclude=...`.
 
         case "--exclude":
-            fileExcludeList = fileExcludeList.concat(
-                processArgElem[1].split(",")
-            );
+            excludeList.push(processArgElem[1]);
             break;
 
-// PR-371 - add cli-option `--exclude-node-modules=false`
+// PR-371
+// Add cli-option `--include=...`
 
-        case "--exclude-node-modules":
-            fileIncludeNodeModules = (
-                /0|false|null|undefined/
-            ).test(processArgElem[1]);
+        case "--include":
+            includeList.push(processArgElem[1]);
             break;
 
-// PR-371 - add cli-option `--include=aa,bb`
+// PR-400
+// Disable default-coverage of directory `node_modules`,
+// but allow override with cli-option `--include-node-modules=1`.
 
-        case "--include":
-            fileIncludeList = fileIncludeList.concat(
-                processArgElem[1].split(",")
-            );
+        case "--include-node-modules":
+            modeIncludeNodeModules = !(
+                /0|false|null|undefined/
+            ).test(processArgElem[1]);
             break;
         }
     }
@@ -10905,9 +11167,11 @@ function sentinel() {}
         ).test(file);
     });
     v8CoverageObj = await Promise.all(v8CoverageObj.map(async function (file) {
-        let data = await moduleFs.promises.readFile(coverageDir + file, "utf8");
+        let data;
+        let pathnameDict = Object.create(null);
+        data = await moduleFs.promises.readFile(coverageDir + file, "utf8");
         data = JSON.parse(data);
-        data.result = data.result.filter(function (scriptCov) {
+        data.result.forEach(function (scriptCov) {
             let pathname = scriptCov.url;
 
 // Filter out internal coverages.
@@ -10918,38 +11182,40 @@ function sentinel() {}
 
 // Normalize pathname.
 
-            pathname = pathnameRelativeCwd(moduleUrl.fileURLToPath(pathname));
-            if (
+            pathname = moduleUrl.fileURLToPath(pathname);
+            pathname = modulePath.resolve(pathname).replace((
+                /\\/g
+            ), "/");
 
 // Filter files outside of cwd.
 
-                !pathname
-                || pathname.startsWith("[")
+            if (pathname.indexOf("[") >= 0 || !pathname.startsWith(cwd)) {
+                return;
+            }
 
-// PR-371 - Filter directory node_modules.
+// Normalize pathname relative to cwd.
 
-                || (
-                    !fileIncludeNodeModules
-                    && (
-                        /(?:^|\/)node_modules\//m
-                    ).test(pathname)
-                )
+            pathname = pathname.slice(cwd.length);
+            scriptCov.url = pathname;
+            pathnameDict[pathname] = scriptCov;
+        });
 
-// PR-371 - Filter fileExcludeList.
+// PR-400
+// Filter directory `node_modules`.
 
-                || fileExcludeList.indexOf(pathname) >= 0
+        if (!modeIncludeNodeModules) {
+            excludeList.push("node_modules/");
+        }
 
-// PR-371 - Filter fileIncludeList.
+// PR-400
+// Filter files by glob-patterns in excludeList, includeList.
 
-                || (
-                    fileIncludeList.length > 0
-                    && fileIncludeList.indexOf(pathname) === -1
-                )
-            ) {
-                return;
-            }
-            scriptCov.url = pathname;
-            return true;
+        data.result = globExclude({
+            excludeList,
+            includeList,
+            pathnameList: Object.keys(pathnameDict)
+        }).pathnameList.map(function (pathname) {
+            return pathnameDict[pathname];
         });
         return data;
     }));
@@ -10958,7 +11224,7 @@ function sentinel() {}
 
     v8CoverageObj = v8CoverageListMerge(v8CoverageObj);
 
-// debug v8CoverageObj.
+// Debug v8CoverageObj.
 
     await fsWriteFileWithParents(
         coverageDir + "v8_coverage_merged.json",
@@ -11098,6 +11364,7 @@ jslint_export = Object.freeze(Object.assign(jslint, {
     assertOrThrow,
     debugInline,
     fsWriteFileWithParents,
+    globExclude,
     htmlEscape,
     jslint,
     jslint_apidoc,

package/package.json

@@ -11,7 +11,7 @@
     "engines": {
         "node": ">=14"
     },
-    "fileCount": 28,
+    "fileCount": 29,
     "homepage": "https://github.com/sqlmath/sqlmath",
     "keywords": [
         "data-science",
@@ -29,7 +29,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/sqlmath/sqlmath"
+        "url": "https://github.com/sqlmath/sqlmath.git"
     },
     "scripts": {
         "build": "sh jslint_ci.sh shCiBuildNodejs",
@@ -37,5 +37,5 @@
         "test2": "sh jslint_ci.sh shCiBase",
         "test_win32": "node -e \"require('child_process').spawn('C:\\\\Program Files\\\\Git\\\\bin\\\\bash.exe',['-c','npm run test' + ' ' + process.argv.slice(1).join(' ')],{stdio:['ignore',1,2]});\""
     },
-    "version": "2022.4.28"
+    "version": "2022.5.20"
 }