feat: remoteLoader introduced

Sergio Moreno · Sergio Moreno · commit 775c85a011ba · 2021-06-08T18:09:22.000+02:00
diff --git a/packages/cli/src/api/formats/csv.ts b/packages/cli/src/api/formats/csv.ts
@@ -48,6 +48,10 @@ const csv: CatalogFormatter = {
       throw new Error(`Cannot read ${filename}: ${e.message}`)
     }
   },
+
+  parse(content) {
+    return deserialize(content)
+  }
 }
 
 export default csv
diff --git a/packages/cli/src/api/formats/index.ts b/packages/cli/src/api/formats/index.ts
@@ -28,6 +28,7 @@ export type CatalogFormatter = {
     options?: CatalogFormatOptionsInternal
   ): void
   read(filename: string): CatalogType | null
+  parse(content): any
 }
 
 export default function getFormat(name: CatalogFormat): CatalogFormatter {
diff --git a/packages/cli/src/api/formats/lingui.ts b/packages/cli/src/api/formats/lingui.ts
@@ -49,6 +49,10 @@ const lingui: CatalogFormatter = {
       throw new Error(`Cannot read ${filename}: ${e.message}`)
     }
   },
+
+  parse(content) {
+    return content
+  }
 }
 
 export default lingui
diff --git a/packages/cli/src/api/formats/minimal.ts b/packages/cli/src/api/formats/minimal.ts
@@ -36,6 +36,10 @@ const minimal: CatalogFormatter = {
       throw new Error(`Cannot read ${filename}: ${e.message}`)
     }
   },
+
+  parse(content: Record<string, any>) {
+    return deserialize(content)
+  }
 }
 
 export default minimal
diff --git a/packages/cli/src/api/formats/po-gettext.ts b/packages/cli/src/api/formats/po-gettext.ts
@@ -332,7 +332,7 @@ const poGettext: CatalogFormatter & PoFormatter = {
     return this.parse(raw)
   },
 
