pg-mvc-service 2.1.14 → 2.1.16
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/Service.d.ts +16 -1
- package/dist/Service.d.ts.map +1 -1
- package/dist/Service.js +61 -1
- package/dist/models/TableDoc.d.ts.map +1 -1
- package/dist/models/TableDoc.js +27 -11
- package/dist/models/TableModel.d.ts.map +1 -1
- package/dist/models/TableModel.js +33 -2
- package/dist/models/Type.d.ts +16 -3
- package/dist/models/Type.d.ts.map +1 -1
- package/dist/models/Utils/MessageUtil.d.ts +1 -1
- package/dist/models/Utils/MessageUtil.d.ts.map +1 -1
- package/dist/models/Utils/MessageUtil.js +6 -0
- package/dist/reqestResponse/RequestType.d.ts +0 -3
- package/dist/reqestResponse/RequestType.d.ts.map +1 -1
- package/dist/reqestResponse/RequestType.js +2 -22
- package/package.json +1 -1
package/dist/Service.d.ts
CHANGED
|
@@ -42,7 +42,6 @@ export declare class Service<IEnv extends IServiceEnv = IServiceEnv> {
|
|
|
42
42
|
get ApiUserAvailable(): string;
|
|
43
43
|
protected readonly request: RequestType;
|
|
44
44
|
get Request(): RequestType;
|
|
45
|
-
get AuthToken(): string;
|
|
46
45
|
protected readonly response: ResponseType;
|
|
47
46
|
get Response(): ResponseType;
|
|
48
47
|
protected readonly tags: Array<string>;
|
|
@@ -56,6 +55,22 @@ export declare class Service<IEnv extends IServiceEnv = IServiceEnv> {
|
|
|
56
55
|
private readonly c?;
|
|
57
56
|
protected get C(): Context;
|
|
58
57
|
get Module(): 'express' | 'hono';
|
|
58
|
+
protected get Headers(): Record<string, string | string[] | undefined>;
|
|
59
|
+
protected getHeader(key: string): string | undefined;
|
|
60
|
+
protected setCookie(key: string, value: string, options?: {
|
|
61
|
+
httpOnly?: boolean;
|
|
62
|
+
secure?: boolean;
|
|
63
|
+
sameSite?: 'strict' | 'lax' | 'none';
|
|
64
|
+
maxAge?: number;
|
|
65
|
+
path?: string;
|
|
66
|
+
domain?: string;
|
|
67
|
+
expires?: Date;
|
|
68
|
+
}): void;
|
|
69
|
+
protected getCookie(key: string): string | undefined;
|
|
70
|
+
protected removeCookie(key: string, options?: {
|
|
71
|
+
path?: string;
|
|
72
|
+
domain?: string;
|
|
73
|
+
}): void;
|
|
59
74
|
get Env(): IEnv;
|
|
60
75
|
constructor(request: Request, response: Response);
|
|
61
76
|
constructor(c: Context);
|
package/dist/Service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../src/Service.ts"],"names":[],"mappings":"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"}
|
package/dist/Service.js
CHANGED
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.Service = void 0;
|
|
16
16
|
const axios_1 = __importDefault(require("axios"));
|
|
17
|
+
const cookie_1 = require("hono/cookie");
|
|
17
18
|
const Exception_1 = require("./exceptions/Exception");
|
|
18
19
|
const RequestType_1 = require("./reqestResponse/RequestType");
|
|
19
20
|
const ResponseType_1 = require("./reqestResponse/ResponseType");
|
|
@@ -29,7 +30,6 @@ class Service {
|
|
|
29
30
|
get ApiUserAvailable() { return this.apiUserAvailable; }
|
|
30
31
|
get Request() { return this.request; }
|
|
31
32
|
; // swaggerで必要なので、ここだけ宣言
|
|
32
|
-
get AuthToken() { var _a; return (_a = this.request.Authorization) !== null && _a !== void 0 ? _a : ''; }
|
|
33
33
|
get Response() { return this.response; }
|
|
34
34
|
; // swaggerで必要なので、ここだけ宣言
|
|
35
35
|
get Tags() { return this.tags; }
|
|
@@ -68,6 +68,66 @@ class Service {
|
|
|
68
68
|
throw new Error('Failed to determine whether the module is "express" or "hono".');
|
|
69
69
|
}
|
|
70
70
|
;
|
|
71
|
+
get Headers() {
|
|
72
|
+
if (this.Module === 'express') {
|
|
73
|
+
return this.Req.headers;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
return this.C.req.header();
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
getHeader(key) {
|
|
80
|
+
if (this.Module === 'express') {
|
|
81
|
+
// Expressの場合
|
|
82
|
+
const value = this.Req.header(key);
|
|
83
|
+
return Array.isArray(value) ? value[0] : value;
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
// Honoの場合
|
|
87
|
+
return this.C.req.header(key);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
setCookie(key, value, options) {
|
|
91
|
+
var _a, _b, _c, _d;
|
|
92
|
+
const config = {
|
|
93
|
+
httpOnly: (_a = options === null || options === void 0 ? void 0 : options.httpOnly) !== null && _a !== void 0 ? _a : true,
|
|
94
|
+
secure: (_b = options === null || options === void 0 ? void 0 : options.secure) !== null && _b !== void 0 ? _b : true,
|
|
95
|
+
sameSite: (_c = options === null || options === void 0 ? void 0 : options.sameSite) !== null && _c !== void 0 ? _c : 'strict',
|
|
96
|
+
maxAge: options === null || options === void 0 ? void 0 : options.maxAge,
|
|
97
|
+
path: (_d = options === null || options === void 0 ? void 0 : options.path) !== null && _d !== void 0 ? _d : '/',
|
|
98
|
+
domain: options === null || options === void 0 ? void 0 : options.domain,
|
|
99
|
+
expires: options === null || options === void 0 ? void 0 : options.expires,
|
|
100
|
+
};
|
|
101
|
+
if (this.Module === 'express') {
|
|
102
|
+
this.Res.cookie(key, value, config);
|
|
103
|
+
}
|
|
104
|
+
else if (this.Module === 'hono') {
|
|
105
|
+
(0, cookie_1.setCookie)(this.C, key, value, Object.assign(Object.assign({}, config), {
|
|
106
|
+
// HonoのmaxAgeは秒単位なので変換
|
|
107
|
+
maxAge: (options === null || options === void 0 ? void 0 : options.maxAge) !== undefined ? options.maxAge / 1000 : undefined,
|
|
108
|
+
// HonoのsameSiteはPascalCase（Strict等）
|
|
109
|
+
sameSite: (config.sameSite.charAt(0).toUpperCase() + config.sameSite.slice(1)) }));
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
getCookie(key) {
|
|
113
|
+
if (this.Module === 'express') {
|
|
114
|
+
return this.Req.cookies[key];
|
|
115
|
+
}
|
|
116
|
+
else if (this.Module === 'hono') {
|
|
117
|
+
return (0, cookie_1.getCookie)(this.C, key);
|
|
118
|
+
}
|
|
119
|
+
return undefined;
|
|
120
|
+
}
|
|
121
|
+
removeCookie(key, options) {
|
|
122
|
+
if (this.Module === 'express') {
|
|
123
|
+
// Expressの場合
|
|
124
|
+
this.Res.clearCookie(key, options);
|
|
125
|
+
}
|
|
126
|
+
else if (this.Module === 'hono') {
|
|
127
|
+
// Honoの場合
|
|
128
|
+
(0, cookie_1.deleteCookie)(this.C, key, options);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
71
131
|
get Env() {
|
|
72
132
|
if (this.Module === 'express') {
|
|
73
133
|
return process.env;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableDoc.d.ts","sourceRoot":"","sources":["../../src/models/TableDoc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAO,MAAM,cAAc,GAAI,QAAQ,KAAK,CAAC,UAAU,CAAC,EAAE,cAAc,MAAM,
|
|
1
|
+
{"version":3,"file":"TableDoc.d.ts","sourceRoot":"","sources":["../../src/models/TableDoc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAO,MAAM,cAAc,GAAI,QAAQ,KAAK,CAAC,UAAU,CAAC,EAAE,cAAc,MAAM,WAsV7E,CAAA"}
|
package/dist/models/TableDoc.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createTableDoc = void 0;
|
|
4
4
|
const createTableDoc = (models, serviceName) => {
|
|
5
|
-
var _a, _b, _c
|
|
5
|
+
var _a, _b, _c;
|
|
6
6
|
let html = `
|
|
7
7
|
<!DOCTYPE html>
|
|
8
8
|
<html lang="ja">
|
|
@@ -177,28 +177,33 @@ td:nth-child(6) {
|
|
|
177
177
|
width: 40px;
|
|
178
178
|
}
|
|
179
179
|
|
|
180
|
-
/*
|
|
180
|
+
/* validation */
|
|
181
181
|
td:nth-child(7) {
|
|
182
|
+
width: 120px;
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
/* nullable */
|
|
186
|
+
td:nth-child(8) {
|
|
182
187
|
width: 40px;
|
|
183
188
|
}
|
|
184
189
|
|
|
185
190
|
/* default */
|
|
186
|
-
td:nth-child(
|
|
191
|
+
td:nth-child(9) {
|
|
187
192
|
width: 120px;
|
|
188
193
|
}
|
|
189
194
|
|
|
190
195
|
/* Foreign Key */
|
|
191
|
-
td:nth-child(
|
|
196
|
+
td:nth-child(10) {
|
|
192
197
|
width: 300px;
|
|
193
198
|
}
|
|
194
199
|
|
|
195
200
|
/* comment */
|
|
196
|
-
td:nth-child(
|
|
201
|
+
td:nth-child(11) {
|
|
197
202
|
width: auto;
|
|
198
203
|
}
|
|
199
204
|
|
|
200
205
|
/* function */
|
|
201
|
-
td:nth-child(
|
|
206
|
+
td:nth-child(12) {
|
|
202
207
|
width: auto;
|
|
203
208
|
}
|
|
204
209
|
</style>
|
|
@@ -226,7 +231,7 @@ td:nth-child(11) {
|
|
|
226
231
|
<div class="table-title-left">${model.Id !== "" ? `[${model.Id}] ` : ""}${model.TableName} ${model.TableDescription !== '' ? ` : ${model.TableDescription}` : ''}</div>
|
|
227
232
|
<button class="table-title-right" onclick="${createFuncName}()">Copy Create Query</button>
|
|
228
233
|
</div>
|
|
229
|
-
<div class="comment-wrapper">${model.Comment.replace(
|
|
234
|
+
<div class="comment-wrapper">${model.Comment.replace(/\n/g, '<br>')}</div>
|
|
230
235
|
|
|
231
236
|
<table>
|
|
232
237
|
<tr>
|
|
@@ -236,6 +241,7 @@ td:nth-child(11) {
|
|
|
236
241
|
<th>alias</th>
|
|
237
242
|
<th>type</th>
|
|
238
243
|
<th>length</th>
|
|
244
|
+
<th>validation</th>
|
|
239
245
|
<th>nullable</th>
|
|
240
246
|
<th>default</th>
|
|
241
247
|
<th>foreign key</th>
|
|
@@ -265,11 +271,21 @@ td:nth-child(11) {
|
|
|
265
271
|
<td>${keyColName}</td>
|
|
266
272
|
<td>${(_a = column.alias) !== null && _a !== void 0 ? _a : keyColName}</td>
|
|
267
273
|
<td>${column.type}</td>
|
|
268
|
-
<td>${
|
|
274
|
+
<td>${'length' in column ? column.length : ''}</td>
|
|
275
|
+
<td>${(() => {
|
|
276
|
+
const v = [];
|
|
277
|
+
if ('min' in column && column.min !== undefined)
|
|
278
|
+
v.push(`min: ${column.min}`);
|
|
279
|
+
if ('max' in column && column.max !== undefined)
|
|
280
|
+
v.push(`max: ${column.max}`);
|
|
281
|
+
if ('regExp' in column && column.regExp !== undefined)
|
|
282
|
+
v.push(`regexp: ${column.regExp}`);
|
|
283
|
+
return v.join('<br>');
|
|
284
|
+
})()}</td>
|
|
269
285
|
<td>${column.attribute === 'nullable' ? 'nullable' : ''}</td>
|
|
270
|
-
<td>${column.attribute === 'hasDefault' ? (
|
|
286
|
+
<td>${column.attribute === 'hasDefault' ? (_b = column.default) !== null && _b !== void 0 ? _b : '???' : ''}</td>
|
|
271
287
|
<td>${references.length === 0 ? '' : references.join('<br>')}</td>
|
|
272
|
-
<td>${((
|
|
288
|
+
<td>${((_c = column.comment) !== null && _c !== void 0 ? _c : '').replace(/\n/g, '<br>')}</td>
|
|
273
289
|
<td>
|
|
274
290
|
${column.attribute === "primary" ? `` : `
|
|
275
291
|
<button onclick="${addFuncName}()">Copy add column</button><br>
|
|
@@ -338,7 +354,7 @@ function toColumnType(column) {
|
|
|
338
354
|
return column.type.replace('real', 'REAL');
|
|
339
355
|
}
|
|
340
356
|
else if (column.type.startsWith('string')) {
|
|
341
|
-
return column.type.replace('string', `VARCHAR(${column.length})`);
|
|
357
|
+
return column.type.replace('string', `VARCHAR(${'length' in column ? column.length : '???'})`);
|
|
342
358
|
}
|
|
343
359
|
else if (column.type.startsWith('timestamp')) {
|
|
344
360
|
return column.type.replace('timestamp', 'TIMESTAMP');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -380,7 +380,7 @@ class TableModel {
|
|
|
380
380
|
});
|
|
381
381
|
}
|
|
382
382
|
throwException(code, type, columnName, value) {
|
|
383
|
-
var _a;
|
|
383
|
+
var _a, _b, _c;
|
|
384
384
|
const column = this.getColumn(columnName);
|
|
385
385
|
let message = this.errorMessages[type];
|
|
386
386
|
const name = (column.alias === undefined || column.alias === '') ? columnName : column.alias;
|
|
@@ -388,6 +388,12 @@ class TableModel {
|
|
|
388
388
|
if (message.includes("{length}") && (column.type === 'string' || column.type === 'string[]')) {
|
|
389
389
|
message = message.replace('{length}', ((_a = column.length) !== null && _a !== void 0 ? _a : '未設定').toString());
|
|
390
390
|
}
|
|
391
|
+
if (message.includes("{min}") && (column.type === 'integer' || column.type === 'integer[]')) {
|
|
392
|
+
message = message.replace('{min}', ((_b = column.min) !== null && _b !== void 0 ? _b : '').toString());
|
|
393
|
+
}
|
|
394
|
+
if (message.includes("{max}") && (column.type === 'integer' || column.type === 'integer[]')) {
|
|
395
|
+
message = message.replace('{max}', ((_c = column.max) !== null && _c !== void 0 ? _c : '').toString());
|
|
396
|
+
}
|
|
391
397
|
this.throwUnprocessableException(code, message);
|
|
392
398
|
}
|
|
393
399
|
throwDbCoflictException(code, message) {
|
|
@@ -425,6 +431,9 @@ class TableModel {
|
|
|
425
431
|
if (value.toString().length > column.length) {
|
|
426
432
|
this.throwException("003", "length", key, value);
|
|
427
433
|
}
|
|
434
|
+
if (column.regExp !== undefined && column.regExp.test(value) === false) {
|
|
435
|
+
this.throwException("008", "regExp", key, value);
|
|
436
|
+
}
|
|
428
437
|
}
|
|
429
438
|
else if (column.type === 'string[]') {
|
|
430
439
|
if (Number.isInteger(column.length) === false) {
|
|
@@ -433,7 +442,29 @@ class TableModel {
|
|
|
433
442
|
// ValidateValueUtil.isErrorValue(column.type, value)で型チェックしてるのでas []にしている
|
|
434
443
|
for (const v of value) {
|
|
435
444
|
if (v.toString().length > column.length) {
|
|
436
|
-
this.throwException("004", "length", key,
|
|
445
|
+
this.throwException("004", "length", key, v);
|
|
446
|
+
}
|
|
447
|
+
if (column.regExp !== undefined && column.regExp.test(v.toString()) === false) {
|
|
448
|
+
this.throwException("009", "regExp", key, v);
|
|
449
|
+
}
|
|
450
|
+
}
|
|
451
|
+
}
|
|
452
|
+
else if (column.type === 'integer') {
|
|
453
|
+
if (column.min !== undefined && column.min > Number(value)) {
|
|
454
|
+
this.throwException("010", "min", key, value);
|
|
455
|
+
}
|
|
456
|
+
if (column.max !== undefined && column.max < Number(value)) {
|
|
457
|
+
this.throwException("011", "max", key, value);
|
|
458
|
+
}
|
|
459
|
+
}
|
|
460
|
+
else if (column.type === 'integer[]') {
|
|
461
|
+
// ValidateValueUtil.isErrorValue(column.type, value)で型チェックしてるのでas []にしている
|
|
462
|
+
for (const v of value) {
|
|
463
|
+
if (column.min !== undefined && column.min > Number(v)) {
|
|
464
|
+
this.throwException("010", "min", key, v);
|
|
465
|
+
}
|
|
466
|
+
if (column.max !== undefined && column.max < Number(v)) {
|
|
467
|
+
this.throwException("011", "max", key, v);
|
|
437
468
|
}
|
|
438
469
|
}
|
|
439
470
|
}
|
package/dist/models/Type.d.ts
CHANGED
|
@@ -12,6 +12,12 @@ type TColumnBase = {
|
|
|
12
12
|
type TStringColumn = TColumnBase & {
|
|
13
13
|
type: "string";
|
|
14
14
|
length: number;
|
|
15
|
+
regExp?: RegExp;
|
|
16
|
+
};
|
|
17
|
+
type TIntegerColumn = TColumnBase & {
|
|
18
|
+
type: "integer";
|
|
19
|
+
max?: number;
|
|
20
|
+
min?: number;
|
|
15
21
|
};
|
|
16
22
|
type TJsonColumn = TColumnBase & {
|
|
17
23
|
type: "json" | "jsonb";
|
|
@@ -19,20 +25,27 @@ type TJsonColumn = TColumnBase & {
|
|
|
19
25
|
attribute: Exclude<TColumnAttribute, "primary">;
|
|
20
26
|
};
|
|
21
27
|
type TBasicColumn = TColumnBase & {
|
|
22
|
-
type: Exclude<TColumnType, "string">;
|
|
28
|
+
type: Exclude<TColumnType, "string" | "integer">;
|
|
23
29
|
length?: undefined;
|
|
24
30
|
};
|
|
25
31
|
type TStringArrayColumn = TColumnBase & {
|
|
26
32
|
type: "string[]";
|
|
27
33
|
length: number;
|
|
34
|
+
regExp?: RegExp;
|
|
35
|
+
attribute: Exclude<TColumnAttribute, "primary">;
|
|
36
|
+
};
|
|
37
|
+
type TIntegerArrayColumn = TColumnBase & {
|
|
38
|
+
type: "integer[]";
|
|
39
|
+
max?: number;
|
|
40
|
+
min?: number;
|
|
28
41
|
attribute: Exclude<TColumnAttribute, "primary">;
|
|
29
42
|
};
|
|
30
43
|
type TArrayColumn = TColumnBase & {
|
|
31
|
-
type: Exclude<TColumnArrayType, "string[]">;
|
|
44
|
+
type: Exclude<TColumnArrayType, "string[]" | "integer[]">;
|
|
32
45
|
length?: undefined;
|
|
33
46
|
attribute: Exclude<TColumnAttribute, "primary">;
|
|
34
47
|
};
|
|
35
|
-
export type TColumn = TStringColumn | TJsonColumn | TBasicColumn | TStringArrayColumn | TArrayColumn;
|
|
48
|
+
export type TColumn = TStringColumn | TIntegerColumn | TJsonColumn | TBasicColumn | TStringArrayColumn | TIntegerArrayColumn | TArrayColumn;
|
|
36
49
|
export type TColumnDetail = TColumn & {
|
|
37
50
|
columnName: string;
|
|
38
51
|
tableName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Type.d.ts","sourceRoot":"","sources":["../../src/models/Type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,WAAW,CAAC;AACnF,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAI,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAC9H,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAI,QAAQ,GAAG,QAAQ,GAAG,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AACvJ,KAAK,WAAW,GAAG;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC;IACrC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC;AAEF,KAAK,aAAa,GAAG,WAAW,GAAG;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Type.d.ts","sourceRoot":"","sources":["../../src/models/Type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TColumnArrayType, TColumnType } from "../Type";
|
|
2
|
-
export type TOptionErrorMessage = Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'find', string>;
|
|
2
|
+
export type TOptionErrorMessage = Record<TColumnType | TColumnArrayType | 'length' | 'regExp' | 'min' | 'max' | 'null' | 'notInput' | 'fk' | 'find', string>;
|
|
3
3
|
export default class MessageUtil {
|
|
4
4
|
static readonly optionErrorMessageEnglish: TOptionErrorMessage;
|
|
5
5
|
static readonly optionErrorMessageJapan: TOptionErrorMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageUtil.d.ts","sourceRoot":"","sources":["../../../src/models/Utils/MessageUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEvD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,GAAG,gBAAgB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MessageUtil.d.ts","sourceRoot":"","sources":["../../../src/models/Utils/MessageUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEvD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,GAAG,gBAAgB,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7J,MAAM,CAAC,OAAO,OAAO,WAAW;IAC5B,gBAAuB,yBAAyB,EAAE,mBAAmB,CA6BpE;IACD,gBAAuB,uBAAuB,EAAE,mBAAmB,CA6BlE;CACJ"}
|
|
@@ -24,6 +24,9 @@ MessageUtil.optionErrorMessageEnglish = {
|
|
|
24
24
|
'jsonb': '{name} should be entered as an Object or JSON string.',
|
|
25
25
|
'jsonb[]': '{name} should be entered as an array of Objects or JSON strings.',
|
|
26
26
|
'length': '{name} should be entered within {length} characters.',
|
|
27
|
+
'regExp': '{name} format is invalid.',
|
|
28
|
+
'min': '{name} should be greater than or equal to {min}.',
|
|
29
|
+
'max': '{name} should be less than or equal to {max}.',
|
|
27
30
|
'null': '{name} is not allowed to be null.',
|
|
28
31
|
'notInput': 'Please enter {name}.',
|
|
29
32
|
'fk': 'The value of {name} does not exist in the table.',
|
|
@@ -51,6 +54,9 @@ MessageUtil.optionErrorMessageJapan = {
|
|
|
51
54
|
'jsonb': '{name}はObject形またはJSON文字列で入力してください。',
|
|
52
55
|
'jsonb[]': '{name}はObject形またはJSON文字列の配列で入力してください。',
|
|
53
56
|
'length': '{name}は{length}文字以内で入力してください。',
|
|
57
|
+
'regExp': '{name}の形式が正しくありません。',
|
|
58
|
+
'min': '{name}は{min}以上の値で入力してください。',
|
|
59
|
+
'max': '{name}は{max}以下の値で入力してください。',
|
|
54
60
|
'null': '{name}はnullを許可されていません。',
|
|
55
61
|
'notInput': '{name}を入力してください。',
|
|
56
62
|
'fk': '{name}の値がテーブルに存在しません。',
|
|
@@ -42,9 +42,6 @@ export declare class RequestType extends ReqResType {
|
|
|
42
42
|
get Data(): {
|
|
43
43
|
[key: string]: any;
|
|
44
44
|
};
|
|
45
|
-
private headers?;
|
|
46
|
-
get Headers(): IncomingHttpHeaders;
|
|
47
|
-
get Authorization(): string | null;
|
|
48
45
|
setRequest(module: 'express' | 'hono', request: Request | Context): Promise<void>;
|
|
49
46
|
private createErrorMessage;
|
|
50
47
|
/**
|
|
@@ -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;CAC5B;AAED,qBAAa,WAAY,SAAQ,UAAU;IAQvC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAuBrC;IACD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAuBnC;IACD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,gBAAgB,CAA2F;IAE7I,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,aAAa,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAK;IAC7G,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,OAAO,CAAC,MAAM,CAAC,CAAuB;IACtC,IAAI,MAAM,IAAK;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAKlC;IACD,OAAO,CAAC,IAAI,CAAC,CAAuB;IACpC,IAAI,IAAI,IAAI;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAK/B;
|
|
1
|
+
{"version":3,"file":"RequestType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/RequestType.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,23 +94,9 @@ class RequestType extends ReqResType_1.default {
|
|
|
94
94
|
}
|
|
95
95
|
return (_a = this.data) !== null && _a !== void 0 ? _a : {};
|
|
96
96
|
}
|
|
97
|
-
get Headers() {
|
|
98
|
-
if (this.headers === undefined) {
|
|
99
|
-
throw new Error("Request data must be set using setRequest method before accessing Req.");
|
|
100
|
-
}
|
|
101
|
-
return this.headers;
|
|
102
|
-
}
|
|
103
|
-
get Authorization() {
|
|
104
|
-
var _a;
|
|
105
|
-
const authorization = (_a = this.Headers['authorization']) !== null && _a !== void 0 ? _a : '';
|
|
106
|
-
if (authorization.startsWith('Bearer ') === false) {
|
|
107
|
-
return null;
|
|
108
|
-
}
|
|
109
|
-
return authorization.replace(/^Bearer\s/, '');
|
|
110
|
-
}
|
|
111
97
|
setRequest(module, request) {
|
|
112
98
|
return __awaiter(this, void 0, void 0, function* () {
|
|
113
|
-
var _a, _b, _c
|
|
99
|
+
var _a, _b, _c;
|
|
114
100
|
yield this.createBody(module, request);
|
|
115
101
|
this.params = {};
|
|
116
102
|
if (module === 'express') {
|
|
@@ -125,22 +111,16 @@ class RequestType extends ReqResType_1.default {
|
|
|
125
111
|
}
|
|
126
112
|
}
|
|
127
113
|
this.params = (_a = req.params) !== null && _a !== void 0 ? _a : {};
|
|
128
|
-
this.headers = (_b = req.headers) !== null && _b !== void 0 ? _b : {};
|
|
129
114
|
}
|
|
130
115
|
else {
|
|
131
116
|
const c = request;
|
|
132
117
|
for (let index = 0; index < this.paramProperties.length; index++) {
|
|
133
118
|
const prop = this.paramProperties[index];
|
|
134
|
-
const value = (
|
|
119
|
+
const value = (_c = (_b = c.req).param) === null || _c === void 0 ? void 0 : _c.call(_b, prop.key); // hono の param()
|
|
135
120
|
if (value !== undefined) {
|
|
136
121
|
this.params[prop.key] = this.convertValue(prop, value, [prop.key, `(pathIndex: ${index})`], false);
|
|
137
122
|
}
|
|
138
123
|
}
|
|
139
|
-
const headersObj = {};
|
|
140
|
-
c.req.raw.headers.forEach((v, k) => {
|
|
141
|
-
headersObj[k.toLowerCase()] = v;
|
|
142
|
-
});
|
|
143
|
-
this.headers = headersObj;
|
|
144
124
|
}
|
|
145
125
|
});
|
|
146
126
|
}
|