textbrowser 0.47.0 → 0.48.1

package/resources/templates/workDisplay.js

@@ -15,14 +15,15 @@ const getDataForSerializingParamsAsURL = () => ({
 });
 
 export default {
-  bdo: ({fallbackDirection, message}) =>
-  // Displaying as div with inline display instead of span since
-  //    Firefox puts punctuation at left otherwise (bdo dir
-  //    seemed to have issues in Firefox)
-    ['div', {style: 'display: inline; direction: ' + fallbackDirection}, [message]],
+  bdo ({fallbackDirection, message}) {
+    // Displaying as div with inline display instead of span since
+    //    Firefox puts punctuation at left otherwise (bdo dir
+    //    seemed to have issues in Firefox)
+    return ['div', {style: 'display: inline; direction: ' + fallbackDirection}, [message]];
+  },
   columnsTable: ({
     lDirectional, fieldInfo, $p, lElement, lIndexedParam, l,
-    metadataObj, preferredLocale, schemaItems,
+    // metadataObj, preferredLocale, schemaItems,
     fieldMatchesLocale
   }) => ['table', {
     border: '1', cellpadding: '5', align: 'center'
@@ -71,19 +72,21 @@ export default {
           })
         ]),
         lElement('check-sequence', 'td', 'title', {}, [
-          ['select', {name: lIndexedParam('field') + idx, id: fieldIndex, size: '1'},
-            fieldInfo.map(({field, fieldAliasOrName}, j) => {
-              const matchedFieldParam = fieldParam && fieldParam === fieldAliasOrName;
-              return ['option', {
-                dataset: {name: field},
-                value: fieldAliasOrName,
-                selected: (
-                  matchedFieldParam ||
-                                    (j === i && !$p.has(fieldIndex))
-                )
-              }, [fieldAliasOrName]];
-            })
-          ]
+          ['select', {
+            name: lIndexedParam('field') + idx,
+            id: fieldIndex,
+            size: '1'
+          }, fieldInfo.map(({field, fieldAliasOrName}, j) => {
+            const matchedFieldParam = fieldParam && fieldParam === fieldAliasOrName;
+            return ['option', {
+              dataset: {name: field},
+              value: fieldAliasOrName,
+              selected: (
+                matchedFieldParam ||
+                                  (j === i && !$p.has(fieldIndex))
+              )
+            }, [fieldAliasOrName]];
+          })]
         ]),
         ['td', [ // Todo: Make as tag selector with fields as options
           lElement('interlinear-tips', 'input', 'title', {
@@ -128,7 +131,7 @@ export default {
           type: 'button',
           $on: {
             click () {
-              fieldInfo.forEach(({field}, i) => {
+              fieldInfo.forEach((/* {field} */_, i) => {
                 const idx = i + 1;
                 // The following is redundant with 'field' but may need to
                 //     retrieve later out of order?
@@ -278,22 +281,20 @@ export default {
       dir: 'ltr'
     }, [
       lDirectional('font_stretch'), nbsp,
-      ['select', {name: lParam('fontstretch')},
-        [
-          'ultra-condensed', 'extra-condensed', 'condensed', 'semi-condensed',
-          'normal', 'semi-expanded', 'expanded', 'extra-expanded', 'ultra-expanded'
-        ].map((stretch) => {
-          const atts = {
-            value: lDirectional(['param_values', 'font-stretch', stretch]),
-            selected: null
-          };
-          if ($p.get('fontstretch') === stretch ||
-                        (!$p.has('fontstretch') && stretch === 'normal')) {
-            atts.selected = 'selected';
-          }
-          return ['option', atts, [lDirectional(['param_values', 'font-stretch', stretch])]];
-        })
-      ]
+      ['select', {name: lParam('fontstretch')}, [
+        'ultra-condensed', 'extra-condensed', 'condensed', 'semi-condensed',
+        'normal', 'semi-expanded', 'expanded', 'extra-expanded', 'ultra-expanded'
+      ].map((stretch) => {
+        const atts = {
+          value: lDirectional(['param_values', 'font-stretch', stretch]),
+          selected: null
+        };
+        if ($p.get('fontstretch') === stretch ||
+                      (!$p.has('fontstretch') && stretch === 'normal')) {
+          atts.selected = 'selected';
+        }
+        return ['option', atts, [lDirectional(['param_values', 'font-stretch', stretch])]];
+      })]
     ]],
     /**/
     ['br'], ['br'],
@@ -326,8 +327,8 @@ export default {
         ['yes', lDirectional(['param_values', 'y'])],
         ['no', lDirectional(['param_values', 'n'])],
         ['none', lDirectional(['param_values', '0'])]
-      ].map(([key, val], i, arr) =>
-        ['label', [
+      ].map(([key, val], i, arr) => {
+        return ['label', [
           ['input', {
             name: lParam('header'),
             type: 'radio',
@@ -336,8 +337,8 @@ export default {
                             (!$p.has('header') && i === 1)
           }],
           lDirectional(key), (i === arr.length - 1 ? '' : nbsp3)
-        ]]
-      ))
+        ]];
+      }))
     ]],
     ['div', [
       lDirectional('footer_wstyles'), nbsp2,
@@ -345,8 +346,8 @@ export default {
         ['yes', lDirectional(['param_values', 'y'])],
         ['no', lDirectional(['param_values', 'n'])],
         ['none', lDirectional(['param_values', '0'])]
-      ].map(([key, val], i, arr) =>
-        ['label', [
+      ].map(([key, val], i, arr) => {
+        return ['label', [
           ['input', {
             name: lParam('footer'),
             type: 'radio',
@@ -355,8 +356,8 @@ export default {
                             (!$p.has('footer') && i === 2)
           }],
           lDirectional(key), (i === arr.length - 1 ? '' : nbsp3)
-        ]]
-      ))
+        ]];
+      }))
     ]],
     ['label', [
       ['input', {
@@ -374,8 +375,8 @@ export default {
         ['yes', lDirectional(['param_values', 'y'])],
         ['no', lDirectional(['param_values', 'n'])],
         ['none', lDirectional(['param_values', '0'])]
-      ].map(([key, val], i, arr) =>
-        ['label', [
+      ].map(([key, val], i, arr) => {
+        return ['label', [
           ['input', {
             name: lParam('caption'),
             type: 'radio',
@@ -384,8 +385,8 @@ export default {
                             (!$p.has('caption') && i === 2)
           }],
           lDirectional(key), (i === arr.length - 1 ? '' : nbsp3)
-        ]]
-      ))
+        ]];
+      }))
     ]],
     ['br'],
     ['div', [
@@ -512,7 +513,9 @@ export default {
     lParam, lDirectional, l, lElement, $p, serializeParamsAsURL, content
   }) {
     const addRowContent = (rowContent) => {
-      if (!rowContent || !rowContent.length) { return; }
+      if (!rowContent || !rowContent.length) {
+        return;
+      }
       content.push(['tr', rowContent]);
     };
     [
@@ -562,10 +565,11 @@ export default {
     ].forEach(addRowContent);
   },
   getPreferences: ({
-    languageParam, workI18n, paramsSetter, replaceHash,
+    // languageParam, workI18n, groups,
+    paramsSetter, replaceHash,
     getFieldAliasOrNames, work,
     langs, languageI18n, l, localizeParamNames, namespace,
-    hideFormattingSection, groups, preferencesPlugin
+    hideFormattingSection, preferencesPlugin
   }) => ['div', {
     style: {textAlign: 'left'}, id: 'preferences', hidden: 'true'
   }, [
@@ -611,9 +615,9 @@ export default {
           change ({target: {selectedOptions}}) {
             // Todo: EU disclaimer re: storage?
             localStorage.setItem(namespace + '-langCodes', JSON.stringify(
-              [...selectedOptions].map((opt) =>
-                opt.value
-              )
+              [...selectedOptions].map((opt) => {
+                return opt.value;
+              })
             ));
           }
         }
@@ -632,15 +636,20 @@ export default {
         ]];
       })]
     ]],
-    (preferencesPlugin ? preferencesPlugin({
-      $, l, jml, paramsSetter, getDataForSerializingParamsAsURL, work,
-      replaceHash, getFieldAliasOrNames
-    }) : '')
+    (preferencesPlugin
+      ? preferencesPlugin({
+        $, l, jml, paramsSetter, getDataForSerializingParamsAsURL, work,
+        replaceHash, getFieldAliasOrNames
+      })
+      : ''
+    )
   ]],
   addBrowseFields ({browseFields, fieldInfo, lDirectional, i, lIndexedParam, $p, content}) {
     const work = $p.get('work');
     const addRowContent = (rowContent) => {
-      if (!rowContent || !rowContent.length) { return; }
+      if (!rowContent || !rowContent.length) {
+        return;
+      }
       content.push(['tr', rowContent]);
     };
     [
@@ -652,8 +661,8 @@ export default {
         : '',
       [
         ...(() => {
-          const addBrowseFieldSet = (setType) =>
-            browseFields.reduce((rowContent, {
+          const addBrowseFieldSet = (setType) => {
+            return browseFields.reduce((rowContent, {
               fieldName, aliases, fieldSchema: {minimum, maximum}
             }, j) => {
               // Namespace by work for sake of browser auto-complete caching
@@ -664,36 +673,41 @@ export default {
                   ['label', {for: name}, [fieldName]]
                 ]],
                 ['td', [
-                  aliases ? ['datalist', {id: 'dl-' + id},
-                    aliases.map((alias) => ['option', [alias]])
-                  ] : '',
-                  aliases ? ['input', {
-                    name, id, class: 'browseField',
-                    list: 'dl-' + id,
-                    value: $p.get(name, true),
-                    $on: setType === 'start'
-                      ? {change (e) {
-                        $$('input.browseField').forEach((bf) => {
-                          if (bf.id.includes((i + 1) + '-' +
-                                                        (j + 1))
-                          ) {
-                            bf.value = e.target.value;
-                          }
-                        });
-                      }}
-                      : undefined
-                  }] : ['input', {
-                    name, id,
-                    type: 'number',
-                    min: minimum,
-                    max: maximum,
-                    value: $p.get(name, true)
-                  }],
+                  aliases
+                    ? ['datalist', {
+                      id: 'dl-' + id
+                    }, aliases.map((alias) => ['option', [alias]])]
+                    : '',
+                  aliases
+                    ? ['input', {
+                      name, id, class: 'browseField',
+                      list: 'dl-' + id,
+                      value: $p.get(name, true),
+                      $on: setType === 'start'
+                        ? {change (e) {
+                          $$('input.browseField').forEach((bf) => {
+                            if (bf.id.includes((i + 1) + '-' +
+                                                          (j + 1))
+                            ) {
+                              bf.value = e.target.value;
+                            }
+                          });
+                        }}
+                        : undefined
+                    }]
+                    : ['input', {
+                      name, id,
+                      type: 'number',
+                      min: minimum,
+                      max: maximum,
+                      value: $p.get(name, true)
+                    }],
                   nbsp3
                 ]]
               );
               return rowContent;
             }, {'#': []});
+          };
           return [
             addBrowseFieldSet('start'),
             ['td', [
@@ -708,7 +722,7 @@ export default {
         ]]
       ],
       [
-        ['td', {colspan: 4 * browseFields.length + 2 + 1, align: 'center'}, [
+        ['td', {colspan: (4 * browseFields.length) + 2 + 1, align: 'center'}, [
           ['table', [
             ['tr', [
               browseFields.reduce((
@@ -724,9 +738,11 @@ export default {
                     ['label', {for: name}, [fieldName]]
                   ]],
                   ['td', [
-                    aliases ? ['datalist', {id: 'dl-' + id},
-                      aliases.map((alias) => ['option', [alias]])
-                    ] : '',
+                    aliases
+                      ? ['datalist', {
+                        id: 'dl-' + id
+                      }, aliases.map((alias) => ['option', [alias]])]
+                      : '',
                     aliases
                       ? ['input', {
                         name, id, class: 'browseField',
@@ -752,15 +768,16 @@ export default {
               ['td', [
                 ['label', [
                   lDirectional('field') + nbsp2,
-                  ['select', {name: lIndexedParam('anchorfield') + (i + 1), size: '1'},
-                    fieldInfo.map(({fieldAliasOrName}) => {
-                      const val = $p.get(lIndexedParam('anchorfield') + (i + 1), true);
-                      if (val === fieldAliasOrName) {
-                        return ['option', {selected: true}, [fieldAliasOrName]];
-                      }
-                      return ['option', [fieldAliasOrName]];
-                    })
-                  ]
+                  ['select', {
+                    name: lIndexedParam('anchorfield') + (i + 1),
+                    size: '1'
+                  }, fieldInfo.map(({fieldAliasOrName}) => {
+                    const val = $p.get(lIndexedParam('anchorfield') + (i + 1), true);
+                    if (val === fieldAliasOrName) {
+                      return ['option', {selected: true}, [fieldAliasOrName]];
+                    }
+                    return ['option', [fieldAliasOrName]];
+                  })]
                 ]]
               ]]
             ]]
@@ -771,7 +788,8 @@ export default {
   },
   main ({
     workI18n, languageParam,
-    l, namespace, heading, fallbackDirection, languageI18n, langs, fieldInfo, localizeParamNames,
+    l, namespace, heading, // fallbackDirection,
+    languageI18n, langs, fieldInfo, localizeParamNames,
     serializeParamsAsURL, paramsSetter, replaceHash,
     getFieldAliasOrNames,
     hideFormattingSection, $p,
@@ -784,9 +802,10 @@ export default {
         {...getDataForSerializingParamsAsURL(), type}
       );
     };
-    const lOption = (key, atts) =>
-      ['option', atts, [
-        l(key
+    const lOption = (key, atts) => {
+      return ['option', atts, [
+        l(
+          key
           // Ensure `intl-dom` supports
           // , fallback ({message}) {
           //   atts.dir = fallbackDirection;
@@ -794,6 +813,7 @@ export default {
           // }
         )
       ]];
+    };
     // Returns element with localized or fallback attribute value (as Jamilih);
     //   also adds direction
     jml(

package/resources/templates/workSelect.js

@@ -38,11 +38,11 @@ export default ({groups, workI18n, getNextAlias, $p, followParams}) => {
           }
         }, [
           ['option', {value: ''}, ['--']],
-          ...group.files.map(({name: fileName}) =>
-            ['option', {
+          ...group.files.map(({name: fileName}) => {
+            return ['option', {
               value: workI18n(['workNames', group.id, fileName])
-            }, [getNextAlias()]]
-          )
+            }, [getNextAlias()]];
+          })
         ]]
         // Todo: Add in Go button (with 'submitgo' localization string) to
         //    avoid need for pull-down if using first selection?

package/resources/utils/IntlURLSearchParams.js

@@ -1,3 +1,6 @@
+/**
+ * @file Note that this should be kept as a polyglot client-server file.
+ */
 /**
  *
  * @param {string} param
@@ -11,7 +14,7 @@ function _prepareParam (param, skip) {
   }
 
   // start, end, toggle
-  const endNums = /\d+(-\d+)?$/; // eslint-disable-line unicorn/no-unsafe-regex
+  const endNums = /\d+(-\d+)?$/;
   const indexed = param.match(endNums);
   if (indexed) {
     // Todo: We could i18nize numbers as well

package/resources/utils/Languages.js

@@ -20,6 +20,9 @@ export const getPreferredLanguages = ({namespace, preferredLocale}) => {
   return langArr;
 };
 
+/**
+ * @classdesc Note that this should be kept as a polyglot client-server class.
+ */
 export class Languages {
   constructor ({langData}) {
     this.langData = langData;
@@ -33,7 +36,9 @@ export class Languages {
     // || new Intl.DisplayNames([locale], {type: 'language'}).of(code);
   }
   getFieldNameFromPluginNameAndLocales ({
-    pluginName, locales, workI18n, targetLanguage, applicableFieldI18N, meta, metaApplicableField
+    pluginName,
+    // locales,
+    workI18n, targetLanguage, applicableFieldI18N, meta, metaApplicableField
   }) {
     return workI18n(['plugins', pluginName, 'fieldname'], {
       ...meta,

package/resources/utils/Metadata.js

@@ -3,8 +3,9 @@ import {getPreferredLanguages} from './Languages.js';
 // Keep this as the last import for Rollup
 import JsonRefs from 'json-refs'; // eslint-disable-line import/order
 
-const getCurrDir = () =>
-  window.location.href.replace(/(index\.html)?#.*$/, '');
+const getCurrDir = () => {
+  return window.location.href.replace(/(index\.html)?#.*$/, '');
+};
 
 export const getMetaProp = function getMetaProp (lang, metadataObj, properties, allowObjects) {
   let prop;
@@ -38,8 +39,8 @@ export const getMetadata = async (file, property, basePath) => {
   url.pathname = file;
   url.hash = property ? '#/' + property : '';
 
-  return (await JsonRefs
-    .resolveRefsAt(
+  return (await JsonRefs.
+    resolveRefsAt(
       url.toString(),
       {
         loaderOptions: {
@@ -59,9 +60,9 @@ export const getMetadata = async (file, property, basePath) => {
 export const getFieldNameAndValueAliases = function ({
   field, schemaItems, metadataObj, getFieldAliasOrName, lang
 }) {
-  const fieldSchemaIndex = schemaItems.findIndex((item) =>
-    item.title === field
-  );
+  const fieldSchemaIndex = schemaItems.findIndex((item) => {
+    return item.title === field;
+  });
   const fieldSchema = schemaItems[fieldSchemaIndex];
 
   const fieldInfo = metadataObj.fields[field];
@@ -118,13 +119,13 @@ export const getFieldNameAndValueAliases = function ({
         // We'll assume the longest version is best for auto-complete
         ret.aliases.push(
           ...(
-            aliases.filter((v) =>
-              aliases.every((x) =>
-                x === v || !(
+            aliases.filter((v) => {
+              return aliases.every((x) => {
+                return x === v || !(
                   x.toLowerCase().startsWith(v.toLowerCase())
-                )
-              )
-            ).map((v) => v + ' (' + key + ')') // Todo: i18nize
+                );
+              });
+            }).map((v) => v + ' (' + key + ')') // Todo: i18nize
           )
         );
       });
@@ -152,13 +153,13 @@ export const getBrowseFieldData = function ({
     // Todo: Deal with ['td', [['h3', [lDirectional(browseFieldObject.name)]]]]
     //          as kind of fieldset
 
-    const browseFields = fieldSets.map((field) =>
-      getFieldNameAndValueAliases({
+    const browseFields = fieldSets.map((field) => {
+      return getFieldNameAndValueAliases({
         lang,
         field, schemaItems, metadataObj,
         getFieldAliasOrName
-      })
-    );
+      });
+    });
     callback({setName, browseFields, i, presort}); // eslint-disable-line n/no-callback-literal
   });
 };
@@ -199,7 +200,7 @@ export class Metadata {
       // If this is a localized field (e.g., enum), we don't want
       //  to avoid as may be translated (should check though)
       const hasFieldValue = localeStrings &&
-                Object.keys(localeStrings).some(lng => {
+                Object.keys(localeStrings).some((lng) => {
                   const fv = localeStrings[lng] &&
                         localeStrings[lng].fieldvalue;
                   return fv && fv[field];
@@ -207,9 +208,9 @@ export class Metadata {
 
       return hasFieldValue ||
                 (metaLang && preferredLanguages.includes(metaLang)) ||
-                schemaItems.some(item =>
-                  item.title === field && item.type !== 'string'
-                );
+                schemaItems.some((item) => {
+                  return item.title === field && item.type !== 'string';
+                });
     };
   }
 }

package/resources/utils/Plugin.js

@@ -1,20 +1,20 @@
 export const escapePluginComponent = (pluginName) => {
-  return pluginName.replace(/\^/g, '^^') // Escape our escape
-    .replace(/-/g, '^0');
+  return pluginName.replaceAll('^', '^^'). // Escape our escape
+    replaceAll('-', '^0');
 };
 
 export const unescapePluginComponent = (pluginName) => {
   if (!pluginName) {
     return pluginName;
   }
-  return pluginName.replace(
+  return pluginName.replaceAll(
     /(\^+)0/g,
     (n0, esc) => {
       return esc.length % 2
         ? esc.slice(1) + '-'
         : n0;
     }
-  ).replace(/\^\^/g, '^');
+  ).replaceAll('^^', '^');
 };
 
 export const escapePlugin = ({pluginName, applicableField, targetLanguage}) => {

package/resources/utils/ServiceWorker.js

@@ -1,13 +1,23 @@
-/* globals console, location, URL */
 // import {escapeHTML} from './sanitize.js';
 import {dialogs} from './dialogs.js';
 
+/**
+ * Note that this function be kept as a polyglot client-server file.
+ * @param {PlainObject} target
+ * @param {PlainObject} source
+ * @returns {{
+ *   userJSON: string,
+ *   languages: string,
+ *   serviceWorkerPath: string,
+ *   files: string,
+ *   namespace: string
+ * }}
+ */
 export const setServiceWorkerDefaults = (target, source) => {
   target.userJSON = source.userJSON || 'resources/user.json';
   target.languages = source.languages || new URL(
-    '../appdata/languages.json',
-    // Todo: Substitute with `import.meta.url`
-    new URL('node_modules/textbrowser/resources/index.js', location)
+    '../../appdata/languages.json',
+    import.meta.url
   ).href;
   target.serviceWorkerPath = source.serviceWorkerPath ||
         `sw.js?pathToUserJSON=${
@@ -25,7 +35,8 @@ export const setServiceWorkerDefaults = (target, source) => {
 //    some tabs open)
 
 export const listenForWorkerUpdate = ({
-  r, logger
+  r
+  // logger
 }) => {
   r.addEventListener('updatefound', (e) => {
     // New service worker has appeared
@@ -53,8 +64,7 @@ this dialog now and continue working with the old version.
 However, when you are finished, you should close this tab
 and any other old tabs for this site in order to be able to
 begin using the new version.
-`
-        );
+`);
         break;
       case 'redundant': // discarded. Either failed install, or it's been
         //                replaced by a newer version
@@ -71,8 +81,7 @@ this dialog now and continue working with the old version.
 However, when you are finished, you may wish to close this tab
 and any other old tabs for this site in order to try again
 for offline installation.
-`
-        );
+`);
         break;
         // These shouldn't occur as we are not skipping waiting (?)
       case 'activating':
@@ -94,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 (resolve, reject) => { // eslint-disable-line no-async-promise-executor
+  return new Promise(async () => { // eslint-disable-line no-async-promise-executor
     navigator.serviceWorker.addEventListener('message', ({data}) => {
       const {message, type, name, errorType} = data;
       console.log('msg1', message, r);
@@ -175,8 +184,7 @@ export const respondToState = async ({
       await dialogs.alert(`
 There was likely an error installing. Click "ok" to try again.
 (Error code: Service worker is redundant)
-`
-      );
+`);
       location.reload();
       // listenForWorkerUpdate({r, logger});
     } else if (r.installing) {
@@ -192,8 +200,7 @@ you have in them, please close this and any other existing tabs
 running this web application and then open the site again.
 Please note it may take some time to install and may not show
 any indication it is installing.
-`, {ok: false}
-      );
+`, {ok: false});
       // We might just let the user go on without a reload, but
       //   as fetch operations would apparently wait to execute,
       //   it wouldn't be much use, so just reload (to get same