@rxap/schematic-angular 16.1.0-dev.48 → 16.1.0-dev.49

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 (5) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/README.md +1 -1
  3. package/package.json +9 -5
  4. package/src/lib/table-column.js +6 -1
  5. package/src/lib/table-column.js.map +1 -1
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.1.0-dev.49](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.1.0-dev.48...@rxap/schematic-angular@16.1.0-dev.49) (2023-11-19)
7
+
8
+ ### Bug Fixes
9
+
10
+ - preserve table column name prefix ([6ad3d2b](https://gitlab.com/rxap/packages/commit/6ad3d2b528a9d5ae022ad3fef7a0aa60220cf6d4))
11
+
6
12
  # [16.1.0-dev.48](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.1.0-dev.47...@rxap/schematic-angular@16.1.0-dev.48) (2023-11-19)
7
13
 
8
14
  ### Features
package/README.md CHANGED
@@ -17,5 +17,5 @@ yarn add @rxap/schematic-angular
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-ts-morph@^16.0.0-dev.36 @rxap/schematics-utilities@^16.0.0-dev.21 @rxap/ts-morph@* @rxap/utilities@^16.0.0-dev.23 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-ts-morph@^16.0.0-dev.37 @rxap/schematics-utilities@^16.0.0-dev.21 @rxap/ts-morph@^0.1.0-dev.21 @rxap/utilities@^16.0.0-dev.23 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.48",
2
+ "version": "16.1.0-dev.49",
3
3
  "name": "@rxap/schematic-angular",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -12,9 +12,9 @@
12
12
  "peerDependencies": {
13
13
  "@angular-devkit/core": "^16.1.4",
14
14
  "@angular-devkit/schematics": "^16.1.4",
15
- "@rxap/schematics-ts-morph": "^16.0.0-dev.36",
15
+ "@rxap/schematics-ts-morph": "^16.0.0-dev.37",
16
16
  "@rxap/schematics-utilities": "^16.0.0-dev.21",
17
- "@rxap/ts-morph": "*",
17
+ "@rxap/ts-morph": "^0.1.0-dev.21",
18
18
  "@rxap/utilities": "^16.0.0-dev.23",
19
19
  "ts-morph": "^18.0.0",
20
20
  "tslib": "2.6.2",
@@ -42,12 +42,16 @@
42
42
  "packageGroup": [
43
43
  {
44
44
  "package": "@rxap/schematics-ts-morph",
45
- "version": "16.0.0-dev.36"
45
+ "version": "16.0.0-dev.37"
46
46
  },
47
47
  {
48
48
  "package": "@rxap/schematics-utilities",
49
49
  "version": "16.0.0-dev.21"
50
50
  },
51
+ {
52
+ "package": "@rxap/ts-morph",
53
+ "version": "0.1.0-dev.21"
54
+ },
51
55
  {
52
56
  "package": "@rxap/utilities",
53
57
  "version": "16.0.0-dev.23"
@@ -69,7 +73,7 @@
69
73
  },
70
74
  "schematics": "./collection.json",
71
75
  "type": "commonjs",
72
- "gitHead": "d176d9da2d3ebf2bb2bb0b0ebde2a3526816f829",
76
+ "gitHead": "2696f76597655752c1a47785c4b527ad1c88fe71",
73
77
  "main": "./src/index.js",
74
78
  "types": "./src/index.d.ts"
75
79
  }
package/src/lib/table-column.js CHANGED
@@ -38,7 +38,7 @@ function NormalizeTableColumnPipe(pipe) {
38
38
  }
39
39
  exports.NormalizeTableColumnPipe = NormalizeTableColumnPipe;
40
40
  function NormalizeTableColumn(column) {
41
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
41
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
42
42
  let name;
43
43
  let type = 'unknown';
44
44
  let modifiers = [];
@@ -82,12 +82,17 @@ function NormalizeTableColumn(column) {
82
82
  template = (_o = column.template) !== null && _o !== void 0 ? _o : template;
83
83
  pipeList = (_p = column.pipeList) !== null && _p !== void 0 ? _p : pipeList;
84
84
  }
85
+ const namePrefix = (_r = (_q = name.match(/^(_+)/)) === null || _q === void 0 ? void 0 : _q[1]) !== null && _r !== void 0 ? _r : '';
85
86
  propertyPath !== null && propertyPath !== void 0 ? propertyPath : (propertyPath = name
86
87
  .replace(/\?\./g, '.')
87
88
  .split('.')
88
89
  .map((part) => (0, schematics_utilities_1.camelize)(part))
89
90
  .join('?.'));
90
91
  name = (0, schematics_utilities_1.dasherize)(name.replace(/\??\./g, '_'));
92
+ if (namePrefix) {
93
+ name = namePrefix + name;
94
+ propertyPath = namePrefix + propertyPath;
95
+ }
91
96
  title !== null && title !== void 0 ? title : (title = (0, schematics_utilities_1.dasherize)(name)
92
97
  .replace(/_/g, '-')
93
98
  .split('-')
package/src/lib/table-column.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/table-column.ts"],"names":[],"mappings":";;;AAAA,qEAIoC;AAGpC,+CAGuB;AA8BvB,SAAgB,wBAAwB,CAAC,IAA8B;IACrE,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO;gBACV,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,WAAW;oBACxB,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL,KAAK,MAAM;gBACT,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,UAAU;oBACvB,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL,KAAK,MAAM;gBACT,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,UAAU;oBACvB,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL,KAAK,UAAU;gBACb,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,cAAc;oBAC3B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL;gBACE,MAAM,IAAI,KAAK,CAAC,gBAAiB,IAAK,EAAE,CAAC,CAAC;SAC7C;KACF;IACD,OAAO,IAAA,iCAAmB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAhCD,4DAgCC;AAED,SAAgB,oBAAoB,CAClC,MAAsC;;IAEtC,IAAI,IAAY,CAAC;IACjB,IAAI,IAAI,GAAwB,SAAS,CAAC;IAC1C,IAAI,SAAS,GAAa,EAAE,CAAC;IAC7B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,YAAY,GAAkB,IAAI,CAAC;IACvC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,IAAI,GAAkB,IAAI,CAAC;IAC/B,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,QAAQ,GAAoC,EAAE,CAAC;IACnD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,gCAAgC;QAChC,gCAAgC;QAChC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,uCAAuC;QACpE,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;YAChB,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;SACjD;QACD,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;KAC7C;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACnB,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC;QAC3B,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;QACnC,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,KAAK,CAAC;QACtC,KAAK,GAAG,MAAA,MAAM,CAAC,KAAK,mCAAI,KAAK,CAAC;QAC9B,YAAY,GAAG,MAAA,MAAM,CAAC,YAAY,mCAAI,YAAY,CAAC;QACnD,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QAChC,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QAChC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,KAAK,CAAC;QACpC,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,KAAK,CAAC;QAC5B,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QAChC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,QAAQ,CAAC;QACvC,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC;QAC3B,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,QAAQ,CAAC;QACvC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,QAAQ,CAAC;KACxC;IACD,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,IAAI;SAClB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,CAAC;SAC7B,IAAI,CAAC,IAAI,CAAC,EAAC;IACd,IAAI,GAAG,IAAA,gCAAS,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,KAAK,aAAL,KAAK,cAAL,KAAK,IAAL,KAAK,GAAK,IAAA,gCAAS,EAAC,IAAI,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,iCAAU,EAAC,IAAI,CAAC,CAAC;SAC/B,IAAI,CAAC,GAAG,CAAC,EAAC;IACb,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;IACtD,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAChD,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC;IACtD,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IAC1C,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAChD,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAChD,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;QAC/B,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,IAAI,GAAG,eAAe,CAAC;gBACvB,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,GAAG,QAAQ,CAAC;gBAChB,MAAM;YACR,KAAK,MAAM;gBACT,iCAAiC;gBACjC,IAAI,GAAG;oBACL,IAAI,EAAE,YAAY;oBAClB,eAAe,EAAE,iBAAiB;iBACnC,CAAC;gBACF,MAAM;YACR,KAAK,SAAS;gBACZ,IAAI,GAAG,SAAS,CAAC;gBACjB,MAAM;SACT;KACF;IACD,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,SAAS,EAAC;IACnB,IAAI,MAAM,EAAE;QACV,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,QAAQ,CAAC;SACrB;aAAM;YACL,QAAQ,IAAI,SAAS,CAAC;SACvB;KACF;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI;QACJ,IAAI;QACJ,IAAI,EAAE,IAAA,iCAAmB,EAAC,IAAI,CAAC;QAC/B,SAAS;QACT,SAAS;QACT,KAAK;QACL,YAAY;QACZ,MAAM;QACN,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,MAAM;QACN,QAAQ;QACR,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC;QAChD,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AA3GD,oDA2GC;AAED,SAAgB,wBAAwB,CACtC,UAA0D;;IAE1D,OAAO,MAAM,CAAC,MAAM,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,oBAAoB,CAAC,mCAAI,EAAE,CAAC,CAAC;AACpE,CAAC;AAJD,4DAIC"}
1
+ {"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/table-column.ts"],"names":[],"mappings":";;;AAAA,qEAIoC;AAGpC,+CAGuB;AA8BvB,SAAgB,wBAAwB,CAAC,IAA8B;IACrE,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO;gBACV,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,WAAW;oBACxB,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL,KAAK,MAAM;gBACT,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,UAAU;oBACvB,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL,KAAK,MAAM;gBACT,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,UAAU;oBACvB,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL,KAAK,UAAU;gBACb,OAAO,IAAA,iCAAmB,EAAC;oBACzB,IAAI,EAAE,UAAU;oBAChB,WAAW,EAAE,cAAc;oBAC3B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;YACL;gBACE,MAAM,IAAI,KAAK,CAAC,gBAAiB,IAAK,EAAE,CAAC,CAAC;SAC7C;KACF;IACD,OAAO,IAAA,iCAAmB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAhCD,4DAgCC;AAED,SAAgB,oBAAoB,CAClC,MAAsC;;IAEtC,IAAI,IAAY,CAAC;IACjB,IAAI,IAAI,GAAwB,SAAS,CAAC;IAC1C,IAAI,SAAS,GAAa,EAAE,CAAC;IAC7B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,YAAY,GAAkB,IAAI,CAAC;IACvC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,IAAI,GAAkB,IAAI,CAAC;IAC/B,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,QAAQ,GAAoC,EAAE,CAAC;IACnD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,gCAAgC;QAChC,gCAAgC;QAChC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,uCAAuC;QACpE,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;YAChB,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;SACjD;QACD,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;KAC7C;SAAM;QACL,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACnB,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC;QAC3B,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;QACnC,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,KAAK,CAAC;QACtC,KAAK,GAAG,MAAA,MAAM,CAAC,KAAK,mCAAI,KAAK,CAAC;QAC9B,YAAY,GAAG,MAAA,MAAM,CAAC,YAAY,mCAAI,YAAY,CAAC;QACnD,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QAChC,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QAChC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,KAAK,CAAC;QACpC,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,KAAK,CAAC;QAC5B,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QAChC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,QAAQ,CAAC;QACvC,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC;QAC3B,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,QAAQ,CAAC;QACvC,QAAQ,GAAG,MAAA,MAAM,CAAC,QAAQ,mCAAI,QAAQ,CAAC;KACxC;IACD,MAAM,UAAU,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,0CAAG,CAAC,CAAC,mCAAI,EAAE,CAAC;IAClD,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,IAAI;SAClB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,CAAC;SAC7B,IAAI,CAAC,IAAI,CAAC,EAAC;IACd,IAAI,GAAG,IAAA,gCAAS,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,IAAI,UAAU,EAAE;QACd,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;QACzB,YAAY,GAAG,UAAU,GAAG,YAAY,CAAC;KAC1C;IACD,KAAK,aAAL,KAAK,cAAL,KAAK,IAAL,KAAK,GAAK,IAAA,gCAAS,EAAC,IAAI,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,iCAAU,EAAC,IAAI,CAAC,CAAC;SAC/B,IAAI,CAAC,GAAG,CAAC,EAAC;IACb,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;IACtD,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAChD,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC;IACtD,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IAC1C,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAChD,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;IAChD,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;QAC/B,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,IAAI,GAAG,eAAe,CAAC;gBACvB,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,GAAG,QAAQ,CAAC;gBAChB,MAAM;YACR,KAAK,MAAM;gBACT,iCAAiC;gBACjC,IAAI,GAAG;oBACL,IAAI,EAAE,YAAY;oBAClB,eAAe,EAAE,iBAAiB;iBACnC,CAAC;gBACF,MAAM;YACR,KAAK,SAAS;gBACZ,IAAI,GAAG,SAAS,CAAC;gBACjB,MAAM;SACT;KACF;IACD,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,SAAS,EAAC;IACnB,IAAI,MAAM,EAAE;QACV,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG,QAAQ,CAAC;SACrB;aAAM;YACL,QAAQ,IAAI,SAAS,CAAC;SACvB;KACF;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI;QACJ,IAAI;QACJ,IAAI,EAAE,IAAA,iCAAmB,EAAC,IAAI,CAAC;QAC/B,SAAS;QACT,SAAS;QACT,KAAK;QACL,YAAY;QACZ,MAAM;QACN,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,MAAM;QACN,QAAQ;QACR,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC;QAChD,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAhHD,oDAgHC;AAED,SAAgB,wBAAwB,CACtC,UAA0D;;IAE1D,OAAO,MAAM,CAAC,MAAM,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,oBAAoB,CAAC,mCAAI,EAAE,CAAC,CAAC;AACpE,CAAC;AAJD,4DAIC"}