i18next-cli 1.52.0 → 1.52.1

package/dist/cjs/cli.js

@@ -31,7 +31,7 @@ const program = new commander.Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.52.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.52.1'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/cjs/extractor/core/translation-manager.js

@@ -210,8 +210,9 @@ function sortObject(obj, config, customSort) {
  * A helper function to build a new translation object for a single namespace.
  * This centralizes the core logic of merging keys.
  */
-function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, namespace, preservePatterns = [], objectKeys = new Set(), syncPrimaryWithDefaults = false, syncAll = false, trustDerivedDefaults = false, logger$1 = new logger.ConsoleLogger()) {
-    const { keySeparator = '.', sort = true, removeUnusedKeys = true, primaryLanguage, defaultValue: emptyDefaultValue = '', pluralSeparator = '_', contextSeparator = '_', preserveContextVariants = false, } = config.extract;
+function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, namespace, preservePatterns = [], objectKeys = new Set(), syncPrimaryWithDefaults = false, syncAll = false, trustDerivedDefaults = false, primaryExistingTranslations = {}, logger$1 = new logger.ConsoleLogger()) {
+    const { keySeparator = '.', sort = true, removeUnusedKeys = true, defaultValue: emptyDefaultValue = '', pluralSeparator = '_', contextSeparator = '_', preserveContextVariants = false, } = config.extract;
+    const primaryLanguage = config.extract.primaryLanguage || config.locales[0] || 'en';
     const nsSep = typeof config.extract.nsSeparator === 'string' ? config.extract.nsSeparator : ':';
     // Keep the raw configured defaultValue so we can distinguish:
     // - "not provided" (undefined) vs
@@ -621,17 +622,24 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             }
         }
         const existingValue = nestedObject.getNestedValue(existingTranslations, key, separator);
+        const primaryExistingValue = locale === primaryLanguage
+            ? existingValue
+            : nestedObject.getNestedValue(primaryExistingTranslations, key, separator);
         // When keySeparator === false we are working with flat keys (no nesting).
         // Avoid concatenating false into strings (``${key}${false}`` => "keyfalse") which breaks the startsWith check.
         // For flat keys there cannot be nested children, so treat them as leaves.
         const isLeafInNewKeys = keySeparator === false
             ? true
             : !filteredKeys.some(otherKey => otherKey.key !== key && otherKey.key.startsWith(`${key}${keySeparator}`));
+        const isDerivedDefault = isDerivedFromKey(key, defaultValue$1, explicitDefault);
         // Determine if we should preserve an existing object
         const shouldPreserveObject = typeof existingValue === 'object' && existingValue !== null && (objectKeys.has(key) || // Explicit returnObjects
             !defaultValue$1 || defaultValue$1 === key // No explicit default or default equals key
         );
         const isStaleObject = typeof existingValue === 'object' && existingValue !== null && isLeafInNewKeys && !objectKeys.has(key) && !shouldPreserveObject;
