Define can have more deps that callback has arguments.

Author: prwater

src/Helper/TypeScript/TypeScriptFixHelper.php

@@ -250,10 +250,9 @@ private function fixReferences()
       $args = explode(',', $matches['args']);
 
       $replace = [];
-      foreach ($deps as $key => $dep)
+      foreach ($args as $key => $arg)
       {
-        $dep = trim($dep, '"');
-        $arg = $args[$key];
+        $dep = trim($deps[$key], '"');
 
         if (!in_array($dep, ['require', 'exports']))
         {

test/Helper/TypeScript/TypeScriptFixHelperTest.php

@@ -72,6 +72,34 @@ public function testFixDefineDeps(): void
     unlink($jsPath);
   }
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Test fixing defining deps list longer than arguments
+   */
+  public function testMoreDepsThanArguments(): void
+  {
+    putenv(sprintf('PLAISIO_CONFIG_DIR=%s', Path::join(__DIR__, __FUNCTION__)));
+
+    $jsPath       = Path::makeRelative(Path::join(__DIR__, __FUNCTION__, 'js', 'Test', 'Foo.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/Helper/TypeScript/testMoreDepsThanArguments/js/Test/Foo.expected.js

@@ -0,0 +1,11 @@
+define("Test/Foo", ["require", "exports", "Test/Foo", "Test/Bar", "Test/Eggs", "jquery", "jquery-ui"], function (require, exports, Foo_1, Bar_1, Eggs_1, $) {
+    "use strict";
+
+    class Foo {
+        // Nothing to do.
+    }
+    Foo.NahouwPage = Foo;
+
+    return Foo;
+});
+// Modified by Plaisio\Console\Helper\TypeScript\TypeScriptFixHelper

test/Helper/TypeScript/testMoreDepsThanArguments/js/Test/Foo.org.js

@@ -0,0 +1,8 @@
+define(["require", "exports", "./Foo", "./Bar", "./Eggs", "jquery", "jquery-ui"], function (require, exports, Foo_1, Bar_1, Eggs_1, $) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    class Foo {
+        // Nothing to do.
+    }
+    Foo.NahouwPage = Foo;
+});

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

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