textbrowser 0.49.0 → 0.50.0

package/eslint.config.js

@@ -0,0 +1,69 @@
+import ashNazg from 'eslint-config-ash-nazg';
+
+export default [
+  {
+    ignores: [
+      'resources/vendor',
+      'dist/**',
+      '!dist/sw-helper.js'
+    ]
+  },
+  ...ashNazg(['sauron', 'browser']),
+  {
+    files: ['resources/user-sample.js'],
+    rules: {
+      'n/no-missing-import': 0,
+      'import/no-unresolved': 0
+    }
+  },
+  {
+    files: ['sw-sample.js'],
+    rules: {
+      'import/no-unresolved': 0,
+      'import/unambiguous': 0,
+      strict: 0
+    }
+  },
+  {
+    files: ['test/index.html', 'test/textbrowserTests.js'],
+    languageOptions: {
+      globals: {
+        assert: false,
+        mocha: false
+      }
+    },
+    rules: {
+      'import/unambiguous': 0
+    }
+  },
+  {
+    settings: {
+      polyfills: [
+        'navigator.serviceWorker',
+        'Notification.requestPermission'
+      ]
+    },
+    rules: {
+      // Disable for now
+      'array-bracket-newline': 0,
+      'no-console': 0,
+      'require-unicode-regexp': 0,
+      '@stylistic/max-len': 0,
+      'no-shadow': 0,
+      'implicit-arrow-linebreak': 0,
+      'function-paren-newline': 0,
+      'class-methods-use-this': 0,
+      'callback-return': 0,
+      'multiline-ternary': 0,
+      'consistent-return': 0,
+      'arrow-parens': 0,
+      'require-await': 0,
+      'prefer-named-capture-group': 0,
+      'jsdoc/require-jsdoc': 0,
+      'promise/avoid-new': 0,
+      'promise/prefer-await-to-callbacks': 0,
+      'import/no-anonymous-default-export': 0,
+      'unicorn/no-array-callback-reference': 0
+    }
+  }
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "textbrowser",
-  "version": "0.49.0",
+  "version": "0.50.0",
   "description": "Multilinear text browser",
   "type": "module",
   "main": "dist/index-es.min.js",
@@ -10,7 +10,7 @@
     "textbrowser": "./server/main.js"
   },
   "browserslist": [
-    "cover 100%"
+    "defaults, not op_mini all"
   ],
   "bugs": {
     "url": "https://github.com/bahaidev/textbrowser/issues"
@@ -30,59 +30,41 @@
     "text"
   ],
   "dependencies": {
-    "@babel/core": "^7.23.3",
+    "@babel/core": "^7.25.2",
     "@brettz9/node-static": "^0.1.1",
-    "command-line-args": "^5.2.1",
+    "command-line-args": "^6.0.0",
     "dom-parser": "^1.1.5",
     "form-serialization": "^0.11.0",
     "indexeddbshim": "^12.0.0",
-    "intl-dom": "^0.19.0",
+    "intl-dom": "^0.20.0",
     "intl-locale-textinfo-polyfill": "^2.1.1",
-    "jamilih": "0.58.2",
-    "jsdom": "^22.1.0",
+    "jamilih": "0.60.0",
+    "jsdom": "^25.0.0",
     "json-refs": "^3.0.15",
-    "load-stylesheets": "0.10.0",
-    "node-fetch": "^2.6.6",
+    "load-stylesheets": "0.12.5",
+    "node-fetch": "^3.3.2",
     "simple-get-json": "^9.0.1"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.23.3",
-    "@brettz9/eslint-plugin": "^1.0.4",
+    "@babel/preset-env": "^7.25.4",
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-commonjs": "^26.0.1",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@stadtlandnetz/rollup-plugin-postprocess": "^1.1.0",
-    "@web/rollup-plugin-import-meta-assets": "^2.2.0",
-    "ajv": "8.12.0",
+    "@web/rollup-plugin-import-meta-assets": "^2.2.1",
+    "ajv": "8.17.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "chai": "^4.3.10",
-    "eslint": "^8.53.0",
-    "eslint-config-ash-nazg": "^35.1.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-array-func": "^4.0.0",
-    "eslint-plugin-compat": "^4.2.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jsdoc": "^46.9.0",
-    "eslint-plugin-markdown": "^3.0.1",
-    "eslint-plugin-n": "^16.3.1",
-    "eslint-plugin-no-unsanitized": "^4.0.2",
-    "eslint-plugin-no-use-extend-native": "^0.5.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-sonarjs": "^0.23.0",
-    "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-unicorn": "^49.0.0",
+    "chai": "^5.1.1",
+    "eslint": "^9.10.0",
+    "eslint-config-ash-nazg": "^36.17.0",
     "json-metaschema": "1.3.0",
-    "mocha": "^10.2.0",
+    "mocha": "^10.7.3",
     "npm-run-all": "^4.1.5",
-    "open-cli": "^7.2.0",
-    "rollup": "^4.4.0",
+    "open-cli": "^8.0.0",
+    "rollup": "^4.22.0",
     "rollup-plugin-re": "^1.0.7",
     "textbrowser-data-schemas": "^0.2.0"
   },
