Compact namespace at TransformedType->getNamespaceSegments() instead of TransformedType->getTypescriptName()

Author: gvlasov

src/Compactors/Compactor.php

@@ -7,5 +7,7 @@
  */
 interface Compactor
 {
-    public function compact(string $typescriptIdentifier): string;
+    public function removeSuffix(string $typeName): string;
+
+    public function removePrefix(string $namespace): string;
 }

src/Compactors/ConfigCompactor.php

@@ -23,10 +23,9 @@ public function __construct(TypeScriptTransformerConfig $config) {
     protected function getPrefixes(): array {
         if ($this->prefixes === null) {
             $this->prefixes = array_map(
-                function(string $prefix): string {
-                    $prefix = str_replace("\\", ".", $prefix);
-                    if (!str_ends_with($prefix, ".")) {
-                        $prefix .= ".";
+                function (string $prefix): string {
+                    if (str_ends_with($prefix, "\\")) {
+                        $prefix = rtrim($prefix, "\\");
                     }
                     return $prefix;
                 },
@@ -46,28 +45,30 @@ protected function getSuffixes(): array {
         return $this->suffixes;
     }
 
-    public function compact(
-        string $typescriptIdentifier
-    ): string {
-        $matchingPrefix = '';
+    public function removeSuffix(string $typeName): string {
         $matchingSuffix = '';
-        foreach ($this->getPrefixes() as $prefix) {
-            if (str_starts_with($typescriptIdentifier, $prefix)) {
-                $matchingPrefix = $prefix;
-                break;
-            }
-        }
         foreach ($this->getSuffixes() as $suffix) {
-            if (str_ends_with($typescriptIdentifier, $suffix)) {
+            if (str_ends_with($typeName, $suffix)) {
                 $matchingSuffix = $suffix;
                 break;
             }
         }
         if ($matchingSuffix !== '') {
-            $typescriptIdentifier = substr($typescriptIdentifier, 0, -strlen($matchingSuffix));
+            $typeName = substr($typeName, 0, -strlen($matchingSuffix));
+        }
+        return $typeName;
+    }
+
+    public function removePrefix(string $namespace): string {
+        $matchingPrefix = '';
+        foreach ($this->getPrefixes() as $prefix) {
+            if (str_starts_with($namespace, $prefix)) {
+                $matchingPrefix = $prefix;
+                break;
+            }
         }
-        $substr = substr($typescriptIdentifier, strlen($matchingPrefix));
-        return $substr;
+        $substr = substr($namespace, strlen($matchingPrefix));
+        return ltrim($substr, '\\');
     }
 
 }

src/Compactors/IdentityCompactor.php

@@ -5,8 +5,11 @@
 class IdentityCompactor implements Compactor
 {
 
-    public function compact(string $typescriptIdentifier): string {
-        return $typescriptIdentifier;
+    public function removeSuffix(string $typeName): string {
+        return $typeName;
     }
 
+    public function removePrefix(string $namespace): string {
+        return $namespace;
+    }
 }

src/Structures/TransformedType.php

@@ -33,7 +33,7 @@ public static function create(
         string $keyword = 'type',
         bool $trailingSemicolon = true,
     ): self {
-        return new self($class, $compactor->compact($name), $transformed, $compactor, $missingSymbols ?? new MissingSymbolsCollection(), $inline, $keyword, $trailingSemicolon);
+        return new self($class, $compactor->removeSuffix($name), $transformed, $compactor, $missingSymbols ?? new MissingSymbolsCollection(), $inline, $keyword, $trailingSemicolon);
     }
 
     public static function createInline(
@@ -77,6 +77,12 @@ public function getNamespaceSegments(): array
             return [];
         }
 
+        $namespace = $this->compactor->removePrefix($namespace);
+
+        if ($namespace === '') {
+            return [];
+        }
+
         return explode('\\', $namespace);
     }
 
@@ -91,9 +97,7 @@ public function getTypeScriptName($fullyQualified = true): string
             [$this->name]
         );
 
-        return $this->compactor->compact(
-            implode('.', $segments)
-        );
+        return implode('.', $segments);
     }
 
     public function replaceSymbol(string $class, string $replacement): void

src/Writers/TypeDefinitionWriter.php

@@ -27,7 +27,7 @@ public function format(TypesCollection $collection): string
 
         foreach ($namespaces as $namespace => $types) {
             asort($types);
-            $namespace = $this->compactor->compact($namespace);
+            $namespace = $this->compactor->removePrefix($namespace);
 
             $output .= "declare namespace {$namespace} {".PHP_EOL;
 

tests/Transformers/DtoTransformerTest.php

@@ -169,7 +169,7 @@ class DummyOptionalDto
         (new DtoTransformer(
             TypeScriptTransformerConfig::create()
                 ->compactorPrefixes([
-                    "Spatie.TypeScriptTransformer.Tests.FakeClasses.Integration"
+                    "Spatie\\TypeScriptTransformer\\Tests\\FakeClasses\\Integration"
                 ])
         ))->transform(
             $reflectionClass,
@@ -182,7 +182,7 @@ class DummyOptionalDto
         (new DtoTransformer(
             TypeScriptTransformerConfig::create()
                 ->compactorPrefixes([
-                    "Spatie.TypeScriptTransformer.Tests.FakeClasses"
+                    "Spatie\\TypeScriptTransformer\\Tests\\FakeClasses"
                 ])
         ))->transform(
             $reflectionClass,
@@ -194,8 +194,8 @@ class DummyOptionalDto
         (new DtoTransformer(
             TypeScriptTransformerConfig::create()
                 ->compactorPrefixes([
-                    "Spatie.TypeScriptTransformer.Tests.RealClasses",
-                    "Spatie.TypeScriptTransformer.Tests.FakeClasses"
+                    "Spatie\\TypeScriptTransformer\\Tests\\RealClasses",
+                    "Spatie\\TypeScriptTransformer\\Tests\\FakeClasses"
                 ])
         ))->transform(
             $reflectionClass,
@@ -209,7 +209,7 @@ class DummyOptionalDto
         'Dto',
         (new DtoTransformer(
             TypeScriptTransformerConfig::create()
-                ->compactorPrefixes("Spatie.TypeScriptTransformer.Tests.FakeClasses.Integration")
+                ->compactorPrefixes("Spatie\\TypeScriptTransformer\\Tests\\FakeClasses\\Integration")
                 ->compactorSuffixes([
                     'WithChildren'
                 ])