🐛 bug fixes and support for single result

fumeapp · Feb 4, 2023 · 76978b6 · 76978b6
1 parent e4ff1a6
commit 76978b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Actions/GenerateCliOutput.php b/src/Actions/GenerateCliOutput.php
@@ -99,8 +99,9 @@ public function __invoke(Collection $models, bool $global = false): string
             $plural = Str::plural($name);
             $entry .= "{$this->indent}export type $plural = {$name}[]\n";
             $entry .= "{$this->indent}export interface {$name}Results extends api.MetApiResults { data: $plural }\n";
+            $entry .= "{$this->indent}export interface {$name}Result extends api.MetApiResults { data: $name }\n";
             $entry .= "{$this->indent}export interface {$name}MetApiData extends api.MetApiData { data: $name }\n";
-            $entry .= "{$this->indent}export interface {$name}Response extends MetApiResponse { data: {$name}MetApiData }\n\n";
+            $entry .= "{$this->indent}export interface {$name}Response extends api.MetApiResponse { data: {$name}MetApiData }\n\n";
 
             $this->output .= $entry;
         });

diff --git a/src/ModelInterface.php b/src/ModelInterface.php
@@ -270,8 +270,9 @@ private function getCode(TypescriptInterface $interface): string
         $plural = Str::plural($interface->name);
         $code .= "{$this->space}export type $plural = {$interface->name}[]\n";
         $code .= "{$this->space}export interface {$interface->name}Results extends api.MetApiResults { data: $plural }\n";
+        $code .= "{$this->space}export interface {$interface->name}Result extends api.MetApiResults { data: {$interface->name} }\n";
         $code .= "{$this->space}export interface {$interface->name}MetApiData extends api.MetApiData { data: {$interface->name} }\n";
-        $code .= "{$this->space}export interface {$interface->name}Response extends MetApiResponse { data: {$interface->name}MetApiData }\n\n";
+        $code .= "{$this->space}export interface {$interface->name}Response extends api.MetApiResponse { data: {$interface->name}MetApiData }\n\n";
 
         return $code;
     }