chore: refactor methods

Author: stainless-app[bot]

scripts/lint

@@ -5,4 +5,4 @@ set -e
 cd -- "$(dirname -- "$0")/.."
 
 echo "==> Running PHPStan"
-exec -- ./vendor/bin/phpstan analyse --memory-limit=1G
+exec -- ./vendor/bin/phpstan analyse --memory-limit=2G

src/CasGenerator/CasGeneratorGenerateCasParams.php

@@ -127,7 +127,7 @@ public static function with(
         $obj->password = $password;
         $obj->toDate = $toDate;
 
-        null !== $casAuthority && $obj->casAuthority = $casAuthority instanceof CasAuthority ? $casAuthority->value : $casAuthority;
+        null !== $casAuthority && $obj['casAuthority'] = $casAuthority;
         null !== $panNo && $obj->panNo = $panNo;
 
         return $obj;
@@ -185,7 +185,7 @@ public function withToDate(string $toDate): self
     public function withCasAuthority(CasAuthority|string $casAuthority): self
     {
         $obj = clone $this;
-        $obj->casAuthority = $casAuthority instanceof CasAuthority ? $casAuthority->value : $casAuthority;
+        $obj['casAuthority'] = $casAuthority;
 
         return $obj;
     }

src/CasGenerator/CasGeneratorGenerateCasResponse.php

@@ -6,22 +6,22 @@
 
 use CasParser\Core\Attributes\Api;
 use CasParser\Core\Concerns\SdkModel;
+use CasParser\Core\Concerns\SdkResponse;
 use CasParser\Core\Contracts\BaseModel;
+use CasParser\Core\Conversion\Contracts\ResponseConverter;
 
 /**
  * @phpstan-type cas_generator_generate_cas_response = array{
  *   msg?: string, status?: string
  * }
- * When used in a response, this type parameter can define a $rawResponse property.
- * @template TRawResponse of object = object{}
- *
- * @mixin TRawResponse
  */
-final class CasGeneratorGenerateCasResponse implements BaseModel
+final class CasGeneratorGenerateCasResponse implements BaseModel, ResponseConverter
 {
     /** @use SdkModel<cas_generator_generate_cas_response> */
     use SdkModel;
 
+    use SdkResponse;
+
     #[Api(optional: true)]
     public ?string $msg;
 

src/CasParser/UnifiedResponse.php

@@ -13,7 +13,9 @@
 use CasParser\CasParser\UnifiedResponse\Summary;
 use CasParser\Core\Attributes\Api;
 use CasParser\Core\Concerns\SdkModel;
+use CasParser\Core\Concerns\SdkResponse;
 use CasParser\Core\Contracts\BaseModel;
+use CasParser\Core\Conversion\Contracts\ResponseConverter;
 
 /**
  * @phpstan-type unified_response = array{
@@ -25,16 +27,14 @@
  *   nps?: list<Np>,
  *   summary?: Summary,
  * }
- * When used in a response, this type parameter can define a $rawResponse property.
- * @template TRawResponse of object = object{}
- *
- * @mixin TRawResponse
  */
-final class UnifiedResponse implements BaseModel
+final class UnifiedResponse implements BaseModel, ResponseConverter
 {
     /** @use SdkModel<unified_response> */
     use SdkModel;
 
+    use SdkResponse;
+
     /** @var list<DematAccount>|null $dematAccounts */
     #[Api('demat_accounts', list: DematAccount::class, optional: true)]
     public ?array $dematAccounts;

src/CasParser/UnifiedResponse/DematAccount.php

@@ -114,7 +114,7 @@ public static function with(
         null !== $additionalInfo && $obj->additionalInfo = $additionalInfo;
         null !== $boID && $obj->boID = $boID;
         null !== $clientID && $obj->clientID = $clientID;
-        null !== $dematType && $obj->dematType = $dematType instanceof DematType ? $dematType->value : $dematType;
+        null !== $dematType && $obj['dematType'] = $dematType;
         null !== $dpID && $obj->dpID = $dpID;
         null !== $dpName && $obj->dpName = $dpName;
         null !== $holdings && $obj->holdings = $holdings;
@@ -165,7 +165,7 @@ public function withClientID(string $clientID): self
     public function withDematType(DematType|string $dematType): self
     {
         $obj = clone $this;
-        $obj->dematType = $dematType instanceof DematType ? $dematType->value : $dematType;
+        $obj['dematType'] = $dematType;
 
         return $obj;
     }

src/CasParser/UnifiedResponse/Meta.php

@@ -58,7 +58,7 @@ public static function with(
     ): self {
         $obj = new self;
 
-        null !== $casType && $obj->casType = $casType instanceof CasType ? $casType->value : $casType;
+        null !== $casType && $obj['casType'] = $casType;
         null !== $generatedAt && $obj->generatedAt = $generatedAt;
         null !== $statementPeriod && $obj->statementPeriod = $statementPeriod;
 
@@ -73,7 +73,7 @@ public static function with(
     public function withCasType(CasType|string $casType): self
     {
         $obj = clone $this;
-        $obj->casType = $casType instanceof CasType ? $casType->value : $casType;
+        $obj['casType'] = $casType;
 
         return $obj;
     }

src/CasParser/UnifiedResponse/MutualFund/Scheme.php

@@ -134,7 +134,7 @@ public static function with(
         null !== $nav && $obj->nav = $nav;
         null !== $nominees && $obj->nominees = $nominees;
         null !== $transactions && $obj->transactions = $transactions;
-        null !== $type && $obj->type = $type instanceof Type ? $type->value : $type;
+        null !== $type && $obj['type'] = $type;
         null !== $units && $obj->units = $units;
         null !== $value && $obj->value = $value;
 
@@ -236,7 +236,7 @@ public function withTransactions(array $transactions): self
     public function withType(Type|string $type): self
     {
         $obj = clone $this;
-        $obj->type = $type instanceof Type ? $type->value : $type;
+        $obj['type'] = $type;
 
         return $obj;
     }

src/Client.php

@@ -28,7 +28,7 @@ public function __construct(?string $apiKey = null, ?string $baseUrl = null)
     {
         $this->apiKey = (string) ($apiKey ?? getenv('CAS_PARSER_API_KEY'));
 
-        $base = $baseUrl ?? getenv(
+        $baseUrl ??= getenv(
             'CAS_PARSER_BASE_URL'
         ) ?: 'https://portfolio-parser.api.casparser.in';
 
@@ -43,7 +43,7 @@ public function __construct(?string $apiKey = null, ?string $baseUrl = null)
             headers: [
                 'Content-Type' => 'application/json', 'Accept' => 'application/json',
             ],
-            baseUrl: $base,
+            baseUrl: $baseUrl,
             options: $options,
         );
 

src/Core/BaseClient.php

@@ -29,7 +29,7 @@
  *   body: mixed,
  * }
  */
-class BaseClient
+abstract class BaseClient
 {
     protected UriInterface $baseUrl;
 
@@ -77,14 +77,11 @@ public function request(
         // @phpstan-ignore-next-line
         $rsp = $this->sendRequest($opts, req: $request, data: $body, redirectCount: 0, retryCount: 0);
 
-        $decoded = Util::decodeContent($rsp);
-
         if (!is_null($stream)) {
             return new $stream(
                 convert: $convert,
                 request: $request,
-                response: $rsp,
-                stream: $decoded
+                response: $rsp
             );
         }
 
@@ -93,23 +90,20 @@ public function request(
                 convert: $convert,
                 client: $this,
                 request: $req,
+                response: $rsp,
                 options: $opts,
-                data: $decoded,
             );
         }
 
         if (!is_null($convert)) {
-            return Conversion::coerce($convert, value: $decoded);
+            return Conversion::coerceResponse($convert, response: $rsp);
         }
 
-        return $decoded;
+        return Util::decodeContent($rsp);
     }
 
     /** @return array<string, string> */
-    protected function authHeaders(): array
-    {
-        return [];
-    }
+    abstract protected function authHeaders(): array;
 
     /**
      * @internal

src/Core/Concerns/SdkResponse.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace CasParser\Core\Concerns;
+
+use CasParser\Core\Util;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * @internal
+ * SdkResponse must only be used in conjunction with classes that use the SdkModel trait
+ */
+trait SdkResponse
+{
+    private ?ResponseInterface $_rawResponse;
+
+    public static function fromResponse(ResponseInterface $response): static
+    {
+        $instance = new static;
+        $instance->_rawResponse = $response;
+        $instance->__unserialize(Util::decodeContent($response)); // @phpstan-ignore-line
+
+        return $instance;
+    }
+
+    public function getRawResponse(): ?ResponseInterface
+    {
+        return $this->_rawResponse;
+    }
+}