Fix bugs related to modules, props and custom types

Author: hakobyansen

src/Services/DtoBuilder.php

@@ -3,6 +3,7 @@
 namespace PhpDto\Services;
 
 use PhpDto\DtoSerialize;
+use PhpDto\Enum\Types;
 
 class DtoBuilder
 {
@@ -23,22 +24,26 @@ public function getNamespace( array $configs ): string
 	}
 
 	/**
-	 * @param array $dtoConfigs
+	 * @param array $configs
 	 * @return string
 	 */
-	public function getClassName( array $dtoConfigs ): string
+	public function getClassName( array $configs ): string
 	{
-		$classPrefix = ucfirst( $dtoConfigs['class'] );
+		$classPrefix = ucfirst( $configs['class'] );
 
 		return $classPrefix.getenv( 'PHP_DTO_CLASS_POSTFIX' );
 	}
 
 	/**
+	 * @param array $configs
 	 * @return array
 	 */
-	public function getModules(): array
+	public function getModules( array $configs ): array
 	{
-		return [];
+		return $this->mergeModulesFromProps(
+			modules: $configs['modules'] ?? [],
+			props: $configs['props'] ?? []
+		);
 	}
 
 	/**
@@ -62,20 +67,11 @@ public function getProps( array $configs, string $visibility = 'private' ): arra
 
 		foreach ($configs['props'] as $key => $value)
 		{
-			$type = '';
-
-			if( str_contains($value, 'nullable') !== false )
-			{
-				$type = '?';
-				$value = str_replace('nullable|', '', $value);
-				$value = str_replace('|nullable', '', $value);
-			}
-
-			$type .= $value;
-
 			$key = $this->convertPropToSnakeCase($key);
 
-			$props[] = "{$visibility} {$type}" . ' $_' . "{$key};";
+			$value = $this->getLastSegmentFromPath($value);
+
+			$props[] = "{$visibility} {$value}" . ' $_' . "{$key};";
 		}
 
 		return $props;
@@ -115,45 +111,36 @@ public function getConstructorProps( array $configs ): array
      */
     public function getMethods( array $configs, string $visibility = 'public' ): array
     {
-        $methods = [];
-
-        foreach ($configs['props'] as $key => $value)
-        {
-            $props = explode('|', $value);
+		 $methods = [];
 
-            $returnType = '';
+		 foreach ($configs['props'] as $key => $value)
+		 {
+			 if (str_contains($key, '_'))
+			 {
+				 $key = join('', array_map('ucfirst', explode('_', $key)));
+			 }
 
-            $returnType .= in_array( 'nullable', $props ) ? '?' : '';
-            $returnType .= in_array( 'int', $props ) ? 'int' : '';
-            $returnType .= in_array( 'float', $props ) ? 'float' : '';
-            $returnType .= in_array( 'string', $props ) ? 'string' : '';
-            $returnType .= in_array( 'bool', $props ) ? 'bool' : '';
-            $returnType .= in_array( 'array', $props ) ? 'array' : '';
+			 $returnType = $this->getReturnTypeFromValue($value);
 
-			  if (strpos($key, '_') !== false)
-			  {
-				  $key = join('', array_map('ucfirst', explode('_', $key)));
-			  }
+			 $declaration = 'function get' . ucfirst($key) . '(): ' . $returnType;
 
-            $declaration = 'function get'.ucfirst($key).'(): '.$returnType;
+			 $method['visibility'] = $visibility;
+			 $method['declaration'] = $declaration;
+			 $method['body'] = 'return $this->_' . lcfirst($key) . ';';
 
-            $method['visibility']  = $visibility;
-            $method['declaration'] = $declaration;
-            $method['body']        = 'return $this->_'.lcfirst($key).';';
+			 $methods[] = $method;
+		 }
 
-            $methods[] = $method;
-        }
-
-        return $methods;
-    }
+		 return $methods;
+	 }
 
 	/**
 	 * @param string $prop
 	 * @return string
 	 */
 	public function convertPropToSnakeCase(string $prop): string
 	{
-		if (strlen($prop) > 0 && strpos($prop, '_') !== false)
+		if (strlen($prop) > 0 && str_contains($prop, '_'))
 		{
 			$exploded = explode('_', $prop);
 
@@ -173,4 +160,74 @@ public function convertPropToSnakeCase(string $prop): string
 
 		return $prop;
 	}
+
+	/**
+	 * @param string $value
+	 * @return string
+	 */
+	public function getReturnTypeFromValue(string $value): string
+	{
+		return $this->getLastSegmentFromPath($value);
+	}
+
+	/**
+	 * @param array $modules
+	 * @param array $props
+	 * @return array
+	 */
+	public function mergeModulesFromProps(array $modules, array $props): array
+	{
+		$types = new Types();
+
+		foreach ($props as $prop)
+		{
+			$prop = str_replace('?', '', $prop);
+
+			if( !$types->hasValue($prop) && !$this->isPropInModules($prop, $modules) )
+			{
+				$modules[] = $prop;
+			}
+		}
+
+		return $modules;
+	}
+
+	/**
+	 * @param string $prop
+	 * @param array $modules
+	 * @return bool
+	 */
+	public function isPropInModules(string $prop, array $modules): bool
+	{
+		$modules = array_map(function (string $namespace) use ($prop) {
+			if(str_contains($namespace, '\\'))
+			{
+				$exploded = explode('\\', $namespace);
+
+				return $exploded[count($exploded)-1];
+			}
+
+			return $prop;
+		}, $modules);
+
+		return in_array(needle: $prop, haystack: $modules);
+	}
+
+	/**
+	 * @param string $value
+	 * @return string
+	 */
+	public function getLastSegmentFromPath(string $value): string
+	{
+		if(str_contains($value, '\\'))
+		{
+			$nullChar = $value[0] === '?' ? '?' : '';
+
+			$exploded = explode('\\', $value);
+
+			$value = $nullChar . $exploded[count($exploded)-1];
+		}
+
+		return $value;
+	}
 }