lingo.dev 0.71.0 → 0.73.0

package/build/cli.mjs

@@ -18,7 +18,7 @@ import { InteractiveCommand as InteractiveCommand2 } from "interactive-commander
 import figlet from "figlet";
 import { vice } from "gradient-string";
 
-// src/cli/cli/auth.ts
+// src/cli/cmd/auth.ts
 import { Command } from "interactive-commander";
 import Ora from "ora";
 import express from "express";
@@ -174,7 +174,7 @@ function createAuthenticator(params) {
   };
 }
 
-// src/cli/cli/auth.ts
+// src/cli/cmd/auth.ts
 var auth_default = new Command().command("auth").description("Authenticate with Lingo.dev API").helpOption("-h, --help", "Show help").option("--logout", "Delete existing authentication").option("--login", "Authenticate with Lingo.dev API").action(async (options) => {
   try {
     let settings = await getSettings(void 0);
@@ -242,7 +242,7 @@ async function waitForApiKey(cb) {
   });
 }
 
-// src/cli/cli/init.ts
+// src/cli/cmd/init.ts
 import { InteractiveCommand, InteractiveOption } from "interactive-commander";
 import Ora2 from "ora";
 
@@ -275,7 +275,7 @@ function _getConfigFilePath() {
   return path2.join(process.cwd(), "i18n.json");
 }
 
-// src/cli/cli/init.ts
+// src/cli/cmd/init.ts
 import fs3 from "fs";
 import { spawn } from "child_process";
 import _2 from "lodash";
@@ -396,10 +396,10 @@ var init_default = new InteractiveCommand().command("init").description("Initial
   }
 });
 
-// src/cli/cli/show/index.ts
+// src/cli/cmd/show/index.ts
 import { Command as Command5 } from "interactive-commander";
 
-// src/cli/cli/show/config.ts
+// src/cli/cmd/show/config.ts
 import { Command as Command2 } from "interactive-commander";
 import _3 from "lodash";
 import fs4 from "fs";
@@ -420,7 +420,7 @@ function loadReplexicaFileConfig() {
   return replexicaFileConfig;
 }
 
-// src/cli/cli/show/locale.ts
+// src/cli/cmd/show/locale.ts
 import { Command as Command3 } from "interactive-commander";
 import Ora3 from "ora";
 var locale_default = new Command3().command("locale").description("Print out the list of locales").helpOption("-h, --help", "Show help").argument("<type>", 'Type of locales to show, either "sources" or "targets"').action(async (type) => {
@@ -445,7 +445,7 @@ var locale_default = new Command3().command("locale").description("Print out the
   }
 });
 
-// src/cli/cli/show/files.ts
+// src/cli/cmd/show/files.ts
 import { Command as Command4 } from "interactive-commander";
 import Ora4 from "ora";
 
@@ -529,7 +529,7 @@ function resolveBucketItem(bucketItem) {
   return bucketItem;
 }
 
