Cleanup and updates based on feedback

features/makejson.feature

@@ -985,7 +985,7 @@ Feature: Split PO files into JSON files.
     And the return code should be 0
     And the foo-theme/my-custom-domain-de_DE-557240f2080a0894dbd39f5c2f559bf8.json file should exist
 
-  Scenario: Should only proces js/min.js extensions by default
+  Scenario: Should only process js/min.js extensions by default
     Given an empty foo-theme directory
     And a foo-theme/de_DE.po file:
       """
@@ -1010,7 +1010,7 @@ Feature: Split PO files into JSON files.
       msgid "Foo Theme"
       msgstr "Foo Theme"
 
-      #: bar-minified.min.js:15
+      #: bar.min.minified.min.js:15
       msgid "Foo Theme"
       msgstr "Foo Theme"
 
@@ -1030,7 +1030,7 @@ Feature: Split PO files into JSON files.
       """
     And the return code should be 0
     And the foo-theme/foo-theme-de_DE-557240f2080a0894dbd39f5c2f559bf8.json file should exist
-    And the foo-theme/foo-theme-de_DE-da8cc4943ac0f9e5cc173c7de3f7299d.json file should exist
+    And the foo-theme/foo-theme-de_DE-a9c6627f5fe96185c0a0d0ddd8fa0216.json file should exist
 
   Scenario: Allows processing custom file extensions
     Given an empty foo-theme directory

src/MakeJsonCommand.php

@@ -85,12 +85,12 @@
 		$update_mo_files = Utils\get_flag_value( $assoc_args, 'update-mo-files', true );
 		$map_paths       = Utils\get_flag_value( $assoc_args, 'use-map', false );
 		$domain          = Utils\get_flag_value( $assoc_args, 'domain', '' );
 		$extensions      = array_map(
 			function ( $extension ) {
 				return trim( $extension, ' .' );
 			},
 			explode( ',', Utils\get_flag_value( $assoc_args, 'extensions', '' ) )
 		);
 
 		if ( Utils\get_flag_value( $assoc_args, 'pretty-print', false ) ) {
 			$this->json_options |= JSON_PRETTY_PRINT;
@@ -128,7 +128,7 @@
 		/** @var DirectoryIterator $file */
 		foreach ( $files as $file ) {
 			if ( $file->isFile() && $file->isReadable() && 'po' === $file->getExtension() ) {
 				$result        = $this->make_json( $file->getRealPath(), $destination, $map, $domain, $extensions );
 				$result_count += count( $result );
 
 				if ( $purge ) {
@@ -240,12 +240,12 @@
 	 * @param array      $extensions  Additional extensions.
 	 * @return array     List of created JSON files.
 	 */
 	protected function make_json( $source_file, $destination, $map, $domain, $extensions ) {
 		/** @var Translations[] $mapping */
 		$mapping      = [];
 		$translations = new Translations();
 		$result       = [];
 		$extensions   = array_merge( [ 'js' ], $extensions );
 
 		PoExtractor::fromFile( $source_file, $translations );
 
@@ -262,12 +262,13 @@
 
 			// Find all unique sources this translation originates from.
 			$sources = array_map(
 				static function ( $reference ) use ( $extensions ) {
-					$file = $reference[0];
-
+					$file      = $reference[0];
 					$extension = pathinfo( $file, PATHINFO_EXTENSION );
 
-					return in_array( $extension, $extensions, true ) ? str_replace( '.min.', '.', $file ) : null;
+					return in_array( $extension, $extensions, true )
+						? preg_replace( "/.min.{$extension}$/", ".{$extension}", $file )
+						: null;
 				},
 				$this->reference_map( $translation->getReferences(), $map )
 			);