textbrowser 0.40.2 → 0.40.3

package/.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
       'document.dir',
       'document.querySelector',
       'document.querySelectorAll',
+      'document.title',
       'DOMParser',
       'Error',
       'fetch',

package/.ncurc.js

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

package/CHANGES.md

@@ -1,5 +1,18 @@
 # textbrowser CHANGES
 
+## 0.40.3
+
+### User-facing
+
+- fix: clear out extra query string, e.g., from Facebook when querying for
+    metadata file
+- chore: update deps.
+
+### Dev-facing
+
+- chore: lint and add ncurc.js
+- chore: update devDeps.
+
 ## 0.40.2
 
 - Fix: Add ESM `dist` versions for `activateCallback` and `WorkInfo`

package/README.md

@@ -736,6 +736,11 @@ it supports the following arguments:
 
 ## To-dos (Highest priority)
 
+1.  Document and add **screen-casts** along with one for developers showing
+    JSON format, metadata, and schemas); also use with shortcuts (including
+    Bahá'í Library Online ones)
+1.  Fix so as to ignore other items of query string such as `?fbclid=...`
+    from Facebook.
 0.  Progressive web app? / Electron?
 1.  Adapt approach of <https://suttacentral.net/offline> in providing form for
     choice of items to offline (also add to individual work pages).
@@ -751,12 +756,10 @@ it supports the following arguments:
 1.  Ensure works with `pnpm` in all environments (didn't work when deployed,
     but would need to recall the problem and resolve)
 1.  Simplify `languages.json` by using `Intl.DisplayNames` (`type: 'language'`)
-    to localize language names (and can avoid direction if [intl-locale-info proposal](https://github.com/tc39/proposal-intl-locale-info) is
-    implemented); consider using with plugins so can, e.g., show language
+    to localize language names (and can avoid direction if
+    [intl-locale-info proposal](https://github.com/tc39/proposal-intl-locale-info)
+    is implemented); consider using with plugins so can, e.g., show language
     visibly into which a targeted content language field was translated
-1.  Document and add screen-casts along with one for developers showing
-    JSON format, metadata, and schemas); also use with shortcuts (including
-    Bahá'í Library Online ones)
 1.  For plugins, allow export of `stylesheets` array to add to
     `loadStylesheets`, so they don't have to do the importing and executing.
 1.  **Progress meter** with hidden console to avoid intimidating loading
@@ -777,7 +780,7 @@ it supports the following arguments:
     1. Fix limitation that 0's don't change to 1's if
         not present as a minimum (e.g., if no 0 for Chapter
         number, then won't show anything).
-    1. Avoid need for separate `startEnd` for browse set;
+    1. Avoid need for separate `<work name>-startEnd` for browse set;
         e.g., parse Rodwell or Sale?
     1. Ideally work across even book
     1. Support anchor portion (e.g., `1:2:3-1:2:5#1:2:4`)
@@ -785,6 +788,7 @@ it supports the following arguments:
     `activateCallback.js`
 1.  Have **IndexedDB handle all pages** language select, work select, and
     work display be part of too?
+    1.  `indexedDB` for JSON data
 1.  **Node.js** (or PHP?)
     1.  Delivery of HTML content by same URL so third parties can
         consume without JavaScript and optimized when not offline
@@ -910,7 +914,9 @@ it supports the following arguments:
             and/or syntax (generic to *TextBrowser* and/or canonical, ideally
             human-readable based on JSON-supplied information; e.g., for the
             Bible, `Matt. 5:10-12`); use with `postMessage` to-do to supply
-            syntax back to another site
+            syntax back to another site; see
+            [Scroll To Text fragment](https://wicg.github.io/ScrollToTextFragment/);
+            [Stack answer](https://stackoverflow.com/a/62162093/271577)
         1.  Correct any field easily by links within TB to editing interface
         1.  Add an "overlay" column like interlinear, but which overlays by
             tooltip if any data is present; can also use metadata if the
@@ -966,11 +972,13 @@ it supports the following arguments:
         <https://github.com/json-schema-org/json-schema-spec/issues/587#issuecomment-389726603>
         by using initial `$`?
 1.  Find way to avoid need for `!important` in column CSS
-1.  Offer more border styling tuning controls (including right/left/top/bottom,
+1.  Redirect automatically by accepted language, though have a link or
+    preference to change the default
+1.  Offer more **border styling** tuning controls (including right/left/top/bottom,
     color, etc.); then offer this along with other styles if we replace CSS
     input box with pop-up styling form (like Advanced Formatting, but for columns)
-1.  Refactoring: Try to use `deserialize` of `form-serialization` fork for initial population
-    or hash change?
+1.  Refactoring: Try to use `deserialize` of `form-serialization` fork for
+    initial population or hash change? (if not `FormData`)
 1.  We should try to allow `onByDefault` and `placement` for non-plugin
     fields also
 1.  [ES6 Modules in browser](https://jakearchibald.com/2017/es-modules-in-browsers/):
@@ -1044,8 +1052,8 @@ it supports the following arguments:
     with multiselect
 1.  Preview styling changes (or move all controls to results page for
     immediate real feedback)
-1.  Separate formatting within Jamilih code to CSS; unit test and performance
-    by being able to use a natively stringifying version of Jamilih
+1.  Separate **formatting within Jamilih code** to CSS; unit test and
+    performance by being able to use a natively stringifying version of Jamilih
     (once complete)
 1.  Utilize meta-data properties, `primary_text_field`, `orig_lang_field`,
     `orig_langs`, e.g., to allow for user to display main language and
@@ -1105,7 +1113,7 @@ it supports the following arguments:
 
 1.  Waiting: Avoid superagent warning:
     <https://github.com/whitlockjc/path-loader/issues/17>
-1.  Remember columns enabled, etc. since last visit, and/or saved as
+1.  **Remember columns enabled**, etc. since last visit, and/or saved as
     preferences.
 1.  Allow copy-pasting a search as a custom web protocol (make
     site-configurable), e.g., to support `web+bahaiwritings:` links per
@@ -1124,8 +1132,6 @@ it supports the following arguments:
         1.  Preference to remember enabled checkboxes and formatting
 1.  Change to utilize history.pushState?
     <https://developer.mozilla.org/en-US/docs/Web/API/History_API>
-1.  Use ES6 modules (babel)
-    1.  dynamic or hierarchical loading of CSS too?
 1.  Sort file selection listing per locale?
 1.  Node.js synchronization of locale files?
 1.  Could allow Node to built schemas, optionally allowing or disallowing
@@ -1142,7 +1148,6 @@ it supports the following arguments:
     the i18n of "lang"?).
 1.  `window.postMessage` API (since CORS is only for Ajax and
     `document.domain` is only for subdomains).
-1.  `indexedDB` for JSON data
 1.  Restore `tabindex` usage
 1.  Restore option from work page to have a checkbox on whether to go to
     "Advanced mode", opening the styling options by default or not.

package/dist/WorkInfo-es.js

@@ -4229,9 +4229,14 @@ const getMetaProp = function getMetaProp (lang, metadataObj, properties, allowOb
 //      file.anyOf.splice(1, 1, {$ref: schemaFile});
 // Todo: Allow use of dbs and fileGroup together in base directories?
 const getMetadata = async (file, property, basePath) => {
+  const url = new URL(basePath || getCurrDir());
+  url.search = ''; // Clear out query string, e.g., `?fbclid` from Facebook
+  url.pathname = file;
+  url.hash = property ? '#/' + property : '';
+
   return (await JsonRefs
     .resolveRefsAt(
-      (basePath || getCurrDir()) + file + (property ? '#/' + property : ''),
+      url.toString(),
       {
         loaderOptions: {
           processContent (res, callback) {

package/dist/activateCallback-es.js

@@ -155,4 +155,4 @@ async function activateCallback ({
   });
 }
 
-export default activateCallback;
+export { activateCallback as default };

package/dist/index-es.js

@@ -3,14 +3,9 @@ function ownKeys(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -18,19 +13,12 @@ function ownKeys(object, enumerableOnly) {
 
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -1485,15 +1473,15 @@ var number = createCommonjsModule(function (module, exports) {
         result.maximumSignificantDigits = g1.length;
       } // @@@+ case
       else if (g2 === '+') {
-          result.minimumSignificantDigits = g1.length;
-        } // .### case
-        else if (g1[0] === '#') {
-            result.maximumSignificantDigits = g1.length;
-          } // .@@## or .@@@ case
-          else {
-              result.minimumSignificantDigits = g1.length;
-              result.maximumSignificantDigits = g1.length + (typeof g2 === 'string' ? g2.length : 0);
-            }
+        result.minimumSignificantDigits = g1.length;
+      } // .### case
+      else if (g1[0] === '#') {
+        result.maximumSignificantDigits = g1.length;
+      } // .@@## or .@@@ case
+      else {
+        result.minimumSignificantDigits = g1.length;
+        result.maximumSignificantDigits = g1.length + (typeof g2 === 'string' ? g2.length : 0);
+      }
 
       return '';
     });
@@ -1733,15 +1721,15 @@ var number = createCommonjsModule(function (module, exports) {
             result.minimumFractionDigits = g1.length;
           } // .### case
           else if (g3 && g3[0] === '#') {
-              result.maximumFractionDigits = g3.length;
-            } // .00## case
-            else if (g4 && g5) {
-                result.minimumFractionDigits = g4.length;
-                result.maximumFractionDigits = g4.length + g5.length;
-              } else {
-                result.minimumFractionDigits = g1.length;
-                result.maximumFractionDigits = g1.length;
-              }
+            result.maximumFractionDigits = g3.length;
+          } // .00## case
+          else if (g4 && g5) {
+            result.minimumFractionDigits = g4.length;
+            result.maximumFractionDigits = g4.length + g5.length;
+          } else {
+            result.minimumFractionDigits = g1.length;
+            result.maximumFractionDigits = g1.length;
+          }
 
           return '';
         });
@@ -1966,14 +1954,14 @@ var parser = createCommonjsModule(function (module, exports) {
         if (char === 123
         /* `{` */
         ) {
-            var result = this.parseArgument(nestingLevel, expectingCloseTag);
+          var result = this.parseArgument(nestingLevel, expectingCloseTag);
 
-            if (result.err) {
-              return result;
-            }
+          if (result.err) {
+            return result;
+          }
 
-            elements.push(result.val);
-          } else if (char === 125
+          elements.push(result.val);
+        } else if (char === 125
         /* `}` */
         && nestingLevel > 0) {
           break;
@@ -1990,12 +1978,12 @@ var parser = createCommonjsModule(function (module, exports) {
         /* `<` */
         && !this.ignoreTag && this.peek() === 47 // char code for '/'
         ) {
-            if (expectingCloseTag) {
-              break;
-            } else {
-              return this.error(error.ErrorKind.UNMATCHED_CLOSING_TAG, createLocation(this.clonePosition(), this.clonePosition()));
-            }
-          } else if (char === 60
+          if (expectingCloseTag) {
+            break;
+          } else {
+            return this.error(error.ErrorKind.UNMATCHED_CLOSING_TAG, createLocation(this.clonePosition(), this.clonePosition()));
+          }
+        } else if (char === 60
         /* `<` */
         && !this.ignoreTag && _isAlpha(this.peek() || 0)) {
           var result = this.parseTag(nestingLevel, parentArgType);
@@ -2180,8 +2168,8 @@ var parser = createCommonjsModule(function (module, exports) {
       if (this.isEOF() || this.char() !== 39
       /* `'` */
       ) {
-          return null;
-        } // Parse escaped char following the apostrophe, or early return if there is no escaped char.
+        return null;
+      } // Parse escaped char following the apostrophe, or early return if there is no escaped char.
       // Check if is valid escaped character
 
 
@@ -2225,18 +2213,18 @@ var parser = createCommonjsModule(function (module, exports) {
         if (ch === 39
         /* `'` */
         ) {
-            if (this.peek() === 39
-            /* `'` */
-            ) {
-                codePoints.push(39); // Bump one more time because we need to skip 2 characters.
+          if (this.peek() === 39
+          /* `'` */
+          ) {
+            codePoints.push(39); // Bump one more time because we need to skip 2 characters.
 
-                this.bump();
-              } else {
-              // Optional closing apostrophe.
-              this.bump();
-              break;
-            }
+            this.bump();
           } else {
+            // Optional closing apostrophe.
+            this.bump();
+            break;
+          }
+        } else {
           codePoints.push(ch);
         }
 
@@ -2282,9 +2270,9 @@ var parser = createCommonjsModule(function (module, exports) {
       if (this.char() === 125
       /* `}` */
       ) {
-          this.bump();
-          return this.error(error.ErrorKind.EMPTY_ARGUMENT, createLocation(openingBracePosition, this.clonePosition()));
-        } // argument name
+        this.bump();
+        return this.error(error.ErrorKind.EMPTY_ARGUMENT, createLocation(openingBracePosition, this.clonePosition()));
+      } // argument name
 
 
       var value = this.parseIdentifierIfPossible().value;
@@ -2563,8 +2551,8 @@ var parser = createCommonjsModule(function (module, exports) {
       if (this.isEOF() || this.char() !== 125
       /* `}` */
       ) {
-          return this.error(error.ErrorKind.EXPECT_ARGUMENT_CLOSING_BRACE, createLocation(openingBracePosition, this.clonePosition()));
-        }
+        return this.error(error.ErrorKind.EXPECT_ARGUMENT_CLOSING_BRACE, createLocation(openingBracePosition, this.clonePosition()));
+      }
 
       this.bump(); // `}`
 
@@ -2774,10 +2762,10 @@ var parser = createCommonjsModule(function (module, exports) {
         && ch <= 57
         /* `9` */
         ) {
-            hasDigits = true;
-            decimal = decimal * 10 + (ch - 48);
-            this.bump();
-          } else {
+          hasDigits = true;
+          decimal = decimal * 10 + (ch - 48);
+          this.bump();
+        } else {
           break;
         }
       }
@@ -2861,10 +2849,10 @@ var parser = createCommonjsModule(function (module, exports) {
       if (code === 10
       /* '\n' */
       ) {
-          this.position.line += 1;
-          this.position.column = 1;
-          this.position.offset += 1;
-        } else {
+        this.position.line += 1;
+        this.position.column = 1;
+        this.position.offset += 1;
+      } else {
         this.position.column += 1; // 0 ~ 0x10000 -> unicode BMP, otherwise skip the surrogate pair.
 
         this.position.offset += code < 0x10000 ? 1 : 2;
@@ -15179,7 +15167,12 @@ const getMetaProp = function getMetaProp(lang, metadataObj, properties, allowObj
 // Todo: Allow use of dbs and fileGroup together in base directories?
 
 const getMetadata = async (file, property, basePath) => {
-  return (await JsonRefs.resolveRefsAt((basePath || getCurrDir()) + file + (property ? '#/' + property : ''), {
+  const url = new URL(basePath || getCurrDir());
+  url.search = ''; // Clear out query string, e.g., `?fbclid` from Facebook
+
+  url.pathname = file;
+  url.hash = property ? '#/' + property : '';
+  return (await JsonRefs.resolveRefsAt(url.toString(), {
     loaderOptions: {
       processContent(res, callback) {
         callback(undefined, JSON.parse(res.text || // `.metadata` not a recognized extension, so
@@ -17966,8 +17959,7 @@ async function workDisplay({
     groupsToWorks
   }) {
     const il = localizeParamNames ? key => l(['params', key]) : key => key;
-    const iil = localizeParamNames ? key => l(['params', 'indexed', key]) : key => key; // eslint-disable-next-line unicorn/prefer-prototype-methods -- Convenient
-
+    const iil = localizeParamNames ? key => l(['params', 'indexed', key]) : key => key;
     const localeFromLangData = languages.localeFromLangData.bind(languages);
     const imfLang = IMF({
       locales: lang.map(localeFromLangData),
@@ -18307,6 +18299,8 @@ Object.defineProperty(self$1, '_BIDI_RTL_LANGS', {
   /* 'فارسی', Persian */
   'glk',
   /* 'گیلکی', Gilaki */
+  'he',
+  /* 'עברית', Hebrew */
   'ku',
   /* 'Kurdî / كوردی', Kurdish */
   'mzn',
@@ -18321,8 +18315,10 @@ Object.defineProperty(self$1, '_BIDI_RTL_LANGS', {
   /* 'سنڌي', Sindhi */
   'ug',
   /* 'Uyghurche / ئۇيغۇرچە', Uyghur */
-  'ur'
+  'ur',
   /* 'اردو', Urdu */
+  'yi'
+  /* 'ייִדיש', Yiddish */
   ],
   writable: false,
   enumerable: true,
@@ -18384,8 +18380,8 @@ const setAnchor = ({
           if (i === max || // No more field sets to check
           anchors.length // Already had anchors found
           ) {
-              breakout = true;
-            }
+            breakout = true;
+          }
 
           break;
         }
@@ -19436,7 +19432,7 @@ async function requestPermissions(langs, l) {
           // rememberRefusal();
           resolve();
           return;
-        // eslint-disable-next-line radar/no-duplicated-branches
+        // eslint-disable-next-line sonarjs/no-duplicated-branches
 
         case 'default':
           resolve();
@@ -19900,4 +19896,4 @@ TextBrowser.prototype.workDisplay = workDisplay;
 TextBrowser.prototype.resultsDisplayClient = resultsDisplayClient;
 TextBrowser.prototype.getWorkFiles = getWorkFiles;
 
-export default TextBrowser;
+export { TextBrowser as default };