Added the ability to exclude generic files or generic folders. (#71)

martinlindhe · May 1, 2019 · 056293f · 056293f
1 parent a0f95ad
commit 056293f
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 35 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -25,6 +25,9 @@ public function __construct($config = [])
         if (!isset($config['i18nLib'])) {
             $config['i18nLib'] = self::VUE_I18N;
         }
+        if (!isset($config['excludes'])) {
+            $config['excludes'] = [];
+        }
         $this->config = $config;
     }
 
@@ -49,7 +52,9 @@ public function generateFromPath($path, $format = 'es6', $withVendor = false, $l
         $jsBody = '';
         foreach ($dir as $fileinfo) {
             if (!$fileinfo->isDot()) {
-                if(!$withVendor && in_array($fileinfo->getFilename(), ['vendor'])) {
+                if(!$withVendor
+                    && in_array($fileinfo->getFilename(), array_merge(['vendor'], $this->config['excludes']))
+                ) {
                     continue;
                 }
 
@@ -62,21 +67,23 @@ public function generateFromPath($path, $format = 'es6', $withVendor = false, $l
             $fileinfo = new \SplFileInfo($fileName);
 
             $noExt = $this->removeExtension($fileinfo->getFilename());
-            if (class_exists('App')) {
-                App::setLocale($noExt);
-            }
+            if ($noExt !== '') {
+                if (class_exists('App')) {
+                    App::setLocale($noExt);
+                }
 
-            if ($fileinfo->isDir()) {
-                $local = $this->allocateLocaleArray($fileinfo->getRealPath());
-            } else {
-                $local = $this->allocateLocaleJSON($fileinfo->getRealPath());
-                if ($local === null) continue;
-            }
+                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;
+                if (isset($locales[$noExt])) {
+                    $locales[$noExt] = array_merge($local, $locales[$noExt]);
+                } else {
+                    $locales[$noExt] = $local;
+                }
             }
         }
 
@@ -120,29 +127,30 @@ public function generateMultiple($path, $format = 'es6')
         $jsBody = '';
         foreach ($dir as $fileinfo) {
             if (!$fileinfo->isDot()
-                && !in_array($fileinfo->getFilename(), ['vendor'])
+                && !in_array($fileinfo->getFilename(), array_merge(['vendor'], $this->config['excludes']))
+                && $fileinfo !== ''
             ) {
                 $noExt = $this->removeExtension($fileinfo->getFilename());
-                if (class_exists('App')) {
-                    App::setLocale($noExt);
-                }
-                if (!in_array($noExt, $this->availableLocales)) {
-                    $this->availableLocales[] = $noExt;
-                }
-                if ($fileinfo->isDir()) {
-                    $local = $this->allocateLocaleArray($fileinfo->getRealPath());
-                } else {
-                    $local = $this->allocateLocaleJSON($fileinfo->getRealPath());
-                    if ($local === null) continue;
-                }
+                if ($noExt !== '') {
+                    if (class_exists('App')) {
+                        App::setLocale($noExt);
+                    }
+                    if (!in_array($noExt, $this->availableLocales)) {
+                        $this->availableLocales[] = $noExt;
+                    }
+                    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;
+                    if (isset($locales[$noExt])) {
+                        $locales[$noExt] = array_merge($local, $locales[$noExt]);
+                    } else {
+                        $locales[$noExt] = $local;
+                    }
                 }
-
-
             }
         }
         foreach ($this->filesToCreate as $fileName => $data) {

diff --git a/src/config/vue-i18n-generator.php b/src/config/vue-i18n-generator.php
@@ -32,15 +32,17 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Excluded files
+    | Excluded files & folders
     |--------------------------------------------------------------------------
     |
-    | Exclude translation files you don't need.
+    | Exclude translation files, generic files or folders you don't need.
     |
     */
     'excludes' => [
         /*
         'validation',
+        'example.file',
+        'example-folder',
         */
     ],