langsys-js-typescript 0.6.3 → 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();