lingo.dev 0.75.1 → 0.76.0

package/build/cli.cjs

@@ -325,8 +325,7 @@ function findLocaleFilesWithExtension(ext) {
     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]/`) : _path2.default.join(_path2.default.dirname(file), `[locale]${ext}`);
+    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 = _lodash2.default.groupBy(localeFilesAndPatterns, "pattern");
@@ -698,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(_path2.default.sep);
-  const localeSegmentIndex = pathPatternChunks.findIndex((segment) => segment.includes("[locale]"));
-  const localePlaceholderIndex = _nullishCoalesce(_optionalChain([pathPatternChunks, 'access', _35 => _35[localeSegmentIndex], 'optionalAccess', _36 => _36.indexOf, 'call', _37 => _37("[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) => _path2.default.relative(process.cwd(), fullpath));
   const placeholderedPaths = sourcePaths.map((sourcePath) => {
     const sourcePathChunks = sourcePath.split(_path2.default.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 = _nullishCoalesce(_optionalChain([pathPatternChunks, 'access', _35 => _35[localeSegmentIndex], 'optionalAccess', _36 => _36.indexOf, 'call', _37 => _37("[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(_path2.default.sep);
     return placeholderedPath;
   });
@@ -991,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 = _path2.default.resolve(draftPath);
       const dirPath = _path2.default.dirname(finalPath);
       await _promises4.default.mkdir(dirPath, { recursive: true });
@@ -1006,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 = _path2.default.resolve(draftPath);
   const exists = await _promises4.default.access(finalPath).then(() => true).catch(() => false);
   if (!exists) {
@@ -3520,7 +3520,7 @@ function displaySummary(results) {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.75.1",
+  version: "0.76.0",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {