sonamu 0.1.2 → 0.1.5

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 (67) hide show
  1. package/dist/entity/entity-manager.d.ts.map +1 -1
  2. package/dist/entity/entity-manager.js +1 -0
  3. package/dist/entity/entity-manager.js.map +1 -1
  4. package/dist/entity/entity-utils.d.ts.map +1 -1
  5. package/dist/entity/entity-utils.js +1 -1
  6. package/dist/entity/entity-utils.js.map +1 -1
  7. package/dist/entity/entity.d.ts +4 -0
  8. package/dist/entity/entity.d.ts.map +1 -1
  9. package/dist/entity/entity.js +74 -22
  10. package/dist/entity/entity.js.map +1 -1
  11. package/dist/entity/migrator.d.ts.map +1 -1
  12. package/dist/entity/migrator.js +43 -12
  13. package/dist/entity/migrator.js.map +1 -1
  14. package/dist/syncer/syncer.d.ts +6 -1
  15. package/dist/syncer/syncer.d.ts.map +1 -1
  16. package/dist/syncer/syncer.js +62 -41
  17. package/dist/syncer/syncer.js.map +1 -1
  18. package/dist/templates/entity.template.d.ts +1 -1
  19. package/dist/templates/entity.template.d.ts.map +1 -1
  20. package/dist/templates/entity.template.js +43 -13
  21. package/dist/templates/entity.template.js.map +1 -1
  22. package/dist/templates/generated.template.d.ts.map +1 -1
  23. package/dist/templates/generated.template.js +18 -0
  24. package/dist/templates/generated.template.js.map +1 -1
  25. package/dist/templates/service.template.d.ts.map +1 -1
  26. package/dist/templates/service.template.js +4 -4
  27. package/dist/templates/service.template.js.map +1 -1
  28. package/dist/templates/view_enums_dropdown.template.d.ts +2 -2
  29. package/dist/templates/view_enums_dropdown.template.d.ts.map +1 -1
  30. package/dist/templates/view_enums_dropdown.template.js +14 -13
  31. package/dist/templates/view_enums_dropdown.template.js.map +1 -1
  32. package/dist/templates/view_enums_select.template.d.ts +1 -1
  33. package/dist/templates/view_enums_select.template.d.ts.map +1 -1
  34. package/dist/templates/view_enums_select.template.js +4 -4
  35. package/dist/templates/view_enums_select.template.js.map +1 -1
  36. package/dist/templates/view_form.template.d.ts +2 -5
  37. package/dist/templates/view_form.template.d.ts.map +1 -1
  38. package/dist/templates/view_form.template.js +14 -8
  39. package/dist/templates/view_form.template.js.map +1 -1
  40. package/dist/templates/view_list.template.d.ts +2 -5
  41. package/dist/templates/view_list.template.d.ts.map +1 -1
  42. package/dist/templates/view_list.template.js +17 -20
  43. package/dist/templates/view_list.template.js.map +1 -1
  44. package/dist/types/types.d.ts +15 -30
  45. package/dist/types/types.d.ts.map +1 -1
  46. package/dist/types/types.js +0 -3
  47. package/dist/types/types.js.map +1 -1
  48. package/dist/utils/utils.d.ts +1 -1
  49. package/dist/utils/utils.d.ts.map +1 -1
  50. package/dist/utils/utils.js +4 -1
  51. package/dist/utils/utils.js.map +1 -1
  52. package/package.json +1 -1
  53. package/src/entity/entity-manager.ts +1 -0
  54. package/src/entity/entity-utils.ts +2 -0
  55. package/src/entity/entity.ts +101 -32
  56. package/src/entity/migrator.ts +54 -13
  57. package/src/shared/web.shared.ts.txt +21 -9
  58. package/src/syncer/syncer.ts +88 -45
  59. package/src/templates/entity.template.ts +42 -9
  60. package/src/templates/generated.template.ts +27 -2
  61. package/src/templates/service.template.ts +6 -4
  62. package/src/templates/view_enums_dropdown.template.ts +12 -17
  63. package/src/templates/view_enums_select.template.ts +4 -8
  64. package/src/templates/view_form.template.ts +16 -10
  65. package/src/templates/view_list.template.ts +16 -23
  66. package/src/types/types.ts +4 -6
  67. package/src/utils/utils.ts +5 -1
