tspace-spear 1.2.8 → 1.2.9-beta.1

package/dist/cli/generators/controller/template.js

@@ -5,6 +5,7 @@ exports.ControllerTemplate = `
 import {
   type T,
   Controller,
+  Service,
   Middleware,
   Get,
   Post,
@@ -16,17 +17,19 @@ import { CatService }    from "./cat.service";
 import { CreateCatDto , UpdateCatDto }  from "./cat.dto";
 import { LogMiddleware } from "../../common/middlewares/log.middleware";
 
+@Service([CatService])
 @Controller("/cats")
 class CatController {
 
   constructor(
-    private catService: CatService = new CatService()
+    private catService: CatService
   ) {}
 
   @Get("/")
   @Middleware(LogMiddleware)
   async index() {
-    return this.catService.index();
+    const cats = await this.catService.index();
+    return { cats };
   }
 
   @Get("/:id")
@@ -38,8 +41,8 @@ class CatController {
       id: number;
     };
   }>) {
-
-    return this.catService.show(params.id);
+    const cat = await this.catService.show(params.id);
+    return { cat }
   }
 
   @Post("/")
@@ -51,11 +54,13 @@ class CatController {
     body: CreateCatDto;
   }>) {
 
-    return this.catService
+    const cat = await this.catService
     .create({ 
       name: body.name, 
       age: body.age 
     });
+
+    return { cat };
   }
 
   @Put("/:id")
@@ -71,11 +76,13 @@ class CatController {
     body: UpdateCatDto;
   }>) {
 
-    return this.catService
+    const cat = await this.catService
     .update(params.id, { 
       name: body.name, 
       age: body.age 
     });
+
+    return { cat }
   }
 
   @Delete("/:id")
@@ -88,8 +95,10 @@ class CatController {
     };
   }>) {
 
-    return this.catService
+    const deleted = await this.catService
     .remove(params.id);
+
+    return deleted;
   }
 }
 

package/dist/cli/generators/controller/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/cli/generators/controller/template.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8FjC,CAAC"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/cli/generators/controller/template.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuGjC,CAAC"}

package/dist/cli/generators/dto/index.js

@@ -23,6 +23,7 @@ import {
   Min,
   IsNotEmpty,
   IsNumber,
+  IsOptional
 } from "class-validator";
 
 export class Create${className} {
@@ -36,13 +37,14 @@ export class Create${className} {
 }
 
 export class Update${className} {
+  @IsOptional()
   @IsString()
-  @IsNotEmpty()
-  name!: string;
+  name?: string;
 
+  @IsOptional()
   @IsNumber()
   @Min(0.1)
-  age!: number;
+  age?: number;
 }
 `);
     console.log(`

package/dist/cli/generators/dto/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/generators/dto/index.ts"],"names":[],"mappings":";;;;;AAQA,8BAsDC;AA9DD,4CAAoB;AACpB,gDAAwB;AACxB,sCAImB;AAEnB,SAAgB,SAAS,CAAC,IAAa,EAAC,IAAa;IACjD,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAEH,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAG,SAAS,EAAE,IAAA,iBAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;IAEnF,MAAM,QAAQ,GAAG,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,SAAS,CAAC;IAE9C,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAEjD,YAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,IAAA,mBAAU,EAAC,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;IAEvD,YAAE,CAAC,aAAa,CACd,MAAM,EACN;;;;;;;;qBAQiB,SAAS;;;;;;;;;;qBAUT,SAAS;;;;;;;;;CAS7B,CACE,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC;WACF,MAAM;;gCAEe,IAAI;;CAEnC,CAAC,CAAA;AACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/generators/dto/index.ts"],"names":[],"mappings":";;;;;AAQA,8BAwDC;AAhED,4CAAoB;AACpB,gDAAwB;AACxB,sCAImB;AAEnB,SAAgB,SAAS,CAAC,IAAa,EAAC,IAAa;IACjD,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAEH,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAG,SAAS,EAAE,IAAA,iBAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;IAEnF,MAAM,QAAQ,GAAG,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,SAAS,CAAC;IAE9C,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAEjD,YAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,IAAA,mBAAU,EAAC,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;IAEvD,YAAE,CAAC,aAAa,CACd,MAAM,EACN;;;;;;;;;qBASiB,SAAS;;;;;;;;;;qBAUT,SAAS;;;;;;;;;;CAU7B,CACE,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC;WACF,MAAM;;gCAEe,IAAI;;CAEnC,CAAC,CAAA;AACF,CAAC"}

package/dist/cli/generators/module/index.js

@@ -54,7 +54,7 @@ class ${controllerName} {
     async show({
         params
     }: T.Context<{ params: { id: number } }>) {
-        return this.${(0, shared_1.toSingular)(name)}Service.show(params.id);
+        return this.${(0, shared_1.toSingular)(name)}Service.show(+params.id);
     }
 
     @Post("/")
@@ -81,7 +81,7 @@ class ${controllerName} {
     }>) {
 
         return this.${(0, shared_1.toSingular)(name)}Service
-        .update(params.id, { 
+        .update(+params.id, { 
             name: body.name, 
             age: body.age 
         });
@@ -92,7 +92,7 @@ class ${controllerName} {
         params
     }: T.Context<{ params: { id: number } }>) {
         return this.${(0, shared_1.toSingular)(name)}Service
-        .remove(params.id);
+        .remove(+params.id);
     }
 }
 

package/dist/cli/generators/service/template.d.ts

@@ -1 +1 @@
-export declare const ServiceTemplate = "\ntype Cat = {\n    id: number;\n    name: string;\n    age: number;\n}\n\nexport class CatService {\n    private cats: Cat[] = [\n        { id: 1, name: 'cat1', age: 1.6 },\n        { id: 2, name: 'cat2', age: 1.8 },\n    ];\n    public async index() {\n        return this.cats;\n    };\n\n    public async show(id: number) {\n        return this.cats.find(cat => cat.id === id);\n    };\n\n    public async create({ name, age }: Omit<Cat, \"id\">) {\n\n        const cat: Cat = {\n            id: this.cats.length + 1,\n            name: name,\n            age: age\n        };\n\n        this.cats.push(cat);\n\n        return {\n            message: \"Created\",\n            cat\n        };\n    }\n    \n    public async update(id: number, { name, age }: Omit<Cat, \"id\">) {\n        const index = this.cats.findIndex(d => d.id === id);\n\n        if (index === -1) {\n            throw new Error(\"Cat not found\");\n        }\n\n        this.cats[index] = {\n            ...this.cats[index],\n            ...{ name, age }        \n        };\n\n        return {\n            message: \"Updated\",\n            cat: this.cats[index]\n        };\n    }\n\n    public async remove(id: number) {\n        const index = this.cats.findIndex(d => d.id === id);\n\n        if (index === -1) {\n            throw new Error(\"Cat not found\");\n        }\n\n        const [removedCat] = this.cats.splice(index, 1);\n\n        return {\n            message: \"Deleted\",\n            cat: removedCat\n        };\n    }\n}\n";
+export declare const ServiceTemplate = "\nimport { \n    CreateCatDto, \n    UpdateCatDto \n}  from \"./cat.dto\";\n\ntype Cat = {\n    id: number;\n    name: string;\n    age: number;\n}\n\nexport class CatService {\n    private cats: Cat[] = [\n        { id: 1, name: 'cat1', age: 1.6 },\n        { id: 2, name: 'cat2', age: 1.8 },\n    ];\n    public async index() {\n        return this.cats;\n    };\n\n    public async show(id: number) {\n        const cat = this.cats.find(cat => cat.id === id);\n        if(cat == null) return null;\n        return cat;\n    };\n\n    public async create({ name, age }: CreateCatDto) {\n\n        const cat = {\n            id: this.cats.length + 1,\n            name: name,\n            age: age\n        };\n\n        this.cats.push(cat);\n\n        return cat;\n    }\n    \n    public async update(id: number, { name, age }: UpdateCatDto) {\n        const index = this.cats.findIndex(d => d.id === id);\n\n        if (index === -1) {\n            throw new Error(\"Cat not found\");\n        }\n\n        this.cats[index] = {\n            ...this.cats[index],\n            ...{ name, age }        \n        };\n\n        const cat = this.cats[index];\n\n        return cat;\n    }\n\n    public async remove(id: number) {\n        const index = this.cats.findIndex(d => d.id === id);\n\n        if (index === -1) {\n            throw new Error(\"Cat not found\");\n        }\n\n        this.cats.splice(index, 1);\n\n        return true;\n    }\n}\n";

package/dist/cli/generators/service/template.js

@@ -2,6 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceTemplate = void 0;
 exports.ServiceTemplate = `
+import { 
+    CreateCatDto, 
+    UpdateCatDto 
+}  from "./cat.dto";
+
 type Cat = {
     id: number;
     name: string;
@@ -18,12 +23,14 @@ export class CatService {
     };
 
     public async show(id: number) {
-        return this.cats.find(cat => cat.id === id);
+        const cat = this.cats.find(cat => cat.id === id);
+        if(cat == null) return null;
+        return cat;
     };
 
-    public async create({ name, age }: Omit<Cat, "id">) {
+    public async create({ name, age }: CreateCatDto) {
 
-        const cat: Cat = {
+        const cat = {
             id: this.cats.length + 1,
             name: name,
             age: age
@@ -31,13 +38,10 @@ export class CatService {
 
         this.cats.push(cat);
 
-        return {
-            message: "Created",
-            cat
-        };
+        return cat;
     }
     
-    public async update(id: number, { name, age }: Omit<Cat, "id">) {
+    public async update(id: number, { name, age }: UpdateCatDto) {
         const index = this.cats.findIndex(d => d.id === id);
 
         if (index === -1) {
@@ -49,10 +53,9 @@ export class CatService {
             ...{ name, age }        
         };
 
-        return {
-            message: "Updated",
-            cat: this.cats[index]
-        };
+        const cat = this.cats[index];
+
+        return cat;
     }
 
     public async remove(id: number) {
@@ -62,12 +65,9 @@ export class CatService {
             throw new Error("Cat not found");
         }
 
-        const [removedCat] = this.cats.splice(index, 1);
+        this.cats.splice(index, 1);
 
-        return {
-            message: "Deleted",
-            cat: removedCat
-        };
+        return true;
     }
 }
 `;

package/dist/cli/index.js

@@ -20,7 +20,7 @@ if (command === "create" && type === "new") {
         .then(_ => process.exit(1))
         .catch(_ => process.exit(1));
 }
-if (command === "g") {
+else if (command === "g") {
     if (!name) {
         printUsage();
         process.exit(1);
@@ -47,19 +47,22 @@ if (command === "g") {
     }
     process.exit(0);
 }
+else {
+    printUsage();
+}
 function printUsage() {
     console.log(`
 Usage:
 
-  spear create new <project>
+  spear create new app
 
 Generators:
 
-  spear g module <names>
-  spear g controller <name>
-  spear g service <name>
-  spear g dto <name>
-  spear g middleware <name>
+  spear g module names
+  spear g controller name
+  spear g service name
+  spear g dto name
+  spear g middleware name
 `);
 }
 //# sourceMappingURL=index.js.map

package/dist/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;AAEA,0CAA6C;AAC7C,gDAAmD;AACnD,wDAA2D;AAC3D,kDAAqD;AACrD,wDAA2D;AAC3D,0CAA6C;AAE7C,MAAM,CAAC,EAAE,AAAD,EAAG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AAE/C;;;;;;GAMG;AAEH,IAAI,OAAO,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;IAC3C,IAAA,eAAS,EAAC,IAAI,CAAC;SACd,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC1B,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAC9B,CAAC;AAED,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;IACpB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,UAAU,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IAEnB,QAAQ,IAAI,EAAE,CAAC;QAEb,KAAK,QAAQ;YACX,IAAA,qBAAY,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACxB,MAAM;QAER,KAAK,YAAY;YACf,IAAA,6BAAgB,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YAC5B,MAAM;QAER,KAAK,SAAS;YACZ,IAAA,uBAAa,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM;QAER,KAAK,KAAK;YACR,IAAA,eAAS,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACrB,MAAM;QAER,KAAK,YAAY;YACf,IAAA,6BAAgB,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YAC5B,MAAM;QAER;YACE,UAAU,EAAE,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,UAAU;IACjB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;CAYb,CAAC,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;AAEA,0CAA6C;AAC7C,gDAAmD;AACnD,wDAA2D;AAC3D,kDAAqD;AACrD,wDAA2D;AAC3D,0CAA6C;AAE7C,MAAM,CAAC,EAAE,AAAD,EAAG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AAE/C;;;;;;GAMG;AAEH,IAAI,OAAO,KAAK,QAAQ,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;IAC3C,IAAA,eAAS,EAAC,IAAI,CAAC;SACd,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC1B,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAC9B,CAAC;KAEI,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,UAAU,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IAEnB,QAAQ,IAAI,EAAE,CAAC;QAEb,KAAK,QAAQ;YACX,IAAA,qBAAY,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACxB,MAAM;QAER,KAAK,YAAY;YACf,IAAA,6BAAgB,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YAC5B,MAAM;QAER,KAAK,SAAS;YACZ,IAAA,uBAAa,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM;QAER,KAAK,KAAK;YACR,IAAA,eAAS,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YACrB,MAAM;QAER,KAAK,YAAY;YACf,IAAA,6BAAgB,EAAC,IAAI,EAAC,IAAI,CAAC,CAAC;YAC5B,MAAM;QAER;YACE,UAAU,EAAE,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;KAAM,CAAC;IACN,UAAU,EAAE,CAAC;AACf,CAAC;AAED,SAAS,UAAU;IACjB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;CAYb,CAAC,CAAC;AACH,CAAC"}

package/dist/lib/core/client/index.d.ts

@@ -1,15 +1,4 @@
-import type { AnyRoutes, RoutesWithMethod, RequestBody, RequestQuery, RequestParams, RequestFiles, ResponseType } from "../compiler/types";
-type RequestInput<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = RequestParams<TRoutes, TPath, TMethod> extends never ? {
-    params?: never;
-    query?: RequestQuery<TRoutes, TPath, TMethod>;
-    body?: RequestBody<TRoutes, TPath, TMethod>;
-    files?: RequestFiles<TRoutes, TPath, TMethod>;
-} : {
-    params: RequestParams<TRoutes, TPath, TMethod>;
-    query?: RequestQuery<TRoutes, TPath, TMethod>;
-    body?: RequestBody<TRoutes, TPath, TMethod>;
-    files?: RequestFiles<TRoutes, TPath, TMethod>;
-};
+import type { AnyRoutes, RoutesWithMethod, ResponseType, RequestInput, OptionalIfEmpty, ApiResponse } from "./types";
 /**
  * Type-safe HTTP client built on top of the native Fetch API.
  *
@@ -41,42 +30,23 @@ type RequestInput<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMetho
  * })
  *
  * // fully typed response
- * console.log(res.cats)
+ * if(res.ok)
+ *  console.log(res.cats)
  * ```
  */
 declare class ApiClient<TRoutes extends AnyRoutes> {
     private baseURL;
     constructor(baseURL: string);
-    protected request<TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]>(method: TMethod, path: TPath, input?: RequestInput<TRoutes, TPath, TMethod>): Promise<{
-        ok: boolean;
-        status: number;
-        data: ResponseType<TRoutes, TPath, TMethod>;
-    }>;
-    get<TPath extends RoutesWithMethod<TRoutes, "GET">>(path: TPath, input?: RequestInput<TRoutes, TPath, "GET">): Promise<{
-        ok: boolean;
-        status: number;
-        data: ResponseType<TRoutes, TPath, "GET">;
-    }>;
-    post<TPath extends RoutesWithMethod<TRoutes, "POST">>(path: TPath, input: RequestInput<TRoutes, TPath, "POST">): Promise<{
-        ok: boolean;
-        status: number;
-        data: ResponseType<TRoutes, TPath, "POST">;
-    }>;
-    put<TPath extends RoutesWithMethod<TRoutes, "PUT">>(path: TPath, input: RequestInput<TRoutes, TPath, "PUT">): Promise<{
-        ok: boolean;
-        status: number;
-        data: ResponseType<TRoutes, TPath, "PUT">;
-    }>;
-    patch<TPath extends RoutesWithMethod<TRoutes, "PATCH">>(path: TPath, input: RequestInput<TRoutes, TPath, "PATCH">): Promise<{
-        ok: boolean;
-        status: number;
-        data: ResponseType<TRoutes, TPath, "PATCH">;
-    }>;
-    delete<TPath extends RoutesWithMethod<TRoutes, "DELETE">>(path: TPath, input?: RequestInput<TRoutes, TPath, "DELETE">): Promise<{
-        ok: boolean;
-        status: number;
-        data: ResponseType<TRoutes, TPath, "DELETE">;
-    }>;
+    private request;
+    get<TPath extends RoutesWithMethod<TRoutes, "GET">>(path: TPath, ...args: OptionalIfEmpty<RequestInput<TRoutes, TPath, "GET">>): Promise<ApiResponse<ResponseType<TRoutes, TPath, "GET">>>;
+    post<TPath extends RoutesWithMethod<TRoutes, "POST">>(path: TPath, ...args: OptionalIfEmpty<RequestInput<TRoutes, TPath, "POST">>): Promise<ApiResponse<ResponseType<TRoutes, TPath, "POST">>>;
+    put<TPath extends RoutesWithMethod<TRoutes, "PUT">>(path: TPath, ...args: OptionalIfEmpty<RequestInput<TRoutes, TPath, "PUT">>): Promise<ApiResponse<ResponseType<TRoutes, TPath, "PUT">>>;
+    patch<TPath extends RoutesWithMethod<TRoutes, "PATCH">>(path: TPath, ...args: OptionalIfEmpty<RequestInput<TRoutes, TPath, "PATCH">>): Promise<ApiResponse<ResponseType<TRoutes, TPath, "PATCH">>>;
+    delete<TPath extends RoutesWithMethod<TRoutes, "DELETE">>(path: TPath, ...args: OptionalIfEmpty<RequestInput<TRoutes, TPath, "DELETE">>): Promise<ApiResponse<ResponseType<TRoutes, TPath, "DELETE">>>;
+    upload<TMethod extends "POST" | "PUT" | "PATCH" = "POST", TPath extends RoutesWithMethod<TRoutes, TMethod> = RoutesWithMethod<TRoutes, TMethod>>(path: TPath, options: {
+        method?: TMethod;
+        formdata: FormData;
+    }): Promise<ApiResponse<ResponseType<TRoutes, TPath, TMethod>>>;
 }
 export { ApiClient };
 export default ApiClient;

package/dist/lib/core/client/index.js

@@ -15,27 +15,51 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiClient = void 0;
 let fetchFn = null;
-async function getFetch() {
+const getFetch = async () => {
     if (fetchFn)
         return fetchFn;
-    if (globalThis.fetch) {
-        fetchFn = globalThis.fetch;
+    // Browser OR modern Node v18+ (preferred)
+    if (typeof globalThis.fetch === "function") {
+        fetchFn = globalThis.fetch.bind(globalThis);
         return fetchFn;
     }
+    // Legacy Node fallback
     const mod = await Promise.resolve().then(() => __importStar(require("node-fetch")));
     fetchFn = mod.default;
     return fetchFn;
-}
+};
+const isFormData = (value) => {
+    // In Node.js 18+ it is compatible with the browser implementation.
+    if (typeof globalThis.FormData !== "undefined") {
+        return value instanceof globalThis.FormData;
+    }
+    // In Node.js below 18-, FormData is not the same as in the browser
+    // using from pkg form-data
+    return (value != null &&
+        typeof value === "object" &&
+        typeof value.append === "function" &&
+        typeof value.getHeaders === "function");
+};
 /**
  * Type-safe HTTP client built on top of the native Fetch API.
  *
@@ -67,7 +91,8 @@ async function getFetch() {
  * })
  *
  * // fully typed response
- * console.log(res.cats)
+ * if(res.ok)
+ *  console.log(res.cats)
  * ```
  */
 class ApiClient {
@@ -92,50 +117,62 @@ class ApiClient {
         if (!fetchFn) {
             throw new Error("Fetch is not available. Use Node 18+ or polyfill.");
         }
+        let body = input?.body
+            ? JSON.stringify(input.body)
+            : undefined;
+        let headers = {
+            "Content-Type": "application/json",
+        };
+        const isFileUpload = isFormData(input?.body);
+        if (isFileUpload) {
+            body = input?.body;
+            headers = undefined;
+        }
         const res = await fetchFn(url, {
             method: method,
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: input?.body
-                ? JSON.stringify(input.body)
-                : undefined,
+            headers,
+            body
         });
         const contentType = res.headers.get("content-type");
         const isJson = contentType?.includes("application/json");
         const data = isJson
             ? await res.json()
             : await res.text();
-        // if (!res.ok) {
-        //   throw new Error(
-        //     data?.message ||
-        //       data?.error ||
-        //       (typeof data === "string"
-        //         ? data
-        //         : `HTTP ${res.status}`),
-        //   );
-        // }
         return {
             ok: res.ok,
+            headers: res.headers,
             status: res.status,
-            data,
+            data: data,
         };
     }
-    async get(path, input) {
+    async get(path, ...args) {
+        const input = args[0];
         return this.request("GET", path, input);
     }
-    async post(path, input) {
+    async post(path, ...args) {
+        const input = args[0];
         return this.request("POST", path, input);
     }
-    async put(path, input) {
+    async put(path, ...args) {
+        const input = args[0];
         return this.request("PUT", path, input);
     }
-    async patch(path, input) {
+    async patch(path, ...args) {
+        const input = args[0];
         return this.request("PATCH", path, input);
     }
-    async delete(path, input) {
+    async delete(path, ...args) {
+        const input = args[0];
         return this.request("DELETE", path, input);
     }
+    async upload(path, options) {
+        const { method = "POST", formdata } = options;
+        return this.request(method, path, 
+        //@ts-ignore
+        {
+            body: formdata
+        });
+    }
 }
 exports.ApiClient = ApiClient;
 exports.default = ApiClient;

package/dist/lib/core/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/core/client/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/core/client/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/core/client/types.d.ts

@@ -0,0 +1,43 @@
+export type AnyRoutes = {
+    [key: string]: any;
+};
+export type RoutesWithMethod<TRoutes extends AnyRoutes, TMethod extends string> = {
+    [K in keyof TRoutes]: TMethod extends keyof TRoutes[K] ? K : never;
+}[keyof TRoutes];
+export type ExtractFrom<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath], Key extends string> = TRoutes[TPath][TMethod] extends Record<Key, infer R> ? R : never;
+export type RequestBody<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = ExtractFrom<TRoutes, TPath, TMethod, "body">;
+export type RequestQuery<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = ExtractFrom<TRoutes, TPath, TMethod, "query">;
+export type RequestParams<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = ExtractFrom<TRoutes, TPath, TMethod, "params">;
+export type RequestFiles<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = ExtractFrom<TRoutes, TPath, TMethod, "files">;
+export type ResponseType<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = TRoutes[TPath][TMethod] extends {
+    response: infer R;
+} ? Awaited<R> : never;
+export type Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+export type ExactProperty<Key extends string, T> = [
+    T
+] extends [never] ? {
+    [K in Key]?: never;
+} : undefined extends T ? {
+    [K in Key]?: T;
+} : {} extends T ? {
+    [K in Key]?: T;
+} : {
+    [K in Key]: T;
+};
+export type OptionalIfEmpty<T> = {} extends T ? [input?: T] : [input: T];
+export type RequestInput<TRoutes extends AnyRoutes, TPath extends keyof TRoutes, TMethod extends keyof TRoutes[TPath]> = Prettify<ExactProperty<"params", RequestParams<TRoutes, TPath, TMethod>> & ExactProperty<"query", RequestQuery<TRoutes, TPath, TMethod>> & ExactProperty<"body", RequestBody<TRoutes, TPath, TMethod>> & ExactProperty<"files", RequestFiles<TRoutes, TPath, TMethod>>>;
+export type SuccessStatus = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226;
+export type ErrorStatus = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
+export type ApiResponse<T, E = any> = {
+    ok: true;
+    status: SuccessStatus;
+    headers: Headers;
+    data: T;
+} | {
+    ok: false;
+    status: ErrorStatus;
+    headers: Headers;
+    data: E;
+};

package/dist/lib/core/client/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/lib/core/client/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/lib/core/client/types.ts"],"names":[],"mappings":""}

package/dist/lib/core/compiler/generator.d.ts

@@ -1,18 +1,16 @@
 type Route = {
     method: string;
     path: string;
-    response: string;
     body: string;
     params: string;
     query: string;
     files: string;
+    response: string;
 };
 type Options = {
-    controllers: {
-        folder: string;
-        name: RegExp;
-    };
+    folder: string;
+    name: RegExp;
     output?: string;
 };
-export declare function generateRoutes(options: Options): Promise<Route[] | undefined>;
+export declare const generateRoutes: (globalPrefix: string, options: Options) => Promise<Route[] | undefined>;
 export {};