@deliverart/sdk-js-core 0.1.3 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @deliverart/sdk-js-core
 
+## 0.2.0
+
+### Minor Changes
+
+- 3a95890: change input output mode
+
+## 0.1.4
+
+### Patch Changes
+
+- 60fba1c: ignore lock
+
 ## 0.1.3
 
 ### Patch Changes

package/dist/index.cjs

@@ -66,32 +66,24 @@ var AbstractApiRequest = class {
   }
   validateInput() {
     const result = this.inputSchema.safeParse(this.input);
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues);
     return result.data;
   }
   validateQuery() {
     if (!this.querySchema || !this.options?.query) return void 0;
     const result = this.querySchema.safeParse(this.options.query);
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues);
     return result.data;
   }
   validateHeaders() {
     if (!this.headersSchema || !this.options?.headers) return void 0;
     const result = this.headersSchema.safeParse(this.options.headers);
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues);
     return result.data;
   }
   validateOutput(data) {
     const result = this.outputSchema.safeParse(data);
-    if (!result.success) {
-      throw new OutputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new OutputValidationError(result.error.issues);
     return result.data;
   }
   parseResponse(data, rawResponse) {

package/dist/index.d.cts

@@ -1,13 +1,15 @@
 import { AxiosResponse, AxiosInstance } from 'axios';
-import { ZodSchema, ZodIssue } from 'zod';
+import { ZodType, ZodTypeDef, ZodSchema, ZodIssue } from 'zod';
 
 type ApiExtension = Record<string, unknown>;
 interface ApiClientPlugin<T extends ApiExtension = Record<string, unknown>> {
     setup: (client: ApiClient<Record<string, unknown>>) => T;
 }
+type ZodInput<T extends ZodType<any, any, any>> = T extends ZodType<any, any, infer I> ? I : never;
+type ZodOutput<T extends ZodType<any, any, any>> = T extends ZodType<infer O, any, any> ? O : never;
 
-declare abstract class AbstractApiRequest<Input, Output, Query = unknown, Headers = unknown> {
-    readonly input: Input;
+declare abstract class AbstractApiRequest<TInputSchema extends ZodType<any, ZodTypeDef, any>, TOutputSchema extends ZodType<any, ZodTypeDef, any>, Query = unknown, Headers = unknown> {
+    readonly input: ZodInput<TInputSchema>;
     readonly options?: {
         query?: Query;
         headers?: Headers;
@@ -15,30 +17,30 @@ declare abstract class AbstractApiRequest<Input, Output, Query = unknown, Header
     abstract readonly method: 'GET' | 'POST' | 'PATCH' | 'DELETE';
     abstract readonly contentType: 'application/json' | 'multipart/form-data' | 'application/merge-patch+json';
     abstract readonly accept: 'application/json';
-    abstract readonly inputSchema: ZodSchema<Input>;
-    abstract readonly outputSchema: ZodSchema<Output>;
+    abstract readonly inputSchema: TInputSchema;
+    abstract readonly outputSchema: TOutputSchema;
     abstract readonly querySchema?: ZodSchema<Query>;
     abstract readonly headersSchema?: ZodSchema<Headers>;
-    protected constructor(input: Input, options?: {
+    protected constructor(input: ZodInput<TInputSchema>, options?: {
         query?: Query;
         headers?: Headers;
     } | undefined);
     abstract getPath(): string;
-    validateInput(): Input;
+    validateInput(): ZodOutput<TInputSchema>;
     validateQuery(): Query | undefined;
     validateHeaders(): Headers | undefined;
-    validateOutput(data: unknown): Output;
-    parseResponse(data: unknown, rawResponse?: AxiosResponse): Output;
+    validateOutput(data: unknown): ZodOutput<TOutputSchema>;
+    parseResponse(data: unknown, rawResponse?: AxiosResponse): ZodOutput<TOutputSchema>;
 }
 interface ApiClientBase {
     http: AxiosInstance;
+    call<TInputSchema extends ZodType<any, ZodTypeDef, any>, TOutputSchema extends ZodType<any, ZodTypeDef, any>, Q = unknown, H = unknown>(request: AbstractApiRequest<TInputSchema, TOutputSchema, Q, H>): Promise<ZodOutput<TOutputSchema>>;
     addPlugin: <T extends ApiExtension>(plugin: ApiClientPlugin<T>) => ApiClient<T>;
-    call<I, O, Q, H>(request: AbstractApiRequest<I, O, Q, H>): Promise<O>;
 }
+type ApiClient<Extensions extends ApiExtension = NonNullable<unknown>> = ApiClientBase & Extensions;
 declare function createApiClient<Extensions extends ApiExtension = NonNullable<unknown>>(config: {
     baseUrl: string;
 }): ApiClient<Extensions>;
-type ApiClient<Extensions extends ApiExtension = NonNullable<unknown>> = ApiClientBase & Extensions;
 
 declare class InputValidationError extends Error {
     readonly issues: ZodIssue[];
@@ -49,4 +51,4 @@ declare class OutputValidationError extends Error {
     constructor(issues: ZodIssue[]);
 }
 
-export { AbstractApiRequest, type ApiClient, type ApiClientPlugin, type ApiExtension, InputValidationError, OutputValidationError, createApiClient };
+export { AbstractApiRequest, type ApiClient, type ApiClientPlugin, type ApiExtension, InputValidationError, OutputValidationError, type ZodInput, type ZodOutput, createApiClient };

package/dist/index.d.ts

@@ -1,13 +1,15 @@
 import { AxiosResponse, AxiosInstance } from 'axios';
-import { ZodSchema, ZodIssue } from 'zod';
+import { ZodType, ZodTypeDef, ZodSchema, ZodIssue } from 'zod';
 
 type ApiExtension = Record<string, unknown>;
 interface ApiClientPlugin<T extends ApiExtension = Record<string, unknown>> {
     setup: (client: ApiClient<Record<string, unknown>>) => T;
 }
+type ZodInput<T extends ZodType<any, any, any>> = T extends ZodType<any, any, infer I> ? I : never;
+type ZodOutput<T extends ZodType<any, any, any>> = T extends ZodType<infer O, any, any> ? O : never;
 
-declare abstract class AbstractApiRequest<Input, Output, Query = unknown, Headers = unknown> {
-    readonly input: Input;
+declare abstract class AbstractApiRequest<TInputSchema extends ZodType<any, ZodTypeDef, any>, TOutputSchema extends ZodType<any, ZodTypeDef, any>, Query = unknown, Headers = unknown> {
+    readonly input: ZodInput<TInputSchema>;
     readonly options?: {
         query?: Query;
         headers?: Headers;
@@ -15,30 +17,30 @@ declare abstract class AbstractApiRequest<Input, Output, Query = unknown, Header
     abstract readonly method: 'GET' | 'POST' | 'PATCH' | 'DELETE';
     abstract readonly contentType: 'application/json' | 'multipart/form-data' | 'application/merge-patch+json';
     abstract readonly accept: 'application/json';
-    abstract readonly inputSchema: ZodSchema<Input>;
-    abstract readonly outputSchema: ZodSchema<Output>;
+    abstract readonly inputSchema: TInputSchema;
+    abstract readonly outputSchema: TOutputSchema;
     abstract readonly querySchema?: ZodSchema<Query>;
     abstract readonly headersSchema?: ZodSchema<Headers>;
-    protected constructor(input: Input, options?: {
+    protected constructor(input: ZodInput<TInputSchema>, options?: {
         query?: Query;
         headers?: Headers;
     } | undefined);
     abstract getPath(): string;
-    validateInput(): Input;
+    validateInput(): ZodOutput<TInputSchema>;
     validateQuery(): Query | undefined;
     validateHeaders(): Headers | undefined;
-    validateOutput(data: unknown): Output;
-    parseResponse(data: unknown, rawResponse?: AxiosResponse): Output;
+    validateOutput(data: unknown): ZodOutput<TOutputSchema>;
+    parseResponse(data: unknown, rawResponse?: AxiosResponse): ZodOutput<TOutputSchema>;
 }
 interface ApiClientBase {
     http: AxiosInstance;
+    call<TInputSchema extends ZodType<any, ZodTypeDef, any>, TOutputSchema extends ZodType<any, ZodTypeDef, any>, Q = unknown, H = unknown>(request: AbstractApiRequest<TInputSchema, TOutputSchema, Q, H>): Promise<ZodOutput<TOutputSchema>>;
     addPlugin: <T extends ApiExtension>(plugin: ApiClientPlugin<T>) => ApiClient<T>;
-    call<I, O, Q, H>(request: AbstractApiRequest<I, O, Q, H>): Promise<O>;
 }
+type ApiClient<Extensions extends ApiExtension = NonNullable<unknown>> = ApiClientBase & Extensions;
 declare function createApiClient<Extensions extends ApiExtension = NonNullable<unknown>>(config: {
     baseUrl: string;
 }): ApiClient<Extensions>;
-type ApiClient<Extensions extends ApiExtension = NonNullable<unknown>> = ApiClientBase & Extensions;
 
 declare class InputValidationError extends Error {
     readonly issues: ZodIssue[];
@@ -49,4 +51,4 @@ declare class OutputValidationError extends Error {
     constructor(issues: ZodIssue[]);
 }
 
-export { AbstractApiRequest, type ApiClient, type ApiClientPlugin, type ApiExtension, InputValidationError, OutputValidationError, createApiClient };
+export { AbstractApiRequest, type ApiClient, type ApiClientPlugin, type ApiExtension, InputValidationError, OutputValidationError, type ZodInput, type ZodOutput, createApiClient };

package/dist/index.js

@@ -27,32 +27,24 @@ var AbstractApiRequest = class {
   }
   validateInput() {
     const result = this.inputSchema.safeParse(this.input);
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues);
     return result.data;
   }
   validateQuery() {
     if (!this.querySchema || !this.options?.query) return void 0;
     const result = this.querySchema.safeParse(this.options.query);
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues);
     return result.data;
   }
   validateHeaders() {
     if (!this.headersSchema || !this.options?.headers) return void 0;
     const result = this.headersSchema.safeParse(this.options.headers);
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues);
     return result.data;
   }
   validateOutput(data) {
     const result = this.outputSchema.safeParse(data);
-    if (!result.success) {
-      throw new OutputValidationError(result.error.issues);
-    }
+    if (!result.success) throw new OutputValidationError(result.error.issues);
     return result.data;
   }
   parseResponse(data, rawResponse) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deliverart/sdk-js-core",
   "description": "Core SDK for DeliverArt, providing essential functionalities and utilities.",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/ApiClient.ts

@@ -1,25 +1,31 @@
 import axios, { AxiosInstance, AxiosResponse } from 'axios'
-import { ZodSchema } from 'zod'
+import { ZodSchema, ZodType, ZodTypeDef } from 'zod'
 
 import { InputValidationError, OutputValidationError } from './errors'
-import type { ApiClientPlugin, ApiExtension } from './types'
-
-export abstract class AbstractApiRequest<Input, Output, Query = unknown, Headers = unknown> {
+import { ApiClientPlugin, ApiExtension, ZodInput, ZodOutput } from './types'
+
+export abstract class AbstractApiRequest<
+  TInputSchema extends ZodType<any, ZodTypeDef, any>,
+  TOutputSchema extends ZodType<any, ZodTypeDef, any>,
+  Query = unknown,
+  Headers = unknown,
+> {
   abstract readonly method: 'GET' | 'POST' | 'PATCH' | 'DELETE'
   abstract readonly contentType:
     | 'application/json'
     | 'multipart/form-data'
     | 'application/merge-patch+json'
   abstract readonly accept: 'application/json'
-  abstract readonly inputSchema: ZodSchema<Input>
-  abstract readonly outputSchema: ZodSchema<Output>
+
+  abstract readonly inputSchema: TInputSchema
+  abstract readonly outputSchema: TOutputSchema
   abstract readonly querySchema?: ZodSchema<Query>
   abstract readonly headersSchema?: ZodSchema<Headers>
 
   protected constructor(
-    // eslint-disable-next-line no-unused-vars
-    public readonly input: Input,
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line
+    public readonly input: ZodInput<TInputSchema>,
+    // eslint-disable-next-line
     public readonly options?: {
       query?: Query
       headers?: Headers
@@ -28,43 +34,33 @@ export abstract class AbstractApiRequest<Input, Output, Query = unknown, Headers
 
   abstract getPath(): string
 
-  validateInput(): Input {
+  validateInput(): ZodOutput<TInputSchema> {
     const result = this.inputSchema.safeParse(this.input)
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues)
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues)
     return result.data
   }
 
   validateQuery(): Query | undefined {
     if (!this.querySchema || !this.options?.query) return undefined
-
     const result = this.querySchema.safeParse(this.options.query)
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues)
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues)
     return result.data
   }
 
   validateHeaders(): Headers | undefined {
     if (!this.headersSchema || !this.options?.headers) return undefined
-
     const result = this.headersSchema.safeParse(this.options.headers)
-    if (!result.success) {
-      throw new InputValidationError(result.error.issues)
-    }
+    if (!result.success) throw new InputValidationError(result.error.issues)
     return result.data
   }
 
-  validateOutput(data: unknown): Output {
+  validateOutput(data: unknown): ZodOutput<TOutputSchema> {
     const result = this.outputSchema.safeParse(data)
-    if (!result.success) {
-      throw new OutputValidationError(result.error.issues)
-    }
+    if (!result.success) throw new OutputValidationError(result.error.issues)
     return result.data
   }
 
-  parseResponse(data: unknown, rawResponse?: AxiosResponse): Output {
+  parseResponse(data: unknown, rawResponse?: AxiosResponse): ZodOutput<TOutputSchema> {
     void rawResponse
     return this.validateOutput(data)
   }
@@ -72,12 +68,25 @@ export abstract class AbstractApiRequest<Input, Output, Query = unknown, Headers
 
 interface ApiClientBase {
   http: AxiosInstance
-  // eslint-disable-next-line no-unused-vars
+
+  call<
+    TInputSchema extends ZodType<any, ZodTypeDef, any>,
+    TOutputSchema extends ZodType<any, ZodTypeDef, any>,
+    Q = unknown,
+    H = unknown,
+  >(
+    // eslint-disable-next-line
+    request: AbstractApiRequest<TInputSchema, TOutputSchema, Q, H>,
+  ): Promise<ZodOutput<TOutputSchema>>
+
+  // eslint-disable-next-line
   addPlugin: <T extends ApiExtension>(plugin: ApiClientPlugin<T>) => ApiClient<T>
-  // eslint-disable-next-line no-unused-vars
-  call<I, O, Q, H>(request: AbstractApiRequest<I, O, Q, H>): Promise<O>
 }
 
+export type ApiClient<Extensions extends ApiExtension = NonNullable<unknown>> = ApiClientBase &
+  Extensions
+
+// --- Factory ---
 export function createApiClient<Extensions extends ApiExtension = NonNullable<unknown>>(config: {
   baseUrl: string
 }): ApiClient<Extensions> {
@@ -86,7 +95,14 @@ export function createApiClient<Extensions extends ApiExtension = NonNullable<un
   const base: ApiClientBase = {
     http,
 
-    async call<I, O, Q, H>(request: AbstractApiRequest<I, O, Q, H>): Promise<O> {
+    async call<
+      TInputSchema extends ZodType<any, ZodTypeDef, any>,
+      TOutputSchema extends ZodType<any, ZodTypeDef, any>,
+      Q,
+      H,
+    >(
+      request: AbstractApiRequest<TInputSchema, TOutputSchema, Q, H>,
+    ): Promise<ZodOutput<TOutputSchema>> {
       const input = request.validateInput()
       const query = request.validateQuery()
       const headers = request.validateHeaders()
@@ -114,6 +130,3 @@ export function createApiClient<Extensions extends ApiExtension = NonNullable<un
 
   return base as ApiClient<Extensions>
 }
-
-export type ApiClient<Extensions extends ApiExtension = NonNullable<unknown>> = ApiClientBase &
-  Extensions

package/src/types.ts

@@ -1,3 +1,5 @@
+import { ZodType } from 'zod'
+
 import { ApiClient } from './ApiClient'
 
 export type ApiExtension = Record<string, unknown>
@@ -6,3 +8,9 @@ export interface ApiClientPlugin<T extends ApiExtension = Record<string, unknown
   // eslint-disable-next-line no-unused-vars
   setup: (client: ApiClient<Record<string, unknown>>) => T
 }
+
+export type ZodInput<T extends ZodType<any, any, any>> =
+  T extends ZodType<any, any, infer I> ? I : never
+
+export type ZodOutput<T extends ZodType<any, any, any>> =
+  T extends ZodType<infer O, any, any> ? O : never