pg-mvc-service 2.0.65 → 2.0.67

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 (5) hide show
  1. package/dist/reqestResponse/RequestType.js +5 -5
  2. package/dist/reqestResponse/ResponseType.js +0 -4
  3. package/package.json +1 -1
  4. package/src/reqestResponse/RequestType.ts +5 -5
  5. package/src/reqestResponse/ResponseType.ts +0 -4
package/dist/reqestResponse/RequestType.js CHANGED
@@ -283,23 +283,23 @@ class RequestType extends ReqResType_1.default {
283
283
  case 'map':
284
284
  case 'map?':
285
285
  const mapData = {};
286
- for (const [mapKey, mapValue] of value) {
286
+ for (const [mapKey, mapValue] of Object.entries(value)) {
287
287
  switch (this.properties[key].mapType) {
288
288
  case 'number':
289
289
  case 'number?':
290
- if (this.isNumber(this.properties) === false) {
290
+ if (this.isNumber(mapValue) === false) {
291
291
  this.throwInputError("MAP_011", [key], value);
292
292
  }
293
293
  mapData[mapKey] = Number(mapValue);
294
294
  break;
295
295
  case 'string':
296
296
  case 'string?':
297
- switch (typeof value) {
297
+ switch (typeof mapValue) {
298
298
  case 'number':
299
- mapData[mapKey] = value.toString();
299
+ mapData[mapKey] = mapValue.toString();
300
300
  break;
301
301
  case 'string':
302
- mapData[mapKey] = value;
302
+ mapData[mapKey] = mapValue;
303
303
  break;
304
304
  default:
305
305
  this.throwInputError("MAP_012", [key], value);
package/dist/reqestResponse/ResponseType.js CHANGED
@@ -59,18 +59,15 @@ class ResponseType extends ReqResType_1.default {
59
59
  getObject(keys) {
60
60
  let resData = {};
61
61
  const data = this.getData(keys);
62
- console.log("getObject-keys", keys.join(','));
63
62
  const objectProperty = this.getProperty(keys);
64
63
  if (objectProperty.type !== 'object' && objectProperty.type !== 'object?') {
65
64
  throw new Error(`getObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
66
65
  }
67
66
  for (const key of Object.keys(objectProperty.properties)) {
68
- console.log("getObject-key : ", key);
69
67
  if (key in data === false || data[key] === undefined) {
70
68
  continue;
71
69
  }
72
70
  const property = objectProperty.properties[key];
73
- console.log("getObject-props : ", property);
74
71
  if (data[key] === null || (property.type.replace("?", "") !== "string" && data[key] === "")) {
75
72
  resData[key] = property.type.endsWith('?') ? null : undefined;
76
73
  continue;
@@ -78,7 +75,6 @@ class ResponseType extends ReqResType_1.default {
78
75
  switch (property.type) {
79
76
  case 'object':
80
77
  case 'object?':
81
- console.log("getObject-next-keys : ", [...keys, key]);
82
78
  resData[key] = this.getObject([...keys, key]);
83
79
  break;
84
80
  case 'array':
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pg-mvc-service",
3
- "version": "2.0.65",
3
+ "version": "2.0.67",
4
4
  "description": "",
5
5
  "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
6
6
  "bugs": {
package/src/reqestResponse/RequestType.ts CHANGED
@@ -292,23 +292,23 @@ export class RequestType extends ReqResType {
292
292
  case 'map':
293
293
  case 'map?':
294
294
  const mapData: {[key: string]: string | number} = {};
295
- for (const [mapKey, mapValue] of value) {
295
+ for (const [mapKey, mapValue] of Object.entries(value)) {
296
296
  switch (this.properties[key].mapType) {
297
297
  case 'number':
298
298
  case 'number?':
299
- if (this.isNumber(this.properties) === false) {
299
+ if (this.isNumber(mapValue) === false) {
300
300
  this.throwInputError("MAP_011", [key], value);
301
301
  }
302
302
  mapData[mapKey] = Number(mapValue);
303
303
  break;
304
304
  case 'string':
305
305
  case 'string?':
306
- switch (typeof value) {
306
+ switch (typeof mapValue) {
307
307
  case 'number':
308
- mapData[mapKey] = value.toString();
308
+ mapData[mapKey] = mapValue.toString();
309
309
  break;
310
310
  case 'string':
311
- mapData[mapKey] = value;
311
+ mapData[mapKey] = mapValue;
312
312
  break;
313
313
  default:
314
314
  this.throwInputError("MAP_012", [key], value);
package/src/reqestResponse/ResponseType.ts CHANGED
@@ -60,20 +60,17 @@ export class ResponseType extends ReqResType {
60
60
  let resData: {[key: string]: any} = {};
61
61
  const data = this.getData(keys);
62
62
 
63
- console.log("getObject-keys", keys.join(','))
64
63
  const objectProperty = this.getProperty(keys);
65
64
  if (objectProperty.type !== 'object' && objectProperty.type !== 'object?') {
66
65
  throw new Error(`getObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
67
66
  }
68
67
 
69
68
  for (const key of Object.keys(objectProperty.properties)) {
70
- console.log("getObject-key : ", key);
71
69
  if (key in data === false || data[key] === undefined) {
72
70
  continue;
73
71
  }
74
72
 
75
73
  const property = objectProperty.properties[key];
76
- console.log("getObject-props : ", property);
77
74
  if (data[key] === null || (property.type.replace("?", "") !== "string" && data[key] === "")) {
78
75
  resData[key] = property.type.endsWith('?') ? null : undefined;
79
76
  continue;
@@ -82,7 +79,6 @@ export class ResponseType extends ReqResType {
82
79
  switch (property.type) {
83
80
  case 'object':
84
81
  case 'object?':
85
- console.log("getObject-next-keys : ", [...keys, key]);
86
82
  resData[key] = this.getObject([...keys, key]);
87
83
  break;
88
84
  case 'array':