@lingo.dev/_compiler 0.3.0 → 0.3.1

package/build/index.cjs

@@ -4,7 +4,7 @@ var _unplugin = require('unplugin');
 // package.json
 var package_default = {
   name: "@lingo.dev/_compiler",
-  version: "0.3.0",
+  version: "0.3.1",
   description: "Lingo.dev Compiler",
   private: false,
   publishConfig: {
@@ -834,10 +834,9 @@ var LCPCache = class {
   }
   // merge dictionary with current cache, sort files, entries and locales to minimize diffs
   static _mergeLocaleDictionary(currentCache, dictionary, lcp) {
-    const files = _lodash2.default.call(void 0, dictionary.files).mapValues((file, fileName) => ({
-      ...file,
-      entries: _lodash2.default.call(void 0, file.entries).mapValues((entry, entryName) => {
-        const cachedEntry = _nullishCoalesce(_lodash2.default.get(currentCache, ["files", fileName, "entries", entryName]), () => ( {}));
+    const newCache = _lodash2.default.cloneDeep(currentCache);
+    for (const [fileName, fileData] of Object.entries(dictionary.files)) {
+      for (const [entryName, entryValue] of Object.entries(fileData.entries)) {
         const hash = _lodash2.default.get(lcp, [
           "files",
           fileName,
@@ -845,19 +844,33 @@ var LCPCache = class {
           entryName,
           "hash"
         ]);
-        const cachedEntryContent = cachedEntry.hash === hash ? cachedEntry.content : {};
-        const content = _lodash2.default.call(void 0, {
-          ...cachedEntryContent,
-          [dictionary.locale]: entry
+        const existingEntry = _lodash2.default.get(newCache, [
+          "files",
+          fileName,
+          "entries",
+          entryName
+        ]) || {
+          content: {},
+          hash
+        };
+        const mergedContent = _lodash2.default.call(void 0, {
+          ...existingEntry.content,
+          [dictionary.locale]: entryValue
         }).toPairs().sortBy([0]).fromPairs().value();
-        return { content, hash };
-      }).toPairs().sortBy([0]).fromPairs().value()
-    })).toPairs().sortBy([0]).fromPairs().value();
-    const newCache = {
+        _lodash2.default.set(newCache, ["files", fileName, "entries", entryName], {
+          content: mergedContent,
+          hash
+        });
+      }
+    }
+    const sortedFiles = _lodash2.default.call(void 0, newCache.files).toPairs().sortBy([0]).map(([fileName, file]) => {
+      const sortedEntries = _lodash2.default.call(void 0, file.entries).toPairs().sortBy([0]).fromPairs().value();
+      return [fileName, { entries: sortedEntries }];
+    }).fromPairs().value();
+    return {
       version: dictionary.version,
-      files
+      files: sortedFiles
     };
-    return newCache;
   }
   // extract dictionary from cache for given locale, validate entry hash from LCP schema
   static _extractLocaleDictionary(cache, locale, lcp) {

package/build/index.mjs

@@ -4,7 +4,7 @@ import { createUnplugin } from "unplugin";
 // package.json
 var package_default = {
   name: "@lingo.dev/_compiler",
-  version: "0.3.0",
+  version: "0.3.1",
   description: "Lingo.dev Compiler",
   private: false,
   publishConfig: {
@@ -834,10 +834,9 @@ var LCPCache = class {
   }
   // merge dictionary with current cache, sort files, entries and locales to minimize diffs
   static _mergeLocaleDictionary(currentCache, dictionary, lcp) {
-    const files = _3(dictionary.files).mapValues((file, fileName) => ({
-      ...file,
-      entries: _3(file.entries).mapValues((entry, entryName) => {
-        const cachedEntry = _3.get(currentCache, ["files", fileName, "entries", entryName]) ?? {};
+    const newCache = _3.cloneDeep(currentCache);
+    for (const [fileName, fileData] of Object.entries(dictionary.files)) {
+      for (const [entryName, entryValue] of Object.entries(fileData.entries)) {
         const hash = _3.get(lcp, [
           "files",
           fileName,
@@ -845,19 +844,33 @@ var LCPCache = class {
           entryName,
           "hash"
         ]);
-        const cachedEntryContent = cachedEntry.hash === hash ? cachedEntry.content : {};
-        const content = _3({
-          ...cachedEntryContent,
-          [dictionary.locale]: entry
+        const existingEntry = _3.get(newCache, [
+          "files",
+          fileName,
+          "entries",
+          entryName
+        ]) || {
+          content: {},
+          hash
+        };
+        const mergedContent = _3({
+          ...existingEntry.content,
+          [dictionary.locale]: entryValue
         }).toPairs().sortBy([0]).fromPairs().value();
-        return { content, hash };
-      }).toPairs().sortBy([0]).fromPairs().value()
-    })).toPairs().sortBy([0]).fromPairs().value();
-    const newCache = {
+        _3.set(newCache, ["files", fileName, "entries", entryName], {
+          content: mergedContent,
+          hash
+        });
+      }
+    }
+    const sortedFiles = _3(newCache.files).toPairs().sortBy([0]).map(([fileName, file]) => {
+      const sortedEntries = _3(file.entries).toPairs().sortBy([0]).fromPairs().value();
+      return [fileName, { entries: sortedEntries }];
+    }).fromPairs().value();
+    return {
       version: dictionary.version,
-      files
+      files: sortedFiles
     };
-    return newCache;
   }
   // extract dictionary from cache for given locale, validate entry hash from LCP schema
   static _extractLocaleDictionary(cache, locale, lcp) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingo.dev/_compiler",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Lingo.dev Compiler",
   "private": false,
   "publishConfig": {