Bug fix: wrong file name if group value has whitespaces

.editorconfig

@@ -6,18 +6,12 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
-max_line_length = 120
-
-[*.md]
 trim_trailing_whitespace = false
+max_line_length = 120
 
 [*.{yml, yaml}]
 indent_size = 2
 
-[*.blade.php]
-trim_trailing_whitespace = false
-
 [*.php]
 ij_php_align_key_value_pairs = false
 ij_php_comma_after_last_array_element = true
@@ -27,4 +21,4 @@ ij_php_keep_blank_lines_in_code = 1
 ij_php_concat_spaces = false
 ij_php_blank_lines_before_return_statement = 1
 ij_php_space_before_short_closure_left_parenthesis = true
-ij_php_anonymous_brace_style = next_line
+ij_php_anonymous_brace_style = next_line

src/Exporters/JsonLanguagesExporter.php

@@ -48,7 +48,7 @@ public function handle(LarexExportCommand $command, CsvReader $reader): int
 
             $data = [];
             foreach ($groups as $group => $keys) {
-                foreach ($keys as $key=>$value) {
+                foreach ($keys as $key => $value) {
                     $data["$group.$key"] = $value;
                 }
             }

src/Support/CsvParser.php

@@ -49,8 +49,8 @@ public function parse(bool $skipEmpty = true): array
         foreach ($rows as $columns) {
 
             //get first two columns values
-            $group = $columns->get('group');
-            $key = $columns->get('key');
+            $group = trim($columns->get('group'));
+            $key = trim($columns->get('key'));
 
             //check if key is filled
             if ($key === '') {
@@ -59,6 +59,7 @@ public function parse(bool $skipEmpty = true): array
 
             //loop language columns
             foreach ($columns->skip(2) as $lang => $value) {
+                $lang = trim($lang);
                 $item = $value ?? '';
 
                 if ($item === '') {

src/Support/Utils.php

@@ -294,7 +294,8 @@ public static function bytesToHuman($bytes): string
      */
     public static function putJson(string $path, $data): void
     {
-        File::put($path, json_encode($data,
-            JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+        $content = json_encode($data,
+            JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+        File::put($path, Str::finish($content, "\n"));
     }
 }

tests/Exporters/JsonGroupsExporterTest.php

@@ -146,3 +146,23 @@
         ->expectsOutput('No entries exported.')
         ->assertExitCode(0);
 });
+
+it('exports strings trimming whitespaces in group and key', function () {
+    initFromStub('exporters.json-groups.spaces.input');
+
+    $this->artisan(LarexExportCommand::class, ['exporter' => 'json:group'])
+        ->expectsOutput(sprintf("Processing the '%s' file...", localizationPath(true)))
+        ->expectsOutput('resources/lang/en/app.json created successfully.')
+        ->expectsOutput('resources/lang/it/app.json created successfully.')
+        ->assertExitCode(0);
+
+    expect(resource_path('lang/en/app.json'))
+        ->toBeFile()
+        ->fileContent()
+        ->toEqualStub('exporters.json-groups.spaces.output-en-app');
+
+    expect(resource_path('lang/it/app.json'))
+        ->toBeFile()
+        ->fileContent()
+        ->toEqualStub('exporters.json-groups.spaces.output-it-app');
+});

tests/Exporters/JsonLanguagesExporterTest.php

@@ -106,3 +106,23 @@
         ->expectsOutput('No entries exported.')
         ->assertExitCode(0);
 });
+
+it('exports strings trimming whitespaces in group and key', function () {
+    initFromStub('exporters.json-language.spaces.input');
+
+    $this->artisan(LarexExportCommand::class, ['exporter' => 'json:lang'])
+        ->expectsOutput(sprintf("Processing the '%s' file...", localizationPath(true)))
+        ->expectsOutput('resources/lang/en.json created successfully.')
+        ->expectsOutput('resources/lang/it.json created successfully.')
+        ->assertExitCode(0);
+
+    expect(resource_path('lang/en.json'))
+        ->toBeFile()
+        ->fileContent()
+        ->toEqualStub('exporters.json-language.spaces.output-en');
+
+    expect(resource_path('lang/it.json'))
+        ->toBeFile()
+        ->fileContent()
+        ->toEqualStub('exporters.json-language.spaces.output-it');
+});

tests/Exporters/LaravelExporterTest.php

@@ -200,3 +200,23 @@
         ->fileContent()
         ->toEqualStub('exporters.laravel.base.output-it-special');
 });
+
+it('exports strings trimming whitespaces in group and key', function () {
+    initFromStub('exporters.laravel.spaces.input');
+
+    $this->artisan(LarexExportCommand::class, ['exporter' => 'laravel'])
+        ->expectsOutput(sprintf("Processing the '%s' file...", localizationPath(true)))
+        ->expectsOutput('resources/lang/en/app.php created successfully.')
+        ->expectsOutput('resources/lang/it/app.php created successfully.')
+        ->assertExitCode(0);
+
+    expect(resource_path('lang/en/app.php'))
+        ->toBeFile()
+        ->fileContent()
+        ->toEqualStub('exporters.laravel.spaces.output-en');
+
+    expect(resource_path('lang/it/app.php'))
+        ->toBeFile()
+        ->fileContent()
+        ->toEqualStub('exporters.laravel.spaces.output-it');
+});

tests/Stubs/exporters/json-groups/base/output-en-app.stub

@@ -2,4 +2,4 @@
     "first": "First",
     "second": "Second",
     "third": "Third"
-}
+}

