lingo.dev 0.74.15 → 0.74.17

package/build/cli.cjs

@@ -25,9 +25,9 @@ function getSettings(explicitApiKey) {
   _legacyEnvVarWarning();
   return {
     auth: {
-      apiKey: explicitApiKey || env.LINGODOTDEV_API_KEY || _optionalChain([systemFile, 'access', _21 => _21.auth, 'optionalAccess', _22 => _22.apiKey]) || defaults.auth.apiKey,
-      apiUrl: env.LINGODOTDEV_API_URL || _optionalChain([systemFile, 'access', _23 => _23.auth, 'optionalAccess', _24 => _24.apiUrl]) || defaults.auth.apiUrl,
-      webUrl: env.LINGODOTDEV_WEB_URL || _optionalChain([systemFile, 'access', _25 => _25.auth, 'optionalAccess', _26 => _26.webUrl]) || defaults.auth.webUrl
+      apiKey: explicitApiKey || env.LINGODOTDEV_API_KEY || _optionalChain([systemFile, 'access', _22 => _22.auth, 'optionalAccess', _23 => _23.apiKey]) || defaults.auth.apiKey,
+      apiUrl: env.LINGODOTDEV_API_URL || _optionalChain([systemFile, 'access', _24 => _24.auth, 'optionalAccess', _25 => _25.apiUrl]) || defaults.auth.apiUrl,
+      webUrl: env.LINGODOTDEV_WEB_URL || _optionalChain([systemFile, 'access', _26 => _26.auth, 'optionalAccess', _27 => _27.webUrl]) || defaults.auth.webUrl
     }
   };
 }
