gg-express 1.0.111 → 1.0.113

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/v2/GGExpressV2.d.ts +5 -10
  2. package/dist/v2/generateStaticRouteFileV2.js +1 -4
  3. package/dist/v2/output/staticRouteInterface_hotel_v2.d.ts +2 -4
  4. package/package.json +1 -1
  5. package/src/v2/GGExpressV2.ts +21 -44
  6. package/src/v2/generateStaticRouteFileV2.ts +1 -4
  7. package/src/v2/output/staticRouteInterface_hotel_v2.ts +15 -59
package/dist/v2/GGExpressV2.d.ts CHANGED
@@ -7,20 +7,15 @@ type MyRequest<M extends Method, RQ extends ConstSchemaType, PR extends Paramete
7
7
  type NonNullableObject<T> = {
8
8
  [K in keyof T]-?: NonNullable<T[K]>;
9
9
  };
10
- type MyRequestQuery<T extends ConstSchemaType, PR extends ParameterType, S extends readonly (keyof TypeResolve<T>)[] = [], P extends boolean = false> = P extends true ? Request<{}, {}, {}, {
10
+ type ResolvePartial<T extends ConstSchemaType, PR extends ParameterType, S extends readonly (keyof TypeResolve<T>)[] = [], P extends boolean = false> = P extends true ? {
11
11
  data: Partial<Omit<TypeResolve<T>, S[number]>> & NonNullableObject<Pick<TypeResolve<T>, S[number]>>;
12
12
  parameter: TypeResolve<PR>;
13
- }, {}> : Request<{}, {}, {}, {
13
+ } : {
14
14
  data: Omit<TypeResolve<T>, S[number]> & NonNullableObject<Pick<TypeResolve<T>, S[number]>>;
15
15
  parameter: TypeResolve<PR>;
16
- }, {}>;
17
- type MyRequestBody<T extends ConstSchemaType, PR extends ParameterType, S extends readonly (keyof TypeResolve<T>)[] = [], P extends boolean = false> = P extends true ? Request<{}, {}, {
18
- data: Partial<Omit<TypeResolve<T>, S[number]>> & NonNullableObject<Pick<TypeResolve<T>, S[number]>>;
19
- parameter: TypeResolve<PR>;
20
- }, {}, {}> : Request<{}, {}, {
21
- data: Omit<TypeResolve<T>, S[number]> & NonNullableObject<Pick<TypeResolve<T>, S[number]>>;
22
- parameter: TypeResolve<PR>;
23
- }, {}, {}>;
16
+ };
17
+ type MyRequestQuery<T extends ConstSchemaType, PR extends ParameterType, S extends readonly (keyof TypeResolve<T>)[] = [], P extends boolean = false> = P extends true ? Request<{}, {}, {}, ResolvePartial<T, PR, S, P>, {}> : Request<{}, {}, {}, ResolvePartial<T, PR, S, P>, {}>;
18
+ type MyRequestBody<T extends ConstSchemaType, PR extends ParameterType, S extends readonly (keyof TypeResolve<T>)[] = [], P extends boolean = false> = P extends true ? Request<{}, {}, ResolvePartial<T, PR, S, P>, {}, {}> : Request<{}, {}, ResolvePartial<T, PR, S, P>, {}, {}>;
24
19
  type SuccessResponse<T extends ConstSchemaType> = {
25
20
  status: "SUCCESS";
26
21
  message: string;
package/dist/v2/generateStaticRouteFileV2.js CHANGED
@@ -17,7 +17,7 @@ function extract(allData, prepareRoute) {
17
17
  prepareRoute[route.method][route.url] = {
18
18
  requireParams: parentInputToCode(route.requireParams, route.isPartialRequireParam),
19
19
  parameter: route.parameter
20
- ? parentInputToCode({ data: route.parameter }, false)
20
+ ? parentInputToCode(route.parameter, false)
21
21
  : "never",
22
22
  responseStructure: parentInputToCode(route.responseStructure, false),
23
23
  isPartial: route.isPartialRequireParam,
@@ -27,9 +27,6 @@ function extract(allData, prepareRoute) {
27
27
  }
28
28
  function parentInputToCode(data, isPartialRequireParam) {
29
29
  const recursiveExtract = (target, parentKeyName) => {
30
- console.log("parentKeyName :", parentKeyName);
31
- console.log("target :", target);
32
- console.log("-------");
33
30
  const getParentKeyCode = (parentKeyName) => {
34
31
  if (isPartialRequireParam === true)
35
32
  return `${parentKeyName}?`;
package/dist/v2/output/staticRouteInterface_hotel_v2.d.ts CHANGED
@@ -24,10 +24,8 @@ export interface staticRouteInterface_hotel_v2 {
24
24
  note?: string | undefined | null;
25
25
  };
26
26
  parameter: {
27
- data: {
28
- xx: boolean;
29
- data: string[];
30
- };
27
+ xx: boolean;
28
+ data: (string)[];
31
29
  };
32
30
  };
33
31
  responseStructure: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gg-express",
3
- "version": "1.0.111",
3
+ "version": "1.0.113",
4
4
  "description": "",
5
5
  "main": "dist/main.js",
6
6
  "scripts": {
package/src/v2/GGExpressV2.ts CHANGED
@@ -27,34 +27,31 @@ type MyRequest<
27
27
  type NonNullableObject<T> = {
28
28
  [K in keyof T]-?: NonNullable<T[K]>
29
29
  }
30
+ type ResolvePartial<
31
+ T extends ConstSchemaType,
32
+ PR extends ParameterType,
33
+ S extends readonly (keyof TypeResolve<T>)[] = [],
34
+ P extends boolean = false
35
+ > = P extends true
36
+ ? {
37
+ data: Partial<Omit<TypeResolve<T>, S[number]>> &
38
+ NonNullableObject<Pick<TypeResolve<T>, S[number]>>
39
+ parameter: TypeResolve<PR>
40
+ }
41
+ : {
42
+ data: Omit<TypeResolve<T>, S[number]> &
43
+ NonNullableObject<Pick<TypeResolve<T>, S[number]>>
44
+ parameter: TypeResolve<PR>
45
+ }
46
+
30
47
  type MyRequestQuery<
31
48
  T extends ConstSchemaType,
32
49
  PR extends ParameterType,
33
50
  S extends readonly (keyof TypeResolve<T>)[] = [],
34
51
  P extends boolean = false
35
52
  > = P extends true
36
- ? Request<
37
- {},
38
- {},
39
- {},
40
- {
41
- data: Partial<Omit<TypeResolve<T>, S[number]>> &
42
- NonNullableObject<Pick<TypeResolve<T>, S[number]>>
43
- parameter: TypeResolve<PR>
44
- },
45
- {}
46
- >
47
- : Request<
48
- {},
49
- {},
50
- {},
51
- {
52
- data: Omit<TypeResolve<T>, S[number]> &
53
- NonNullableObject<Pick<TypeResolve<T>, S[number]>>
54
- parameter: TypeResolve<PR>
55
- },
56
- {}
57
- >
53
+ ? Request<{}, {}, {}, ResolvePartial<T, PR, S, P>, {}>
54
+ : Request<{}, {}, {}, ResolvePartial<T, PR, S, P>, {}>
58
55
 
59
56
  type MyRequestBody<
60
57
  T extends ConstSchemaType,
@@ -62,28 +59,8 @@ type MyRequestBody<
62
59
  S extends readonly (keyof TypeResolve<T>)[] = [],
63
60
  P extends boolean = false
64
61
  > = P extends true
65
- ? Request<
66
- {},
67
- {},
68
- {
69
- data: Partial<Omit<TypeResolve<T>, S[number]>> &
70
- NonNullableObject<Pick<TypeResolve<T>, S[number]>>
71
- parameter: TypeResolve<PR>
72
- },
73
- {},
74
- {}
75
- >
76
- : Request<
77
- {},
78
- {},
79
- {
80
- data: Omit<TypeResolve<T>, S[number]> &
81
- NonNullableObject<Pick<TypeResolve<T>, S[number]>>
82
- parameter: TypeResolve<PR>
83
- },
84
- {},
85
- {}
86
- >
62
+ ? Request<{}, {}, ResolvePartial<T, PR, S, P>, {}, {}>
63
+ : Request<{}, {}, ResolvePartial<T, PR, S, P>, {}, {}>
87
64
 
88
65
  type SuccessResponse<T extends ConstSchemaType> = {
89
66
  status: "SUCCESS"
package/src/v2/generateStaticRouteFileV2.ts CHANGED
@@ -41,7 +41,7 @@ function extract(
41
41
  route.isPartialRequireParam
42
42
  ),
43
43
  parameter: route.parameter
44
- ? parentInputToCode({ data: route.parameter }, false)
44
+ ? parentInputToCode(route.parameter, false)
45
45
  : "never",
46
46
  responseStructure: parentInputToCode(route.responseStructure, false),
47
47
  isPartial: route.isPartialRequireParam,
@@ -56,9 +56,6 @@ function parentInputToCode(
56
56
  isPartialRequireParam: boolean
57
57
  ) {
58
58
  const recursiveExtract = (target: ConstSchemaType, parentKeyName: string) => {
59
- console.log("parentKeyName :", parentKeyName)
60
- console.log("target :", target)
61
- console.log("-------")
62
59
  const getParentKeyCode = (parentKeyName: string) => {
63
60
  if (isPartialRequireParam === true) return `${parentKeyName}?`
64
61
  else return parentKeyName
package/src/v2/output/staticRouteInterface_hotel_v2.ts CHANGED
@@ -1,60 +1,16 @@
1
- export interface staticRouteInterface_hotel_v2 {
2
- get: {
3
- "/api/v2/hotel/users/id": {
4
- requireParams: {
5
- data: {
6
- id: number
7
- bookingGroupID: number
8
- checkInDate: string
9
- checkOutDate: string
10
- checkInTime: string
11
- checkOutTime: string
12
- roomRate: number
13
- extraBedRate: number
14
- roomNumber?: string | undefined | null
15
- editTime: string
16
- createTime: string
17
- shiftDate: string
18
- shiftName: string | null
19
- userName: string
20
- bookingStatus: "ACTIVE" | "CLOSE" | "CANCEL" | "NO_SHOW"
21
- is_specificRoom: number
22
- guestCount: number
23
- reasonToCancel: string
24
- note?: string | undefined | null
25
- }
26
- parameter: {
27
- data: { xx: boolean; data: string[] }
28
- }
29
- }
30
- responseStructure: {
31
- data: {
32
- id: number
33
- bookingGroupID: number
34
- checkInDate: string
35
- checkOutDate: string
36
- checkInTime: string
37
- checkOutTime: string
38
- roomRate: number
39
- extraBedRate: number
40
- roomNumber?: string | undefined | null
41
- editTime: string
42
- createTime: string
43
- shiftDate: string
44
- shiftName: string | null
45
- userName: string
46
- bookingStatus: "ACTIVE" | "CLOSE" | "CANCEL" | "NO_SHOW"
47
- is_specificRoom: number
48
- guestCount: number
49
- reasonToCancel: string
50
- note?: string | undefined | null
51
- }[]
52
- status: "SUCCESS" | "ERROR"
53
- message: string
54
- }
55
- }
1
+
2
+ export interface staticRouteInterface_hotel_v2 {
3
+ get : {
4
+ "/api/v2/hotel/users/id" : {
5
+ requireParams : { data: { id : number,bookingGroupID : number,checkInDate : string,checkOutDate : string,checkInTime : string,checkOutTime : string,roomRate : number,extraBedRate : number,roomNumber? : string | undefined | null,editTime : string,createTime : string,shiftDate : string,shiftName : string | null,userName : string,bookingStatus : "ACTIVE" | "CLOSE" | "CANCEL" | "NO_SHOW" ,is_specificRoom : number,guestCount : number,reasonToCancel : string,note? : string | undefined | null } , parameter : { xx : boolean,data : (string)[] } },
6
+ responseStructure : {
7
+ data : { id : number,bookingGroupID : number,checkInDate : string,checkOutDate : string,checkInTime : string,checkOutTime : string,roomRate : number,extraBedRate : number,roomNumber? : string | undefined | null,editTime : string,createTime : string,shiftDate : string,shiftName : string | null,userName : string,bookingStatus : "ACTIVE" | "CLOSE" | "CANCEL" | "NO_SHOW" ,is_specificRoom : number,guestCount : number,reasonToCancel : string,note? : string | undefined | null } [] ,
8
+ status: "SUCCESS" | "ERROR",
9
+ message: string
10
+ }
11
+ } },
12
+ post : { },
13
+ put : { },
14
+ delete : { },
56
15
  }
57
- post: {}
58
- put: {}
59
- delete: {}
60
- }
16
+