pg-mvc-service 2.1.33 → 2.1.35
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.
- package/dist/reqestResponse/ReqResType.d.ts +1 -1
- package/dist/reqestResponse/ReqResType.d.ts.map +1 -1
- package/dist/reqestResponse/ReqResType.js +1 -1
- package/dist/reqestResponse/RequestType.d.ts +3 -1
- package/dist/reqestResponse/RequestType.d.ts.map +1 -1
- package/dist/reqestResponse/RequestType.js +43 -4
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
type PrimitiveKeyType = 'boolean' | 'date' | 'datetime' | 'time' | 'uuid' | 'mail' | 'https' | 'base64' | 'boolean?' | 'date?' | 'datetime?' | 'time?' | 'uuid?' | 'mail?' | 'https?' | 'base64?';
|
|
1
|
+
type PrimitiveKeyType = 'boolean' | 'date' | 'datetime' | 'time' | 'uuid' | 'mail' | 'https' | 'base64' | 'file' | 'boolean?' | 'date?' | 'datetime?' | 'time?' | 'uuid?' | 'mail?' | 'https?' | 'base64?' | 'file?';
|
|
2
2
|
export type PrimitiveType = {
|
|
3
3
|
type: PrimitiveKeyType;
|
|
4
4
|
description?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReqResType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/ReqResType.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GACrB,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"ReqResType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/ReqResType.ts"],"names":[],"mappings":"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"}
|
|
@@ -176,7 +176,7 @@ class ReqResType {
|
|
|
176
176
|
}
|
|
177
177
|
propertyType = propertyType.replace('?', '');
|
|
178
178
|
propertyType = propertyType.replace('number', 'integer');
|
|
179
|
-
propertyType = propertyType.replace(/datetime|date|time|uuid|mail|https|base64/g, 'string');
|
|
179
|
+
propertyType = propertyType.replace(/datetime|date|time|uuid|mail|https|base64|file/g, 'string');
|
|
180
180
|
return propertyType;
|
|
181
181
|
}
|
|
182
182
|
}
|
|
@@ -25,12 +25,14 @@ export interface ErrorMessageType {
|
|
|
25
25
|
INVALID_MAP_NUMBER: string;
|
|
26
26
|
INVALID_MAP_STRING: string;
|
|
27
27
|
INVALID_MAP_BOOL: string;
|
|
28
|
+
INVALID_FILE: string;
|
|
28
29
|
}
|
|
29
30
|
export declare class RequestType extends ReqResType {
|
|
31
|
+
protected readonly isFormRequest: boolean;
|
|
30
32
|
protected readonly language: "ja" | "en";
|
|
31
33
|
private readonly ERROR_MESSAGE_ENGLISH;
|
|
32
34
|
private readonly ERROR_MESSAGE_JAPAN;
|
|
33
|
-
protected
|
|
35
|
+
protected get ERROR_MESSAGE(): ErrorMessageType;
|
|
34
36
|
protected paramProperties: Array<(PrimitiveType | StringType | NumberType | EnumType) & {
|
|
35
37
|
key: string;
|
|
36
38
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/RequestType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,UAAU,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;AAIzG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,yBAAyB,EAAE,MAAM,CAAC;IAClC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/RequestType.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ const type_utils_n_daira_1 = require("type-utils-n-daira");
|
|
|
20
20
|
class RequestType extends ReqResType_1.default {
|
|
21
21
|
constructor() {
|
|
22
22
|
super(...arguments);
|
|
23
|
+
this.isFormRequest = false;
|
|
23
24
|
this.language = "en";
|
|
24
25
|
// *****************************************
|
|
25
26
|
// Input Error Message
|
|
@@ -50,6 +51,7 @@ class RequestType extends ReqResType_1.default {
|
|
|
50
51
|
INVALID_MAP_NUMBER: '{property} must be a valid number for a map key. ({value})',
|
|
51
52
|
INVALID_MAP_STRING: '{property} must be a valid string for a map key. ({value})',
|
|
52
53
|
INVALID_MAP_BOOL: '{property} must be a valid boolean for a map key. ({value})',
|
|
54
|
+
INVALID_FILE: '{property} must be of type File. ({value})',
|
|
53
55
|
};
|
|
54
56
|
this.ERROR_MESSAGE_JAPAN = {
|
|
55
57
|
REQUIRED: '{property}は必須項目です。',
|
|
@@ -74,10 +76,13 @@ class RequestType extends ReqResType_1.default {
|
|
|
74
76
|
INVALID_MAP_NUMBER: '{property} は有効な数値のマップキーでなければなりません。({value})',
|
|
75
77
|
INVALID_MAP_STRING: '{property} は有効な文字列のマップキーでなければなりません。({value})',
|
|
76
78
|
INVALID_MAP_BOOL: '{property} は有効なboolのマップキーでなければなりません。({value})',
|
|
79
|
+
INVALID_FILE: '{property} はファイル形式（File型）で入力してください。（{value}）',
|
|
77
80
|
};
|
|
78
|
-
this.ERROR_MESSAGE = this.language === 'ja' ? this.ERROR_MESSAGE_JAPAN : this.ERROR_MESSAGE_ENGLISH;
|
|
79
81
|
this.paramProperties = [];
|
|
80
82
|
}
|
|
83
|
+
get ERROR_MESSAGE() {
|
|
84
|
+
return this.language === 'ja' ? this.ERROR_MESSAGE_JAPAN : this.ERROR_MESSAGE_ENGLISH;
|
|
85
|
+
}
|
|
81
86
|
get paramPath() {
|
|
82
87
|
return this.paramProperties.map(property => `/{${property.key}}`).join("");
|
|
83
88
|
}
|
|
@@ -194,6 +199,8 @@ class RequestType extends ReqResType_1.default {
|
|
|
194
199
|
"DATETIME_92": this.ERROR_MESSAGE.INVALID_DATETIME,
|
|
195
200
|
"HTTPS_91": this.ERROR_MESSAGE.INVALID_HTTPS,
|
|
196
201
|
"BASE64_91": this.ERROR_MESSAGE.INVALID_BASE64,
|
|
202
|
+
"FILE_21": this.ERROR_MESSAGE.INVALID_FILE,
|
|
203
|
+
"FILE_91": this.ERROR_MESSAGE.INVALID_FILE,
|
|
197
204
|
};
|
|
198
205
|
let errorMessage = list[code];
|
|
199
206
|
const property = this.getProperty(keys);
|
|
@@ -270,8 +277,24 @@ class RequestType extends ReqResType_1.default {
|
|
|
270
277
|
}
|
|
271
278
|
}
|
|
272
279
|
else {
|
|
273
|
-
|
|
274
|
-
|
|
280
|
+
if (this.isFormRequest) {
|
|
281
|
+
const data = {}; // ループ内でthis.dataに直接入れたかったが、型エラーになるため、
|
|
282
|
+
(yield c.req.formData()).forEach((formValue, formKey) => {
|
|
283
|
+
if (formKey in data === false) {
|
|
284
|
+
data[formKey] = formValue;
|
|
285
|
+
}
|
|
286
|
+
else if (Array.isArray(data[formKey])) {
|
|
287
|
+
data[formKey].push(formValue);
|
|
288
|
+
}
|
|
289
|
+
else {
|
|
290
|
+
data[formKey] = [data[formKey], formValue];
|
|
291
|
+
}
|
|
292
|
+
});
|
|
293
|
+
this.data = data;
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
this.data = yield c.req.json();
|
|
297
|
+
}
|
|
275
298
|
}
|
|
276
299
|
}
|
|
277
300
|
if (this.data === undefined) {
|
|
@@ -329,9 +352,10 @@ class RequestType extends ReqResType_1.default {
|
|
|
329
352
|
this.setArray([key], value);
|
|
330
353
|
}
|
|
331
354
|
else {
|
|
332
|
-
if (method === 'GET' || method === 'DELETE') {
|
|
355
|
+
if (method === 'GET' || method === 'DELETE' || this.isFormRequest) {
|
|
333
356
|
// GET,DELETEメソッドの場合、?array=1&array=2で配列となるが、
|
|
334
357
|
// ?array=1のみで終わる場合は配列にならないため、直接配列にしている
|
|
358
|
+
// formDataで送信されたときも同様
|
|
335
359
|
const type = this.properties[key].item.type;
|
|
336
360
|
if (type === 'object' || type === 'object?' || type === 'array' || type === 'array?' || type === 'map' || type === 'map?') {
|
|
337
361
|
throw new Error("GETまたはDELETEメソッドでは配列型にobject, array, mapを使用することはできません。");
|
|
@@ -845,6 +869,13 @@ class RequestType extends ReqResType_1.default {
|
|
|
845
869
|
return value;
|
|
846
870
|
}
|
|
847
871
|
this.throwInputError(isRequestBody ? "BASE64_21" : "BASE64_91", keys, value);
|
|
872
|
+
case 'file':
|
|
873
|
+
case 'file?':
|
|
874
|
+
if (value instanceof File ||
|
|
875
|
+
(value && typeof value === 'object' && typeof value.name === 'string' && typeof value.size === 'number')) {
|
|
876
|
+
return value;
|
|
877
|
+
}
|
|
878
|
+
this.throwInputError(isRequestBody ? "FILE_21" : "FILE_91", keys, value);
|
|
848
879
|
}
|
|
849
880
|
return value;
|
|
850
881
|
}
|
|
@@ -1418,6 +1449,14 @@ class RequestType extends ReqResType_1.default {
|
|
|
1418
1449
|
description: this.createErrorMessage(isRequestBody ? "BASE64_21" : "BASE64_91", keys)
|
|
1419
1450
|
});
|
|
1420
1451
|
break;
|
|
1452
|
+
case 'file':
|
|
1453
|
+
case 'file?':
|
|
1454
|
+
errorList.push({
|
|
1455
|
+
status: 400,
|
|
1456
|
+
code: isRequestBody ? "FILE_21" : "FILE_91",
|
|
1457
|
+
description: this.createErrorMessage(isRequestBody ? "FILE_21" : "FILE_91", keys)
|
|
1458
|
+
});
|
|
1459
|
+
break;
|
|
1421
1460
|
}
|
|
1422
1461
|
return errorList;
|
|
1423
1462
|
}
|