-  parse(raw) {
+  parse(raw: string) {
     const po = PO.parse(raw)
     convertPluralsToICU(po.items, po.headers.Language)
     return deserialize(indexItems(po.items))
diff --git a/packages/cli/src/api/formats/po.ts b/packages/cli/src/api/formats/po.ts
@@ -106,7 +106,7 @@ const po: CatalogFormatter & PoFormatter = {
     return this.parse(raw)
   },
 
-  parse(raw) {
+  parse(raw: string) {
     const po = PO.parse(raw)
     validateItems(po.items)
     return deserialize(indexItems(po.items))
diff --git a/packages/loader/index.d.ts b/packages/loader/index.d.ts
@@ -0,0 +1,3 @@
+declare type RemoteLoaderMessages<T> = string | Record<string, any> | T;
+export declare function remoteLoader<T>(locale: string, messages: RemoteLoaderMessages<T>, fallbackMessages?: RemoteLoaderMessages<T>): any;
+export {};
diff --git a/packages/loader/index.js b/packages/loader/index.js
@@ -1 +1,2 @@
 export { default } from "./src"
+export { remoteLoader } from "./src/remoteLoader"
diff --git a/packages/loader/package.json b/packages/loader/package.json
@@ -2,6 +2,7 @@
   "name": "@lingui/loader",
   "version": "3.9.0",
   "description": "webpack loader for lingui message catalogs",
+  "types": "index.d.ts",
   "main": "index.js",
   "author": {
     "name": "Tomáš Ehrlich",
diff --git a/packages/loader/src/index.ts b/packages/loader/src/index.ts
@@ -0,0 +1,2 @@
+export { default } from "./webpackLoader"
+export { remoteLoader } from "./remoteLoader"
diff --git a/packages/loader/src/remoteLoader.test.ts b/packages/loader/src/remoteLoader.test.ts
@@ -0,0 +1,95 @@
+import { remoteLoader } from "./remoteLoader"
+import fs from "fs"
+import path from "path"
+
+describe("remote-loader", () => {
+  it("should compile correctly JSON messages coming from the fly", async () => {
+    const unlink = createConfig("minimal")
+    const messages = await simulatedJsonResponse()
+    expect(remoteLoader("en", messages)).toMatchInlineSnapshot(
+      `/*eslint-disable*/module.exports={messages:{"property.key":"value","{0} Deposited":[["0"]," Deposited"],"{0} Strategy":[["0"]," Strategy"]}};`
+    )
+    unlink()
+  })
+
+  it("should compile correctly .po messages coming from the fly", async () => {
+    const unlink = createConfig("po")
+    const messages = await simulatedPoResponse()
+    expect(remoteLoader("en", messages)).toMatchInlineSnapshot(
+      `/*eslint-disable*/module.exports={messages:{"Hello World":"Hello World","My name is {name}":["My name is ",["name"]]}};`
+    )
+    unlink()
+  })
+
+  describe("fallbacks", () => {
+    it("should fallback correctly to the fallback collection", async () => {
+      const unlink = createConfig("minimal")
+      const messages = await simulatedJsonResponse(true)
+      const fallbackMessages = await simulatedJsonResponse()
+
+      expect(
+        remoteLoader("en", messages, fallbackMessages)
+      ).toMatchInlineSnapshot(
+        `/*eslint-disable*/module.exports={messages:{"property.key":"value","{0} Deposited":[["0"]," Deposited"],"{0} Strategy":[["0"]," Strategy"]}};`
+      )
+      unlink()
+    })
+
+    it("should fallback to compiled fallback", async () => {
+      const unlink = createConfig("po")
+      const messages = await simulatedPoResponse("es")
+      const fallbackMessages = await simulatedPoCompiledFile()
+
+      expect(
+        remoteLoader("en", messages, fallbackMessages)
+      ).toMatchInlineSnapshot(
+        `/*eslint-disable*/module.exports={messages:{"Hello World":"Hello World","My name is {name}":["My name is ",["name"]]}};`
+      )
+      unlink()
+    })
+  })
+})
+
+function simulatedJsonResponse(nully?: boolean) {
+  return new Promise((resolve) => {
+    resolve({
+      "property.key": nully ? "" : "value",
+      "{0} Deposited": "{0} Deposited",
+      "{0} Strategy": "{0} Strategy",
+    })
+  })
+}
+
+function simulatedPoResponse(locale = "en") {
+  return new Promise((resolve) => {
+    const file = fs.readFileSync(
+      path.join(__dirname, "..", "test/locale/" + locale + "/messages.po"),
+      "utf-8"
+    )
+    resolve(file)
+  })
+}
+
+function simulatedPoCompiledFile() {
+  return new Promise((resolve) => {
+    resolve({
+      "Hello World": "Hello World",
+      "My name is {name}": ["My name is ", ["name"]],
+    })
+  })
+}
+
+function createConfig(format: string) {
+  const filename = `${process.cwd()}/.linguirc`
+  const config = `
+  {
+    'locales': ['en'],
+    'catalogs': [{
+      'path': 'locale/{locale}/messages'
+    }],
+    'format': '${format}'
+  }
+  `
+  fs.writeFileSync(filename, config)
+  return () => fs.unlinkSync(filename)
+}
diff --git a/packages/loader/src/remoteLoader.ts b/packages/loader/src/remoteLoader.ts
@@ -0,0 +1,57 @@
+import R from "ramda"
+import { getConfig } from "@lingui/conf"
+import { createCompiledCatalog, getFormat } from "@lingui/cli/api"
+
+type RemoteLoaderMessages<T> = string | Record<string, any> | T
+
+export function remoteLoader<T>(locale: string, messages: RemoteLoaderMessages<T>, fallbackMessages?: RemoteLoaderMessages<T>) {
+  const config = getConfig()
+
+  // When format is minimal, everything works fine because are .json files,
+  // but when is csv, .po, .po-gettext needs to be parsed to something interpretable
+  let parsedMessages;
+  let parsedFallbackMessages;
+  if (config.format) {
+    const formatter = getFormat(config.format)
+    if (fallbackMessages) {
+      // we do this because, people could just import the fallback and import the ./en/messages.js
+      // generated by lingui and the use case of format .po but fallback as .json module could be perfectly valid
+      parsedFallbackMessages = typeof fallbackMessages === "object" ? getFormat("minimal").parse(fallbackMessages) : formatter.parse(fallbackMessages)
+    }
+
+    parsedMessages = formatter.parse(messages)
+  } else {
+    throw new Error(`
+        *format* value in the Lingui configuration is required to make this loader 100% functional
+        Read more about this here: https://lingui.js.org/ref/conf.html#format
+      `)
+  }
+
+
+  const mapTranslationsToInterporlatedString = R.mapObjIndexed(
+    (_, key) => {
+      // if there's fallback and translation is empty, return the fallback
+      if (parsedMessages[key].translation === "" && parsedFallbackMessages?.[key]?.translation) {
+        return parsedFallbackMessages[key].translation
+      }
+
+      return parsedMessages[key].translation
+    },
+    parsedMessages
+  )
+
+  // In production we don't want untranslated strings. It's better to use message
+  // keys as a last resort.
+  // In development, however, we want to catch missing strings with `missing` parameter
+  // of I18nProvider (React) or setupI18n (core) and therefore we need to get
+  // empty translations if missing.
+  const strict = process.env.NODE_ENV !== "production"
+  return createCompiledCatalog(locale, mapTranslationsToInterporlatedString, {
+    strict,
+    ...config,
+    namespace: config.compileNamespace,
+    pseudoLocale: config.pseudoLocale,
+  })
+
+}
+
diff --git a/packages/loader/src/webpackLoader.ts b/packages/loader/src/webpackLoader.ts
@@ -18,7 +18,7 @@ try {
   JavascriptGenerator = require("webpack/lib/JavascriptGenerator")
 } catch (error) {
   if (error.code !== "MODULE_NOT_FOUND") {
-    throw e
+    throw error
   }
 }
 
diff --git a/packages/loader/test/locale/es/messages.po b/packages/loader/test/locale/es/messages.po
@@ -0,0 +1,5 @@
+msgid "Hello World"
+msgstr ""
+
+msgid "My name is {name}"
+msgstr "My name is {name}"

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ const csv: CatalogFormatter = {`
`48`	`48`	throw new Error(`Cannot read ${filename}: ${e.message}`)
`49`	`49`	`}`
`50`	`50`	`},`
	`51`	`+`
	`52`	`+ parse(content) {`
	`53`	`+ return deserialize(content)`
	`54`	`+ }`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`export default csv`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ export type CatalogFormatter = {`
`28`	`28`	`options?: CatalogFormatOptionsInternal`
`29`	`29`	`): void`
`30`	`30`	`read(filename: string): CatalogType \| null`
	`31`	`+ parse(content): any`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`export default function getFormat(name: CatalogFormat): CatalogFormatter {`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,10 @@ const lingui: CatalogFormatter = {`
`49`	`49`	throw new Error(`Cannot read ${filename}: ${e.message}`)
`50`	`50`	`}`
`51`	`51`	`},`
	`52`	`+`
	`53`	`+ parse(content) {`
	`54`	`+ return content`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`
`54`	`58`	`export default lingui`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ const minimal: CatalogFormatter = {`
`36`	`36`	throw new Error(`Cannot read ${filename}: ${e.message}`)
`37`	`37`	`}`
`38`	`38`	`},`
	`39`	`+`
	`40`	`+ parse(content: Record<string, any>) {`
	`41`	`+ return deserialize(content)`
	`42`	`+ }`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`export default minimal`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+declare type RemoteLoaderMessages<T> = string \| Record<string, any> \| T;`
	`2`	`+export declare function remoteLoader<T>(locale: string, messages: RemoteLoaderMessages<T>, fallbackMessages?: RemoteLoaderMessages<T>): any;`
	`3`	`+export {};`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`export { default } from "./src"`
	`2`	`+export { remoteLoader } from "./src/remoteLoader"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export { default } from "./webpackLoader"`
	`2`	`+export { remoteLoader } from "./remoteLoader"`