@rxap/schematics-ts-morph 16.1.0-dev.13 → 16.1.0-dev.15

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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,18 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [16.1.0-dev.15](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.14...@rxap/schematics-ts-morph@16.1.0-dev.15) (2024-03-07)
7
+
8
+ ### Features
9
+
10
+ - support string utilities in handlebar templates ([699005d](https://gitlab.com/rxap/packages/commit/699005d9b85e2a36da072112f46513136872a86a))
11
+
12
+ # [16.1.0-dev.14](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.13...@rxap/schematics-ts-morph@16.1.0-dev.14) (2024-03-07)
13
+
14
+ ### Bug Fixes
15
+
16
+ - ensure the coerce array items function is used instead of unshift ([17b8d10](https://gitlab.com/rxap/packages/commit/17b8d10fa3df7eaec51180b79216d5c4913b3b1d))
17
+
6
18
  # [16.1.0-dev.13](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.12...@rxap/schematics-ts-morph@16.1.0-dev.13) (2024-03-07)
7
19
 
8
20
  ### Bug Fixes
package/README.md CHANGED
@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
17
17
  ```
18
18
  **Install peer dependencies:**
19
19
  ```bash
20
- yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.1 @rxap/ts-morph@^1.1.0-dev.12 @rxap/utilities@^16.1.0-dev.6 @rxap/workspace-ts-morph@^16.0.2-dev.1 colors@^1.4.0 handlebars@^4.7.7 ts-morph@^18.0.0 tslib@2.6.2
20
+ yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.1 @rxap/ts-morph@^1.1.0-dev.13 @rxap/utilities@^16.1.0-dev.6 @rxap/workspace-ts-morph@^16.0.2-dev.1 colors@^1.4.0 handlebars@^4.7.7 ts-morph@^18.0.0 tslib@2.6.2
21
21
  ```
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.1.0-dev.13",
2
+ "version": "16.1.0-dev.15",
3
3
  "name": "@rxap/schematics-ts-morph",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -13,7 +13,7 @@
13
13
  "@angular-devkit/core": "^16.1.4",
14
14
  "@angular-devkit/schematics": "^16.1.4",
15
15
  "@rxap/schematics-utilities": "^16.0.1-dev.1",
16
- "@rxap/ts-morph": "^1.1.0-dev.12",
16
+ "@rxap/ts-morph": "^1.1.0-dev.13",
17
17
  "@rxap/utilities": "^16.1.0-dev.6",
18
18
  "@rxap/workspace-ts-morph": "^16.0.2-dev.1",
19
19
  "colors": "^1.4.0",
@@ -49,7 +49,7 @@
49
49
  },
50
50
  {
51
51
  "package": "@rxap/ts-morph",
52
- "version": "1.1.0-dev.12"
52
+ "version": "1.1.0-dev.13"
53
53
  },
54
54
  {
55
55
  "package": "@rxap/utilities",
@@ -71,7 +71,7 @@
71
71
  "directory": "packages/schematic/ts-morph"
72
72
  },
73
73
  "type": "commonjs",
74
- "gitHead": "86465ff6bf6b3ae2429379c43143a40d2110469b",
74
+ "gitHead": "01f49c722df2528196780e097c38ed9d419b9e14",
75
75
  "main": "./src/index.js",
76
76
  "types": "./src/index.d.ts"
77
77
  }
@@ -1,7 +1,7 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
+ import Handlebars from 'handlebars';
2
3
  import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
3
4
  import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
4
- import Handlebars from 'handlebars';
5
5
  import 'colors';
6
6
  export interface TemplateOptions {
7
7
  url?: string;
@@ -6,11 +6,12 @@ const core_1 = require("@angular-devkit/core");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
7
  const schematics_utilities_1 = require("@rxap/schematics-utilities");
8
8
  const ts_morph_1 = require("@rxap/ts-morph");
9
+ const utilities_1 = require("@rxap/utilities");
10
+ const handlebars_1 = tslib_1.__importDefault(require("handlebars"));
9
11
  const path_1 = require("path");
10
12
  const ts_morph_transform_1 = require("../ts-morph-transform");
11
13
  const build_angular_base_path_1 = require("./build-angular-base-path");
12
14
  const has_component_1 = require("./has-component");
13
- const handlebars_1 = tslib_1.__importDefault(require("handlebars"));
14
15
  require("colors");
15
16
  function applyContentHandlebars(options) {
16
17
  return (entry) => {
@@ -27,6 +28,12 @@ function applyContentHandlebars(options) {
27
28
  return index === 0 ? line : indent + line;
28
29
  }).join('\n'));
29
30
  });
31
+ handlebars_1.default.registerHelper('dasherize', value => (0, utilities_1.dasherize)(value));
32
+ handlebars_1.default.registerHelper('classify', value => (0, schematics_utilities_1.classify)(value));
33
+ handlebars_1.default.registerHelper('decamelize', value => (0, utilities_1.decamelize)(value));
34
+ handlebars_1.default.registerHelper('camelize', value => (0, utilities_1.camelize)(value));
35
+ handlebars_1.default.registerHelper('underscore', value => (0, utilities_1.underscore)(value));
36
+ handlebars_1.default.registerHelper('capitalize', value => (0, utilities_1.capitalize)(value));
30
37
  try {
31
38
  const template = handlebars_1.default.compile(content.toString());
32
39
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CoerceTableSelectOperationRule = void 0;
4
4
  const ts_morph_1 = require("@rxap/ts-morph");
5
+ const utilities_1 = require("@rxap/utilities");
5
6
  const coerce_get_page_operation_1 = require("./coerce-get-page-operation");
6
7
  function CoerceTableSelectOperationRule(options) {
7
8
  const { propertyList = [], rowIdProperty, rowDisplayProperty, rowValueProperty = (0, ts_morph_1.NormalizeDataProperty)(rowIdProperty), } = options;
8
- propertyList.unshift(Object.assign(Object.assign({}, rowDisplayProperty), { name: '__display', source: rowDisplayProperty.name }));
9
- propertyList.unshift(Object.assign(Object.assign({}, rowValueProperty), { name: '__value', source: rowValueProperty.name }));
9
+ (0, utilities_1.CoerceArrayItems)(propertyList, [
10
+ Object.assign(Object.assign({}, rowValueProperty), { name: '__value', source: rowValueProperty.name }),
11
+ Object.assign(Object.assign({}, rowDisplayProperty), { name: '__display', source: rowDisplayProperty.name })
12
+ ], { compareTo: (a, b) => a.name === b.name, unshift: true });
10
13
  return (0, coerce_get_page_operation_1.CoerceGetPageOperation)(Object.assign(Object.assign({}, options), { propertyList: propertyList, rowIdProperty }));
11
14
  }
12
15
  exports.CoerceTableSelectOperationRule = CoerceTableSelectOperationRule;
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AACxB,2EAGqC;AAQrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,MAAM,EACJ,YAAY,GAAG,EAAE,EACjB,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,aAAa,CAAC,GACxD,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,OAAO,iCACf,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI,IAC/B,CAAC;IACH,YAAY,CAAC,OAAO,iCACf,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI,IAC7B,CAAC;IAEH,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,YAAY,EAAE,YAAY,EAC1B,aAAa,IACb,CAAC;AAEL,CAAC;AAzBD,wEAyBC"}
1
+ {"version":3,"file":"coerce-table-select-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-operation.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AACxB,+CAAmD;AACnD,2EAGqC;AAQrC,SAAgB,8BAA8B,CAAC,OAA0C;IACvF,MAAM,EACJ,YAAY,GAAG,EAAE,EACjB,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,aAAa,CAAC,GACxD,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;wCAExB,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI;wCAG1B,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI;KAElC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9D,OAAO,IAAA,kDAAsB,kCACxB,OAAO,KACV,YAAY,EAAE,YAAY,EAC1B,aAAa,IACb,CAAC;AAEL,CAAC;AA3BD,wEA2BC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CoerceTableSelectValueResolveOperationRule = exports.BuildTableSelectValueResolveUpstreamGetParametersImplementation = void 0;
4
4
  const ts_morph_1 = require("@rxap/ts-morph");
5
+ const utilities_1 = require("@rxap/utilities");
5
6
  const coerce_operation_1 = require("./coerce-operation");
6
7
  function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDeclaration, moduleSourceFile, dto, options) {
7
8
  return () => {
@@ -21,9 +22,11 @@ function BuildTableSelectValueResolveUpstreamGetParametersImplementation(classDe
21
22
  exports.BuildTableSelectValueResolveUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation;
22
23
  function CoerceTableSelectValueResolveOperationRule(options) {
23
24
  const { buildUpstreamGetParametersImplementation = BuildTableSelectValueResolveUpstreamGetParametersImplementation, propertyList = [], rowIdProperty, rowDisplayProperty, rowValueProperty = (0, ts_morph_1.NormalizeDataProperty)(rowIdProperty), } = options;
24
- propertyList.unshift(Object.assign(Object.assign({}, rowDisplayProperty), { name: '__display', source: rowDisplayProperty.name }));
25
- propertyList.unshift(Object.assign(Object.assign({}, rowValueProperty), { name: '__value', source: rowValueProperty.name }));
26
- propertyList.unshift((0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, rowIdProperty), { name: '__rowId', source: rowIdProperty.name }), 'number'));
25
+ (0, utilities_1.CoerceArrayItems)(propertyList, [
26
+ Object.assign(Object.assign({}, rowValueProperty), { name: '__value', source: rowValueProperty.name }),
27
+ Object.assign(Object.assign({}, rowDisplayProperty), { name: '__display', source: rowDisplayProperty.name }),
28
+ (0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, rowIdProperty), { name: '__rowId', source: rowIdProperty.name }), 'number')
29
+ ], { compareTo: (a, b) => a.name === b.name, unshift: true });
27
30
  return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { buildUpstreamGetParametersImplementation }));
28
31
  }
29
32
  exports.CoerceTableSelectValueResolveOperationRule = CoerceTableSelectValueResolveOperationRule;
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAOxB,yDAI4B;AAS5B,SAAgB,+DAA+D,CAClB,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAgE;IAE3H,OAAO,GAAG,EAAE;;QACV,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,IAAI,QAAQ,EAAE;YACZ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;gBAChD,IAAI,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,EAAE;oBAC1B,OAAO,mBAAoB,QAAQ,CAAC,MAAM,CAAC,KAAM,aAAa,CAAC;iBAChE;aACF;YACD,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAlBD,0IAkBC;AAED,SAAgB,0CAA0C,CAAC,OAAsD;IAC/G,MAAM,EACJ,wCAAwC,GAAG,+DAA+D,EAC1G,YAAY,GAAG,EAAE,EACjB,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,aAAa,CAAC,GACxD,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,OAAO,iCACf,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI,IAC/B,CAAC;IACH,YAAY,CAAC,OAAO,iCACf,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI,IAC7B,CAAC;IACH,YAAY,CAAC,OAAO,CAAC,IAAA,gCAAqB,kCACrC,aAAa,KAChB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,aAAa,CAAC,IAAI,KACzB,QAAQ,CAAC,CAAC,CAAC;IAEd,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,wCAAwC,IACxC,CAAC;AACL,CAAC;AA7BD,gGA6BC"}
1
+ {"version":3,"file":"coerce-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AACxB,+CAAmD;AAOnD,yDAI4B;AAS5B,SAAgB,+DAA+D,CAClB,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAgE;IAE3H,OAAO,GAAG,EAAE;;QACV,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,IAAI,QAAQ,EAAE;YACZ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;gBAChD,IAAI,MAAA,QAAQ,CAAC,MAAM,0CAAE,KAAK,EAAE;oBAC1B,OAAO,mBAAoB,QAAQ,CAAC,MAAM,CAAC,KAAM,aAAa,CAAC;iBAChE;aACF;YACD,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAlBD,0IAkBC;AAED,SAAgB,0CAA0C,CAAC,OAAsD;IAC/G,MAAM,EACJ,wCAAwC,GAAG,+DAA+D,EAC1G,YAAY,GAAG,EAAE,EACjB,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,aAAa,CAAC,GACxD,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;wCAExB,gBAAgB,KACnB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,gBAAgB,CAAC,IAAI;wCAG1B,kBAAkB,KACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,kBAAkB,CAAC,IAAI;QAEjC,IAAA,gCAAqB,kCAChB,aAAa,KAChB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,aAAa,CAAC,IAAI,KACzB,QAAQ,CAAC;KACb,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9D,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,wCAAwC,IACxC,CAAC;AACL,CAAC;AA/BD,gGA+BC"}