@strato-admin/i18n 0.1.0 → 0.3.0

package/dist/formatter.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Pretty-prints an ICU message for better readability in translation files.
+ * Uses newlines and indentation for nested structures.
+ */
+export declare function prettyPrintICU(msg: string): string;
+/**
+ * Canonicalizes an ICU message using the official printer and normalization.
+ * This ensures consistent spacing and a single-line format for hashing and compilation.
+ */
+export declare function canonicalizeMessage(msg: string): string;

package/dist/formatter.js

@@ -0,0 +1,58 @@
+import { parse, isPluralElement, isSelectElement, isTagElement, isLiteralElement, isPoundElement, } from '@formatjs/icu-messageformat-parser';
+import { printAST } from '@formatjs/icu-messageformat-parser/printer.js';
+import { normalizeMessage } from './hash';
+/**
+ * Pretty-prints an ICU message for better readability in translation files.
+ * Uses newlines and indentation for nested structures.
+ */
+export function prettyPrintICU(msg) {
+    try {
+        const ast = parse(msg);
+        return printElement(ast, 0).trim();
+    }
+    catch (e) {
+        return msg.trim();
+    }
+}
+function printElement(elements, indent) {
+    const padding = '  '.repeat(indent);
+    let result = '';
+    elements.forEach((el) => {
+        if (isLiteralElement(el)) {
+            result += el.value;
+        }
+        else if (isPluralElement(el) || isSelectElement(el)) {
+            const type = isPluralElement(el) ? 'plural' : 'select';
+            result += `{${el.value}, ${type},\n`;
+            const options = Object.entries(el.options);
+            options.forEach(([key, opt], _) => {
+                result += `${padding}  ${key} {${printElement(opt.value, indent + 2)}}\n`;
+            });
+            result += `${padding}}`;
+        }
+        else if (isTagElement(el)) {
+            result += `<${el.value}>${printElement(el.children, indent)}</${el.value}>`;
+        }
+        else if (isPoundElement(el)) {
+            result += '#';
+        }
+        else {
+            // For arguments like {name}
+            result += `{${el.value || ''}}`;
+        }
+    });
+    return result;
+}
+/**
+ * Canonicalizes an ICU message using the official printer and normalization.
+ * This ensures consistent spacing and a single-line format for hashing and compilation.
+ */
+export function canonicalizeMessage(msg) {
+    try {
+        const ast = parse(msg);
+        return normalizeMessage(printAST(ast));
+    }
+    catch (e) {
+        return normalizeMessage(msg);
+    }
+}

package/dist/hash.d.ts

@@ -3,3 +3,8 @@
  * This is lightweight and works identically in Node and the Browser.
  */
 export declare function generateMessageId(msg: string): string;
+/**
+ * Normalizes a message string by collapsing multiple whitespaces and newlines.
+ * This ensures that formatting changes in the source code do not change the message ID.
+ */
+export declare function normalizeMessage(msg: string): string;

package/dist/hash.js

