fix: allow parentheses in catalog pathnames (#1820)

lingui · Dec 18, 2023 · f5fae0e · f5fae0e · vercel · Dec 18, 2023
1 parent 8830f2e
commit f5fae0e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/packages/cli/src/api/catalog/getCatalogs.test.ts b/packages/cli/src/api/catalog/getCatalogs.test.ts
@@ -407,4 +407,22 @@ describe("getCatalogForFile", () => {
       catalog,
     })
   })
+
+  it("should allow parentheses in path names", async () => {
+    const catalog = new Catalog(
+      {
+        name: null,
+        path: "./src/locales/(asd)/{locale}",
+        include: ["./src/"],
+        format,
+      },
+      mockConfig({ format: "po", rootDir: "." })
+    )
+    const catalogs = [catalog]
+
+    expect(getCatalogForFile("./src/locales/(asd)/en.po", catalogs)).toEqual({
+      locale: "en",
+      catalog,
+    })
+  })
 })
diff --git a/packages/cli/src/api/catalog/getCatalogs.ts b/packages/cli/src/api/catalog/getCatalogs.ts
@@ -132,10 +132,13 @@ export function getCatalogForFile(file: string, catalogs: Catalog[]) {
   for (const catalog of catalogs) {
     const catalogFile = `${catalog.path}${catalog.format.getCatalogExtension()}`
     const catalogGlob = replacePlaceholders(catalogFile, { locale: "*" })
-    const match = micromatch.capture(
-      normalizeRelativePath(path.relative(catalog.config.rootDir, catalogGlob)),
-      normalizeRelativePath(file)
+    const matchPattern = normalizeRelativePath(
+      path.relative(catalog.config.rootDir, catalogGlob)
     )
+      .replace("(", "\\(")
+      .replace(")", "\\)")
+
+    const match = micromatch.capture(matchPattern, normalizeRelativePath(file))
     if (match) {
       return {
         locale: match[0],