@@ -91,7 +73,7 @@
     "start": "static -p 8081",
     "rollup": "rollup -c",
     "lint": "npm run eslint",
-    "eslint": "eslint --ext=js,md,html .",
+    "eslint": "eslint .",
     "mocha": "mocha --require test/bootstrap/node.js --require chai/register-assert.js test/textbrowserTests.js",
     "node": "npm run eslint && npm run rollup && npm run mocha",
     "open-test": "open-cli http://127.0.0.1:8081/test/",

package/resources/activateCallback.js

@@ -2,7 +2,7 @@
  * @file Note that this should be kept as a polyglot client-server file
  *    (besides the server, it is to be invoked by the project service worker).
  */
-/* eslint-env worker */
+/* eslint-env worker -- Worker environment */
 
 const {ceil} = Math;
 const arrayChunk = (arr, size) => {

package/resources/index.js

@@ -1,5 +1,3 @@
-/* eslint-env browser */
-
 import {getJSON} from 'simple-get-json';
 import {i18n} from 'intl-dom';
 import loadStylesheets from 'load-stylesheets';
@@ -22,15 +20,6 @@ import workSelect from './workSelect.js';
 import workDisplay from './workDisplay.js';
 import {resultsDisplayClient} from './resultsDisplay.js';
 
-/* eslint-disable no-unused-vars, @stylistic/brace-style */
-/**
- *
- * @param {null|number|string|PlainObject|GenericArray} obj
- * @returns {void}
- */
-function s (obj) { dialogs.alert(JSON.stringify(obj)); } // lgtm [js/unused-local-variable]
-/* eslint-enable no-unused-vars, @stylistic/brace-style */
-
 /**
  *
  * @returns {Promise<void>}
@@ -138,7 +127,7 @@ async function requestPermissions (langs, l) {
         // rememberRefusal();
         resolve();
         return;
-        // eslint-disable-next-line sonarjs/no-duplicated-branches
+        // eslint-disable-next-line sonarjs/no-duplicated-branches -- Ease of maintenance
       case 'default':
         resolve();
         return;
@@ -269,7 +258,6 @@ class TextBrowser {
       const url = location.href.replace(/#.*$/, '') + '#' + $p.toString();
       history.replaceState(formSerialize(form, {hash: true, empty: true}), document.title, url);
       // Get and set new state within URL
-      // eslint-disable-next-line n/callback-return
       cb();
       location.hash = '#' + $p.toString();
     };

package/resources/resultsDisplay.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 import Locale from 'intl-locale-textinfo-polyfill';
 import JsonRefs from 'json-refs';
 import {jml} from 'jamilih';
@@ -42,6 +41,7 @@ const setAnchor = ({
   if (!anchor) {
     const anchors = [];
     let anchorField = '';
+    // eslint-disable-next-line sonarjs/misplaced-loop-counter -- Ok
     for (let i = 1, breakout; !breakout && !anchors.length; i++) {
       for (let j = 1; ; j++) {
         const anchorText = work + '-' + 'anchor' + i + '-' + j;
@@ -65,7 +65,9 @@ const setAnchor = ({
       }
     }
     if (anchors.length) {
-      const escapeSelectorAttValue = (str) => (str || '').replaceAll(/["\\]/g, '\\$&');
+      const escapeSelectorAttValue = (str) => (str || '').replaceAll(
+        /["\\]/g, String.raw`\$&`
+      );
       const escapedRow = escapeSelectorAttValue(anchors.join('-'));
       const escapedCol = anchorField
         ? escapeSelectorAttValue(anchorField)
@@ -428,7 +430,9 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
   const $pEscArbitrary = (param) => escapeHTML($p.get(param, true));
 
   // Not currently in use
-  const escapeQuotedCSS = (s) => s.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
+  const escapeQuotedCSS = (s) => s.replaceAll('\\', '\\\\').replaceAll(
+    '"', String.raw`\"`
+  );
 
   const {
     fileData, workI18n, getFieldAliasOrName, schemaObj, metadataObj,

package/resources/templates/index.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 import {jml, $, body} from 'jamilih';
 
 import languageSelect from './languageSelect.js';
@@ -33,6 +32,7 @@ const Templates = {
         installationDialog.showModal();
         const container = $('#dialogContainer');
         container.hidden = false;
+      // eslint-disable-next-line no-unused-vars -- Ok
       } catch (err) {
         // May already be open
       }

package/resources/templates/languageSelect.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 import {jml, $} from 'jamilih';
 import {deserialize as formDeserialize} from 'form-serialization';
 

package/resources/templates/resultsDisplayServerOrClient.js

@@ -135,9 +135,9 @@ div.inner-caption {
     letter-spacing: ${$pEscArbitrary('letterspacing')};
     line-height: ${$pEscArbitrary('lineheight')};
     ${colorEsc ? `color: ${escapeCSS(colorEsc)};` : ''
-}
+    }
     ${bgcolorEsc ? `background-color: ${escapeCSS(bgcolorEsc)};` : ''
-}
+    }
 }
 ${escapeCSS($pEscArbitrary('pagecss') || '')}
 ` +
@@ -248,6 +248,7 @@ body {
     };
 
     const addChildren = (el, children) => {
+      // eslint-disable-next-line unicorn/prefer-structured-clone -- Need JSON
       el = JSON.parse(JSON.stringify(el));
       el.push(children);
       return el;

package/resources/templates/workDisplay.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 import {jml, $, $$, nbsp} from 'jamilih';
 import Templates from './index.js';
 import {colors, fonts} from './utils/html.js';
@@ -898,6 +897,7 @@ export default {
                         const url = replaceHash(paramsCopy) + `&work=${work}&${work}-startEnd1=%s`; // %s will be escaped if set as param; also add changeable workName here
                         try {
                           await navigator.clipboard.writeText(url);
+                        // eslint-disable-next-line no-unused-vars -- Okay to ignore
                         } catch (err) {
                           // User rejected
                         }

package/resources/templates/workSelect.js

@@ -1,8 +1,7 @@
-/* eslint-env browser */
 import {jml, $} from 'jamilih';
 import {deserialize as formDeserialize} from 'form-serialization';
 
-export default ({groups, workI18n, getNextAlias, $p, followParams}) => {
+const workSelect = function ({groups, workI18n, getNextAlias, $p, followParams}) {
   const form = jml(
     'form',
     {id: 'workSelect', class: 'focus', $on: {
@@ -55,3 +54,5 @@ export default ({groups, workI18n, getNextAlias, $p, followParams}) => {
   }
   return form;
 };
+
+export default workSelect;

package/resources/utils/Languages.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 // Todo: remember this locales choice by cookie?
 export const getPreferredLanguages = ({namespace, preferredLocale}) => {
   // Todo: Add to this optionally with one-off tag input box

package/resources/utils/Metadata.js

@@ -1,7 +1,6 @@
-/* eslint-env browser */
 import {getPreferredLanguages} from './Languages.js';
 // Keep this as the last import for Rollup
-import JsonRefs from 'json-refs'; // eslint-disable-line import/order
+import JsonRefs from 'json-refs'; // // eslint-disable-line import/order
 
 const getCurrDir = () => {
   return window.location.href.replace(/(index\.html)?#.*$/, '');
@@ -90,6 +89,7 @@ export const getFieldNameAndValueAliases = function ({
         true
       );
     }
+    // eslint-disable-next-line unicorn/prefer-structured-clone -- Expecting JSON
     ret.rawFieldValueAliasMap = JSON.parse(JSON.stringify(fieldValueAliasMap));
     ret.aliases = [];
     // Todo: We could use `prefer_alias` but algorithm below may cover
@@ -130,6 +130,7 @@ export const getFieldNameAndValueAliases = function ({
         );
       });
     }
+    // eslint-disable-next-line unicorn/prefer-structured-clone -- Expecting JSON
     ret.fieldValueAliasMap = JSON.parse(JSON.stringify(fieldValueAliasMap));
     // ret.aliases.sort();
   }
@@ -160,7 +161,7 @@ export const getBrowseFieldData = function ({
         getFieldAliasOrName
       });
     });
-    callback({setName, browseFields, i, presort}); // eslint-disable-line n/no-callback-literal
+    callback({setName, browseFields, i, presort});
   });
 };
 

