fix: types

Author: loks0n

src/SDK/Language/Web.php

@@ -252,9 +252,11 @@ public function getGenerics(string $model, array $spec, bool $skipFirst = false)
     public function getReturn(array $method, array $spec): string
     {
         if ($method['type'] === 'webAuth') {
-            return 'void | URL';
-        } elseif ($method['type'] === 'location') {
-            return 'URL';
+            return 'Promise<void | string>';
+        }
+        
+        if ($method['type'] === 'location') {
+            return 'string';
         }
 
         if (array_key_exists('responseModel', $method) && !empty($method['responseModel']) && $method['responseModel'] !== 'any') {

templates/web/src/client.ts.twig

@@ -47,7 +47,7 @@ type RealtimeRequest = {
 /**
  * Realtime event response structure with generic payload type.
  */
-export type RealtimeResponseEvent<T extends unknown> = {
+type RealtimeResponseEvent<T extends unknown> = {
     /**
      * List of event names associated with the response.
      */
@@ -214,7 +214,7 @@ type Realtime = {
 /**
  * Type representing upload progress information.
  */
-export type UploadProgress = {
+type UploadProgress = {
     /**
      * Identifier for the upload progress.
      */
@@ -696,4 +696,5 @@ class Client {
 export { Client, {{spec.title | caseUcfirst}}Exception };
 export { Query } from './query';
 export type { Models, Payload, UploadProgress };
+export type { RealtimeResponseEvent };
 export type { QueryTypes, QueryTypesList } from './query';

templates/web/src/services/template.ts.twig

@@ -38,7 +38,7 @@ export class {{ service.name | caseUcfirst }} {
      * @throws {{ '{' }}{{ spec.title | caseUcfirst}}Exception}
      * @returns {{ '{' }}{{ method | getReturn(spec) | raw }}{{ '}' }}
      */
-    {% if method.type != 'location' and method.type != 'webAuth'%}async {% endif %}{{ method.name | caseCamel }}{{ method.responseModel | getGenerics(spec) | raw }}({% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required or parameter.nullable %}?{% endif %}: {{ parameter | getPropertyType(method) | raw }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, onProgress = (progress: UploadProgress) => {}{% endif %}): {{ method | getReturn(spec) | raw }} {
+    {% if method.type != 'location' %}async {% endif %}{{ method.name | caseCamel }}{{ method.responseModel | getGenerics(spec) | raw }}({% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required or parameter.nullable %}?{% endif %}: {{ parameter | getPropertyType(method) | raw }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, onProgress = (progress: UploadProgress) => {}{% endif %}): {{ method | getReturn(spec) | raw }} {
         {%~ for parameter in method.parameters.all %}
         {%~ if parameter.required %}
         if (typeof {{ parameter.name | caseCamel | escapeKeyword }} === 'undefined') {
@@ -78,9 +78,8 @@ export class {{ service.name | caseUcfirst }} {
         );
         if (typeof window !== 'undefined') {
             window.location.href = location;
-        } else {
-            return location;
         }
+        return location.toString();
         {%~ elseif method.type == 'location' %}
         {%~ for node in method.auth %}
         {%~ for key, header in node|keys %}