sonamu 0.0.18 → 0.0.20

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.
@@ -1 +1 @@
1
- {"version":3,"file":"base-model.d.ts","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,QAAQ,EAAM,MAAM,MAAM,CAAC;AACpC,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,cAAc;IAClB,SAAS,EAAE,MAAM,CAAa;IAGrC,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAGtB,OAAO;IAIb,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAQ3B,cAAc,CAClB,GAAG,EAAE,IAAI,EACT,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,GAAE,MAAY;IAkCnB,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC;IA6DvE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;IAuCpB,cAAc,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,MAAM,EAAE,EAC/D,MAAM,EACN,SAAS,EACT,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,GACN,EAAE;QACD,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,CAAC,WAAW,EAAE;YACnB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC;YACtB,EAAE,EAAE,IAAI,CAAC;YACT,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;SACnB,KAAK,IAAI,CAAC,YAAY,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;KACpC,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,WAAW,EAAE,WAAW,CAAC;QACzB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC;KACvB,CAAC;IA6EF,aAAa,CACX,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EACtB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAQhB,gBAAgB,IAAI,aAAa;CAGlC;AACD,eAAO,MAAM,SAAS,gBAAuB,CAAC"}
1
+ {"version":3,"file":"base-model.d.ts","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,QAAQ,EAAM,MAAM,MAAM,CAAC;AACpC,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,cAAc;IAClB,SAAS,EAAE,MAAM,CAAa;IAGrC,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAGtB,OAAO;IAIb,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAQ3B,cAAc,CAClB,GAAG,EAAE,IAAI,EACT,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,GAAE,MAAY;IAkCnB,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC;IA6DvE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;IAuCpB,cAAc,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,MAAM,EAAE,EAC/D,MAAM,EACN,SAAS,EACT,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,GACN,EAAE;QACD,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,CAAC,WAAW,EAAE;YACnB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC;YACtB,EAAE,EAAE,IAAI,CAAC;YACT,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;SACnB,KAAK,IAAI,CAAC,YAAY,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;KACpC,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,WAAW,EAAE,WAAW,CAAC;QACzB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC;KACvB,CAAC;IAyFF,aAAa,CACX,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EACtB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAQhB,gBAAgB,IAAI,aAAa;CAGlC;AACD,eAAO,MAAM,SAAS,gBAAuB,CAAC"}
@@ -149,6 +149,7 @@ class BaseModelClass {
149
149
  });
150
150
  }
