Merge pull request #9 from SalemC/resolve-generated-relations-not-respecting-nullable-column

Resolve generated relations not respecting nullable column

Author: SalemC

src/TypeScriptifyModel.php

@@ -274,16 +274,16 @@ private function getTypeScriptType(stdClass $columnSchema): string {
             // We generate new interfaces for any relational attributes.
             // That means we can recursively instantiate the current class to generate
             // as many interface definitions for relational attributes as we need.
-            return (new self($fullyQualifiedRelatedModelName))->generate();
+            $mappedType = (new self($fullyQualifiedRelatedModelName))->generate();
+        } else {
+            // If the attribute is natively casted, we'll want to perform native cast checking
+            // to generate the correct TypeScript type. If it's not natively casted, we can
+            // simply map the database type to a TypeScript type.
+            $mappedType = $this->isAttributeNativelyCasted($columnSchema->Field)
+                ? $this->mapNativeCastToTypeScriptType($columnSchema->Field)
+                : $this->mapDatabaseTypeToTypeScriptType($columnType);
         }
 
-        // If the attribute is natively casted, we'll want to perform native cast checking
-        // to generate the correct TypeScript type. If it's not natively casted, we can
-        // simply map the database type to a TypeScript type.
-        $mappedType = $this->isAttributeNativelyCasted($columnSchema->Field)
-            ? $this->mapNativeCastToTypeScriptType($columnSchema->Field)
-            : $this->mapDatabaseTypeToTypeScriptType($columnType);
-
         // We can't do much with an unknown type.
         if ($mappedType === 'unknown') return $mappedType;
 
@@ -313,19 +313,23 @@ private function generateInterface(): string {
 
         $outputBuffer = collect([
             // The output buffer always needs to start with the first `interface X {` line.
-            'interface ' . (Str::of($this->fullyQualifiedModelName)->afterLast('\\')) . " {"
+            sprintf('interface %s {', Str::of($this->fullyQualifiedModelName)->afterLast('\\')),
         ]);
 
         $tableColumns->each(function ($column) use ($outputBuffer) {
             // If this attribute is hidden and we're not including hidden, we'll skip it.
             if (!$this->includeHidden && $this->isAttributeHidden($column->Field)) return;
 
             if ($this->isAttributeRelation($column->Field)) {
-                // The foreign model name will be the name of the interface we'll generate for this relation.
-                $foreignModelName = Str::of($this->convertForeignKeyToFullyQualifiedModelName($column->Field))->afterLast('\\');
                 $relationName = $this->convertForeignKeyToPredictedRelationName($column->Field);
+                $generatedTypeScriptType = Str::of($this->getTypeScriptType($column));
+
+                $generatedTypeName = $generatedTypeScriptType
+                    ->after('interface ')
+                    ->before(' {')
+                    ->append($generatedTypeScriptType->afterLast('}'));
 
-                $outputBuffer->push(sprintf('    %s: %s;', $relationName, $foreignModelName));
+                $outputBuffer->push(sprintf('    %s: %s;', $relationName, $generatedTypeName));
 
                 // Add an empty line so related interfaces aren't directly after each other.
                 $outputBuffer->prepend('');
@@ -335,7 +339,7 @@ private function generateInterface(): string {
                 // Once we've got the interface, we'll want to explode it, then prepend
                 // each piece of the interface to the output buffer.
                 // We reverse the exploded string because we prepend, otherwise we'd prepend backwards.
-                Str::of($this->getTypeScriptType($column))
+                $generatedTypeScriptType
                     ->explode("\n")
                     ->reverse()
                     ->each(fn ($str) => $outputBuffer->prepend($str));