unicode-input-toolconverter 0.2.0 → 0.2.3

package/browser_action/index.js

@@ -1,6 +1,6 @@
-import {i18n, setJSONExtra} from '../vendor/intl-dom/dist/index.esm.js';
+import {i18n, setJSONExtra} from 'intl-dom';
 // Currently not bundling json-6
-import jsonExtra from '../vendor/json-6/dist/index.mjs';
+import jsonExtra from 'json-6';
 
 import {makeTabBox} from './templatesElementCustomization/widgets.js';
 import {code, link} from './templateUtils/elements.js';
@@ -31,7 +31,7 @@ setJSONExtra(jsonExtra);
 // SETUP
 
 // Todo: Support hash searchParams / streamline with `pushState`
-const {searchParams} = new URL(location);
+const {searchParams} = new URL(location.href);
 
 const lang = searchParams.get('lang');
 
@@ -44,10 +44,10 @@ const locales = [...new Set([
 
 // eslint-disable-next-line unicorn/prefer-top-level-await -- No iife export
 (async () => {
-const _ = await i18n({
+const _ = /** @type {import('intl-dom').I18NCallback<string>} */ (await i18n({
   locales, defaults: false, localesBasePath: '../',
   substitutions: {code, link}
-});
+}));
 
 if (searchParams.get('serviceWorker')) {
   // Doesn't work in FF as SW using ESM so putting behind switch for now

package/browser_action/preferences/prefDefaults.js

@@ -1,9 +1,14 @@
 // hexstyleLwr:  return true; // Could use but better not to
 //   change for XML-compatibility
 
-import {SimplePrefs} from '../../vendor/simple-prefs/dist/index.esm.js';
+import {SimplePrefs} from 'simple-prefs';
 
+/** @type {import('intl-dom').I18NCallback<string>} */
 let _;
+
+/**
+ * @param {{_: import('intl-dom').I18NCallback<string>}} cfg
+ */
 export const setPrefDefaultVars = ({_: __}) => {
   _ = __;
 };
@@ -45,8 +50,12 @@ export const getPrefDefaults = () => ({
   font: '',
   cssWhitespace: ' ',
   initialTab: 'charts',
-  defaultStartCharCode: _('startCharCode').codePointAt() - 1, // 'a'
-  currentStartCharCode: _('startCharCode').codePointAt() - 1, // 'a'
+  defaultStartCharCode: /** @type {number} */ (
+    _('startCharCode').codePointAt(0)
+  ) - 1, // 'a'
+  currentStartCharCode: /** @type {number} */ (
+    _('startCharCode').codePointAt(0)
+  ) - 1, // 'a'
   lang: _('langCode'), // 'en-US'
   dropdownArr: []
 });

package/browser_action/service-worker/sw-activateCallback.js

@@ -31,14 +31,13 @@ function deleteDatabase (db) {
 }
 
 /**
- * @param {PlainObject} cfg
+ * @param {object} cfg
  * @param {string} cfg.namespace
  * @returns {Promise<void>}
  */
 async function activateCallback ({namespace /* , log */}) {
   await deleteDatabase(namespace); // Chrome sometimes doesn't complete
   const charrefunicodeDb = new UnicodeDatabase({
-    name: namespace,
     // We don't peg to package major version as database version may vary
     //  independently
     version: 1

package/browser_action/service-worker/sw-resources.json

@@ -2,14 +2,13 @@
   "/browser_action/characterSelection.js",
   "/browser_action/charrefConverters.js",
   "/browser_action/chartBuild.js",
-  "/browser_action/encodingBehaviors.js",
-  "/browser_action/encodings.js",
   "/browser_action/entities.js",
   "/browser_action/entityBehaviors.js",
   "/browser_action/index.html",
   "/browser_action/index.iife.min.js",
   "/browser_action/index.js",
   "/browser_action/preferences/prefDefaults.js",
+  "/browser_action/service-worker/sw-activateCallback.js",
   "/browser_action/styles/unicode-dialog.css",
   "/browser_action/templateUtils/elements.js",
   "/browser_action/templateUtils/fill.js",
@@ -21,14 +20,16 @@
   "/browser_action/unicode/charrefunicodeDb.js",
   "/browser_action/unicode/getScriptInfoForCodePoint.js",
   "/browser_action/unicode/hangul.js",
-  "/browser_action/unicode/parseUnihanFromTextFileStrings.js",
   "/browser_action/unicode/unicodeScripts.js",
   "/browser_action/unicode/unihan.js",
   "/browser_action/unicode/unihanDbPopulate.js",
+  "/browser_action/unicode/unihanFields.js",
   "/browser_action/unicodecharref.js",
   "/browser_action/utils/DOMUtils.js",
+  "/browser_action/utils/FetchUtils.js",
   "/browser_action/utils/TextUtils.js",
   "/browser_action/utils/TypedArrayUtils.js",
+  "/browser_action/utils/semicolonSeparatedToArray.js",
   "/browser_action/utils/setupServiceWorker.js",
   "/download/entities/html5-uppercase.ent",
   "/download/entities/htmlmathml-f.ent",
@@ -62,9 +63,10 @@
   "/download/entities/xhtml1-special.ent",
   "/download/entities/xhtml1-symbol.ent",
   "/icons/openWindow24.png",
+  "/vendor/camelcase/index.js",
   "/vendor/fflate/esm/browser.js",
   "/vendor/intl-dom/dist/index.esm.js",
-  "/vendor/jamilih/dist/jml-es.js",
+  "/vendor/jamilih/dist/jml.mjs",
   "/vendor/jquery/dist/jquery.js",
   "/vendor/json-6/dist/index.mjs",
   "/vendor/miller-columns/dist/index-es.min.js",

package/browser_action/templateUtils/elements.js

@@ -1,8 +1,19 @@
-import {jml} from '../../vendor/jamilih/dist/jml-es.js';
+import {jml} from 'jamilih/dist/jml.js';
 
+/**
+ * @param {{
+ *   arg: string
+ * }} cfg
+ */
 export const code = function ({arg}) {
   return jml('code', [arg]);
 };
+
+/**
+ * @param {{
+ *   arg: string
+ * }} cfg
+ */
 export const link = function ({arg}) {
   // Todo: Could parse arg for link different from text
   return jml('a', {

package/browser_action/templateUtils/fill.js

@@ -1,3 +1,9 @@
+/* eslint-disable jsdoc/reject-any-type -- Arbitrary */
+/**
+ * @param {number} items
+ * @param {null|(() => any)} [filler]
+ */
 export const fill = (items, filler = null) => {
+  // eslint-disable-next-line unicorn/no-array-from-fill -- Ok to try?
   return Array.from({length: items}).fill(filler);
 };

package/browser_action/templateUtils/validation.js

@@ -1,5 +1,8 @@
+/**
+ * @param {string} link
+ */
 export const safeLink = function (link) {
-  return (/https?:/u).test(link)
+  return (/https?:/v).test(link)
     ? link
     /* istanbul ignore next -- All links should be safe */
     : '';

package/browser_action/templates/chartBuild.js

@@ -1,17 +1,50 @@
-import {jml, nbsp, $} from '../../vendor/jamilih/dist/jml-es.js';
+import {jml, nbsp, $} from 'jamilih/dist/jml.js';
 import {fill} from '../templateUtils/fill.js';
 import unicodecharref from '../unicodecharref.js';
 
 let idgen = 0;
+
+/**
+ * @param {{
+ *   descripts?: boolean,
+ *   _: import('intl-dom').I18NCallback,
+ *   buttonyes: boolean,
+ *   entyes: boolean,
+ *   colsOverRemainder?: number|false,
+ *   captionContent: string,
+ *   font: string,
+ *   lang: string,
+ *   rows: number,
+ *   cols: number,
+ *   rowceil?: number,
+ *   appliedFormats: ("decyes" | "hexyes" | "unicodeyes")[],
+ *   resetCurrentStartCharCodeIfOutOfBounds: () => void,
+ *   current: {startCharCode: number},
+ *   prev: number,
+ *   q?: number,
+ *   arr?: number[],
+ *   displayTypes: import('../chartBuild.js').DisplayTypes,
+ *   textReceptacle: HTMLTextAreaElement|HTMLInputElement,
+ *   chartContainer: HTMLElement,
+ *   setPref: ReturnType<
+ *     typeof import('../preferences/prefDefaults.js').getUnicodeDefaults
+ *   >['setPref'],
+ *   insertText: import('../chartBuild.js').InsertText,
+ *   chartBuild: typeof import('../chartBuild.js').chartBuild,
+ *   charrefunicodeConverter: import('../chartBuild.js').CharrefUnicodeConverter
+ * }} cfg
+ */
 const chartBuildTemplate = function ({
   _, rows, cols, charrefunicodeConverter, current,
   resetCurrentStartCharCodeIfOutOfBounds, // descriptsOrOnlyEnts,
-  q, textReceptacle, entyes, chartBuild, descripts,
+  q: qq, textReceptacle, entyes, chartBuild, descripts,
   chartContainer, arr,
   setPref, insertText, buttonyes, font, lang, prev,
   rowceil, colsOverRemainder, appliedFormats, displayTypes,
   captionContent
 }) {
+  let q = /** @type {number} */ (qq);
+
   jml('table', {
     id: 'chart_table',
     class: 'unicodetablecell',
@@ -28,116 +61,142 @@ const chartBuildTemplate = function ({
       captionContent
     ]],
     ...fill(rows).map((_row, j) => {
-      return ['tr', fill(cols).map((_col, i) => {
-        // If more rows/cols. specified than match
-        if (j === rowceil && i >= colsOverRemainder) {
-          return '';
-        }
+      return /** @type {import('jamilih/dist/jml.js').JamilihArray} */ (
+        ['tr', fill(cols).map((_col, i) => {
+          // If more rows/cols. specified than match
+          if (j === rowceil && i >= Number(colsOverRemainder)) {
+            return '';
+          }
 
-        // Todo: Document what's going on here
-        if (arr) {
-          q++;
-          if (q >= arr.length) {
-            q = 0;
+          // Todo: Document what's going on here
+          if (arr) {
+            q++;
+            if (q >= arr.length) {
+              q = 0;
+            }
+            current.startCharCode = arr[q];
+          } else {
+            current.startCharCode++;
           }
-          current.startCharCode = arr[q];
-        } else {
-          current.startCharCode++;
-        }
-        resetCurrentStartCharCodeIfOutOfBounds();
+          resetCurrentStartCharCodeIfOutOfBounds();
 
-        const charRefIdx = charrefunicodeConverter.
-          numericCharacterReferences.indexOf(
-            // We've now had to add 1 here for some reason
-            current.startCharCode
-          );
-        const hasEntity = charRefIdx > -1;
-        const entity = hasEntity
-          // If recognized multiple char ent. (won't convert these to decimal)
-          ? '&' + charrefunicodeConverter.entities[charRefIdx] + ';'
-          : '';
+          const charRefIdx = charrefunicodeConverter.
+            numericCharacterReferences.indexOf(
+              // We've now had to add 1 here for some reason
+              current.startCharCode
+            );
+          const hasEntity = charRefIdx !== -1;
+          const entity = hasEntity
+            // If recognized multiple char ent. (won't convert these to decimal)
+            ? '&' + charrefunicodeConverter.entities[charRefIdx] + ';'
+            : '';
 
-        return ['td', {
-          class: (hasEntity ? 'entity ' : '') + 'unicodetablecell',
-          $on: {
-            mouseover: (function (_entity, startCharCode) {
-              return function (/* e */) {
-                if (!$('#chart_table').$noGetDescripts) {
-                  unicodecharref.getUnicodeDescription(
-                    _entity,
-                    // Needed to convert this for some reason
-                    startCharCode.toString(16).toUpperCase().padStart(4, '0')
-                  );
+          return ['td', {
+            class: (hasEntity ? 'entity ' : '') + 'unicodetablecell',
+            $on: {
+              mouseover: (function (_entity, startCharCode) {
+                return function (/* e */) {
+                  if (
+                    !(
+                      /** @type {HTMLElement & {$noGetDescripts: boolean}} */ (
+                        $('#chart_table')
+                      )
+                    ).$noGetDescripts
+                  ) {
+                    unicodecharref.getUnicodeDescription(
+                      _entity,
+                      // Needed to convert this for some reason
+                      startCharCode.toString(16).toUpperCase().padStart(4, '0')
+                    );
+                  }
+                };
+              }(entity, current.startCharCode)),
+              // trying dblclick worked but might not be obvious to
+              //   user and single clicks still activated; relying on
+              //   right button doesn't work
+              /**
+               * @param {Event} e
+               */
+              click (e) {
+                if ('altKey' in e && e.altKey) {
+                  /** @type {HTMLElement & {$noGetDescripts: boolean}} */
+                  ($('#chart_table')).$noGetDescripts =
+                    !(
+                      /** @type {HTMLElement & {$noGetDescripts: boolean}} */ (
+                        $('#chart_table')
+                      )
+                    ).$noGetDescripts;
                 }
-              };
-            }(entity, current.startCharCode)),
-            // trying dblclick worked but might not be obvious to
-            //   user and single clicks still activated; relying on
-            //   right button doesn't work
-            click (e) {
-              if (e.altKey) {
-                $('#chart_table').$noGetDescripts =
-                  !$('#chart_table').$noGetDescripts;
               }
             }
-          }
-        }, [
-          ...appliedFormats.flatMap((type, idx, array) => {
-            const name = type.replace('yes', '');
-            const isMiddle = idx === 1 && array.length === 2;
-            const isFinal = idx === 2;
-            const button = [(buttonyes ? 'button' : 'div'), {
-              class: buttonyes ? 'buttonyes' : null,
-              name,
-              id: '_' + idgen++,
-              dataset: {
-                value: displayTypes[type](current.startCharCode)
-              },
-              $on: {
-                click ({altKey, target: {dataset: {value}}}) {
-                  if (!altKey) {
-                    insertText({textReceptacle, value});
+          }, [
+            ...appliedFormats.flatMap((type, idx, array) => {
+              const name = type.replace('yes', '');
+              const isMiddle = idx === 1 && array.length === 2;
+              const isFinal = idx === 2;
+              // eslint-disable-next-line @stylistic/max-len -- Long
+              const button = /** @type {import('jamilih/dist/jml.js').JamilihArray} */ (
+                [(buttonyes ? 'button' : 'div'), {
+                  class: buttonyes ? 'buttonyes' : null,
+                  name,
+                  id: '_' + idgen++,
+                  dataset: {
+                    value: displayTypes[type](current.startCharCode)
+                  },
+                  $on: {
+                    click (e) {
+                      const {target: {dataset: {value}}} = e;
+                      if (!('altKey' in e) || !e.altKey) {
+                        insertText({
+                          textReceptacle,
+                          value: /** @type {string} */ (value)
+                        });
+                      }
+                    }
                   }
-                }
-              }
-            }, [
-              // Todo: Add substitute character if detect is an invisible?
-              displayTypes[type](current.startCharCode)
-            ]];
-            const container = isFinal
-              ? jml('div', {
-                class: 'centered'
-              }, [button])
-              : button;
-            return [
-              isMiddle
-                ? nbsp.repeat(3)
-                : isFinal
-                  ? ['br']
-                  : '',
-              container
-            ];
-          }),
-          ...(entyes && hasEntity
-            ? [
-              ['a', {
-                href: '#',
-                $on: {
-                  click (e) {
-                    e.preventDefault();
-                    if (!e.altKey) {
-                      insertText({textReceptacle, value: entity});
+                }, [
+                  // Todo: Add substitute character if detect is an invisible?
+                  displayTypes[type](current.startCharCode)
+                ]]
+              );
+              const container = isFinal
+                ? jml('div', {
+                  class: 'centered'
+                }, [button])
+                : button;
+              return [
+                isMiddle
+                  ? nbsp.repeat(3)
+                  : isFinal
+                    ? ['br']
+                    : '',
+                container
+              ];
+            }),
+            ...(entyes && hasEntity
+              ? [
+                ['a', {
+                  href: '#',
+                  $on: {
+                    /**
+                     * @param {MouseEvent} e
+                     */
+                    click (e) {
+                      e.preventDefault();
+                      if (!e.altKey) {
+                        insertText({textReceptacle, value: entity});
+                      }
                     }
                   }
-                }
-              }, [
-                entity
-              ]],
-              ' '
-            ]
-            : [''])
-        ]];
-      })];
+                }, [
+                  entity
+                ]],
+                ' '
+              ]
+              : [''])
+          ]];
+        })]
+      );
     }),
     ['tr', [
       ['td', {
@@ -147,6 +206,9 @@ const chartBuildTemplate = function ({
         ['a', {
           href: '#',
           $on: {
+            /**
+             * @param {Event} e
+             */
             async click (e) {
               e.preventDefault();
               await Promise.all([
@@ -164,6 +226,9 @@ const chartBuildTemplate = function ({
         ['a', {
           href: '#',
           $on: {
+            /**
+             * @param {Event} e
+             */
             async click (e) {
               e.preventDefault();
               await Promise.all([