lingo.dev 0.75.0 → 0.75.1

package/build/cli.mjs

@@ -303,24 +303,31 @@ function findLocaleFilesWithExtension(ext) {
   const files = 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 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 = match?.[1];
-    const localeInDir = match?.[3] !== ext;
-    const filePattern = localeInDir ? file.replace(`/${locale}/`, `/[locale]/`) : path3.join(path3.dirname(file), `[locale]${ext}`);
-    return { file, locale, pattern: filePattern };
-  }).filter(({ locale }) => {
-    try {
-      resolveLocaleCode(locale);
-      return true;
-    } catch (e) {
+  const potantialLocaleFilesAndPatterns = potentialLocaleFiles.map((file) => {
+    const matchPotentialLocales = Array.from(
+      file.matchAll(new RegExp(`/([a-z]{2}(-[A-Z]{2})?|[^/]+)(?=/|${ext})`, "g"))
+    );
+    const potantialLocales = matchPotentialLocales.map((match) => match[1]);
+    return { file, potantialLocales };
+  }).map(({ file, potantialLocales }) => {
+    for (const locale of potantialLocales) {
+      try {
+        resolveLocaleCode(locale);
+        return { locale, file };
+      } catch (e) {
+      }
     }
-    return false;
+    return { file, locale: null };
+  }).filter(({ locale }) => locale !== null);
+  const localeFilesAndPatterns = potantialLocaleFilesAndPatterns.map(({ file, locale }) => {
+    const localeInDir = file.match(`/${locale}/`);
+    const pattern = localeInDir ? file.replace(`/${locale}/`, `/[locale]/`) : path3.join(path3.dirname(file), `[locale]${ext}`);
+    return { pattern, file };
   });
   const grouppedFilesAndPatterns = _2.groupBy(localeFilesAndPatterns, "pattern");
   const patterns = Object.keys(grouppedFilesAndPatterns);
@@ -519,6 +526,8 @@ var init_default = new InteractiveCommand().command("init").description("Initial
       });
     } else {
       spinner.succeed("No existing locale files found.");
+    }
+    if (selectedPatterns.length === 0) {
       const useDefault = await confirm({
         message: `Use (and create) default path ${patterns.join(", ")}?`
       });
@@ -3511,7 +3520,7 @@ function displaySummary(results) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.75.0",
+  version: "0.75.1",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {