pg-mvc-service 2.1.14 → 2.1.15
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/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/package.json +1 -1
|
@@ -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":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAoB,aAAa,EAAE,WAAW,EAAe,UAAU,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAIlM,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,OAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,qBAAa,UAAU;IAEnB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAM;IACnC,IAAI,EAAE,IAAI,MAAM,CAAoB;IACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAa;IAC9C,IAAI,MAAM,IAAI,MAAM,CAAwB;IAC5C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAM;IAC1C,IAAI,SAAS,IAAI,MAAM,CAKtB;IACD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAM;IACjD,IAAI,gBAAgB,IAAI,MAAM,CAAkC;IAChE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAM;IACxC,IAAI,OAAO,IAAI,MAAM,CAAyB;IAC9C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAM;IAC5D,IAAI,OAAO,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAKxC;IACM,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAY5C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;KAAC,CAAC,CAAM;IAC1G,IAAI,UAAU,IAAI,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;KAAC,CAAC,CAA4B;IAC5G,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;KAAC,CAAC;IAY/G,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IACvC,IAAI,UAAU,IAAI,MAAM,CAEvB;IAEM,WAAW,EAAE,OAAO,CAAS;IAC7B,WAAW,EAAE,YAAY,CAAS;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEtB,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,cAAc,CAId;IACR,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,IAAI,CAAkB;IAE9B,OAAO,KAAK,sBAAsB,GA2BjC;IACD,OAAO,KAAK,+BAA+B,GAc1C;IAED,OAAO,CAAC,MAAM,CAAoB;IAClC,IAAI,MAAM,IAAI,UAAU,GAAG,IAAI,CAE9B;gBAEW,MAAM,EAAE,IAAI,GAAG,UAAU,EAAE,UAAU,CAAC,EAAE,MAAM;IAOnD,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAC3E,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAChF,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IACtH,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAC3H,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAC1K,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAC/K,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IACjM,IAAI,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAsCtM,MAAM,IAAI,IAAI;IACd,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,kBAAkB,CAAA;KAAC,CAAC,GAAG,GAAG,GAAG,IAAI;IACtG,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,kBAAkB,CAAA;KAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IACzH,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,kBAAkB,CAAA;KAAC,CAAC,GAAG,GAAG,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;IAC7H,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,kBAAkB,CAAA;KAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;IAChJ,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAqDtD;;;;;;OAMG;IACI,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAC,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM;IAY5G;;;;;;OAMG;IACI,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAC,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,EAAE,KAAK,EAAE,MAAM;IAU7H;;;;;OAKG;IACI,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAI3G,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAC/B,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;IACjD,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAChD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,IAAI;IACxE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,IAAI;IAgD7E,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAO3C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,WAAW,EAAE,YAAY;IAO/D,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,EAAE,WAAW,EAAE,YAAY,GAAG,IAAI;IA4CzH,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,GAAG,IAAI;IAIzD,aAAa,CAAC,CAAC,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAU5D,oBAAoB,CAAC,CAAC,GAAG,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAC,CAAC;IAiC1K,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAC6D;IAElH,OAAO,CAAC,cAAc;IAoBtB,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;IAIvE,SAAS,CAAC,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;IAI3E,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;cAItD,eAAe,CAAC,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA4G9I,MAAM,CAAC,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAoBrD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAmB/G,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAI,OAAO,CAAC,IAAI,CAAC;IAgBhF,aAAa,CAAC,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAI,OAAO,CAAC,MAAM,CAAC;IAmC9D,aAAa,IAAK,OAAO,CAAC,MAAM,CAAC;IAyB9C,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAI,OAAO,CAAC,GAAG,CAAC;IACxE,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAI,OAAO,CAAC,GAAG,CAAC;YA0BvC,WAAW;IAmCzB,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,IAAI,cAAc,IAAI,cAAc,CAMnC;IAED,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,IAAI,gBAAgB,IAAI,gBAAgB,CAMvC;CACJ"}
|
|
@@ -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}の値がテーブルに存在しません。',
|