lingo.dev 0.75.0 → 0.76.0

package/build/cli.mjs

@@ -303,24 +303,30 @@ 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 pattern = file.replaceAll(new RegExp(`/${locale}${ext}`, "g"), `/[locale]${ext}`).replaceAll(new RegExp(`/${locale}/`, "g"), `/[locale]/`).replaceAll(new RegExp(`/${locale}/`, "g"), `/[locale]/`);
+    return { pattern, file };
   });
   const grouppedFilesAndPatterns = _2.groupBy(localeFilesAndPatterns, "pattern");
   const patterns = Object.keys(grouppedFilesAndPatterns);
@@ -519,6 +525,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(", ")}?`
       });
@@ -689,24 +697,25 @@ function expandPlaceholderedGlob(_pathPattern, sourceLocale) {
       docUrl: "invalidPathPattern"
     });
   }
-  if (pathPattern.split("[locale]").length > 2) {
-    throw new CLIError({
-      message: `Invalid path pattern: ${pathPattern}. Path pattern must contain at most one "[locale]" placeholder.`,
-      docUrl: "invalidPathPattern"
-    });
-  }
   const pathPatternChunks = pathPattern.split(path7.sep);
-  const localeSegmentIndex = pathPatternChunks.findIndex((segment) => segment.includes("[locale]"));
-  const localePlaceholderIndex = pathPatternChunks[localeSegmentIndex]?.indexOf("[locale]") ?? -1;
-  const sourcePathPattern = pathPattern.replace(/\[locale\]/g, sourceLocale);
+  const localeSegmentIndexes = pathPatternChunks.reduce((indexes, segment, index) => {
+    if (segment.includes("[locale]")) {
+      indexes.push(index);
+    }
+    return indexes;
+  }, []);
+  const sourcePathPattern = pathPattern.replaceAll(/\[locale\]/g, sourceLocale);
   const sourcePaths = glob2.sync(sourcePathPattern, { follow: true, withFileTypes: true }).filter((file) => file.isFile() || file.isSymbolicLink()).map((file) => file.fullpath()).map((fullpath) => path7.relative(process.cwd(), fullpath));
   const placeholderedPaths = sourcePaths.map((sourcePath) => {
     const sourcePathChunks = sourcePath.split(path7.sep);
-    if (localeSegmentIndex >= 0 && localePlaceholderIndex >= 0) {
-      const placeholderedPathChunk = sourcePathChunks[localeSegmentIndex];
-      const placeholderedSegment = placeholderedPathChunk.substring(0, localePlaceholderIndex) + "[locale]" + placeholderedPathChunk.substring(localePlaceholderIndex + sourceLocale.length);
-      sourcePathChunks[localeSegmentIndex] = placeholderedSegment;
-    }
+    localeSegmentIndexes.forEach((localeSegmentIndex) => {
+      const localePlaceholderIndex = pathPatternChunks[localeSegmentIndex]?.indexOf("[locale]") ?? -1;
+      if (localeSegmentIndex >= 0 && localePlaceholderIndex >= 0) {
+        const placeholderedPathChunk = sourcePathChunks[localeSegmentIndex];
+        const placeholderedSegment = placeholderedPathChunk.substring(0, localePlaceholderIndex) + "[locale]" + placeholderedPathChunk.substring(localePlaceholderIndex + sourceLocale.length);
+        sourcePathChunks[localeSegmentIndex] = placeholderedSegment;
+      }
+    });
     const placeholderedPath = sourcePathChunks.join(path7.sep);
     return placeholderedPath;
   });
@@ -982,7 +991,7 @@ function createTextFileLoader(pathPattern) {
       return trimmedResult;
     },
     async push(locale, data, _21, originalLocale) {
-      const draftPath = pathPattern.replace("[locale]", locale);
+      const draftPath = pathPattern.replaceAll("[locale]", locale);
       const finalPath = path8.resolve(draftPath);
       const dirPath = path8.dirname(finalPath);
       await fs6.mkdir(dirPath, { recursive: true });
@@ -997,7 +1006,7 @@ function createTextFileLoader(pathPattern) {
   });
 }
 async function readFileForLocale(pathPattern, locale) {
-  const draftPath = pathPattern.replace("[locale]", locale);
+  const draftPath = pathPattern.replaceAll("[locale]", locale);
   const finalPath = path8.resolve(draftPath);
   const exists = await fs6.access(finalPath).then(() => true).catch(() => false);
   if (!exists) {
@@ -3511,7 +3520,7 @@ function displaySummary(results) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.75.0",
+  version: "0.76.0",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {