@intlayer/chokidar 5.7.7 → 5.8.0-canary.0

package/dist/cjs/loadDictionaries/loadDictionaries.cjs

@@ -22,6 +22,7 @@ __export(loadDictionaries_exports, {
 });
 module.exports = __toCommonJS(loadDictionaries_exports);
 var import_config = require("@intlayer/config");
+var import_node_path = require("node:path");
 var import_fetchDistantDictionaryKeys = require('../fetchDistantDictionaryKeys.cjs');
 var import_log = require('../log.cjs');
 var import_sortAlphabetically = require('../utils/sortAlphabetically.cjs');
@@ -43,7 +44,7 @@ const loadDictionaries = async (contentDeclarationsPaths, configuration = (0, im
       if (!hasContent) {
         console.error(
           "Content declaration has no exported content",
-          dict.filePath
+          dict.filePath ? (0, import_node_path.relative)(configuration.content.baseDir, dict.filePath) : ""
         );
       } else if (!hasKey) {
         console.error("Content declaration has no key", dict.filePath);

package/dist/cjs/loadDictionaries/loadDictionaries.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/loadDictionaries/loadDictionaries.ts"],"sourcesContent":["// @ts-ignore @intlayer/backend is not build yet\nimport type { DictionaryAPI } from '@intlayer/backend';\nimport {\n  ESMxCJSRequire,\n  getAppLogger,\n  getConfiguration,\n} from '@intlayer/config';\nimport type { Dictionary } from '@intlayer/core';\nimport { fetchDistantDictionaryKeys } from '../fetchDistantDictionaryKeys';\nimport { logger } from '../log';\nimport { sortAlphabetically } from '../utils/sortAlphabetically';\nimport { loadContentDeclarations } from './loadContentDeclaration';\nimport { loadDistantDictionaries } from './loadDistantDictionaries';\n\nexport const loadDictionaries = async (\n  contentDeclarationsPaths: string[] | string,\n  configuration = getConfiguration(),\n  projectRequire = ESMxCJSRequire\n): Promise<Dictionary[]> => {\n  try {\n    const appLogger = getAppLogger(configuration);\n    const { editor } = configuration;\n\n    appLogger('Dictionaries:', { isVerbose: true });\n\n    const files = Array.isArray(contentDeclarationsPaths)\n      ? contentDeclarationsPaths\n      : [contentDeclarationsPaths];\n\n    const localDictionaries: Dictionary[] = await loadContentDeclarations(\n      files,\n      projectRequire\n    );\n\n    const filteredLocalDictionaries = localDictionaries.filter((dict) => {\n      const hasKey = Boolean(dict.key);\n      const hasContent = Boolean(dict.content);\n\n      if (!hasContent) {\n        console.error(\n          'Content declaration has no exported content',\n          dict.filePath\n        );\n      } else if (!hasKey) {\n        console.error('Content declaration has no key', dict.filePath);\n      }\n\n      return hasKey && hasContent;\n    });\n\n    const localDictionaryKeys = filteredLocalDictionaries\n      .map((dict) => dict.key)\n      .filter(Boolean); // Remove empty or undefined keys\n\n    // Initialize the logger with both local and distant dictionaries\n    logger.init(localDictionaryKeys, []);\n\n    // Update logger statuses for local dictionaries\n    logger.updateStatus(\n      filteredLocalDictionaries.map((dict) => ({\n        dictionaryKey: dict.key,\n        type: 'local',\n        status: { status: 'built' },\n      }))\n    );\n\n    let distantDictionaries: DictionaryAPI[] = [];\n    let distantDictionaryKeys: string[] = [];\n\n    if (editor.clientId && editor.clientSecret) {\n      try {\n        // Fetch distant dictionary keys\n        distantDictionaryKeys = await fetchDistantDictionaryKeys();\n\n        const orderedDistantDictionaryKeys =\n          distantDictionaryKeys.sort(sortAlphabetically);\n\n        // Add distant dictionaries to the logger\n        logger.addDictionaryKeys('distant', orderedDistantDictionaryKeys);\n\n        // Fetch distant dictionaries\n        distantDictionaries = await loadDistantDictionaries({\n          dictionaryKeys: orderedDistantDictionaryKeys,\n        });\n      } catch (_error) {\n        appLogger('Error during fetching distant dictionaries', {\n          level: 'error',\n        });\n      }\n    }\n\n    // Ensure the logger is stopped\n    logger.stop();\n\n    return [...filteredLocalDictionaries, ...distantDictionaries];\n  } catch (error) {\n    // Ensure the logger is stopped\n    logger.stop();\n\n    throw error; // Re-throw the error after logging\n  }\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oBAIO;AAEP,wCAA2C;AAC3C,iBAAuB;AACvB,gCAAmC;AACnC,oCAAwC;AACxC,qCAAwC;AAEjC,MAAM,mBAAmB,OAC9B,0BACA,oBAAgB,gCAAiB,GACjC,iBAAiB,iCACS;AAC1B,MAAI;AACF,UAAM,gBAAY,4BAAa,aAAa;AAC5C,UAAM,EAAE,OAAO,IAAI;AAEnB,cAAU,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAE9C,UAAM,QAAQ,MAAM,QAAQ,wBAAwB,IAChD,2BACA,CAAC,wBAAwB;AAE7B,UAAM,oBAAkC,UAAM;AAAA,MAC5C;AAAA,MACA;AAAA,IACF;AAEA,UAAM,4BAA4B,kBAAkB,OAAO,CAAC,SAAS;AACnE,YAAM,SAAS,QAAQ,KAAK,GAAG;AAC/B,YAAM,aAAa,QAAQ,KAAK,OAAO;AAEvC,UAAI,CAAC,YAAY;AACf,gBAAQ;AAAA,UACN;AAAA,UACA,KAAK;AAAA,QACP;AAAA,MACF,WAAW,CAAC,QAAQ;AAClB,gBAAQ,MAAM,kCAAkC,KAAK,QAAQ;AAAA,MAC/D;AAEA,aAAO,UAAU;AAAA,IACnB,CAAC;AAED,UAAM,sBAAsB,0BACzB,IAAI,CAAC,SAAS,KAAK,GAAG,EACtB,OAAO,OAAO;AAGjB,sBAAO,KAAK,qBAAqB,CAAC,CAAC;AAGnC,sBAAO;AAAA,MACL,0BAA0B,IAAI,CAAC,UAAU;AAAA,QACvC,eAAe,KAAK;AAAA,QACpB,MAAM;AAAA,QACN,QAAQ,EAAE,QAAQ,QAAQ;AAAA,MAC5B,EAAE;AAAA,IACJ;AAEA,QAAI,sBAAuC,CAAC;AAC5C,QAAI,wBAAkC,CAAC;AAEvC,QAAI,OAAO,YAAY,OAAO,cAAc;AAC1C,UAAI;AAEF,gCAAwB,UAAM,8DAA2B;AAEzD,cAAM,+BACJ,sBAAsB,KAAK,4CAAkB;AAG/C,0BAAO,kBAAkB,WAAW,4BAA4B;AAGhE,8BAAsB,UAAM,wDAAwB;AAAA,UAClD,gBAAgB;AAAA,QAClB,CAAC;AAAA,MACH,SAAS,QAAQ;AACf,kBAAU,8CAA8C;AAAA,UACtD,OAAO;AAAA,QACT,CAAC;AAAA,MACH;AAAA,IACF;AAGA,sBAAO,KAAK;AAEZ,WAAO,CAAC,GAAG,2BAA2B,GAAG,mBAAmB;AAAA,EAC9D,SAAS,OAAO;AAEd,sBAAO,KAAK;AAEZ,UAAM;AAAA,EACR;AACF;","names":[]}
+{"version":3,"sources":["../../../src/loadDictionaries/loadDictionaries.ts"],"sourcesContent":["// @ts-ignore @intlayer/backend is not build yet\nimport type { DictionaryAPI } from '@intlayer/backend';\nimport {\n  ESMxCJSRequire,\n  getAppLogger,\n  getConfiguration,\n} from '@intlayer/config';\nimport type { Dictionary } from '@intlayer/core';\nimport { relative } from 'node:path';\nimport { fetchDistantDictionaryKeys } from '../fetchDistantDictionaryKeys';\nimport { logger } from '../log';\nimport { sortAlphabetically } from '../utils/sortAlphabetically';\nimport { loadContentDeclarations } from './loadContentDeclaration';\nimport { loadDistantDictionaries } from './loadDistantDictionaries';\n\nexport const loadDictionaries = async (\n  contentDeclarationsPaths: string[] | string,\n  configuration = getConfiguration(),\n  projectRequire = ESMxCJSRequire\n): Promise<Dictionary[]> => {\n  try {\n    const appLogger = getAppLogger(configuration);\n    const { editor } = configuration;\n\n    appLogger('Dictionaries:', { isVerbose: true });\n\n    const files = Array.isArray(contentDeclarationsPaths)\n      ? contentDeclarationsPaths\n      : [contentDeclarationsPaths];\n\n    const localDictionaries: Dictionary[] = await loadContentDeclarations(\n      files,\n      projectRequire\n    );\n\n    const filteredLocalDictionaries = localDictionaries.filter((dict) => {\n      const hasKey = Boolean(dict.key);\n      const hasContent = Boolean(dict.content);\n\n      if (!hasContent) {\n        console.error(\n          'Content declaration has no exported content',\n          dict.filePath\n            ? relative(configuration.content.baseDir, dict.filePath)\n            : ''\n        );\n      } else if (!hasKey) {\n        console.error('Content declaration has no key', dict.filePath);\n      }\n\n      return hasKey && hasContent;\n    });\n\n    const localDictionaryKeys = filteredLocalDictionaries\n      .map((dict) => dict.key)\n      .filter(Boolean); // Remove empty or undefined keys\n\n    // Initialize the logger with both local and distant dictionaries\n    logger.init(localDictionaryKeys, []);\n\n    // Update logger statuses for local dictionaries\n    logger.updateStatus(\n      filteredLocalDictionaries.map((dict) => ({\n        dictionaryKey: dict.key,\n        type: 'local',\n        status: { status: 'built' },\n      }))\n    );\n\n    let distantDictionaries: DictionaryAPI[] = [];\n    let distantDictionaryKeys: string[] = [];\n\n    if (editor.clientId && editor.clientSecret) {\n      try {\n        // Fetch distant dictionary keys\n        distantDictionaryKeys = await fetchDistantDictionaryKeys();\n\n        const orderedDistantDictionaryKeys =\n          distantDictionaryKeys.sort(sortAlphabetically);\n\n        // Add distant dictionaries to the logger\n        logger.addDictionaryKeys('distant', orderedDistantDictionaryKeys);\n\n        // Fetch distant dictionaries\n        distantDictionaries = await loadDistantDictionaries({\n          dictionaryKeys: orderedDistantDictionaryKeys,\n        });\n      } catch (_error) {\n        appLogger('Error during fetching distant dictionaries', {\n          level: 'error',\n        });\n      }\n    }\n\n    // Ensure the logger is stopped\n    logger.stop();\n\n    return [...filteredLocalDictionaries, ...distantDictionaries];\n  } catch (error) {\n    // Ensure the logger is stopped\n    logger.stop();\n\n    throw error; // Re-throw the error after logging\n  }\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oBAIO;AAEP,uBAAyB;AACzB,wCAA2C;AAC3C,iBAAuB;AACvB,gCAAmC;AACnC,oCAAwC;AACxC,qCAAwC;AAEjC,MAAM,mBAAmB,OAC9B,0BACA,oBAAgB,gCAAiB,GACjC,iBAAiB,iCACS;AAC1B,MAAI;AACF,UAAM,gBAAY,4BAAa,aAAa;AAC5C,UAAM,EAAE,OAAO,IAAI;AAEnB,cAAU,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAE9C,UAAM,QAAQ,MAAM,QAAQ,wBAAwB,IAChD,2BACA,CAAC,wBAAwB;AAE7B,UAAM,oBAAkC,UAAM;AAAA,MAC5C;AAAA,MACA;AAAA,IACF;AAEA,UAAM,4BAA4B,kBAAkB,OAAO,CAAC,SAAS;AACnE,YAAM,SAAS,QAAQ,KAAK,GAAG;AAC/B,YAAM,aAAa,QAAQ,KAAK,OAAO;AAEvC,UAAI,CAAC,YAAY;AACf,gBAAQ;AAAA,UACN;AAAA,UACA,KAAK,eACD,2BAAS,cAAc,QAAQ,SAAS,KAAK,QAAQ,IACrD;AAAA,QACN;AAAA,MACF,WAAW,CAAC,QAAQ;AAClB,gBAAQ,MAAM,kCAAkC,KAAK,QAAQ;AAAA,MAC/D;AAEA,aAAO,UAAU;AAAA,IACnB,CAAC;AAED,UAAM,sBAAsB,0BACzB,IAAI,CAAC,SAAS,KAAK,GAAG,EACtB,OAAO,OAAO;AAGjB,sBAAO,KAAK,qBAAqB,CAAC,CAAC;AAGnC,sBAAO;AAAA,MACL,0BAA0B,IAAI,CAAC,UAAU;AAAA,QACvC,eAAe,KAAK;AAAA,QACpB,MAAM;AAAA,QACN,QAAQ,EAAE,QAAQ,QAAQ;AAAA,MAC5B,EAAE;AAAA,IACJ;AAEA,QAAI,sBAAuC,CAAC;AAC5C,QAAI,wBAAkC,CAAC;AAEvC,QAAI,OAAO,YAAY,OAAO,cAAc;AAC1C,UAAI;AAEF,gCAAwB,UAAM,8DAA2B;AAEzD,cAAM,+BACJ,sBAAsB,KAAK,4CAAkB;AAG/C,0BAAO,kBAAkB,WAAW,4BAA4B;AAGhE,8BAAsB,UAAM,wDAAwB;AAAA,UAClD,gBAAgB;AAAA,QAClB,CAAC;AAAA,MACH,SAAS,QAAQ;AACf,kBAAU,8CAA8C;AAAA,UACtD,OAAO;AAAA,QACT,CAAC;AAAA,MACH;AAAA,IACF;AAGA,sBAAO,KAAK;AAEZ,WAAO,CAAC,GAAG,2BAA2B,GAAG,mBAAmB;AAAA,EAC9D,SAAS,OAAO;AAEd,sBAAO,KAAK;AAEZ,UAAM;AAAA,EACR;AACF;","names":[]}

package/dist/cjs/mergeDictionaries.cjs

@@ -41,7 +41,7 @@ const checkTypesMatch = (obj1, obj2, dictionaryKey, path = []) => {
   const type2 = (0, import_core.getNodeType)(obj2);
   if (type1 !== type2) {
     appLogger(
-      `Error: Dictionary ${dictionaryKey} has a multiple content files with type mismatch at path "${path.join(".")}": Cannot merge ${type1} with ${type2}`,
+      `Error: Dictionary "${dictionaryKey}" has a multiple content files with type mismatch at path "${path.join(".")}": Cannot merge ${type1} with ${type2}`,
       {
         level: "error"
       }
@@ -56,9 +56,65 @@ const checkTypesMatch = (obj1, obj2, dictionaryKey, path = []) => {
     }
   }
 };
+const arrayMerge = (destinationArray, sourceArray) => {
+  const isObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+  const getKey = (item) => {
+    if (!isObject(item)) return void 0;
+    const key = item.key;
+    if (typeof key === "string" || typeof key === "number") return key;
+    return void 0;
+  };
+  const result = [];
+  const destKeyToIndex = /* @__PURE__ */ new Map();
+  const destUsed = new Array(destinationArray.length).fill(false);
+  for (let i = 0; i < destinationArray.length; i++) {
+    const k = getKey(destinationArray[i]);
+    if (k !== void 0 && !destKeyToIndex.has(k)) {
+      destKeyToIndex.set(k, i);
+    }
+  }
+  for (let i = 0; i < sourceArray.length; i++) {
+    const sourceItem = sourceArray[i];
+    const sourceKey = getKey(sourceItem);
+    if (sourceKey !== void 0 && destKeyToIndex.has(sourceKey)) {
+      const destIndex = destKeyToIndex.get(sourceKey);
+      const destItem2 = destinationArray[destIndex];
+      destUsed[destIndex] = true;
+      if (isObject(destItem2) && isObject(sourceItem)) {
+        result.push((0, import_deepmerge.default)(sourceItem, destItem2, { arrayMerge }));
+      } else {
+        result.push(destItem2 !== void 0 ? destItem2 : sourceItem);
+      }
+      continue;
+    }
+    const destItem = destinationArray[i];
+    if (destItem !== void 0 && !destUsed[i]) {
+      destUsed[i] = true;
+      if (isObject(destItem) && isObject(sourceItem)) {
+        result.push((0, import_deepmerge.default)(sourceItem, destItem, { arrayMerge }));
+      } else if (destItem !== void 0) {
+        result.push(destItem);
+      } else {
+        result.push(sourceItem);
+      }
+    } else {
+      result.push(sourceItem);
+    }
+  }
+  for (let i = 0; i < destinationArray.length; i++) {
+    if (!destUsed[i]) {
+      result.push(destinationArray[i]);
+      destUsed[i] = true;
+    }
+  }
+  return result;
+};
 const mergeDictionaries = (dictionaries) => {
   const { editor } = import_built.default;
   let mergedDictionaries = dictionaries[0];
+  const mergeOptions = {
+    arrayMerge
+  };
   for (let i = 1; i < dictionaries.length; i++) {
     const currentDictionary = dictionaries[i];
     checkTypesMatch(
@@ -69,9 +125,17 @@ const mergeDictionaries = (dictionaries) => {
     );
     const isDistant = currentDictionary.location === "distant";
     if (editor.dictionaryPriorityStrategy === "distant_first" && isDistant) {
-      mergedDictionaries = (0, import_deepmerge.default)(mergedDictionaries, currentDictionary);
+      mergedDictionaries = (0, import_deepmerge.default)(
+        mergedDictionaries,
+        currentDictionary,
+        mergeOptions
+      );
     } else {
-      mergedDictionaries = (0, import_deepmerge.default)(currentDictionary, mergedDictionaries);
+      mergedDictionaries = (0, import_deepmerge.default)(
+        currentDictionary,
+        mergedDictionaries,
+        mergeOptions
+      );
     }
   }
   return { ...mergedDictionaries, filePath: void 0 };

package/dist/cjs/mergeDictionaries.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mergeDictionaries.ts"],"sourcesContent":["import { getAppLogger } from '@intlayer/config';\nimport configuration from '@intlayer/config/built';\nimport type { Dictionary } from '@intlayer/core';\nimport { getNodeType } from '@intlayer/core';\nimport merge from 'deepmerge';\n\nconst checkTypesMatch = (\n  obj1: any,\n  obj2: any,\n  dictionaryKey: string,\n  path: string[] = []\n): void => {\n  const appLogger = getAppLogger(configuration);\n  const type1 = getNodeType(obj1);\n  const type2 = getNodeType(obj2);\n\n  if (type1 !== type2) {\n    appLogger(\n      `Error: Dictionary ${dictionaryKey} has a multiple content files with type mismatch at path \"${path.join('.')}\": Cannot merge ${type1} with ${type2}`,\n      {\n        level: 'error',\n      }\n    );\n  }\n\n  if (type1 === 'object' && obj1 && obj2) {\n    const allKeys = new Set([...Object.keys(obj1), ...Object.keys(obj2)]);\n    for (const key of allKeys) {\n      if (key in obj1 && key in obj2) {\n        checkTypesMatch(obj1[key], obj2[key], dictionaryKey, [...path, key]);\n      }\n    }\n  }\n};\n\nexport const mergeDictionaries = (dictionaries: Dictionary[]): Dictionary => {\n  const { editor } = configuration;\n\n  let mergedDictionaries: Dictionary = dictionaries[0];\n\n  for (let i = 1; i < dictionaries.length; i++) {\n    const currentDictionary = dictionaries[i];\n\n    // Check types before merging\n    checkTypesMatch(\n      mergedDictionaries,\n      currentDictionary,\n      currentDictionary.key,\n      []\n    );\n\n    const isDistant = currentDictionary.location === 'distant';\n\n    if (editor.dictionaryPriorityStrategy === 'distant_first' && isDistant) {\n      mergedDictionaries = merge(mergedDictionaries, currentDictionary);\n    } else {\n      mergedDictionaries = merge(currentDictionary, mergedDictionaries);\n    }\n  }\n\n  return { ...mergedDictionaries, filePath: undefined };\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAC7B,mBAA0B;AAE1B,kBAA4B;AAC5B,uBAAkB;AAElB,MAAM,kBAAkB,CACtB,MACA,MACA,eACA,OAAiB,CAAC,MACT;AACT,QAAM,gBAAY,4BAAa,aAAAA,OAAa;AAC5C,QAAM,YAAQ,yBAAY,IAAI;AAC9B,QAAM,YAAQ,yBAAY,IAAI;AAE9B,MAAI,UAAU,OAAO;AACnB;AAAA,MACE,qBAAqB,aAAa,6DAA6D,KAAK,KAAK,GAAG,CAAC,mBAAmB,KAAK,SAAS,KAAK;AAAA,MACnJ;AAAA,QACE,OAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAEA,MAAI,UAAU,YAAY,QAAQ,MAAM;AACtC,UAAM,UAAU,oBAAI,IAAI,CAAC,GAAG,OAAO,KAAK,IAAI,GAAG,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC;AACpE,eAAW,OAAO,SAAS;AACzB,UAAI,OAAO,QAAQ,OAAO,MAAM;AAC9B,wBAAgB,KAAK,GAAG,GAAG,KAAK,GAAG,GAAG,eAAe,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,MACrE;AAAA,IACF;AAAA,EACF;AACF;AAEO,MAAM,oBAAoB,CAAC,iBAA2C;AAC3E,QAAM,EAAE,OAAO,IAAI,aAAAA;AAEnB,MAAI,qBAAiC,aAAa,CAAC;AAEnD,WAAS,IAAI,GAAG,IAAI,aAAa,QAAQ,KAAK;AAC5C,UAAM,oBAAoB,aAAa,CAAC;AAGxC;AAAA,MACE;AAAA,MACA;AAAA,MACA,kBAAkB;AAAA,MAClB,CAAC;AAAA,IACH;AAEA,UAAM,YAAY,kBAAkB,aAAa;AAEjD,QAAI,OAAO,+BAA+B,mBAAmB,WAAW;AACtE,+BAAqB,iBAAAC,SAAM,oBAAoB,iBAAiB;AAAA,IAClE,OAAO;AACL,+BAAqB,iBAAAA,SAAM,mBAAmB,kBAAkB;AAAA,IAClE;AAAA,EACF;AAEA,SAAO,EAAE,GAAG,oBAAoB,UAAU,OAAU;AACtD;","names":["configuration","merge"]}
+{"version":3,"sources":["../../src/mergeDictionaries.ts"],"sourcesContent":["import { getAppLogger } from '@intlayer/config';\nimport configuration from '@intlayer/config/built';\nimport type { Dictionary } from '@intlayer/core';\nimport { getNodeType } from '@intlayer/core';\nimport merge, { Options } from 'deepmerge';\n\nconst checkTypesMatch = (\n  obj1: any,\n  obj2: any,\n  dictionaryKey: string,\n  path: string[] = []\n): void => {\n  const appLogger = getAppLogger(configuration);\n  const type1 = getNodeType(obj1);\n  const type2 = getNodeType(obj2);\n\n  if (type1 !== type2) {\n    appLogger(\n      `Error: Dictionary \"${dictionaryKey}\" has a multiple content files with type mismatch at path \"${path.join('.')}\": Cannot merge ${type1} with ${type2}`,\n      {\n        level: 'error',\n      }\n    );\n  }\n\n  if (type1 === 'object' && obj1 && obj2) {\n    const allKeys = new Set([...Object.keys(obj1), ...Object.keys(obj2)]);\n    for (const key of allKeys) {\n      if (key in obj1 && key in obj2) {\n        checkTypesMatch(obj1[key], obj2[key], dictionaryKey, [...path, key]);\n      }\n    }\n  }\n};\n\n// Custom array merge strategy that merges arrays by key when present, otherwise by index\nconst arrayMerge = (destinationArray: any[], sourceArray: any[]): any[] => {\n  const isObject = (value: unknown): value is Record<string, any> =>\n    !!value && typeof value === 'object' && !Array.isArray(value);\n\n  const getKey = (item: any): string | number | undefined => {\n    if (!isObject(item)) return undefined;\n    const key = (item as any).key;\n    if (typeof key === 'string' || typeof key === 'number') return key;\n    return undefined;\n  };\n\n  const result: any[] = [];\n\n  // Build a lookup for destination keyed items and track usage of all destination indices\n  const destKeyToIndex = new Map<string | number, number>();\n  const destUsed: boolean[] = new Array(destinationArray.length).fill(false);\n  for (let i = 0; i < destinationArray.length; i++) {\n    const k = getKey(destinationArray[i]);\n    if (k !== undefined && !destKeyToIndex.has(k)) {\n      destKeyToIndex.set(k, i);\n    }\n  }\n\n  // First pass: respect source (already merged) order\n  for (let i = 0; i < sourceArray.length; i++) {\n    const sourceItem = sourceArray[i];\n    const sourceKey = getKey(sourceItem);\n\n    if (sourceKey !== undefined && destKeyToIndex.has(sourceKey)) {\n      const destIndex = destKeyToIndex.get(sourceKey)!;\n      const destItem = destinationArray[destIndex];\n      destUsed[destIndex] = true;\n\n      if (isObject(destItem) && isObject(sourceItem)) {\n        result.push(merge(sourceItem, destItem, { arrayMerge }));\n      } else {\n        // Prefer destination item (later dictionary) when primitive\n        result.push(destItem !== undefined ? destItem : sourceItem);\n      }\n      continue;\n    }\n\n    // Fallback to index-based merge when no key match\n    const destItem = destinationArray[i];\n    if (destItem !== undefined && !destUsed[i]) {\n      destUsed[i] = true;\n      if (isObject(destItem) && isObject(sourceItem)) {\n        result.push(merge(sourceItem, destItem, { arrayMerge }));\n      } else if (destItem !== undefined) {\n        result.push(destItem);\n      } else {\n        result.push(sourceItem);\n      }\n    } else {\n      result.push(sourceItem);\n    }\n  }\n\n  // Second pass: append remaining unused destination items (including keyed-only in destination or extra by index)\n  for (let i = 0; i < destinationArray.length; i++) {\n    if (!destUsed[i]) {\n      result.push(destinationArray[i]);\n      destUsed[i] = true;\n    }\n  }\n\n  return result;\n};\n\nexport const mergeDictionaries = (dictionaries: Dictionary[]): Dictionary => {\n  const { editor } = configuration;\n\n  let mergedDictionaries: Dictionary = dictionaries[0];\n\n  // Configure deepmerge options with custom array merge strategy\n  const mergeOptions: Options = {\n    arrayMerge,\n  };\n\n  for (let i = 1; i < dictionaries.length; i++) {\n    const currentDictionary = dictionaries[i];\n\n    // Check types before merging\n    checkTypesMatch(\n      mergedDictionaries,\n      currentDictionary,\n      currentDictionary.key,\n      []\n    );\n\n    const isDistant = currentDictionary.location === 'distant';\n\n    if (editor.dictionaryPriorityStrategy === 'distant_first' && isDistant) {\n      mergedDictionaries = merge(\n        mergedDictionaries,\n        currentDictionary,\n        mergeOptions\n      );\n    } else {\n      mergedDictionaries = merge(\n        currentDictionary,\n        mergedDictionaries,\n        mergeOptions\n      );\n    }\n  }\n\n  return { ...mergedDictionaries, filePath: undefined };\n};\n"],"mappings":"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","names":["configuration","destItem","merge"]}

package/dist/cjs/reduceDictionaryContent/applyMask.cjs

@@ -36,8 +36,22 @@ const applyMask = (full, mask) => {
   }
   if (mask && typeof mask === "object" && full && typeof full === "object") {
     const out = {};
-    for (const [k, m] of Object.entries(mask)) {
-      out[k] = applyMask(full[k], m);
+    const maskEntries = Object.entries(mask);
+    const allChildrenAreArrays = maskEntries.every(
+      ([, value]) => Array.isArray(value)
+    );
+    for (const [k, m] of maskEntries) {
+      const fullValue = full[k];
+      if (Array.isArray(m) && Array.isArray(fullValue)) {
+        const isTranslationNode = (val) => !!val && typeof val === "object" && "nodeType" in val;
+        const isArrayOfTranslationNodes = fullValue.every(
+          (item) => isTranslationNode(item)
+        );
+        if (!allChildrenAreArrays && !isArrayOfTranslationNodes) {
+          continue;
+        }
+      }
+      out[k] = applyMask(fullValue, m);
     }
     return out;
   }

package/dist/cjs/reduceDictionaryContent/applyMask.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/reduceDictionaryContent/applyMask.ts"],"sourcesContent":["import type { Dictionary } from '@intlayer/core';\n\nexport const applyMask = (full: Dictionary, mask: any): Dictionary => {\n  // the mask \"true\" → we don't filter\n  if (mask === true) {\n    return full;\n  }\n\n  // arrays\n  if (Array.isArray(mask) && Array.isArray(full)) {\n    return mask.map((m, i) => applyMask(full[i], m)) as any;\n  }\n\n  // handle node with nodeType property\n  if (full && typeof full === 'object' && 'nodeType' in full) {\n    if (mask && typeof mask === 'object') {\n      return full; // Keep the full object with nodeType intact\n    }\n    return full;\n  }\n\n  // generic object\n  if (mask && typeof mask === 'object' && full && typeof full === 'object') {\n    const out: any = {};\n    for (const [k, m] of Object.entries(mask)) {\n      out[k] = applyMask((full as any)[k], m);\n    }\n    return out;\n  }\n\n  // unexpected case: we return the original value\n  return full;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,YAAY,CAAC,MAAkB,SAA0B;AAEpE,MAAI,SAAS,MAAM;AACjB,WAAO;AAAA,EACT;AAGA,MAAI,MAAM,QAAQ,IAAI,KAAK,MAAM,QAAQ,IAAI,GAAG;AAC9C,WAAO,KAAK,IAAI,CAAC,GAAG,MAAM,UAAU,KAAK,CAAC,GAAG,CAAC,CAAC;AAAA,EACjD;AAGA,MAAI,QAAQ,OAAO,SAAS,YAAY,cAAc,MAAM;AAC1D,QAAI,QAAQ,OAAO,SAAS,UAAU;AACpC,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAGA,MAAI,QAAQ,OAAO,SAAS,YAAY,QAAQ,OAAO,SAAS,UAAU;AACxE,UAAM,MAAW,CAAC;AAClB,eAAW,CAAC,GAAG,CAAC,KAAK,OAAO,QAAQ,IAAI,GAAG;AACzC,UAAI,CAAC,IAAI,UAAW,KAAa,CAAC,GAAG,CAAC;AAAA,IACxC;AACA,WAAO;AAAA,EACT;AAGA,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../src/reduceDictionaryContent/applyMask.ts"],"sourcesContent":["import type { Dictionary } from '@intlayer/core';\n\nexport const applyMask = (full: Dictionary, mask: any): Dictionary => {\n  // the mask \"true\" → we don't filter\n  if (mask === true) {\n    return full;\n  }\n\n  // arrays\n  if (Array.isArray(mask) && Array.isArray(full)) {\n    return mask.map((m, i) => applyMask(full[i], m)) as any;\n  }\n\n  // handle node with nodeType property\n  if (full && typeof full === 'object' && 'nodeType' in full) {\n    if (mask && typeof mask === 'object') {\n      return full; // Keep the full object with nodeType intact\n    }\n    return full;\n  }\n\n  // generic object\n  if (mask && typeof mask === 'object' && full && typeof full === 'object') {\n    const out: any = {};\n    const maskEntries = Object.entries(mask);\n    const allChildrenAreArrays = maskEntries.every(([, value]) =>\n      Array.isArray(value)\n    );\n\n    for (const [k, m] of maskEntries) {\n      const fullValue = (full as any)[k];\n\n      // If this child is an array, decide preservation rules.\n      // - Preserve when all children at this level are arrays in the mask\n      // - Also preserve when the array is an array of translation nodes\n      if (Array.isArray(m) && Array.isArray(fullValue)) {\n        const isTranslationNode = (val: unknown): boolean =>\n          !!val && typeof val === 'object' && 'nodeType' in (val as any);\n        const isArrayOfTranslationNodes = fullValue.every((item: any) =>\n          isTranslationNode(item)\n        );\n\n        if (!allChildrenAreArrays && !isArrayOfTranslationNodes) {\n          continue; // skip incidental arrays when mixed with non-arrays\n        }\n      }\n\n      out[k] = applyMask(fullValue, m);\n    }\n    return out;\n  }\n\n  // unexpected case: we return the original value\n  return full;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,YAAY,CAAC,MAAkB,SAA0B;AAEpE,MAAI,SAAS,MAAM;AACjB,WAAO;AAAA,EACT;AAGA,MAAI,MAAM,QAAQ,IAAI,KAAK,MAAM,QAAQ,IAAI,GAAG;AAC9C,WAAO,KAAK,IAAI,CAAC,GAAG,MAAM,UAAU,KAAK,CAAC,GAAG,CAAC,CAAC;AAAA,EACjD;AAGA,MAAI,QAAQ,OAAO,SAAS,YAAY,cAAc,MAAM;AAC1D,QAAI,QAAQ,OAAO,SAAS,UAAU;AACpC,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAGA,MAAI,QAAQ,OAAO,SAAS,YAAY,QAAQ,OAAO,SAAS,UAAU;AACxE,UAAM,MAAW,CAAC;AAClB,UAAM,cAAc,OAAO,QAAQ,IAAI;AACvC,UAAM,uBAAuB,YAAY;AAAA,MAAM,CAAC,CAAC,EAAE,KAAK,MACtD,MAAM,QAAQ,KAAK;AAAA,IACrB;AAEA,eAAW,CAAC,GAAG,CAAC,KAAK,aAAa;AAChC,YAAM,YAAa,KAAa,CAAC;AAKjC,UAAI,MAAM,QAAQ,CAAC,KAAK,MAAM,QAAQ,SAAS,GAAG;AAChD,cAAM,oBAAoB,CAAC,QACzB,CAAC,CAAC,OAAO,OAAO,QAAQ,YAAY,cAAe;AACrD,cAAM,4BAA4B,UAAU;AAAA,UAAM,CAAC,SACjD,kBAAkB,IAAI;AAAA,QACxB;AAEA,YAAI,CAAC,wBAAwB,CAAC,2BAA2B;AACvD;AAAA,QACF;AAAA,MACF;AAEA,UAAI,CAAC,IAAI,UAAU,WAAW,CAAC;AAAA,IACjC;AACA,WAAO;AAAA,EACT;AAGA,SAAO;AACT;","names":[]}

package/dist/cjs/writeContentDeclaration/formatCode.cjs

@@ -33,6 +33,7 @@ __export(formatCode_exports, {
 module.exports = __toCommonJS(formatCode_exports);
 var import_config = require("@intlayer/config");
 var import_built = __toESM(require("@intlayer/config/built"));
+var import_path = require("path");
 const formatCode = async (filePath, code) => {
   const appLogger = (0, import_config.getAppLogger)(import_built.default);
   let prettier;
@@ -48,7 +49,8 @@ const formatCode = async (filePath, code) => {
         filepath: filePath
         // Explicitly provide the filepath so Prettier can infer the parser
       });
-      appLogger(`Applied Prettier formatting to ${filePath}`, {
+      const relativePath = (0, import_path.relative)(import_built.default.content.baseDir, filePath);
+      appLogger(`Applied Prettier formatting to ${relativePath}`, {
         level: "info",
         isVerbose: true
       });

package/dist/cjs/writeContentDeclaration/formatCode.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/writeContentDeclaration/formatCode.ts"],"sourcesContent":["import { getAppLogger } from '@intlayer/config';\nimport configuration from '@intlayer/config/built';\n\nexport const formatCode = async (filePath: string, code: string) => {\n  const appLogger = getAppLogger(configuration);\n  // Try to import prettier if it exists\n  let prettier: any;\n  try {\n    prettier = require('prettier');\n  } catch (error) {\n    // Prettier is not installed, continue without it\n  }\n\n  // Apply Prettier formatting if it's available\n  if (prettier) {\n    try {\n      // Try to find a prettier config file\n      const prettierConfig = await prettier.resolveConfig(filePath ?? '');\n\n      // Format the code with Prettier\n      const formattedCode = await prettier.format(code, {\n        ...prettierConfig,\n        filepath: filePath, // Explicitly provide the filepath so Prettier can infer the parser\n      });\n\n      appLogger(`Applied Prettier formatting to ${filePath}`, {\n        level: 'info',\n        isVerbose: true,\n      });\n\n      return formattedCode;\n    } catch (error) {\n      const err = error as Error;\n      appLogger(\n        `Failed to apply Prettier formatting to ${filePath}: ${err.message}`,\n        {\n          level: 'warn',\n          isVerbose: true,\n        }\n      );\n      // Continue with unformatted code on prettier error\n    }\n  }\n\n  return code;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAC7B,mBAA0B;AAEnB,MAAM,aAAa,OAAO,UAAkB,SAAiB;AAClE,QAAM,gBAAY,4BAAa,aAAAA,OAAa;AAE5C,MAAI;AACJ,MAAI;AACF,eAAW,QAAQ,UAAU;AAAA,EAC/B,SAAS,OAAO;AAAA,EAEhB;AAGA,MAAI,UAAU;AACZ,QAAI;AAEF,YAAM,iBAAiB,MAAM,SAAS,cAAc,YAAY,EAAE;AAGlE,YAAM,gBAAgB,MAAM,SAAS,OAAO,MAAM;AAAA,QAChD,GAAG;AAAA,QACH,UAAU;AAAA;AAAA,MACZ,CAAC;AAED,gBAAU,kCAAkC,QAAQ,IAAI;AAAA,QACtD,OAAO;AAAA,QACP,WAAW;AAAA,MACb,CAAC;AAED,aAAO;AAAA,IACT,SAAS,OAAO;AACd,YAAM,MAAM;AACZ;AAAA,QACE,0CAA0C,QAAQ,KAAK,IAAI,OAAO;AAAA,QAClE;AAAA,UACE,OAAO;AAAA,UACP,WAAW;AAAA,QACb;AAAA,MACF;AAAA,IAEF;AAAA,EACF;AAEA,SAAO;AACT;","names":["configuration"]}
+{"version":3,"sources":["../../../src/writeContentDeclaration/formatCode.ts"],"sourcesContent":["import { getAppLogger } from '@intlayer/config';\nimport configuration from '@intlayer/config/built';\nimport { relative } from 'path';\n\nexport const formatCode = async (filePath: string, code: string) => {\n  const appLogger = getAppLogger(configuration);\n  // Try to import prettier if it exists\n  let prettier: any;\n  try {\n    prettier = require('prettier');\n  } catch (error) {\n    // Prettier is not installed, continue without it\n  }\n\n  // Apply Prettier formatting if it's available\n  if (prettier) {\n    try {\n      // Try to find a prettier config file\n      const prettierConfig = await prettier.resolveConfig(filePath ?? '');\n\n      // Format the code with Prettier\n      const formattedCode = await prettier.format(code, {\n        ...prettierConfig,\n        filepath: filePath, // Explicitly provide the filepath so Prettier can infer the parser\n      });\n\n      const relativePath = relative(configuration.content.baseDir, filePath);\n\n      appLogger(`Applied Prettier formatting to ${relativePath}`, {\n        level: 'info',\n        isVerbose: true,\n      });\n\n      return formattedCode;\n    } catch (error) {\n      const err = error as Error;\n      appLogger(\n        `Failed to apply Prettier formatting to ${filePath}: ${err.message}`,\n        {\n          level: 'warn',\n          isVerbose: true,\n        }\n      );\n      // Continue with unformatted code on prettier error\n    }\n  }\n\n  return code;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAC7B,mBAA0B;AAC1B,kBAAyB;AAElB,MAAM,aAAa,OAAO,UAAkB,SAAiB;AAClE,QAAM,gBAAY,4BAAa,aAAAA,OAAa;AAE5C,MAAI;AACJ,MAAI;AACF,eAAW,QAAQ,UAAU;AAAA,EAC/B,SAAS,OAAO;AAAA,EAEhB;AAGA,MAAI,UAAU;AACZ,QAAI;AAEF,YAAM,iBAAiB,MAAM,SAAS,cAAc,YAAY,EAAE;AAGlE,YAAM,gBAAgB,MAAM,SAAS,OAAO,MAAM;AAAA,QAChD,GAAG;AAAA,QACH,UAAU;AAAA;AAAA,MACZ,CAAC;AAED,YAAM,mBAAe,sBAAS,aAAAA,QAAc,QAAQ,SAAS,QAAQ;AAErE,gBAAU,kCAAkC,YAAY,IAAI;AAAA,QAC1D,OAAO;AAAA,QACP,WAAW;AAAA,MACb,CAAC;AAED,aAAO;AAAA,IACT,SAAS,OAAO;AACd,YAAM,MAAM;AACZ;AAAA,QACE,0CAA0C,QAAQ,KAAK,IAAI,OAAO;AAAA,QAClE;AAAA,UACE,OAAO;AAAA,UACP,WAAW;AAAA,QACb;AAAA,MACF;AAAA,IAEF;AAAA,EACF;AAEA,SAAO;AACT;","names":["configuration"]}

package/dist/cjs/writeContentDeclaration/writeJSFile.cjs

@@ -186,167 +186,120 @@ const writeJSFile = async (filePath, dictionary) => {
   const contentObjectPath = contentPropertyPath.get(
     "value"
   );
-  for (const [entryKeyToUpdate, newEntryData] of Object.entries(
-    updatesToApply
-  )) {
-    const targetPropertyPath = contentObjectPath.get("properties").find((propPath) => {
+  const buildValueNodeFromData = (data) => {
+    if (data?.nodeType === import_core.NodeType.Translation) {
+      const translationContent = data;
+      if (isPerLocaleDeclarationFile && typeof locale === "string" && translationContent?.[import_core.NodeType.Translation]?.[locale] !== void 0) {
+        return buildValueNodeFromData(
+          translationContent[import_core.NodeType.Translation][locale]
+        );
+      }
+      const translationsObj = t.objectExpression(
+        Object.entries(translationContent?.[import_core.NodeType.Translation] ?? {}).map(
+          ([langKey, langValue]) => {
+            const keyNode = t.isValidIdentifier(langKey) ? t.identifier(langKey) : t.stringLiteral(langKey);
+            return t.objectProperty(keyNode, buildValueNodeFromData(langValue));
+          }
+        )
+      );
+      return t.callExpression(t.identifier("t"), [translationsObj]);
+    }
+    if (Array.isArray(data)) {
+      return t.arrayExpression(data.map((el) => buildValueNodeFromData(el)));
+    }
+    if (data && typeof data === "object") {
+      const props = Object.entries(data).map(([k, v]) => {
+        const key = t.isValidIdentifier(k) ? t.identifier(k) : t.stringLiteral(k);
+        return t.objectProperty(key, buildValueNodeFromData(v));
+      });
+      return t.objectExpression(props);
+    }
+    switch (typeof data) {
+      case "string":
+        return t.stringLiteral(data);
+      case "number":
+        return t.numericLiteral(data);
+      case "boolean":
+        return t.booleanLiteral(data);
+      default:
+        return t.nullLiteral();
+    }
+  };
+  const ensureObjectProperty = (objPath, key) => {
+    const existing = objPath.get("properties").find((propPath) => {
       if (!propPath.isObjectProperty()) return false;
       const propNode = propPath.node;
       const keyName = t.isIdentifier(propNode.key) ? propNode.key.name : t.isStringLiteral(propNode.key) ? propNode.key.value : null;
-      return keyName === entryKeyToUpdate;
+      return keyName === key;
     });
-    if (!targetPropertyPath || !targetPropertyPath.isObjectProperty()) {
-      appLogger(
-        `Key '${entryKeyToUpdate}' not found in content object of ${filePath}. Adding the missing key.`,
-        {
-          level: "info",
-          isVerbose: true
-        }
-      );
-      let valueNode;
-      if (newEntryData?.nodeType === import_core.NodeType.Translation) {
-        const translationContent = newEntryData;
-        if (isPerLocaleDeclarationFile && typeof locale === "string" && translationContent?.[import_core.NodeType.Translation]?.[locale]) {
-          valueNode = t.stringLiteral(
-            String(translationContent[import_core.NodeType.Translation][locale])
-          );
-        } else {
-          const translationsObj = t.objectExpression(
-            Object.entries(translationContent?.[import_core.NodeType.Translation]).map(
-              ([langKey, langValue]) => {
-                const keyNode2 = t.isValidIdentifier(langKey) ? t.identifier(langKey) : t.stringLiteral(langKey);
-                return t.objectProperty(
-                  keyNode2,
-                  t.stringLiteral(String(langValue))
-                );
-              }
+    if (existing) return existing;
+    const keyNode = t.isValidIdentifier(key) ? t.identifier(key) : t.stringLiteral(key);
+    const newProp = t.objectProperty(keyNode, t.objectExpression([]));
+    objPath.node.properties.push(newProp);
+    const props = objPath.get("properties");
+    return props[props.length - 1];
+  };
+  const mergeValueIntoProperty = (propPath, value, propKeyForLogs) => {
+    const valuePath = propPath.get("value");
+    if (value?.nodeType === import_core.NodeType.Translation) {
+      const translationContent = value;
+      if (valuePath.isCallExpression() && t.isIdentifier(valuePath.node.callee) && valuePath.node.callee.name === "t") {
+        const translationsObj = t.objectExpression(
+          Object.entries(translationContent?.[import_core.NodeType.Translation] ?? {}).map(
+            ([langKey, langValue]) => t.objectProperty(
+              t.isValidIdentifier(langKey) ? t.identifier(langKey) : t.stringLiteral(langKey),
+              buildValueNodeFromData(langValue)
             )
-          );
-          valueNode = t.callExpression(t.identifier("t"), [translationsObj]);
-        }
-      } else if (typeof newEntryData === "string") {
-        valueNode = t.stringLiteral(newEntryData);
-      } else {
-        appLogger(
-          `Unsupported data type for new key '${entryKeyToUpdate}'. Using empty string.`,
-          { level: "warn", isVerbose: true }
+          )
         );
-        valueNode = t.stringLiteral("");
-      }
-      const keyNode = t.isValidIdentifier(entryKeyToUpdate) ? t.identifier(entryKeyToUpdate) : t.stringLiteral(entryKeyToUpdate);
-      const newProperty = t.objectProperty(keyNode, valueNode);
-      contentObjectPath.node.properties.push(newProperty);
-      continue;
-    }
-    const callExpressionPath = targetPropertyPath.get("value");
-    if (callExpressionPath.isCallExpression()) {
-      const calleeNode = callExpressionPath.node.callee;
-      const calleeName = t.isIdentifier(calleeNode) ? calleeNode.name : null;
-      if (newEntryData?.nodeType === "translation" && calleeName === "t") {
-        const args = callExpressionPath.node.arguments;
-        if (args.length === 0 || !t.isObjectExpression(args[0])) {
-          appLogger(
-            `'t' call for '${entryKeyToUpdate}' in ${filePath} does not have an object literal as its first argument. Skipping.`,
-            {
-              level: "warn",
-              isVerbose: true
-            }
-          );
-          continue;
-        }
         if (isPerLocaleDeclarationFile && typeof locale === "string") {
-          const translations = newEntryData?.[import_core.NodeType.Translation];
-          if (translations[locale]) {
-            targetPropertyPath.get("value").replaceWith(t.stringLiteral(String(translations[locale])));
-          } else {
-            appLogger(
-              `Missing translation for locale '${locale}' in '${entryKeyToUpdate}'. Using first available translation.`,
-              { level: "warn", isVerbose: true }
-            );
-            const firstValue = Object.values(translations)[0];
-            if (firstValue) {
-              targetPropertyPath.get("value").replaceWith(t.stringLiteral(String(firstValue)));
-            }
-          }
-          continue;
-        }
-        const translationsObjectAstNode = args[0];
-        const processedLangKeysInJsonUpdate = /* @__PURE__ */ new Set();
-        translationsObjectAstNode.properties.forEach((prop) => {
-          if (t.isObjectProperty(prop)) {
-            const langKeyNode = prop.key;
-            const astLangKeyName = t.isIdentifier(langKeyNode) ? langKeyNode.name : t.isStringLiteral(langKeyNode) ? langKeyNode.value : null;
-            if (astLangKeyName && newEntryData?.[import_core.NodeType.Translation].hasOwnProperty(astLangKeyName)) {
-              prop.value = t.stringLiteral(
-                String(
-                  newEntryData?.[import_core.NodeType.Translation]?.[astLangKeyName]
-                )
-              );
-              processedLangKeysInJsonUpdate.add(astLangKeyName);
-            }
-          }
-        });
-        for (const [jsonLangKey, jsonLangValue] of Object.entries(
-          newEntryData?.[import_core.NodeType.Translation]
-        )) {
-          if (!processedLangKeysInJsonUpdate.has(jsonLangKey)) {
-            const newKeyNode = t.isValidIdentifier(jsonLangKey) ? t.identifier(jsonLangKey) : t.stringLiteral(jsonLangKey);
-            translationsObjectAstNode.properties.push(
-              t.objectProperty(
-                newKeyNode,
-                t.stringLiteral(String(jsonLangValue))
-              )
-            );
+          const localized = translationContent?.[import_core.NodeType.Translation]?.[locale];
+          if (localized !== void 0) {
+            valuePath.replaceWith(buildValueNodeFromData(localized));
+            return;
           }
         }
-      } else {
-        appLogger(
-          `Unhandled callee '${calleeName || "unknown"}' for key '${entryKeyToUpdate}' in ${filePath}.`,
-          { level: "warn", isVerbose: true }
-        );
+        valuePath.node.arguments = [translationsObj];
+        return;
       }
-    } else if (callExpressionPath.isStringLiteral()) {
-      if (typeof newEntryData === "string") {
-        targetPropertyPath.get("value").replaceWith(t.stringLiteral(newEntryData));
-      } else if (newEntryData?.[import_core.NodeType.Translation]) {
-        const translations = newEntryData[import_core.NodeType.Translation];
-        const firstValue = Object.values(translations)[0];
-        if (firstValue) {
-          targetPropertyPath.get("value").replaceWith(t.stringLiteral(String(firstValue)));
-        }
-      } else {
-        appLogger(
-          `Unhandled data structure for string replacement at '${entryKeyToUpdate}' in ${filePath}.`,
-          { level: "warn", isVerbose: true }
-        );
+      valuePath.replaceWith(buildValueNodeFromData(value));
+      return;
+    }
+    if (Array.isArray(value)) {
+      valuePath.replaceWith(buildValueNodeFromData(value));
+      return;
+    }
+    if (value && typeof value === "object") {
+      if (!valuePath.isObjectExpression()) {
+        valuePath.replaceWith(t.objectExpression([]));
       }
-    } else {
-      const valueType = callExpressionPath.node.type;
-      appLogger(
-        `Updating value of type ${valueType} for '${entryKeyToUpdate}' in ${filePath}`,
-        { level: "info", isVerbose: true }
-      );
-      if (typeof newEntryData === "string") {
-        targetPropertyPath.get("value").replaceWith(t.stringLiteral(newEntryData));
-      } else if (newEntryData?.[import_core.NodeType.Translation]) {
-        const translations = newEntryData[import_core.NodeType.Translation];
-        const localeMatch = filePath.match(/\.([a-z]{2})\.content\.(ts|js)$/i);
-        const locale2 = localeMatch ? localeMatch[1] : Object.keys(translations)[0];
-        if (translations[locale2]) {
-          targetPropertyPath.get("value").replaceWith(t.stringLiteral(String(translations[locale2])));
-        } else {
-          const firstValue = Object.values(translations)[0];
-          if (firstValue) {
-            targetPropertyPath.get("value").replaceWith(t.stringLiteral(String(firstValue)));
-          }
-        }
-      } else {
-        appLogger(
-          `Cannot update value of type ${valueType} for '${entryKeyToUpdate}' in ${filePath}. Unsupported data structure.`,
-          { level: "warn", isVerbose: true }
-        );
+      const objPath = valuePath;
+      for (const [k, v] of Object.entries(value)) {
+        const childProp = ensureObjectProperty(objPath, k);
+        mergeValueIntoProperty(childProp, v, `${propKeyForLogs}.${k}`);
       }
+      return;
+    }
+    valuePath.replaceWith(buildValueNodeFromData(value));
+    return;
+  };
+  for (const [entryKeyToUpdate, newEntryData] of Object.entries(
+    updatesToApply
+  )) {
+    let targetPropertyPath = contentObjectPath.get("properties").find((propPath) => {
+      if (!propPath.isObjectProperty()) return false;
+      const propNode = propPath.node;
+      const keyName = t.isIdentifier(propNode.key) ? propNode.key.name : t.isStringLiteral(propNode.key) ? propNode.key.value : null;
+      return keyName === entryKeyToUpdate;
+    });
+    if (!targetPropertyPath) {
+      const keyNode = t.isValidIdentifier(entryKeyToUpdate) ? t.identifier(entryKeyToUpdate) : t.stringLiteral(entryKeyToUpdate);
+      const newProperty = t.objectProperty(keyNode, t.objectExpression([]));
+      contentObjectPath.node.properties.push(newProperty);
+      const props = contentObjectPath.get("properties");
+      targetPropertyPath = props[props.length - 1];
     }
+    mergeValueIntoProperty(targetPropertyPath, newEntryData, entryKeyToUpdate);
   }
   const generatedCode = (0, import_generator.default)(ast, {
     retainLines: true,