RFC-002 - Catalogs

.eslintrc

@@ -2,7 +2,6 @@
   "env": {
     "jest/globals": true
   },
-  "parser": "babel-eslint",
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",

examples/create-react-app/package.json

@@ -22,7 +22,11 @@
     "babel-core": "^7.0.0-bridge.0"
   },
   "lingui": {
-    "localeDir": "src/locales",
+    "catalogs": [{
+      "path": "src/locales/{locale}",
+      "include": ["src"]
+    }],
+    "locales": ["en", "cs"],
     "format": "po",
     "sourceLocale": "en"
   },

examples/create-react-app/src/i18n.js

@@ -6,7 +6,7 @@ export const locales = {
 }
 
 function loadCatalog(locale) {
-  return import(`@lingui/loader!./locales/${locale}/messages.po`)
+  return import(`@lingui/loader!./locales/${locale}.po`)
 }
 
 export const i18n = setupI18n()

examples/create-react-app/src/locales/cs/messages.po → examples/create-react-app/src/locales/cs.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2018-10-05 11:01+0200\n"
+"POT-Creation-Date: 2018-10-13 13:51+0200\n"
 "Mime-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

examples/create-react-app/src/locales/en/messages.po → examples/create-react-app/src/locales/en.po

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2018-10-05 11:01+0200\n"
+"POT-Creation-Date: 2018-10-13 13:51+0200\n"
 "Mime-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,12 +15,12 @@ msgstr ""
 
 #: src/App.js:24
 msgid "Edit <0>src/App.js</0> and save to reload."
-msgstr ""
+msgstr "Edit <0>src/App.js</0> and save to reload."
 
 #: src/App.js:35
 msgid "Learn React"
-msgstr ""
+msgstr "Learn React"
 
 #: src/App.js:19
 msgid "logo"
-msgstr ""
+msgstr "logo"

package.json

@@ -16,6 +16,7 @@
     "lint:eslint": "eslint packages/",
     "lint": "yarn lint:eslint; yarn lint:types",
     "release": "node ./scripts/release.js",
+    "release:integration": "node ./scripts/integration.js",
     "release:build": "node ./scripts/build/",
     "release:test": "node ./scripts/test.js"
   },

packages/babel-plugin-extract-messages/package.json

@@ -28,7 +28,7 @@
     "node": ">=8.0.0"
   },
   "dependencies": {
-    "@babel/generator": "^7.0.0",
+    "@babel/generator": "^7.1.3",
     "@lingui/conf": "0.0.0-managed-by-release-script"
   }
 }

packages/babel-plugin-extract-messages/src/index.ts

@@ -4,6 +4,8 @@ import mkdirp from "mkdirp"
 import generate from "@babel/generator"
 import { getConfig } from "@lingui/conf"
 
+const CONFIG = Symbol("I18nConfig")
+
 // Map of messages
 const MESSAGES = Symbol("I18nMessages")
 
@@ -40,9 +42,6 @@ function addMessage(
 export default function({ types: t }) {
   let localTransComponentName
 
-  const opts = getConfig()
-  const optsBaseDir = opts.rootDir
-
   function isTransComponent(node) {
     return (
       t.isJSXElement(node) &&
@@ -60,8 +59,9 @@ export default function({ types: t }) {
   function collectMessage(path, file, props) {
     const messages = file.get(MESSAGES)
 
+    const rootDir = file.get(CONFIG).rootDir
     const filename = fsPath
-      .relative(optsBaseDir, file.opts.filename)
+      .relative(rootDir, file.opts.filename)
       .replace(/\\/g, "/")
     const line = path.node.loc ? path.node.loc.start.line : null
     props.origin = [[filename, line]]
@@ -195,6 +195,13 @@ export default function({ types: t }) {
     pre(file) {
       localTransComponentName = null
 
+      // Skip validation because config is loaded for each file.
+      // Config was already validated in CLI.
+      file.set(
+        CONFIG,
+        getConfig({ cwd: file.opts.filename, skipValidation: true })
+      )
+
       // Ignore else path for now. Collision is possible if other plugin is
       // using the same Symbol('I18nMessages').
       // istanbul ignore else
@@ -210,9 +217,11 @@ export default function({ types: t }) {
        * e.g: if file is src/components/App.js (relative to package.json), then
        * catalog will be in locale/_build/src/components/App.json
        */
-      const localeDir = this.opts.localeDir || opts.localeDir
+      const config = file.get(CONFIG)
+      const localeDir = this.opts.localeDir || config.localeDir
       const { filename } = file.opts
-      const baseDir = fsPath.dirname(fsPath.relative(optsBaseDir, filename))
+      const rootDir = config.rootDir
+      const baseDir = fsPath.dirname(fsPath.relative(rootDir, filename))
       const targetDir = fsPath.join(localeDir, "_build", baseDir)
 
       const messages = file.get(MESSAGES)

packages/babel-plugin-extract-messages/test/__snapshots__/index.ts.snap

@@ -5,7 +5,7 @@ Object {
   {count, plural, one {# book} other {# books}}: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-without-trans.js,
+        jsx-without-trans.js,
         3,
       ],
     ],
@@ -19,7 +19,7 @@ Object {
     comment: description,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         7,
       ],
     ],
@@ -28,27 +28,27 @@ Object {
     message: Message with id,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         12,
       ],
     ],
   },
   Message: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         3,
       ],
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         5,
       ],
     ],
   },
   Values {param}: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         17,
       ],
     ],
@@ -57,15 +57,15 @@ Object {
     comment: Descriptor with comment,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         21,
       ],
     ],
   },
   defineMessages - string: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-with-macros.js,
