Added support for nested folders in translations, closes #12

Author: luisdalmolin

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kirschbaum-development/laravel-translations-loader",
-    "version": "0.4.4",
+    "version": "0.5.0",
     "main": "all.js",
     "author": {
         "name": "Kirschbaum Development"
@@ -31,6 +31,7 @@
         }
     ],
     "dependencies": {
+        "klaw-sync": "^6.0.0",
         "loader-utils": "^1.1.0",
         "lodash": "^4.17.11",
         "php-array-parser": "^1.0.1"

php-loader.js

@@ -3,34 +3,39 @@ const fs = require('fs');
 const _ = require('lodash');
 const loaderUtils = require('loader-utils');
 const phpArrayParser = require('php-array-parser');
+const klaw = require('klaw-sync');
 
 const phpLoader = {
     execute (baseDirectory, options) {
         var bundle = {};
-
         var directories;
 
+        if (! path.isAbsolute(baseDirectory)) {
+            baseDirectory = path.resolve(baseDirectory);
+        }
+
         directories = fs.readdirSync(baseDirectory).filter((file) => {
             return fs.statSync(path.join(baseDirectory, file)).isDirectory();
         });
 
-
         directories.forEach((directory) => {
             var langDirectory = path.join(baseDirectory, directory);
-            var files = files = fs.readdirSync(langDirectory).filter(function (file) {
-                return path.extname(file) === '.php';
-            });
 
-            files.forEach((file) => {
-                var content = fs.readFileSync(path.join(langDirectory, file), 'utf8');
+            klaw(langDirectory, {
+                nodir: true
+            }).filter((file) => {
+                return path.extname(file.path) === '.php';
+            }).forEach((file) => {
+                var filename = file.path.split(langDirectory + '/')[1];
+                var content = fs.readFileSync(path.join(langDirectory, filename), 'utf8');
 
                 // Remove left part of return expression and any ending `?>`.
                 const ret = content.indexOf('return') + 'return'.length
                 content = content.substr(ret)
                 content = content.replace(/\?>\s*$/, '_')
 
                 let langObject = {}
-                langObject[file.replace('.php', '')] = phpArrayParser.parse(content)
+                langObject[filename.replace('.php', '')] = phpArrayParser.parse(content)
 
                 if (typeof options.namespace !== 'undefined') {
                     if (typeof bundle[directory] === 'undefined') {

test/fixtures/php-with-nested-folders/en/menu/main.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+
+    'home' => 'Home',
+    'about' => 'About',
+
+];

test/fixtures/php-with-nested-folders/en/validation.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+    'required' => 'This field is required',
+
+];

test/php.test.js

@@ -1,4 +1,5 @@
 let assert = require('assert')
+let path = require('path')
 let phpLoader = require('./../php-loader')
 
 describe('it should load php language files', function () {
@@ -48,4 +49,18 @@ describe('it should load php language files', function () {
             }
         });
     });
+
+    it('should be able to load nested folders', function () {
+        let content = phpLoader.execute('./test/fixtures/php-with-nested-folders', {});
+
+        assert.deepEqual(content.en, {
+            validation: {
+                required: 'This field is required',
+            },
+            "menu/main": {
+                home: 'Home',
+                about: 'About'
+            }
+        });
+    });
 });

yarn.lock

@@ -74,6 +74,11 @@ [email protected]:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+graceful-fs@^4.1.11:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
 [email protected]:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -107,6 +112,13 @@ json5@^0.5.0:
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
+klaw-sync@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
+  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+
 loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"