@museumwnf/viewer-core 2.13.0 → 2.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@museumwnf/viewer-core",
-  "version": "2.13.0",
+  "version": "2.15.0",
   "description": "Application engine for MWNF websites: turns a dataset.config.js into a mounted Vue application.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/catalogue/legacySearch.js

@@ -56,15 +56,18 @@ function byStartDate(a, b) {
 }
 
 /**
- * `fields`: `{ [field]: (record, text) => string | string[] }`, what each
- * field of the form searches in a record and one of its translations.
+ * `fields`: `{ [field]: (record, text, language) => string | string[] }`,
+ * what each field of the form searches in a record and one of its
+ * translations, given that translation's language (so a field can read a
+ * related record's text in the same language, as legacy's joins did).
  * `countryFields`: the fields in which a word naming a country (in any of
  * its names) also finds the records of that country.
  * `glossaryFields`: the fields in which a glossary term also searches its
  * spellings in the site's language.
- * `score`: `{ [field]: (like, record, text, inCountry) => number }`, the
- * relevance a matching row adds, `like(value)` telling whether a value holds
- * the row's own word. Summed over the rows, the best translation counting.
+ * `score`: `{ [field]: (like, record, text, inCountry, language) => number }`,
+ * the relevance a matching row adds, `like(value)` telling whether a value
+ * holds the row's own word. Summed over the rows, the best translation
+ * counting.
  *
  * Returns `narrow(list, filters, helpers)` for a results spec (pass it
  * `sort: false`): the records of `list` that match, in legacy's order.
@@ -88,13 +91,13 @@ export function useLegacySearch({
   // translation object, so a file loaded again starts afresh.
   const folded = new WeakMap()
 
-  function hayOf(field, record, text) {
+  function hayOf(field, record, text, language) {
     let byField = folded.get(text)
     if (!byField) folded.set(text, (byField = new Map()))
     let hay = byField.get(field)
     if (!hay) {
       const getter = fields[field] ?? fields.keyword
-      byField.set(field, (hay = strings(getter(record, text)).map(collate)))
+      byField.set(field, (hay = strings(getter(record, text, language)).map(collate)))
     }
     return hay
   }
@@ -161,13 +164,13 @@ export function useLegacySearch({
         let relevance = 0
         for (const row of active) {
           const inCountry = row.countries.has(record.country_id)
-          const hay = hayOf(row.field, record, text)
+          const hay = hayOf(row.field, record, text, language)
           const hit = inCountry || hay.some((h) => row.needles.some((n) => h.includes(n)))
           if (result === null) result = hit
           else if (String(row.cond).toUpperCase() === 'OR') result = result || hit
           else result = result && hit
           const rank = score[row.field]
-          if (rank) relevance += rank((value) => strings(value).some((v) => collate(v).includes(row.needle)), record, text, inCountry)
+          if (rank) relevance += rank((value) => strings(value).some((v) => collate(v).includes(row.needle)), record, text, inCountry, language)
         }
         if (result === null || result) best = Math.max(best ?? 0, relevance)
       }

package/src/i18n/index.js

@@ -47,18 +47,23 @@ export function mergeMessages(...catalogues) {
 export function createI18n({ messages = {}, locale = BASE_LANGUAGE } = {}) {
   const current = ref(locale)
 
-  const t = (key) => {
-    const active = messages[current.value]
+  // A text in a language of the caller's choosing (a record's own, say),
+  // English where that language has none.
+  const tIn = (language, key) => {
+    const active = messages[language]
     if (active && typeof active[key] === 'string') return active[key]
     const base = messages[BASE_LANGUAGE]
     if (base && typeof base[key] === 'string') return base[key]
     return key
   }
 
+  const t = (key) => tIn(current.value, key)
+
   const i18n = {
     locale: current,
     availableLocales: Object.keys(messages),
     t,
+    tIn,
     install(app) {
       app.provide(VIEWER_I18N, i18n)
       // `$t` in a template, `useI18n()` in a script — the two shapes Vue

package/src/testing/viteConfig.js

@@ -54,6 +54,9 @@ export function defineViewerConfig({
     test: {
       environment: 'jsdom',
       testTimeout: 60000,
+      // Node 26 has a `localStorage` of its own, which hides jsdom's from the
+      // tests: without a storage file it is undefined.
+      execArgv: ['--no-experimental-webstorage'],
       server: {
         deps: {
           // viewer-core ships .vue source; Node cannot load it unless Vitest