151
151
  runSubsetQuery({ params, baseTable, subset, subsetQuery, build, debug, }) {
152
+ var _a;
152
153
  return __awaiter(this, void 0, void 0, function* () {
153
154
  const db = this.getDB(subset.startsWith("A") ? "w" : "r");
154
155
  baseTable = baseTable !== null && baseTable !== void 0 ? baseTable : (0, inflection_1.pluralize)((0, inflection_1.underscore)(this.modelName));
@@ -172,7 +173,19 @@ class BaseModelClass {
172
173
  // count
173
174
  let countQuery;
174
175
  if (params.id === undefined && params.withoutCount !== true) {
175
- countQuery = qb.clone().clearOrder().count("*", { as: "total" });
176
+ const clonedQb = qb.clone().clear("order");
177
+ const [, matched] = (_a = clonedQb
178
+ .toQuery()
179
+ .toLowerCase()
180
+ .match(/select (distinct .+) from/)) !== null && _a !== void 0 ? _a : [];
181
+ if (matched) {
182
+ countQuery = clonedQb
183
+ .clear("select")
184
+ .select(db.raw(`COUNT(${matched}) as total`));
185
+ }
186
+ else {
187
+ countQuery = clonedQb.count("*", { as: "total" });
188
+ }
176
189
  }
177
190
  // limit, offset
178
191
  if (params.num !== 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"smd-manager.d.ts","sourceRoot":"","sources":["../../src/smd/smd-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,oBAAY,cAAc,GAAG,MAAM,CAC/B,IAAI,GACJ,UAAU,GACV,OAAO,GACP,aAAa,GACb,SAAS,GACT,eAAe,GACf,OAAO,GACP,UAAU,EACZ,MAAM,CACP,CAAC;AACF,aAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,cAAM,eAAe;IACnB,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,UAAU,CAAqC;IAChD,YAAY,EAAE,OAAO,CAAS;IAG/B,QAAQ,CAAC,QAAQ,GAAE,OAAe;IA+BxC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI;IAK1C,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IASvB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAK9B,SAAS,IAAI,MAAM,EAAE;IAIrB,eAAe,IAAI,MAAM,EAAE;IAO3B,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAO1C,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpD,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IASlC,YAAY,CAAC,SAAS,EAAE,SAAS;IAIjC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IASpC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc;CAY9C;AAED,eAAO,MAAM,UAAU,iBAAwB,CAAC"}
1
+ {"version":3,"file":"smd-manager.d.ts","sourceRoot":"","sources":["../../src/smd/smd-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,oBAAY,cAAc,GAAG,MAAM,CAC/B,IAAI,GACJ,UAAU,GACV,OAAO,GACP,aAAa,GACb,SAAS,GACT,eAAe,GACf,OAAO,GACP,UAAU,EACZ,MAAM,CACP,CAAC;AACF,aAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,cAAM,eAAe;IACnB,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,UAAU,CAAqC;IAChD,YAAY,EAAE,OAAO,CAAS;IAG/B,QAAQ,CAAC,QAAQ,GAAE,OAAe;IA+BxC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI;IAK1C,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG;IASvB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAK9B,SAAS,IAAI,MAAM,EAAE;IAIrB,eAAe,IAAI,MAAM,EAAE;IAO3B,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAO1C,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAKpD,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IASlC,YAAY,CAAC,SAAS,EAAE,SAAS;IAIjC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IASpC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc;CAgB9C;AAED,eAAO,MAAM,UAAU,iBAAwB,CAAC"}
@@ -124,13 +124,15 @@ class SMDManagerClass {
124
124
  return tableSpec;
125
125
  }
126
126
  getNamesFromId(smdId) {
127
+ // smdId가 단복수 동형 단어인 경우 List 붙여서 생성
128
+ const pluralized = (0, inflection_1.pluralize)(smdId) === smdId ? `${smdId}List` : (0, inflection_1.pluralize)(smdId);
127
129
  return {
128
130
  fs: (0, inflection_1.dasherize)((0, inflection_1.underscore)(smdId)).toLowerCase(),
129
- fsPlural: (0, inflection_1.dasherize)((0, inflection_1.underscore)((0, inflection_1.pluralize)(smdId))).toLowerCase(),
131
+ fsPlural: (0, inflection_1.dasherize)((0, inflection_1.underscore)(pluralized)).toLowerCase(),
130
132
  camel: (0, inflection_1.camelize)(smdId, true),
131
- camelPlural: (0, inflection_1.pluralize)((0, inflection_1.camelize)(smdId, true)),
133
+ camelPlural: (0, inflection_1.camelize)(pluralized, true),
132
134
  capital: smdId,
133
- capitalPlural: (0, inflection_1.pluralize)(smdId),
135
+ capitalPlural: pluralized,
134
136
  upper: smdId.toUpperCase(),
135
137
  constant: (0, inflection_1.underscore)(smdId).toUpperCase(),
136
138
  };
@@ -1 +1 @@
1
- {"version":3,"file":"smd-manager.js","sourceRoot":"","sources":["../../src/smd/smd-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"smd-manager.js","sourceRoot":"","sources":["../../src/smd/smd-manager.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"smd.d.ts","sourceRoot":"","sources":["../../src/smd/smd.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,YAAY,EACZ,QAAQ,EAER,WAAW,EAMX,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,qBAAa,GAAG;IACd,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;KAC7B,CAAC;IACF,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;KACzB,CAAC;IACF,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC;KAC9B,CAAM;IACP,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAChC,CAAM;IACP,UAAU,EAAE;QACV,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;KACtC,CAAM;gBAEK,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC;IA0DzE,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW;IAS9C,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW;IAoMjE,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,GAAE,GAAU,GAAG,WAAW,EAAE;IA8F3E,aAAa,CACX,MAAM,SAAK,EACX,QAAQ,GAAE,MAAU,EACpB,KAAK,GAAE,MAAM,EAAO,GACnB,MAAM,EAAE;IAsBX,mBAAmB;IAwEnB,kBAAkB,IAAI,IAAI;CAwB3B"}
1
+ {"version":3,"file":"smd.d.ts","sourceRoot":"","sources":["../../src/smd/smd.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,YAAY,EACZ,QAAQ,EAER,WAAW,EAMX,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,qBAAa,GAAG;IACd,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;KAC7B,CAAC;IACF,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;KACzB,CAAC;IACF,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC;KAC9B,CAAM;IACP,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAChC,CAAM;IACP,UAAU,EAAE;QACV,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;KACtC,CAAM;gBAEK,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC;IA0DzE,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW;IAS9C,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW;IAmMjE,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,GAAE,GAAU,GAAG,WAAW,EAAE;IA8F3E,aAAa,CACX,MAAM,SAAK,EACX,QAAQ,GAAE,MAAU,EACpB,KAAK,GAAE,MAAM,EAAO,GACnB,MAAM,EAAE;IA4BX,mBAAmB;IAwEnB,kBAAkB,IAAI,IAAI;CAwB3B"}
package/dist/smd/smd.js CHANGED
@@ -93,6 +93,8 @@ class SMD {
93
93
  /*
94
94
  */
95
95
  resolveSubsetQuery(prefix, fields) {
96
+ // prefix 치환 (prefix는 ToOneRelation이 복수로 붙은 경우 모두 __로 변경됨)
97
+ prefix = prefix.replace(/\./g, "__");
96
98
  // 서브셋을 1뎁스만 분리하여 그룹핑
97
99
  const subsetGroup = lodash_1.default.groupBy(fields, (field) => {
98
100
  if (field.includes(".")) {
@@ -116,7 +118,7 @@ class SMD {
116
118
  }
117
119
  else {
118
120
  // 넘어온 테이블인 경우
119
- r.select = r.select.concat(realFields.map((field) => `${prefix.replace(".", "__")}.${field} as ${prefix.replace(".", "__")}__${field}`));
121
+ r.select = r.select.concat(realFields.map((field) => `${prefix}.${field} as ${prefix}__${field}`));
120
122
  }
121
123
  return r;
122
124
  }
@@ -323,9 +325,15 @@ class SMD {
323
325
  return this.props
324
326
  .map((prop) => {
325
327
  const propName = [prefix, prop.name].filter((v) => v !== "").join(".");
326
- if ((0, types_1.isRelationProp)(prop) && maxDepth - 1 >= 0) {
327
- // 역방향 relation인 경우 제외
328
+ if (propName === prefix) {
329
+ return null;
330
+ }
331
+ if ((0, types_1.isRelationProp)(prop)) {
332
+ if (maxDepth < 0) {
333
+ return null;
334
+ }
328
335
  if (froms.includes(prop.with)) {
336
+ // 역방향 relation인 경우 제외
329
337
  return null;
330
338
  }
331
339
  // 정방향 relation인 경우 recursive 콜
@@ -1 +1 @@
1
- {"version":3,"file":"smd.js","sourceRoot":"","sources":["../../src/smd/smd.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"smd.js","sourceRoot":"","sources":["../../src/smd/smd.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"view_id_async_select.template.d.ts","sourceRoot":"","sources":["../../src/templates/view_id_async_select.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAc,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,8BAA+B,SAAQ,QAAQ;;IAK1D,gBAAgB,CAAC,KAAK,EAAE,cAAc;;;;IAOtC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,sBAAsB,CAAC;;;;;;CAgGrE"}
1
+ {"version":3,"file":"view_id_async_select.template.d.ts","sourceRoot":"","sources":["../../src/templates/view_id_async_select.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAc,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,8BAA+B,SAAQ,QAAQ;;IAK1D,gBAAgB,CAAC,KAAK,EAAE,cAAc;;;;IAOtC,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,sBAAsB,CAAC;;;;;;CAuGrE"}
@@ -66,6 +66,13 @@ export function ${names.capital}IdAsyncSelect<T extends ${names.capital}SubsetKe
66
66
  );
67
67
  }, [${names.camelPlural}]);
68
68
 
69
+ useEffect(() => {
70
+ setListParams({
71
+ ...listParams,
72
+ ...baseListParams,
73
+ });
74
+ }, [baseListParams]);
75
+
69
76
  const handleSearchChange = (
70
77
  e: SyntheticEvent<HTMLElement, Event>,
71
78
  data: DropdownOnSearchChangeData,
@@ -1 +1 @@
1
- {"version":3,"file":"view_id_async_select.template.js","sourceRoot":"","sources":["../../src/templates/view_id_async_select.template.ts"],"names":[],"mappings":";;;AACA,oDAAgE;AAChE,mDAA2C;AAE3C,MAAa,8BAA+B,SAAQ,wBAAQ;IAC1D;QACE,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAChC,CAAC;IAED,gBAAgB,CAAC,KAAqB;QACpC,OAAO;YACL,MAAM,EAAE,oBAAoB;YAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,mBAAmB;SACtD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAA2C;QAClE,MAAM,KAAK,GAAG,wBAAU,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,wBAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACzC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACtC,CAAC;YACF,IAAI,UAAU,EAAE;gBACd,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC;aAC7B;iBAAM;gBACL,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;gBACvE,IAAI,aAAa,EAAE;oBACjB,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC;iBAChC;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;iBAClC;aACF;SACF;QAED,uCACK,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAC/B,IAAI,EAAE;;;WAGD,KAAK,CAAC,OAAO,cAChB,KAAK,CAAC,OACR,sCAAsC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;WACrD,KAAK,CAAC,OAAO,gCAAgC,KAAK,CAAC,EAAE,IACxD,KAAK,CAAC,EACR;WACK,KAAK,CAAC,OAAO,mCAAmC,KAAK,CAAC,EAAE,IAC3D,KAAK,CAAC,EACR;;kBAEY,KAAK,CAAC,OAAO,2BACvB,KAAK,CAAC,OACR;;;uBAGiB,KAAK,CAAC,OAAO;eACrB,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,KAAK,CAAC,OAAO;yBAClC,KAAK,CAAC,OAAO;;;;iDAIW,KAAK,CAAC,OAAO;;;;4BAIlC,KAAK,CAAC,OAAO,cACjC,KAAK,CAAC,aACR;kBACY,KAAK,CAAC,WAAW;;;;SAI1B,KAAK,CAAC,WAAW,gBAAgB,KAAK,CAAC,KAAK;;iBAEpC,KAAK,CAAC,KAAK;mBACT,KAAK,CAAC,KAAK;yBACL,KAAK,CAAC,KAAK,aAC5B,SAAS,CAAC,CAAC,CAAC,QAAQ,SAAS,GAAG,CAAC,CAAC,CAAC,EACrC;;;;QAIE,KAAK,CAAC,WAAW;;;;;;;;;;;;;;qBAcJ,KAAK,CAAC,QAAQ;;;;mBAIhB,KAAK,CAAC,WAAW;kBAClB,KAAK,CAAC,WAAW;;;;;;OAM5B,CAAC,IAAI,EAAE,EACR,UAAU,EAAE,EAAE,IACd;IACJ,CAAC;CACF;AA5GD,wEA4GC"}
1
+ {"version":3,"file":"view_id_async_select.template.js","sourceRoot":"","sources":["../../src/templates/view_id_async_select.template.ts"],"names":[],"mappings":";;;AACA,oDAAgE;AAChE,mDAA2C;AAE3C,MAAa,8BAA+B,SAAQ,wBAAQ;IAC1D;QACE,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAChC,CAAC;IAED,gBAAgB,CAAC,KAAqB;QACpC,OAAO;YACL,MAAM,EAAE,oBAAoB;YAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,mBAAmB;SACtD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAA2C;QAClE,MAAM,KAAK,GAAG,wBAAU,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,wBAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACzC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACtC,CAAC;YACF,IAAI,UAAU,EAAE;gBACd,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC;aAC7B;iBAAM;gBACL,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;gBACvE,IAAI,aAAa,EAAE;oBACjB,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC;iBAChC;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;iBAClC;aACF;SACF;QAED,uCACK,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAC/B,IAAI,EAAE;;;WAGD,KAAK,CAAC,OAAO,cAChB,KAAK,CAAC,OACR,sCAAsC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE;WACrD,KAAK,CAAC,OAAO,gCAAgC,KAAK,CAAC,EAAE,IACxD,KAAK,CAAC,EACR;WACK,KAAK,CAAC,OAAO,mCAAmC,KAAK,CAAC,EAAE,IAC3D,KAAK,CAAC,EACR;;kBAEY,KAAK,CAAC,OAAO,2BACvB,KAAK,CAAC,OACR;;;uBAGiB,KAAK,CAAC,OAAO;eACrB,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,KAAK,CAAC,OAAO;yBAClC,KAAK,CAAC,OAAO;;;;iDAIW,KAAK,CAAC,OAAO;;;;4BAIlC,KAAK,CAAC,OAAO,cACjC,KAAK,CAAC,aACR;kBACY,KAAK,CAAC,WAAW;;;;SAI1B,KAAK,CAAC,WAAW,gBAAgB,KAAK,CAAC,KAAK;;iBAEpC,KAAK,CAAC,KAAK;mBACT,KAAK,CAAC,KAAK;yBACL,KAAK,CAAC,KAAK,aAC5B,SAAS,CAAC,CAAC,CAAC,QAAQ,SAAS,GAAG,CAAC,CAAC,CAAC,EACrC;;;;QAIE,KAAK,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;qBAqBJ,KAAK,CAAC,QAAQ;;;;mBAIhB,KAAK,CAAC,WAAW;kBAClB,KAAK,CAAC,WAAW;;;;;;OAM5B,CAAC,IAAI,EAAE,EACR,UAAU,EAAE,EAAE,IACd;IACJ,CAAC;CACF;AAnHD,wEAmHC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sonamu",
3
- "version": "0.0.18",
3
+ "version": "0.0.20",
4
4
  "description": "Sonamu — TypeScript Fullstack API Framework",
5
5
  "keywords": [
6
6
  "typescript",
@@ -224,7 +224,19 @@ export class BaseModelClass {
224
224
  // count
225
225
  let countQuery;
226
226
  if (params.id === undefined && params.withoutCount !== true) {
227
- countQuery = qb.clone().clearOrder().count("*", { as: "total" });
227
+ const clonedQb = qb.clone().clear("order");
228
+ const [, matched] =
229
+ clonedQb
230
+ .toQuery()
231
+ .toLowerCase()
232
+ .match(/select (distinct .+) from/) ?? [];
233
+ if (matched) {
234
+ countQuery = clonedQb
235
+ .clear("select")
236
+ .select(db.raw(`COUNT(${matched}) as total`));
237
+ } else {
238
+ countQuery = clonedQb.count("*", { as: "total" });
239
+ }
228
240
  }
229
241
 
230
242
  // limit, offset
@@ -125,13 +125,17 @@ class SMDManagerClass {
125
125
  }
126
126
 
127
127
  getNamesFromId(smdId: string): SMDNamesRecord {
128
+ // smdId가 단복수 동형 단어인 경우 List 붙여서 생성
129
+ const pluralized =
130
+ pluralize(smdId) === smdId ? `${smdId}List` : pluralize(smdId);
131
+
128
132
  return {
129
133
  fs: dasherize(underscore(smdId)).toLowerCase(),
130
- fsPlural: dasherize(underscore(pluralize(smdId))).toLowerCase(),
134
+ fsPlural: dasherize(underscore(pluralized)).toLowerCase(),
131
135
  camel: camelize(smdId, true),
132
- camelPlural: pluralize(camelize(smdId, true)),
136
+ camelPlural: camelize(pluralized, true),
133
137
  capital: smdId,
134
- capitalPlural: pluralize(smdId),
138
+ capitalPlural: pluralized,
135
139
  upper: smdId.toUpperCase(),
136
140
  constant: underscore(smdId).toUpperCase(),
137
141
  };
package/src/smd/smd.ts CHANGED
@@ -120,6 +120,9 @@ export class SMD {
120
120
  /*
121
121
  */
122
122
  resolveSubsetQuery(prefix: string, fields: string[]): SubsetQuery {
123
+ // prefix 치환 (prefix는 ToOneRelation이 복수로 붙은 경우 모두 __로 변경됨)
124
+ prefix = prefix.replace(/\./g, "__");
125
+
123
126
  // 서브셋을 1뎁스만 분리하여 그룹핑
124
127
  const subsetGroup = _.groupBy(fields, (field) => {
125
128
  if (field.includes(".")) {
@@ -152,11 +155,7 @@ export class SMD {
152
155
  // 넘어온 테이블인 경우
153
156
  r.select = r.select.concat(
154
157
  realFields.map(
155
- (field) =>
156
- `${prefix.replace(".", "__")}.${field} as ${prefix.replace(
157
- ".",
158
- "__"
159
- )}__${field}`
158
+ (field) => `${prefix}.${field} as ${prefix}__${field}`
160
159
  )
161
160
  );
162
161
  }
@@ -417,9 +416,15 @@ export class SMD {
417
416
  return this.props
418
417
  .map((prop) => {
419
418
  const propName = [prefix, prop.name].filter((v) => v !== "").join(".");
420
- if (isRelationProp(prop) && maxDepth - 1 >= 0) {
421
- // 역방향 relation인 경우 제외
419
+ if (propName === prefix) {
420
+ return null;
421
+ }
422
+ if (isRelationProp(prop)) {
423
+ if (maxDepth < 0) {
424
+ return null;
425
+ }
422
426
  if (froms.includes(prop.with)) {
427
+ // 역방향 relation인 경우 제외
423
428
  return null;
424
429
  }
425
430
  // 정방향 relation인 경우 recursive 콜
@@ -83,6 +83,13 @@ export function ${names.capital}IdAsyncSelect<T extends ${
83
83
  );
84
84
  }, [${names.camelPlural}]);
85
85
 
86
+ useEffect(() => {
87
+ setListParams({
88
+ ...listParams,
89
+ ...baseListParams,
90
+ });
91
+ }, [baseListParams]);
92
+
86
93
  const handleSearchChange = (
87
94
  e: SyntheticEvent<HTMLElement, Event>,
88
95
  data: DropdownOnSearchChangeData,