feat(i18n-loader): handle projects with one file per language

README.md

@@ -64,15 +64,31 @@ npm i @creadigme/au-i18n-audit --save-dev
 
 1. Check the directories of your project, example :
 
+i18n with a specific file per namespace (`--i18nMode tree`):
+
 ```shell
 
 ├── i18n
 │   ├── fr
-│   │   ├── NS1.{yml,json}
-│   │   └── NS2.{yml,json}
+│   │   ├── NS1.{yml,yaml,json}
+│   │   └── NS2.{yml,yaml,json}
 │   └── en
-│       ├── NS1.{yml,json}
-│       └── NS2.{yml,json}
+│       ├── NS1.{yml,yaml,json}
+│       └── NS2.{yml,yaml,json}
+└── src
+    ├── file1.{js,ts}
+    ├── file2.{js,ts}
+    └── file3.{js,ts}
+
+```
+
+i18n with a specific file for each language (`--i18nMode root`):
+
+```shell
+
+├── i18n
+│   ├── fr.{yml,yaml,json}
+│   └── en.{yml,yaml,json}
 └── src
     ├── file1.{js,ts}
     ├── file2.{js,ts}
@@ -82,9 +98,10 @@ npm i @creadigme/au-i18n-audit --save-dev
 
 2. Add i18n script
 
-```json
+```diff
 "scripts": {
-  "i18n" : "au-i18n-audit --src ./src/ --i18n ./i18n --reporter summary"
++  "i18n" : "au-i18n-audit --src ./src/ --i18n ./i18n --i18nMode tree --reporter summary"
+!  "i18n" : "au-i18n-audit --src ./src/ --i18n ./i18n --i18nMode root --reporter summary"
 }
 ```
 

samples/case_04/i18n/fr.json

@@ -0,0 +1,8 @@
+{
+  "EASY": {
+    "STOP": "STOP",
+    "START": "Start",
+    "PAUSE": "Pause",
+    "NOT_USED": "Another One"
+  }
+}

samples/case_04/src/sample.html

@@ -0,0 +1,18 @@
+<template>
+
+  <div class="something else" title.one-time="'EASY.PAUSE' & t">?</div>
+        <div class="something else" title.bind="'EASY.START' & t">?</div>
+        <div class="something else" title.one-time="'EASY.START' & t">?</div>
+          <div class="something else" title.bind="'EASY.STOP' & t">?</div>
+
+          <div class="something else">${"EASY.KEY" & t} : </div>
+          <div class="something else">${'EASY.KEY2' | t} : </div>
+          <!-- ignore this -->
+          <div class="something else">${'EASY.KEY3'} : </div>
+
+
+          <div class="something else" t="EASY.KEY"></div>
+          <div class="something else" t="EASY.KEY2"></div>
+          <!-- ignore this -->
+          <div class="something else" tt="EASY.KEY3"></div>
+</template>

samples/case_04/src/sample.ts

@@ -0,0 +1,28 @@
+export class Sample3 {
+  public i18n: any;
+
+  /**
+   */
+  public something() {
+    return this.i18n.tr('EASY.START');
+  }
+
+  /**
+   */
+  public summoner() {
+    return this.i18n.tr('EASY.STOP');
+  }
+
+  /**
+   */
+  public invocation() {
+    return this.i18n.tr('EASY.MIDDLE');
+  }
+
+  /**
+   */
+  public moon() {
+    // return true; this.i18n.tr("EASY.MOON");
+    return true; // this.i18n.tr("EASY.MOON");
+  }
+}

src/cli.ts