package/resources/utils/Params.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 // Todo: Reimplement this with `formSerialize.deserialize` as possible
 import {serialize as formSerialize} from 'form-serialization';
 

package/resources/utils/Plugin.js

@@ -51,7 +51,7 @@ export class PluginsForWork {
         onByDefault: onByDefaultDefault, lang: pluginLang, meta
       }] = this.pluginsInWork[i];
       const plugin = this.getPluginObject(pluginName);
-      cb({ // eslint-disable-line n/no-callback-literal
+      cb({
         plugin,
         placement,
         applicableFields,
@@ -71,11 +71,10 @@ export class PluginsForWork {
     }]) => {
       if (Array.isArray(targetLanguage)) {
         targetLanguage.forEach((targetLanguage) => {
-          cb({applicableField, targetLanguage, onByDefault, metaApplicableField}); // eslint-disable-line n/no-callback-literal
+          cb({applicableField, targetLanguage, onByDefault, metaApplicableField});
         });
       } else {
-        // eslint-disable-next-line n/callback-return
-        cb({applicableField, targetLanguage, onByDefault, metaApplicableField}); // eslint-disable-line n/no-callback-literal
+        cb({applicableField, targetLanguage, onByDefault, metaApplicableField});
       }
     });
     return true;

package/resources/utils/ServiceWorker.js

@@ -103,7 +103,7 @@ export const respondToState = async ({
   // We use this promise for rejecting (inside a listener)
   //    to a common catch and to prevent continuation by
   //    failing to return
-  return new Promise(async () => { // eslint-disable-line no-async-promise-executor
+  return new Promise(async () => { // eslint-disable-line no-async-promise-executor, sonarjs/no-misused-promises -- See above
     navigator.serviceWorker.addEventListener('message', ({data}) => {
       const {message, type, name, errorType} = data;
       console.log('msg1', message, r);
@@ -263,6 +263,7 @@ export const registerServiceWorker = async ({
         type: 'module'
       }
     );
+  // eslint-disable-next-line no-unused-vars -- Ok
   } catch (err) {
     console.log('serviceWorkerPath', serviceWorkerPath);
     await dialogs.alert(`

package/resources/utils/WorkInfo.js

@@ -1,3 +1,4 @@
+/* globals process -- Node polyglot */
 import {getJSON} from 'simple-get-json';
 import {i18n} from 'intl-dom';
 import {getMetaProp, getMetadata, Metadata} from './Metadata.js';
@@ -152,7 +153,7 @@ export const getWorkData = async function ({
     getPlugins
       ? Promise.all(
         pluginPaths.map((pluginPath) => {
-          // eslint-disable-next-line no-unsanitized/method
+          // // eslint-disable-next-line no-unsanitized/method
           return import(
             cwd +
             pluginPath

package/resources/workDisplay.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 import {getJSON} from 'simple-get-json';
 
 import {replaceHash, getParamsSetter, getSerializeParamsAsURL} from './utils/Params.js';

package/resources/workSelect.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 import {getJSON} from 'simple-get-json';
 import {i18n} from 'intl-dom';
 

package/server/main.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-/* eslint-env node */
+/* eslint-env node -- Environment here */
 import http from 'http';
 
 import statik from '@brettz9/node-static';
@@ -100,8 +100,11 @@ setGlobalVars(null, {
 }); // Adds `indexedDB` and `IDBKeyRange` to global in Node
 
 if (userParams.nodeActivate) {
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins -- node-fetch
   global.fetch = fetch;
-  await activateCallback({...userParamsWithDefaults, basePath});
+  setTimeout(async () => {
+    await activateCallback({...userParamsWithDefaults, basePath});
+  });
   console.log('Activated');
 }
 console.log('past activate check');
@@ -131,7 +134,6 @@ const srv = http.createServer(async (req, res) => {
      * @returns {Promise<void>}
      */
     const runHttpServer = async function () {
-      // eslint-disable-next-line no-unsanitized/method -- Site-specified plugin
       const server = (await import(userParams.httpServer)).default();
       return await server(
         req,
@@ -146,13 +148,12 @@ const srv = http.createServer(async (req, res) => {
       );
     };
     if (userParams.expressServer) {
-      // eslint-disable-next-line no-unsanitized/method -- Site-specified plugin
       const app = (await import(userParams.expressServer)).default();
 
       if (userParams.httpServer && (!app._router || !app._router.stack.some(({regexp}) => {
         // Hack to ignore middleware like jsonParser (and hopefully
         //   not get any other)
-        return regexp.source !== '^\\/?(?=\\/|$)' && regexp.test(req.url);
+        return regexp.source !== String.raw`^\/?(?=\\/|$)` && regexp.test(req.url);
       }))) {
         await runHttpServer();
 
@@ -182,7 +183,8 @@ const srv = http.createServer(async (req, res) => {
     */
     return;
   }
-  const languages = (req.headers['accept-language']?.replace(/;q=.*?$/, '') ?? 'en-US').split(',');
+  const languages = (req.headers['accept-language']?.replace(/;q=.*$/, '') ?? 'en-US').split(',');
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins -- Polyglot reasons
   global.navigator = {
     language: languages[0],
     languages

package/.eslintignore

@@ -1,4 +0,0 @@
-node_modules
-resources/vendor
-dist/**
-!dist/sw-helper.js

package/.eslintrc.cjs

@@ -1,108 +0,0 @@
-'use strict';
-
-module.exports = {
-  extends: ['ash-nazg/sauron-node-overrides'],
-  parser: '@babel/eslint-parser',
-  parserOptions: {
-    requireConfigFile: false
-  },
-  settings: {
-    jsdoc: {
-      mode: 'typescript'
-    },
-    polyfills: [
-      'Array.isArray',
-      'Blob',
-      'caches',
-      'console',
-      'Date.now',
-      'document.dir',
-      'document.querySelector',
-      'document.querySelectorAll',
-      'document.title',
-      'DOMParser',
-      'Error',
-      'fetch',
-      'history',
-      'history.replaceState',
-      'IDBKeyRange',
-      'indexedDB',
-      'JSON',
-      'location.hash',
-      'location.href',
-      'location.host',
-      'location.protocol',
-      'navigator',
-      'navigator.clipboard',
-      'navigator.serviceWorker',
-      'Notification.requestPermission',
-      'Number.isNaN',
-      'Number.parseInt',
-      'Object.entries',
-      'Object.keys',
-      'Object.values',
-      'Promise',
-      'Request',
-      'ServiceWorker',
-      'Set',
-      'Symbol.iterator',
-      'URL',
-      'URLSearchParams',
-      'XMLSerializer'
-    ]
-  },
-  overrides: [{
-    files: ['resources/user-sample.js'],
-    rules: {
-      'node/no-missing-import': 0,
-      'import/no-unresolved': 0
-    }
-  }, {
-    files: ['sw-sample.js'],
-    rules: {
-      'import/no-unresolved': 0,
-      'import/unambiguous': 0,
-      strict: 0
-    }
-  }, {
-    files: ['test/index.html'],
-    extends: ['ash-nazg/sauron-node-overrides'],
-    globals: {
-      mocha: false
-    },
-    rules: {
-      'import/unambiguous': 0
-    }
-  }, {
-    files: ['test/textbrowserTests.js'],
-    extends: ['ash-nazg/sauron-node-overrides']
-  }, {
-    files: ['server/**', 'resources/utils/WorkInfo.js'],
-    globals: {
-      require: true
-    }
-  }],
-  rules: {
-    // Disable for now
-    'array-bracket-newline': 0,
-    'no-console': 0,
-    'require-unicode-regexp': 0,
-    '@stylistic/max-len': 0,
-    'no-shadow': 0,
-    'implicit-arrow-linebreak': 0,
-    'function-paren-newline': 0,
-    'class-methods-use-this': 0,
-    'callback-return': 0,
-    'multiline-ternary': 0,
-    'consistent-return': 0,
-    'arrow-parens': 0,
-    'require-await': 0,
-    'prefer-named-capture-group': 0,
-    'jsdoc/require-jsdoc': 0,
-    'promise/avoid-new': 0,
-    'promise/prefer-await-to-callbacks': 0,
-    'import/no-anonymous-default-export': 0,
-    'unicorn/no-array-callback-reference': 0,
-    'eslint-comments/require-description': 0
-  }
-};

package/.ncurc.js

@@ -1,8 +0,0 @@
-'use strict';
-
-module.exports = {
-  reject: [
-    // Wait until making this package ESM and ESM-only
-    'node-fetch'
-  ]
-};