+        js-with-macros.js,
         20,
       ],
     ],
@@ -79,7 +79,7 @@ Object {
     comment: description,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         9,
       ],
     ],
@@ -88,27 +88,27 @@ Object {
     message: Message with id,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         14,
       ],
     ],
   },
   Message: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         1,
       ],
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         5,
       ],
     ],
   },
   Values {param}: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         19,
       ],
     ],
@@ -117,15 +117,15 @@ Object {
     comment: Descriptor with comment,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         28,
       ],
     ],
   },
   defineMessages - string: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/js-without-macros.js,
+        js-without-macros.js,
         27,
       ],
     ],
@@ -138,23 +138,23 @@ Object {
   Hi, my name is {name}: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-with-macros.js,
+        jsx-with-macros.js,
         3,
       ],
     ],
   },
   Title: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-with-macros.js,
+        jsx-with-macros.js,
         4,
       ],
     ],
   },
   {count, plural, one {# book} other {# books}}: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-with-macros.js,
+        jsx-with-macros.js,
         6,
       ],
     ],
@@ -167,7 +167,7 @@ Object {
   Hi, my name is <0>{name}</0>: Object {
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-without-macros.js,
+        jsx-without-macros.js,
         9,
       ],
     ],
@@ -176,11 +176,11 @@ Object {
     message: Hello World,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-without-macros.js,
+        jsx-without-macros.js,
         7,
       ],
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-without-macros.js,
+        jsx-without-macros.js,
         8,
       ],
     ],
@@ -189,7 +189,7 @@ Object {
     comment: Description,
     origin: Array [
       Array [
-        packages/babel-plugin-extract-messages/test/fixtures/jsx-without-macros.js,
+        jsx-without-macros.js,
         6,
       ],
     ],

packages/babel-plugin-extract-messages/test/fixtures/.linguirc

@@ -0,0 +1,3 @@
+{
+  "locales": ["en", "cs"]
+}

packages/babel-plugin-extract-messages/test/index.ts

@@ -6,16 +6,7 @@ import plugin from "@lingui/babel-plugin-extract-messages"
 
 const LOCALE_DIR = "./locale"
 
-// CWD is root directory of repository, so origin of all messages is going to
-// relative to root
-const buildDir = path.join(
-  LOCALE_DIR,
-  "_build",
-  "packages",
-  "babel-plugin-extract-messages",
-  "test",
-  "fixtures"
-)
+const buildDir = path.join(LOCALE_DIR, "_build")
 
 const rmdir = dir => {
   if (!fs.existsSync(dir)) return
@@ -39,7 +30,7 @@ const rmdir = dir => {
 }
 
 function testCase(testName, assertion) {
-  const transform = (filename, jsx = true) => () => {
+  const transform = filename => () => {
     process.env.LINGUI_EXTRACT = "1"
     try {
       return transformFileSync(path.join(__dirname, "fixtures", filename), {
@@ -65,9 +56,9 @@ function testCase(testName, assertion) {
   } else {
     it(testName, () => {
       // first run should create all required folders and write messages
-      expect(transform(assertion, false)).not.toThrow()
+      expect(transform(assertion)).not.toThrow()
       // another runs should just write messages
-      expect(transform(assertion, false)).not.toThrow()
+      expect(transform(assertion)).not.toThrow()
 
       const messages = JSON.parse(
         fs.readFileSync(path.join(buildDir, `${assertion}.json`)).toString()

packages/cli/package.json

@@ -34,12 +34,11 @@
     "*.js.flow"
   ],
   "dependencies": {
-    "@babel/core": "^7.1.0",
-    "@babel/generator": "^7.0.0",
-    "@babel/parser": "^7.1.0",
+    "@babel/generator": "^7.1.3",
+    "@babel/parser": "^7.1.3",
     "@babel/plugin-syntax-jsx": "^7.0.0",
     "@babel/runtime": "^7.0.0",
-    "@babel/types": "^7.0.0",
+    "@babel/types": "^7.1.3",
     "@lingui/babel-plugin-extract-messages": "0.0.0-managed-by-release-script",
     "@lingui/conf": "0.0.0-managed-by-release-script",
     "babel-plugin-macros": "^2.4.1",
@@ -53,6 +52,7 @@
     "inquirer": "^6.3.1",
     "make-plural": "^4.1.1",
     "messageformat-parser": "^2.0.0",
+    "minimatch": "^3.0.4",
     "mkdirp": "^0.5.1",
     "ora": "^3.4.0",
     "pofile": "^1.0.11",
@@ -64,6 +64,6 @@
     "mockdate": "^2.0.2"
   },
   "peerDependencies": {
-    "babel-core": "6.x || ^7.0.0-bridge.0"
+    "babel-core": "^6.0.0 | ^7.0.0-bridge.0"
   }
 }