pg-mvc-service 2.0.56 → 2.0.58

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 (3) hide show
  1. package/dist/reqestResponse/ResponseType.js +5 -3
  2. package/package.json +1 -1
  3. package/src/reqestResponse/ResponseType.ts +5 -3
package/dist/reqestResponse/ResponseType.js CHANGED
@@ -59,17 +59,18 @@ 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(','));
62
63
  const objectProperty = this.getProperty(keys);
63
64
  if (objectProperty.type !== 'object' && objectProperty.type !== 'object?') {
64
65
  throw new Error(`getObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
65
66
  }
66
- console.log(objectProperty);
67
67
  for (const key of Object.keys(objectProperty.properties)) {
68
- console.log(key);
68
+ console.log("getObject-key : ", key);
69
69
  if (key in data === false || data[key] === undefined) {
70
70
  continue;
71
71
  }
72
72
  const property = objectProperty.properties[key];
73
+ console.log("getObject-props : ", property);
73
74
  if (data[key] === null || (property.type.replace("?", "") !== "string" && data[key] === "")) {
74
75
  resData[key] = property.type.endsWith('?') ? null : undefined;
75
76
  continue;
@@ -77,6 +78,7 @@ class ResponseType extends ReqResType_1.default {
77
78
  switch (property.type) {
78
79
  case 'object':
79
80
  case 'object?':
81
+ console.log("getObject-next-keys : ", [...keys, key]);
80
82
  resData[key] = this.getObject([...keys, key]);
81
83
  break;
82
84
  case 'array':
@@ -324,7 +326,7 @@ class ResponseType extends ReqResType_1.default {
324
326
  makeSwaggerProperyFromObject(keys, tabCount) {
325
327
  const objectProperty = this.getProperty(keys);
326
328
  if (objectProperty.type !== 'object' && objectProperty.type !== 'object?') {
327
- throw new Error(`getObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
329
+ throw new Error(`makeSwaggerProperyFromObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
328
330
  }
329
331
  const space = ' '.repeat(tabCount);
330
332
  let ymlString = `${space}properties:\n`;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pg-mvc-service",
3
- "version": "2.0.56",
3
+ "version": "2.0.58",
4
4
  "description": "",
5
5
  "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
6
6
  "bugs": {
package/src/reqestResponse/ResponseType.ts CHANGED
@@ -60,19 +60,20 @@ 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(','))
63
64
  const objectProperty = this.getProperty(keys);
64
65
  if (objectProperty.type !== 'object' && objectProperty.type !== 'object?') {
65
66
  throw new Error(`getObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
66
67
  }
67
68
 
68
- console.log(objectProperty);
69
69
  for (const key of Object.keys(objectProperty.properties)) {
70
- console.log(key);
70
+ console.log("getObject-key : ", key);
71
71
  if (key in data === false || data[key] === undefined) {
72
72
  continue;
73
73
  }
74
74
 
75
75
  const property = objectProperty.properties[key];
76
+ console.log("getObject-props : ", property);
76
77
  if (data[key] === null || (property.type.replace("?", "") !== "string" && data[key] === "")) {
77
78
  resData[key] = property.type.endsWith('?') ? null : undefined;
78
79
  continue;
@@ -81,6 +82,7 @@ export class ResponseType extends ReqResType {
81
82
  switch (property.type) {
82
83
  case 'object':
83
84
  case 'object?':
85
+ console.log("getObject-next-keys : ", [...keys, key]);
84
86
  resData[key] = this.getObject([...keys, key]);
85
87
  break;
86
88
  case 'array':
@@ -356,7 +358,7 @@ export class ResponseType extends ReqResType {
356
358
 
357
359
  const objectProperty = this.getProperty(keys);
358
360
  if (objectProperty.type !== 'object' && objectProperty.type !== 'object?') {
359
- throw new Error(`getObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
361
+ throw new Error(`makeSwaggerProperyFromObjectメソッドでObject型以外が入力された場合はエラー\n keys: ${keys.join(',')}`);
360
362
  }
361
363
 
362
364
  const space = ' '.repeat(tabCount);