textbrowser 0.50.0 → 0.52.0

package/dist/resources/workDisplay.d.ts

@@ -0,0 +1,81 @@
+/**
+ * @typedef {() => Promise<{
+ *   groupName: string | Text | DocumentFragment,
+ *   worksToFields: {
+ *     workName: string | Text | DocumentFragment,
+ *     shortcut: string,
+ *     fieldAliasOrNames: (
+ *       string|string[]|import('../server/main.js').LocalizationStrings
+ *     )[]|undefined
+ *   }[]
+ * }[]>} GetFieldAliasOrNames
+ */
+/**
+ * @typedef {(innerArg: {
+ *   form: HTMLFormElement,
+ *   random: {
+ *     checked: boolean
+ *   },
+ *   checkboxes: HTMLInputElement[],
+ *   type: string,
+ *   fieldAliasOrNames?: string[],
+ *   workName?: string,
+ * }) => string} SerializeParamsAsURL
+ */
+/**
+ * @typedef {(
+ *   key: string|string[],
+ *   substitutions?: Record<string, string>
+ * ) => string|Text|DocumentFragment} LDirectional
+ */
+/**
+ * @typedef {(
+ *   key: string,
+ *   tag: string,
+ *   attr: string,
+ *   atts: import('jamilih').JamilihAttributes,
+ *   children?: import('jamilih').JamilihChildren
+ * ) => import('jamilih').JamilihArray} LElement
+ */
+/**
+ * @this {import('./index.js').default}
+ * @param {{
+ *   l: import('intl-dom').I18NCallback,
+ *   languageParam: string,
+ *   lang: string[],
+ *   preferredLocale: string,
+ *   languages: import('./utils/Languages.js').Languages,
+ *   fallbackLanguages: string[],
+ *   $p: import('./utils/IntlURLSearchParams.js').default
+ * }} cfg
+ */
+export default function workDisplay(this: import("./index.js").default, { l, languageParam, lang, preferredLocale, languages, fallbackLanguages, $p }: {
+    l: import("intl-dom").I18NCallback;
+    languageParam: string;
+    lang: string[];
+    preferredLocale: string;
+    languages: import("./utils/Languages.js").Languages;
+    fallbackLanguages: string[];
+    $p: import("./utils/IntlURLSearchParams.js").default;
+}): Promise<void>;
+export type GetFieldAliasOrNames = () => Promise<{
+    groupName: string | Text | DocumentFragment;
+    worksToFields: {
+        workName: string | Text | DocumentFragment;
+        shortcut: string;
+        fieldAliasOrNames: (string | string[] | import("../server/main.js").LocalizationStrings)[] | undefined;
+    }[];
+}[]>;
+export type SerializeParamsAsURL = (innerArg: {
+    form: HTMLFormElement;
+    random: {
+        checked: boolean;
+    };
+    checkboxes: HTMLInputElement[];
+    type: string;
+    fieldAliasOrNames?: string[];
+    workName?: string;
+}) => string;
+export type LDirectional = (key: string | string[], substitutions?: Record<string, string>) => string | Text | DocumentFragment;
+export type LElement = (key: string, tag: string, attr: string, atts: import("jamilih").JamilihAttributes, children?: import("jamilih").JamilihChildren) => import("jamilih").JamilihArray;
+//# sourceMappingURL=workDisplay.d.ts.map

package/dist/resources/workDisplay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workDisplay.d.ts","sourceRoot":"","sources":["../../resources/workDisplay.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;GAWG;AAEH;;;;;GAKG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AACH,uJAVW;IACN,CAAC,EAAE,OAAO,UAAU,EAAE,YAAY,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;IACpD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,EAAE,EAAE,OAAO,gCAAgC,EAAE,OAAO,CAAA;CACrD,iBAyOH;mCA7RY,MAAM,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,gBAAgB,CAAC;IAC5C,aAAa,EAAE;QACb,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,gBAAgB,CAAC;QAC3C,QAAQ,EAAE,MAAM,CAAC;QACjB,iBAAiB,EAAE,CACzB,MAAc,GAAC,MAAM,EAAE,GAAC,OAAO,mBAAmB,EAAE,mBAAmB,CAChE,EAAE,GAAC,SAAS,CAAA;KACd,EAAE,CAAA;CACJ,EAAE,CAAC;mCAIM,CAAC,QAAQ,EAAE;IACnB,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE;QACN,OAAO,EAAE,OAAO,CAAA;KACjB,CAAC;IACF,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,KAAK,MAAM;2BAIF,CACR,GAAG,EAAE,MAAM,GAAC,MAAM,EAAE,EACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACnC,MAAM,GAAC,IAAI,GAAC,gBAAgB;uBAIvB,CACR,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,SAAS,EAAE,iBAAiB,EACzC,QAAQ,CAAC,EAAE,OAAO,SAAS,EAAE,eAAe,KACzC,OAAO,SAAS,EAAE,YAAY"}

