Simplify pugModule handle

Author: kylekatarnls

src/JsPhpize/JsPhpizePhugFormatter.php

@@ -27,17 +27,12 @@ public function injectFormatter(Formatter $formatter)
         $compiler = $this->compiler;
         // 'dependencies_storage'
         $formatter->setOptionsRecursive([
-            'dependencies_storage_getter' => function ($phpCode) {
-                $phpCode = ltrim($phpCode);
-
-                return substr($phpCode, 0, 1) === '$'
-                    ? substr($phpCode, 1)
-                    : $phpCode;
-            },
-            'patterns'                    => [
-                'transform_expression' => function ($jsCode) use (&$compiler) {
+            'patterns' => [
+                'transform_expression' => function ($jsCode) use (&$compiler, &$formatter) {
                     /** @var JsPhpize $jsPhpize */
                     $jsPhpize = $compiler->getOption('jsphpize_engine');
+                    $pugModuleName = $formatter->getOption('dependencies_storage');
+                    $jsCode = str_replace('$'.$pugModuleName, $pugModuleName, $jsCode);
 
                     try {
                         return rtrim(trim(preg_replace(

tests/JsPhpize/JsPhpizePhugTest.php

@@ -53,15 +53,4 @@ public function testPlug()
             $compiler->compile('a(foo?!=array("foo" => "bar")[\'foo\'])')
         );
     }
-
-    public function testDependencyStorageFixer()
-    {
-        $formatter = new Formatter([
-            'modules' => [new JsPhpizePhugFormatter(new Compiler())],
-        ]);
-        $getter = $formatter->getOption('dependencies_storage_getter');
-
-        self::assertSame('foo', $getter('  foo'));
-        self::assertSame('foo', $getter('  $foo'));
-    }
 }