Merge pull request #239 from frouriojs/define-methods

solufa · web-flow · commit d4a0a463c78e · 2023-08-04T04:02:32.000+09:00
feat: upgrade aspida and use DefineMethods helper for template
diff --git a/servers/all/api/empty/noEmpty/index.ts b/servers/all/api/empty/noEmpty/index.ts
@@ -1,5 +1,7 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     resBody: string;
   };
-};
+}>;
diff --git a/servers/all/api/index.ts b/servers/all/api/index.ts
@@ -1,5 +1,5 @@
-import { DefineMethods } from 'aspida';
-import { Body, Query } from 'validators';
+import type { DefineMethods } from 'aspida';
+import type { Body, Query } from 'validators';
 
 export type Methods = DefineMethods<{
   get: {
diff --git a/servers/all/api/texts/_label@string/index.ts b/servers/all/api/texts/_label@string/index.ts
@@ -1,5 +1,7 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     resBody: string;
   };
-};
+}>;
diff --git a/servers/all/api/texts/index.ts b/servers/all/api/texts/index.ts
@@ -1,4 +1,4 @@
-import { DefineMethods } from 'aspida';
+import type { DefineMethods } from 'aspida';
 
 export type Methods = DefineMethods<{
   get: {
diff --git a/servers/all/api/users/_userId@number/_name/index.ts b/servers/all/api/users/_userId@number/_name/index.ts
@@ -1,5 +1,7 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     resBody: string;
   };
-};
+}>;
diff --git a/servers/all/api/users/index.ts b/servers/all/api/users/index.ts
@@ -1,5 +1,5 @@
-import { DefineMethods } from 'aspida';
-import { UserInfo } from 'validators';
+import type { DefineMethods } from 'aspida';
+import type { UserInfo } from 'validators';
 
 export type Methods = DefineMethods<{
   get: {
diff --git a/servers/minimum/api/index.ts b/servers/minimum/api/index.ts
@@ -1,7 +1,9 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     resBody: {
       hello: string;
     };
   };
-};
+}>;
diff --git a/servers/noMulter/api/empty/index.ts b/servers/noMulter/api/empty/index.ts
@@ -1 +1,3 @@
-export type Methods = {};
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{}>;
diff --git a/servers/noMulter/api/empty/noEmpty/index.ts b/servers/noMulter/api/empty/noEmpty/index.ts
@@ -1,5 +1,7 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     resBody: string;
   };
-};
+}>;
diff --git a/servers/noMulter/api/index.ts b/servers/noMulter/api/index.ts
@@ -1,6 +1,7 @@
-import { Body, Query } from '../validators';
+import type { DefineMethods } from 'aspida';
+import type { Body, Query } from '../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   get: {
     query?: Query;
     status: 200;
@@ -16,4 +17,4 @@ export type Methods = {
       port: string;
     };
   };
-};
+}>;
diff --git a/servers/noMulter/api/texts/sample/index.ts b/servers/noMulter/api/texts/sample/index.ts
@@ -1,4 +1,6 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   put: {
     reqBody: {
       id: string;
@@ -7,4 +9,4 @@ export type Methods = {
       id: string;
     } | null;
   };
-};
+}>;
diff --git a/servers/noMulter/api/users/index.ts b/servers/noMulter/api/users/index.ts
@@ -1,11 +1,12 @@
-import { UserInfo } from '../../validators';
+import type { DefineMethods } from 'aspida';
+import type { UserInfo } from '../../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   get: {
     resBody: UserInfo[];
   };
 
   post: {
     reqBody: UserInfo;
   };
-};
+}>;
diff --git a/servers/noTypedParams/api/empty/index.ts b/servers/noTypedParams/api/empty/index.ts
@@ -1 +1,3 @@
-export type Methods = {};
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{}>;
diff --git a/servers/noTypedParams/api/empty/noEmpty/index.ts b/servers/noTypedParams/api/empty/noEmpty/index.ts
@@ -1,5 +1,7 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     resBody: string;
   };
-};
+}>;
diff --git a/servers/noTypedParams/api/index.ts b/servers/noTypedParams/api/index.ts
@@ -1,6 +1,7 @@
-import { Body, Query } from '../validators';
+import type { DefineMethods } from 'aspida';
+import type { Body, Query } from '../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   get: {
     query?: Query;
     status: 200;
@@ -18,4 +19,4 @@ export type Methods = {
       fileName: string;
     };
   };
-};
+}>;
diff --git a/servers/noTypedParams/api/multiForm/index.ts b/servers/noTypedParams/api/multiForm/index.ts
@@ -1,6 +1,7 @@
-import { MultiForm } from '../../validators';
+import type { DefineMethods } from 'aspida';
+import type { MultiForm } from '../../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   post: {
     reqFormat: FormData;
     reqBody: MultiForm;
@@ -12,4 +13,4 @@ export type Methods = {
       files: number;
     };
   };
-};
+}>;
diff --git a/servers/noTypedParams/api/texts/index.ts b/servers/noTypedParams/api/texts/index.ts
@@ -1,4 +1,6 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   get: {
     query: {
       val: string;
@@ -7,4 +9,4 @@ export type Methods = {
   };
 
   put: {};
-};
+}>;
diff --git a/servers/noTypedParams/api/texts/sample/index.ts b/servers/noTypedParams/api/texts/sample/index.ts
@@ -1,4 +1,6 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   put: {
     reqBody: {
       id: string;
@@ -7,4 +9,4 @@ export type Methods = {
       id: string;
     } | null;
   };
-};
+}>;
diff --git a/servers/noTypedParams/api/users/index.ts b/servers/noTypedParams/api/users/index.ts
@@ -1,11 +1,12 @@
-import { UserInfo } from '../../validators';
+import type { DefineMethods } from 'aspida';
+import type { UserInfo } from '../../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   get: {
     resBody: UserInfo[];
   };
 
   post: {
     reqBody: UserInfo;
   };
-};
+}>;
diff --git a/servers/noValidator/api/index.ts b/servers/noValidator/api/index.ts
@@ -1,6 +1,7 @@
-import { Body, Query } from '../validators';
+import type { DefineMethods } from 'aspida';
+import type { Body, Query } from '../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   get: {
     query?: Query;
     status: 200;
@@ -18,4 +19,4 @@ export type Methods = {
       fileName: string;
     };
   };
-};
+}>;
diff --git a/servers/noValidator/api/multiForm/index.ts b/servers/noValidator/api/multiForm/index.ts
@@ -1,6 +1,7 @@
-import { MultiForm } from '../../validators';
+import type { DefineMethods } from 'aspida';
+import type { MultiForm } from '../../validators';
 
-export type Methods = {
+export type Methods = DefineMethods<{
   post: {
     reqFormat: FormData;
     reqBody: MultiForm;
@@ -12,4 +13,4 @@ export type Methods = {
       files: number;
     };
   };
-};
+}>;
diff --git a/servers/noValidator/api/texts/sample/index.ts b/servers/noValidator/api/texts/sample/index.ts
@@ -1,4 +1,6 @@
-export type Methods = {
+import type { DefineMethods } from 'aspida';
+
+export type Methods = DefineMethods<{
   put: {
     reqBody: {
       id: string;
@@ -7,4 +9,4 @@ export type Methods = {
       id: string;
     } | null;
   };
-};
+}>;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DefineMethods } from 'aspida';`
	`1`	`+import type { DefineMethods } from 'aspida';`
`2`	`2`
`3`	`3`	`export type Methods = DefineMethods<{`
`4`	`4`	`get: {`