lingo.dev 0.74.7 → 0.74.9

package/build/cli.mjs

@@ -704,21 +704,18 @@ import path5 from "path";
 function createTextFileLoader(pathPattern) {
   return createLoader({
     async pull(locale) {
-      const draftPath = pathPattern.replace("[locale]", locale);
-      const finalPath = path5.resolve(draftPath);
-      const exists = await fs5.access(finalPath).then(() => true).catch(() => false);
-      if (!exists) {
-        return "";
-      }
-      const result = await fs5.readFile(finalPath, "utf-8");
-      return result;
+      const result = await readFileForLocale(pathPattern, locale);
+      const trimmedResult = result.trim();
+      return trimmedResult;
     },
-    async push(locale, data) {
+    async push(locale, data, _19, originalLocale) {
       const draftPath = pathPattern.replace("[locale]", locale);
       const finalPath = path5.resolve(draftPath);
       const dirPath = path5.dirname(finalPath);
       await fs5.mkdir(dirPath, { recursive: true });
-      const finalPayload = data.trim();
+      const trimmedPayload = data.trim();
+      const trailingNewLine = await getTrailingNewLine(pathPattern, locale, originalLocale);
+      let finalPayload = trimmedPayload + trailingNewLine;
       await fs5.writeFile(finalPath, finalPayload, {
         encoding: "utf-8",
         flag: "w"
@@ -726,6 +723,26 @@ function createTextFileLoader(pathPattern) {
     }
   });
 }
+async function readFileForLocale(pathPattern, locale) {
+  const draftPath = pathPattern.replace("[locale]", locale);
+  const finalPath = path5.resolve(draftPath);
+  const exists = await fs5.access(finalPath).then(() => true).catch(() => false);
+  if (!exists) {
+    return "";
+  }
+  return fs5.readFile(finalPath, "utf-8");
+}
+async function getTrailingNewLine(pathPattern, locale, originalLocale) {
+  let templateData = await readFileForLocale(pathPattern, locale);
+  if (!templateData) {
+    templateData = await readFileForLocale(pathPattern, originalLocale);
+  }
+  if (templateData?.match(/[\r\n]$/)) {
+    const ending = templateData?.includes("\r\n") ? "\r\n" : templateData?.includes("\r") ? "\r" : "\n";
+    return ending;
+  }
+  return "";
+}
 
 // src/cli/loaders/yaml.ts
 import YAML from "yaml";
@@ -2262,7 +2279,7 @@ ${currentIndent}}`;
       const bIsWhitespace = /^\s*$/.test(b);
       if (aIsWhitespace && !bIsWhitespace) return -1;
       if (!aIsWhitespace && bIsWhitespace) return 1;
-      return a.localeCompare(b, void 0, { numeric: false });
+      return a.localeCompare(b, void 0, { numeric: true });
     });
     const items = sortedKeys.map((key) => {
       const value = data[key];
@@ -2294,24 +2311,6 @@ function createPlutilJsonTextLoader() {
   });
 }
 
-// src/cli/loaders/new-line.ts
-function createNewLineLoader() {
-  return createLoader({
-    async pull(locale, input) {
-      return input;
-    },
-    async push(locale, data, originalInput) {
-      if (!data) return "";
-      const trimmed = data.replace(/[\r\n]+$/, "");
-      if (originalInput?.match(/[\r\n]$/)) {
-        const ending = originalInput?.includes("\r\n") ? "\r\n" : originalInput?.includes("\r") ? "\r" : "\n";
-        return trimmed + ending;
-      }
-      return trimmed;
-    }
-  });
-}
-
 // src/cli/loaders/index.ts
 function createBucketLoader(bucketType, bucketPathPattern) {
   switch (bucketType) {
@@ -2320,7 +2319,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "android":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createAndroidLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2329,7 +2327,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "csv":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createCsvLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2338,7 +2335,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "html":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPrettierLoader({ parser: "html", alwaysFormat: true }),
         createHtmlLoader(),
         createSyncLoader(),
@@ -2347,7 +2343,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "json":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPrettierLoader({ parser: "json" }),
         createJsonLoader(),
         createFlatLoader(),
@@ -2357,7 +2352,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "markdown":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPrettierLoader({ parser: "markdown" }),
         createMarkdownLoader(),
         createSyncLoader(),
@@ -2366,7 +2360,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "po":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPoLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2376,7 +2369,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "properties":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPropertiesLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2384,7 +2376,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xcode-strings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createXcodeStringsLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2392,7 +2383,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xcode-stringsdict":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createXcodeStringsdictLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2401,7 +2391,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xcode-xcstrings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPlutilJsonTextLoader(),
         createJsonLoader(),
         createXcodeXcstringsLoader(),
@@ -2413,7 +2402,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "yaml":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPrettierLoader({ parser: "yaml" }),
         createYamlLoader(),
         createFlatLoader(),
@@ -2423,7 +2411,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "yaml-root-key":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPrettierLoader({ parser: "yaml" }),
         createYamlLoader(),
         createRootKeyLoader(true),
@@ -2434,7 +2421,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "flutter":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createPrettierLoader({ parser: "json" }),
         createJsonLoader(),
         createFlutterLoader(),
@@ -2445,7 +2431,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xliff":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createXliffLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2454,7 +2439,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xml":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createXmlLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2463,7 +2447,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "srt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createSrtLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2478,7 +2461,6 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "vtt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createNewLineLoader(),
         createVttLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2685,7 +2667,8 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
       for (const bucket of buckets) {
         cacheOra.info(`Processing bucket: ${bucket.type}`);
         for (const bucketConfig of bucket.config) {
-          const bucketOra = ora.info(`Processing path: ${bucketConfig.pathPattern}`);
+          const bucketOra = Ora5({ indent: 4 });
+          bucketOra.info(`Processing path: ${bucketConfig.pathPattern}`);
           const sourceLocale = resolveOverridenLocale3(i18nConfig.locale.source, bucketConfig.delimiter);
           const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern);
           bucketLoader.setDefaultLocale(sourceLocale);
@@ -2789,12 +2772,12 @@ var i18n_default = new Command6().command("i18n").description("Run Localization
                   cacheChunk(targetLocale, sourceChunk, processedChunk);
                   const progressLog = `[${sourceLocale} -> ${targetLocale}] [${Object.keys(processableData).length} entries] (${progress}%) AI localization in progress...`;
                   if (flags.verbose) {
-                    ora.info(progressLog);
-                    ora.info(
-                      `Caching chunk ${JSON.stringify(sourceChunk, null, 2)} -> ${JSON.stringify(processedChunk, null, 2)}`
+                    bucketOra.info(progressLog);
+                    bucketOra.info(
+                      `(${progress}%) Caching chunk ${JSON.stringify(sourceChunk, null, 2)} -> ${JSON.stringify(processedChunk, null, 2)}`
                     );
                   } else {
-                    ora.text = progressLog;
+                    bucketOra.text = progressLog;
                   }
                 }
               );
@@ -3175,7 +3158,7 @@ function displaySummary(results) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.74.7",
+  version: "0.74.9",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {