@rxap/schematics-ts-morph 16.1.0-dev.1 → 16.1.0-dev.3

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 (46) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/README.md +1 -1
  3. package/package.json +8 -6
  4. package/src/index.d.ts +1 -0
  5. package/src/index.js +1 -0
  6. package/src/index.js.map +1 -1
  7. package/src/lib/angular/coerce-component.d.ts +6 -0
  8. package/src/lib/angular/coerce-component.js +57 -2
  9. package/src/lib/angular/coerce-component.js.map +1 -1
  10. package/src/lib/angular/coerce-proxy-remote-method-class.d.ts +2 -2
  11. package/src/lib/angular/coerce-proxy-remote-method-class.js +15 -18
  12. package/src/lib/angular/coerce-proxy-remote-method-class.js.map +1 -1
  13. package/src/lib/angular/coerce-table-data-source.js +1 -1
  14. package/src/lib/angular/coerce-table-data-source.js.map +1 -1
  15. package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js +2 -2
  16. package/src/lib/angular/coerce-tree-table-children-proxy-remote-method-class.js.map +1 -1
  17. package/src/lib/nest/coerce-dto-class.d.ts +2 -9
  18. package/src/lib/nest/coerce-dto-class.js +28 -20
  19. package/src/lib/nest/coerce-dto-class.js.map +1 -1
  20. package/src/lib/nest/coerce-form-submit-operation.js +2 -2
  21. package/src/lib/nest/coerce-form-submit-operation.js.map +1 -1
  22. package/src/lib/nest/coerce-get-children-operation.js +6 -12
  23. package/src/lib/nest/coerce-get-children-operation.js.map +1 -1
  24. package/src/lib/nest/coerce-get-data-grid-operation.js +4 -9
  25. package/src/lib/nest/coerce-get-data-grid-operation.js.map +1 -1
  26. package/src/lib/nest/coerce-get-page-operation.d.ts +3 -6
  27. package/src/lib/nest/coerce-get-page-operation.js +73 -62
  28. package/src/lib/nest/coerce-get-page-operation.js.map +1 -1
  29. package/src/lib/nest/coerce-get-root-operation.d.ts +1 -0
  30. package/src/lib/nest/coerce-get-root-operation.js +5 -10
  31. package/src/lib/nest/coerce-get-root-operation.js.map +1 -1
  32. package/src/lib/nest/coerce-operation.d.ts +1 -1
  33. package/src/lib/nest/coerce-operation.js +10 -7
  34. package/src/lib/nest/coerce-operation.js.map +1 -1
  35. package/src/lib/nest/coerce-page-dto-class.d.ts +2 -8
  36. package/src/lib/nest/coerce-page-dto-class.js +46 -20
  37. package/src/lib/nest/coerce-page-dto-class.js.map +1 -1
  38. package/src/lib/nest/coerce-row-dto-class.js +1 -4
  39. package/src/lib/nest/coerce-row-dto-class.js.map +1 -1
  40. package/src/lib/nest/coerce-submit-data-grid-operation.js +3 -7
  41. package/src/lib/nest/coerce-submit-data-grid-operation.js.map +1 -1
  42. package/src/lib/nest/coerce-tree-operation.js +2 -2
  43. package/src/lib/nest/coerce-tree-operation.js.map +1 -1
  44. package/src/lib/nest/table-query-list.d.ts +2 -0
  45. package/src/lib/nest/table-query-list.js +33 -0
  46. package/src/lib/nest/table-query-list.js.map +1 -0
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-form-submit-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-form-submit-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,cAAc,EACd,YAAY,GAAE,EAAE,EAChB,OAAO,EACP,WAAW,GAAE,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,cAAc,CAAE,CAAC,GACvD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,WAAY;gBAClB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA1CD,8DA0CC"}
1
+ {"version":3,"file":"coerce-form-submit-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-form-submit-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,yBAAyB,CAAC,OAAyC;IACjF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,cAAc,EACd,YAAY,GAAE,EAAE,EAChB,OAAO,EACP,WAAW,GAAE,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,cAAc,CAAE,CAAC,GACvD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,WAAY;gBAClB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,IACX,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA3CD,8DA2CC"}
@@ -6,9 +6,9 @@ const utilities_1 = require("@rxap/utilities");
6
6
  const coerce_imports_1 = require("../ts-morph/coerce-imports");
7
7
  const coerce_dto_class_1 = require("./coerce-dto-class");
8
8
  const coerce_operation_1 = require("./coerce-operation");
9
+ const table_query_list_1 = require("./table-query-list");
9
10
  function CoerceGetChildrenOperation(options) {
10
- const { tsMorphTransform = utilities_1.noop, paramList = [], propertyList = [], } = options;
11
- let { controllerName } = options;
11
+ const { tsMorphTransform = utilities_1.noop, paramList = [], propertyList = [], operationName = 'get-children', } = options;
12
12
  (0, utilities_1.CoerceArrayItems)(propertyList, [
13
13
  {
14
14
  name: 'hasChildren',
@@ -22,14 +22,12 @@ function CoerceGetChildrenOperation(options) {
22
22
  isType: true,
23
23
  },
24
24
  ], (a, b) => a.name === b.name);
25
- controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
26
25
  paramList.push({
27
26
  name: 'parentUuid',
28
27
  type: 'string',
29
28
  });
30
- return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), {
31
- // TODO : remove after migration to controllerName
32
- controllerName, operationName: 'get-children', paramList, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
29
+ return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName,
30
+ paramList, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
33
31
  const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
34
32
  project,
35
33
  name: (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item'),
@@ -37,11 +35,7 @@ function CoerceGetChildrenOperation(options) {
37
35
  });
38
36
  (0, coerce_imports_1.CoerceImports)(sourceFile, [
39
37
  {
40
- namedImports: ['plainToInstance'],
41
- moduleSpecifier: 'class-transformer',
42
- },
43
- {
44
- namedImports: ['classTransformOptions'],
38
+ namedImports: ['FilterQuery', 'FilterQueryPipe'],
45
39
  moduleSpecifier: '@rxap/nest-utilities',
46
40
  },
47
41
  {
@@ -49,7 +43,7 @@ function CoerceGetChildrenOperation(options) {
49
43
  moduleSpecifier: filePath,
50
44
  },
51
45
  ]);
52
- return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
46
+ return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
53
47
  } }));
54
48
  }
55
49
  exports.CoerceGetChildrenOperation = CoerceGetChildrenOperation;
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-get-children-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-children-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AAEpD,yDAG4B;AAI5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,SAAS,GAAG,EAAE,EACd,YAAY,GAAG,EAAE,GAClB,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACjC,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7D,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IACH,OAAO,IAAA,kCAAe,kCACjB,OAAO;QACV,kDAAkD;QAClD,cAAc,EACd,aAAa,EAAE,cAAc,EAC7B,SAAS,EACT,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,IAAA,mCAAY,EAAC,cAAc,EAAE,OAAO,CAAC;gBAC3C,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,iBAAiB,CAAE;oBACnC,eAAe,EAAE,mBAAmB;iBACrC;gBACD;oBACE,YAAY,EAAE,CAAE,uBAAuB,CAAE;oBACzC,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AApED,gEAoEC"}
1
+ {"version":3,"file":"coerce-get-children-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-children-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AAEpD,yDAG4B;AAC5B,yDAAsD;AAItD,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,SAAS,GAAG,EAAE,EACd,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,cAAc,GAC/B,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IACH,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa;QACb,SAAS,EACT,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,IAAA,mCAAY,EAAC,cAAc,EAAE,OAAO,CAAC;gBAC3C,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,aAAa,EAAE,iBAAiB,CAAE;oBAClD,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,SAAS,EAAE,mCAAgB,EAC3B,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA/DD,gEA+DC"}
@@ -1,18 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CoerceGetDataGridOperation = void 0;
4
- const schematics_utilities_1 = require("@rxap/schematics-utilities");
4
+ const utilities_1 = require("@rxap/utilities");
5
5
  const coerce_imports_1 = require("../ts-morph/coerce-imports");
6
6
  const coerce_dto_class_1 = require("./coerce-dto-class");
7
7
  const coerce_operation_1 = require("./coerce-operation");
8
8
  function CoerceGetDataGridOperation(options) {
9
- let { tsMorphTransform, collection, propertyList, controllerName, } = options;
10
- collection !== null && collection !== void 0 ? collection : (collection = false);
11
- tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
12
- propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
13
- controllerName =
14
- (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-data-grid');
15
- return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
9
+ const { tsMorphTransform = utilities_1.noop, collection = false, propertyList = [], controllerName, } = options;
10
+ return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
16
11
  const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
17
12
  project,
18
13
  name: controllerName,
@@ -22,7 +17,7 @@ function CoerceGetDataGridOperation(options) {
22
17
  namedImports: [dtoClassName],
23
18
  moduleSpecifier: dtoFilePath,
24
19
  });
25
- return Object.assign({ returnType: dtoClassName + (collection ? '[]' : '') }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
20
+ return Object.assign({ returnType: dtoClassName + (collection ? '[]' : '') }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
26
21
  } }));
27
22
  }
28
23
  exports.CoerceGetDataGridOperation = CoerceGetDataGridOperation;
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-get-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-data-grid-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,cAAc,GACf,GAAG,OAAO,CAAC;IACZ,UAAU,aAAV,UAAU,cAAV,UAAU,IAAV,UAAU,GAAK,KAAK,EAAC;IACrB,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,cAAc;QACZ,IAAA,mCAAY,EAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAE7C,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,KAAK,EACpB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAChD,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA9CD,gEA8CC"}
1
+ {"version":3,"file":"coerce-get-data-grid-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-data-grid-operation.ts"],"names":[],"mappings":";;;AACA,+CAAuC;AACvC,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,UAAU,GAAE,KAAK,EACjB,YAAY,GAAG,EAAE,EACjB,cAAc,GACf,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,KAAK,EACpB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAChD,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AA1CD,gEA0CC"}
@@ -1,4 +1,4 @@
1
- import { TypeImport } from '@rxap/ts-morph';
1
+ import { NormalizedUpstreamOptions, TypeImport } from '@rxap/ts-morph';
2
2
  import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
3
3
  import { OperationOptions } from './add-operation-to-controller';
4
4
  import { CoerceOperationOptions } from './coerce-operation';
@@ -20,10 +20,6 @@ export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperation
20
20
  */
21
21
  rowIdProperty?: string | null;
22
22
  operationName?: string;
23
- /**
24
- * true - the suffix '-table' will not be enforced for the controller name
25
- */
26
- skipCoerceTableSuffix?: boolean;
27
23
  /**
28
24
  * The base name of the page and row DTO class name. Defaults to the controller name
29
25
  */
@@ -31,10 +27,11 @@ export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperation
31
27
  coerceToRowDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
32
28
  coerceToPageDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
33
29
  coerceGetPageDataMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceGetPageOperationOptions) => void;
30
+ upstream?: NormalizedUpstreamOptions | null;
34
31
  }
35
32
  export declare function GetPageOperationColumnToDtoClassProperty(property: GetPageOperationProperty): DtoClassProperty;
36
33
  export declare function GetPageOperationColumnToCodeText(property: GetPageOperationProperty): string;
37
34
  export declare function CoerceToRowDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions): void;
38
35
  export declare function CoerceToPageDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions): void;
39
- export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceGetPageOperationOptions): void;
36
+ export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, { upstream }: CoerceGetPageOperationOptions): void;
40
37
  export declare function CoerceGetPageOperation(options: Readonly<CoerceGetPageOperationOptions>): import("@angular-devkit/schematics").Rule;
@@ -5,12 +5,12 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
5
5
  const ts_morph_1 = require("@rxap/ts-morph");
6
6
  const utilities_1 = require("@rxap/utilities");
7
7
  const ts_morph_2 = require("ts-morph");
8
- const coerce_class_method_1 = require("../coerce-class-method");
9
- const coerce_imports_1 = require("../ts-morph/coerce-imports");
10
8
  const coerce_type_alias_1 = require("../ts-morph/coerce-type-alias");
9
+ const coerce_dto_class_1 = require("./coerce-dto-class");
11
10
  const coerce_operation_1 = require("./coerce-operation");
12
11
  const coerce_page_dto_class_1 = require("./coerce-page-dto-class");
13
12
  const coerce_row_dto_class_1 = require("./coerce-row-dto-class");
13
+ const table_query_list_1 = require("./table-query-list");
14
14
  function GetPageOperationColumnTypeToTypeImport(property) {
15
15
  var _a, _b;
16
16
  if (!property.type) {
@@ -50,7 +50,7 @@ function GetPageOperationColumnToCodeText(property) {
50
50
  exports.GetPageOperationColumnToCodeText = GetPageOperationColumnToCodeText;
51
51
  function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options) {
52
52
  var _a;
53
- (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
53
+ (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toRowDto', {
54
54
  scope: ts_morph_2.Scope.Private,
55
55
  returnType: rowClassName,
56
56
  parameters: [
@@ -88,7 +88,7 @@ function CoerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, option
88
88
  }
89
89
  exports.CoerceToRowDtoMethod = CoerceToRowDtoMethod;
90
90
  function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options) {
91
- (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'toPageDto', {
91
+ (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'toPageDto', {
92
92
  scope: ts_morph_2.Scope.Private,
93
93
  returnType: pageClassName,
94
94
  parameters: [
@@ -130,8 +130,55 @@ function CoerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowC
130
130
  });
131
131
  }
132
132
  exports.CoerceToPageDtoMethod = CoerceToPageDtoMethod;
133
- function CoerceGetPageDataMethod(sourceFile, classDeclaration, options) {
134
- (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
133
+ function CoerceGetPageDataMethod(sourceFile, classDeclaration, { upstream }) {
134
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
135
+ const statements = [];
136
+ if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
137
+ const commandClassName = (0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId);
138
+ const memberName = (0, schematics_utilities_1.camelize)(commandClassName);
139
+ (0, coerce_dto_class_1.CoercePropertyDeclaration)(classDeclaration, memberName, {
140
+ type: commandClassName,
141
+ scope: ts_morph_2.Scope.Private,
142
+ hasExclamationToken: true,
143
+ decorators: [
144
+ {
145
+ name: 'Inject',
146
+ arguments: [commandClassName],
147
+ },
148
+ ],
149
+ });
150
+ (0, ts_morph_1.CoerceImports)(sourceFile, [
151
+ {
152
+ namedImports: [commandClassName],
153
+ moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope),
154
+ }, {
155
+ namedImports: ['Inject'],
156
+ moduleSpecifier: '@nestjs/common',
157
+ },
158
+ ]);
159
+ statements.push(`const response = await this.${memberName}.execute({
160
+ parameters: {
161
+ ${(_b = (_a = upstream.mapper) === null || _a === void 0 ? void 0 : _a.pageIndex) !== null && _b !== void 0 ? _b : 'pageIndex'}: pageIndex,
162
+ ${(_d = (_c = upstream.mapper) === null || _c === void 0 ? void 0 : _c.pageSize) !== null && _d !== void 0 ? _d : 'pageSize'}: pageSize,
163
+ ${(_f = (_e = upstream.mapper) === null || _e === void 0 ? void 0 : _e.sortBy) !== null && _f !== void 0 ? _f : 'sortBy'}: sortBy,
164
+ ${(_h = (_g = upstream.mapper) === null || _g === void 0 ? void 0 : _g.sortDirection) !== null && _h !== void 0 ? _h : 'sortDirection'}: sortDirection,
165
+ filter: ${((_j = upstream.mapper) === null || _j === void 0 ? void 0 : _j.filter) ? `filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';')` :
166
+ 'filter'},
167
+ },
168
+ });`, 'return {', ` list: response.${(_l = (_k = upstream.mapper) === null || _k === void 0 ? void 0 : _k.list) !== null && _l !== void 0 ? _l : 'list'} ?? [],`, ` total: response.${(_o = (_m = upstream.mapper) === null || _m === void 0 ? void 0 : _m.total) !== null && _o !== void 0 ? _o : 'total'} ?? 0,`, '};');
169
+ }
170
+ else {
171
+ statements.push(`const response = await ((() => { throw new NotImplementedException(); })() as any).execute({
172
+ parameters: {
173
+ page: pageIndex,
174
+ size: pageSize,
175
+ sort: sortBy,
176
+ order: sortDirection,
177
+ filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
178
+ },
179
+ });`, 'return {', ' list: response.entities ?? [],', ' total: response.maxCount ?? 0,', '};');
180
+ }
181
+ (0, ts_morph_1.CoerceClassMethod)(classDeclaration, 'getPageData', {
135
182
  scope: ts_morph_2.Scope.Public,
136
183
  returnType: 'Promise<{ list: RawRowData[], total: number }>',
137
184
  isAsync: true,
@@ -157,42 +204,28 @@ function CoerceGetPageDataMethod(sourceFile, classDeclaration, options) {
157
204
  type: 'FilterQuery[]',
158
205
  },
159
206
  ],
160
- statements: [
161
- `const response = await ((() => { throw new NotImplementedException() })() as any).execute({
162
- parameters: {
163
- page: pageIndex,
164
- size: pageSize,
165
- sort: sortBy,
166
- order: sortDirection,
167
- filter: filter.map((item) => \`\${ item.column }:\${ item.filter }\`).join(';'),
168
- },
169
- });`,
170
- 'return {',
171
- ' list: response.entities ?? [],',
172
- ' total: response.maxCount ?? 0,',
173
- '};',
174
- ],
207
+ statements: statements,
175
208
  });
176
209
  }
177
210
  exports.CoerceGetPageDataMethod = CoerceGetPageDataMethod;
178
211
  function CoerceGetPageOperation(options) {
179
- let { skipCoerceTableSuffix, operationName, rowIdProperty, tsMorphTransform, propertyList, controllerName, responseDtoName, context, coerceToRowDtoMethod, coerceToPageDtoMethod, coerceGetPageDataMethod, } = options;
180
- tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
181
- controllerName = skipCoerceTableSuffix ? controllerName : (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-table');
182
- operationName !== null && operationName !== void 0 ? operationName : (operationName = 'get-page');
183
- responseDtoName !== null && responseDtoName !== void 0 ? responseDtoName : (responseDtoName = (0, utilities_1.joinWithDash)([context, controllerName]));
184
- coerceToRowDtoMethod !== null && coerceToRowDtoMethod !== void 0 ? coerceToRowDtoMethod : (coerceToRowDtoMethod = CoerceToRowDtoMethod);
185
- coerceToPageDtoMethod !== null && coerceToPageDtoMethod !== void 0 ? coerceToPageDtoMethod : (coerceToPageDtoMethod = CoerceToPageDtoMethod);
186
- coerceGetPageDataMethod !== null && coerceGetPageDataMethod !== void 0 ? coerceGetPageDataMethod : (coerceGetPageDataMethod = CoerceGetPageDataMethod);
187
- return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName,
188
- operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
212
+ const { operationName = 'get-page', rowIdProperty, tsMorphTransform = utilities_1.noop, propertyList, context, coerceToRowDtoMethod = CoerceToRowDtoMethod, coerceToPageDtoMethod = CoerceToPageDtoMethod, coerceGetPageDataMethod = CoerceGetPageDataMethod, upstream, } = options;
213
+ let { responseDtoName } = options;
214
+ return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
215
+ if (!responseDtoName) {
216
+ responseDtoName = controllerName;
217
+ }
218
+ else {
219
+ responseDtoName = (0, utilities_1.CoercePrefix)(responseDtoName, controllerName + '-');
220
+ }
221
+ console.log(`[TEST]`, { responseDtoName, context, controllerName, operationName });
189
222
  const { className: rowClassName, filePath: rowFilePath, sourceFile: rowSourceFile, } = (0, coerce_row_dto_class_1.CoerceRowDtoClass)({
190
223
  project,
191
224
  name: responseDtoName,
192
225
  propertyList: propertyList.map(GetPageOperationColumnToDtoClassProperty),
193
226
  rowIdType: rowIdProperty === null ? null : undefined,
194
227
  });
195
- (0, coerce_imports_1.CoerceImports)(rowSourceFile, propertyList
228
+ (0, ts_morph_1.CoerceImports)(rowSourceFile, propertyList
196
229
  .map(c => GetPageOperationColumnTypeToTypeImport(c))
197
230
  .filter(type => (0, ts_morph_1.RequiresTypeImport)(type))
198
231
  .map(type => (0, ts_morph_1.TypeImportToImportStructure)(type)));
@@ -205,7 +238,13 @@ function CoerceGetPageOperation(options) {
205
238
  coerceGetPageDataMethod(sourceFile, classDeclaration, options);
206
239
  coerceToRowDtoMethod(sourceFile, classDeclaration, rowClassName, options);
207
240
  coerceToPageDtoMethod(sourceFile, classDeclaration, pageClassName, rowClassName, options);
208
- (0, coerce_imports_1.CoerceImports)(sourceFile, [
241
+ if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
242
+ (0, ts_morph_1.CoerceNestModuleProvider)(moduleSourceFile, {
243
+ providerObject: (0, ts_morph_1.OperationIdToCommandClassName)(upstream.operationId),
244
+ moduleSpecifier: (0, ts_morph_1.OperationIdToCommandClassImportPath)(upstream.operationId, upstream.scope),
245
+ });
246
+ }
247
+ (0, ts_morph_1.CoerceImports)(sourceFile, [
209
248
  {
210
249
  namedImports: ['FilterQuery', 'FilterQueryPipe'],
211
250
  moduleSpecifier: '@rxap/nest-utilities',
@@ -231,35 +270,7 @@ function CoerceGetPageOperation(options) {
231
270
  isExported: false,
232
271
  type: 'any',
233
272
  });
234
- return Object.assign({ queryList: [
235
- {
236
- name: 'pageIndex',
237
- type: 'number',
238
- defaultValue: '0',
239
- },
240
- {
241
- name: 'pageSize',
242
- type: 'number',
243
- defaultValue: '5',
244
- },
245
- {
246
- name: 'sortDirection',
247
- type: 'string',
248
- defaultValue: w => w.quote('desc'),
249
- },
250
- {
251
- name: 'sortBy',
252
- type: 'string',
253
- defaultValue: w => w.quote('__updatedAt'),
254
- },
255
- {
256
- name: 'filter',
257
- type: 'FilterQuery[]',
258
- pipeList: ['new FilterQueryPipe()'],
259
- // the FilterQueryPipe will set the default value to an empty array
260
- hasQuestionToken: false,
261
- },
262
- ], returnType: pageClassName, statements: [
273
+ return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: pageClassName, statements: [
263
274
  'const data = await this.getPageData(sortBy, sortDirection, pageSize, pageIndex, filter);',
264
275
  'return plainToInstance(',
265
276
  ' ' + pageClassName + ',',
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-get-page-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-page-operation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"coerce-get-page-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-page-operation.ts"],"names":[],"mappings":"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"}
@@ -2,5 +2,6 @@ import { CoerceOperationOptions } from './coerce-operation';
2
2
  import { DtoClassProperty } from './create-dto-class';
3
3
  export interface CoerceGetRootOperationOptions extends Omit<CoerceOperationOptions, 'operationName'> {
4
4
  propertyList?: DtoClassProperty[];
5
+ operationName?: string;
5
6
  }
6
7
  export declare function CoerceGetRootOperation(options: Readonly<CoerceGetRootOperationOptions>): import("@angular-devkit/schematics").Rule;
@@ -6,9 +6,9 @@ const utilities_1 = require("@rxap/utilities");
6
6
  const coerce_imports_1 = require("../ts-morph/coerce-imports");
7
7
  const coerce_dto_class_1 = require("./coerce-dto-class");
8
8
  const coerce_operation_1 = require("./coerce-operation");
9
+ const table_query_list_1 = require("./table-query-list");
9
10
  function CoerceGetRootOperation(options) {
10
- const { tsMorphTransform = utilities_1.noop, propertyList = [], } = options;
11
- let { controllerName } = options;
11
+ const { tsMorphTransform = utilities_1.noop, propertyList = [], operationName = 'get-root', } = options;
12
12
  (0, utilities_1.CoerceArrayItems)(propertyList, [
13
13
  {
14
14
  name: 'hasChildren',
@@ -22,8 +22,7 @@ function CoerceGetRootOperation(options) {
22
22
  isType: true,
23
23
  },
24
24
  ], (a, b) => a.name === b.name);
25
- controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-tree-table');
26
- return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { controllerName, operationName: 'get-root', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
25
+ return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName, moduleSourceFile) => {
27
26
  const { className, filePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
28
27
  project,
29
28
  name: (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-item'),
@@ -31,11 +30,7 @@ function CoerceGetRootOperation(options) {
31
30
  });
32
31
  (0, coerce_imports_1.CoerceImports)(sourceFile, [
33
32
  {
34
- namedImports: ['plainToInstance'],
35
- moduleSpecifier: 'class-transformer',
36
- },
37
- {
38
- namedImports: ['classTransformOptions'],
33
+ namedImports: ['FilterQuery', 'FilterQueryPipe'],
39
34
  moduleSpecifier: '@rxap/nest-utilities',
40
35
  },
41
36
  {
@@ -43,7 +38,7 @@ function CoerceGetRootOperation(options) {
43
38
  moduleSpecifier: filePath,
44
39
  },
45
40
  ]);
46
- return Object.assign({ returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName));
41
+ return Object.assign({ queryList: table_query_list_1.TABLE_QUERY_LIST, returnType: className + '[]' }, tsMorphTransform(project, sourceFile, classDeclaration, controllerName, moduleSourceFile));
47
42
  } }));
48
43
  }
49
44
  exports.CoerceGetRootOperation = CoerceGetRootOperation;
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,GAClB,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACjC,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7D,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,cAAc,EACd,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,IAAA,mCAAY,EAAC,cAAc,EAAE,OAAO,CAAC;gBAC3C,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,iBAAiB,CAAE;oBACnC,eAAe,EAAE,mBAAmB;iBACrC;gBACD;oBACE,YAAY,EAAE,CAAE,uBAAuB,CAAE;oBACzC,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAC3E;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA7DD,wDA6DC"}
1
+ {"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,qEAGoC;AACpC,+CAGyB;AACzB,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAE5B,yDAAsD;AAOtD,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,UAAU,GAC3B,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,aAAa,EACb,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,EAAE;YAEF,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,IAAA,mCAAY,EAAC,cAAc,EAAE,OAAO,CAAC;gBAC3C,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,YAAY,EAAE,CAAE,aAAa,EAAE,iBAAiB,CAAE;oBAClD,eAAe,EAAE,sBAAsB;iBACxC;gBACD;oBACE,YAAY,EAAE,CAAE,SAAS,CAAE;oBAC3B,eAAe,EAAE,QAAQ;iBAC1B;aACF,CAAC,CAAC;YAEH,uBACE,SAAS,EAAE,mCAAgB,EAC3B,UAAU,EAAE,SAAS,GAAG,IAAI,IACzB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAC7F;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAzDD,wDAyDC"}
@@ -9,7 +9,7 @@ export interface CoerceOperationOptions extends TsMorphNestProjectTransformOptio
9
9
  skipCoerce?: boolean;
10
10
  paramList?: OperationParameter[];
11
11
  queryList?: OperationParameter[];
12
- tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string) => Partial<OperationOptions>;
12
+ tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string, moduleSourceFile: SourceFile) => Partial<OperationOptions>;
13
13
  operationName: string;
14
14
  path?: string;
15
15
  controllerPath?: string;
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CoerceOperation = exports.CoerceOperationParamList = void 0;
4
4
  const schematics_1 = require("@angular-devkit/schematics");
5
5
  const schematics_utilities_1 = require("@rxap/schematics-utilities");
6
+ const utilities_1 = require("@rxap/utilities");
6
7
  const path_1 = require("path");
7
8
  const ts_morph_transform_1 = require("../ts-morph-transform");
8
9
  const add_operation_to_controller_1 = require("./add-operation-to-controller");
@@ -57,7 +58,7 @@ function CoerceOperation(options) {
57
58
  }
58
59
  directory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', nestModule);
59
60
  return (0, schematics_1.chain)([
60
- () => console.log(`Coerce Operation '${operationName}' with path '${path}' in the controller '${nestController}' in the module '${nestModule}'`),
61
+ () => console.log(`Coerce Operation '${operationName}' with path '${path !== null && path !== void 0 ? path : '<empty>'}' in the controller '${nestController}' in the module '${nestModule}'`),
61
62
  (0, coerce_nest_controller_1.CoerceNestController)({
62
63
  project,
63
64
  feature,
@@ -75,10 +76,12 @@ function CoerceOperation(options) {
75
76
  feature,
76
77
  shared,
77
78
  directory,
78
- }, project => {
79
- const sourceFile = project.getSourceFileOrThrow(`${nestController}.controller.ts`);
80
- const classDeclaration = sourceFile.getClassOrThrow(`${(0, schematics_utilities_1.classify)(nestController)}Controller`);
81
- const operationOptions = tsMorphTransform(project, sourceFile, classDeclaration, nestController);
79
+ // must be set to false are some specializations of this function need to access more files then only the
80
+ // controller and module source file
81
+ filter: false,
82
+ }, (project, [controllerSourceFile, moduleSourceFile]) => {
83
+ const classDeclaration = controllerSourceFile.getClassOrThrow(`${(0, schematics_utilities_1.classify)(nestController)}Controller`);
84
+ const operationOptions = tsMorphTransform(project, controllerSourceFile, classDeclaration, nestController, moduleSourceFile);
82
85
  if (controllerPath) {
83
86
  classDeclaration.getDecoratorOrThrow('Controller').set({
84
87
  arguments: [w => w.quote(controllerPath)],
@@ -95,10 +98,10 @@ function CoerceOperation(options) {
95
98
  });
96
99
  }
97
100
  CoerceOperationParamList(paramList, classDeclaration);
98
- (0, add_operation_to_controller_1.AddOperationToController)(sourceFile, classDeclaration, operationName, Object.assign({ isAsync: true, paramList,
101
+ (0, add_operation_to_controller_1.AddOperationToController)(controllerSourceFile, classDeclaration, operationName, Object.assign({ isAsync: true, paramList,
99
102
  queryList,
100
103
  path }, operationOptions));
101
- }),
104
+ }, [`${nestController}.controller.ts?`, `${(0, utilities_1.dasherize)(nestModule)}.module.ts?`]),
102
105
  ]);
103
106
  }
104
107
  exports.CoerceOperation = CoerceOperation;
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-operation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"coerce-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-operation.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,5 @@
1
- import { ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, Project } from 'ts-morph';
2
- import { DtoClassProperty } from './create-dto-class';
3
- export interface CoercePageDtoClassOptions {
4
- project: Project;
5
- name: string;
6
- propertyList?: DtoClassProperty[];
7
- classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
8
- importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
1
+ import { CoerceDtoClassOptions } from './coerce-dto-class';
2
+ export interface CoercePageDtoClassOptions extends CoerceDtoClassOptions {
9
3
  rowClassName: string;
10
4
  rowFilePath: string;
11
5
  }
@@ -2,36 +2,62 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CoercePageDtoClass = void 0;
4
4
  const schematics_utilities_1 = require("@rxap/schematics-utilities");
5
+ const ts_morph_1 = require("@rxap/ts-morph");
6
+ const utilities_1 = require("@rxap/utilities");
5
7
  const path_1 = require("path");
6
8
  const coerce_dto_class_1 = require("./coerce-dto-class");
7
9
  function CoercePageDtoClass(options) {
8
- let { project, name, propertyList, classStructure, importStructureList, rowClassName, rowFilePath, } = options;
9
- importStructureList !== null && importStructureList !== void 0 ? importStructureList : (importStructureList = []);
10
- importStructureList.push({
11
- namedImports: ['PageDto'],
12
- moduleSpecifier: '@rxap/nest-dto',
13
- }, {
14
- namedImports: [rowClassName],
15
- moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
16
- });
17
- classStructure !== null && classStructure !== void 0 ? classStructure : (classStructure = {});
18
- classStructure.extends = `PageDto<${rowClassName}>`;
19
- propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = [
10
+ const { project, name, propertyList = [], rowClassName, rowFilePath, tsMorphTransform = utilities_1.noop, } = options;
11
+ (0, utilities_1.CoerceArrayItems)(propertyList, [
20
12
  {
21
13
  name: 'rows',
22
14
  type: rowClassName,
23
15
  isArray: true,
24
16
  isType: true,
25
17
  },
18
+ {
19
+ name: 'pageSize',
20
+ type: 'number',
21
+ },
22
+ {
23
+ name: 'pageIndex',
24
+ type: 'number',
25
+ },
26
+ {
27
+ name: 'total',
28
+ type: 'number',
29
+ },
30
+ {
31
+ name: 'sortDirection',
32
+ type: 'string',
33
+ isOptional: true,
34
+ },
35
+ {
36
+ name: 'sortBy',
37
+ type: 'string',
38
+ isOptional: true,
39
+ },
40
+ {
41
+ name: 'filter',
42
+ type: 'FilterQueryDto',
43
+ isArray: true,
44
+ isType: true,
45
+ isOptional: true,
46
+ }
26
47
  ]);
27
- propertyList.push();
28
- return (0, coerce_dto_class_1.CoerceDtoClass)({
29
- project,
30
- name: (0, schematics_utilities_1.CoerceSuffix)(name, '-page'),
31
- propertyList,
32
- classStructure,
33
- importStructureList,
34
- });
48
+ return (0, coerce_dto_class_1.CoerceDtoClass)(Object.assign(Object.assign({}, options), { project, name: (0, schematics_utilities_1.CoerceSuffix)(name, '-page'), propertyList, tsMorphTransform: (p, sourceFile, classDeclaration) => {
49
+ (0, ts_morph_1.CoerceImports)(sourceFile, [
50
+ {
51
+ namedImports: [rowClassName],
52
+ moduleSpecifier: `./${(0, path_1.basename)(rowFilePath)}`,
53
+ },
54
+ {
55
+ namedImports: ['FilterQueryDto'],
56
+ moduleSpecifier: '@rxap/nest-dto',
57
+ }
58
+ ]);
59
+ tsMorphTransform(p, sourceFile, classDeclaration);
60
+ } }));
35
61
  }
36
62
  exports.CoercePageDtoClass = CoercePageDtoClass;
37
63
  //# sourceMappingURL=coerce-page-dto-class.js.map