Improvements on docs and tests.

Author: rmariuzzo

loader/index.js

@@ -1,13 +1,23 @@
+
 const phpArrayParser = require('./parser/php-array')
-const jsonParser = require('json-loader');
+const jsonParser = require('json-loader')
 
+/**
+ * The Laravel Localization loader.
+ * @param  {string} source The source contents.
+ * @return {string}        The parsed contents.
+ */
 const laravelLocalizationLoader = function(source) {
   const isPHP = ~source.indexOf('<?php')
+  let parsed;
+
   if (isPHP) {
-    return phpArrayParser(source)
+    parsed = phpArrayParser(source)
   } else {
-    return jsonParser(source)
+    parsed = jsonParser(source)
   }
+
+  return parsed
 }
 
 module.exports = laravelLocalizationLoader

loader/parser/php-array.js

@@ -4,18 +4,32 @@ const parser = new engine({
   ast: { withPositions: true },
 })
 
+/**
+ * The PHP array parser.
+ * @param  {string} source The PHP source contents.
+ * @return {string}        The parsed contents.
+ */
 const phpArrayParser = function (source) {
   const ast = parser.parseCode(source)
   const ret = ast.children.find((child) => child.kind === 'return')
   const parsed = parse(ret.expr)
-    .reduce((acc, val) => Object.assign({}, acc, val), {})
   return `module.exports = ${JSON.stringify(parsed)};`
 }
 
+/**
+ * Parse a PHP expression to JavaScript
+ * @param  {Object} expr The AST PHP expression.
+ * @return {*}           A JavaScript object or value.
+ */
 function parse(expr) {
   switch(expr.kind) {
     case 'array':
-      return expr.items.map(parse)
+      const isKeyed = expr.items.every((item) => item.key !== null)
+      let items = expr.items.map(parse)
+      if (isKeyed) {
+        items = items.reduce((a, v) => Object.assign({}, a, v), {})
+      }
+      return items
     case 'entry':
       return { [parse(expr.key)]: parse(expr.value) }
     case 'string':

tests/fixtures/resources/lang/en/messages.php

@@ -3,4 +3,7 @@
 return [
   'string' => 'Rubens',
   'number' => 123,
+  'parent' => [
+    'child' => 'Mariuzzo',
+  ],
 ];

tests/loader.test.js

@@ -2,18 +2,19 @@ const path = require('path')
 const webpack = require('webpack')
 const merge = require('webpack-merge')
 
-test('should load PHP array translation file', () => {
+test('should load PHP Laravel translation file', () => {
   return runWebpack({
     entry: path.join(__dirname, './fixtures/resources/lang/en/messages.php'),
   })
   .then((result) => {
     expect(result).toBeDefined()
     expect(result).toHaveProperty('string', 'Rubens')
     expect(result).toHaveProperty('number', 123)
+    expect(result).toHaveProperty('parent.child', 'Mariuzzo')
   })
 })
 
-function runWebpack(config) {
+function runWebpack(config, legacy) {
   return new Promise((resolve, reject) => {
     const webpackConfig = merge({
       output: {
@@ -26,6 +27,7 @@ function runWebpack(config) {
           {
             test: /resources\/lang.+\.php$/,
             loader: 'laravel-localization-loader',
+            options: { legacy },
           }
         ]
       },

tests/output/translation.js

@@ -80,7 +80,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 0 */
 /***/ (function(module, exports) {
 
-module.exports = {"string":"Rubens","number":123};
+module.exports = {"string":"Rubens","number":123,"parent":{"child":"Mariuzzo"}};
 
 /***/ })
 /******/ ]);