@rxap/schematic-angular 16.2.0-dev.13 → 16.2.0-dev.14

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,12 @@
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.2.0-dev.14](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.13...@rxap/schematic-angular@16.2.0-dev.14) (2024-02-26)
7
+
8
+ ### Bug Fixes
9
+
10
+ - ensure data grid item form control imports are merged ([efab2fd](https://gitlab.com/rxap/packages/commit/efab2fd67eefa99229b797e4749e6f9129305ae9))
11
+
6
12
  # [16.2.0-dev.13](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.12...@rxap/schematic-angular@16.2.0-dev.13) (2024-02-26)
7
13
 
8
14
  ### Bug Fixes
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.2.0-dev.13",
2
+ "version": "16.2.0-dev.14",
3
3
  "name": "@rxap/schematic-angular",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -76,7 +76,7 @@
76
76
  },
77
77
  "schematics": "./collection.json",
78
78
  "type": "commonjs",
79
- "gitHead": "4b0d80812485da49cb92ac8c5c4b54384999923b",
79
+ "gitHead": "98c835d0c876d3446e01bc889b8befbe72d939c8",
80
80
  "main": "./src/index.js",
81
81
  "types": "./src/index.d.ts"
82
82
  }
@@ -41,6 +41,9 @@ function NormalizeBaseDataGridItem(item) {
41
41
  const importList = (_e = item.importList) !== null && _e !== void 0 ? _e : [];
42
42
  const pipeList = (0, pipe_option_1.NormalizePipeOptionList)(item.pipeList);
43
43
  (0, utilities_1.CoerceArrayItems)(importList, pipeList.map(pipe_option_1.PipeOptionToTypeImport), (a, b) => a.name === b.name && a.namedImport === b.namedImport);
44
+ if (formControl) {
45
+ (0, utilities_1.CoerceArrayItems)(importList, formControl.importList, (a, b) => a.name === b.name && a.namedImport === b.namedImport);
46
+ }
44
47
  const kind = (_f = item.kind) !== null && _f !== void 0 ? _f : DataGridKinds.DEFAULT;
45
48
  const template = (_g = item.template) !== null && _g !== void 0 ? _g : kind + '-data-grid-item.hbs';
46
49
  return Object.freeze(Object.assign(Object.assign({}, (0, ts_morph_1.NormalizeDataProperty)(item)), { template,
@@ -1 +1 @@
1
- {"version":3,"file":"data-grid-item.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/data-grid-item.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-grid-item.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/data-grid-item.ts"],"names":[],"mappings":"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"}