langsys-js-typescript 0.6.1 → 0.6.3

package/dist/index.mjs

@@ -1074,8 +1074,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",
@@ -1084,10 +1090,16 @@ var TRANSLATABLE_ATTRIBUTES = [
   "data-pattern-message"
 ];
 var PHRASE_MARKER_ATTRS = ["data-ls-phrase", "data-langsys-phrase"];
+function isTranslationExcluded(element) {
+  if ((element.getAttribute("translate") ?? "").toLowerCase() === "no") return true;
+  if (!element.hasAttribute("data-notrans")) return false;
+  const value = (element.getAttribute("data-notrans") ?? "").trim().toLowerCase();
+  return value !== "false" && value !== "0";
+}
 function isPhraseMarked(element) {
   return PHRASE_MARKER_ATTRS.some((attr) => {
     if (!element.hasAttribute(attr)) return false;
-    const value = (element.getAttribute(attr) ?? "").toLowerCase();
+    const value = (element.getAttribute(attr) ?? "").trim().toLowerCase();
     return value !== "false" && value !== "0";
   });
 }
@@ -1186,9 +1198,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) => {
@@ -1202,18 +1220,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 (el.getAttribute("translate") === "no") return;
+      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) {
@@ -1221,10 +1239,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;
@@ -1245,7 +1263,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();
@@ -1371,9 +1389,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();
@@ -1395,7 +1419,7 @@ var Translate = class {
     nodes.forEach((node) => {
       if (node?.nodeType === Node.ELEMENT_NODE) {
         const element = node;
-        if (element.getAttribute("translate") === "no") return;
+        if (isTranslationExcluded(element)) return;
         if (isPhraseMarked(element)) return;
         this.translateAttributes(node);
       }
@@ -1637,6 +1661,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, 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