inlang-plugin-rich-icu 0.1.0 → 0.1.3

package/README.md

@@ -27,14 +27,14 @@ as a dependency. Add it to your `project.inlang/settings.json`:
 Catalogs are JSON maps of `key → ICU string`, one file per locale:
 
 ```json
-{ "resumeCount": "{count, plural, one {Vous avez <strong># CV</strong>.} other {Vous avez <strong># CV</strong>.}}" }
+{ "messageCount": "{count, plural, one {Vous avez <strong># nouveau message</strong>.} other {Vous avez <strong># nouveaux messages</strong>.}}" }
 ```
 
 ## Render (Paraglide + React)
 
 ```tsx
 <ParaglideMessage
-  message={m.resumeCount}
+  message={m.messageCount}
   inputs={{ count }}
   markup={{ strong: ({ children }) => <strong>{children}</strong> }}
 />
@@ -71,7 +71,7 @@ Other notes:
 
 - `@inlang/sdk` 2.10.2
 - `@formatjs/icu-messageformat-parser` ^2
-- Parité d'AST vérifiée contre `@inlang/plugin-icu1` 1.1.0 (corpus sans markup)
+- AST parity verified against `@inlang/plugin-icu1` 1.1.0 (markup-free corpus)
 
 ## Development
 

package/dist/index.js

@@ -4366,8 +4366,16 @@ function markupPartToTag(part) {
   }
 }
 
+// src/order-cases.ts
+function orderCaseKeys(keys, isExact2) {
+  const exacts = keys.filter(isExact2);
+  const cldr = keys.filter((k) => !isExact2(k) && k !== "other");
+  const other = keys.includes("other") ? ["other"] : [];
+  return [...exacts, ...cldr, ...other];
+}
+
 // src/parse.ts
-var SELF_CLOSE_MARK = "\uE000";
+var SELF_CLOSE_MARK = String.fromCodePoint(57344);
 var SELF_CLOSE_RE = /<([\w][\w-]*)\s*\/>/y;
 function normalizeSelfClosingTags(source) {
   let out = "";
@@ -4466,7 +4474,7 @@ function extendVariant(v, el, ctx, poundArg) {
   if (el.type === TYPE.plural || el.type === TYPE.select) {
     const sel = registerSelector(el, ctx);
     const out = [];
-    for (const caseKey of orderCases(el)) {
+    for (const caseKey of orderCaseKeys(Object.keys(el.options), isExact)) {
       const childPound = el.type === TYPE.plural ? el.value : poundArg;
       const caseMatches = sel.matchesFor(caseKey);
       for (const cv of expand(el.options[caseKey].value, ctx, childPound)) {
@@ -4499,13 +4507,6 @@ function isSelfClosing(children) {
   return children.length === 1 && children[0].type === TYPE.literal && // biome-ignore lint/suspicious/noExplicitAny: FormatJS literal carries .value
   children[0].value === SELF_CLOSE_MARK;
 }
-function orderCases(el) {
-  const keys = Object.keys(el.options);
-  const exacts = keys.filter(isExact);
-  const cldr = keys.filter((k) => !isExact(k) && k !== "other");
-  const other = keys.includes("other") ? ["other"] : [];
-  return [...exacts, ...cldr, ...other];
-}
 function registerSelector(el, ctx) {
   const arg = el.value;
   if (el.type === TYPE.select) {
@@ -4586,7 +4587,7 @@ function mapSimple(el, ctx, poundArg) {
       ];
     }
     default:
-      throw new Error(`Type ICU non support\xE9 : ${el.type}`);
+      throw new Error(`Unsupported ICU element type: ${el.type}`);
   }
 }
 
@@ -4596,7 +4597,7 @@ function bundleToMessageString(args) {
   if (variants.length === 0) return "";
   if (message.selectors.length === 0) return patternToString(variants[0].pattern, false);
   const icuSelectors = resolveIcuSelectors(message, bundle);
-  return reconstruct(icuSelectors, variants);
+  return reconstruct(icuSelectors, variants, false);
 }
 function declMap(bundle) {
   return new Map(bundle.declarations.map((d) => [d.name, d]));
@@ -4609,11 +4610,11 @@ function resolveIcuSelectors(message, bundle) {
   function resolvePlural(pluralDecl, pluralKey, exactKey) {
     const arg = pluralDecl.value.arg.name;
     const ordinal = pluralDecl.value.annotation.options?.some(
-      // biome-ignore lint/suspicious/noExplicitAny: AST inlang dynamique
+      // biome-ignore lint/suspicious/noExplicitAny: dynamic inlang AST
       (o) => o.name === "type" && o.value.value === "ordinal"
     );
     const offset = Number(
-      // biome-ignore lint/suspicious/noExplicitAny: AST inlang dynamique
+      // biome-ignore lint/suspicious/noExplicitAny: dynamic inlang AST
       pluralDecl.value.annotation.options?.find((o) => o.name === "offset")?.value.value ?? 0
     );
     out.push({ arg, kind: ordinal ? "selectordinal" : "plural", offset, pluralKey, exactKey });
@@ -4661,16 +4662,9 @@ function caseFor(sel, matches) {
   const plural = matches.find((x) => x.key === sel.pluralKey);
   return plural?.type === "literal-match" ? plural.value : "other";
 }
-function orderIcuCases(keys) {
-  const isEx = (k) => k.startsWith("=");
-  const exacts = keys.filter(isEx);
-  const cldr = keys.filter((k) => !isEx(k) && k !== "other");
-  const other = keys.includes("other") ? ["other"] : [];
-  return [...exacts, ...cldr, ...other];
-}
-function reconstruct(selectors, variants) {
+function reconstruct(selectors, variants, ancestorInPlural) {
   const [sel, ...rest] = selectors;
-  const inPlural = sel.kind !== "select";
+  const inPlural = ancestorInPlural || sel.kind !== "select";
   const groups = /* @__PURE__ */ new Map();
   for (const v of variants) {
     const c = caseFor(sel, v.matches);
@@ -4683,9 +4677,9 @@ function reconstruct(selectors, variants) {
   }
   const offsetStr = sel.offset ? `offset:${sel.offset} ` : "";
   const head = `${sel.arg}, ${sel.kind}, ${offsetStr}`;
-  const body = orderIcuCases([...groups.keys()]).map((c) => {
+  const body = orderCaseKeys([...groups.keys()], (k) => k.startsWith("=")).map((c) => {
     const grp = groups.get(c) ?? [];
-    const inner = rest.length === 0 ? patternToString(grp[0].pattern, inPlural) : reconstruct(rest, grp);
+    const inner = rest.length === 0 ? patternToString(grp[0].pattern, inPlural) : reconstruct(rest, grp, inPlural);
     return `${c} {${inner}}`;
   }).join(" ");
   return `{${head}${body}}`;
@@ -4703,7 +4697,7 @@ function patternToString(pattern, inPlural) {
       case "markup-standalone":
         return markupPartToTag(p);
       default:
-        throw new Error(`part inconnue: ${p.type}`);
+        throw new Error(`Unknown pattern part: ${p.type}`);
     }
   }).join("");
 }
@@ -4758,7 +4752,7 @@ var richIcuPlugin = {
         json = JSON.parse(decoder.decode(file.content));
       } catch (err) {
         console.warn(
-          `${LOG_PREFIX} JSON invalide pour la locale "${file.locale}", fichier ignor\xE9 : ${err.message}`
+          `${LOG_PREFIX} invalid JSON for locale "${file.locale}", file skipped: ${err.message}`
         );
         continue;
       }
@@ -4766,7 +4760,7 @@ var richIcuPlugin = {
         if (key === "$schema") continue;
         if (typeof value !== "string") {
           console.warn(
-            `${LOG_PREFIX} valeur non-string ignor\xE9e pour "${key}" (locale "${file.locale}")`
+            `${LOG_PREFIX} non-string value skipped for "${key}" (locale "${file.locale}")`
           );
           continue;
         }
@@ -4775,7 +4769,7 @@ var richIcuPlugin = {
           imported = messageToImport({ source: value, bundleId: key, locale: file.locale });
         } catch (err) {
           console.warn(
-            `${LOG_PREFIX} ICU invalide pour "${key}" (locale "${file.locale}"), message ignor\xE9 : ${err.message}`
+            `${LOG_PREFIX} invalid ICU for "${key}" (locale "${file.locale}"), message skipped: ${err.message}`
           );
           continue;
         }
@@ -4806,7 +4800,7 @@ var richIcuPlugin = {
     const s = settings;
     const bundleById = new Map(bundles.map((b) => [b.id, b]));
     const variantsByMsg = /* @__PURE__ */ new Map();
-    const keyOf = (v) => v.messageId != null ? `id:${v.messageId}` : `bl:${v.messageBundleId}\0${v.messageLocale}`;
+    const keyOf = (v) => v.messageId != null ? `id:${v.messageId}` : `bl:${v.messageBundleId} ${v.messageLocale}`;
     for (const v of variants) {
       const k = keyOf(v);
       const arr = variantsByMsg.get(k);
@@ -4817,20 +4811,26 @@ var richIcuPlugin = {
     for (const message of messages) {
       const bundle = bundleById.get(message.bundleId);
       if (!bundle) continue;
-      const vs = (message.id != null ? variantsByMsg.get(`id:${message.id}`) : void 0) ?? variantsByMsg.get(`bl:${message.bundleId}\0${message.locale}`) ?? [];
+      const vs = (message.id != null ? variantsByMsg.get(`id:${message.id}`) : void 0) ?? variantsByMsg.get(`bl:${message.bundleId} ${message.locale}`) ?? [];
       if (vs.length === 0) continue;
+      let serialized;
+      try {
+        serialized = bundleToMessageString({ bundle, message, variants: vs });
+      } catch (err) {
+        console.warn(
+          `${LOG_PREFIX} failed to export "${message.bundleId}" (locale "${message.locale}"), message skipped: ${err.message}`
+        );
+        continue;
+      }
       if (!byLocale[message.locale]) byLocale[message.locale] = {};
-      byLocale[message.locale][message.bundleId] = bundleToMessageString({
-        bundle,
-        message,
-        variants: vs
-      });
+      byLocale[message.locale][message.bundleId] = serialized;
     }
     const pattern = pathPattern(s);
+    const encoder = new TextEncoder();
     return Object.entries(byLocale).map(([locale, map]) => ({
       locale,
       name: pattern.replace("{locale}", locale).split("/").at(-1) ?? locale,
-      content: new TextEncoder().encode(`${JSON.stringify(map, null, "	")}
+      content: encoder.encode(`${JSON.stringify(map, null, "	")}
 `)
     }));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inlang-plugin-rich-icu",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "inlang storage plugin: inline ICU MessageFormat with rich-text markup tags preserved as first-class inlang markup parts.",
   "type": "module",
   "exports": {