textbrowser 0.47.0 → 0.48.1

package/resources/resultsDisplay.js

@@ -1,5 +1,5 @@
 /* eslint-env browser */
-import rtlDetect from 'rtl-detect';
+import Locale from 'intl-locale-textinfo-polyfill';
 import JsonRefs from 'json-refs';
 import {jml} from 'jamilih';
 
@@ -10,9 +10,12 @@ import {
 } from './utils/Metadata.js';
 import {Languages} from './utils/Languages.js';
 import {getWorkData} from './utils/WorkInfo.js';
-// Keep this as the last import for Rollup
 
-const {getLangDir} = rtlDetect;
+const getLangDir = (locale) => {
+  const {direction} = new Locale(locale).textInfo;
+  return direction;
+};
+
 const fieldValueAliasRegex = /^.* \((.*?)\)$/;
 
 const getRawFieldValue = (v) => {
@@ -62,7 +65,7 @@ const setAnchor = ({
       }
     }
     if (anchors.length) {
-      const escapeSelectorAttValue = (str) => (str || '').replace(/["\\]/g, '\\$&');
+      const escapeSelectorAttValue = (str) => (str || '').replaceAll(/["\\]/g, '\\$&');
       const escapedRow = escapeSelectorAttValue(anchors.join('-'));
       const escapedCol = anchorField
         ? escapeSelectorAttValue(anchorField)
@@ -117,6 +120,11 @@ export const resultsDisplayClient = async function resultsDisplayClient (args) {
   });
 };
 
+/**
+ * This is server-only code, but kept here as the function is similar.
+ * @param {{serverOutput: "jamilih"|"html"|"json"}} args
+ * @returns {Promise<Array|string>}
+ */
 export const resultsDisplayServer = async function resultsDisplayServer (args) {
   const {
     templateArgs
@@ -168,7 +176,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     fieldValueAliasMap, fieldValueAliasMapPreferred, localizedFieldNames,
     canonicalBrowseFieldNames
   }) => ({
-    tr, foundState
+    tr // , foundState
   }) => {
     return canonicalBrowseFieldNames.map((fieldName) => {
       const idx = localizedFieldNames.indexOf(fieldName);
@@ -259,13 +267,13 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     } while (field);
     checkedFields = checkedFields.filter((cf) => localizedFieldNames.includes(cf));
     const checkedFieldIndexes = checkedFields.map((cf) => localizedFieldNames.indexOf(cf));
-    const allInterlinearColIndexes = checkedFieldIndexes.map((cfi, i) => {
+    const allInterlinearColIndexes = checkedFieldIndexes.map((cfi) => {
       const interlin = $p.get('interlin' + (cfi + 1), true);
-      return interlin && interlin.split(/\s*,\s*/).map((col) =>
+      return interlin && interlin.split(/\s*,\s*/).map((col) => {
       // Todo: Avoid this when known to be integer or if string, though allow
       //    string to be treated as number if config is set.
-        Number.parseInt(col) - 1
-      ).filter((n) => !Number.isNaN(n));
+        return Number.parseInt(col) - 1;
+      }).filter((n) => !Number.isNaN(n));
     });
     return [checkedFields, checkedFieldIndexes, allInterlinearColIndexes];
   };
@@ -294,8 +302,8 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
             );
             */
       const startSep = Templates.resultsDisplayServerOrClient.startSeparator({l});
-      const innerBrowseFieldSeparator = Templates.resultsDisplayServerOrClient
-        .innerBrowseFieldSeparator({l});
+      const innerBrowseFieldSeparator = Templates.resultsDisplayServerOrClient.
+        innerBrowseFieldSeparator({l});
 
       const buildRanges = () => {
         const endVals = [];
@@ -354,9 +362,9 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
       if (fieldValueAliasMap) {
         Object.entries(fieldValueAliasMap).forEach(([key, val]) => {
           if (Array.isArray(val)) {
-            fieldValueAliasMap[key] = val.map((value) =>
-              Templates.resultsDisplayServerOrClient.fieldValueAlias({key, value})
-            );
+            fieldValueAliasMap[key] = val.map((value) => {
+              return Templates.resultsDisplayServerOrClient.fieldValueAlias({key, value});
+            });
             return;
           }
           if (val && typeof val === 'object') {
@@ -420,7 +428,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
   const $pEscArbitrary = (param) => escapeHTML($p.get(param, true));
 
   // Not currently in use
-  const escapeQuotedCSS = (s) => s.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+  const escapeQuotedCSS = (s) => s.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
 
   const {
     fileData, workI18n, getFieldAliasOrName, schemaObj, metadataObj,
@@ -464,7 +472,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     console.log('pluginsForWork', pluginsForWork);
     const {lang} = this; // array with first item as preferred
     pluginsForWork.iterateMappings(({
-      plugin,
+      // plugin,
       pluginName, pluginLang,
       onByDefaultDefault,
       placement, applicableFields, meta
@@ -564,11 +572,11 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
       prefI18n !== 'false' && this.localizeParamNames
     );
   const lParam = localizeParamNames
-    ? key => l(['params', key])
-    : key => key;
+    ? (key) => l(['params', key])
+    : (key) => key;
   const lIndexedParam = localizeParamNames
-    ? key => l(['params', 'indexed', key])
-    : key => key;
+    ? (key) => l(['params', 'indexed', key])
+    : (key) => key;
   const lParamRaw = localizeParamNames
     ? (key, suffix = '') => $p.get(lParam(key) + suffix, true)
     : (key, suffix = '') => $p.get(key + suffix, true);
@@ -577,9 +585,9 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     : (key, suffix = '') => $p.get($p.get('work') + '-' + key + suffix, true);
 
   // Now that we know `browseFieldSets`, we can parse `startEnd`
-  const browseFieldSetStartEndIdx = browseFieldSets.findIndex((item, i) =>
-    lIndexedParamRaw('startEnd', (i + 1))
-  );
+  const browseFieldSetStartEndIdx = browseFieldSets.findIndex((item, i) => {
+    return lIndexedParamRaw('startEnd', (i + 1));
+  });
   if (browseFieldSetStartEndIdx !== -1) {
     // Todo: i18nize (by work and/or by whole app?)
     const rangeSep = '-';
@@ -614,29 +622,30 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     }
   }
 
-  const browseFieldSetIdx = browseFieldSets.findIndex((item, i) =>
-    lIndexedParamRaw('start', (i + 1) + '-1')
-  );
+  const browseFieldSetIdx = browseFieldSets.findIndex((item, i) => {
+    return lIndexedParamRaw('start', (i + 1) + '-1');
+  });
   const applicableBrowseFieldSet = browseFieldSets[browseFieldSetIdx];
   const applicableBrowseFieldSetName = setNames[browseFieldSetIdx];
-  const applicableBrowseFieldNames = applicableBrowseFieldSet.map((abfs) =>
-    abfs.fieldName
-  );
+  const applicableBrowseFieldNames = applicableBrowseFieldSet.map((abfs) => {
+    return abfs.fieldName;
+  });
 
   const canonicalBrowseFieldSet = browseFieldSets[0];
   const canonicalBrowseFieldSetName = setNames[0];
-  const canonicalBrowseFieldNames = canonicalBrowseFieldSet.map((abfs) =>
-    abfs.fieldName
-  );
+  const canonicalBrowseFieldNames = canonicalBrowseFieldSet.map((abfs) => {
+    return abfs.fieldName;
+  });
 
   const fieldSchemaTypes = applicableBrowseFieldSet.map((abfs) => abfs.fieldSchema.type);
-  const buildRangePoint = (startOrEnd) =>
-    applicableBrowseFieldNames.map((bfn, j) =>
-      $p.get(
+  const buildRangePoint = (startOrEnd) => {
+    return applicableBrowseFieldNames.map((bfn, j) => {
+      return $p.get(
         $p.get('work') + '-' + startOrEnd + (browseFieldSetIdx + 1) + '-' + (j + 1),
         true
-      )
-    );
+      );
+    });
+  };
   const starts = buildRangePoint('start');
   const ends = buildRangePoint('end');
 
@@ -696,7 +705,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
         //   through notifications (or however)
         !noIndexedDB
   ) {
-    tableData = await new Promise((resolve, reject) => {
+    tableData = await new Promise((resolve) => {
       // Todo: Fetch the work in code based on the non-localized `datafileName`
       const dbName = this.namespace + '-textbrowser-cache-data';
       const req = indexedDB.open(dbName);
@@ -747,11 +756,11 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     }
   }
   if (!usingServerData && pluginsForWork) {
-    fieldInfo.forEach(({plugin, placement}, j) => {
+    fieldInfo.forEach(({plugin, placement}) => {
       if (!plugin) {
         return;
       }
-      tableData.forEach((tr, i) => {
+      tableData.forEach((tr) => {
         // Todo: We should pass on other arguments (like `meta` but on `applicableFields`)
         tr.splice(
           placement,

package/resources/templates/languageSelect.js

@@ -19,9 +19,9 @@ export default {
             });
           }
         }
-      }, langs.map(({code}) =>
-        ['option', {value: code}, [languages.getLanguageFromCode(code)]]
-      )]
+      }, langs.map(({code}) => {
+        return ['option', {value: code}, [languages.getLanguageFromCode(code)]];
+      })]
     ], $('#main'));
     if (history.state && typeof history.state === 'object') {
       formDeserialize(document.querySelector('#languageSelectionContainer'), history.state);

package/resources/templates/resultsDisplayServerOrClient.js

@@ -1,4 +1,3 @@
-/* globals console, DOMParser */
 import Templates from './index.js';
 
 export default {
@@ -34,7 +33,8 @@ export default {
     return `<span class="interlintitle">${val}</span>${colonSpace}`;
   },
   styles ({
-    $p, $pRaw, $pRawEsc, $pEscArbitrary, escapeQuotedCSS, escapeCSS,
+    $p, $pRaw, $pRawEsc, $pEscArbitrary, // escapeQuotedCSS,
+    escapeCSS,
     tableWithFixedHeaderAndFooter, checkedFieldIndexes, hasCaption
   }) {
     const colorEsc = !$p.has('color', true) || $p.get('color', true) === '#'
@@ -141,8 +141,8 @@ div.inner-caption {
 }
 ${escapeCSS($pEscArbitrary('pagecss') || '')}
 ` +
-            checkedFieldIndexes.map((idx, i) =>
-              ($pRaw('header') === 'y'
+            checkedFieldIndexes.map((idx, i) => {
+              return ($pRaw('header') === 'y'
                 ? (tableWithFixedHeaderAndFooter
                   ? `.thead .th:nth-child(${i + 1}) div.th-inner, `
                   : `.thead .th:nth-child(${i + 1}), `)
@@ -156,14 +156,17 @@ ${escapeCSS($pEscArbitrary('pagecss') || '')}
 `{
     ${$pEscArbitrary('css' + (idx + 1))}
 }
-`).join('') +
+`;
+            }).join('') +
 
-($pEscArbitrary('interlintitle_css') ? `
-/* http://salzerdesign.com/test/fixedTable.html */
-.interlintitle {
-    ${escapeCSS($pEscArbitrary('interlintitle_css'))}
-}
-` : '') +
+($pEscArbitrary('interlintitle_css')
+  ? `
+  /* http://salzerdesign.com/test/fixedTable.html */
+  .interlintitle {
+      ${escapeCSS($pEscArbitrary('interlintitle_css'))}
+  }
+  `
+  : '') +
             (bgcolorEsc
               ? `
 body {
@@ -357,16 +360,18 @@ body {
       }),
       tableWrap([
         addChildren(tableElem, [
-          (caption ? addChildren(captionElem, [
-            caption,
-            tableWithFixedHeaderAndFooter
-              ? ['div', {class: 'zupa1'}, [
-                ['div', {class: 'inner-caption'}, [
-                  ['span', [caption]]
+          (caption
+            ? addChildren(captionElem, [
+              caption,
+              tableWithFixedHeaderAndFooter
+                ? ['div', {class: 'zupa1'}, [
+                  ['div', {class: 'inner-caption'}, [
+                    ['span', [caption]]
+                  ]]
                 ]]
-              ]]
-              : ''
-          ]) : ''),
+                : ''
+            ])
+            : ''),
           /*
                     // Works but quirky, e.g., `color` doesn't work (as also
                     //  confirmed per https://quirksmode.org/css/css2/columns.html)
@@ -376,54 +381,60 @@ body {
                         )
                     ),
                     */
-          ($pRaw('header') !== '0' ? addChildren(theadElem, [
-            addChildren(trElem,
-              checkedFields.map((cf, i) => {
-                const interlinearColIndexes = allInterlinearColIndexes[i];
-                cf = escapeHTML(cf) + (interlinearColIndexes
-                  ? l('comma-space') + interlinearColIndexes.map((idx) =>
-                    localizedFieldNames[idx]
-                  ).join(l('comma-space'))
-                  : ''
-                );
-                return addChildren(thElem, [
-                  cf,
-                  (tableWithFixedHeaderAndFooter
-                    ? ['div', {class: 'zupa1'}, [
-                      ['div', {class: 'th-inner'}, [
-                        ['span', [cf]]
-                      ]]
-                    ]]
+          ($pRaw('header') !== '0'
+            ? addChildren(theadElem, [
+              addChildren(
+                trElem,
+                checkedFields.map((cf, i) => {
+                  const interlinearColIndexes = allInterlinearColIndexes[i];
+                  cf = escapeHTML(cf) + (interlinearColIndexes
+                    ? l('comma-space') + interlinearColIndexes.map((idx) => {
+                      return localizedFieldNames[idx];
+                    }).join(l('comma-space'))
                     : ''
-                  )
-                ]);
-              })
-            )
-          ]) : ''),
-          ($pRaw('footer') && $pRaw('footer') !== '0' ? addChildren(tfootElem, [
-            addChildren(trElem,
-              checkedFields.map((cf, i) => {
-                const interlinearColIndexes = allInterlinearColIndexes[i];
-                cf = escapeHTML(cf) + (interlinearColIndexes
-                  ? l('comma-space') + interlinearColIndexes.map((idx) =>
-                    localizedFieldNames[idx]
-                  ).join(l('comma-space'))
-                  : ''
-                );
-                return addChildren(thElem, [
-                  cf,
-                  (tableWithFixedHeaderAndFooter
-                    ? ['div', {class: 'zupa1'}, [
-                      ['div', {class: 'th-inner'}, [
-                        ['span', [cf]]
+                  );
+                  return addChildren(thElem, [
+                    cf,
+                    (tableWithFixedHeaderAndFooter
+                      ? ['div', {class: 'zupa1'}, [
+                        ['div', {class: 'th-inner'}, [
+                          ['span', [cf]]
+                        ]]
                       ]]
-                    ]]
+                      : ''
+                    )
+                  ]);
+                })
+              )
+            ])
+            : ''),
+          ($pRaw('footer') && $pRaw('footer') !== '0'
+            ? addChildren(tfootElem, [
+              addChildren(
+                trElem,
+                checkedFields.map((cf, i) => {
+                  const interlinearColIndexes = allInterlinearColIndexes[i];
+                  cf = escapeHTML(cf) + (interlinearColIndexes
+                    ? l('comma-space') + interlinearColIndexes.map((idx) => {
+                      return localizedFieldNames[idx];
+                    }).join(l('comma-space'))
                     : ''
-                  )
-                ]);
-              })
-            )
-          ]) : ''),
+                  );
+                  return addChildren(thElem, [
+                    cf,
+                    (tableWithFixedHeaderAndFooter
+                      ? ['div', {class: 'zupa1'}, [
+                        ['div', {class: 'th-inner'}, [
+                          ['span', [cf]]
+                        ]]
+                      ]]
+                      : ''
+                    )
+                  ]);
+                })
+              )
+            ])
+            : ''),
           addChildren(tbodyElem, outArr)
         ])
       ])