@@ -1 +1 @@
1
- {"version":3,"file":"entity-manager.d.ts","sourceRoot":"","sources":["../../src/entity/entity-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAClC,IAAI,GACJ,UAAU,GACV,OAAO,GACP,aAAa,GACb,SAAS,GACT,eAAe,GACf,OAAO,GACP,UAAU,EACZ,MAAM,CACP,CAAC;AACF,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,cAAM,kBAAkB;IACtB,OAAO,CAAC,QAAQ,CAAkC;IAC3C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IACpD,OAAO,CAAC,UAAU,CAAqC;IAChD,YAAY,EAAE,OAAO,CAAS;IAG/B,QAAQ,CAAC,QAAQ,GAAE,OAAe;IAwBlC,MAAM,CAAC,QAAQ,GAAE,OAAe;IAStC,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAKhC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAS7B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAKjC,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,QAAQ,EAAE,MAAM,GAAG,iBAAiB;CAkBpD;AAED,eAAO,MAAM,aAAa,oBAA2B,CAAC"}
1
+ {"version":3,"file":"entity-manager.d.ts","sourceRoot":"","sources":["../../src/entity/entity-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAClC,IAAI,GACJ,UAAU,GACV,OAAO,GACP,aAAa,GACb,SAAS,GACT,eAAe,GACf,OAAO,GACP,UAAU,EACZ,MAAM,CACP,CAAC;AACF,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,cAAM,kBAAkB;IACtB,OAAO,CAAC,QAAQ,CAAkC;IAC3C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IACpD,OAAO,CAAC,UAAU,CAAqC;IAChD,YAAY,EAAE,OAAO,CAAS;IAG/B,QAAQ,CAAC,QAAQ,GAAE,OAAe;IAwBlC,MAAM,CAAC,QAAQ,GAAE,OAAe;IAUtC,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAKhC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAS7B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAKjC,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,QAAQ,EAAE,MAAM,GAAG,iBAAiB;CAkBpD;AAED,eAAO,MAAM,aAAa,oBAA2B,CAAC"}
@@ -49,6 +49,7 @@ class EntityManagerClass {
49
49
  }
50
50
  reload(doSilent = false) {
51
51
  return __awaiter(this, void 0, void 0, function* () {
52
+ console.log("reload");
52
53
  this.entities.clear();
53
54
  this.modulePaths.clear();
54
55
  this.tableSpecs.clear();
@@ -1 +1 @@
1
- {"version":3,"file":"entity-manager.js","sourceRoot":"","sources":["../../src/entity/entity-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity-manager.js","sourceRoot":"","sources":["../../src/entity/entity-manager.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"entity-utils.d.ts","sourceRoot":"","sources":["../../src/entity/entity-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity-utils.d.ts","sourceRoot":"","sources":["../../src/entity/entity-utils.ts"],"names":[],"mappings":"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"}
@@ -41,7 +41,7 @@ function float(name, option) {
41
41
  return Object.assign({ name, type: "float", precision: 8, scale: 2 }, option);
42
42
  }
43
43
  function double(name, option) {
44
- return Object.assign({ name, type: "double" }, option);
44
+ return Object.assign({ name, type: "double", precision: 8, scale: 2 }, option);
45
45
  }
46
46
  function decimal(name, option) {
47
47
  return Object.assign({ name, type: "decimal", precision: 8, scale: 2 }, option);
@@ -1 +1 @@
1
- {"version":3,"file":"entity-utils.js","sourceRoot":"","sources":["../../src/entity/entity-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity-utils.js","sourceRoot":"","sources":["../../src/entity/entity-utils.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAyBtC,0CAAyC;AAE5B,QAAA,CAAC,GAAG;IACf,OAAO;IACP,UAAU;IACV,IAAI;IACJ,MAAM;IACN,KAAK;IACL,MAAM;IACN,OAAO;IACP,OAAO;IACP,IAAI;IACJ,QAAQ;IACR,IAAI;IACJ,SAAS;IACT,IAAI;IACJ,IAAI;IACJ,KAAK;IACL,OAAO;IACP,gBAAgB;IAChB,oBAAoB;IACpB,eAAe;IACf,kBAAkB;CACnB,CAAC;AAEF,SAAS,OAAO,CACd,IAAY,EACZ,MAA2C;IAE3C,uBACE,IAAI,EACJ,IAAI,EAAE,SAAS,IACZ,MAAM,EACT;AACJ,CAAC;AACD,SAAS,UAAU,CACjB,IAAY,EACZ,MAA8C;IAE9C,uBACE,IAAI,EACJ,IAAI,EAAE,YAAY,IACf,MAAM,EACT;AACJ,CAAC;AACD,SAAS,IAAI,CAAC,IAAY,EAAE,MAAuC;IACjE,uBACE,IAAI,EACJ,IAAI,EAAE,MAAM,IACT,MAAM,EACT;AACJ,CAAC;AACD,SAAS,MAAM,CACb,IAAY,EACZ,MAAyC;IAEzC,uBACE,IAAI,EACJ,IAAI,EAAE,QAAQ,IACX,MAAM,EACT;AACJ,CAAC;AACD,SAAS,KAAK,CACZ,IAAY,EACZ,MAAyC;IAEzC,uBACE,IAAI,EACJ,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,CAAC,EACZ,KAAK,EAAE,CAAC,IACL,MAAM,EACT;AACJ,CAAC;AACD,SAAS,MAAM,CACb,IAAY,EACZ,MAA0C;IAE1C,uBACE,IAAI,EACJ,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,CAAC,EACZ,KAAK,EAAE,CAAC,IACL,MAAM,EACT;AACJ,CAAC;AACD,SAAS,OAAO,CACd,IAAY,EACZ,MAA2C;IAE3C,uBACE,IAAI,EACJ,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,EACZ,KAAK,EAAE,CAAC,IACL,MAAM,EACT;AACJ,CAAC;AACD,SAAS,OAAO,CACd,IAAY,EACZ,MAA2C;IAE3C,uBACE,IAAI,EACJ,IAAI,EAAE,SAAS,IACZ,MAAM,EACT;AACJ,CAAC;AACD,SAAS,IAAI,CACX,IAAY,EACZ,MAAyD;IAEzD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,MAAK,IAAI,EAAE;QACxB,OAAO,MAAM,CAAC,GAAG,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,mBAAmB,CAAC;KACxC;IACD,uBACE,IAAI,EACJ,IAAI,EAAE,MAAM,IACT,MAAM,EACT;AACJ,CAAC;AACD,SAAS,QAAQ,CACf,IAAY,EACZ,MAA6D;IAE7D,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,MAAK,IAAI,EAAE;QACxB,OAAO,MAAM,CAAC,GAAG,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,mBAAmB,CAAC;KACxC;IACD,uBACE,IAAI,EACJ,IAAI,EAAE,UAAU,IACb,MAAM,EACT;AACJ,CAAC;AACD,SAAS,IAAI,CACX,IAAY,EACZ,MAAyD;IAEzD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,MAAK,IAAI,EAAE;QACxB,OAAO,MAAM,CAAC,GAAG,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,mBAAmB,CAAC;KACxC;IACD,uBACE,IAAI,EACJ,IAAI,EAAE,MAAM,IACT,MAAM,EACT;AACJ,CAAC;AACD,SAAS,SAAS,CAChB,IAAY,EACZ,MAA8D;IAE9D,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,MAAK,IAAI,EAAE;QACxB,OAAO,MAAM,CAAC,GAAG,CAAC;QAClB,MAAM,CAAC,SAAS,GAAG,mBAAmB,CAAC;KACxC;IACD,uBACE,IAAI,EACJ,IAAI,EAAE,WAAW,IACd,MAAM,EACT;AACJ,CAAC;AACD,SAAS,IAAI,CAAC,IAAY,EAAE,MAAuC;IACjE,uBACE,IAAI,EACJ,IAAI,EAAE,MAAM,IACT,MAAM,EACT;AACJ,CAAC;AACD,SAAS,IAAI,CAAC,IAAY,EAAE,MAAuC;IACjE,uBACE,IAAI,EACJ,IAAI,EAAE,MAAM,IACT,MAAM,EACT;AACJ,CAAC;AACD,SAAS,KAAK,CACZ,IAAY,EACZ,MAAgE;;IAEhE,uBACE,IAAI,EACJ,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAA,MAAM,CAAC,EAAE,mCAAI,SAAS,IAAA,qBAAQ,EAAC,IAAI,CAAC,EAAE,IACvC,MAAM,EACT;AACJ,CAAC;AACD,SAAS,OAAO,CACd,IAAY,EACZ,MAAqE;IAErE,uBACE,IAAI,EACJ,IAAI,EAAE,SAAS,IACZ,MAAM,EACT;AACJ,CAAC;AACD,SAAS,gBAAgB,CACvB,IAAY,EACZ,MAGC;IAED,uBACE,IAAI,EACJ,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,UAAU,IACrB,MAAM,EACT;AACJ,CAAC;AACD,SAAS,oBAAoB,CAC3B,IAAY,EACZ,MAAwE;IAExE,uBACE,IAAI,EACJ,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,cAAc,IACzB,MAAM,EACT;AACJ,CAAC;AACD,SAAS,eAAe,CACtB,IAAY,EACZ,MAAmE;IAEnE,uBACE,IAAI,EACJ,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,SAAS,IACpB,MAAM,EACT;AACJ,CAAC;AACD,SAAS,kBAAkB,CACzB,IAAY,EACZ,MAAsE;IAEtE,uBACE,IAAI,EACJ,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,YAAY,IACvB,MAAM,EACT;AACJ,CAAC;AAEY,QAAA,CAAC,GAAG;IACf,KAAK;IACL,MAAM;CACP,CAAC;AAEF,SAAS,KAAK,CAAC,OAA0B;IACvC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,IAAA,eAAO,EAAC,OAAO,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,OAA0B;IACxC,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,IAAA,eAAO,EAAC,OAAO,CAAC;KAC1B,CAAC;AACJ,CAAC"}
@@ -46,6 +46,10 @@ export declare class Entity {
46
46
  [key: string]: string[];
47
47
  }, prefixes?: string[]): EntitySubsetRow[];
48
48
  createProp(prop: EntityProp, at?: number): Promise<void>;
49
+ analyzeSubsetField(subsetField: string): {
50
+ entityId: string;
51
+ propName: string;
52
+ }[];
49
53
  modifyProp(newProp: EntityProp, at: number): Promise<void>;
50
54
  delProp(at: number): Promise<void>;
51
55
  getEntityIdFromSubsetField(subsetField: string): string;
@@ -1 +1 @@
1
- {"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/entity/entity.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EACV,YAAY,EAEZ,WAAW,EAMX,cAAc,EAGd,WAAW,EACX,UAAU,EACV,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,qBAAa,MAAM;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;KAC3B,CAAC;IACF,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;KAC7B,CAAC;IACF,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,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,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAClC,CAAM;IACP,UAAU,EAAE;QACV,CAAC,MAAM,EAAE,MAAM,GAAG;YAChB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB,CAAC;KACH,CAAM;gBAEK,EACV,EAAE,EACF,QAAQ,EACR,KAAK,EACL,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,KAAK,GACN,EAAE,UAAU;IAwEb,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW;IAS9C,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,oBAAoB,GAAE,OAAe,GACpC,WAAW;IA2Nd,qBAAqB,CACnB,UAAU,EAAE,MAAM,EAAE,EACpB,MAAM,GAAE,MAAa,GACpB,cAAc,EAAE;IA8FnB,aAAa,CACX,MAAM,SAAK,EACX,QAAQ,GAAE,MAAU,EACpB,KAAK,GAAE,MAAM,EAAO,GACnB,MAAM,EAAE;IA4BX,eAAe,IAAI,MAAM,EAAE;IAI3B,mBAAmB;IAwDnB,kBAAkB,IAAI,IAAI;IAc1B,MAAM,IAAI,UAAU;IAad,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB3B,aAAa,CACX,QAAQ,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,EACtC,QAAQ,GAAE,MAAM,EAAO,GACtB,eAAe,EAAE;IAyDd,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxD,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC1D,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BxC,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAoBjD,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAStD"}
1
+ {"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/entity/entity.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EACV,YAAY,EAEZ,WAAW,EAMX,cAAc,EAGd,WAAW,EACX,UAAU,EACV,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,qBAAa,MAAM;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC;KAC3B,CAAC;IACF,SAAS,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAC;KAC7B,CAAC;IACF,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,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,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAClC,CAAM;IACP,UAAU,EAAE;QACV,CAAC,MAAM,EAAE,MAAM,GAAG;YAChB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB,CAAC;KACH,CAAM;gBAEK,EACV,EAAE,EACF,QAAQ,EACR,KAAK,EACL,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,EACP,KAAK,GACN,EAAE,UAAU;IAwEb,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW;IAS9C,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,oBAAoB,GAAE,OAAe,GACpC,WAAW;IA2Nd,qBAAqB,CACnB,UAAU,EAAE,MAAM,EAAE,EACpB,MAAM,GAAE,MAAa,GACpB,cAAc,EAAE;IA+FnB,aAAa,CACX,MAAM,SAAK,EACX,QAAQ,GAAE,MAAU,EACpB,KAAK,GAAE,MAAM,EAAO,GACnB,MAAM,EAAE;IA4BX,eAAe,IAAI,MAAM,EAAE;IAkB3B,mBAAmB;IAwDnB,kBAAkB,IAAI,IAAI;IAc1B,MAAM,IAAI,UAAU;IAad,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB3B,aAAa,CACX,QAAQ,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,EACtC,QAAQ,GAAE,MAAM,EAAO,GACtB,eAAe,EAAE;IAyDd,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG;QACvC,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE;IA4BG,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C1D,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CxC,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAsBjD,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAStD"}
@@ -46,6 +46,7 @@ const fs_1 = require("fs");
46
46
  const zod_1 = require("zod");
47
47
  const sonamu_1 = require("../api/sonamu");
48
48
  const prettier_1 = __importDefault(require("prettier"));
49
+ const utils_1 = require("../utils/utils");
49
50
  class Entity {
50
51
  constructor({ id, parentId, table, title, props, indexes, subsets, enums, }) {
51
52
  this.types = {};
@@ -321,9 +322,10 @@ class Entity {
321
322
  children: [],
322
323
  };
323
324
  }
324
- const prop = entity.propsDict[propName];
325
+ const prop = entity.props.find((p) => p.name === propName);
325
326
  if (prop === undefined) {
326
- throw new Error(`${this.id} -- 잘못된 FieldExpr ${propName}`);
327
+ console.log({ propName, groups });
328
+ throw new Error(`${entity.id} -- 잘못된 FieldExpr ${propName}`);
327
329
  }
328
330
  return {
329
331
  nodeType: "plain",
@@ -393,7 +395,20 @@ class Entity {
393
395
  .filter((f) => f !== null);
394
396
  }
395
397
  getTableColumns() {
396
- return this.props.map((prop) => prop.name);
398
+ return this.props
399
+ .map((prop) => {
400
+ if (prop.type === "relation") {
401
+ if (prop.relationType === "BelongsToOne" ||
402
+ (prop.relationType === "OneToOne" && prop.hasJoinColumn === true)) {
403
+ return `${prop.name}_id`;
404
+ }
405
+ else {
406
+ return null;
407
+ }
408
+ }
409
+ return prop.name;
410
+ })
411
+ .filter(utils_1.nonNullable);
397
412
  }
398
413
  registerModulePaths() {
399
414
  const basePath = `${this.names.parentFs}`;
@@ -510,11 +525,30 @@ class Entity {
510
525
  yield this.save();
511
526
  });
512
527
  }
528
+ analyzeSubsetField(subsetField) {
529
+ const arr = subsetField.split(".");
530
+ let entityId = this.id;
531
+ const result = [];
532
+ for (let i = 0; i < arr.length; i++) {
533
+ const propName = arr[i];
534
+ result.push({
535
+ entityId,
536
+ propName,
537
+ });
538
+ const prop = entity_manager_1.EntityManager.get(entityId).props.find((p) => p.name === propName);
539
+ if (!prop) {
540
+ throw new Error(`${entityId}의 잘못된 서브셋키 ${subsetField}`);
541
+ }
542
+ if ((0, types_1.isRelationProp)(prop)) {
543
+ entityId = prop.with;
544
+ }
545
+ }
546
+ return result;
547
+ }
513
548
  modifyProp(newProp, at) {
514
549
  return __awaiter(this, void 0, void 0, function* () {
515
- // 프롭 수정
550
+ // 이전 프롭 이름 저장
516
551
  const oldName = this.props[at].name;
517
- this.props[at] = newProp;
518
552
  // 저장할 엔티티
519
553
  const entities = [this];
520
554
  // 이름이 바뀐 경우
@@ -526,24 +560,30 @@ class Entity {
526
560
  const relEntitySubsetKeys = Object.keys(relEntity.subsets);
527
561
  for (const subsetKey of relEntitySubsetKeys) {
528
562
  const subset = relEntity.subsets[subsetKey];
529
- const oldSubsetFields = subset.filter((field) => field.endsWith(oldName) &&
530
- relEntity.getEntityIdFromSubsetField(field) === this.id);
531
- if (oldSubsetFields.length > 0) {
532
- relEntity.subsets[subsetKey] = relEntity.subsets[subsetKey].map((oldField) => oldSubsetFields.includes(oldField)
533
- ? oldField.replace(`${oldName}`, `${newProp.name}`)
534
- : oldField);
563
+ // 서브셋 필드를 순회하며, 엔티티-프롭 단위로 분석한 후 현재 엔티티-프롭과 일치하는 경우 수정 처리
564
+ const modifiedSubsetFields = subset.map((subsetField) => {
565
+ const analyzed = relEntity.analyzeSubsetField(subsetField);
566
+ const modified = analyzed.map((a) => a.propName === oldName && a.entityId === this.id
567
+ ? Object.assign(Object.assign({}, a), { propName: newProp.name }) : a);
568
+ // 분석한 필드를 다시 서브셋 필드로 복구
569
+ return modified.map((a) => a.propName).join(".");
570
+ });
571
+ if (subset.join(",") !== modifiedSubsetFields.join(",")) {
572
+ relEntity.subsets[subsetKey] = modifiedSubsetFields;
535
573
  entities.push(relEntity);
536
574
  }
537
575
  }
538
576
  }
539
577
  }
578
+ // 프롭 수정
579
+ this.props[at] = newProp;
540
580
  yield Promise.all(entities.map((entity) => __awaiter(this, void 0, void 0, function* () { return entity.save(); })));
541
581
  });
542
582
  }
543
583
  delProp(at) {
544
584
  return __awaiter(this, void 0, void 0, function* () {
585
+ // 이전 프롭 이름 저장
545
586
  const oldName = this.props[at].name;
546
- this.props.splice(at, 1);
547
587
  // 저장할 엔티티
548
588
  const entities = [this];
549
589
  // 전체 엔티티에서 현재 삭제된 프롭을 참조하고 있는 모든 서브셋필드 찾아서 제외
@@ -553,14 +593,26 @@ class Entity {
553
593
  const relEntitySubsetKeys = Object.keys(relEntity.subsets);
554
594
  for (const subsetKey of relEntitySubsetKeys) {
555
595
  const subset = relEntity.subsets[subsetKey];
556
- const oldSubsetFields = subset.filter((field) => field.endsWith(oldName) &&
557
- relEntity.getEntityIdFromSubsetField(field) === this.id);
558
- if (oldSubsetFields.length > 0) {
559
- relEntity.subsets[subsetKey] = relEntity.subsets[subsetKey].filter((oldField) => oldSubsetFields.includes(oldField) === false);
596
+ // 서브셋 필드를 순회하며, 엔티티-프롭 단위로 분석한 후 현재 엔티티-프롭과 일치하는 경우 이후의 필드를 제외
597
+ const modifiedSubsetFields = subset
598
+ .map((subsetField) => {
599
+ const analyzed = relEntity.analyzeSubsetField(subsetField);
600
+ if (analyzed.find((a) => a.propName === oldName && a.entityId === this.id)) {
601
+ return null;
602
+ }
603
+ else {
604
+ return subsetField;
605
+ }
606
+ })
607
+ .filter(utils_1.nonNullable);
608
+ if (subset.join(",") !== modifiedSubsetFields.join(",")) {
609
+ relEntity.subsets[subsetKey] = modifiedSubsetFields;
560
610
  entities.push(relEntity);
561
611
  }
562
612
  }
563
613
  }
614
+ // 프롭 삭제
615
+ this.props.splice(at, 1);
564
616
  yield Promise.all(entities.map((entity) => __awaiter(this, void 0, void 0, function* () { return entity.save(); })));
565
617
  });
566
618
  }
@@ -571,15 +623,15 @@ class Entity {
571
623
  // 서브셋 필드의 마지막은 프롭이므로 제외
572
624
  const arr = subsetField.split(".").slice(0, -1);
573
625
  // 서브셋 필드를 내려가면서 마지막으로 relation된 엔티티를 찾음
574
- const lastEntity = arr.reduce((entity, field) => {
575
- const relProp = entity.props.find((p) => p.name === field);
626
+ const lastEntityId = arr.reduce((entityId, field) => {
627
+ const relProp = entity_manager_1.EntityManager.get(entityId).props.find((p) => p.name === field);
576
628
  if (!relProp || relProp.type !== "relation") {
577
- console.debug({ arr, thisId: this.id });
629
+ console.debug({ arr, thisId: this.id, entityId, field });
578
630
  throw new Error(`잘못된 서브셋키 ${subsetField}`);
579
631
  }
580
- return entity_manager_1.EntityManager.get(relProp.with);
581
- }, this);
582
- return lastEntity.id;
632
+ return relProp.with;
633
+ }, this.id);
634
+ return lastEntityId;
583
635
  }
584
636
  moveProp(at, to) {
585
637
  return __awaiter(this, void 0, void 0, function* () {
@@ -1 +1 @@
1
- {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/entity/entity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/entity/entity.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/entity/migrator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/entity/migrator.ts"],"names":[],"mappings":"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"}
@@ -69,6 +69,16 @@ class Migrator {
69
69
  return __awaiter(this, void 0, void 0, function* () {
70
70
  const srcMigrationsDir = `${api_1.Sonamu.apiRootPath}/src/migrations`;
71
71
  const distMigrationsDir = `${api_1.Sonamu.apiRootPath}/dist/migrations`;
72
+ if ((0, fs_1.existsSync)(srcMigrationsDir) === false) {
73
+ (0, fs_1.mkdirSync)(srcMigrationsDir, {
74
+ recursive: true,
75
+ });
76
+ }
77
+ if ((0, fs_1.existsSync)(distMigrationsDir) === false) {
78
+ (0, fs_1.mkdirSync)(distMigrationsDir, {
79
+ recursive: true,
80
+ });
81
+ }
72
82
  const srcMigrations = (0, fs_1.readdirSync)(srcMigrationsDir)
73
83
  .filter((f) => f.endsWith(".ts"))
74
84
  .map((f) => f.split(".")[0]);
@@ -124,7 +134,7 @@ class Migrator {
124
134
  const tConn = (0, knex_1.default)(knexOptions);
125
135
  const status = yield (() => __awaiter(this, void 0, void 0, function* () {
126
136
  try {
127
- return tConn.migrate.status();
137
+ return yield tConn.migrate.status();
128
138
  }
129
139
  catch (err) {
130
140
  return "error";
@@ -620,13 +630,15 @@ class Migrator {
620
630
  return null;
621
631
  }
622
632
  const columns = dbColumns.map((dbColumn) => {
623
- var _a;
624
633
  const dbColType = this.resolveDBColType(dbColumn.Type, dbColumn.Field);
625
- return Object.assign(Object.assign({ name: dbColumn.Field, nullable: dbColumn.Null !== "NO" }, dbColType), (0, lodash_able_1.propIf)(dbColumn.Default !== null, {
626
- defaultTo: dbColType.type === "float"
627
- ? parseFloat((_a = dbColumn.Default) !== null && _a !== void 0 ? _a : "0").toString()
628
- : dbColumn.Default,
629
- }));
634
+ return Object.assign(Object.assign({ name: dbColumn.Field, nullable: dbColumn.Null !== "NO" }, dbColType), (() => {
635
+ if (dbColumn.Default !== null) {
636
+ return {
637
+ defaultTo: dbColumn.Default,
638
+ };
639
+ }
640
+ return {};
641
+ })());
630
642
  });
631
643
  const dbIndexesGroup = (0, lodash_1.groupBy)(dbIndexes.filter((dbIndex) => dbIndex.Key_name !== "PRIMARY" &&
632
644
  !dbForeigns.find((dbForeign) => dbForeign.keyName === dbIndex.Key_name)), (dbIndex) => dbIndex.Key_name);
@@ -723,7 +735,15 @@ class Migrator {
723
735
  return __awaiter(this, void 0, void 0, function* () {
724
736
  // 테이블 정보
725
737
  try {
726
- const [cols] = yield compareDB.raw(`SHOW FIELDS FROM ${tableName}`);
738
+ const [_cols] = (yield compareDB.raw(`SHOW FIELDS FROM ${tableName}`));
739
+ const cols = _cols.map((col) => (Object.assign(Object.assign({}, col), (col.Default !== null
740
+ ? {
741
+ Default: col.Default.replace(/[0-9]+/g, "").length > 0 &&
742
+ col.Extra !== "DEFAULT_GENERATED"
743
+ ? `"${col.Default}"`
744
+ : col.Default,
745
+ }
746
+ : {}))));
727
747
  const [indexes] = yield compareDB.raw(`SHOW INDEX FROM ${tableName}`);
728
748
  const [[row]] = yield compareDB.raw(`SHOW CREATE TABLE ${tableName}`);
729
749
  const ddl = row["Create Table"];
@@ -802,9 +822,14 @@ class Migrator {
802
822
  ? { unsigned: prop.unsigned === true }
803
823
  : {})), ((0, types_1.isStringProp)(prop) || (0, types_1.isEnumProp)(prop)
804
824
  ? { length: prop.length }
805
- : {})), { nullable: prop.nullable === true }), (0, lodash_able_1.propIf)(prop.dbDefault !== undefined, {
806
- defaultTo: "" + prop.dbDefault,
807
- })), ((0, types_1.isDecimalProp)(prop) || (0, types_1.isFloatProp)(prop)
825
+ : {})), { nullable: prop.nullable === true }), (() => {
826
+ if (prop.dbDefault !== undefined) {
827
+ return {
828
+ defaultTo: prop.dbDefault,
829
+ };
830
+ }
831
+ return {};
832
+ })()), ((0, types_1.isDecimalProp)(prop) || (0, types_1.isFloatProp)(prop)
808
833
  ? {
809
834
  precision: (_a = prop.precision) !== null && _a !== void 0 ? _a : 8,
810
835
  scale: (_b = prop.scale) !== null && _b !== void 0 ? _b : 2,
@@ -940,7 +965,13 @@ class Migrator {
940
965
  chains.push(column.nullable ? "nullable()" : "notNullable()");
941
966
  // defaultTo
942
967
  if (column.defaultTo !== undefined) {
943
- chains.push(`defaultTo(knex.raw('${column.defaultTo}'))`);
968
+ if (typeof column.defaultTo === "string" &&
969
+ column.defaultTo.startsWith(`"`)) {
970
+ chains.push(`defaultTo(${column.defaultTo})`);
971
+ }
972
+ else {
973
+ chains.push(`defaultTo(knex.raw('${column.defaultTo}'))`);
974
+ }
944
975
  }
945
976
  return `table.${chains.join(".")};`;
946
977
  });