@antv/layout 0.3.22 → 0.3.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.
Files changed (10) hide show
  1. package/dist/layout.min.js +1 -1
  2. package/dist/layout.min.js.map +1 -1
  3. package/es/layout/comboCombined.d.ts +3 -3
  4. package/es/layout/comboCombined.js +39 -26
  5. package/es/layout/comboCombined.js.map +1 -1
  6. package/lib/layout/comboCombined.d.ts +3 -3
  7. package/lib/layout/comboCombined.js +38 -23
  8. package/lib/layout/comboCombined.js.map +1 -1
  9. package/package.json +1 -1
  10. package/src/layout/comboCombined.ts +86 -38
package/es/layout/comboCombined.d.ts CHANGED
@@ -2,9 +2,9 @@
2
2
  * @fileOverview Combo force layout
3
3
  * @author shiwu.wyy@antfin.com
4
4
  */
5
- import { Edge, Combo, OutNode, PointTuple, ComboTree, ComboCombinedLayoutOptions } from "./types";
6
- import { Base } from "./base";
7
- import { CircularLayout, ConcentricLayout, GridLayout, RadialLayout } from ".";
5
+ import { Edge, Combo, OutNode, PointTuple, ComboTree, ComboCombinedLayoutOptions } from './types';
6
+ import { Base } from './base';
7
+ import { CircularLayout, ConcentricLayout, GridLayout, RadialLayout } from '.';
8
8
  type Node = OutNode & {
9
9
  depth?: number;
10
10
  itemType?: string;
package/es/layout/comboCombined.js CHANGED
@@ -3,9 +3,9 @@
3
3
  * @author shiwu.wyy@antfin.com
4
4
  */
5
5
  import { FORCE_LAYOUT_TYPE_MAP } from './constants';
6
- import { Base } from "./base";
7
- import { isArray, isNumber, isFunction, traverseTreeUp, isObject, getLayoutBBox } from "../util";
8
- import { ConcentricLayout, GridLayout, GForceLayout, MDSLayout } from ".";
6
+ import { Base } from './base';
7
+ import { isArray, isNumber, isFunction, traverseTreeUp, isObject, getLayoutBBox, } from '../util';
8
+ import { ConcentricLayout, GridLayout, GForceLayout, MDSLayout, } from '.';
9
9
  /**
10
10
  * combined two layouts (inner and outer) for graph with combos
11
11
  */
@@ -75,7 +75,10 @@ export class ComboCombinedLayout extends Base {
75
75
  // 代表 combo 的节点
76
76
  const oNode = Object.assign(Object.assign({}, cTree), { x: innerNode.x || comboMap[cTree.id].x, y: innerNode.y || comboMap[cTree.id].y, fx: innerNode.fx || comboMap[cTree.id].fx, fy: innerNode.fy || comboMap[cTree.id].fy, mass: innerNode.mass || comboMap[cTree.id].mass, size: innerNode.size });
77
77
  outerNodes.push(oNode);
78
- if (!isNaN(oNode.x) && oNode.x !== 0 && !isNaN(oNode.y) && oNode.y !== 0) {
78
+ if (!isNaN(oNode.x) &&
79
+ oNode.x !== 0 &&
80
+ !isNaN(oNode.y) &&
81
+ oNode.y !== 0) {
79
82
  allHaveNoPosition = false;
80
83
  }
81
84
  else {
@@ -95,7 +98,10 @@ export class ComboCombinedLayout extends Base {
95
98
  // 代表节点的节点
96
99
  const oNode = Object.assign({}, node);
97
100
  outerNodes.push(oNode);
98
- if (!isNaN(oNode.x) && oNode.x !== 0 && !isNaN(oNode.y) && oNode.y !== 0) {
101
+ if (!isNaN(oNode.x) &&
102
+ oNode.x !== 0 &&
103
+ !isNaN(oNode.y) &&
104
+ oNode.y !== 0) {
99
105
  allHaveNoPosition = false;
100
106
  }
101
107
  else {
@@ -114,7 +120,7 @@ export class ComboCombinedLayout extends Base {
114
120
  outerNodeIds.includes(targetAncestorId)) {
115
121
  outerEdges.push({
116
122
  source: sourceAncestorId,
117
- target: targetAncestorId
123
+ target: targetAncestorId,
118
124
  });
119
125
  }
120
126
  });
@@ -127,19 +133,20 @@ export class ComboCombinedLayout extends Base {
127
133
  else {
128
134
  const outerData = {
129
135
  nodes: outerNodes,
130
- edges: outerEdges
136
+ edges: outerEdges,
131
137
  };
132
138
  // 需要使用一个同步的布局
133
139
  // @ts-ignore
134
- const outerLayout = this.outerLayout || new GForceLayout({
135
- gravity: 1,
136
- factor: 4,
137
- linkDistance: (edge, source, target) => {
138
- var _a, _b;
139
- const nodeSize = ((((_a = source.size) === null || _a === void 0 ? void 0 : _a[0]) || 30) + (((_b = target.size) === null || _b === void 0 ? void 0 : _b[0]) || 30)) / 2;
140
- return Math.min(nodeSize * 1.5, 700);
141
- }
142
- });
140
+ const outerLayout = this.outerLayout ||
141
+ new GForceLayout({
142
+ gravity: 1,
143
+ factor: 4,
144
+ linkDistance: (edge, source, target) => {
145
+ var _a, _b;
146
+ const nodeSize = ((((_a = source.size) === null || _a === void 0 ? void 0 : _a[0]) || 30) + (((_b = target.size) === null || _b === void 0 ? void 0 : _b[0]) || 30)) / 2;
147
+ return Math.min(nodeSize * 1.5, 700);
148
+ },
149
+ });
143
150
  const outerLayoutType = (_a = outerLayout.getType) === null || _a === void 0 ? void 0 : _a.call(outerLayout);
144
151
  outerLayout.updateCfg({
145
152
  center,
@@ -183,8 +190,8 @@ export class ComboCombinedLayout extends Base {
183
190
  continue;
184
191
  innerGraph.nodes.forEach((node) => {
185
192
  if (!innerGraph.visited) {
186
- node.x += (innerGraph.x || 0);
187
- node.y += (innerGraph.y || 0);
193
+ node.x += innerGraph.x || 0;
194
+ node.y += innerGraph.y || 0;
188
195
  }
189
196
  if (nodeMap[node.id]) {
190
197
  nodeMap[node.id].x = node.x;
@@ -203,7 +210,8 @@ export class ComboCombinedLayout extends Base {
203
210
  const { comboTrees, nodeSize, edges, comboPadding, spacing } = self;
204
211
  const innerGraphs = {};
205
212
  // @ts-ignore
206
- const innerGraphLayout = this.innerLayout || (new ConcentricLayout({ sortBy: 'id' }));
213
+ const innerGraphLayout = this.innerLayout ||
214
+ new ConcentricLayout({ type: 'concentric', sortBy: 'id' });
207
215
  innerGraphLayout.center = [0, 0];
208
216
  innerGraphLayout.preventOverlap = true;
209
217
  innerGraphLayout.nodeSpacing = spacing;
@@ -217,11 +225,13 @@ export class ComboCombinedLayout extends Base {
217
225
  if (!((_a = treeNode.children) === null || _a === void 0 ? void 0 : _a.length)) {
218
226
  // 空 combo
219
227
  if (treeNode.itemType === 'combo') {
220
- const treeNodeSize = padding ? [padding * 2, padding * 2] : [30, 30];
228
+ const treeNodeSize = padding
229
+ ? [padding * 2, padding * 2]
230
+ : [30, 30];
221
231
  innerGraphs[treeNode.id] = {
222
232
  id: treeNode.id,
223
233
  nodes: [],
224
- size: treeNodeSize
234
+ size: treeNodeSize,
225
235
  };
226
236
  }
227
237
  }
@@ -236,14 +246,16 @@ export class ComboCombinedLayout extends Base {
236
246
  const innerGraphNodeIds = innerGraphNodes.map((node) => node.id);
237
247
  const innerGraphData = {
238
248
  nodes: innerGraphNodes,
239
- edges: edges.filter((edge) => innerGraphNodeIds.includes(edge.source) && innerGraphNodeIds.includes(edge.target))
249
+ edges: edges.filter((edge) => innerGraphNodeIds.includes(edge.source) &&
250
+ innerGraphNodeIds.includes(edge.target)),
240
251
  };
241
252
  let minNodeSize = Infinity;
242
253
  innerGraphNodes.forEach((node) => {
243
254
  var _a;
244
255
  // @ts-ignore
245
256
  if (!node.size)
246
- node.size = ((_a = innerGraphs[node.id]) === null || _a === void 0 ? void 0 : _a.size) || (nodeSize === null || nodeSize === void 0 ? void 0 : nodeSize(node)) || [30, 30];
257
+ node.size = ((_a = innerGraphs[node.id]) === null || _a === void 0 ? void 0 : _a.size) ||
258
+ (nodeSize === null || nodeSize === void 0 ? void 0 : nodeSize(node)) || [30, 30];
247
259
  if (isNumber(node.size))
248
260
  node.size = [node.size, node.size];
249
261
  if (minNodeSize > node.size[0])
@@ -260,11 +272,12 @@ export class ComboCombinedLayout extends Base {
260
272
  node.x -= center.x;
261
273
  node.y -= center.y;
262
274
  });
263
- const innerGraphSize = Math.max(maxX - minX, maxY - minY, minNodeSize) + padding * 2;
275
+ const innerGraphWidth = Math.max(maxX - minX, minNodeSize) + padding * 2;
276
+ const innerGraphHeight = Math.max(maxY - minY, minNodeSize) + padding * 2;
264
277
  innerGraphs[treeNode.id] = {
265
278
  id: treeNode.id,
266
279
  nodes: innerGraphNodes,
267
- size: [innerGraphSize, innerGraphSize]
280
+ size: [innerGraphWidth, innerGraphHeight],
268
281
  };
269
282
  }
270
283
  return true;
@@ -348,7 +361,7 @@ export class ComboCombinedLayout extends Base {
348
361
  this.comboPadding = comboPaddingFunc;
349
362
  }
350
363
  getType() {
351
- return "comboCombined";
364
+ return 'comboCombined';
352
365
  }
353
366
  }
354
367
  //# sourceMappingURL=comboCombined.js.map
package/es/layout/comboCombined.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"comboCombined.js","sourceRoot":"","sources":["../../src/layout/comboCombined.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"comboCombined.js","sourceRoot":"","sources":["../../src/layout/comboCombined.ts"],"names":[],"mappings":"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"}
package/lib/layout/comboCombined.d.ts CHANGED
@@ -2,9 +2,9 @@
2
2
  * @fileOverview Combo force layout
3
3
  * @author shiwu.wyy@antfin.com
4
4
  */
5
- import { Edge, Combo, OutNode, PointTuple, ComboTree, ComboCombinedLayoutOptions } from "./types";
6
- import { Base } from "./base";
7
- import { CircularLayout, ConcentricLayout, GridLayout, RadialLayout } from ".";
5
+ import { Edge, Combo, OutNode, PointTuple, ComboTree, ComboCombinedLayoutOptions } from './types';
6
+ import { Base } from './base';
7
+ import { CircularLayout, ConcentricLayout, GridLayout, RadialLayout } from '.';
8
8
  type Node = OutNode & {
9
9
  depth?: number;
10
10
  itemType?: string;
package/lib/layout/comboCombined.js CHANGED
@@ -106,7 +106,10 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
106
106
  // 代表 combo 的节点
107
107
  var oNode = __assign(__assign({}, cTree), { x: innerNode.x || comboMap[cTree.id].x, y: innerNode.y || comboMap[cTree.id].y, fx: innerNode.fx || comboMap[cTree.id].fx, fy: innerNode.fy || comboMap[cTree.id].fy, mass: innerNode.mass || comboMap[cTree.id].mass, size: innerNode.size });
108
108
  outerNodes.push(oNode);
109
- if (!isNaN(oNode.x) && oNode.x !== 0 && !isNaN(oNode.y) && oNode.y !== 0) {
109
+ if (!isNaN(oNode.x) &&
110
+ oNode.x !== 0 &&
111
+ !isNaN(oNode.y) &&
112
+ oNode.y !== 0) {
110
113
  allHaveNoPosition = false;
111
114
  }
112
115
  else {
@@ -126,7 +129,10 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
126
129
  // 代表节点的节点
127
130
  var oNode = __assign({}, node);
128
131
  outerNodes.push(oNode);
129
- if (!isNaN(oNode.x) && oNode.x !== 0 && !isNaN(oNode.y) && oNode.y !== 0) {
132
+ if (!isNaN(oNode.x) &&
133
+ oNode.x !== 0 &&
134
+ !isNaN(oNode.y) &&
135
+ oNode.y !== 0) {
130
136
  allHaveNoPosition = false;
131
137
  }
132
138
  else {
@@ -145,7 +151,7 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
145
151
  outerNodeIds.includes(targetAncestorId)) {
146
152
  outerEdges.push({
147
153
  source: sourceAncestorId,
148
- target: targetAncestorId
154
+ target: targetAncestorId,
149
155
  });
150
156
  }
151
157
  });
@@ -158,19 +164,20 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
158
164
  else {
159
165
  var outerData = {
160
166
  nodes: outerNodes,
161
- edges: outerEdges
167
+ edges: outerEdges,
162
168
  };
163
169
  // 需要使用一个同步的布局
164
170
  // @ts-ignore
165
- var outerLayout = this.outerLayout || new _1.GForceLayout({
166
- gravity: 1,
167
- factor: 4,
168
- linkDistance: function (edge, source, target) {
169
- var _a, _b;
170
- var nodeSize = ((((_a = source.size) === null || _a === void 0 ? void 0 : _a[0]) || 30) + (((_b = target.size) === null || _b === void 0 ? void 0 : _b[0]) || 30)) / 2;
171
- return Math.min(nodeSize * 1.5, 700);
172
- }
173
- });
171
+ var outerLayout = this.outerLayout ||
172
+ new _1.GForceLayout({
173
+ gravity: 1,
174
+ factor: 4,
175
+ linkDistance: function (edge, source, target) {
176
+ var _a, _b;
177
+ var nodeSize = ((((_a = source.size) === null || _a === void 0 ? void 0 : _a[0]) || 30) + (((_b = target.size) === null || _b === void 0 ? void 0 : _b[0]) || 30)) / 2;
178
+ return Math.min(nodeSize * 1.5, 700);
179
+ },
180
+ });
174
181
  var outerLayoutType = (_a = outerLayout.getType) === null || _a === void 0 ? void 0 : _a.call(outerLayout);
175
182
  outerLayout.updateCfg({
176
183
  center: center,
@@ -214,8 +221,8 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
214
221
  return "continue";
215
222
  innerGraph.nodes.forEach(function (node) {
216
223
  if (!innerGraph.visited) {
217
- node.x += (innerGraph.x || 0);
218
- node.y += (innerGraph.y || 0);
224
+ node.x += innerGraph.x || 0;
225
+ node.y += innerGraph.y || 0;
219
226
  }
220
227
  if (nodeMap[node.id]) {
221
228
  nodeMap[node.id].x = node.x;
@@ -237,7 +244,8 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
237
244
  var comboTrees = self.comboTrees, nodeSize = self.nodeSize, edges = self.edges, comboPadding = self.comboPadding, spacing = self.spacing;
238
245
  var innerGraphs = {};
239
246
  // @ts-ignore
240
- var innerGraphLayout = this.innerLayout || (new _1.ConcentricLayout({ sortBy: 'id' }));
247
+ var innerGraphLayout = this.innerLayout ||
248
+ new _1.ConcentricLayout({ type: 'concentric', sortBy: 'id' });
241
249
  innerGraphLayout.center = [0, 0];
242
250
  innerGraphLayout.preventOverlap = true;
243
251
  innerGraphLayout.nodeSpacing = spacing;
@@ -251,11 +259,13 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
251
259
  if (!((_a = treeNode.children) === null || _a === void 0 ? void 0 : _a.length)) {
252
260
  // 空 combo
253
261
  if (treeNode.itemType === 'combo') {
254
- var treeNodeSize = padding ? [padding * 2, padding * 2] : [30, 30];
262
+ var treeNodeSize = padding
263
+ ? [padding * 2, padding * 2]
264
+ : [30, 30];
255
265
  innerGraphs[treeNode.id] = {
256
266
  id: treeNode.id,
257
267
  nodes: [],
258
- size: treeNodeSize
268
+ size: treeNodeSize,
259
269
  };
260
270
  }
261
271
  }
@@ -270,14 +280,18 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
270
280
  var innerGraphNodeIds_1 = innerGraphNodes.map(function (node) { return node.id; });
271
281
  var innerGraphData = {
272
282
  nodes: innerGraphNodes,
273
- edges: edges.filter(function (edge) { return innerGraphNodeIds_1.includes(edge.source) && innerGraphNodeIds_1.includes(edge.target); })
283
+ edges: edges.filter(function (edge) {
284
+ return innerGraphNodeIds_1.includes(edge.source) &&
285
+ innerGraphNodeIds_1.includes(edge.target);
286
+ }),
274
287
  };
275
288
  var minNodeSize_1 = Infinity;
276
289
  innerGraphNodes.forEach(function (node) {
277
290
  var _a;
278
291
  // @ts-ignore
279
292
  if (!node.size)
280
- node.size = ((_a = innerGraphs[node.id]) === null || _a === void 0 ? void 0 : _a.size) || (nodeSize === null || nodeSize === void 0 ? void 0 : nodeSize(node)) || [30, 30];
293
+ node.size = ((_a = innerGraphs[node.id]) === null || _a === void 0 ? void 0 : _a.size) ||
294
+ (nodeSize === null || nodeSize === void 0 ? void 0 : nodeSize(node)) || [30, 30];
281
295
  if ((0, util_1.isNumber)(node.size))
282
296
  node.size = [node.size, node.size];
283
297
  if (minNodeSize_1 > node.size[0])
@@ -294,11 +308,12 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
294
308
  node.x -= center_1.x;
295
309
  node.y -= center_1.y;
296
310
  });
297
- var innerGraphSize = Math.max(maxX - minX, maxY - minY, minNodeSize_1) + padding * 2;
311
+ var innerGraphWidth = Math.max(maxX - minX, minNodeSize_1) + padding * 2;
312
+ var innerGraphHeight = Math.max(maxY - minY, minNodeSize_1) + padding * 2;
298
313
  innerGraphs[treeNode.id] = {
299
314
  id: treeNode.id,
300
315
  nodes: innerGraphNodes,
301
- size: [innerGraphSize, innerGraphSize]
316
+ size: [innerGraphWidth, innerGraphHeight],
302
317
  };
303
318
  }
304
319
  return true;
@@ -382,7 +397,7 @@ var ComboCombinedLayout = /** @class */ (function (_super) {
382
397
  this.comboPadding = comboPaddingFunc;
383
398
  };
384
399
  ComboCombinedLayout.prototype.getType = function () {
385
- return "comboCombined";
400
+ return 'comboCombined';
386
401
  };
387
402
  return ComboCombinedLayout;
388
403
  }(base_1.Base));
package/lib/layout/comboCombined.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"comboCombined.js","sourceRoot":"","sources":["../../src/layout/comboCombined.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUH,yCAAoD;AACpD,+BAA8B;AAC9B,gCAAiG;AACjG,sBAAwG;AAWxG;;GAEG;AACH;IAAyC,uCAAI;IAmC3C,6BAAY,OAAoC;QAAhD,YACE,iBAAO,SAER;QApCD,WAAW;QACJ,YAAM,GAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnC,aAAa;QACN,WAAK,GAAW,EAAE,CAAC;QAEnB,WAAK,GAAW,EAAE,CAAC;QAEnB,YAAM,GAAY,EAAE,CAAC;QAErB,gBAAU,GAAW,EAAE,CAAC;QAc/B,wBAAwB;QACjB,kBAAY,GAIH,EAAE,CAAC;QAEZ,gBAAU,GAAgB,EAAE,CAAC;QAIlC,KAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;;IAC1B,CAAC;IAEM,2CAAa,GAApB;QACE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACI,qCAAO,GAAd;QACE,IAAM,IAAI,GAAG,IAAI,CAAC;QAClB,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE3B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,IAAI,IAAI,CAAC,WAAW;gBAAE,IAAI,CAAC,WAAW,EAAE,CAAC;YACzC,OAAO;SACR;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACvB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,IAAI,CAAC,WAAW;gBAAE,IAAI,CAAC,WAAW,EAAE,CAAC;YACzC,OAAO;SACR;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,SAAS;QACT,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3C,CAAC;IAEM,iCAAG,GAAV;;QACE,IAAM,IAAI,GAAG,IAAI,CAAC;QACV,IAAA,KAAK,GAAwC,IAAI,MAA5C,EAAE,KAAK,GAAiC,IAAI,MAArC,EAAE,MAAM,GAAyB,IAAI,OAA7B,EAAE,UAAU,GAAa,IAAI,WAAjB,EAAE,MAAM,GAAK,IAAI,OAAT,CAAU;QAE1D,IAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;YACjB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,IAAM,QAAQ,GAAQ,EAAE,CAAC;QACzB,MAAM,CAAC,OAAO,CAAC,UAAC,KAAK;YACnB,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAM,WAAW,GAAQ,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAEtD,wCAAwC;QACxC,IAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAM,UAAU,GAAW,EAAE,CAAC;QAC9B,IAAM,iBAAiB,GAA8B,EAAE,CAAC;QACxD,IAAI,iBAAiB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAC,KAAK;YAC5B,IAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACxC,eAAe;YACf,IAAM,KAAK,yBACN,KAAK,KACR,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EACtC,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EACtC,EAAE,EAAE,SAAS,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EACzC,EAAE,EAAE,SAAS,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EACzC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAC/C,IAAI,EAAE,SAAS,CAAC,IAAI,GACrB,CAAC;YACF,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE;gBACxE,iBAAiB,GAAG,KAAK,CAAC;aAC3B;iBAAM;gBACL,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;gBAC9B,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;aAC/B;YACD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAA,qBAAc,EAAY,KAAK,EAAE,UAAC,KAAK;gBACrC,IAAI,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;oBAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;gBAClE,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;YACjB,IAAI,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,OAAO;YACnD,UAAU;YACV,IAAM,KAAK,gBAAc,IAAI,CAAE,CAAC;YAChC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE;gBACxE,iBAAiB,GAAG,KAAK,CAAC;aAC3B;iBAAM;gBACL,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;gBAC9B,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;aAC/B;YACD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAM,UAAU,GAAQ,EAAE,CAAC;QAC3B,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,IAAI;YACpC,IAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;YACvE,IAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;YACvE,+CAA+C;YAC/C,IAAI,gBAAgB,KAAK,gBAAgB;gBACvC,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBACvC,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;gBACzC,UAAU,CAAC,IAAI,CAAC;oBACd,MAAM,EAAE,gBAAgB;oBACxB,MAAM,EAAE,gBAAgB;iBACzB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,gCAAgC;QAChC,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAE;YACtB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC3B,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC5B,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;aAC7B;iBAAM;gBACL,IAAM,SAAS,GAAG;oBAChB,KAAK,EAAE,UAAU;oBACjB,KAAK,EAAE,UAAU;iBAClB,CAAC;gBAEF,cAAc;gBACd,aAAa;gBACb,IAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,eAAY,CAAC;oBACvD,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,CAAC;oBACT,YAAY,EAAE,UAAC,IAAS,EAAE,MAAW,EAAE,MAAW;;wBAChD,IAAM,QAAQ,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAC,GAAG,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;wBAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;oBACvC,CAAC;iBACF,CAAC,CAAC;gBACH,IAAM,eAAe,GAAG,MAAA,WAAW,CAAC,OAAO,2DAAI,CAAC;gBAChD,WAAW,CAAC,SAAS,CAAC;oBACpB,MAAM,QAAA;oBACN,EAAE,EAAE,CAAC;oBACL,cAAc,EAAE,IAAI;oBACpB,OAAO,EAAE,KAAK;iBACf,CAAC,CAAC;gBACH,qEAAqE;gBACrE,IAAI,iBAAiB,IAAI,iCAAqB,CAAC,eAAe,CAAC,EAAE;oBAC/D,IAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,YAAS,EAAE,CAAC,CAAC,CAAC,IAAI,aAAU,EAAE,CAAC;oBACvF,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;iBACrC;gBACD,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aAC/B;YACD,oCAAoC;YACpC,UAAU,CAAC,OAAO,CAAC,UAAC,SAAS;gBAC3B,IAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC7C,IAAI,CAAC,UAAU,EAAE;oBACf,IAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;oBACnC,IAAI,IAAI,EAAE;wBACR,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;wBACrB,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;qBACtB;oBACD,OAAO;iBACR;gBACD,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC1B,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gBAC3B,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gBAC3B,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,UAAC,IAAa;oBACrC,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC;oBACtB,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;QAED,oBAAoB;QACpB,IAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gCACtC,CAAC;YACR,IAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAM,UAAU,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,UAAU;kCAAW;YAC1B,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,UAAC,IAAa;gBACrC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;oBACvB,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC9B,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC/B;gBACD,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBACpB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;oBAC5B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;iBAC7B;YACH,CAAC,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE;gBAChB,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gBAC9B,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;aAC/B;;QAjBH,KAAK,IAAI,CAAC,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBAAzC,CAAC;SAkBT;QACD,OAAO,EAAE,KAAK,OAAA,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,CAAC;IAC9C,CAAC;IAEO,4CAAc,GAAtB,UAAuB,OAAY;QACjC,IAAM,IAAI,GAAG,IAAI,CAAC;QACV,IAAA,UAAU,GAA6C,IAAI,WAAjD,EAAE,QAAQ,GAAmC,IAAI,SAAvC,EAAE,KAAK,GAA4B,IAAI,MAAhC,EAAE,YAAY,GAAc,IAAI,aAAlB,EAAE,OAAO,GAAK,IAAI,QAAT,CAAU;QACpE,IAAM,WAAW,GAAQ,EAAE,CAAC;QAE5B,aAAa;QACb,IAAM,gBAAgB,GAAQ,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,mBAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3F,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACjC,gBAAgB,CAAC,cAAc,GAAG,IAAI,CAAC;QACvC,gBAAgB,CAAC,WAAW,GAAG,OAAO,CAAC;QAEvC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAC,KAAU;YACpC,IAAA,qBAAc,EAAY,KAAK,EAAE,UAAC,QAAQ;;gBACxC,aAAa;gBACb,IAAI,OAAO,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,QAAQ,CAAC,KAAI,EAAE,CAAC,CAAC,SAAS;gBACvD,IAAI,IAAA,cAAO,EAAC,OAAO,CAAC;oBAAE,OAAO,GAAG,IAAI,CAAC,GAAG,OAAR,IAAI,EAAQ,OAAO,CAAC,CAAC;gBACrD,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,MAAM,CAAA,EAAE;oBAC9B,UAAU;oBACV,IAAI,QAAQ,CAAC,QAAQ,KAAK,OAAO,EAAE;wBACjC,IAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACrE,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG;4BACzB,EAAE,EAAE,QAAQ,CAAC,EAAE;4BACf,KAAK,EAAE,EAAE;4BACT,IAAI,EAAE,YAAY;yBACnB,CAAC;qBACH;iBACF;qBAAM;oBACL,WAAW;oBACX,IAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,KAAK;wBAClD,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO;4BAAE,OAAO,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC7D,IAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;wBACxC,6BAAY,OAAO,GAAK,KAAK,EAAG;oBAClC,CAAC,CAAC,CAAC;oBACH,IAAM,mBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,EAAE,EAAP,CAAO,CAAC,CAAC;oBACjE,IAAM,cAAc,GAAG;wBACrB,KAAK,EAAE,eAAe;wBACtB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,mBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,mBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAlF,CAAkF,CAAC;qBAClH,CAAC;oBACF,IAAI,aAAW,GAAG,QAAQ,CAAC;oBAC3B,eAAe,CAAC,OAAO,CAAC,UAAC,IAAI;;wBAC3B,aAAa;wBACb,IAAI,CAAC,IAAI,CAAC,IAAI;4BAAE,IAAI,CAAC,IAAI,GAAG,CAAA,MAAA,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,0CAAE,IAAI,MAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,IAAI,CAAC,CAAA,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACvF,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,IAAI,CAAC;4BAAE,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC5D,IAAI,aAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;4BAAE,aAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC3D,IAAI,aAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;4BAAE,aAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC7D,CAAC,CAAC,CAAC;oBAEH,wBAAwB;oBAExB,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;oBAClC,IAAA,KAA6B,IAAA,oBAAa,EAAC,eAAe,CAAC,EAAzD,IAAI,UAAA,EAAE,IAAI,UAAA,EAAE,IAAI,UAAA,EAAE,IAAI,UAAmC,CAAC;oBAClE,qEAAqE;oBACrE,IAAM,QAAM,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC9D,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;wBAChC,IAAI,CAAC,CAAC,IAAI,QAAM,CAAC,CAAC,CAAC;wBACnB,IAAI,CAAC,CAAC,IAAI,QAAM,CAAC,CAAC,CAAC;oBACrB,CAAC,CAAC,CAAC;oBACH,IAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,aAAW,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC;oBACrF,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG;wBACzB,EAAE,EAAE,QAAQ,CAAC,EAAE;wBACf,KAAK,EAAE,eAAe;wBACtB,IAAI,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;qBACvC,CAAC;iBACH;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,sCAAQ,GAAhB;QACE,IAAM,IAAI,GAAG,IAAI,CAAC;QAElB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,YAAgC,CAAC;QACrC,IAAI,WAA+B,CAAC;QAEpC,0BAA0B;QAC1B,IAAI,IAAA,eAAQ,EAAC,OAAO,CAAC,EAAE;YACrB,WAAW,GAAG,cAAM,OAAA,OAAc,EAAd,CAAc,CAAC;SACpC;aAAM,IAAI,IAAA,iBAAU,EAAC,OAAO,CAAC,EAAE;YAC9B,WAAW,GAAG,OAAO,CAAC;SACvB;aAAM;YACL,WAAW,GAAG,cAAM,OAAA,CAAC,EAAD,CAAC,CAAC;SACvB;QACD,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC;QAE3B,uBAAuB;QACvB,IAAI,CAAC,QAAQ,EAAE;YACb,YAAY,GAAG,UAAC,CAAC;gBACf,IAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,CAAC,IAAI,EAAE;oBACV,IAAI,IAAA,cAAO,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE;wBACnB,IAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC1D,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;qBAC5B;oBAAE,IAAI,IAAA,eAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE;wBACvB,IAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;wBACxE,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;qBAC5B;oBACD,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;iBAC/B;gBACD,OAAO,EAAE,GAAG,OAAO,GAAG,CAAC,CAAC;YAC1B,CAAC,CAAC;SACH;aAAM,IAAI,IAAA,iBAAU,EAAC,QAAQ,CAAC,EAAE;YAC/B,YAAY,GAAG,UAAC,CAAC;gBACf,IAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACzB,IAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,IAAA,cAAO,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oBACnB,IAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC1D,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;iBAC5B;gBACD,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC,CAAC;SACH;aAAM,IAAI,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE;YAC5B,IAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACrE,IAAM,QAAM,GAAG,MAAM,GAAG,CAAC,CAAC;YAC1B,YAAY,GAAG,UAAC,CAAC,IAAK,OAAA,QAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAA3B,CAA2B,CAAC;SACnD;aAAM;YACL,cAAc;YACd,IAAM,QAAM,GAAG,QAAQ,GAAG,CAAC,CAAC;YAC5B,YAAY,GAAG,UAAC,CAAC,IAAK,OAAA,QAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAA3B,CAA2B,CAAC;SACnD;QACD,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC;QAE7B,2BAA2B;QAC3B,IAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,gBAAoC,CAAC;QACzC,IAAI,IAAA,eAAQ,EAAC,YAAY,CAAC,EAAE;YAC1B,gBAAgB,GAAG,cAAM,OAAA,YAAmB,EAAnB,CAAmB,CAAC;SAC9C;aAAM,IAAI,IAAA,cAAO,EAAC,YAAY,CAAC,EAAE;YAChC,gBAAgB,GAAG,cAAM,OAAA,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,EAAlC,CAAkC,CAAC;SAC7D;aAAM,IAAI,IAAA,iBAAU,EAAC,YAAY,CAAC,EAAE;YACnC,gBAAgB,GAAG,YAAY,CAAC;SACjC;aAAM;YACL,YAAY;YACZ,gBAAgB,GAAG,cAAM,OAAA,CAAC,EAAD,CAAC,CAAC;SAC5B;QACD,IAAI,CAAC,YAAY,GAAG,gBAAgB,CAAC;IACvC,CAAC;IACM,qCAAO,GAAd;QACE,OAAO,eAAe,CAAC;IACzB,CAAC;IACH,0BAAC;AAAD,CAAC,AA9WD,CAAyC,WAAI,GA8W5C;AA9WY,kDAAmB"}
1
+ {"version":3,"file":"comboCombined.js","sourceRoot":"","sources":["../../src/layout/comboCombined.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antv/layout",
3
- "version": "0.3.22",
3
+ "version": "0.3.23",
4
4
  "description": "graph layout algorithm",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",