@@ -7,6 +7,7 @@ const commandLineArgs = commandLineArgsImp.default || commandLineArgsImp;
 const optionDefinitions = [
   { name: 'src', type: String, multiple: true },
   { name: 'i18n', type: String, multiple: true },
+  { name: 'i18nMode', type: String },
   { name: 'remote-i18n', type: String, multiple: false },
   { name: 'lang', type: String, multiple: true },
   { name: 'namespace', type: String, multiple: true },
@@ -31,6 +32,7 @@ CLIReporter.cliAsync({
   local: options.i18n
     ? {
         i18nPaths: options.i18n,
+        mode: options.i18nMode,
       }
     : undefined,
   remote: options['remote-i18n']

src/i18n/i18n-audit-options.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 import { forwardSlash } from '../utils/forward-slash';
 import { ELevel } from './e-level';
 import { II18NConfig } from './i-i18n-config';
-import { ILocalOptions, IRemoteOptions } from './i18n-loader';
+import type { ILocalOptions, IRemoteOptions } from './loader/provider/i18n-loader-common';
 
 export class I18NAuditOptions {
   private _isInit?: boolean = false;

src/i18n/i18n-audit.spec.ts

@@ -27,7 +27,7 @@ describe('i18n-audit', () => {
   });
 
   describe('lint', () => {
-    describe('local', () => {
+    describe('local - Tree i18n/lang/ns', () => {
       it('html without i18n', async () => {
         const audit = new I18NAudit({
           srcPaths: [path.resolve('.\\samples\\wo_i18n\\src')],
@@ -176,6 +176,67 @@ describe('i18n-audit', () => {
       });
     });
 
+    describe('local - Root i18n/{{lang}}.fr', () => {
+      it('easy', async () => {
+        const audit = new I18NAudit(
+          new I18NAuditOptions({
+            srcPaths: [path.resolve('.\\samples\\case_04\\src')],
+            local: {
+              i18nPaths: [path.resolve('.\\samples\\case_04\\i18n')],
+              mode: 'root',
+            },
+            level: ELevel.EASY,
+          })
+        );
+
+        await audit.initializeAsync();
+        const details = await audit.validateAsync();
+        assert.strictEqual(details.isOk, true);
+        assert.strictEqual(details.languages.length, 1);
+        assert.strictEqual(details.unused.length, 1);
+        assert.strictEqual(Object.keys(details.missingKeys).length, 3);
+      });
+
+      it('medium', async () => {
+        const audit = new I18NAudit({
+          srcPaths: [path.resolve('.\\samples\\case_04\\src')],
+          local: {
+            i18nPaths: [path.resolve('.\\samples\\case_04\\i18n')],
+            mode: 'root',
+          },
+          level: ELevel.MEDIUM,
+        });
+
+        await audit.initializeAsync();
+        const details = await audit.validateAsync();
+        assert.strictEqual(details.isOk, false);
+        assert.strictEqual(details.languages.length, 1);
+        assert.strictEqual(details.unused.length, 1);
+        assert.strictEqual(Object.keys(details.missingKeys).length, 3);
+      });
+
+      it('hard', async () => {
+        const audit = new I18NAudit({
+          srcPaths: [path.resolve('.\\samples\\case_04\\src')],
+          local: {
+            i18nPaths: [path.resolve('.\\samples\\case_04\\i18n')],
+            mode: 'root',
+          },
+          level: ELevel.HARD,
+          i18nConfig: {
+            attributes: [],
+          },
+        });
+
+        await audit.initializeAsync();
+        const details = await audit.validateAsync();
+        assert.strictEqual(details.isOk, false);
+        assert.strictEqual(details.languages.length, 1);
+        assert.strictEqual(details.unused.length, 1);
+        assert.strictEqual(Object.keys(details.missingKeys).length, 3);
+      });
+    });
+
     describe('remote', () => {
       const fakeI18nBackend = new FakeI18NBackend();
 

src/i18n/i18n-audit.ts

@@ -7,7 +7,8 @@ import { II18NAuditResults } from './i-i18n-audit-results';
 import { ELevel } from './e-level';
 
 import { I18NSeeker } from './i18n-seeker';
-import { I18NLoader, I18NKeys } from './i18n-loader';
+import { I18NLoader } from './loader/i18n-loader';
+import type { I18NKeys } from './loader/provider/i18n-loader-common';
 
 /**
  * I18N Audit