Merge pull request #4 from jmsariron/master

Better handle nullables for frontend devs

Author: ddniel16

ParseTypeScript/Parser.php

@@ -75,16 +75,16 @@ public function __construct(string $filePath)
 
             $type = $this->parsePhpDocForProperty($property);
 
-            $isNull = '';
+            $isNull = false;
             if (preg_match('/nullable=true/i', $property->getDocComment(), $matches)) {
-                $isNull = '?';
+                $isNull = true;
             }
 
             if (empty($isNull) && is_null($property->getType()) !== true && $property->getType()->allowsNull()) {
-                $isNull = '?';
+                $isNull = true;
             }
 
-            $this->currentInterface->properties[] = new TypeScriptProperty($property->getName() . $isNull, $type);
+            $this->currentInterface->properties[] = new TypeScriptProperty($property->getName(), $type, $isNull);
         }
 
         $this->output[] = $this->currentInterface;

ParseTypeScript/TypeScriptBaseInterface.php

@@ -42,7 +42,7 @@ public function __toString()
                 }
             }
 
-            $pieces[] = "  " . $property->name . ": " . $property->type . ";";
+            $pieces[] = '  ' . (string) $property  . ';';
         }
 
         $result = "";

ParseTypeScript/TypeScriptProperty.php

@@ -23,15 +23,21 @@ class TypeScriptProperty
      */
     public $type;
 
-    public function __construct(string $name, string $type = 'unknown')
+    /**
+     * @var bool
+     */
+    public $isNullable;
+
+    public function __construct(string $name, string $type = 'unknown', bool $isNullable = false)
     {
         $this->name = $name;
         $this->type = $type;
+        $this->isNullable = $isNullable;
     }
 
     public function __toString()
     {
-        return $this->name . ': ' . $this->type;
+        return $this->name . '?: ' . $this->type . ($this->isNullable ? ' | null' : '') ;
     }
 
 }