package/dist/resources/workSelect.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @param {{
+ *   files: string,
+ *   lang: string[],
+ *   fallbackLanguages: string[],
+ *   $p: import('./utils/IntlURLSearchParams.js').default,
+ *   followParams: (formSelector: string, cb: () => void) => void
+ * }} cfg
+ */
+export default function workSelect({ files, lang, fallbackLanguages, $p, followParams }: {
+    files: string;
+    lang: string[];
+    fallbackLanguages: string[];
+    $p: import("./utils/IntlURLSearchParams.js").default;
+    followParams: (formSelector: string, cb: () => void) => void;
+}): Promise<void>;
+//# sourceMappingURL=workSelect.d.ts.map

package/dist/resources/workSelect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workSelect.d.ts","sourceRoot":"","sources":["../../resources/workSelect.js"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,yFARW;IACN,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,EAAE,EAAE,OAAO,gCAAgC,EAAE,OAAO,CAAC;IACrD,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,CAAA;CAC7D,iBAkFH"}

package/dist/rollup.config.d.ts

@@ -0,0 +1,19 @@
+declare const _default: (import("rollup").RollupOptions | {
+    input: string;
+    output: {
+        format: string;
+        file: string;
+        name: string;
+    };
+    plugins: any[];
+} | {
+    input: string;
+    output: {
+        format: string;
+        file: string;
+        name: string;
+    };
+    plugins?: undefined;
+})[];
+export default _default;
+//# sourceMappingURL=rollup.config.d.ts.map

package/dist/rollup.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rollup.config.d.ts","sourceRoot":"","sources":["../rollup.config.js"],"names":[],"mappings":""}

package/dist/server/main.d.ts

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+export type UserOptions = {
+    nodeActivate: boolean;
+    port: number;
+    domain: string;
+    basePath: string;
+    interlinearSeparator: string;
+    localizeParamNames: boolean;
+    trustFormatHTML: boolean;
+    allowPlugins: boolean;
+    showEmptyInterlinear: boolean;
+    showTitleOnSingleInterlinear: boolean;
+    serviceWorkerPath: string;
+    userJSON: string;
+    languages: string;
+    files: string;
+    namespace: string;
+    httpServer: string;
+    expressServer: string;
+};
+export type AnyValue = any;
+export type ResultsDisplayServerContext = import("../resources/utils/ServiceWorker.js").ServiceWorkerConfig & UserOptions & {
+    lang: string[];
+    langs: LanguageInfo[];
+    fallbackLanguages: string[];
+    log: (...args: AnyValue[]) => void;
+    nodeActivate?: boolean;
+    port?: number;
+    skipIndexedDB: false;
+    noDynamic: false;
+};
+export type LanguageInfo = {
+    code: string;
+    direction: "ltr" | "rtl";
+    locale: {
+        $ref: string;
+    };
+};
+export type LocalizationStrings = {
+    [key: string]: string | string[] | LocalizationStrings;
+};
+export type LanguagesData = {
+    languages: LanguageInfo[];
+    localeFileBasePath?: string;
+    "localization-strings": LocalizationStrings;
+};
+//# sourceMappingURL=main.d.ts.map

