fix: init command

Author: mathio

packages/cli/src/cli/cmd/init.ts

@@ -130,6 +130,9 @@ export default new InteractiveCommand()
         });
       } else {
         spinner.succeed("No existing locale files found.");
+      }
+
+      if (selectedPatterns.length === 0) {
         const useDefault = await confirm({
           message: `Use (and create) default path ${patterns.join(", ")}?`,
         });

packages/cli/src/cli/utils/find-locale-paths.spec.ts

@@ -63,6 +63,10 @@ describe("findLocaleFiles", () => {
       "src/locales/fr/messages.json",
       "src/i18n/es/strings.json",
       "src/translations/es.json",
+      "src/aa/translations/en.json",
+      "src/aa/bb/foobar/cc/translations/es/values.json",
+      "src/aa/en.json",
+      "src/aa/translations/bb/en.json",
 
       // not a valid locale
       "src/xx/settings.json",
@@ -77,6 +81,10 @@ describe("findLocaleFiles", () => {
         "src/locales/[locale]/messages.json",
         "src/i18n/[locale]/strings.json",
         "src/translations/[locale].json",
+        "src/aa/translations/[locale].json",
+        "src/aa/bb/foobar/cc/translations/[locale]/values.json",
+        "src/aa/[locale].json",
+        "src/aa/translations/bb/[locale].json",
       ],
     });
   });
@@ -97,13 +105,18 @@ describe("findLocaleFiles", () => {
       "ios/MyApp/Localizable.xcstrings",
       "ios/MyApp/Onboarding/Localizable.xcstrings",
       "ios/MyApp/Onboarding/fr.xcstrings",
+      "ios/MyApp/xx/Localizable.xcstrings",
     ]);
 
     const result = findLocaleFiles("xcode-xcstrings");
 
     expect(result).toEqual({
       found: true,
-      patterns: ["ios/MyApp/Localizable.xcstrings", "ios/MyApp/Onboarding/Localizable.xcstrings"],
+      patterns: [
+        "ios/MyApp/Localizable.xcstrings",
+        "ios/MyApp/Onboarding/Localizable.xcstrings",
+        "ios/MyApp/xx/Localizable.xcstrings",
+      ],
     });
   });
 

packages/cli/src/cli/utils/find-locale-paths.ts

@@ -34,28 +34,38 @@ function findLocaleFilesWithExtension(ext: string) {
     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 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: string) => localeFilePattern.test(file) || localeDirectoryPattern.test(file),
   );
-  const localeFilesAndPatterns = potentialLocaleFiles
+
+  const potantialLocaleFilesAndPatterns = potentialLocaleFiles
     .map((file: string) => {
-      const match = file.match(new RegExp(`[\/|\\\\]([a-z]{2}(-[A-Z]{2})?)(\/|\\\\|${ext})`));
-      const locale = match?.[1];
-      const localeInDir = match?.[3] !== ext;
-      const filePattern = localeInDir
-        ? file.replace(`/${locale}/`, `/[locale]/`)
-        : path.join(path.dirname(file), `[locale]${ext}`);
-      return { file, locale, pattern: filePattern };
+      const matchPotentialLocales = file
+        .matchAll(new RegExp(`\/([a-z]{2}(-[A-Z]{2})?|[^\/]+)(?=\/|${ext})`, "g"))
+        .toArray();
+      const potantialLocales = matchPotentialLocales.map((match) => match[1]);
+      return { file, potantialLocales };
+    })
+    .map(({ file, potantialLocales }) => {
+      for (const locale of potantialLocales) {
+        try {
+          resolveLocaleCode(locale as LocaleCode);
+          return { locale, file };
+        } catch (e) {}
+      }
+      return { file, locale: null };
     })
-    .filter(({ locale }) => {
-      try {
-        resolveLocaleCode(locale as LocaleCode);
-        return true;
-      } catch (e) {}
-      return false;
-    });
+    .filter(({ locale }) => locale !== null);
+
+  const localeFilesAndPatterns = potantialLocaleFilesAndPatterns.map(({ file, locale }) => {
+    const localeInDir = file.match(`/${locale}/`);
+    const pattern = localeInDir
+      ? file.replace(`/${locale}/`, `/[locale]/`)
+      : path.join(path.dirname(file), `[locale]${ext}`);
+    return { pattern, file };
+  });
 
   const grouppedFilesAndPatterns = _.groupBy(localeFilesAndPatterns, "pattern");
   const patterns = Object.keys(grouppedFilesAndPatterns);