Add file name and lang files command line options (#70)

* Add command line option for output file name

* Add command line option for lang files

* Make tests pass

Author: ElNinjaNerdT

src/Commands/GenerateInclude.php

@@ -11,7 +11,7 @@ class GenerateInclude extends Command
      *
      * @var string
      */
-    protected $signature = 'vue-i18n:generate {--umd} {--multi} {--with-vendor}';
+    protected $signature = 'vue-i18n:generate {--umd} {--multi} {--with-vendor} {--file-name=} {--lang-files=}';
 
     /**
      * The console command description.
@@ -33,6 +33,8 @@ public function handle()
         $umd = $this->option('umd');
         $multipleFiles = $this->option('multi');
         $withVendor = $this->option('with-vendor');
+        $fileName = $this->option('file-name');
+        $langFiles = $this->option('lang-files');
 
         if ($multipleFiles) {
             $files = (new Generator($config))
@@ -45,14 +47,32 @@ public function handle()
             return;
         }
 
+        if ($langFiles) {
+            $langFiles = explode(',', $langFiles);
+        }
+
         $data = (new Generator($config))
-            ->generateFromPath($root, $umd, $withVendor);
+            ->generateFromPath($root, $umd, $withVendor, $langFiles);
+
 
-        $jsFile = base_path() . config('vue-i18n-generator.jsFile');
+        $jsFile = $this->getFileName($fileName);
         file_put_contents($jsFile, $data);
 
         if ($config['showOutputMessages']) {
             $this->info("Written to : ".$jsFile);
         }
     }
+
+    /**
+     * @param string $fileNameOption
+     * @return string
+     */
+    private function getFileName($fileNameOption)
+    {
+        if (isset($fileNameOption)) {
+            return base_path() . $fileNameOption;
+        }
+
+         return base_path() . config('vue-i18n-generator.jsFile');
+    }
 }

src/Generator.php

@@ -10,6 +10,7 @@ class Generator
 
     private $availableLocales = [];
     private $filesToCreate = [];
+    private $langFiles;
 
     const VUEX_I18N = 'vuex-i18n';
     const VUE_I18N = 'vue-i18n';
@@ -34,12 +35,14 @@ public function __construct($config = [])
      * @return string
      * @throws Exception
      */
-    public function generateFromPath($path, $umd = null, $withVendor = false)
+    public function generateFromPath($path, $umd = null, $withVendor = false, $langFiles = [])
     {
         if (!is_dir($path)) {
             throw new Exception('Directory not found: ' . $path);
         }
 
+        $this->langFiles = $langFiles;
+
         $locales = [];
         $files = [];
         $dir = new DirectoryIterator($path);
@@ -208,9 +211,7 @@ private function allocateLocaleArray($path)
                     continue;
                 }
 
-                if ((isset($this->config['langFiles']) && !empty($this->config['langFiles']) && !in_array($noExt, $this->config['langFiles']))
-                    || (isset($this->config['excludes']) && in_array($noExt, $this->config['excludes']))
-                ) {
+                if ($this->shouldIgnoreLangFile($noExt)) {
                     continue;
                 }
 
@@ -233,6 +234,21 @@ private function allocateLocaleArray($path)
         return $data;
     }
 
+    /**
+     * @param string $noExt
+     * @return boolean
+     */
+    private function shouldIgnoreLangFile($noExt)
+    {
+        // langFiles passed by option have priority
+        if (isset($this->langFiles) && !empty($this->langFiles)) {
+            return !in_array($noExt, $this->langFiles);
+        }
+
+        return (isset($this->config['langFiles']) && !empty($this->config['langFiles']) && !in_array($noExt, $this->config['langFiles']))
+                    || (isset($this->config['excludes']) && in_array($noExt, $this->config['excludes']));
+    }
+
     /**
      * @param array $arr
      * @return array