unicode-input-toolconverter 0.2.0 → 0.2.2

package/browser_action/chartBuild.js

@@ -1,13 +1,59 @@
-import {jml} from '../vendor/jamilih/dist/jml-es.js';
+import {jml} from 'jamilih/dist/jml.js';
 import {getUnicodeDefaults} from './preferences/prefDefaults.js';
 import chartBuildTemplate from './templates/chartBuild.js';
 
-let _, textReceptacle, chartContainer, insertText, charrefunicodeConverter;
-
+/**
+ * @typedef {{
+ *   decyes: (k: number) => string,
+ *   hexyes: (k: number) => string,
+ *   unicodeyes: (k: number) => string,
+ * }} DisplayTypes
+ */
+
+/**
+ * @typedef {(info: {
+ *   textReceptacle: HTMLTextAreaElement|HTMLInputElement,
+ *   value: string
+ * }) => void} InsertText
+ */
+
+/**
+ * @typedef {InstanceType<ReturnType<
+ *   typeof import('./unicode/UnicodeConverter.js').getUnicodeConverter
+ * >>} CharrefUnicodeConverter
+ */
+
+/** @type {HTMLElement} */
+let chartContainer;
+
+/** @type {InsertText} */
+let insertText;
+
+/** @type {CharrefUnicodeConverter} */
+let charrefunicodeConverter;
+
+/** @type {import('intl-dom').I18NCallback<string>} */
+let _;
+
+/** @type {HTMLTextAreaElement|HTMLInputElement} */
+let textReceptacle;
+
+/**
+ * @param {{
+ *   _: import('intl-dom').I18NCallback<string>,
+ *   charrefunicodeConverter: CharrefUnicodeConverter,
+ *   textReceptacle: HTMLTextAreaElement|HTMLInputElement,
+ *   chartContainer: HTMLElement,
+ *   descripts?: boolean,
+ *   insertText: InsertText
+ * }} cfg
+ */
 const getChartBuild = async function ({
   _: i18n,
   descripts,
-  insertText: it, textReceptacle: tr, chartContainer: cc,
+  insertText: it,
+  textReceptacle: tr,
+  chartContainer: cc,
   charrefunicodeConverter: uc
 }) {
   textReceptacle = tr;
@@ -18,31 +64,44 @@ const getChartBuild = async function ({
   return await chartBuild({descripts});
 };
 
-// // eslint-disable-next-line import/no-mutable-exports -- Easier
+/** @type {number} */
 export let lastStartCharCode;
 
+/**
+ * @param {{
+ *   descripts?: boolean
+ * }} [cfg]
+ */
 const chartBuild = async function chartBuild ({descripts} = {}) {
   const {getPref, setPref} = getUnicodeDefaults();
   const [
     startCharInMiddleOfChart,
-    cols, onlyentsyes,
+    cols,
+    onlyentsyes,
     entyes, buttonyes, decyes, hexyes, unicodeyes,
     hexLettersUpper,
     font, lang,
     tblrowsset, currentStartCharCodeInitial
   ] = await Promise.all([
-    'startCharInMiddleOfChart',
-    'tblcolsset', 'onlyentsyes',
-    'entyes', 'buttonyes', 'decyes', 'hexyes', 'unicodeyes',
-    'hexLettersUpper',
-    'font', 'lang',
-    'tblrowsset', 'currentStartCharCode'
-  ].map((pref) => {
-    return getPref(pref);
-  }));
-
-  const current = {startCharCode: currentStartCharCodeInitial};
-  let rows = tblrowsset;
+    getPref('startCharInMiddleOfChart'),
+    /** @type {Promise<number>} */ (getPref('tblcolsset')),
+    /** @type {Promise<boolean>} */ (getPref('onlyentsyes')),
+    /** @type {Promise<boolean>} */ (getPref('entyes')),
+    /** @type {Promise<boolean>} */ (getPref('buttonyes')),
+    getPref('decyes'),
+    getPref('hexyes'),
+    getPref('unicodeyes'),
+    getPref('hexLettersUpper'),
+    /** @type {Promise<string>} */ (getPref('font')),
+    /** @type {Promise<string>} */ (getPref('lang')),
+    getPref('tblrowsset'),
+    getPref('currentStartCharCode')
+  ]);
+
+  const current = {
+    startCharCode: /** @type {number} */ (currentStartCharCodeInitial)
+  };
+  let rows = /** @type {number} */ (tblrowsset);
 
   lastStartCharCode = current.startCharCode;
 
@@ -63,9 +122,15 @@ const chartBuild = async function chartBuild ({descripts} = {}) {
   }
   resetCurrentStartCharCodeIfOutOfBounds();
 
-  // Todo: Document (or better name) what's going on here
-  let q, prev, arr, remainder, rowceil, colsOverRemainder;
-  const descriptsOrOnlyEnts = onlyentsyes || descripts;
+  // Todo: Document (or better name) what's going on here with these
+  /** @type {number|undefined} */
+  let q;
+  /** @type {number} */
+  let prev;
+  /** @type {number[]|undefined} */
+  let arr;
+  let remainder, rowceil, colsOverRemainder;
+  const descriptsOrOnlyEnts = onlyentsyes || Boolean(descripts);
   if (descriptsOrOnlyEnts) {
     arr = descripts
       ? charrefunicodeConverter.descripts
@@ -105,9 +170,11 @@ const chartBuild = async function chartBuild ({descripts} = {}) {
   chartContainer.textContent = '';
 
   const types = {hexyes, decyes, unicodeyes, entyes};
-  const appliedFormats = [
+  const appliedFormats = /** @type {const} */ ([
     'decyes', 'hexyes', 'unicodeyes'
-  ].filter((t) => types[t]);
+  ]).filter((t) => types[t]);
+
+  /** @type {DisplayTypes} */
   const displayTypes = {
     decyes (k) {
       return `&#${k};`;
@@ -123,24 +190,27 @@ const chartBuild = async function chartBuild ({descripts} = {}) {
     }
   };
 
+  /** @type {string[]} */
   const captioncntnt = [];
   ['unicode', 'hex', 'dec', 'ent'].forEach((type) => {
-    if (types[type + 'yes']) {
+    if (Object.hasOwn(
+      types, /** @type {keyof typeof types} */ (type + 'yes')
+    )) {
       captioncntnt.push(_(type + '_noun'));
     }
   });
 
   const captionContent = _.list([
     // Make first letter of first word upper case
-    captioncntnt[0].replace(/^./u, (s) => s.toLocaleUpperCase(
-      _.locale
+    captioncntnt[0].replace(/^./v, (s) => s.toLocaleUpperCase(
+      _.resolvedLocale
     )),
     ...captioncntnt.slice(1)
   ]);
 
   chartBuildTemplate({
     _, rows, cols, charrefunicodeConverter, current,
-    resetCurrentStartCharCodeIfOutOfBounds, descriptsOrOnlyEnts,
+    resetCurrentStartCharCodeIfOutOfBounds, // descriptsOrOnlyEnts,
     q, arr, textReceptacle, entyes, chartBuild, descripts,
     chartContainer,
     setPref, insertText, buttonyes, font, lang, prev,

package/browser_action/encodingBehaviors.js

@@ -1,17 +1,20 @@
-import {$} from '../vendor/jamilih/dist/jml-es.js';
+// @ts-nocheck
+import {$} from 'jamilih/dist/jml.js';
 
 import {classChange as charrefClassChange} from './charrefConverters.js';
 
 // UI Bridges
+
 export const convertEncoding = (out) => {
   const from = $('#encoding_from').value,
-    to = $('#encoding_to').value,
-    toconvert = out;
+    to = $('#encoding_to').value;
 
   if (!from || !to) {
     return;
   }
 
+  const toconvert = out;
+
   const Components = 'todo';
   const Cc = Components.classes,
     Ci = Components.interfaces;
@@ -48,10 +51,10 @@ export const convertEncoding = (out) => {
 };
 
 /**
-* @param {PlainObject} cfg
-* @param {import('intl-dom').I18NCallback} cfg._
-* @returns {void}
-*/
+ * @param {object} cfg
+ * @param {import('intl-dom').I18NCallback} cfg._
+ * @returns {void}
+ */
 function setupEncodingEvents ({_}) {
   /**
    * @returns {void}

package/browser_action/entityBehaviors.js

@@ -1,8 +1,27 @@
-import {$} from '../vendor/jamilih/dist/jml-es.js';
+import {$} from 'jamilih/dist/jml.js';
 import {getUnicodeDefaults} from './preferences/prefDefaults.js';
 import unicodecharref from './unicodecharref.js';
 
-let charrefunicodeConverter, getPref, setPref;
+/**
+ * @type {InstanceType<ReturnType<
+ *   typeof import('./unicode/UnicodeConverter.js').getUnicodeConverter
+ * >>}
+ */
+let charrefunicodeConverter;
+
+/** @type {ReturnType<typeof getUnicodeDefaults>['getPref']} */
+let getPref;
+/** @type {ReturnType<typeof getUnicodeDefaults>['setPref']} */
+let setPref;
+
+/**
+ * @param {{
+ *   charrefunicodeConverter: InstanceType<ReturnType<
+ *     typeof import('./unicode/UnicodeConverter.js').getUnicodeConverter
+ *   >>
+ * }} cfg
+ * @returns {void}
+ */
 export const shareVars = ({charrefunicodeConverter: _uc}) => {
   charrefunicodeConverter = _uc;
   ({getPref, setPref} = getUnicodeDefaults());
@@ -14,22 +33,24 @@ export const shareVars = ({charrefunicodeConverter: _uc}) => {
  */
 async function insertEntityFile (e) {
   const entFile = await fetch(
-    '../download/entities/' + e.target.value + '.ent'
+    '../download/entities/' + /** @type {HTMLSelectElement} */ (
+      e.target
+    ).value + '.ent'
   );
   const data = await entFile.text();
 
-  $('#DTDtextbox').value += '\n' + data;
+  /** @type {HTMLTextAreaElement} */ ($('#DTDtextbox')).value += '\n' + data;
   await registerDTD();
 }
 
 /**
- * @returns {Promise<{void}>}
+ * @returns {Promise<void>}
  */
 async function registerDTD () {
   // Cannot use back-reference inside char. class, so need to do twice
-  const pattern = /<!ENTITY\s+([^'"\s]*)\s+(["'])(.*)\2\s*>/gu;
+  const pattern = /<!ENTITY\s+([^'"\s]*)\s+(["'])(.*)\2\s*>/gv;
 
-  const text = $('#DTDtextbox').value;
+  const text = /** @type {HTMLTextAreaElement} */ ($('#DTDtextbox')).value;
   await setPref('DTDtextbox', text);
 
   let result;
@@ -51,16 +72,17 @@ async function registerDTD () {
   // Start off blank in case items erased
   charrefunicodeConverter.newcharrefs = [...unicodecharref.orignewcharrefs];
 
-  const decreg = /^(?:&#|#)?(\d\d+);?$/u;
-  // const decreg2 = /^(&#|#)([0-9]);?$/u;
-  const hexreg = /^(?:&#|#|0|U|u)?(?:[xX+])([\da-fA-F]+);?$/u;
+  const decreg = /^(?:&#|#)?(\d\d+);?$/v;
+  // const decreg2 = /^(&#|#)([0-9]);?$/v;
+  const hexreg = /^(?:&#|#|0|U|u)?(?:[xX+])([\da-fA-F]+);?$/v;
 
   while ((result = pattern.exec(text)) !== null) {
+    /** @type {number|string} */
     let m = result[3];
     let addreg = true;
     if (decreg.test(m)) { // Dec
       m = m.replace(decreg, '$1');
-      m = Number.parseInt(m);
+      m = Number.parseInt(m, 10);
     } else if (hexreg.test(m)) { // Hex
       m = m.replace(hexreg, '$1');
       m = Number.parseInt(m, 16);
@@ -70,12 +92,15 @@ async function registerDTD () {
     } else if (m.length > 1) {
       addreg = false;
     } else {
-      m = m.charCodeAt();
+      m = m.charCodeAt(0);
     }
     if (addreg) {
       // Used to ensure apos or amp is detected in same position
       charrefunicodeConverter.entities.unshift(result[1]);
-      charrefunicodeConverter.numericCharacterReferences.unshift(m);
+      charrefunicodeConverter.numericCharacterReferences.unshift(
+        /** @type {number} */
+        (m)
+      );
     // For translating entities into two-char+ Unicode, or hex or dec
     } else {
       charrefunicodeConverter.newents.push(result[1]);
@@ -85,10 +110,11 @@ async function registerDTD () {
 }
 
 /**
-* @returns {void}
-*/
+ * @returns {void}
+ */
 function setupEntityEvents () {
-  $('#insertEntityFile').addEventListener('change', async function (e) {
+  /** @type {HTMLSelectElement} */
+  ($('#insertEntityFile')).addEventListener('change', async function (e) {
     await insertEntityFile(e);
   });
 }

package/browser_action/index-es.html

@@ -5,7 +5,19 @@
     <title>-</title>
     <!-- Temporary favicon no-op -->
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-
+    <script type="importmap">
+      {
+        "imports": {
+          "jamilih/dist/jml.js": "../vendor/jamilih/dist/jml.mjs",
+          "miller-columns": "../vendor/miller-columns/dist/index-es.min.js",
+          "camelcase": "../../vendor/camelcase/index.js",
+          "intl-dom": "../vendor/intl-dom/dist/index.esm.js",
+          "simple-prefs": "../../vendor/simple-prefs/dist/index.esm.js",
+          "fflate": "../vendor/fflate/esm/browser.js",
+          "json-6": "../vendor/json-6/dist/index.mjs"
+        }
+      }
+    </script>
     <script src="/vendor/jquery/dist/jquery.js"></script>
     <!-- <script src="/polyfills/browser-polyfill.min.js"></script> -->
     <script type="module" src="/browser_action/index.js"></script>

package/browser_action/index-instrumented.html

@@ -5,7 +5,19 @@
     <title>-</title>
     <!-- Temporary favicon no-op -->
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-
+    <script type="importmap">
+      {
+        "imports": {
+          "jamilih/dist/jml.js": "../vendor/jamilih/dist/jml.mjs",
+          "miller-columns": "../vendor/miller-columns/dist/index-es.min.js",
+          "camelcase": "../../vendor/camelcase/index.js",
+          "intl-dom": "../vendor/intl-dom/dist/index.esm.js",
+          "simple-prefs": "../../vendor/simple-prefs/dist/index.esm.js",
+          "fflate": "../vendor/fflate/esm/browser.js",
+          "json-6": "../vendor/json-6/dist/index.mjs"
+        }
+      }
+    </script>
     <script src="/vendor/jquery/dist/jquery.js"></script>
     <!-- <script src="/polyfills/browser-polyfill.min.js"></script> -->
     <!-- <script type="module" src="/browser_action/index.js"></script> -->

package/browser_action/index-pages.html

@@ -5,7 +5,19 @@
     <title>-</title>
     <!-- Temporary favicon no-op -->
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-
+    <script type="importmap">
+      {
+        "imports": {
+          "jamilih/dist/jml.js": "../vendor/jamilih/dist/jml.mjs",
+          "miller-columns": "../vendor/miller-columns/dist/index-es.min.js",
+          "camelcase": "../../vendor/camelcase/index.js",
+          "intl-dom": "../vendor/intl-dom/dist/index.esm.js",
+          "simple-prefs": "../../vendor/simple-prefs/dist/index.esm.js",
+          "fflate": "../vendor/fflate/esm/browser.js",
+          "json-6": "../vendor/json-6/dist/index.mjs"
+        }
+      }
+    </script>
     <script src="../vendor/jquery/dist/jquery.js"></script>
     <!-- <script src="/polyfills/browser-polyfill.min.js"></script> -->
     <!-- <script type="module" src="/browser_action/index.js"></script> -->

package/browser_action/index.html

@@ -5,7 +5,19 @@
     <title>-</title>
     <!-- Temporary favicon no-op -->
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
-
+    <script type="importmap">
+      {
+        "imports": {
+          "jamilih/dist/jml.js": "../vendor/jamilih/dist/jml.mjs",
+          "miller-columns": "../vendor/miller-columns/dist/index-es.min.js",
+          "camelcase": "../../vendor/camelcase/index.js",
+          "intl-dom": "../vendor/intl-dom/dist/index.esm.js",
+          "simple-prefs": "../../vendor/simple-prefs/dist/index.esm.js",
+          "fflate": "../vendor/fflate/esm/browser.js",
+          "json-6": "../vendor/json-6/dist/index.mjs"
+        }
+      }
+    </script>
     <script src="/vendor/jquery/dist/jquery.js"></script>
     <!-- <script src="/polyfills/browser-polyfill.min.js"></script> -->
     <!-- <script type="module" src="/browser_action/index.js"></script> -->