-// src/cli/cli/show/files.ts
+// src/cli/cmd/show/files.ts
 var files_default = new Command4().command("files").description("Print out the list of files managed by Lingo.dev").option("--source", "Only show source files").option("--target", "Only show target files").helpOption("-h, --help", "Show help").action(async (type) => {
   const ora = Ora4();
   try {
@@ -575,10 +575,10 @@ var files_default = new Command4().command("files").description("Print out the l
   }
 });
 
-// src/cli/cli/show/index.ts
+// src/cli/cmd/show/index.ts
 var show_default = new Command5().command("show").description("Prints out the current configuration").helpOption("-h, --help", "Show help").addCommand(config_default).addCommand(locale_default).addCommand(files_default);
 
-// src/cli/cli/i18n.ts
+// src/cli/cmd/i18n.ts
 import { Command as Command6 } from "interactive-commander";
 import Z4 from "zod";
 import _17 from "lodash";
@@ -724,7 +724,7 @@ function createTextFileLoader(pathPattern) {
       const finalPath = path5.resolve(draftPath);
       const dirPath = path5.dirname(finalPath);
       await fs5.mkdir(dirPath, { recursive: true });
-      const finalPayload = data.trim() + "\n";
+      const finalPayload = data.trim();
       await fs5.writeFile(finalPath, finalPayload, {
         encoding: "utf-8",
         flag: "w"
@@ -1271,7 +1271,7 @@ function createPrettierLoader(options) {
         return data;
       }
       const result = prettier.format(data, {
-        ...prettierConfig || { printWidth: 2500 },
+        ...prettierConfig || { printWidth: 2500, bracketSameLine: false },
         parser: options.parser,
         // For HTML parser, preserve comments and quotes
         ...options.parser === "html" ? {
@@ -2136,7 +2136,6 @@ function createVttLoader() {
           text
         };
       });
-      console.log(payload, output);
       const input = {
         valid: true,
         strict: true,
@@ -2236,6 +2235,100 @@ function createSyncLoader() {
   });
 }
 
+// src/cli/utils/plutil-formatter.ts
+function formatPlutilStyle(jsonData, existingJson) {
+  const indent = existingJson ? detectIndentation(existingJson) : "  ";
+  function format(data, level = 0) {
+    const currentIndent = indent.repeat(level);
+    const nextIndent = indent.repeat(level + 1);
+    if (typeof data !== "object" || data === null) {
+      return JSON.stringify(data);
+    }
+    if (Array.isArray(data)) {
+      if (data.length === 0) return "[]";
+      const items2 = data.map((item) => `${nextIndent}${format(item, level + 1)}`);
+      return `[
+${items2.join(",\n")}
+${currentIndent}]`;
+    }
+    const keys = Object.keys(data);
+    if (keys.length === 0) {
+      return `{
+
+${currentIndent}}`;
+    }
+    const items = keys.map((key) => {
+      const value = data[key];
+      return `${nextIndent}${JSON.stringify(key)} : ${format(value, level + 1)}`;
+    });
+    return `{
+${items.join(",\n")}
+${currentIndent}}`;
+  }
+  return format(jsonData);
+}
+function detectIndentation(jsonStr) {
+  const match = jsonStr.match(/\n(\s+)/);
+  return match ? match[1] : "    ";
+}
+
+// src/cli/loaders/plutil-json-loader.ts
+function createPlutilJsonTextLoader() {
+  return createLoader({
+    async pull(locale, data) {
+      return data;
+    },
+    async push(locale, data, originalInput) {
+      const jsonData = JSON.parse(data);
+      const result = formatPlutilStyle(jsonData, originalInput || "");
+      console.log(result[result.length - 1]);
+      return result;
+    }
+  });
+}
+
+// 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/json-sorting.ts
+function createJsonSortingLoader() {
+  return createLoader({
+    async pull(locale, input) {
+      return input;
+    },
+    async push(locale, data, originalInput) {
+      return sortObjectDeep(data);
+    }
+  });
+}
+function sortObjectDeep(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map(sortObjectDeep);
+  }
+  if (obj !== null && typeof obj === "object") {
+    return Object.keys(obj).sort().reduce((result, key) => {
+      result[key] = sortObjectDeep(obj[key]);
+      return result;
+    }, {});
+  }
+  return obj;
+}
+
 // src/cli/loaders/index.ts
 function createBucketLoader(bucketType, bucketPathPattern) {
   switch (bucketType) {
@@ -2244,6 +2337,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "android":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createAndroidLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2252,6 +2346,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "csv":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createCsvLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2260,6 +2355,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "html":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPrettierLoader({ parser: "html", alwaysFormat: true }),
         createHtmlLoader(),
         createSyncLoader(),
@@ -2268,6 +2364,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "json":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPrettierLoader({ parser: "json" }),
         createJsonLoader(),
         createFlatLoader(),
@@ -2277,6 +2374,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "markdown":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPrettierLoader({ parser: "markdown" }),
         createMarkdownLoader(),
         createSyncLoader(),
@@ -2285,6 +2383,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "po":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPoLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2294,6 +2393,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "properties":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPropertiesLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2301,6 +2401,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xcode-strings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createXcodeStringsLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2308,6 +2409,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xcode-stringsdict":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createXcodeStringsdictLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2316,8 +2418,10 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xcode-xcstrings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
-        createPrettierLoader({ parser: "json" }),
+        createNewLineLoader(),
+        createPlutilJsonTextLoader(),
         createJsonLoader(),
+        createJsonSortingLoader(),
         createXcodeXcstringsLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2327,6 +2431,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "yaml":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPrettierLoader({ parser: "yaml" }),
         createYamlLoader(),
         createFlatLoader(),
@@ -2336,6 +2441,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "yaml-root-key":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPrettierLoader({ parser: "yaml" }),
         createYamlLoader(),
         createRootKeyLoader(true),
@@ -2346,6 +2452,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "flutter":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createPrettierLoader({ parser: "json" }),
         createJsonLoader(),
         createFlutterLoader(),
@@ -2356,6 +2463,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xliff":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createXliffLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2364,6 +2472,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "xml":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createXmlLoader(),
         createFlatLoader(),
         createSyncLoader(),
@@ -2372,6 +2481,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "srt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createSrtLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2379,6 +2489,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "dato":
       return composeLoaders(
         createDatoLoader(bucketPathPattern),
+        createNewLineLoader(),
         createSyncLoader(),
         createFlatLoader(),
         createUnlocalizableLoader()
@@ -2386,6 +2497,7 @@ function createBucketLoader(bucketType, bucketPathPattern) {
     case "vtt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
+        createNewLineLoader(),
         createVttLoader(),
         createSyncLoader(),
         createUnlocalizableLoader()
@@ -2462,7 +2574,7 @@ var LockfileSchema = Z3.object({
   ).default({})
 });
 
-// src/cli/cli/i18n.ts
+// src/cli/cmd/i18n.ts
 import chalk from "chalk";
 import { createTwoFilesPatch } from "diff";
 import inquirer2 from "inquirer";
@@ -2535,7 +2647,7 @@ function _tryParseJSON(line) {
   }
 }
 
-// src/cli/cli/i18n.ts
+// src/cli/cmd/i18n.ts
 var i18n_default = new Command6().command("i18n").description("Run Localization engine").helpOption("-h, --help", "Show help").option("--locale <locale>", "Locale to process", (val, prev) => prev ? [...prev, val] : [val]).option("--bucket <bucket>", "Bucket to process", (val, prev) => prev ? [...prev, val] : [val]).option("--key <key>", "Key to process").option("--frozen", `Don't update the translations and fail if an update is needed`).option("--force", "Ignore lockfile and process all keys").option("--verbose", "Show verbose output").option("--interactive", "Interactive mode").option("--api-key <api-key>", "Explicitly set the API key to use").option("--debug", "Debug mode").option("--strict", "Stop on first error").action(async function(options) {
   const ora = Ora5();
   const flags = parseFlags(options);
@@ -2958,7 +3070,7 @@ Editing value for: ${chalk.cyan(key)}`);
   return customData;
 }
 
-// src/cli/cli/lockfile.ts
+// src/cli/cmd/lockfile.ts
 import { Command as Command7 } from "interactive-commander";
 import Z5 from "zod";
 import Ora6 from "ora";
@@ -2987,7 +3099,7 @@ var flagsSchema = Z5.object({
   force: Z5.boolean().default(false)
 });
 
-// src/cli/cli/cleanup.ts
+// src/cli/cmd/cleanup.ts
 import { Command as Command8 } from "interactive-commander";
 import _18 from "lodash";
 import Ora7 from "ora";
@@ -3080,7 +3192,7 @@ function displaySummary(results) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.71.0",
+  version: "0.73.0",
   description: "Lingo.dev CLI",
   private: false,
   type: "module",