package/dist/server/main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../server/main.js"],"names":[],"mappings":";0BAoCa;IACR,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,4BAA4B,EAAE,OAAO,CAAC;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;uBA2CS,GAAG;0CAKH,OAAO,qCAAqC,EAAE,mBAAmB,GACzE,WAAW,GAAG;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,KAAK,CAAC;IACrB,SAAS,EAAE,KAAK,CAAC;CAClB;2BA2DO;IACR,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,KAAK,GAAC,KAAK,CAAC;IACvB,MAAM,EAAE;QACN,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;CACF;kCAIS;IACZ,CAAK,GAAG,EAAE,MAAM,GAAG,MAAM,GAAC,MAAM,EAAE,GAAC,mBAAmB,CAAA;CACnD;4BAIS;IACR,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAA0B,EAAE,mBAAmB,CAAA;CAC5C"}

package/dist/sw-helper.d.ts

@@ -0,0 +1,3 @@
+export default swHelper;
+declare function swHelper(self: any): void;
+//# sourceMappingURL=sw-helper.d.ts.map

package/dist/sw-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sw-helper.d.ts","sourceRoot":"","sources":["../sw-helper.js"],"names":[],"mappings":";AAiBA,2CAuSC"}

package/dist/sw-helper.js

@@ -10,11 +10,25 @@ const minutes = 60 * 1000;
 
 // UTILITIES
 
+/**
+ * @typedef {number} PositiveInteger
+ */
+
+/**
+ * @typedef {number} Float
+ */
+
+/**
+ * @param {string} url
+ */
 async function getJSON (url) {
   const resp = await fetch(url);
   return await resp.json();
 }
 