@@ -137,7 +137,7 @@ function createAuthenticator(params) {
         });
         if (res.ok) {
           const payload = await res.json();
-          if (!_optionalChain([payload, 'optionalAccess', _27 => _27.email])) {
+          if (!_optionalChain([payload, 'optionalAccess', _28 => _28.email])) {
             return null;
           }
           return {
@@ -269,9 +269,167 @@ function _getConfigFilePath() {
 var _child_process = require('child_process');
 
 var _prompts = require('@inquirer/prompts');
-var openUrl = (path9) => {
+
+// src/cli/utils/find-locale-paths.ts
+
+var _glob = require('glob'); var glob2 = _interopRequireWildcard(_glob);
+
+
+function findLocaleFiles(bucket) {
+  switch (bucket) {
+    case "json":
+      return findLocaleFilesWithExtension(".json");
+    case "yaml":
+      return findLocaleFilesWithExtension(".yml");
+    case "flutter":
+      return findLocaleFilesWithExtension(".arb");
+    case "android":
+      return findLocaleFilesWithExtension(".xml");
+    case "markdown":
+      return findLocaleFilesWithExtension(".md");
+    case "xcode-xcstrings":
+      return findLocaleFilesForFilename("Localizable.xcstrings");
+    case "xcode-strings":
+      return findLocaleFilesForFilename("Localizable.strings");
+    case "xcode-stringsdict":
+      return findLocaleFilesForFilename("Localizable.stringsdict");
+    default:
+      throw new Error(`Unsupported bucket type: ${bucket}`);
+  }
+}
+function findLocaleFilesWithExtension(ext) {
+  const files = _glob.glob.sync(`**/*${ext}`, {
+    ignore: ["node_modules/**", "package*.json", "i18n.json", "lingo.json"]
+  });
+  const localeFilePattern = new RegExp(`[/\\\\]([a-z]{2}(-[A-Z]{2})?)${ext}$`);
+  const localeDirectoryPattern = new RegExp(`[/\\\\]([a-z]{2}(-[A-Z]{2})?)[/\\\\][^/\\\\]+${ext}$`);
+  const potentialLocaleFiles = files.filter(
+    (file) => localeFilePattern.test(file) || localeDirectoryPattern.test(file)
+  );
+  const localeFilesAndPatterns = potentialLocaleFiles.map((file) => {
+    const match = file.match(new RegExp(`[/|\\\\]([a-z]{2}(-[A-Z]{2})?)(/|\\\\|${ext})`));
+    const locale = _optionalChain([match, 'optionalAccess', _29 => _29[1]]);
+    const localeInDir = _optionalChain([match, 'optionalAccess', _30 => _30[3]]) !== ext;
+    const filePattern = localeInDir ? file.replace(`/${locale}/`, `/[locale]/`) : _path2.default.join(_path2.default.dirname(file), `[locale]${ext}`);
+    return { file, locale, pattern: filePattern };
+  }).filter(({ locale }) => {
+    try {
+      __spec.resolveLocaleCode.call(void 0, locale);
+      return true;
+    } catch (e) {
+    }
+    return false;
+  });
+  const grouppedFilesAndPatterns = _lodash2.default.groupBy(localeFilesAndPatterns, "pattern");
+  const patterns = Object.keys(grouppedFilesAndPatterns);
+  if (patterns.length > 0) {
+    return { found: true, patterns };
+  }
+  return { found: false, patterns: [`i18n/[locale]${ext}`] };
+}
+function findLocaleFilesForFilename(fileName) {
+  const pattern = fileName;
+  const localeFiles = _glob.glob.sync(`**/${fileName}`, {
+    ignore: ["node_modules/**", "package*.json", "i18n.json", "lingo.json"]
+  });
+  const localeFilesAndPatterns = localeFiles.map((file) => ({
+    file,
+    pattern: _path2.default.join(_path2.default.dirname(file), pattern)
+  }));
+  const grouppedFilesAndPatterns = _lodash2.default.groupBy(localeFilesAndPatterns, "pattern");
+  const patterns = Object.keys(grouppedFilesAndPatterns);
+  if (patterns.length > 0) {
+    return { found: true, patterns };
+  }
+  return { found: false, patterns: [fileName] };
+}
+
+// src/cli/utils/ensure-patterns.ts
+
+
+function ensurePatterns(patterns, source) {
+  if (patterns.length === 0) {
+    throw new Error("No patterns found");
+  }
+  patterns.forEach((pattern) => {
+    const filePath = pattern.replace("[locale]", source);
+    if (!_fs2.default.existsSync(filePath)) {
+      const defaultContent = getDefaultContent(_path2.default.extname(filePath), source);
+      _fs2.default.mkdirSync(_path2.default.dirname(filePath), { recursive: true });
+      _fs2.default.writeFileSync(filePath, defaultContent);
+    }
+  });
+}
+function getDefaultContent(ext, source) {
+  const defaultGreeting = "Hello from Lingo.dev";
+  switch (ext) {
+    case ".json":
+    case ".arb":
+      return `{
+	"greeting": "${defaultGreeting}"
+}`;
+    case ".yml":
+      return `${source}:
+	greeting: "${defaultGreeting}"`;
+    case ".xml":
+      return `<resources>
+	<string name="greeting">${defaultGreeting}</string>
+</resources>`;
+    case ".md":
+      return `# ${defaultGreeting}`;
+    case ".xcstrings":
+      return `{
+  "sourceLanguage" : "${source}",
+  "strings" : {
+    "${defaultGreeting}" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "${source}" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "${defaultGreeting}"
+          }
+        }
+      }
+    }
+  }
+}`;
+    case ".strings":
+      return `"greeting" = "${defaultGreeting}";`;
+    case ".stringsdict":
+      return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>key</key>
+  <dict>
+    <key>NSStringLocalizedFormatKey</key>
+    <string>%#@count@</string>
+    <key>count</key>
+    <dict>
+      <key>NSStringFormatSpecTypeKey</key>
+      <string>NSStringPluralRuleType</string>
+      <key>NSStringFormatValueTypeKey</key>
+      <string>d</string>
+      <key>zero</key>
+      <string>No items</string>
+      <key>one</key>
+      <string>One item</string>
+      <key>other</key>
+      <string>%d items</string>
+    </dict>
+  </dict>
+</dict>
+</plist>`;
+    default:
+      throw new Error(`Unsupported file extension: ${ext}`);
+  }
+}
+
+// src/cli/cmd/init.ts
+var openUrl = (path11) => {
   const settings = getSettings(void 0);
-  _child_process.spawn.call(void 0, "open", [`${settings.auth.webUrl}${path9}`]);
+  _child_process.spawn.call(void 0, "open", [`${settings.auth.webUrl}${path11}`]);
 };
 var throwHelpError = (option, value) => {
   if (value === "help") {
@@ -327,9 +485,10 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
       }
     }
     return values;
-  }).default([])
+  }).prompt(void 0).default([])
 ).action(async (options) => {
   const settings = getSettings(void 0);
+  const isInteractive = options.interactive;
   const spinner = _ora2.default.call(void 0, ).start("Initializing Lingo.dev project");
   let existingConfig = await getConfig(false);
   if (existingConfig && !options.force) {
@@ -339,14 +498,47 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
   const newConfig = _lodash2.default.cloneDeep(__spec.defaultConfig);
   newConfig.locale.source = options.source;
   newConfig.locale.targets = options.targets;
-  newConfig.buckets = {
-    [options.bucket]: {
-      include: options.paths || []
+  if (!isInteractive) {
+    newConfig.buckets = {
+      [options.bucket]: {
+        include: options.paths || []
+      }
+    };
+  } else {
+    let selectedPatterns = [];
+    const { found, patterns } = findLocaleFiles(options.bucket);
+    if (found) {
+      spinner.succeed("Found existing locale files:");
+      selectedPatterns = await _prompts.checkbox.call(void 0, {
+        message: "Select the paths to use",
+        choices: patterns.map((value) => ({
+          value
+        }))
+      });
+    } else {
+      spinner.succeed("No existing locale files found.");
+      const useDefault = await _prompts.confirm.call(void 0, {
+        message: `Use (and create) default path ${patterns.join(", ")}?`
+      });
+      ensurePatterns(patterns, options.source);
+      if (useDefault) {
+        selectedPatterns = patterns;
+      }
     }
-  };
+    if (selectedPatterns.length === 0) {
+      const customPaths = await _prompts.input.call(void 0, {
+        message: "Enter paths to use"
+      });
+      selectedPatterns = customPaths.includes(",") ? customPaths.split(",") : customPaths.split(" ");
+    }
+    newConfig.buckets = {
+      [options.bucket]: {
+        include: selectedPatterns || []
+      }
+    };
+  }
   await saveConfig(newConfig);
   spinner.succeed("Lingo.dev project initialized");
-  const isInteractive = !process.argv.includes("-y") && !process.argv.includes("--no-interactive");
   if (isInteractive) {
     const openDocs = await _prompts.confirm.call(void 0, { message: "Would you like to see our docs?" });
     if (openDocs) {
@@ -373,7 +565,7 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
         });
         const auth2 = await newAuthenticator.whoami();
         if (auth2) {
-          _ora2.default.call(void 0, ).succeed(`Authenticated as ${_optionalChain([auth2, 'optionalAccess', _28 => _28.email])}`);
+          _ora2.default.call(void 0, ).succeed(`Authenticated as ${_optionalChain([auth2, 'optionalAccess', _31 => _31.email])}`);
         } else {
           _ora2.default.call(void 0, ).fail("Authentication failed.");
         }
@@ -447,12 +639,12 @@ var locale_default = new (0, _interactivecommander.Command)().command("locale").
 // src/cli/utils/buckets.ts
 
 
-var _glob = require('glob'); var glob = _interopRequireWildcard(_glob);
+
 
 function getBuckets(i18nConfig) {
   const result = Object.entries(i18nConfig.buckets).map(([bucketType, bucketEntry]) => {
     const includeItems = bucketEntry.include.map((item) => resolveBucketItem(item));
-    const excludeItems = _optionalChain([bucketEntry, 'access', _29 => _29.exclude, 'optionalAccess', _30 => _30.map, 'call', _31 => _31((item) => resolveBucketItem(item))]);
+    const excludeItems = _optionalChain([bucketEntry, 'access', _32 => _32.exclude, 'optionalAccess', _33 => _33.map, 'call', _34 => _34((item) => resolveBucketItem(item))]);
     return {
       type: bucketType,
       config: extractPathPatterns(i18nConfig.locale.source, includeItems, excludeItems)
@@ -469,7 +661,7 @@ function extractPathPatterns(sourceLocale, include, exclude) {
       })
     )
   );
-  const excludedPatterns = _optionalChain([exclude, 'optionalAccess', _32 => _32.flatMap, 'call', _33 => _33(
+  const excludedPatterns = _optionalChain([exclude, 'optionalAccess', _35 => _35.flatMap, 'call', _36 => _36(
     (pattern) => expandPlaceholderedGlob(pattern.path, __spec.resolveOverridenLocale.call(void 0, sourceLocale, pattern.delimiter)).map(
       (pathPattern) => ({
         pathPattern,
@@ -503,9 +695,9 @@ function expandPlaceholderedGlob(_pathPattern, sourceLocale) {
   }
   const pathPatternChunks = pathPattern.split(_path2.default.sep);
   const localeSegmentIndex = pathPatternChunks.findIndex((segment) => segment.includes("[locale]"));
-  const localePlaceholderIndex = _nullishCoalesce(_optionalChain([pathPatternChunks, 'access', _34 => _34[localeSegmentIndex], 'optionalAccess', _35 => _35.indexOf, 'call', _36 => _36("[locale]")]), () => ( -1));
+  const localePlaceholderIndex = _nullishCoalesce(_optionalChain([pathPatternChunks, 'access', _37 => _37[localeSegmentIndex], 'optionalAccess', _38 => _38.indexOf, 'call', _39 => _39("[locale]")]), () => ( -1));
   const sourcePathPattern = pathPattern.replace(/\[locale\]/g, sourceLocale);
-  const sourcePaths = glob.sync(sourcePathPattern, { follow: true, withFileTypes: true }).filter((file) => file.isFile() || file.isSymbolicLink()).map((file) => file.fullpath()).map((fullpath) => _path2.default.relative(process.cwd(), fullpath));
+  const sourcePaths = glob2.sync(sourcePathPattern, { follow: true, withFileTypes: true }).filter((file) => file.isFile() || file.isSymbolicLink()).map((file) => file.fullpath()).map((fullpath) => _path2.default.relative(process.cwd(), fullpath));
   const placeholderedPaths = sourcePaths.map((sourcePath) => {
     const sourcePathChunks = sourcePath.split(_path2.default.sep);
     if (localeSegmentIndex >= 0 && localePlaceholderIndex >= 0) {
@@ -555,8 +747,8 @@ var files_default = new (0, _interactivecommander.Command)().command("files").de
           } else if (type.target) {
             result.push(...targetPaths);
           }
-          result.forEach((path9) => {
-            console.log(path9);
+          result.forEach((path11) => {
+            console.log(path11);
           });
         }
       }
@@ -588,17 +780,17 @@ function composeLoaders(...loaders) {
   return {
     init: async () => {
       for (const loader of loaders) {
-        await _optionalChain([loader, 'access', _37 => _37.init, 'optionalCall', _38 => _38()]);
+        await _optionalChain([loader, 'access', _40 => _40.init, 'optionalCall', _41 => _41()]);
       }
     },
     setDefaultLocale(locale) {
       for (const loader of loaders) {
-        _optionalChain([loader, 'access', _39 => _39.setDefaultLocale, 'optionalCall', _40 => _40(locale)]);
+        _optionalChain([loader, 'access', _42 => _42.setDefaultLocale, 'optionalCall', _43 => _43(locale)]);
       }
       return this;
     },
-    pull: async (locale, input) => {
-      let result = input;
+    pull: async (locale, input2) => {
+      let result = input2;
       for (let i = 0; i < loaders.length; i++) {
         result = await loaders[i].pull(locale, result);
       }
@@ -624,7 +816,7 @@ function createLoader(lDefinition) {
       if (state.initCtx) {
         return state.initCtx;
       }
-      state.initCtx = await _optionalChain([lDefinition, 'access', _41 => _41.init, 'optionalCall', _42 => _42()]);
+      state.initCtx = await _optionalChain([lDefinition, 'access', _44 => _44.init, 'optionalCall', _45 => _45()]);
       return state.initCtx;
     },
     setDefaultLocale(locale) {
@@ -634,7 +826,7 @@ function createLoader(lDefinition) {
       state.defaultLocale = locale;
       return this;
     },
-    async pull(locale, input) {
+    async pull(locale, input2) {
       if (!state.defaultLocale) {
         throw new Error("Default locale not set");
       }
@@ -642,9 +834,9 @@ function createLoader(lDefinition) {
         throw new Error("The first pull must be for the default locale");
       }
       if (locale === state.defaultLocale) {
-        state.originalInput = input || null;
+        state.originalInput = input2 || null;
       }
-      return lDefinition.pull(locale, input, state.initCtx);
+      return lDefinition.pull(locale, input2, state.initCtx);
     },
     async push(locale, data) {
       if (!state.defaultLocale) {
@@ -663,8 +855,8 @@ function createLoader(lDefinition) {
 var _jsonrepair = require('jsonrepair');
 function createJsonLoader() {
   return createLoader({
-    pull: async (locale, input) => {
-      const jsonString = input || "{}";
+    pull: async (locale, input2) => {
+      const jsonString = input2 || "{}";
       let result;
       try {
         result = JSON.parse(jsonString);
@@ -685,30 +877,43 @@ var _flat = require('flat');
 
 var OBJECT_NUMERIC_KEY_PREFIX = "__lingodotdev__obj__";
 function createFlatLoader() {
-  let denormalizedKeysMap = {};
+  return composeLoaders(createDenormalizeLoader(), createNormalizeLoader());
+}
+function createDenormalizeLoader() {
   return createLoader({
-    pull: async (locale, input) => {
-      const denormalized = denormalizeObjectKeys(input || {});
-      const flattened = _flat.flatten.call(void 0, denormalized, {
+    pull: async (locale, input2) => {
+      const inputDenormalized = denormalizeObjectKeys(input2 || {});
+      const denormalized = _flat.flatten.call(void 0, inputDenormalized, {
         delimiter: "/",
         transformKey(key) {
           return encodeURIComponent(String(key));
         }
       });
-      denormalizedKeysMap = { ...denormalizedKeysMap, ...buildDenormalizedKeysMap(flattened) };
-      const normalized = normalizeObjectKeys(flattened);
+      const keysMap = buildDenormalizedKeysMap(denormalized);
+      return { denormalized, keysMap };
+    },
+    push: async (locale, { denormalized }) => {
+      const normalized = normalizeObjectKeys(denormalized);
+      return normalized;
+    }
+  });
+}
+function createNormalizeLoader() {
+  return createLoader({
+    pull: async (locale, input2) => {
+      const normalized = normalizeObjectKeys(input2.denormalized);
       return normalized;
     },
-    push: async (locale, data) => {
-      const denormalized = mapDenormalizedKeys(data, denormalizedKeysMap);
-      const unflattened = _flat.unflatten.call(void 0, denormalized || {}, {
+    push: async (locale, data, originalInput) => {
+      const keysMap = _nullishCoalesce(_optionalChain([originalInput, 'optionalAccess', _46 => _46.keysMap]), () => ( {}));
+      const input2 = mapDenormalizedKeys(data, keysMap);
+      const denormalized = _flat.unflatten.call(void 0, input2, {
         delimiter: "/",
         transformKey(key) {
           return decodeURIComponent(String(key));
         }
       });
-      const normalized = normalizeObjectKeys(unflattened);
-      return normalized;
+      return { denormalized, keysMap: keysMap || {} };
     }
   });
 }
@@ -728,7 +933,7 @@ function buildDenormalizedKeysMap(obj) {
 function mapDenormalizedKeys(obj, denormalizedKeysMap) {
   return Object.keys(obj).reduce(
     (acc, key) => {
-      const denormalizedKey = denormalizedKeysMap[key];
+      const denormalizedKey = _nullishCoalesce(denormalizedKeysMap[key], () => ( key));
       acc[denormalizedKey] = obj[key];
       return acc;
     },
@@ -774,7 +979,7 @@ function createTextFileLoader(pathPattern) {
       const trimmedResult = result.trim();
       return trimmedResult;
     },
-    async push(locale, data, _20, originalLocale) {
+    async push(locale, data, _21, originalLocale) {
       const draftPath = pathPattern.replace("[locale]", locale);
       const finalPath = _path2.default.resolve(draftPath);
       const dirPath = _path2.default.dirname(finalPath);
@@ -803,8 +1008,8 @@ async function getTrailingNewLine(pathPattern, locale, originalLocale) {
   if (!templateData) {
     templateData = await readFileForLocale(pathPattern, originalLocale);
   }
-  if (_optionalChain([templateData, 'optionalAccess', _43 => _43.match, 'call', _44 => _44(/[\r\n]$/)])) {
-    const ending = _optionalChain([templateData, 'optionalAccess', _45 => _45.includes, 'call', _46 => _46("\r\n")]) ? "\r\n" : _optionalChain([templateData, 'optionalAccess', _47 => _47.includes, 'call', _48 => _48("\r")]) ? "\r" : "\n";
+  if (_optionalChain([templateData, 'optionalAccess', _47 => _47.match, 'call', _48 => _48(/[\r\n]$/)])) {
+    const ending = _optionalChain([templateData, 'optionalAccess', _49 => _49.includes, 'call', _50 => _50("\r\n")]) ? "\r\n" : _optionalChain([templateData, 'optionalAccess', _51 => _51.includes, 'call', _52 => _52("\r")]) ? "\r" : "\n";
     return ending;
   }
   return "";
@@ -814,8 +1019,8 @@ async function getTrailingNewLine(pathPattern, locale, originalLocale) {
 var _yaml = require('yaml'); var _yaml2 = _interopRequireDefault(_yaml);
 function createYamlLoader() {
   return createLoader({
-    async pull(locale, input) {
-      return _yaml2.default.parse(input) || {};
+    async pull(locale, input2) {
+      return _yaml2.default.parse(input2) || {};
     },
     async push(locale, payload) {
       return _yaml2.default.stringify(payload, {
@@ -828,8 +1033,8 @@ function createYamlLoader() {
 // src/cli/loaders/root-key.ts
 function createRootKeyLoader(replaceAll = false) {
   return createLoader({
-    async pull(locale, input) {
-      const result = input[locale];
+    async pull(locale, input2) {
+      const result = input2[locale];
       return result;
     },
     async push(locale, data, originalInput) {
@@ -846,8 +1051,8 @@ function createRootKeyLoader(replaceAll = false) {
 
 function createFlutterLoader() {
   return createLoader({
-    async pull(locale, input) {
-      const result = _lodash2.default.pickBy(input, (value, key) => !key.startsWith("@"));
+    async pull(locale, input2) {
+      const result = _lodash2.default.pickBy(input2, (value, key) => !key.startsWith("@"));
       return result;
     },
     async push(locale, data, originalInput) {
@@ -861,10 +1066,10 @@ function createFlutterLoader() {
 var _xml2js = require('xml2js');
 function createAndroidLoader() {
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       try {
         const result = {};
-        const parsed = !input ? { resources: {} } : await _xml2js.parseStringPromise.call(void 0, input, { explicitArray: true });
+        const parsed = !input2 ? { resources: {} } : await _xml2js.parseStringPromise.call(void 0, input2, { explicitArray: true });
         if (!parsed || !parsed.resources) {
           console.warn("No resources found in the Android resource file");
           return result;
@@ -957,12 +1162,12 @@ var _sync3 = require('csv-stringify/sync');
 function createCsvLoader() {
   return createLoader({
     async pull(locale, _input) {
-      const input = _sync.parse.call(void 0, _input, {
+      const input2 = _sync.parse.call(void 0, _input, {
         columns: true,
         skip_empty_lines: true
       });
       const result = {};
-      _lodash2.default.forEach(input, (row) => {
+      _lodash2.default.forEach(input2, (row) => {
         const key = row.id;
         if (key && row[locale] && row[locale].trim() !== "") {
           result[key] = row[locale];
@@ -971,16 +1176,16 @@ function createCsvLoader() {
       return result;
     },
     async push(locale, data, originalInput) {
-      const input = _sync.parse.call(void 0, originalInput || "", {
+      const input2 = _sync.parse.call(void 0, originalInput || "", {
         columns: true,
         skip_empty_lines: true
       });
-      const columns = input.length > 0 ? Object.keys(input[0]) : ["id", locale];
-      const updatedRows = input.map((row) => ({
+      const columns = input2.length > 0 ? Object.keys(input2[0]) : ["id", locale];
+      const updatedRows = input2.map((row) => ({
         ...row,
         [locale]: data[row.id] || row[locale] || ""
       }));
-      const existingKeys = new Set(input.map((row) => row.id));
+      const existingKeys = new Set(input2.map((row) => row.id));
       Object.entries(data).forEach(([key, value]) => {
         if (!existingKeys.has(key)) {
           const newRow = {
@@ -1015,9 +1220,9 @@ function createHtmlLoader() {
   };
   const UNLOCALIZABLE_TAGS = ["script", "style"];
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       const result = {};
-      const dom = new (0, _jsdom.JSDOM)(input);
+      const dom = new (0, _jsdom.JSDOM)(input2);
       const document = dom.window.document;
       const getPath = (node, attribute) => {
         const indices = [];
@@ -1031,7 +1236,7 @@ function createHtmlLoader() {
             break;
           }
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _49 => _49.textContent, 'optionalAccess', _50 => _50.trim, 'call', _51 => _51()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _53 => _53.textContent, 'optionalAccess', _54 => _54.trim, 'call', _55 => _55()])
           );
           const index = siblings.indexOf(current);
           if (index !== -1) {
@@ -1066,11 +1271,11 @@ function createHtmlLoader() {
               result[getPath(element, attr)] = value;
             }
           });
-          Array.from(element.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _52 => _52.textContent, 'optionalAccess', _53 => _53.trim, 'call', _54 => _54()])).forEach(processNode);
+          Array.from(element.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _56 => _56.textContent, 'optionalAccess', _57 => _57.trim, 'call', _58 => _58()])).forEach(processNode);
         }
       };
-      Array.from(document.head.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _55 => _55.textContent, 'optionalAccess', _56 => _56.trim, 'call', _57 => _57()])).forEach(processNode);
-      Array.from(document.body.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _58 => _58.textContent, 'optionalAccess', _59 => _59.trim, 'call', _60 => _60()])).forEach(processNode);
+      Array.from(document.head.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _59 => _59.textContent, 'optionalAccess', _60 => _60.trim, 'call', _61 => _61()])).forEach(processNode);
+      Array.from(document.body.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _62 => _62.textContent, 'optionalAccess', _63 => _63.trim, 'call', _64 => _64()])).forEach(processNode);
       return result;
     },
     async push(locale, data, originalInput) {
@@ -1083,16 +1288,16 @@ function createHtmlLoader() {
         const bDepth = b.split("/").length;
         return aDepth - bDepth;
       });
-      paths.forEach((path9) => {
-        const value = data[path9];
-        const [nodePath, attribute] = path9.split("#");
+      paths.forEach((path11) => {
+        const value = data[path11];
+        const [nodePath, attribute] = path11.split("#");
         const [rootTag, ...indices] = nodePath.split("/");
         let parent = rootTag === "head" ? document.head : document.body;
         let current = parent;
         for (let i = 0; i < indices.length; i++) {
           const index = parseInt(indices[i]);
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _61 => _61.textContent, 'optionalAccess', _62 => _62.trim, 'call', _63 => _63()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _65 => _65.textContent, 'optionalAccess', _66 => _66.trim, 'call', _67 => _67()])
           );
           if (index >= siblings.length) {
             if (i === indices.length - 1) {
@@ -1137,8 +1342,8 @@ var yamlEngine = {
 };
 function createMarkdownLoader() {
   return createLoader({
-    async pull(locale, input) {
-      const { data: frontmatter, content } = _graymatter2.default.call(void 0, input, {
+    async pull(locale, input2) {
+      const { data: frontmatter, content } = _graymatter2.default.call(void 0, input2, {
         engines: {
           yaml: yamlEngine
         }
@@ -1188,7 +1393,7 @@ function createPropertiesLoader() {
       return result;
     },
     async push(locale, payload) {
-      const result = Object.entries(payload).filter(([_20, value]) => value != null).map(([key, value]) => `${key}=${value}`).join("\n");
+      const result = Object.entries(payload).filter(([_21, value]) => value != null).map(([key, value]) => `${key}=${value}`).join("\n");
       return result;
     }
   });
@@ -1199,7 +1404,7 @@ function isSkippableLine(line) {
 function parsePropertyLine(line) {
   const [key, ...valueParts] = line.split("=");
   return {
-    key: _optionalChain([key, 'optionalAccess', _64 => _64.trim, 'call', _65 => _65()]) || "",
+    key: _optionalChain([key, 'optionalAccess', _68 => _68.trim, 'call', _69 => _69()]) || "",
     value: valueParts.join("=").trim()
   };
 }
@@ -1207,8 +1412,8 @@ function parsePropertyLine(line) {
 // src/cli/loaders/xcode-strings.ts
 function createXcodeStringsLoader() {
   return createLoader({
-    async pull(locale, input) {
-      const lines = input.split("\n");
+    async pull(locale, input2) {
+      const lines = input2.split("\n");
       const result = {};
       for (const line of lines) {
         const trimmedLine = line.trim();
@@ -1249,9 +1454,9 @@ var emptyData = [
 ].join("\n");
 function createXcodeStringsdictLoader() {
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       try {
-        const parsed = _plist2.default.parse(input || emptyData);
+        const parsed = _plist2.default.parse(input2 || emptyData);
         if (typeof parsed !== "object" || parsed === null) {
           throw new CLIError({
             message: "Invalid .stringsdict format",
@@ -1277,11 +1482,11 @@ function createXcodeStringsdictLoader() {
 
 function createXcodeXcstringsLoader() {
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       const resultData = {};
-      for (const [translationKey, _translationEntity] of Object.entries(input.strings)) {
+      for (const [translationKey, _translationEntity] of Object.entries(input2.strings)) {
         const rootTranslationEntity = _translationEntity;
-        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _66 => _66.localizations, 'optionalAccess', _67 => _67[locale]]);
+        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _70 => _70.localizations, 'optionalAccess', _71 => _71[locale]]);
         if (langTranslationEntity) {
           if ("stringUnit" in langTranslationEntity) {
             resultData[translationKey] = langTranslationEntity.stringUnit.value;
@@ -1290,7 +1495,7 @@ function createXcodeXcstringsLoader() {
               resultData[translationKey] = {};
               const pluralForms = langTranslationEntity.variations.plural;
               for (const form in pluralForms) {
-                if (_optionalChain([pluralForms, 'access', _68 => _68[form], 'optionalAccess', _69 => _69.stringUnit, 'optionalAccess', _70 => _70.value])) {
+                if (_optionalChain([pluralForms, 'access', _72 => _72[form], 'optionalAccess', _73 => _73.stringUnit, 'optionalAccess', _74 => _74.value])) {
                   resultData[translationKey][form] = pluralForms[form].stringUnit.value;
                 }
               }
@@ -1383,7 +1588,7 @@ async function loadPrettierConfig() {
 
 var _isurl = require('is-url'); var _isurl2 = _interopRequireDefault(_isurl);
 var _datefns = require('date-fns');
-function createUnlocalizableLoader() {
+function createUnlocalizableLoader(isCacheRestore = false) {
   const rules = {
     isEmpty: (v) => _lodash2.default.isEmpty(v),
     isNumber: (v) => !_lodash2.default.isNaN(_lodash2.default.toNumber(v)),
@@ -1393,19 +1598,22 @@ function createUnlocalizableLoader() {
     isUrl: (v) => _lodash2.default.isString(v) && _isurl2.default.call(void 0, v)
   };
   return createLoader({
-    async pull(locale, input) {
-      const passthroughKeys = Object.entries(input).filter(([key, value]) => {
+    async pull(locale, input2) {
+      const passthroughKeys = Object.entries(input2).filter(([key, value]) => {
         for (const [ruleName, rule] of Object.entries(rules)) {
           if (rule(value)) {
             return true;
           }
         }
         return false;
-      }).map(([key, _20]) => key);
-      const result = _lodash2.default.omitBy(input, (_20, key) => passthroughKeys.includes(key));
+      }).map(([key, _21]) => key);
+      const result = _lodash2.default.omitBy(input2, (_21, key) => passthroughKeys.includes(key));
       return result;
     },
     async push(locale, data, originalInput) {
+      if (isCacheRestore) {
+        return _lodash2.default.merge({}, data);
+      }
       const result = _lodash2.default.merge({}, originalInput, data);
       return result;
     }
@@ -1426,10 +1634,10 @@ function createPoLoader(params = { multiline: false }) {
 }
 function createPoDataLoader(params) {
   return createLoader({
-    async pull(locale, input) {
-      const parsedPo = _gettextparser2.default.po.parse(input);
+    async pull(locale, input2) {
+      const parsedPo = _gettextparser2.default.po.parse(input2);
       const result = {};
-      const sections = input.split("\n\n").filter(Boolean);
+      const sections = input2.split("\n\n").filter(Boolean);
       for (const section of sections) {
         const sectionPo = _gettextparser2.default.po.parse(section);
         const contextKey = _lodash2.default.keys(sectionPo.translations)[0];
@@ -1437,7 +1645,7 @@ function createPoDataLoader(params) {
         Object.entries(entries).forEach(([msgid, entry]) => {
           if (msgid && entry.msgid) {
             const context = entry.msgctxt || "";
-            const fullEntry = _optionalChain([parsedPo, 'access', _71 => _71.translations, 'access', _72 => _72[context], 'optionalAccess', _73 => _73[msgid]]);
+            const fullEntry = _optionalChain([parsedPo, 'access', _75 => _75.translations, 'access', _76 => _76[context], 'optionalAccess', _77 => _77[msgid]]);
             if (fullEntry) {
               result[msgid] = fullEntry;
             }
@@ -1447,7 +1655,7 @@ function createPoDataLoader(params) {
       return result;
     },
     async push(locale, data, originalInput) {
-      const sections = _optionalChain([originalInput, 'optionalAccess', _74 => _74.split, 'call', _75 => _75("\n\n"), 'access', _76 => _76.filter, 'call', _77 => _77(Boolean)]) || [];
+      const sections = _optionalChain([originalInput, 'optionalAccess', _78 => _78.split, 'call', _79 => _79("\n\n"), 'access', _80 => _80.filter, 'call', _81 => _81(Boolean)]) || [];
       const result = sections.map((section) => {
         const sectionPo = _gettextparser2.default.po.parse(section);
         const contextKey = _lodash2.default.keys(sectionPo.translations)[0];
@@ -1474,8 +1682,8 @@ function createPoDataLoader(params) {
 }
 function createPoContentLoader() {
   return createLoader({
-    async pull(locale, input) {
-      const result = _lodash2.default.chain(input).entries().filter(([, entry]) => !!entry.msgid).map(([, entry]) => [
+    async pull(locale, input2) {
+      const result = _lodash2.default.chain(input2).entries().filter(([, entry]) => !!entry.msgid).map(([, entry]) => [
         entry.msgid,
         {
           singular: entry.msgstr[0] || entry.msgid,
@@ -1489,7 +1697,7 @@ function createPoContentLoader() {
         entry.msgid,
         {
           ...entry,
-          msgstr: [_optionalChain([data, 'access', _78 => _78[entry.msgid], 'optionalAccess', _79 => _79.singular]), _optionalChain([data, 'access', _80 => _80[entry.msgid], 'optionalAccess', _81 => _81.plural]) || null].filter(Boolean)
+          msgstr: [_optionalChain([data, 'access', _82 => _82[entry.msgid], 'optionalAccess', _83 => _83.singular]), _optionalChain([data, 'access', _84 => _84[entry.msgid], 'optionalAccess', _85 => _85.plural]) || null].filter(Boolean)
         }
       ]).fromPairs().value();
       return result;
@@ -1501,8 +1709,8 @@ function createPoContentLoader() {
 var _xliff = require('xliff'); var _xliff2 = _interopRequireDefault(_xliff);
 function createXliffLoader() {
   return createLoader({
-    async pull(locale, input) {
-      const js = await _xliff2.default.xliff2js(input);
+    async pull(locale, input2) {
+      const js = await _xliff2.default.xliff2js(input2);
       return js || {};
     },
     async push(locale, payload) {
@@ -1519,10 +1727,10 @@ function normalizeXMLString(xmlString) {
 }
 function createXmlLoader() {
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       let result = {};
       try {
-        const parsed = await _xml2js.parseStringPromise.call(void 0, input, {
+        const parsed = await _xml2js.parseStringPromise.call(void 0, input2, {
           explicitArray: false,
           mergeAttrs: false,
           normalize: true,
@@ -1557,8 +1765,8 @@ var _srtparser2 = require('srt-parser-2'); var _srtparser22 = _interopRequireDef
 function createSrtLoader() {
   const parser = new (0, _srtparser22.default)();
   return createLoader({
-    async pull(locale, input) {
-      const parsed = parser.fromSrt(input) || [];
+    async pull(locale, input2) {
+      const parsed = parser.fromSrt(input2) || [];
       const result = {};
       parsed.forEach((entry) => {
         const key = `${entry.id}#${entry.startTime}-${entry.endTime}`;
@@ -1611,9 +1819,9 @@ var datoSettingsSchema = _zod2.default.object({
 
 function createDatoFilterLoader() {
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       const result = {};
-      for (const [modelId, modelInfo] of _lodash2.default.entries(input)) {
+      for (const [modelId, modelInfo] of _lodash2.default.entries(input2)) {
         result[modelId] = {};
         for (const record of modelInfo.records) {
           result[modelId][record.id] = _lodash2.default.chain(modelInfo.fields).mapKeys((field) => field.api_key).mapValues((field) => _lodash2.default.get(record, [field.api_key, locale])).value();
@@ -1735,7 +1943,7 @@ function createDatoClient(params) {
           only_valid: "true",
           ids: !records.length ? void 0 : records.join(",")
         }
-      }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _82 => _82.response, 'optionalAccess', _83 => _83.body, 'optionalAccess', _84 => _84.data, 'optionalAccess', _85 => _85[0]]) || error));
+      }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _86 => _86.response, 'optionalAccess', _87 => _87.body, 'optionalAccess', _88 => _88.data, 'optionalAccess', _89 => _89[0]]) || error));
     },
     findRecordsForModel: async (modelId, records) => {
       try {
@@ -1745,9 +1953,9 @@ function createDatoClient(params) {
           filter: {
             type: modelId,
             only_valid: "true",
-            ids: !_optionalChain([records, 'optionalAccess', _86 => _86.length]) ? void 0 : records.join(",")
+            ids: !_optionalChain([records, 'optionalAccess', _90 => _90.length]) ? void 0 : records.join(",")
           }
-        }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _87 => _87.response, 'optionalAccess', _88 => _88.body, 'optionalAccess', _89 => _89.data, 'optionalAccess', _90 => _90[0]]) || error));
+        }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _91 => _91.response, 'optionalAccess', _92 => _92.body, 'optionalAccess', _93 => _93.data, 'optionalAccess', _94 => _94[0]]) || error));
         return result;
       } catch (_error) {
         throw new Error(
@@ -1761,9 +1969,9 @@ function createDatoClient(params) {
     },
     updateRecord: async (id, payload) => {
       try {
-        await dato.items.update(id, payload).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _91 => _91.response, 'optionalAccess', _92 => _92.body, 'optionalAccess', _93 => _93.data, 'optionalAccess', _94 => _94[0]]) || error));
+        await dato.items.update(id, payload).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _95 => _95.response, 'optionalAccess', _96 => _96.body, 'optionalAccess', _97 => _97.data, 'optionalAccess', _98 => _98[0]]) || error));
       } catch (_error) {
-        if (_optionalChain([_error, 'optionalAccess', _95 => _95.attributes, 'optionalAccess', _96 => _96.details, 'optionalAccess', _97 => _97.message])) {
+        if (_optionalChain([_error, 'optionalAccess', _99 => _99.attributes, 'optionalAccess', _100 => _100.details, 'optionalAccess', _101 => _101.message])) {
           throw new Error(
             [
               `${_error.attributes.details.message}`,
@@ -1784,9 +1992,9 @@ function createDatoClient(params) {
     },
     enableFieldLocalization: async (args) => {
       try {
-        await dato.fields.update(`${args.modelId}::${args.fieldId}`, { localized: true }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _98 => _98.response, 'optionalAccess', _99 => _99.body, 'optionalAccess', _100 => _100.data, 'optionalAccess', _101 => _101[0]]) || error));
+        await dato.fields.update(`${args.modelId}::${args.fieldId}`, { localized: true }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _102 => _102.response, 'optionalAccess', _103 => _103.body, 'optionalAccess', _104 => _104.data, 'optionalAccess', _105 => _105[0]]) || error));
       } catch (_error) {
-        if (_optionalChain([_error, 'optionalAccess', _102 => _102.attributes, 'optionalAccess', _103 => _103.code]) === "NOT_FOUND") {
+        if (_optionalChain([_error, 'optionalAccess', _106 => _106.attributes, 'optionalAccess', _107 => _107.code]) === "NOT_FOUND") {
           throw new Error(
             [
               `Field "${args.fieldId}" not found in model "${args.modelId}".`,
@@ -1794,7 +2002,7 @@ function createDatoClient(params) {
             ].join("\n\n")
           );
         }
-        if (_optionalChain([_error, 'optionalAccess', _104 => _104.attributes, 'optionalAccess', _105 => _105.details, 'optionalAccess', _106 => _106.message])) {
+        if (_optionalChain([_error, 'optionalAccess', _108 => _108.attributes, 'optionalAccess', _109 => _109.details, 'optionalAccess', _110 => _110.message])) {
           throw new Error(
             [`${_error.attributes.details.message}`, `Error: ${JSON.stringify(_error, null, 2)}`].join("\n\n")
           );
@@ -1860,7 +2068,7 @@ function createDatoApiLoader(config, onConfigUpdate) {
             }
           }
           const records = await dato.findRecordsForModel(modelId);
-          const recordChoices = createRecordChoices(records, _optionalChain([config, 'access', _107 => _107.models, 'access', _108 => _108[modelId], 'optionalAccess', _109 => _109.records]) || [], project);
+          const recordChoices = createRecordChoices(records, _optionalChain([config, 'access', _111 => _111.models, 'access', _112 => _112[modelId], 'optionalAccess', _113 => _113.records]) || [], project);
           const selectedRecords = await promptRecordSelection(modelName, recordChoices);
           result.models[modelId].records = records.filter((record) => selectedRecords.includes(record.id));
           updatedConfig.models[modelId].records = selectedRecords;
@@ -1870,16 +2078,16 @@ function createDatoApiLoader(config, onConfigUpdate) {
       onConfigUpdate(updatedConfig);
       return result;
     },
-    async pull(locale, input, initCtx) {
+    async pull(locale, input2, initCtx) {
       const result = {};
-      for (const modelId of _lodash2.default.keys(_optionalChain([initCtx, 'optionalAccess', _110 => _110.models]) || {})) {
-        let records = _optionalChain([initCtx, 'optionalAccess', _111 => _111.models, 'access', _112 => _112[modelId], 'access', _113 => _113.records]) || [];
+      for (const modelId of _lodash2.default.keys(_optionalChain([initCtx, 'optionalAccess', _114 => _114.models]) || {})) {
+        let records = _optionalChain([initCtx, 'optionalAccess', _115 => _115.models, 'access', _116 => _116[modelId], 'access', _117 => _117.records]) || [];
         const recordIds = records.map((record) => record.id);
         records = await dato.findRecords(recordIds);
         console.log(`Fetched ${records.length} records for model ${modelId}`);
         if (records.length > 0) {
           result[modelId] = {
-            fields: _optionalChain([initCtx, 'optionalAccess', _114 => _114.models, 'optionalAccess', _115 => _115[modelId], 'optionalAccess', _116 => _116.fields]) || [],
+            fields: _optionalChain([initCtx, 'optionalAccess', _118 => _118.models, 'optionalAccess', _119 => _119[modelId], 'optionalAccess', _120 => _120.fields]) || [],
             records
           };
         }
@@ -1938,7 +2146,7 @@ function createRecordChoices(records, selectedIds = [], project) {
   return records.map((record) => ({
     name: `${record.id} - https://${project.internal_domain}/editor/item_types/${record.item_type.id}/items/${record.id}`,
     value: record.id,
-    checked: _optionalChain([selectedIds, 'optionalAccess', _117 => _117.includes, 'call', _118 => _118(record.id)])
+    checked: _optionalChain([selectedIds, 'optionalAccess', _121 => _121.includes, 'call', _122 => _122(record.id)])
   }));
 }
 async function promptRecordSelection(modelName, choices) {
@@ -1982,9 +2190,9 @@ async function promptModelSelection(choices) {
 
 function createDatoExtractLoader() {
   return createLoader({
-    async pull(locale, input) {
+    async pull(locale, input2) {
       const result = {};
-      for (const [modelId, modelInfo] of _lodash2.default.entries(input)) {
+      for (const [modelId, modelInfo] of _lodash2.default.entries(input2)) {
         for (const [recordId, record] of _lodash2.default.entries(modelInfo)) {
           for (const [fieldName, fieldValue] of _lodash2.default.entries(record)) {
             const parsedValue = createParsedDatoValue(fieldValue);
@@ -2089,18 +2297,18 @@ function createRawDatoValue(parsedDatoValue, originalRawDatoValue, isClean = fal
 }
 function serializeStructuredText(rawStructuredText) {
   return serializeStructuredTextNode(rawStructuredText);
-  function serializeStructuredTextNode(node, path9 = [], acc = {}) {
+  function serializeStructuredTextNode(node, path11 = [], acc = {}) {
     if ("document" in node) {
-      return serializeStructuredTextNode(node.document, [...path9, "document"], acc);
+      return serializeStructuredTextNode(node.document, [...path11, "document"], acc);
     }
     if (!_lodash2.default.isNil(node.value)) {
-      acc[[...path9, "value"].join(".")] = node.value;
+      acc[[...path11, "value"].join(".")] = node.value;
     } else if (_lodash2.default.get(node, "type") === "block") {
-      acc[[...path9, "item"].join(".")] = serializeBlock(node.item);
+      acc[[...path11, "item"].join(".")] = serializeBlock(node.item);
     }
     if (node.children) {
       for (let i = 0; i < node.children.length; i++) {
-        serializeStructuredTextNode(node.children[i], [...path9, i.toString()], acc);
+        serializeStructuredTextNode(node.children[i], [...path11, i.toString()], acc);
       }
     }
     return acc;
@@ -2159,8 +2367,8 @@ function deserializeBlockList(parsedBlockList, originalRawBlockList, isClean = f
 }
 function deserializeStructuredText(parsedStructuredText, originalRawStructuredText) {
   const result = _lodash2.default.cloneDeep(originalRawStructuredText);
-  for (const [path9, value] of _lodash2.default.entries(parsedStructuredText)) {
-    const realPath = _lodash2.default.chain(path9.split(".")).flatMap((s) => !_lodash2.default.isNaN(_lodash2.default.toNumber(s)) ? ["children", s] : s).value();
+  for (const [path11, value] of _lodash2.default.entries(parsedStructuredText)) {
+    const realPath = _lodash2.default.chain(path11.split(".")).flatMap((s) => !_lodash2.default.isNaN(_lodash2.default.toNumber(s)) ? ["children", s] : s).value();
     const deserializedValue = createRawDatoValue(value, _lodash2.default.get(originalRawStructuredText, realPath), true);
     _lodash2.default.set(result, realPath, deserializedValue);
   }
@@ -2204,8 +2412,8 @@ function createDatoLoader(configFilePath) {
 var _nodewebvtt = require('node-webvtt'); var _nodewebvtt2 = _interopRequireDefault(_nodewebvtt);
 function createVttLoader() {
   return createLoader({
-    async pull(locale, input) {
-      const vtt = _optionalChain([_nodewebvtt2.default, 'access', _119 => _119.parse, 'call', _120 => _120(input), 'optionalAccess', _121 => _121.cues]);
+    async pull(locale, input2) {
+      const vtt = _optionalChain([_nodewebvtt2.default, 'access', _123 => _123.parse, 'call', _124 => _124(input2), 'optionalAccess', _125 => _125.cues]);
       if (Object.keys(vtt).length === 0) {
         return {};
       } else {
@@ -2228,12 +2436,12 @@ function createVttLoader() {
           text
         };
       });
-      const input = {
+      const input2 = {
         valid: true,
         strict: true,
         cues: output
       };
-      return _nodewebvtt2.default.compile(input);
+      return _nodewebvtt2.default.compile(input2);
     }
   });
 }
@@ -2246,9 +2454,9 @@ function createVariableLoader(params) {
 function variableExtractLoader(params) {
   const specifierPattern = getFormatSpecifierPattern(params.type);
   return createLoader({
-    pull: async (locale, input) => {
+    pull: async (locale, input2) => {
       const result = {};
-      for (const [key, value] of Object.entries(input)) {
+      for (const [key, value] of Object.entries(input2)) {
         const matches = value.match(specifierPattern) || [];
         result[key] = result[key] || {
           value,
@@ -2257,7 +2465,7 @@ function variableExtractLoader(params) {
         for (let i = 0; i < matches.length; i++) {
           const match = matches[i];
           const currentValue = result[key].value;
-          const newValue = _optionalChain([currentValue, 'optionalAccess', _122 => _122.replace, 'call', _123 => _123(match, `{variable:${i}}`)]);
+          const newValue = _optionalChain([currentValue, 'optionalAccess', _126 => _126.replace, 'call', _127 => _127(match, `{variable:${i}}`)]);
           result[key].value = newValue;
           result[key].variables[i] = match;
         }
@@ -2271,7 +2479,7 @@ function variableExtractLoader(params) {
         for (let i = 0; i < valueObj.variables.length; i++) {
           const variable = valueObj.variables[i];
           const currentValue = result[key];
-          const newValue = _optionalChain([currentValue, 'optionalAccess', _124 => _124.replace, 'call', _125 => _125(`{variable:${i}}`, variable)]);
+          const newValue = _optionalChain([currentValue, 'optionalAccess', _128 => _128.replace, 'call', _129 => _129(`{variable:${i}}`, variable)]);
           result[key] = newValue;
         }
       }
@@ -2281,8 +2489,8 @@ function variableExtractLoader(params) {
 }
 function variableContentLoader() {
   return createLoader({
-    pull: async (locale, input) => {
-      const result = _lodash2.default.mapValues(input, (payload) => payload.value);
+    pull: async (locale, input2) => {
+      const result = _lodash2.default.mapValues(input2, (payload) => payload.value);
       return result;
     },
     push: async (locale, data, originalInput) => {
@@ -2312,11 +2520,11 @@ function getFormatSpecifierPattern(type) {
 
 function createSyncLoader() {
   return createLoader({
-    async pull(locale, input, originalInput) {
+    async pull(locale, input2, originalInput) {
       if (!originalInput) {
-        return input;
+        return input2;
       }
-      return _lodash2.default.chain(originalInput).mapValues((value, key) => input[key]).value();
+      return _lodash2.default.chain(originalInput).mapValues((value, key) => input2[key]).value();
     },
     async push(locale, data, originalInput) {
       if (!originalInput) {
@@ -2387,7 +2595,7 @@ function createPlutilJsonTextLoader() {
 }
 
 // src/cli/loaders/index.ts
-function createBucketLoader(bucketType, bucketPathPattern) {
+function createBucketLoader(bucketType, bucketPathPattern, { isCacheRestore = false } = {}) {
   switch (bucketType) {
     default:
       throw new Error(`Unsupported bucket type: ${bucketType}`);
@@ -2397,7 +2605,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createAndroidLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "csv":
       return composeLoaders(
@@ -2405,7 +2613,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createCsvLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "html":
       return composeLoaders(
@@ -2413,7 +2621,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createPrettierLoader({ parser: "html", alwaysFormat: true }),
         createHtmlLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "json":
       return composeLoaders(
@@ -2422,7 +2630,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createJsonLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "markdown":
       return composeLoaders(
@@ -2430,7 +2638,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createPrettierLoader({ parser: "markdown" }),
         createMarkdownLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "po":
       return composeLoaders(
@@ -2438,7 +2646,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createPoLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(),
+        createUnlocalizableLoader(isCacheRestore),
         createVariableLoader({ type: "python" })
       );
     case "properties":
@@ -2446,14 +2654,14 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createTextFileLoader(bucketPathPattern),
         createPropertiesLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "xcode-strings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createXcodeStringsLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "xcode-stringsdict":
       return composeLoaders(
@@ -2461,7 +2669,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createXcodeStringsdictLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "xcode-xcstrings":
       return composeLoaders(
@@ -2471,7 +2679,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createXcodeXcstringsLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(),
+        createUnlocalizableLoader(isCacheRestore),
         createVariableLoader({ type: "ieee" })
       );
     case "yaml":
@@ -2481,7 +2689,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createYamlLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "yaml-root-key":
       return composeLoaders(
@@ -2491,7 +2699,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createRootKeyLoader(true),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "flutter":
       return composeLoaders(
@@ -2501,7 +2709,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createFlutterLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "xliff":
       return composeLoaders(
@@ -2509,7 +2717,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createXliffLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "xml":
       return composeLoaders(
@@ -2517,28 +2725,28 @@ function createBucketLoader(bucketType, bucketPathPattern) {
         createXmlLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "srt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createSrtLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "dato":
       return composeLoaders(
         createDatoLoader(bucketPathPattern),
         createSyncLoader(),
         createFlatLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
     case "vtt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createVttLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader()
+        createUnlocalizableLoader(isCacheRestore)
       );
   }
 }
@@ -2711,11 +2919,11 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
     const auth = await validateAuth(settings);
     ora.succeed(`Authenticated as ${auth.email}`);
     let buckets = getBuckets(i18nConfig);
-    if (_optionalChain([flags, 'access', _126 => _126.bucket, 'optionalAccess', _127 => _127.length])) {
+    if (_optionalChain([flags, 'access', _130 => _130.bucket, 'optionalAccess', _131 => _131.length])) {
       buckets = buckets.filter((bucket) => flags.bucket.includes(bucket.type));
     }
     ora.succeed("Buckets retrieved");
-    const targetLocales = _optionalChain([flags, 'access', _128 => _128.locale, 'optionalAccess', _129 => _129.length]) ? flags.locale : i18nConfig.locale.targets;
+    const targetLocales = _optionalChain([flags, 'access', _132 => _132.locale, 'optionalAccess', _133 => _133.length]) ? flags.locale : i18nConfig.locale.targets;
     const lockfileHelper = createLockfileHelper();
     ora.start("Ensuring i18n.lock exists...");
     if (!lockfileHelper.isLockfileExists()) {
@@ -2745,7 +2953,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
           const bucketOra = _ora2.default.call(void 0, { indent: 4 });
           bucketOra.info(`Processing path: ${bucketConfig.pathPattern}`);
           const sourceLocale = __spec.resolveOverridenLocale.call(void 0, i18nConfig.locale.source, bucketConfig.delimiter);
-          const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern);
+          const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, { isCacheRestore: true });
           bucketLoader.setDefaultLocale(sourceLocale);
           await bucketLoader.init();
           const sourceData = await bucketLoader.pull(sourceLocale);
@@ -2823,7 +3031,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
                 targetData
               });
               if (flags.key) {
-                processableData = _lodash2.default.pickBy(processableData, (_20, key) => key === flags.key);
+                processableData = _lodash2.default.pickBy(processableData, (_21, key) => key === flags.key);
               }
               if (flags.verbose) {
                 bucketOra.info(JSON.stringify(processableData, null, 2));
@@ -3001,12 +3209,12 @@ function validateParams(i18nConfig, flags) {
       message: "No buckets found in i18n.json. Please add at least one bucket containing i18n content.",
       docUrl: "bucketNotFound"
     });
-  } else if (_optionalChain([flags, 'access', _130 => _130.locale, 'optionalAccess', _131 => _131.some, 'call', _132 => _132((locale) => !i18nConfig.locale.targets.includes(locale))])) {
+  } else if (_optionalChain([flags, 'access', _134 => _134.locale, 'optionalAccess', _135 => _135.some, 'call', _136 => _136((locale) => !i18nConfig.locale.targets.includes(locale))])) {
     throw new CLIError({
       message: `One or more specified locales do not exist in i18n.json locale.targets. Please add them to the list and try again.`,
       docUrl: "localeTargetNotFound"
     });
-  } else if (_optionalChain([flags, 'access', _133 => _133.bucket, 'optionalAccess', _134 => _134.some, 'call', _135 => _135((bucket) => !i18nConfig.buckets[bucket])])) {
+  } else if (_optionalChain([flags, 'access', _137 => _137.bucket, 'optionalAccess', _138 => _138.some, 'call', _139 => _139((bucket) => !i18nConfig.buckets[bucket])])) {
     throw new CLIError({
       message: `One or more specified buckets do not exist in i18n.json. Please add them to the list and try again.`,
       docUrl: "bucketNotFound"
@@ -3233,7 +3441,7 @@ function displaySummary(results) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.74.15",
+  version: "0.74.17",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {