i18nexus-cli 3.1.0 → 3.3.0

package/README.md

@@ -4,11 +4,16 @@
 
 ## New to i18nexus?
 
-[i18nexus](https://i18nexus.com) is a translation management web application designed for use with i18next. Learn more with this quick [Next.js walkthrough](https://i18nexus.com/nextjs-tutorial) or this [React.js walkthrough](https://i18nexus.com/react-tutorial).
+[i18nexus](https://i18nexus.com) is a translation management web application designed for use with i18next, next-intl, and react-intl. Learn more with these quick tutorials:
+
+- [next-i18next Walkthrough](https://i18nexus.com/tutorials/nextjs/next-i18next)
+- [next-intl Walkthrough](https://i18nexus.com/tutorials/nextjs/next-intl)
+- [react-i18next Walkthrough](https://i18nexus.com/tutorials/react/react-i18next)
+- [react-intl Walkthrough](https://i18nexus.com/tutorials/react/react-intl)
 
 ## Who is this CLI meant for?
 
-- Developers who prefer to download and bundle their translation files with their app (especially useful for those who use SSR/SSG and libraries such as [next-i18next](https://github.com/isaachinman/next-i18next)).
+- Developers who prefer to download and bundle their translation files with their app (especially useful for those who use SSR/SSG and libraries like Next.js).
 - Developers who wish to add, edit, or delete strings in their i18nexus project from the command line.
 
 ## Installation
@@ -19,7 +24,7 @@ npm install -g i18nexus-cli
 
 ## Environment Variables
 
-The commands below have options that can be set with environment variables. Since the majority of our users are using this package in the context of their web or mobile application, this package will load the `.env` file in the current working directory to check for i18nexus variables. If you would prefer not to load your `.env` file, you can run `export I18NEXUS_NO_DOT_ENV=true`.
+The commands below have options that can be set with environment variables. Since the majority of our users are using this package in the context of their web application, this package will load the `.env` file in the current working directory to check for i18nexus variables. If you would prefer not to load your `.env` file, you can run `export I18NEXUS_NO_DOT_ENV=true`.
 
 ## Downloading your translations
 
@@ -27,7 +32,11 @@ The commands below have options that can be set with environment variables. Sinc
 i18nexus pull -k <PROJECT_API_KEY>
 ```
 
-The above snippet will download all of your latest translations to your current directory in the following structure:
+The above snippet will download all of your latest translations to your current directory. Your translation files will be downloaded in a file structure based on the convention of your i18n library.
+
+### Default download path:
+
+If your i18nexus project is set to **`i18next`**:
 
 ```
 .
@@ -39,18 +48,48 @@ The above snippet will download all of your latest translations to your current
             └── common.json
 ```
 
-This structure is i18next convention, and will work by default with [next-i18next](https://github.com/isaachinman/next-i18next).
+If your i18nexus project is set to **`i18next`** and the CLI detects you're using **Next.js + App Router**:
+
+```
+.
+└── locales
+    ├── en
+    |   └── common.json
+    └── de
+        └── common.json
+```
+
+If your i18nexus project is set to **`next-intl`**:
+
+```
+.
+└── messages
+    └── en.json
+    └── de.json
+```
+
+If your i18nexus project is set to **`react-intl`**:
+
+```
+.
+└── messages
+    └── locales
+        ├── en
+        |   └── common.json
+        └── de
+            └── common.json
+```
 
 If you wish to download your files to a different directory, you can use the `--path` option to specify your download destination. See all options below:
 
 ### Options
 
-| Option              | Default value      |
-| ------------------- | ------------------ |
-| `--api-key` or `-k` |                    |
-| `--path` or `-p`    | `./public/locales` |
-| `--ver` or `-v`     | `latest`           |
-| `--clean`           | `false`            |
+| Option              | Default value |
+| ------------------- | ------------- |
+| `--api-key` or `-k` |               |
+| `--path` or `-p`    | (See above)   |
+| `--ver` or `-v`     | `latest`      |
+| `--clean`           | `false`       |
 
 ### Notes
 

package/bin/index.js

@@ -32,10 +32,9 @@ program
     'The version of the translations to be downloaded.',
     process.env.I18NEXUS_VERSION || 'latest'
   )
-  .requiredOption(
+  .option(
     '-p, --path <path>',
-    'The path to the destination folder in which translation files will be downloaded',
-    `${process.cwd()}/public/locales`
+    'The path to the destination folder in which translation files will be downloaded'
   )
   .option(
     '--clean',

package/commands/pull.js

@@ -3,6 +3,7 @@ const colors = require('colors');
 const handleError = require('../handleError');
 const handleFetch = require('../handleFetch');
 const baseUrl = require('../baseUrl');
+const getProject = require('../getProject');
 
 const cleanDirectory = path => {
   if (!fs.existsSync(path)) {
@@ -22,9 +23,43 @@ const cleanDirectory = path => {
 };
 
 const pull = async opt => {
-  const usingVersion = opt.version !== 'latest';
+  let path = opt.path;
+
+  const project = await getProject(opt.apiKey);
+
+  const projectLibrary = project.library;
 
-  console.log(baseUrl);
+  if (!path) {
+    if (!projectLibrary) {
+      console.log(
+        colors.red(
+          'There was a problem fetching your translations. Please try again in a moment.'
+        )
+      );
+      return process.exit(1);
+    }
+
+    if (projectLibrary === 'i18next') {
+      const hasAppDir =
+        fs.existsSync(`${process.cwd()}/app`) ||
+        fs.existsSync(`${process.cwd()}/src/app`);
+      const usingAppRouter =
+        hasAppDir &&
+        (fs.existsSync(`${process.cwd()}/.next`) ||
+          fs.existsSync(`${process.cwd()}/next.config.js`) ||
+          fs.existsSync(`${process.cwd()}/next.config.ts`));
+
+      if (usingAppRouter) {
+        path = `${process.cwd()}/locales`;
+      } else {
+        path = `${process.cwd()}/public/locales`;
+      }
+    } else {
+      path = `${process.cwd()}/messages`;
+    }
+  }
+
+  const usingVersion = opt.version !== 'latest';
 
   let url = usingVersion
     ? `https://cdn.i18nexus.com/versions/${opt.version}/translations.json`
@@ -32,7 +67,7 @@ const pull = async opt => {
 
   url += `?api_key=${opt.apiKey}`;
 
-  console.log(`Downloading translations to ${opt.path}...`);
+  console.log(`Downloading translations to ${path}...`);
 
   const response = await handleFetch(url);
 
@@ -48,19 +83,30 @@ const pull = async opt => {
   const translations = await response.json();
 
   if (opt.clean) {
-    cleanDirectory(opt.path);
+    cleanDirectory(path);
   }
 
-  for (let lng in translations) {
-    const lngFilePath = `${opt.path}/${lng}`;
-    fs.mkdirSync(lngFilePath, { recursive: true });
+  if (projectLibrary === 'next-intl') {
+    for (let lng in translations) {
+      fs.mkdirSync(path, { recursive: true });
 
-    for (let namespace in translations[lng]) {
       fs.writeFileSync(
-        `${lngFilePath}/${namespace}.json`,
-        JSON.stringify(translations[lng][namespace])
+        `${path}/${lng}.json`,
+        JSON.stringify(translations[lng])
       );
     }
+  } else {
+    for (let lng in translations) {
+      const lngFilePath = `${path}/${lng}`;
+      fs.mkdirSync(lngFilePath, { recursive: true });
+
+      for (let namespace in translations[lng]) {
+        fs.writeFileSync(
+          `${lngFilePath}/${namespace}.json`,
+          JSON.stringify(translations[lng][namespace])
+        );
+      }
+    }
   }
 
   console.log(colors.green('Translations downloaded successfully.'));

package/getProject.js

@@ -0,0 +1,20 @@
+const handleError = require('./handleError');
+const handleFetch = require('./handleFetch');
+const baseUrl = require('./baseUrl');
+
+const getProject = async apiKey => {
+  const url = `${baseUrl}/project_resources/project.json?api_key=${apiKey}`;
+
+  const response = await handleFetch(url);
+
+  if (response.status !== 200) {
+    return handleError(
+      response,
+      'There was a problem fetching your translations. Please try again in a moment.'
+    );
+  }
+
+  return response.json();
+};
+
+module.exports = getProject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18nexus-cli",
-  "version": "3.1.0",
+  "version": "3.3.0",
   "description": "Command line interface (CLI) for accessing the i18nexus API",
   "main": "index.js",
   "bin": {