+        const primaryShouldPreserveObject = typeof primaryExistingValue === 'object' && primaryExistingValue !== null && (objectKeys.has(key) ||
+            !defaultValue$1 || defaultValue$1 === key);
+        const primaryIsStaleObject = typeof primaryExistingValue === 'object' && primaryExistingValue !== null && isLeafInNewKeys && !objectKeys.has(key) && !primaryShouldPreserveObject;
         // Special handling for existing objects that should be preserved
         if (shouldPreserveObject) {
             nestedObject.setNestedValue(newTranslations, key, existingValue, separator);
@@ -641,8 +649,6 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         if (existingValue === undefined || isStaleObject) {
             if (locale === primaryLanguage) {
                 if (syncPrimaryWithDefaults) {
-                    // use the unified "derived" detector (includes keyPrefix suffixes).
-                    const isDerivedDefault = isDerivedFromKey(key, defaultValue$1, explicitDefault);
                     valueToSet =
                         (defaultValue$1 && (!isDerivedDefault || trustDerivedDefaults))
                             ? defaultValue$1
@@ -651,8 +657,7 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                 else {
                     // If there's no real code-provided default (defaultValue is derived fallback),
                     // use the configured extract.defaultValue for PRIMARY language too.
-                    const derived = isDerivedFromKey(key, defaultValue$1, explicitDefault);
-                    if (derived && configuredDefaultValue !== undefined) {
+                    if (isDerivedDefault && configuredDefaultValue !== undefined) {
                         valueToSet = defaultValue.resolveDefaultValue(configuredDefaultValue, key, namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue$1);
                     }
                     else {
@@ -668,8 +673,6 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         else {
             // Existing value exists - decide whether to preserve, sync primary, or clear other locales when requested
             if (locale === primaryLanguage && syncPrimaryWithDefaults) {
-                // Reuse the same derived-default detection as the initial write path so reruns stay idempotent.
-                const isDerivedDefault = isDerivedFromKey(key, defaultValue$1, explicitDefault);
                 // If this key looks like a plural/context variant and the default
                 // wasn't explicitly provided in source code, preserve the existing value.
                 const isVariantKey = key.includes(pluralSeparator) || key.includes(contextSeparator);
@@ -685,7 +688,18 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             }
             else {
                 // Non-primary locale behavior
-                const syncDerivedDefault = Boolean(trustDerivedDefaults && defaultValue$1 && isDerivedFromKey(key, defaultValue$1, explicitDefault));
+                const isVariantKey = key.includes(pluralSeparator) || key.includes(contextSeparator);
+                const syncDerivedDefault = Boolean(syncAll &&
+                    locale !== primaryLanguage &&
+                    syncPrimaryWithDefaults &&
+                    trustDerivedDefaults &&
+                    defaultValue$1 &&
+                    isDerivedDefault &&
+                    !primaryShouldPreserveObject &&
+                    (primaryExistingValue === undefined ||
+                        primaryIsStaleObject ||
+                        ((!isVariantKey || explicitDefault) &&
+                            primaryExistingValue !== defaultValue.resolveDefaultValue(defaultValue$1, key, namespace || config?.extract?.defaultNS || 'translation', primaryLanguage, defaultValue$1))));
                 if (syncAll && locale !== primaryLanguage && (explicitDefault || syncDerivedDefault)) {
                     // When syncAll is requested, clear (reset) any existing translations for keys
                     // that had explicit defaults in code so the primary default can be propagated
@@ -841,7 +855,8 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
  */
 async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaults = false, syncAll = false, trustDerivedDefaults = false, logger: logger$1 = new logger.ConsoleLogger() } = {}) {
     config.extract.primaryLanguage ||= config.locales[0] || 'en';
-    config.extract.secondaryLanguages ||= config.locales.filter((l) => l !== config?.extract?.primaryLanguage);
+    const primaryLanguage = config.extract.primaryLanguage || config.locales[0] || 'en';
+    config.extract.secondaryLanguages ||= config.locales.filter((l) => l !== primaryLanguage);
     const patternsToPreserve = [...(config.extract.preservePatterns || [])];
     const indentation = config.extract.indentation ?? 2;
     for (const key of objectKeys) {
@@ -885,6 +900,10 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
             const outputPath = fileUtils.getOutputPath(config.extract.output, locale);
             const fullPath = node_path.resolve(process.cwd(), outputPath);
             const existingMergedFile = await fileUtils.loadTranslationFile(fullPath) || {};
+            const primaryMergedPath = node_path.resolve(process.cwd(), fileUtils.getOutputPath(config.extract.output, primaryLanguage));
+            const primaryMergedFile = locale === primaryLanguage
+                ? existingMergedFile
+                : (await fileUtils.loadTranslationFile(primaryMergedPath) || {});
             // Determine whether the existing merged file already uses namespace objects
             // or is a flat mapping of translation keys -> values.
             // If it's flat (values are primitives), we must NOT treat each translation key as a namespace.
@@ -920,12 +939,13 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
                 const nsKeys = keysByNS.get(nsKey) || [];
                 if (isTopLevel(nsKey)) {
                     // keys without namespace -> merged into top-level of the merged file
-                    const built = buildNewTranslationsForNs(nsKeys, existingMergedFile, config, locale, undefined, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, logger$1);
+                    const built = buildNewTranslationsForNs(nsKeys, existingMergedFile, config, locale, undefined, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, primaryMergedFile, logger$1);
                     Object.assign(newMergedTranslations, built);
                 }
                 else {
                     const existingTranslations = existingMergedFile[nsKey] || {};
-                    newMergedTranslations[nsKey] = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, nsKey, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, logger$1);
+                    const primaryExistingTranslations = primaryMergedFile[nsKey] || {};
+                    newMergedTranslations[nsKey] = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, nsKey, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, primaryExistingTranslations, logger$1);
                 }
             }
             // Preserve ignored namespaces as-is from the existing merged file
@@ -963,7 +983,11 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
                 const outputPath = fileUtils.getOutputPath(config.extract.output, locale, ns);
                 const fullPath = node_path.resolve(process.cwd(), outputPath);
                 const existingTranslations = await fileUtils.loadTranslationFile(fullPath) || {};
-                const newTranslations = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, ns, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, logger$1);
+                const primaryOutputPath = node_path.resolve(process.cwd(), fileUtils.getOutputPath(config.extract.output, primaryLanguage, ns));
+                const primaryExistingTranslations = locale === primaryLanguage
+                    ? existingTranslations
+                    : (await fileUtils.loadTranslationFile(primaryOutputPath) || {});
+                const newTranslations = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, ns, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, primaryExistingTranslations, logger$1);
                 const oldContent = JSON.stringify(existingTranslations, null, indentation);
                 const newContent = JSON.stringify(newTranslations, null, indentation);
                 // Push one result per namespace file

package/dist/esm/cli.js

@@ -29,7 +29,7 @@ const program = new Command();
 program
     .name('i18next-cli')
     .description('A unified, high-performance i18next CLI.')
-    .version('1.52.0'); // This string is replaced with the actual version at build time by rollup
+    .version('1.52.1'); // This string is replaced with the actual version at build time by rollup
 // new: global config override option
 program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
 program

package/dist/esm/extractor/core/translation-manager.js

@@ -208,8 +208,9 @@ function sortObject(obj, config, customSort) {
  * A helper function to build a new translation object for a single namespace.
  * This centralizes the core logic of merging keys.
  */
-function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, namespace, preservePatterns = [], objectKeys = new Set(), syncPrimaryWithDefaults = false, syncAll = false, trustDerivedDefaults = false, logger = new ConsoleLogger()) {
-    const { keySeparator = '.', sort = true, removeUnusedKeys = true, primaryLanguage, defaultValue: emptyDefaultValue = '', pluralSeparator = '_', contextSeparator = '_', preserveContextVariants = false, } = config.extract;
+function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, namespace, preservePatterns = [], objectKeys = new Set(), syncPrimaryWithDefaults = false, syncAll = false, trustDerivedDefaults = false, primaryExistingTranslations = {}, logger = new ConsoleLogger()) {
+    const { keySeparator = '.', sort = true, removeUnusedKeys = true, defaultValue: emptyDefaultValue = '', pluralSeparator = '_', contextSeparator = '_', preserveContextVariants = false, } = config.extract;
+    const primaryLanguage = config.extract.primaryLanguage || config.locales[0] || 'en';
     const nsSep = typeof config.extract.nsSeparator === 'string' ? config.extract.nsSeparator : ':';
     // Keep the raw configured defaultValue so we can distinguish:
     // - "not provided" (undefined) vs
@@ -619,17 +620,24 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             }
         }
         const existingValue = getNestedValue(existingTranslations, key, separator);
+        const primaryExistingValue = locale === primaryLanguage
+            ? existingValue
+            : getNestedValue(primaryExistingTranslations, key, separator);
         // When keySeparator === false we are working with flat keys (no nesting).
         // Avoid concatenating false into strings (``${key}${false}`` => "keyfalse") which breaks the startsWith check.
         // For flat keys there cannot be nested children, so treat them as leaves.
         const isLeafInNewKeys = keySeparator === false
             ? true
             : !filteredKeys.some(otherKey => otherKey.key !== key && otherKey.key.startsWith(`${key}${keySeparator}`));
+        const isDerivedDefault = isDerivedFromKey(key, defaultValue, explicitDefault);
         // Determine if we should preserve an existing object
         const shouldPreserveObject = typeof existingValue === 'object' && existingValue !== null && (objectKeys.has(key) || // Explicit returnObjects
             !defaultValue || defaultValue === key // No explicit default or default equals key
         );
         const isStaleObject = typeof existingValue === 'object' && existingValue !== null && isLeafInNewKeys && !objectKeys.has(key) && !shouldPreserveObject;
+        const primaryShouldPreserveObject = typeof primaryExistingValue === 'object' && primaryExistingValue !== null && (objectKeys.has(key) ||
+            !defaultValue || defaultValue === key);
+        const primaryIsStaleObject = typeof primaryExistingValue === 'object' && primaryExistingValue !== null && isLeafInNewKeys && !objectKeys.has(key) && !primaryShouldPreserveObject;
         // Special handling for existing objects that should be preserved
         if (shouldPreserveObject) {
             setNestedValue(newTranslations, key, existingValue, separator);
@@ -639,8 +647,6 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         if (existingValue === undefined || isStaleObject) {
             if (locale === primaryLanguage) {
                 if (syncPrimaryWithDefaults) {
-                    // use the unified "derived" detector (includes keyPrefix suffixes).
-                    const isDerivedDefault = isDerivedFromKey(key, defaultValue, explicitDefault);
                     valueToSet =
                         (defaultValue && (!isDerivedDefault || trustDerivedDefaults))
                             ? defaultValue
@@ -649,8 +655,7 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
                 else {
                     // If there's no real code-provided default (defaultValue is derived fallback),
                     // use the configured extract.defaultValue for PRIMARY language too.
-                    const derived = isDerivedFromKey(key, defaultValue, explicitDefault);
-                    if (derived && configuredDefaultValue !== undefined) {
+                    if (isDerivedDefault && configuredDefaultValue !== undefined) {
                         valueToSet = resolveDefaultValue(configuredDefaultValue, key, namespace || config?.extract?.defaultNS || 'translation', locale, defaultValue);
                     }
                     else {
@@ -666,8 +671,6 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
         else {
             // Existing value exists - decide whether to preserve, sync primary, or clear other locales when requested
             if (locale === primaryLanguage && syncPrimaryWithDefaults) {
-                // Reuse the same derived-default detection as the initial write path so reruns stay idempotent.
-                const isDerivedDefault = isDerivedFromKey(key, defaultValue, explicitDefault);
                 // If this key looks like a plural/context variant and the default
                 // wasn't explicitly provided in source code, preserve the existing value.
                 const isVariantKey = key.includes(pluralSeparator) || key.includes(contextSeparator);
@@ -683,7 +686,18 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
             }
             else {
                 // Non-primary locale behavior
-                const syncDerivedDefault = Boolean(trustDerivedDefaults && defaultValue && isDerivedFromKey(key, defaultValue, explicitDefault));
+                const isVariantKey = key.includes(pluralSeparator) || key.includes(contextSeparator);
+                const syncDerivedDefault = Boolean(syncAll &&
+                    locale !== primaryLanguage &&
+                    syncPrimaryWithDefaults &&
+                    trustDerivedDefaults &&
+                    defaultValue &&
+                    isDerivedDefault &&
+                    !primaryShouldPreserveObject &&
+                    (primaryExistingValue === undefined ||
+                        primaryIsStaleObject ||
+                        ((!isVariantKey || explicitDefault) &&
+                            primaryExistingValue !== resolveDefaultValue(defaultValue, key, namespace || config?.extract?.defaultNS || 'translation', primaryLanguage, defaultValue))));
                 if (syncAll && locale !== primaryLanguage && (explicitDefault || syncDerivedDefault)) {
                     // When syncAll is requested, clear (reset) any existing translations for keys
                     // that had explicit defaults in code so the primary default can be propagated
@@ -839,7 +853,8 @@ function buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale,
  */
 async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaults = false, syncAll = false, trustDerivedDefaults = false, logger = new ConsoleLogger() } = {}) {
     config.extract.primaryLanguage ||= config.locales[0] || 'en';
-    config.extract.secondaryLanguages ||= config.locales.filter((l) => l !== config?.extract?.primaryLanguage);
+    const primaryLanguage = config.extract.primaryLanguage || config.locales[0] || 'en';
+    config.extract.secondaryLanguages ||= config.locales.filter((l) => l !== primaryLanguage);
     const patternsToPreserve = [...(config.extract.preservePatterns || [])];
     const indentation = config.extract.indentation ?? 2;
     for (const key of objectKeys) {
@@ -883,6 +898,10 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
             const outputPath = getOutputPath(config.extract.output, locale);
             const fullPath = resolve(process.cwd(), outputPath);
             const existingMergedFile = await loadTranslationFile(fullPath) || {};
+            const primaryMergedPath = resolve(process.cwd(), getOutputPath(config.extract.output, primaryLanguage));
+            const primaryMergedFile = locale === primaryLanguage
+                ? existingMergedFile
+                : (await loadTranslationFile(primaryMergedPath) || {});
             // Determine whether the existing merged file already uses namespace objects
             // or is a flat mapping of translation keys -> values.
             // If it's flat (values are primitives), we must NOT treat each translation key as a namespace.
@@ -918,12 +937,13 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
                 const nsKeys = keysByNS.get(nsKey) || [];
                 if (isTopLevel(nsKey)) {
                     // keys without namespace -> merged into top-level of the merged file
-                    const built = buildNewTranslationsForNs(nsKeys, existingMergedFile, config, locale, undefined, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, logger);
+                    const built = buildNewTranslationsForNs(nsKeys, existingMergedFile, config, locale, undefined, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, primaryMergedFile, logger);
                     Object.assign(newMergedTranslations, built);
                 }
                 else {
                     const existingTranslations = existingMergedFile[nsKey] || {};
-                    newMergedTranslations[nsKey] = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, nsKey, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, logger);
+                    const primaryExistingTranslations = primaryMergedFile[nsKey] || {};
+                    newMergedTranslations[nsKey] = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, nsKey, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, primaryExistingTranslations, logger);
                 }
             }
             // Preserve ignored namespaces as-is from the existing merged file
@@ -961,7 +981,11 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
                 const outputPath = getOutputPath(config.extract.output, locale, ns);
                 const fullPath = resolve(process.cwd(), outputPath);
                 const existingTranslations = await loadTranslationFile(fullPath) || {};
-                const newTranslations = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, ns, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, logger);
+                const primaryOutputPath = resolve(process.cwd(), getOutputPath(config.extract.output, primaryLanguage, ns));
+                const primaryExistingTranslations = locale === primaryLanguage
+                    ? existingTranslations
+                    : (await loadTranslationFile(primaryOutputPath) || {});
+                const newTranslations = buildNewTranslationsForNs(nsKeys, existingTranslations, config, locale, ns, preservePatterns, objectKeys, syncPrimaryWithDefaults, syncAll, trustDerivedDefaults, primaryExistingTranslations, logger);
                 const oldContent = JSON.stringify(existingTranslations, null, indentation);
                 const newContent = JSON.stringify(newTranslations, null, indentation);
                 // Push one result per namespace file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-cli",
-  "version": "1.52.0",
+  "version": "1.52.1",
   "description": "A unified, high-performance i18next CLI.",
   "type": "module",
   "bin": {

package/types/extractor/core/translation-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translation-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/translation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAu6B9F;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,MAAM,EAAE,oBAAoB,EAC5B,EACE,uBAA+B,EAC/B,OAAe,EACf,oBAA4B,EAC5B,MAA4B,EAC7B,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAuJ9B"}
+{"version":3,"file":"translation-manager.d.ts","sourceRoot":"","sources":["../../../src/extractor/core/translation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAo8B9F;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAC/B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,EACvB,MAAM,EAAE,oBAAoB,EAC5B,EACE,uBAA+B,EAC/B,OAAe,EACf,oBAA4B,EAC5B,MAA4B,EAC7B,GAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;CACX,GACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAiK9B"}