@@ -3,12 +3,20 @@
  * This is lightweight and works identically in Node and the Browser.
  */
 export function generateMessageId(msg) {
+    const normalized = normalizeMessage(msg);
     let hash = 0x811c9dc5;
-    for (let i = 0; i < msg.length; i++) {
-        hash ^= msg.charCodeAt(i);
+    for (let i = 0; i < normalized.length; i++) {
+        hash ^= normalized.charCodeAt(i);
         // FNV-1a prime multiplication (hash * 16777619)
         hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
     }
     // Convert to a base36 string for a compact, stable ID
     return (hash >>> 0).toString(36);
 }
+/**
+ * Normalizes a message string by collapsing multiple whitespaces and newlines.
+ * This ensures that formatting changes in the source code do not change the message ID.
+ */
+export function normalizeMessage(msg) {
+    return msg.replace(/\s+/g, ' ').trim();
+}

package/dist/icuI18nProvider.d.ts

@@ -1,2 +1,2 @@
-import type { I18nProvider } from '@strato-admin/core';
+import type { I18nProvider } from '@strato-admin/ra-core';
 export declare const icuI18nProvider: (getMessages: (locale: string) => any | Promise<any>, initialLocale?: string, availableLocales?: any[]) => I18nProvider;

package/dist/icuI18nProvider.js

@@ -33,7 +33,15 @@ export const icuI18nProvider = (getMessages, initialLocale = 'en', availableLoca
             // 2. Lookup by hash first, then fall back to literal key (for ra.* keys)
             const message = messages[msgid] || messages[finalKey];
             if (message === undefined) {
-                return defaultMessage !== undefined ? defaultMessage : finalKey;
+                if (defaultMessage === undefined)
+                    return finalKey;
+                try {
+                    const formatter = new IntlMessageFormat(defaultMessage, locale);
+                    return formatter.format(values);
+                }
+                catch {
+                    return defaultMessage;
+                }
             }
             if (typeof message !== 'string') {
                 return finalKey;

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './icuI18nProvider';
 export * from './hash';
+export * from './formatter';

package/dist/index.js

@@ -1,2 +1,3 @@
 export * from './icuI18nProvider';
 export * from './hash';
+export * from './formatter';

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@strato-admin/i18n",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Strato Admin I18n - ICU i18nProvider for React Admin / Strato Admin",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "default": "dist/index.js"
+      "development": "./src/index.ts",
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -30,20 +31,21 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vgrits/strato-admin.git",
+    "url": "https://github.com/vadimgu/strato-admin.git",
     "directory": "packages/strato-i18n"
   },
   "peerDependencies": {
-    "@strato-admin/core": "0.1.0"
+    "@strato-admin/core": "0.3.0"
   },
   "dependencies": {
+    "@formatjs/icu-messageformat-parser": "^3.5.3",
     "intl-messageformat": "^11.1.2"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",
     "typescript": "^5.9.3",
     "vitest": "^3.0.7",
-    "@strato-admin/ra-core": "^0.1.0"
+    "@strato-admin/ra-core": "^0.3.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

package/src/formatter.ts

@@ -0,0 +1,65 @@
+import {
+  parse,
+  MessageFormatElement,
+  isPluralElement,
+  isSelectElement,
+  isTagElement,
+  isLiteralElement,
+  isPoundElement,
+} from '@formatjs/icu-messageformat-parser';
+import { printAST } from '@formatjs/icu-messageformat-parser/printer.js';
+import { normalizeMessage } from './hash';
+
+/**
+ * Pretty-prints an ICU message for better readability in translation files.
+ * Uses newlines and indentation for nested structures.
+ */
+export function prettyPrintICU(msg: string): string {
+  try {
+    const ast = parse(msg);
+    return printElement(ast, 0).trim();
+  } catch (e) {
+    return msg.trim();
+  }
+}
+
+function printElement(elements: MessageFormatElement[], indent: number): string {
+  const padding = '  '.repeat(indent);
+  let result = '';
+
+  elements.forEach((el) => {
+    if (isLiteralElement(el)) {
+      result += el.value;
+    } else if (isPluralElement(el) || isSelectElement(el)) {
+      const type = isPluralElement(el) ? 'plural' : 'select';
+      result += `{${el.value}, ${type},\n`;
+      const options = Object.entries(el.options);
+      options.forEach(([key, opt], _) => {
+        result += `${padding}  ${key} {${printElement(opt.value, indent + 2)}}\n`;
+      });
+      result += `${padding}}`;
+    } else if (isTagElement(el)) {
+      result += `<${el.value}>${printElement(el.children, indent)}</${el.value}>`;
+    } else if (isPoundElement(el)) {
+      result += '#';
+    } else {
+      // For arguments like {name}
+      result += `{${(el as any).value || ''}}`;
+    }
+  });
+
+  return result;
+}
+
+/**
+ * Canonicalizes an ICU message using the official printer and normalization.
+ * This ensures consistent spacing and a single-line format for hashing and compilation.
+ */
+export function canonicalizeMessage(msg: string): string {
+  try {
+    const ast = parse(msg);
+    return normalizeMessage(printAST(ast));
+  } catch (e) {
+    return normalizeMessage(msg);
+  }
+}

package/src/hash.ts

@@ -3,12 +3,21 @@
  * This is lightweight and works identically in Node and the Browser.
  */
 export function generateMessageId(msg: string): string {
+  const normalized = normalizeMessage(msg);
   let hash = 0x811c9dc5;
-  for (let i = 0; i < msg.length; i++) {
-    hash ^= msg.charCodeAt(i);
+  for (let i = 0; i < normalized.length; i++) {
+    hash ^= normalized.charCodeAt(i);
     // FNV-1a prime multiplication (hash * 16777619)
     hash += (hash << 1) + (hash << 4) + (hash << 7) + (hash << 8) + (hash << 24);
   }
   // Convert to a base36 string for a compact, stable ID
   return (hash >>> 0).toString(36);
 }
+
+/**
+ * Normalizes a message string by collapsing multiple whitespaces and newlines.
+ * This ensures that formatting changes in the source code do not change the message ID.
+ */
+export function normalizeMessage(msg: string): string {
+  return msg.replace(/\s+/g, ' ').trim();
+}

package/src/icuI18nProvider.ts

@@ -1,5 +1,5 @@
 import { IntlMessageFormat } from 'intl-messageformat';
-import type { I18nProvider, TranslationMessages } from '@strato-admin/core';
+import type { I18nProvider } from '@strato-admin/ra-core';
 import { generateMessageId } from './hash';
 
 export const icuI18nProvider = (
@@ -41,12 +41,18 @@ export const icuI18nProvider = (
 
       // 1. Generate the hash ID for the English key
       const msgid = generateMessageId(finalKey);
-      
+
       // 2. Lookup by hash first, then fall back to literal key (for ra.* keys)
       const message = (messages as any)[msgid] || (messages as any)[finalKey];
 
       if (message === undefined) {
-        return defaultMessage !== undefined ? defaultMessage : finalKey;
+        if (defaultMessage === undefined) return finalKey;
+        try {
+          const formatter = new IntlMessageFormat(defaultMessage, locale);
+          return formatter.format(values) as string;
+        } catch {
+          return defaultMessage;
+        }
       }
 
       if (typeof message !== 'string') {

package/src/index.ts

@@ -1,2 +1,3 @@
 export * from './icuI18nProvider';
 export * from './hash';
+export * from './formatter';