langsys-js-typescript 0.6.2 → 0.6.4

package/dist/index.mjs

@@ -287,14 +287,76 @@ function warnUnmatchedParams(source, texts, params, context) {
 }
 function interpolate(template, params, locale) {
   if (isICU(template)) {
-    try {
-      return new IntlMessageFormat(template, locale || "en").format(params);
-    } catch {
-      return simpleInterpolate(template, params, locale);
+    const resolved = locale || "en";
+    const hasNullParam = !!params && Object.values(params).some((value) => value === null);
+    if (!hasNullParam) {
+      try {
+        return new IntlMessageFormat(template, resolved).format(params);
+      } catch {
+      }
+    }
+    {
+      try {
+        const ast = new IntlMessageFormat(template, resolved).ast;
+        if (!Array.isArray(ast)) return simpleInterpolate(template, params, locale);
+        const recovered = _recoverMissingArgs(JSON.parse(JSON.stringify(ast)), params);
+        return new IntlMessageFormat(recovered, resolved).format(params);
+      } catch {
+        return simpleInterpolate(template, params, locale);
+      }
     }
   }
   return simpleInterpolate(template, params, locale);
 }
+var ICU_LITERAL = 0;
+var ICU_ARGUMENT = 1;
+var ICU_NUMBER = 2;
+var ICU_DATE = 3;
+var ICU_TIME = 4;
+var ICU_SELECT = 5;
+var ICU_PLURAL = 6;
+var ICU_POUND = 7;
+var ICU_TAG = 8;
+function _recoverMissingArgs(nodes, params) {
+  const out = [];
+  for (const node of nodes) {
+    const name = node.value;
+    const value = name !== void 0 && name in params ? params[name] : void 0;
+    const supplied = value !== void 0 && value !== null;
+    if (node.type === ICU_TAG) {
+      out.push({ ...node, children: _recoverMissingArgs(node.children ?? [], params) });
+      continue;
+    }
+    if (node.type === ICU_SELECT || node.type === ICU_PLURAL) {
+      if (supplied) {
+        const options = {};
+        for (const [key, branch2] of Object.entries(node.options ?? {})) {
+          options[key] = { value: _recoverMissingArgs(branch2.value, params) };
+        }
+        out.push({ ...node, options });
+        continue;
+      }
+      const other = node.options?.other;
+      if (!other) {
+        out.push(node);
+        continue;
+      }
+      const branch = _recoverMissingArgs(other.value, params);
+      out.push(
+        ...branch.map(
+          (child) => child.type === ICU_POUND ? { type: ICU_LITERAL, value: `{${name}}` } : child
+        )
+      );
+      continue;
+    }
+    if (!supplied && (node.type === ICU_ARGUMENT || node.type === ICU_NUMBER || node.type === ICU_DATE || node.type === ICU_TIME)) {
+      out.push({ type: ICU_LITERAL, value: `{${name}}` });
+      continue;
+    }
+    out.push(node);
+  }
+  return out;
+}
 function simpleInterpolate(template, params, locale) {
   return template.replace(/\{([^{},]+)\}/g, (match, rawKey) => {
     const key = rawKey.trim();
@@ -1074,8 +1136,14 @@ var TRANSLATABLE_ATTRIBUTES = [
   "placeholder",
   "alt",
   "title",
+  "label",
+  // <option>, <optgroup>, <track> — the text a user reads in the picker
   "aria-label",
   "aria-placeholder",
+  "aria-description",
+  "aria-valuetext",
+  // the spoken value of a slider/meter
+  "aria-roledescription",
   "data-error",
   "data-error-message",
   "data-validation-message",
@@ -1192,9 +1260,15 @@ async function registerContentBlock(contentBlock) {
 function tokenizeElement(element) {
   const tokens = [];
   const clone = element.cloneNode(true);
-  _walkForTokens(element, Array.from(clone.childNodes), tokens, []);
+  _walkForTokens(element, Array.from(clone.childNodes), tokens, [], false, true);
   return { tokens, content: normalizeMarkupPlaceholders(clone.outerHTML) };
 }
+function legacyTokenizeElement(element) {
+  const tokens = [];
+  const clone = element.cloneNode(true);
+  _walkForTokens(element, Array.from(clone.childNodes), tokens, [], true, false);
+  return tokens;
+}
 function _writeKnownContentBlockToCache(category, customId) {
   const lookupCat = category || "__uncategorized__";
   sTranslations.update((current) => {
@@ -1208,18 +1282,18 @@ function _writeKnownContentBlockToCache(category, customId) {
     return { ...current };
   });
 }
-function _walkForTokens(liveRoot, cloneNodes, tokens, indices) {
+function _walkForTokens(liveRoot, cloneNodes, tokens, indices, duplicateSelectOptions, applyStyles) {
   cloneNodes.forEach((node, index) => {
     if (node.nodeType === Node.ELEMENT_NODE) {
       const el = node;
       if (isTranslationExcluded(el)) return;
       if (isPhraseMarked(el)) return;
     }
-    if (node.hasChildNodes()) {
+    if (applyStyles && node.hasChildNodes()) {
       _applyStylesToClone(liveRoot, node, [...indices, index]);
     }
     if (node.nodeType === Node.ELEMENT_NODE) {
-      _tokenizeAttributes(node, tokens);
+      _tokenizeAttributes(node, tokens, duplicateSelectOptions);
     }
     const contentToken = node.nodeValue?.replace(/\s+/g, " ").trim();
     if (node.nodeType === Node.TEXT_NODE && contentToken) {
@@ -1227,10 +1301,10 @@ function _walkForTokens(liveRoot, cloneNodes, tokens, indices) {
       return;
     }
     if (!node.hasChildNodes()) return;
-    _walkForTokens(liveRoot, Array.from(node.childNodes), tokens, [...indices, index]);
+    _walkForTokens(liveRoot, Array.from(node.childNodes), tokens, [...indices, index], duplicateSelectOptions, applyStyles);
   });
 }
-function _tokenizeAttributes(element, tokens) {
+function _tokenizeAttributes(element, tokens, duplicateSelectOptions) {
   const tagName = element.tagName.toLowerCase();
   if (tagName === "img") {
     const img = element;
@@ -1251,7 +1325,7 @@ function _tokenizeAttributes(element, tokens) {
       if (value) tokens.push(normalizeMarkupPlaceholders(value));
     }
   }
-  if (tagName === "select") {
+  if (duplicateSelectOptions && tagName === "select") {
     const options = element.querySelectorAll("option");
     options.forEach((option) => {
       const optionText = option.textContent?.trim();
@@ -1377,9 +1451,15 @@ var Translate = class {
       return;
     }
     if (derivedId) {
-      const legacyId = generateLegacyCustomId(contentBlock.category, contentBlock.tokens);
-      if (legacyId !== this.custom_id && isContentBlockKnown(contentBlock.category, legacyId)) {
-        this.custom_id = legacyId;
+      const legacyTokens = legacyTokenizeElement(this.element);
+      const candidates = [
+        generateCustomId(contentBlock.category, legacyTokens),
+        generateLegacyCustomId(contentBlock.category, legacyTokens)
+      ];
+      for (const candidate of candidates) {
+        if (candidate === this.custom_id) continue;
+        if (!isContentBlockKnown(contentBlock.category, candidate)) continue;
+        this.custom_id = candidate;
         if (this.tokens.length > 1 && this.element) {
           this.translate(Array.from(this.element.childNodes));
           this.lastTranslatedLocale = currentlyLoadedLocale.get();
@@ -1643,6 +1723,6 @@ var t = ((phrase, ...rest) => {
 });
 var tSignal = LangsysApp.Translations.tSignal;
 
-export { LangsysApp, LangsysAppAPI, Logger, PHRASE_MARKER_ATTR, PHRASE_MARKER_ATTRS, Phrase, Translate, Translations, canonicalizeLocale, createSignal, currentlyLoadedLocale, encodeRichText, findUnusedParamKeys, generateCustomId, generateLegacyCustomId, getValue, interpolate, isContentBlockKnown, isEmpty, isICU, isPhraseMarked, isTranslationExcluded, logger, markupTokenValues, md5, md5Legacy, normalizeMarkupPlaceholders, persist, reconstitute, registerContentBlock, sTranslations, stripSentinels, t, tSignal, tokenizeElement };
+export { LangsysApp, LangsysAppAPI, Logger, PHRASE_MARKER_ATTR, PHRASE_MARKER_ATTRS, Phrase, Translate, Translations, canonicalizeLocale, createSignal, currentlyLoadedLocale, encodeRichText, findUnusedParamKeys, generateCustomId, generateLegacyCustomId, getValue, interpolate, isContentBlockKnown, isEmpty, isICU, isPhraseMarked, isTranslationExcluded, legacyTokenizeElement, logger, markupTokenValues, md5, md5Legacy, normalizeMarkupPlaceholders, persist, reconstitute, registerContentBlock, sTranslations, stripSentinels, t, tSignal, tokenizeElement };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map