@form-engine-ts/react 4.7.0 → 4.8.0

package/README.md

@@ -81,7 +81,10 @@ schema-driven pre-submit confirmation controls in the builder.
 
 `useTranslationWorkspace` validates added locales against `policy.allowedLocales` and `policy.maxLocales` and returns
 a structured `{ success, error }` result from `addLocale`. Built-in BCP 47, duplicate, and policy checks always run
-before the optional `validateLocale` callback, which receives the locale, default locale, current locales, and policy.
+before the optional `validateLocale` callback, which receives the canonical locale and a plain context object containing
+the canonical default locale, current locales, and policy.
+Locale input is normalized to its canonical BCP 47 form before duplicate, policy, custom-validation, and schema updates;
+underscore-separated values such as `EN_us` are accepted as compatibility input.
 Use `isAddLocaleAllowed` to disable locale controls before submission. Removing a locale also clears its
 localized values and metadata; the default locale remains protected.
 

package/dist/index.cjs

@@ -3282,20 +3282,9 @@ function asAsyncAdapter(adapter) {
     )
   };
 }
-function isValidBcp47Locale(locale) {
-  const language = locale.split("-")[0];
-  if (language === void 0 || !/^[a-z]{2,3}$/iu.test(language)) return false;
-  try {
-    Intl.getCanonicalLocales(locale);
-    return true;
-  } catch {
-    return false;
-  }
-}
 var validateLocalePipeline = (locale, schema, policy, customValidator) => {
-  const currentLocales = schema.supportedLocales ?? [];
-  const defaultLocale = schema.defaultLocale ?? "";
-  if (!isValidBcp47Locale(locale)) {
+  const canonicalLocale = (0, import_core4.normalizeLocale)(locale);
+  if (canonicalLocale === null) {
     return {
       valid: false,
       error: {
@@ -3304,21 +3293,23 @@ var validateLocalePipeline = (locale, schema, policy, customValidator) => {
       }
     };
   }
-  if (locale === defaultLocale || currentLocales.includes(locale)) {
+  const currentLocales = (schema.supportedLocales ?? []).map((candidate) => (0, import_core4.normalizeLocale)(candidate) ?? candidate);
+  const defaultLocale = schema.defaultLocale === void 0 ? "" : (0, import_core4.normalizeLocale)(schema.defaultLocale) ?? schema.defaultLocale;
+  if (canonicalLocale === defaultLocale || currentLocales.includes(canonicalLocale)) {
     return {
       valid: false,
       error: {
         type: "locale_already_exists",
-        message: `Locale "${locale}" is already registered.`
+        message: `Locale "${canonicalLocale}" is already registered.`
       }
     };
   }
-  if (policy?.allowedLocales !== void 0 && !policy.allowedLocales.includes(locale)) {
+  if (policy?.allowedLocales !== void 0 && !policy.allowedLocales.some((candidate) => (0, import_core4.normalizeLocale)(candidate) === canonicalLocale)) {
     return {
       valid: false,
       error: {
         type: "locale_not_allowed",
-        message: `Locale "${locale}" is not allowed by policy.`
+        message: `Locale "${canonicalLocale}" is not allowed by policy.`
       }
     };
   }
@@ -3333,8 +3324,13 @@ var validateLocalePipeline = (locale, schema, policy, customValidator) => {
     };
   }
   if (customValidator !== void 0) {
-    const customContext = policy === void 0 ? Object.assign([...currentLocales], { locale, defaultLocale, currentLocales }) : Object.assign([...currentLocales], { locale, defaultLocale, currentLocales, policy });
-    const customResult = customValidator(locale, customContext);
+    const context = {
+      locale: canonicalLocale,
+      defaultLocale,
+      currentLocales: Object.freeze([...currentLocales]),
+      ...policy === void 0 ? {} : { policy }
+    };
+    const customResult = Reflect.apply(customValidator, void 0, [canonicalLocale, context]);
     if (customResult === false) {
       return {
         valid: false,
@@ -3487,7 +3483,13 @@ function useTranslationWorkspace({
   const addLocale = (0, import_react4.useCallback)(
     (locale) => {
       if (readOnly) return { success: false, error: "Workspace is read-only." };
-      const normalized = locale.trim();
+      const normalized = (0, import_core4.normalizeLocale)(locale);
+      if (normalized === null) {
+        return {
+          success: false,
+          error: workspaceLocaleValidationMessage(validateLocalePipeline(locale, currentSchema, policy, validateLocale))
+        };
+      }
       const validation = validateLocalePipeline(normalized, currentSchema, policy, validateLocale);
       if (!validation.valid) return { success: false, error: workspaceLocaleValidationMessage(validation) };
       commit({
@@ -3502,7 +3504,8 @@ function useTranslationWorkspace({
   const isAddLocaleAllowed = (0, import_react4.useCallback)(
     (locale) => {
       if (readOnly) return false;
-      const normalized = locale.trim();
+      const normalized = (0, import_core4.normalizeLocale)(locale);
+      if (normalized === null) return false;
       return validateLocalePipeline(normalized, currentSchema, policy, validateLocale).valid;
     },
     [currentSchema, policy, readOnly, validateLocale]

package/dist/index.js

@@ -3238,6 +3238,7 @@ import {
   collectSchemaLocales as collectSchemaLocales2,
   collectTranslationSlots,
   computeSourceTextHash,
+  normalizeLocale,
   populateSchemaTranslations as populateSchemaTranslations2,
   removeLocaleFromSchema
 } from "@form-engine-ts/core";
@@ -3257,20 +3258,9 @@ function asAsyncAdapter(adapter) {
     )
   };
 }
-function isValidBcp47Locale(locale) {
-  const language = locale.split("-")[0];
-  if (language === void 0 || !/^[a-z]{2,3}$/iu.test(language)) return false;
-  try {
-    Intl.getCanonicalLocales(locale);
-    return true;
-  } catch {
-    return false;
-  }
-}
 var validateLocalePipeline = (locale, schema, policy, customValidator) => {
-  const currentLocales = schema.supportedLocales ?? [];
-  const defaultLocale = schema.defaultLocale ?? "";
-  if (!isValidBcp47Locale(locale)) {
+  const canonicalLocale = normalizeLocale(locale);
+  if (canonicalLocale === null) {
     return {
       valid: false,
       error: {
@@ -3279,21 +3269,23 @@ var validateLocalePipeline = (locale, schema, policy, customValidator) => {
       }
     };
   }
-  if (locale === defaultLocale || currentLocales.includes(locale)) {
+  const currentLocales = (schema.supportedLocales ?? []).map((candidate) => normalizeLocale(candidate) ?? candidate);
+  const defaultLocale = schema.defaultLocale === void 0 ? "" : normalizeLocale(schema.defaultLocale) ?? schema.defaultLocale;
+  if (canonicalLocale === defaultLocale || currentLocales.includes(canonicalLocale)) {
     return {
       valid: false,
       error: {
         type: "locale_already_exists",
-        message: `Locale "${locale}" is already registered.`
+        message: `Locale "${canonicalLocale}" is already registered.`
       }
     };
   }
-  if (policy?.allowedLocales !== void 0 && !policy.allowedLocales.includes(locale)) {
+  if (policy?.allowedLocales !== void 0 && !policy.allowedLocales.some((candidate) => normalizeLocale(candidate) === canonicalLocale)) {
     return {
       valid: false,
       error: {
         type: "locale_not_allowed",
-        message: `Locale "${locale}" is not allowed by policy.`
+        message: `Locale "${canonicalLocale}" is not allowed by policy.`
       }
     };
   }
@@ -3308,8 +3300,13 @@ var validateLocalePipeline = (locale, schema, policy, customValidator) => {
     };
   }
   if (customValidator !== void 0) {
-    const customContext = policy === void 0 ? Object.assign([...currentLocales], { locale, defaultLocale, currentLocales }) : Object.assign([...currentLocales], { locale, defaultLocale, currentLocales, policy });
-    const customResult = customValidator(locale, customContext);
+    const context = {
+      locale: canonicalLocale,
+      defaultLocale,
+      currentLocales: Object.freeze([...currentLocales]),
+      ...policy === void 0 ? {} : { policy }
+    };
+    const customResult = Reflect.apply(customValidator, void 0, [canonicalLocale, context]);
     if (customResult === false) {
       return {
         valid: false,
@@ -3462,7 +3459,13 @@ function useTranslationWorkspace({
   const addLocale = useCallback3(
     (locale) => {
       if (readOnly) return { success: false, error: "Workspace is read-only." };
-      const normalized = locale.trim();
+      const normalized = normalizeLocale(locale);
+      if (normalized === null) {
+        return {
+          success: false,
+          error: workspaceLocaleValidationMessage(validateLocalePipeline(locale, currentSchema, policy, validateLocale))
+        };
+      }
       const validation = validateLocalePipeline(normalized, currentSchema, policy, validateLocale);
       if (!validation.valid) return { success: false, error: workspaceLocaleValidationMessage(validation) };
       commit({
@@ -3477,7 +3480,8 @@ function useTranslationWorkspace({
   const isAddLocaleAllowed = useCallback3(
     (locale) => {
       if (readOnly) return false;
-      const normalized = locale.trim();
+      const normalized = normalizeLocale(locale);
+      if (normalized === null) return false;
       return validateLocalePipeline(normalized, currentSchema, policy, validateLocale).valid;
     },
     [currentSchema, policy, readOnly, validateLocale]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@form-engine-ts/react",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "publishConfig": {
     "access": "public"
   },
@@ -42,8 +42,8 @@
     "typescript"
   ],
   "dependencies": {
-    "@form-engine-ts/core": "4.7.0",
-    "@form-engine-ts/privacy": "4.7.0"
+    "@form-engine-ts/privacy": "4.8.0",
+    "@form-engine-ts/core": "4.8.0"
   },
   "peerDependencies": {
     "react": ">=18.2 <20",