added tags

riverwaysoft · Apr 21, 2024 · 06daaa8 · 06daaa8
1 parent de8c960
commit 06daaa8
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/src/OutputGenerator/Go/GoOutputGenerator.php b/src/OutputGenerator/Go/GoOutputGenerator.php
@@ -51,39 +51,34 @@ private function convert(DtoType $dto, DtoList $dtoList): string
         if ($dto->getExpressionType()->equals(ExpressionType::class())) {
             $structProps = '';
 
-            $maxStructPropNameLength = 0;
+            $maxPropLen = 0;
+            $maxPropRowLen = 0;
             foreach ($dto->getProperties() as $prop) {
-                $maxStructPropNameLength = max($maxStructPropNameLength, strlen($prop->getName()));
+                $maxPropLen = max($maxPropLen, strlen($prop->getName()));
             }
 
-            $normalizedProperties = [];
+            $normProps = [];
             foreach ($dto->getProperties() as $prop) {
-                $spaces = str_repeat(' ', $maxStructPropNameLength - strlen($prop->getName()) + 1);
+                $spaces = str_repeat(' ', $maxPropLen - strlen($prop->getName()) + 1);
 
                 $tagsTemplate = '`json:"%s"`';
                 if ($prop->getType() instanceof PhpOptionalType) {
                     $tagsTemplate = '`json:"%s,omitempty"`';
                 }
-                $tagsRow = sprintf($tagsTemplate, $prop->getName());
-
                 $structPropsRow = sprintf(
                     "%s$spaces%s",
                     ucfirst($prop->getName()),
                     $this->resolver->resolve($prop->getType(), $dto, $dtoList)
                 );
-
-                $normalizedProperties[] = [
+                $maxPropRowLen = max($maxPropRowLen, strlen($structPropsRow));
+                $normProps[] = [
                     'structPropsRow' => $structPropsRow,
-                    'tagsRow' => $tagsRow,
+                    'tagsRow' => sprintf($tagsTemplate, $prop->getName()),
                 ];
             }
 
-            $maxStructPropLength = 0;
-            foreach ($normalizedProperties as $prop) {
-                $maxStructPropLength = max($maxStructPropLength, strlen($prop['structPropsRow']));
-            }
-            foreach ($normalizedProperties as $prop) {
-                $tagsSpaces = str_repeat(' ', $maxStructPropLength - strlen($prop['structPropsRow']) + 1);
+            foreach ($normProps as $prop) {
+                $tagsSpaces = str_repeat(' ', $maxPropRowLen - strlen($prop['structPropsRow']) + 1);
                 $structProps .= sprintf("\n\t%s$tagsSpaces%s", $prop['structPropsRow'], $prop['tagsRow']);
             }