Don't fix *.main.js files.

Author: prwater

src/Helper/TypeScript/TypeScriptFixHelper.php

@@ -74,13 +74,21 @@ public function fixJavaScriptFile(string $path): void
 
     if (!$this->hasBeenProcessed())
     {
-      $this->io->logInfo('TypeScript fixing: <fso>%s</fso>', $path);
+      if ($this->requiresFixing($path))
+      {
+        $this->io->logInfo('TypeScript fixing: <fso>%s</fso>', $path);
+
+        $this->fixDefine();
+        $this->fixExports1('Object.defineProperty(exports, "__esModule", { value: true });');
+        $this->fixExports1(sprintf('exports.%1$s = %1$s;', Path::getFilename($this->namespace)));
+        $this->fixExports2();
+        $this->fixReferences();
+      }
+      else
+      {
+        $this->io->logVeryVerbose("Main file doesn't require fixing: <fso>%s</fso>", $path);
+      }
 
-      $this->fixDefine();
-      $this->fixExports1('Object.defineProperty(exports, "__esModule", { value: true });');
-      $this->fixExports1(sprintf('exports.%1$s = %1$s;', Path::getFilename($this->namespace)));
-      $this->fixExports2();
-      $this->fixReferences();
       $this->writeJsSource($path);
     }
     else
@@ -290,6 +298,19 @@ private function readJsSource(string $path)
     }
   }
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Returns true if and only if the JS source requires fixing
+   *
+   * @param string $path The path to JS file.
+   *
+   * @return bool
+   */
+  private function requiresFixing($path): bool
+  {
+    return (!str_ends_with($path, '.main.js'));
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Writes the modified JS source.

test/Helper/TypeScript/TypeScriptFixHelperTest.php

@@ -13,6 +13,37 @@
  */
 class TypeScriptFixHelperTest extends TestCase
 {
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Test *.main.js files are not modified.
+   */
+  public function testDontTouchMain(): void
+  {
+    putenv(sprintf('PLAISIO_CONFIG_DIR=%s', Path::join(__DIR__, __FUNCTION__)));
+
+    $jsPath       = Path::makeRelative(Path::join(__DIR__,
+                                                  __FUNCTION__,
+                                                  'js/Plaisio/PageDecorator',
+                                                  'CorePageDecorator.main.js'),
+                                       getcwd());
+    $orgPath      = Path::changeExtension($jsPath, 'org.js');
+    $expectedPath = Path::changeExtension($jsPath, 'expected.js');
+    copy($orgPath, $jsPath);
+
+    $application = new PlaisioApplication();
+    $application->setAutoExit(false);
+
+    $tester = new ApplicationTester($application);
+    $tester->run(['command' => 'plaisio:type-script-fixer',
+                  'path'    => $jsPath]);
+
+    if ($tester->getStatusCode()!==0) echo $tester->getDisplay();
+
+    self::assertSame(0, $tester->getStatusCode());
+    self::assertFileEquals($expectedPath, $jsPath);
+
+    unlink($jsPath);
+  }
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Test fixing defining deps with global packages and local packages.
@@ -33,6 +64,8 @@ public function testFixDefineDeps(): void
     $tester->run(['command' => 'plaisio:type-script-fixer',
                   'path'    => $jsPath]);
 
+    if ($tester->getStatusCode()!==0) echo $tester->getDisplay();
+
     self::assertSame(0, $tester->getStatusCode());
     self::assertFileEquals($expectedPath, $jsPath);
 

test/Helper/TypeScript/testDontTouchMain/js/Plaisio/PageDecorator/CorePageDecorator.main.expected.js

@@ -0,0 +1,14 @@
+//----------------------------------------------------------------------------------------------------------------------
+// @ts-ignore
+requirejs.config({
+    baseUrl: '/js',
+    paths: {
+        'jquery': 'jquery/jquery',
+        'jquery.cookie': 'js-cookie/js.cookie',
+        'js-cookie': 'js-cookie/js.cookie'
+    }
+});
+//----------------------------------------------------------------------------------------------------------------------
+// @ts-ignore
+require(["Plaisio/PageDecorator/CorePageDecorator"]);
+// Modified by Plaisio\Console\Helper\TypeScript\TypeScriptFixHelper

test/Helper/TypeScript/testDontTouchMain/js/Plaisio/PageDecorator/CorePageDecorator.main.org.js

@@ -0,0 +1,13 @@
+//----------------------------------------------------------------------------------------------------------------------
+// @ts-ignore
+requirejs.config({
+    baseUrl: '/js',
+    paths: {
+        'jquery': 'jquery/jquery',
+        'jquery.cookie': 'js-cookie/js.cookie',
+        'js-cookie': 'js-cookie/js.cookie'
+    }
+});
+//----------------------------------------------------------------------------------------------------------------------
+// @ts-ignore
+require(["Plaisio/PageDecorator/CorePageDecorator"]);

test/Helper/TypeScript/testDontTouchMain/plaisio-assets.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assets>
+    <root>test/Helper/TypeScript/testFixDefineDeps</root>
+</assets>