@rxap/ts-morph 1.1.0-dev.22 → 1.1.0-dev.23

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,16 @@
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
+ # [1.1.0-dev.23](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.22...@rxap/ts-morph@1.1.0-dev.23) (2024-04-03)
7
+
8
+ ### Bug Fixes
9
+
10
+ - use environment.app to get the default sentry server name ([c89f1bd](https://gitlab.com/rxap/packages/commit/c89f1bdc99425aaee1417b51dfe05c17dbb6565e))
11
+
12
+ ### Features
13
+
14
+ - support app navigation icon coerce ([b37c6c8](https://gitlab.com/rxap/packages/commit/b37c6c814d21420260c5d4966152a11ca49a81bd))
15
+
6
16
  # [1.1.0-dev.22](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.21...@rxap/ts-morph@1.1.0-dev.22) (2024-03-31)
7
17
 
8
18
  ### Bug Fixes
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.1.0-dev.22",
2
+ "version": "1.1.0-dev.23",
3
3
  "name": "@rxap/ts-morph",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -44,7 +44,7 @@
44
44
  "directory": "packages/ts-morph"
45
45
  },
46
46
  "type": "commonjs",
47
- "gitHead": "88bb83e5ae16a958b2618d657587390058b48a3f",
47
+ "gitHead": "a878cf2fd81f8a225f48ddfe72ce408527390322",
48
48
  "main": "./src/index.js",
49
49
  "types": "./src/index.d.ts"
50
50
  }
@@ -8,5 +8,6 @@ export interface AppNavigationItem {
8
8
  }
9
9
  export interface CoerceAppNavigationOptions {
10
10
  itemList?: AppNavigationItem[];
11
+ overwrite?: boolean;
11
12
  }
12
13
  export declare function CoerceAppNavigation(sourceFile: SourceFile, options?: CoerceAppNavigationOptions): void;
@@ -1,11 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CoerceAppNavigation = void 0;
4
+ const utilities_1 = require("@rxap/utilities");
4
5
  const ts_morph_1 = require("ts-morph");
5
6
  const coerce_imports_1 = require("../coerce-imports");
6
7
  const coerce_variable_declaration_1 = require("../coerce-variable-declaration");
7
8
  function CoerceAppNavigation(sourceFile, options = {}) {
8
- var _a;
9
+ var _a, _b, _c, _d;
9
10
  const variableDeclaration = (0, coerce_variable_declaration_1.CoerceVariableDeclaration)(sourceFile, 'APP_NAVIGATION', {
10
11
  type: '() => NavigationWithInserts',
11
12
  initializer: '() => []',
@@ -33,21 +34,61 @@ function CoerceAppNavigation(sourceFile, options = {}) {
33
34
  return (_a = e.getProperty('label')) === null || _a === void 0 ? void 0 : _a.asKindOrThrow(ts_morph_1.SyntaxKind.PropertyAssignment).getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.StringLiteral).getText().trim().replace(/['"]/g, '');
34
35
  });
35
36
  for (const item of (_a = options.itemList) !== null && _a !== void 0 ? _a : []) {
36
- if (!existingItemLabels.some(e => e === item.label)) {
37
- arrayLiteralExpression.addElement(ts_morph_1.Writers.object({
38
- routerLink: w => {
39
- w.write('[');
40
- for (let i = 0; i < item.routerLink.length; i++) {
41
- const link = item.routerLink[i];
42
- w.quote(link);
43
- if (i < item.routerLink.length - 1) {
44
- w.write(',');
45
- }
46
- }
47
- w.write(']');
48
- },
37
+ const existingItemIndex = existingItemLabels.findIndex(e => e === item.label);
38
+ const routerLink = w => {
39
+ w.write('[');
40
+ for (let i = 0; i < item.routerLink.length; i++) {
41
+ const link = item.routerLink[i];
42
+ w.quote(link);
43
+ if (i < item.routerLink.length - 1) {
44
+ w.write(',');
45
+ }
46
+ }
47
+ w.write(']');
48
+ };
49
+ let icon = null;
50
+ if (item.icon) {
51
+ const iconObj = {};
52
+ if (item.icon.color) {
53
+ iconObj['color'] = w => w.quote(item.icon.color);
54
+ }
55
+ if ((0, utilities_1.IsSvgIcon)(item.icon)) {
56
+ const name = item.icon.svgIcon;
57
+ iconObj['svgIcon'] = w => w.quote(name);
58
+ }
59
+ if ((0, utilities_1.IsMaterialIcon)(item.icon)) {
60
+ const name = item.icon.icon;
61
+ iconObj['icon'] = w => w.quote(name);
62
+ }
63
+ icon = ts_morph_1.Writers.object(iconObj);
64
+ }
65
+ if (existingItemIndex === -1) {
66
+ const obj = {
67
+ routerLink,
49
68
  label: w => w.quote(item.label),
50
- }));
69
+ };
70
+ if (icon) {
71
+ obj['icon'] = icon;
72
+ }
73
+ arrayLiteralExpression.addElement(ts_morph_1.Writers.object(obj));
74
+ }
75
+ else {
76
+ const existingItem = existingItems[existingItemIndex];
77
+ (_b = existingItem.getProperty('routerLink')) === null || _b === void 0 ? void 0 : _b.asKindOrThrow(ts_morph_1.SyntaxKind.PropertyAssignment).setInitializer(routerLink);
78
+ if (icon) {
79
+ if (!existingItem.getProperty('icon')) {
80
+ existingItem.addPropertyAssignment({
81
+ name: 'icon',
82
+ initializer: icon,
83
+ });
84
+ }
85
+ else if (options.overwrite) {
86
+ (_c = existingItem.getProperty('icon')) === null || _c === void 0 ? void 0 : _c.asKindOrThrow(ts_morph_1.SyntaxKind.PropertyAssignment).setInitializer(icon);
87
+ }
88
+ }
89
+ else if (options.overwrite) {
90
+ (_d = existingItem.getProperty('icon')) === null || _d === void 0 ? void 0 : _d.remove();
91
+ }
51
92
  }
52
93
  }
53
94
  }
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-app-navigation.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-app-navigation.ts"],"names":[],"mappings":";;;AACA,uCAIkB;AAClB,sDAAkD;AAClD,gFAA2E;AAa3E,SAAgB,mBAAmB,CAAC,UAAsB,EAAE,UAAsC,EAAE;;IAElG,MAAM,mBAAmB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,gBAAgB,EAAE;QAClF,IAAI,EAAE,6BAA6B;QACnC,WAAW,EAAE,UAAU;KACxB,CAAC,CAAC;IAEH,IAAA,uDAAyB,EAAC,UAAU,EAAE,yBAAyB,EAAE;QAC/D,WAAW,EAAE,kBAAO,CAAC,MAAM,CAAC;YAC1B,OAAO,EAAE,wBAAwB;YACjC,QAAQ,EAAE,gBAAgB;SAC3B,CAAC;KACH,CAAC,CAAC;IAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE,CAAE,uBAAuB,EAAE,wBAAwB,CAAE;YACnE,eAAe,EAAE,cAAc;SAChC;KACF,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,mBAAmB,CAAC,2BAA2B,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC;IAChG,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;IACvF,MAAM,sBAAsB,GAAG,KAAK,CAAC,aAAa,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;IACtF,MAAM,aAAa,GAAG,sBAAsB,CAAC,WAAW,EAAE;SACvD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;SACzD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACjE,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAC1C,CAAC,CAAC,EAAE;;QAAC,OAAA,MAAA,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,0CAAE,aAAa,CAAC,qBAAU,CAAC,kBAAkB,EAAE,2BAA2B,CACnG,qBAAU,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;KAAA,CAAC,CAAC;IACrE,KAAK,MAAM,IAAI,IAAI,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,EAAE;QACzC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE;YACnD,sBAAsB,CAAC,UAAU,CAAC,kBAAO,CAAC,MAAM,CAAC;gBAC/C,UAAU,EAAE,CAAC,CAAC,EAAE;oBACd,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;wBAChC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACd,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;4BAClC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;yBACd;qBACF;oBACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,CAAC;gBACD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;aAChC,CAAC,CAAC,CAAC;SACL;KAEF;AAEH,CAAC;AAlDD,kDAkDC"}
1
+ {"version":3,"file":"coerce-app-navigation.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-app-navigation.ts"],"names":[],"mappings":"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"}