tests/Stubs/exporters/json-groups/base/output-en-special.stub

@@ -9,4 +9,4 @@
     "numeric.3": "March",
     "space.escape": "nope",
     "space.noescape": "nope"
-}
+}

tests/Stubs/exporters/json-groups/base/output-it-app.stub

@@ -2,4 +2,4 @@
     "first": "Primo",
     "second": "Secondo",
     "third": "Terzo"
-}
+}

tests/Stubs/exporters/json-groups/base/output-it-special.stub

@@ -7,4 +7,4 @@
     "numeric.3": "Marzo",
     "space.escape": " ",
     "space.noescape": " "
-}
+}

tests/Stubs/exporters/json-groups/spaces/input.stub

@@ -0,0 +1,2 @@
+group,key,en,it
+   app   ,   first   ,   First   ,   Primo   

tests/Stubs/exporters/json-groups/spaces/output-en-app.stub

@@ -0,0 +1,3 @@
+{
+    "first": "   First   "
+}

tests/Stubs/exporters/json-groups/spaces/output-it-app.stub

@@ -0,0 +1,3 @@
+{
+    "first": "   Primo   "
+}

tests/Stubs/exporters/json-groups/warnings/output-en-app.stub

@@ -1,3 +1,3 @@
 {
     "first": "First"
-}
+}

tests/Stubs/exporters/json-groups/warnings/output-it-app.stub

@@ -1,3 +1,3 @@
 {
     "first": "Primo"
-}
+}

tests/Stubs/exporters/json-language/base/output-en.stub

@@ -12,4 +12,4 @@
     "numeric.months.3": "March",
     "space.escape.yes": "nope",
     "space.escape.no": "nope"
-}
+}

tests/Stubs/exporters/json-language/base/output-it.stub

@@ -10,4 +10,4 @@
     "numeric.months.3": "Marzo",
     "space.escape.yes": " ",
     "space.escape.no": " "
-}
+}

tests/Stubs/exporters/json-language/include-exclude/output-en.stub

@@ -4,4 +4,4 @@
     "another.third": "Third",
     "sub.multi.a": "A",
     "sub.multi.b": "B"
-}
+}

tests/Stubs/exporters/json-language/include-exclude/output-it.stub

@@ -4,4 +4,4 @@
     "another.third": "Terzo",
     "sub.multi.a": "a",
     "sub.multi.b": "b"
-}
+}

tests/Stubs/exporters/json-language/spaces/input.stub

@@ -0,0 +1,2 @@
+group,key,en,it
+   app   ,   first   ,   First   ,   Primo   

tests/Stubs/exporters/json-language/spaces/output-en.stub

@@ -0,0 +1,3 @@
+{
+    "app.first": "   First   "
+}

tests/Stubs/exporters/json-language/spaces/output-it.stub

@@ -0,0 +1,3 @@
+{
+    "app.first": "   Primo   "
+}

tests/Stubs/exporters/json-language/warnings/output-en.stub

@@ -4,4 +4,4 @@
     "another.third": "Third",
     "sub.multi.a": "A",
     "sub.multi.b": "B"
-}
+}

tests/Stubs/exporters/json-language/warnings/output-it.stub

@@ -5,4 +5,4 @@
     "another.third": "Terzo",
     "sub.multi.a": "a",
     "sub.multi.b": "b"
-}
+}

tests/Stubs/exporters/laravel/spaces/input.stub

@@ -0,0 +1,2 @@
+group,key,en,it
+   app   ,   first   ,   First   ,   Primo   

tests/Stubs/exporters/laravel/spaces/output-en.stub

@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+    'first' => '   First   ',
+
+];

tests/Stubs/exporters/laravel/spaces/output-it.stub

@@ -0,0 +1,7 @@
+<?php
+
+return [
+
+    'first' => '   Primo   ',
+
+];