+/**
+ * @param {ServiceWorkerGlobalScope} self
+ */
 function swHelper (self) {
   // These could be made configurable by argument too
   const defaultUserStaticFiles = [
@@ -49,7 +63,7 @@ function swHelper (self) {
   ];
 
   /**
-  * @typedef {PlainObject} ConfigObject
+  * @typedef {object} ConfigObject
   * @property {string} namespace
   * @property {string} basePath
   * @property {string} languages
@@ -59,8 +73,8 @@ function swHelper (self) {
 
   /**
    *
-   * @param {ConfigObject} args
-   * @returns {ConfigObject}
+   * @param {Partial<ConfigObject>} args
+   * @returns {Required<ConfigObject>}
    * @todo Since some of these reused, move to external file (or
    *         use `setServiceWorkerDefaults`?)
    */
@@ -96,7 +110,12 @@ function swHelper (self) {
   function logError (error, ...messages) {
     const message = messages.join(' ');
     console.error(error, message);
-    return post({message, errorType: error.type, name: error.name, type: 'error'});
+    return post({
+      message,
+      // errorType: error.type,
+      // name: error.name,
+      type: 'error'
+    });
   }
 
   /**
@@ -120,7 +139,12 @@ function swHelper (self) {
       return undefined;
     } catch (err) {
       console.log('errrr', err);
-      logError(err, err.message || errMessage);
+      logError(
+        /** @type {Error} */
+        (err),
+        /** @type {Error} */
+        (err).message || errMessage
+      );
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve(tryAndRetry(cb, timeout, errMessage, time));
@@ -131,7 +155,7 @@ function swHelper (self) {
 
   /**
    *
-   * @param {PlainObject} args
+   * @param {object} args
    * @param {"log"|"error"|"beginInstall"|"finishedInstall"|"beginActivate"|"finishedActivate"} args.type
    * @param {string} [args.message]
    * @returns {Promise<void>}
@@ -163,7 +187,7 @@ function swHelper (self) {
     post({type: 'beginInstall'});
     log(`Install: Trying, attempt ${time}`);
     const now = Date.now();
-    const json = await getJSON(pathToUserJSON);
+    const json = await getJSON(/** @type {string} */ (pathToUserJSON));
 
     const {
       namespace, languages, files, userStaticFiles
@@ -190,7 +214,14 @@ function swHelper (self) {
     //      to work selection
     // Todo: We might give option to only download
     //        one locale and avoid language splash page
-    const localeFiles = langs.map(
+    const localeFiles =
+    /**
+     * @type {{
+     *   code: string,
+     *   direction: "rtl"|"ltr",
+     *   locale: {$ref: string}
+     * }[]}
+     */ (langs).map(
       ({locale: {$ref}}) => {
         return (langPathParts.length > 1
           ? langPathParts.slice(0, -1).join('/') + '/'
@@ -222,14 +253,22 @@ function swHelper (self) {
           }
           return cache.put(urlToPrefetch, response);
         } catch (error) {
-          logError(error, 'Not caching ' + urlToPrefetch + ' due to ' + error);
+          logError(
+            /** @type {Error} */
+            (error),
+            `Not caching ${urlToPrefetch} due to ${error}`
+          );
           throw error;
         }
       });
       await Promise.all(cachePromises);
       log('Install: Pre-fetching complete.');
     } catch (error) {
-      logError(error, `Install: Pre-fetching failed: ${error}`);
+      logError(
+        /** @type {Error} */
+        (error),
+        `Install: Pre-fetching failed: ${error}`
+      );
       // Failing gives chance for a new client to re-trigger install?
       throw error;
     }
@@ -252,7 +291,7 @@ function swHelper (self) {
     post({type: 'beginActivate'});
     log(`Activate: Trying, attempt ${time}`);
     const [json, cacheNames] = await Promise.all([
-      getJSON(pathToUserJSON),
+      getJSON(/** @type {string} */ (pathToUserJSON)),
       caches.keys()
     ]);
     const {namespace, files, basePath} = getConfigDefaults(json);
@@ -274,9 +313,10 @@ function swHelper (self) {
     post({type: 'finishedActivate'});
   }
 
+  // @ts-expect-error Ok
   const params = new URL(location).searchParams;
   const pathToUserJSON = params.get('pathToUserJSON');
-  const stylesheets = JSON.parse(params.get('stylesheets') || []);
+  const stylesheets = JSON.parse(params.get('stylesheets') || '[]');
 
   console.log('sw info', pathToUserJSON);
   console.log('sw stylesheets', stylesheets);

package/dist/sw-sample.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sw-sample.d.ts.map

package/dist/sw-sample.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sw-sample.d.ts","sourceRoot":"","sources":["../sw-sample.js"],"names":[],"mappings":""}

package/general-schemas/files.jsonschema

@@ -17,6 +17,9 @@
     },
     "type": "object",
     "properties": {
+        "baseDirectory": {
+            "type": "string"
+        },
         "schemaBaseDirectory": {
             "type": "string"
         },
@@ -193,6 +196,9 @@
                     "id": {"type": "string"},
                     "name": {"$ref": "#/definitions/localeKey"},
                     "directions": {"$ref": "#/definitions/localeKey"},
+                    "baseDirectory": {
+                        "type": "string"
+                    },
                     "schemaBaseDirectory": {
                         "type": "string"
                     },

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "textbrowser",
-  "version": "0.50.0",
+  "version": "0.52.0",
   "description": "Multilinear text browser",
   "type": "module",
   "main": "dist/index-es.min.js",
-  "exports": "./dist/index-es.min.js",
+  "exports": {
+    ".": {
+      "types": "./dist/dist/index-es.d.ts",
+      "default": "./dist/index-es.min.js"
+    }
+  },
   "module": "resources/index.js",
   "bin": {
     "textbrowser": "./server/main.js"
@@ -30,51 +35,59 @@
     "text"
   ],
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@brettz9/node-static": "^0.1.1",
-    "command-line-args": "^6.0.0",
+    "@babel/core": "^7.28.4",
+    "@node-static/node-static": "^0.8.0",
+    "command-line-args": "^6.0.1",
     "dom-parser": "^1.1.5",
     "form-serialization": "^0.11.0",
     "indexeddbshim": "^12.0.0",
     "intl-dom": "^0.20.0",
-    "intl-locale-textinfo-polyfill": "^2.1.1",
+    "intl-locale-textinfo-polyfill": "^3.0.0",
     "jamilih": "0.60.0",
-    "jsdom": "^25.0.0",
+    "jsdom": "^27.0.0",
     "json-refs": "^3.0.15",
     "load-stylesheets": "0.12.5",
     "node-fetch": "^3.3.2",
-    "simple-get-json": "^9.0.1"
+    "simple-get-json": "^10.0.0"
   },
   "devDependencies": {
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.25.4",
+    "@babel/preset-env": "^7.28.3",
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^26.0.1",
+    "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@stadtlandnetz/rollup-plugin-postprocess": "^1.1.0",
-    "@web/rollup-plugin-import-meta-assets": "^2.2.1",
+    "@types/chai": "^5.2.2",
+    "@types/express": "^5.0.3",
+    "@types/json-schema": "^7.0.15",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.6.2",
+    "@web/rollup-plugin-import-meta-assets": "^2.3.0",
     "ajv": "8.17.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "chai": "^5.1.1",
-    "eslint": "^9.10.0",
-    "eslint-config-ash-nazg": "^36.17.0",
+    "chai": "^6.2.0",
+    "eslint": "^9.37.0",
+    "eslint-config-ash-nazg": "^39.5.0",
     "json-metaschema": "1.3.0",
-    "mocha": "^10.7.3",
+    "json-schema": "^0.4.0",
+    "mocha": "^11.7.4",
     "npm-run-all": "^4.1.5",
     "open-cli": "^8.0.0",
-    "rollup": "^4.22.0",
+    "rollup": "^4.52.4",
     "rollup-plugin-re": "^1.0.7",
-    "textbrowser-data-schemas": "^0.2.0"
+    "textbrowser-data-schemas": "^0.2.0",
+    "typescript": "^5.9.3"
   },
   "scripts": {
+    "tsc": "tsc",
     "server": "./server/main.js --allowPlugins --namespace=test",
     "start": "static -p 8081",
     "rollup": "rollup -c",
     "lint": "npm run eslint",
     "eslint": "eslint .",
-    "mocha": "mocha --require test/bootstrap/node.js --require chai/register-assert.js test/textbrowserTests.js",
+    "mocha": "node_modules/.bin/_mocha --require test/bootstrap/node.js --require chai/register-assert.js test/textbrowserTests.js",
     "node": "npm run eslint && npm run rollup && npm run mocha",
     "open-test": "open-cli http://127.0.0.1:8081/test/",
     "start-open-test": "run-p start open-test",

package/resources/activateCallback.js

@@ -4,8 +4,22 @@
  */
 /* eslint-env worker -- Worker environment */
 
+/**
+ * @typedef {import('./utils/Metadata.js')} MetadataFile
+ */
+
+/**
+ * @typedef {number} Integer
+ */
 const {ceil} = Math;
+
+/* eslint-disable jsdoc/reject-any-type -- Generic */
+/**
+ * @param {any[]} arr
+ * @param {number} size
+ */
 const arrayChunk = (arr, size) => {
+  /* eslint-enable jsdoc/reject-any-type -- Generic */
   return Array.from({length: ceil(arr.length / size)}, (_, i) => {
     const offset = i * size;
     return arr.slice(offset, offset + size);
@@ -18,16 +32,18 @@ const arrayChunk = (arr, size) => {
 //          files in cache?
 // Todo: Check `oldVersion` and run this first if still too old
 
+/* eslint-disable jsdoc/reject-any-type -- Generic */
 /**
 * @callback Logger
 * @param {...any} args
 * @returns {void}
 */
+/* eslint-enable jsdoc/reject-any-type -- Generic */
 
 /**
- * @param {PlainObject} cfg
+ * @param {object} cfg
  * @param {string} cfg.namespace
- * @param {string[]} cfg.files
+ * @param {string} cfg.files The files.json path
  * @param {Logger} cfg.log
  * @param {string} [cfg.basePath]
  * @returns {Promise<void>}
@@ -41,17 +57,36 @@ export default async function activateCallback ({
   //  already-running versions upon future sw updates
   log('Activate: Callback called');
   const r = await fetch(files);
-  const {groups} = await r.json();
+  const {groups} = /** @type {import('./utils/WorkInfo.js').FilesObject} */ (
+    await r.json()
+  );
 
+  /* eslint-disable jsdoc/reject-any-type -- Generic */
+  /**
+   * @param {any[]} arr
+   * @param {string} path
+   */
   const addJSONFetch = (arr, path) => {
+    /* eslint-enable jsdoc/reject-any-type -- Generic */
     arr.push(
       (async () => (await fetch(basePath + path)).json())()
     );
   };
 
+  /** @type {string[]} */
   const dataFileNames = [];
+
+  /** @type {import('./utils/WorkInfo.js').WorkTableContainer[]} */
   const dataFiles = [];
+
+  /**
+   * @typedef {import('json-schema').JSONSchema4} SchemaFile
+   */
+
+  /** @type {SchemaFile[]} */
   const schemaFiles = [];
+
+  /** @type {MetadataFile[]} */
   const metadataFiles = [];
   groups.forEach(
     ({files: fileObjs, metadataBaseDirectory, schemaBaseDirectory}) => {
@@ -59,8 +94,8 @@ export default async function activateCallback ({
         // We don't i18nize the name here
         dataFileNames.push(name);
         addJSONFetch(dataFiles, filePath);
-        addJSONFetch(metadataFiles, metadataBaseDirectory + '/' + metadataFile);
         addJSONFetch(schemaFiles, schemaBaseDirectory + '/' + schemaFile);
+        addJSONFetch(metadataFiles, metadataBaseDirectory + '/' + metadataFile);
       });
     }
   );
@@ -69,18 +104,20 @@ export default async function activateCallback ({
   ]);
   const chunked = arrayChunk(promises, dataFiles.length);
   const [
-    dataFileResponses, schemaFileResponses, metadataFileResponses
+    , schemaFileResponses, metadataFileResponses
   ] = chunked;
+  const dataFileResponses = /** @type {{data: (Integer|string)[][]}[]} */ (chunked[0]);
 
   log('Activate: Files fetched');
   const dbName = namespace + '-textbrowser-cache-data';
   indexedDB.deleteDatabase(dbName);
   return new Promise((resolve, reject) => {
     const req = indexedDB.open(dbName);
+    // @ts-expect-error Ok
     req.addEventListener('upgradeneeded', ({target: {result: db}}) => {
       db.onversionchange = () => {
         db.close();
-        const err = new Error('versionchange');
+        const err = /** @type {Error & {type: string}} */ (new Error('versionchange'));
         err.type = 'versionchange';
         reject(err);
       };
@@ -90,11 +127,27 @@ export default async function activateCallback ({
 
         const schemaFileResponse = schemaFileResponses[i];
         const metadataFileResponse = metadataFileResponses[i];
-        const fieldItems = schemaFileResponse.items.items;
+        const fieldItems = /** @type {{title: string}[]} */ (
+          schemaFileResponse.items.items
+        );
 
-        let browseFields = metadataFileResponse.table.browse_fields;
+        /**
+         * @typedef {{
+         *   name?: string,
+         *   presort?: boolean,
+         *   set: string[]
+         * }} NameSet
+         */
+
+        let browseFields =
+          /**
+           * @type {(string|NameSet)[]|NameSet}
+           */ (
+            metadataFileResponse.table.browse_fields
+          );
         browseFields = Array.isArray(browseFields) ? browseFields : [browseFields];
 
+        /** @type {string[]} */
         const columnIndexes = [];
         browseFields.forEach((browseFieldSetObj) => {
           if (typeof browseFieldSetObj === 'string') {
@@ -133,24 +186,42 @@ export default async function activateCallback ({
           // Todo: Optionally send notice when complete
           // To take advantage of indexes on our arrays, we
           //   need to transform them to objects! See https://github.com/w3c/IndexedDB/issues/209
+
+          /**
+           * The `value` property alone contains the latter
+           *   `(Integer|string)[]` value.
+           * @type {{
+           *   [key: string]: string|Integer|(Integer|string)[]
+           * }}
+           */
           const objRow = {
             value: tableRow
           };
           uniqueColumnIndexes.forEach((colIdx) => {
-            objRow[colIdx] = tableRow[colIdx.slice(1)];
+            // Indexed like c0, c1, c2, etc.
+            objRow[colIdx] = tableRow[Number.parseInt(colIdx.slice(1))];
           });
           // log('objRow', objRow);
           store.put(objRow, j);
         });
       });
     });
+
+    // @ts-expect-error Ok
     req.addEventListener('success', ({target: {result: db}}) => {
       log('Activate: Database set-up complete', db);
       // Todo: Replace this with `ready()` check
       //   in calling code?
       resolve();
     });
-    const onerr = ({error = new Error('dbError')}) => {
+
+    /**
+     * @param {Event & {error?: Error}} ev
+     */
+    const onerr = (ev) => {
+      const error = /** @type {Error & {type: string}} */ (
+        ev.error ?? new Error('dbError')
+      );
       error.type = 'dbError';
       reject(error);
     };