rework internals, make tests more robust

Author: martinlindhe

README.md

@@ -87,9 +87,9 @@ yarn add vuex-i18n vuex
 
 Next, open `config/vue-i18n-generator.php` and do the following changes:
 
-```php
-- 'i18nLib' => \MartinLindhe\VueInternationalizationGenerator\Generator::VUE_I18N,
-+ 'i18nLib' => \MartinLindhe\VueInternationalizationGenerator\Generator::VUEX_I18N,
+```diff
+- 'i18nLib' => 'vue-i18n',
++ 'i18nLib' => 'vuex-i18n',
 ```
 
 Then generate the include file with
@@ -183,12 +183,7 @@ Vue template:
 
 - The generated file is an ES6 module.
 
-- One note on [Pluralization](http://laravel.com/docs/5.5/localization#pluralization). This used not to work with vue-i18n but as mentioned at [#12](https://github.com/martinlindhe/laravel-vue-i18n-generator/issues/12)
-they might work since vue-i18n uses the same syntax for separation of singular and plural form as Laravel does. So far this is not confirmed.
-
-  On the other hand it has been tested that pluralization work with vuex-i18n for simple singular / plural forms. However, the 
-  more sophisticated localization as described [here](https://laravel.com/docs/5.5/localization#pluralization) is not supported since
-  vuex-i18n does not support this.
+The more sophisticated pluralization localization as described [here](https://laravel.com/docs/5.5/localization#pluralization) is not supported since neither vue-i18n or vuex-i18n support this.
 
 # License
 

src/Commands/GenerateInclude.php

@@ -27,27 +27,23 @@ class GenerateInclude extends Command
     public function handle()
     {
         $root = base_path() . config('vue-i18n-generator.langPath');
+        $config = config('vue-i18n-generator');
 
+        // options
         $umd = $this->option('umd');
-
         $multipleFiles = $this->option('multi');
-
         $withVendor = $this->option('with-vendor');
 
-        $i18nLib = config('vue-i18n-generator.i18nLib');
-
         if ($multipleFiles) {
-            $files = (new Generator($i18nLib))
+            $files = (new Generator($config))
                 ->generateMultiple($root, $umd);
             echo "Written to :" . PHP_EOL . $files . PHP_EOL;
             exit();
         }
 
-        $data = (new Generator($i18nLib))
+        $data = (new Generator($config))
             ->generateFromPath($root, $umd, $withVendor);
 
-
-
         $jsFile = base_path() . config('vue-i18n-generator.jsFile');
         file_put_contents($jsFile, $data);
 

src/Generator.php

@@ -6,23 +6,25 @@
 
 class Generator
 {
+    private $config;
 
     private $availableLocales = [];
     private $filesToCreate = [];
 
     const VUEX_I18N = 'vuex-i18n';
     const VUE_I18N = 'vue-i18n';
 
-    private $i18nLib;
-
     /**
      * The constructor
      *
-     * @param string $i18nLib
+     * @param array $config
      */
-    public function __construct($i18nLib = self::VUE_I18N)
+    public function __construct($config = [])
     {
-        $this->i18nLib = $i18nLib;
+        if (!isset($config['i18nLib'])) {
+            $config['i18nLib'] = self::VUE_I18N;
+        }
+        $this->config = $config;
     }
 
     /**
@@ -39,6 +41,7 @@ public function generateFromPath($path, $umd = null, $withVendor = false)
         }
 
         $locales = [];
+        $files = [];
         $dir = new DirectoryIterator($path);
         $jsBody = '';
         foreach ($dir as $fileinfo) {
@@ -47,20 +50,27 @@ public function generateFromPath($path, $umd = null, $withVendor = false)
                     continue;
                 }
 
-                $noExt = $this->removeExtension($fileinfo->getFilename());
+                $files[] = $fileinfo->getRealPath();
+            }
+        }
+        asort($files);
 
-                if ($fileinfo->isDir()) {
-                    $local = $this->allocateLocaleArray($fileinfo->getRealPath());
-                } else {
-                    $local = $this->allocateLocaleJSON($fileinfo->getRealPath());
-                    if ($local === null) continue;
-                }
+        foreach ($files as $fileName) {
+            $fileinfo = new \SplFileInfo($fileName);
 
-                if (isset($locales[$noExt])) {
-                    $locales[$noExt] = array_merge($local, $locales[$noExt]);
-                } else {
-                    $locales[$noExt] = $local;
-                }
+            $noExt = $this->removeExtension($fileinfo->getFilename());
+
+            if ($fileinfo->isDir()) {
+                $local = $this->allocateLocaleArray($fileinfo->getRealPath());
+            } else {
+                $local = $this->allocateLocaleJSON($fileinfo->getRealPath());
+                if ($local === null) continue;
+            }
+
+            if (isset($locales[$noExt])) {
+                $locales[$noExt] = array_merge($local, $locales[$noExt]);
+            } else {
+                $locales[$noExt] = $local;
             }
         }
 
@@ -92,7 +102,7 @@ public function generateMultiple($path, $umd = null)
         if (!is_dir($path)) {
             throw new Exception('Directory not found: ' . $path);
         }
-        $jsPath = base_path() . config('vue-i18n-generator.jsPath');
+        $jsPath = base_path() . $this->config['jsPath'];
         $locales = [];
         $fileToCreate = '';
         $createdFiles = '';
@@ -183,8 +193,7 @@ private function allocateLocaleArray($path)
             if ($fileinfo->isDir()) {
                 // Recursivley iterate through subdirs, until everything is allocated.
 
-                $data[$fileinfo->getFilename()] =
-                    $this->allocateLocaleArray($path . '/' . $fileinfo->getFilename());
+                $data[$fileinfo->getFilename()] = $this->allocateLocaleArray($path . '/' . $fileinfo->getFilename());
             } else {
                 $noExt = $this->removeExtension($fileinfo->getFilename());
                 $fileName = $path . '/' . $fileinfo->getFilename();
@@ -194,8 +203,7 @@ private function allocateLocaleArray($path)
                     continue;
                 }
 
-                $langFiles = config('vue-i18n-generator.langFiles');
-                if(! is_null($langFiles) && ! empty($langFiles) && ! in_array($noExt, $langFiles)) {
+                if (!empty($langFiles) && !in_array($noExt, $langFiles)) {
                     continue;
                 }
 
@@ -205,8 +213,8 @@ private function allocateLocaleArray($path)
                     throw new Exception('Unexpected data while processing ' . $fileName);
                     continue;
                 }
-                if($lastLocale !== false){
-                    $root = realpath(base_path() . config('vue-i18n-generator.langPath') . '/' . $lastLocale);
+                if ($lastLocale !== false) {
+                    $root = realpath(base_path() . $this->config['langPath'] . '/' . $lastLocale);
                     $filePath = $this->removeExtension(str_replace('\\', '_', ltrim(str_replace($root, '', realpath($fileName)), '\\')));
                     $this->filesToCreate[$filePath][$lastLocale] = $this->adjustArray($tmp);
                 }
@@ -261,8 +269,7 @@ private function adjustVendor($locales)
     }
 
     /**
-     * Turn Laravel style ":link" into vue-i18n style "{link}" and
-     * turn Laravel style "|" into vuex-i18n style ":::" when using vuex-i18n.
+     * Turn Laravel style ":link" into vue-i18n style "{link}" or vuex-i18n style ":::".
      *
      * @param string $s
      * @return string
@@ -273,10 +280,9 @@ private function adjustString($s)
             return $s;
         }
 
-        if ($this->i18nLib === self::VUEX_I18N) {
+        if ($this->config['i18nLib'] === self::VUEX_I18N) {
             $searchPipePattern = '/(\s)*(\|)(\s)*/';
             $threeColons = ' ::: ';
-
             $s = preg_replace($searchPipePattern, $threeColons, $s);
         }
 

src/GeneratorProvider.php

@@ -18,10 +18,6 @@ class GeneratorProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->app->singleton('vue-i18n.generate', function () {
-            return new Commands\GenerateInclude;
-        });
-
         $this->commands(
             'vue-i18n.generate'
         );
@@ -43,6 +39,9 @@ public function boot()
      */
     public function register()
     {
+        $this->app->singleton(Generator::class, function ($app) {
+            return new Generator($app['config']['vue-i18n-generator']);
+        });
     }
 
     /**

src/config/vue-i18n-generator.php

@@ -49,8 +49,7 @@
     |
     | Specify the library you use for localization.
     | Options are vue-i18n or vuex-i18n.
-    | You can also use Generator::VUE_I18N or Generator::VUEX_I18N
     |
     */
-    'i18nLib' => \MartinLindhe\VueInternationalizationGenerator\Generator::VUE_I18N,
+    'i18nLib' => 'vue-i18n',
 ];