@agroyaar/sdk 2.0.2 → 2.0.4

package/dist/index.cjs

@@ -58,6 +58,10 @@ var responseLogger = (response) => {
 };
 
 // src/core/client.ts
+var interpolatePath = (template, params) => Object.entries(params).reduce(
+  (path, [key, value]) => path.replace(`{${key}}`, encodeURIComponent(String(value))),
+  template
+);
 var createClient = (config, middlewares = []) => {
   const client = import_axios.default.create({
     baseURL: config.baseURL,
@@ -66,9 +70,13 @@ var createClient = (config, middlewares = []) => {
     }
   });
   client.typed = async function(method, path, config2) {
+    const finalPath = config2?.pathParams ? interpolatePath(
+      path,
+      config2.pathParams
+    ) : path;
     const res = await client.request({
       method,
-      url: path,
+      url: finalPath,
       params: config2?.params,
       data: config2?.body
     });
@@ -221,9 +229,7 @@ var createMechanizationServices = (client) => ({
         }
       );
       return import_ts_belt2.R.Ok(
-        mappers.getMechanizationsList(
-          response.content["application/json"].result.data.mechanizations
-        )
+        mappers.getMechanizationsList(response.result.data.mechanizations)
       );
     } catch (error) {
       return wrapError(error);
@@ -234,14 +240,19 @@ var createMechanizationServices = (client) => ({
     mechanizationId
   }) => {
     try {
-      console.log(farmerId, mechanizationId);
       const response = await client.typed(
         "get",
-        "/farmers/{farmerId}/mechanizations/{mechanizationId}/sensors"
+        "/farmers/{farmerId}/mechanizations/{mechanizationId}/sensors",
+        {
+          pathParams: {
+            farmerId,
+            mechanizationId
+          }
+        }
       );
       return import_ts_belt2.R.Ok(
         mappers.getMotorizedMechanizationSensors(
-          response.content["application/json"].result.data.motorizedMechanizationSensors
+          response.result.data.motorizedMechanizationSensors
         )
       );
     } catch (error) {
@@ -306,7 +317,7 @@ var createMechanizationServices = (client) => ({
           }
         }
       );
-      const questions = data.result?.data?.mechanizationsQuestions;
+      const questions = data.result.data.mechanizationsQuestions;
       if (!questions) {
         throw new Error(
           "Invalid API response: 'mechanizationsQuestions' missing"
@@ -334,7 +345,7 @@ var createMechanizationServices = (client) => ({
       );
       return import_ts_belt2.R.Ok(
         mappers.getMechanizationMovementChanges(
-          response.content["application/json"].result.data.movementChanges
+          response.result.data.movementChanges
         )
       );
     } catch (error) {

package/dist/index.d.ts

@@ -925,8 +925,7 @@ interface components {
             readonly model: string;
             /** @example shrek */
             readonly commonName: string;
-            /** @example 0 */
-            readonly manufactureYear: number;
+            readonly manufactureYear: string;
             /** @example code */
             readonly code: string;
             /** @example deviceCode */
@@ -1364,7 +1363,6 @@ interface operations {
         responses: {
             /** @description لیست اطلاعات با موفقیت دریافت شد */
             200: {
-                result: any;
                 headers: {
                     [name: string]: unknown;
                 };
@@ -2926,20 +2924,30 @@ type RequestParams<Op> = Op extends {
     };
 } ? Q extends object ? Q : never : never;
 type RequestBody<Op> = Op extends {
-    requestBody: {
+    requestBody?: {
         content: {
             "application/json": infer B;
         };
     };
 } ? B : never;
+type PathParams<Op> = Op extends {
+    parameters?: {
+        path?: infer P;
+    };
+} ? P extends object ? P : never : never;
 type ResponseData<Op> = Op extends {
     responses: {
-        200: infer R;
+        200: {
+            content: {
+                "application/json": infer R;
+            };
+        };
     };
 } ? R : unknown;
 
 type ExtendedClient = AxiosInstance & {
     typed: <M extends HttpMethod, P extends ExtractPathsByMethod<M>, Op extends PathOperation<M, P>>(_method: M, _path: P, _config?: {
+        pathParams?: PathParams<Op>;
         params?: RequestParams<Op>;
         body?: RequestBody<Op>;
     }) => Promise<ResponseData<Op>>;

package/dist/index.mjs

@@ -22,6 +22,10 @@ var responseLogger = (response) => {
 };
 
 // src/core/client.ts
+var interpolatePath = (template, params) => Object.entries(params).reduce(
+  (path, [key, value]) => path.replace(`{${key}}`, encodeURIComponent(String(value))),
+  template
+);
 var createClient = (config, middlewares = []) => {
   const client = axios.create({
     baseURL: config.baseURL,
@@ -30,9 +34,13 @@ var createClient = (config, middlewares = []) => {
     }
   });
   client.typed = async function(method, path, config2) {
+    const finalPath = config2?.pathParams ? interpolatePath(
+      path,
+      config2.pathParams
+    ) : path;
     const res = await client.request({
       method,
-      url: path,
+      url: finalPath,
       params: config2?.params,
       data: config2?.body
     });
@@ -185,9 +193,7 @@ var createMechanizationServices = (client) => ({
         }
       );
       return R2.Ok(
-        mappers.getMechanizationsList(
-          response.content["application/json"].result.data.mechanizations
-        )
+        mappers.getMechanizationsList(response.result.data.mechanizations)
       );
     } catch (error) {
       return wrapError(error);
@@ -198,14 +204,19 @@ var createMechanizationServices = (client) => ({
     mechanizationId
   }) => {
     try {
-      console.log(farmerId, mechanizationId);
       const response = await client.typed(
         "get",
-        "/farmers/{farmerId}/mechanizations/{mechanizationId}/sensors"
+        "/farmers/{farmerId}/mechanizations/{mechanizationId}/sensors",
+        {
+          pathParams: {
+            farmerId,
+            mechanizationId
+          }
+        }
       );
       return R2.Ok(
         mappers.getMotorizedMechanizationSensors(
-          response.content["application/json"].result.data.motorizedMechanizationSensors
+          response.result.data.motorizedMechanizationSensors
         )
       );
     } catch (error) {
@@ -270,7 +281,7 @@ var createMechanizationServices = (client) => ({
           }
         }
       );
-      const questions = data.result?.data?.mechanizationsQuestions;
+      const questions = data.result.data.mechanizationsQuestions;
       if (!questions) {
         throw new Error(
           "Invalid API response: 'mechanizationsQuestions' missing"
@@ -298,7 +309,7 @@ var createMechanizationServices = (client) => ({
       );
       return R2.Ok(
         mappers.getMechanizationMovementChanges(
-          response.content["application/json"].result.data.movementChanges
+          response.result.data.movementChanges
         )
       );
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agroyaar/sdk",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",