@bhushanpawar/sqldb 1.0.25 → 1.0.27
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/README.md +82 -0
- package/dist/query/operations.d.ts +3 -0
- package/dist/query/operations.d.ts.map +1 -1
- package/dist/query/operations.js +58 -13
- package/dist/query/operations.js.map +1 -1
- package/dist/query/query-builder.d.ts +36 -0
- package/dist/query/query-builder.d.ts.map +1 -1
- package/dist/query/query-builder.js +117 -0
- package/dist/query/query-builder.js.map +1 -1
- package/dist/repository/base-repository.d.ts +52 -0
- package/dist/repository/base-repository.d.ts.map +1 -1
- package/dist/repository/base-repository.js +110 -0
- package/dist/repository/base-repository.js.map +1 -1
- package/dist/utils/case-converter.d.ts +3 -2
- package/dist/utils/case-converter.d.ts.map +1 -1
- package/dist/utils/case-converter.js +55 -1
- package/dist/utils/case-converter.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -135,6 +135,42 @@ await userRepo.updateById(user.userId, { status: 'inactive' });
|
|
|
135
135
|
|
|
136
136
|
---
|
|
137
137
|
|
|
138
|
+
## 🔄 Easy Migration from Custom CRUD Services
|
|
139
|
+
|
|
140
|
+
If you have existing code using custom `UnifiedCRUDService` or similar patterns, SqlDB's backward compatibility methods make migration seamless:
|
|
141
|
+
|
|
142
|
+
```typescript
|
|
143
|
+
// Your old service code works immediately!
|
|
144
|
+
const userRepo = db.getRepository(User);
|
|
145
|
+
|
|
146
|
+
// Legacy methods (drop-in replacements)
|
|
147
|
+
await userRepo.findByPK(userId, ['orders', 'addresses']);
|
|
148
|
+
await userRepo.findByPaginationQuery({ page: 1, limit: 20, orderBy: 'createdAt' });
|
|
149
|
+
await userRepo.findBySearchFilterModel({ search: 'john', searchFields: ['email'] });
|
|
150
|
+
await userRepo.countByQuery({ status: 'active' });
|
|
151
|
+
|
|
152
|
+
// Then migrate incrementally to modern syntax
|
|
153
|
+
await userRepo.findById(userId, { withRelations: { dependents: ['orders'] } });
|
|
154
|
+
await userRepo.find({ limit: 20, offset: 20, orderBy: { column: 'createdAt', direction: 'DESC' } });
|
|
155
|
+
```
|
|
156
|
+
|
|
157
|
+
**Available Legacy Methods:**
|
|
158
|
+
- `findByPK(id, relationsToFetch?)` - Drop-in for custom `findByPK`
|
|
159
|
+
- `findByQuery(query)` - Accepts legacy query objects
|
|
160
|
+
- `findAllRecords(filters?)` - Replaces `findAllRecords`
|
|
161
|
+
- `findByPaginationQuery(paginationQuery)` - Pagination helper
|
|
162
|
+
- `findBySearchFilterModel(searchFilter)` - Search filter helper
|
|
163
|
+
- `countByQuery(query)` / `countAll()` - Count helpers
|
|
164
|
+
- `deleteByQuery(query)` - Delete with legacy format
|
|
165
|
+
|
|
166
|
+
**Migration Strategy:**
|
|
167
|
+
1. Replace `UnifiedCRUDService` extends with `db.getRepository(Entity)`
|
|
168
|
+
2. Code works immediately (zero changes!)
|
|
169
|
+
3. Migrate methods incrementally to modern syntax
|
|
170
|
+
4. Enjoy 94% code reduction
|
|
171
|
+
|
|
172
|
+
---
|
|
173
|
+
|
|
138
174
|
## ⚡ Key Features at a Glance
|
|
139
175
|
|
|
140
176
|
| Feature | What You Get |
|
|
@@ -594,10 +630,56 @@ Performance at a glance: ⚡ <10ms | 🚀 <50ms | ✅ <200ms | ⚠️ <500ms |
|
|
|
594
630
|
- **[Schema Definition](./docs/SCHEMA_DEFINITION.md)** - Schema registry (no decorators)
|
|
595
631
|
- **[Performance Testing](./docs/PERFORMANCE_TESTING.md)** - Benchmark your app
|
|
596
632
|
- **[Performance Results](./docs/PERFORMANCE_RESULTS.md)** - Real-world benchmarks
|
|
633
|
+
- **[Relation Loading Performance](./docs/PERFORMANCE_RELATIONS.md)** - Optimized relation queries
|
|
597
634
|
- **[Schema Generator](./docs/SCHEMA_GENERATOR.md)** - Generate TypeScript schemas
|
|
598
635
|
|
|
599
636
|
---
|
|
600
637
|
|
|
638
|
+
## 📖 Repository API Quick Reference
|
|
639
|
+
|
|
640
|
+
```typescript
|
|
641
|
+
const repo = db.getRepository(User);
|
|
642
|
+
|
|
643
|
+
// CREATE
|
|
644
|
+
await repo.save({ email: 'john@example.com' }); // Insert one
|
|
645
|
+
await repo.saveMany([{ email: 'a@x.com' }, { email: 'b@x.com' }]); // Bulk insert
|
|
646
|
+
|
|
647
|
+
// READ
|
|
648
|
+
await repo.find({ where: { status: 'active' }, limit: 10 }); // Find many
|
|
649
|
+
await repo.findOne({ where: { email: 'john@example.com' } }); // Find one
|
|
650
|
+
await repo.findById(userId); // By ID
|
|
651
|
+
await repo.findAll({ limit: 100 }); // All records
|
|
652
|
+
|
|
653
|
+
// UPDATE
|
|
654
|
+
await repo.update({ status: 'active' }, { verified: true }); // Update many
|
|
655
|
+
await repo.updateById(userId, { email: 'new@example.com' }); // Update one
|
|
656
|
+
|
|
657
|
+
// DELETE
|
|
658
|
+
await repo.delete({ status: 'inactive' }); // Delete many
|
|
659
|
+
await repo.deleteById(userId); // Delete one
|
|
660
|
+
|
|
661
|
+
// COUNT & EXISTS
|
|
662
|
+
await repo.count({ status: 'active' }); // Count
|
|
663
|
+
await repo.exists({ email: 'john@example.com' }); // Check exists
|
|
664
|
+
|
|
665
|
+
// SEARCH
|
|
666
|
+
await repo.search('john', { fields: ['email', 'name'] }); // Full-text search
|
|
667
|
+
|
|
668
|
+
// LEGACY (backward compatibility)
|
|
669
|
+
await repo.findByPK(userId, ['orders']); // Legacy findByPK
|
|
670
|
+
await repo.findByPaginationQuery({ page: 1, limit: 20 }); // Legacy pagination
|
|
671
|
+
await repo.findBySearchFilterModel({ search: 'john' }); // Legacy search
|
|
672
|
+
|
|
673
|
+
// HELPERS
|
|
674
|
+
repo.getTableName(); // Get table name
|
|
675
|
+
repo.getPrimaryKey(); // Get PK field
|
|
676
|
+
repo.getTableOperations(); // Access low-level API
|
|
677
|
+
```
|
|
678
|
+
|
|
679
|
+
See [Repository Pattern Guide](./docs/REPOSITORY_PATTERN.md) for complete API reference and examples.
|
|
680
|
+
|
|
681
|
+
---
|
|
682
|
+
|
|
601
683
|
## 🎯 Examples
|
|
602
684
|
|
|
603
685
|
### Simple Examples
|
|
@@ -32,6 +32,9 @@ export declare class TableOperationsImpl<T = any> implements TableOperations<T>
|
|
|
32
32
|
* 3. Auto-discovered schema (validColumns from discovery)
|
|
33
33
|
*/
|
|
34
34
|
private filterValidColumns;
|
|
35
|
+
private prepareWhereClause;
|
|
36
|
+
private convertResultToCamelCase;
|
|
37
|
+
private prepareOptions;
|
|
35
38
|
/**
|
|
36
39
|
* Prepare data for database write operations
|
|
37
40
|
* Handles:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/query/operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,EAAkB,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAK5D,qBAAa,mBAAmB,CAAC,CAAC,GAAG,GAAG,CAAE,YAAW,eAAe,CAAC,CAAC,CAAC;IACrE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAoB;IACzC,OAAO,CAAC,YAAY,CAAC,CAAuB;IAC5C,OAAO,CAAC,YAAY,CAAC,CAAe;IACpC,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,YAAY,CAAC,CAAc;gBAGjC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,wBAAwB,EACnC,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,EAClC,YAAY,CAAC,EAAE,iBAAiB,EAChC,YAAY,CAAC,EAAE,oBAAoB,EACnC,YAAY,CAAC,EAAE,YAAY,EAC3B,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,CAAC,EAAE,MAAM,EAAE;IAgBzB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IA2C1B;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IAkB3B;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IA2BhB,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAMxE,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/query/operations.ts"],"names":[],"mappings":"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"}
|
package/dist/query/operations.js
CHANGED
|
@@ -62,6 +62,45 @@ class TableOperationsImpl {
|
|
|
62
62
|
}
|
|
63
63
|
return filtered;
|
|
64
64
|
}
|
|
65
|
+
prepareWhereClause(where) {
|
|
66
|
+
if (!where || !this.caseConversionConfig?.enabled) {
|
|
67
|
+
return where;
|
|
68
|
+
}
|
|
69
|
+
return case_converter_1.CaseConverter.whereClauseToSnake(where);
|
|
70
|
+
}
|
|
71
|
+
convertResultToCamelCase(result) {
|
|
72
|
+
if (!result || !this.caseConversionConfig?.enabled) {
|
|
73
|
+
return result;
|
|
74
|
+
}
|
|
75
|
+
return case_converter_1.CaseConverter.objectKeysToCamel(result);
|
|
76
|
+
}
|
|
77
|
+
prepareOptions(options) {
|
|
78
|
+
if (!options || !this.caseConversionConfig?.enabled) {
|
|
79
|
+
return options;
|
|
80
|
+
}
|
|
81
|
+
const prepared = { ...options };
|
|
82
|
+
if (prepared.orderBy) {
|
|
83
|
+
if (typeof prepared.orderBy === 'string') {
|
|
84
|
+
prepared.orderBy = case_converter_1.CaseConverter.camelToSnake(prepared.orderBy);
|
|
85
|
+
}
|
|
86
|
+
else if (Array.isArray(prepared.orderBy)) {
|
|
87
|
+
prepared.orderBy = prepared.orderBy.map(opt => ({
|
|
88
|
+
...opt,
|
|
89
|
+
column: case_converter_1.CaseConverter.camelToSnake(opt.column)
|
|
90
|
+
}));
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
prepared.orderBy = {
|
|
94
|
+
...prepared.orderBy,
|
|
95
|
+
column: case_converter_1.CaseConverter.camelToSnake(prepared.orderBy.column)
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
if (prepared.select) {
|
|
100
|
+
prepared.select = prepared.select.map(col => case_converter_1.CaseConverter.camelToSnake(col));
|
|
101
|
+
}
|
|
102
|
+
return prepared;
|
|
103
|
+
}
|
|
65
104
|
/**
|
|
66
105
|
* Prepare data for database write operations
|
|
67
106
|
* Handles:
|
|
@@ -134,7 +173,10 @@ class TableOperationsImpl {
|
|
|
134
173
|
const { correlationId: _, skipCache: __, withRelations: ___, ...cacheableOptions } = effectiveOptions || {};
|
|
135
174
|
const cacheKey = this.cacheManager
|
|
136
175
|
.getKeyBuilder()
|
|
137
|
-
.buildKey(this.tableName, 'findMany', {
|
|
176
|
+
.buildKey(this.tableName, 'findMany', {
|
|
177
|
+
where: this.prepareWhereClause(where),
|
|
178
|
+
options: this.prepareOptions(cacheableOptions)
|
|
179
|
+
});
|
|
138
180
|
// Try cache first
|
|
139
181
|
if (!skipCache && this.cacheManager.isEnabled()) {
|
|
140
182
|
const cached = await this.cacheManager.get(cacheKey);
|
|
@@ -164,8 +206,9 @@ class TableOperationsImpl {
|
|
|
164
206
|
}
|
|
165
207
|
}
|
|
166
208
|
// Query database
|
|
167
|
-
const { sql, params } = this.queryBuilder.buildSelect(this.tableName, where, effectiveOptions);
|
|
168
|
-
|
|
209
|
+
const { sql, params } = this.queryBuilder.buildSelect(this.tableName, this.prepareWhereClause(where), this.prepareOptions(effectiveOptions));
|
|
210
|
+
const rawResults = await this.dbManager.query(sql, params, correlationId);
|
|
211
|
+
results = this.convertResultToCamelCase(rawResults);
|
|
169
212
|
const executionTime = Date.now() - startTime;
|
|
170
213
|
// Record query stats for auto-warming
|
|
171
214
|
if (this.statsTracker) {
|
|
@@ -222,9 +265,9 @@ class TableOperationsImpl {
|
|
|
222
265
|
}
|
|
223
266
|
// Query database
|
|
224
267
|
const { sql, params } = this.queryBuilder.buildSelectById(this.tableName, id);
|
|
225
|
-
const
|
|
268
|
+
const rawResults = await this.dbManager.query(sql, params, correlationId);
|
|
226
269
|
const executionTime = Date.now() - startTime;
|
|
227
|
-
const result =
|
|
270
|
+
const result = rawResults.length > 0 ? this.convertResultToCamelCase(rawResults[0]) : null;
|
|
228
271
|
// Record query stats for auto-warming
|
|
229
272
|
if (this.statsTracker) {
|
|
230
273
|
const queryId = (0, query_tracker_1.generateQueryId)();
|
|
@@ -275,7 +318,7 @@ class TableOperationsImpl {
|
|
|
275
318
|
}
|
|
276
319
|
}
|
|
277
320
|
// Query database
|
|
278
|
-
const { sql, params } = this.queryBuilder.buildCount(this.tableName, where);
|
|
321
|
+
const { sql, params } = this.queryBuilder.buildCount(this.tableName, this.prepareWhereClause(where));
|
|
279
322
|
const results = await this.dbManager.query(sql, params, correlationId);
|
|
280
323
|
const executionTime = Date.now() - startTime;
|
|
281
324
|
const count = results[0]?.count || 0;
|
|
@@ -358,7 +401,7 @@ class TableOperationsImpl {
|
|
|
358
401
|
console.warn(`[UpdateOne] No valid columns to update in table ${this.tableName}. Original record received`, data);
|
|
359
402
|
return null;
|
|
360
403
|
}
|
|
361
|
-
const { sql, params } = this.queryBuilder.buildUpdate(this.tableName, where, preparedData);
|
|
404
|
+
const { sql, params } = this.queryBuilder.buildUpdate(this.tableName, this.prepareWhereClause(where), preparedData);
|
|
362
405
|
const result = await this.dbManager.query(sql, params, correlationId);
|
|
363
406
|
// Invalidate cache (non-blocking fire-and-forget)
|
|
364
407
|
if (this.cacheConfig.invalidateOnWrite) {
|
|
@@ -379,7 +422,7 @@ class TableOperationsImpl {
|
|
|
379
422
|
console.warn(`[UpdateMany] No valid columns to update in table ${this.tableName}. Original record received`, data);
|
|
380
423
|
return 0;
|
|
381
424
|
}
|
|
382
|
-
const { sql, params } = this.queryBuilder.buildUpdate(this.tableName, where, preparedData);
|
|
425
|
+
const { sql, params } = this.queryBuilder.buildUpdate(this.tableName, this.prepareWhereClause(where), preparedData);
|
|
383
426
|
const result = await this.dbManager.query(sql, params, correlationId);
|
|
384
427
|
// Invalidate cache (non-blocking fire-and-forget)
|
|
385
428
|
if (this.cacheConfig.invalidateOnWrite) {
|
|
@@ -413,7 +456,7 @@ class TableOperationsImpl {
|
|
|
413
456
|
return null;
|
|
414
457
|
}
|
|
415
458
|
async deleteOne(where, correlationId) {
|
|
416
|
-
const { sql, params } = this.queryBuilder.buildDelete(this.tableName, where);
|
|
459
|
+
const { sql, params } = this.queryBuilder.buildDelete(this.tableName, this.prepareWhereClause(where));
|
|
417
460
|
const result = await this.dbManager.query(sql, params, correlationId);
|
|
418
461
|
// Invalidate cache (non-blocking fire-and-forget)
|
|
419
462
|
if (this.cacheConfig.invalidateOnWrite) {
|
|
@@ -422,7 +465,7 @@ class TableOperationsImpl {
|
|
|
422
465
|
return (result.affectedRows || 0) > 0;
|
|
423
466
|
}
|
|
424
467
|
async deleteMany(where, correlationId) {
|
|
425
|
-
const { sql, params } = this.queryBuilder.buildDelete(this.tableName, where);
|
|
468
|
+
const { sql, params } = this.queryBuilder.buildDelete(this.tableName, this.prepareWhereClause(where));
|
|
426
469
|
const result = await this.dbManager.query(sql, params, correlationId);
|
|
427
470
|
// Invalidate cache (non-blocking fire-and-forget)
|
|
428
471
|
if (this.cacheConfig.invalidateOnWrite) {
|
|
@@ -740,14 +783,16 @@ class TableOperationsImpl {
|
|
|
740
783
|
}
|
|
741
784
|
// Detect the ID field name (id, service_id, etc.)
|
|
742
785
|
const idField = this.detectIdField();
|
|
786
|
+
// Prepare filters if provided
|
|
787
|
+
const preparedFilters = filters ? this.prepareWhereClause(filters) : null;
|
|
743
788
|
// Build SQL IN clause manually since query builder doesn't support $in
|
|
744
789
|
const placeholders = idsToFetch.map(() => '?').join(',');
|
|
745
|
-
const whereFilters =
|
|
790
|
+
const whereFilters = preparedFilters ? Object.entries(preparedFilters).map(([key, val]) => `${key} = ?`).join(' AND ') : '';
|
|
746
791
|
const sql = whereFilters
|
|
747
792
|
? `SELECT * FROM ${this.tableName} WHERE ${idField} IN (${placeholders}) AND ${whereFilters} LIMIT ?`
|
|
748
793
|
: `SELECT * FROM ${this.tableName} WHERE ${idField} IN (${placeholders}) LIMIT ?`;
|
|
749
|
-
const params =
|
|
750
|
-
? [...idsToFetch, ...Object.values(
|
|
794
|
+
const params = preparedFilters
|
|
795
|
+
? [...idsToFetch, ...Object.values(preparedFilters), limit]
|
|
751
796
|
: [...idsToFetch, limit];
|
|
752
797
|
let records = await this.raw(sql, params);
|
|
753
798
|
// Apply case conversion if enabled (database -> application)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/query/operations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/query/operations.ts"],"names":[],"mappings":";;;AAOA,mDAAkD;AAMlD,4DAAwD;AACxD,qDAAyD;AACzD,2DAA+D;AAE/D,MAAa,mBAAmB;IAc9B,YACE,SAAiB,EACjB,SAAmC,EACnC,YAA0B,EAC1B,mBAAwC,EACxC,YAA0B,EAC1B,WAAkC,EAClC,YAAgC,EAChC,YAAmC,EACnC,YAA2B,EAC3B,gBAAmC,EACnC,oBAA2C,EAC3C,YAAuB;QAEvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvE,CAAC;IAED;;;;;;OAMG;IACK,kBAAkB,CAAC,IAAgB;QACzC,MAAM,QAAQ,GAAQ,EAAE,CAAC;QAEzB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,IAAI,aAAa,GAAG,IAAI,CAAC;YAEzB,uFAAuF;YACvF,MAAM,WAAW,GAAI,IAAY,CAAC,WAAW,CAAC;YAC9C,IAAI,WAAW,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;gBAC1C,MAAM,WAAW,GAAG,0BAAe,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACtE,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC9B,aAAa,GAAG,KAAK,CAAC;gBACxB,CAAC;YACH,CAAC;YAED,sEAAsE;YACtE,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,WAAW,GAAG,oCAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9E,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC9B,aAAa,GAAG,KAAK,CAAC;gBACxB,CAAC;YACH,CAAC;YAED,yCAAyC;YACzC,IAAI,aAAa,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvC,kEAAkE;gBAClE,MAAM,YAAY,GAAG,8BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACrD,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACpF,CAAC;YAED,IAAI,aAAa,EAAE,CAAC;gBAClB,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACxB,CAAC;QACH,CAAC;QAED,0EAA0E;QAC1E,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,kBAAkB,CAAC,KAAiC;QAC1D,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,8BAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAEO,wBAAwB,CAAC,MAAW;QAC1C,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,8BAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAEO,cAAc,CAAC,OAAqB;QAC1C,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC;YACpD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAEhC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACzC,QAAQ,CAAC,OAAO,GAAG,8BAAa,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClE,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAC9C,GAAG,GAAG;oBACN,MAAM,EAAE,8BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;iBAC/C,CAAC,CAAC,CAAC;YACN,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,OAAO,GAAG;oBACjB,GAAG,QAAQ,CAAC,OAAO;oBACnB,MAAM,EAAE,8BAAa,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;iBAC5D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,8BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;OAMG;IACK,mBAAmB,CAAC,IAAgB;QAC1C,2CAA2C;QAC3C,IAAI,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEjD,wEAAwE;QACxE,IAAI,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC;YACvC,YAAY,GAAG,8BAAa,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,gDAAgD;QAChD,MAAM,UAAU,GAAQ,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;;;OAMG;IACK,cAAc,CAAC,KAAU;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sBAAsB;QACtB,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,oDAAoD;QACpD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;YAC9D,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,0CAA0C;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAqB,EAAE,OAAqB;QACxD,MAAM,aAAa,GAAgB,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC1D,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAsB,EAAE,OAAqB;QAC1D,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,KAAK,CAAC;QAC9C,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,CAAC;QAC7C,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,OAAY,CAAC;QAEjB,8EAA8E;QAC9E,MAAM,gBAAgB,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QACxC,IAAI,aAAa,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;YAC7C,mEAAmE;YACnE,gBAAgB,CAAC,KAAK,GAAG,IAAI,CAAC;YAC9B,OAAO,CAAC,IAAI,CACV,iGAAiG;gBACjG,6EAA6E,CAC9E,CAAC;QACJ,CAAC;QAED,4HAA4H;QAC5H,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,gBAAgB,EAAE,GAAG,gBAAgB,IAAI,EAAE,CAAC;QAC5G,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY;aAC/B,aAAa,EAAE;aACf,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE;YACpC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;YACrC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;SAC/C,CAAC,CAAC;QAEL,kBAAkB;QAClB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAM,QAAQ,CAAC,CAAC;YAC1D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO,GAAG,MAAM,CAAC;gBAEjB,6BAA6B;gBAC7B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;oBAC7C,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;oBAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;wBAC7B,OAAO;wBACP,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS,EAAE,UAAU;wBACrB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;wBACpC,eAAe,EAAE,aAAa;wBAC9B,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,IAAI,IAAI,EAAE;qBACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;wBACZ,+BAA+B;oBACjC,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,+DAA+D;gBAC/D,IAAI,aAAa,EAAE,CAAC;oBAClB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;gBAC3E,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CACnD,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAC9B,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,CACtC,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAQ,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACjF,OAAO,GAAG,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAEpD,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE7C,sCAAsC;QACtC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC7B,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,UAAU;gBACrB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;gBACpC,eAAe,EAAE,aAAa;gBAC9B,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,+BAA+B;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,gBAAgB;QAChB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,+DAA+D;QAC/D,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QAC3E,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAmB,EAAE,aAAsB;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY;aAC/B,aAAa,EAAE;aACf,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAElC,kBAAkB;QAClB,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAI,QAAQ,CAAC,CAAC;YACxD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,6BAA6B;gBAC7B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;oBAC7C,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;oBAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;wBAC7B,OAAO;wBACP,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS,EAAE,UAAU;wBACrB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC;wBAC/B,eAAe,EAAE,aAAa;wBAC9B,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,IAAI,IAAI,EAAE;qBACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;wBACZ,+BAA+B;oBACjC,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC9E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAM,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC/E,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE7C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3F,sCAAsC;QACtC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC7B,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,UAAU;gBACrB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC;gBAC/B,eAAe,EAAE,aAAa;gBAC9B,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,+BAA+B;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,eAAe;QACf,IAAI,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAsB,EAAE,aAAsB;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY;aAC/B,aAAa,EAAE;aACf,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAEhD,gDAAgD;QAChD,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;YAC7D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,6BAA6B;gBAC7B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;oBAC7C,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;oBAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;wBAC7B,OAAO;wBACP,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS,EAAE,OAAO;wBAClB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;wBACpC,eAAe,EAAE,aAAa;wBAC9B,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,IAAI,IAAI,EAAE;qBACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;wBACZ,+BAA+B;oBACjC,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrG,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAQ,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC9E,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;QAErC,sCAAsC;QACtC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC7B,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,OAAO;gBAClB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;gBACpC,eAAe,EAAE,aAAa;gBAC9B,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,+BAA+B;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,oDAAoD;QACpD,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAmB,EAAE,aAAsB;QACzD,+DAA+D;QAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAkB,CAAC,CAAC;QAElE,6CAA6C;QAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,mDAAmD,IAAI,CAAC,SAAS,4BAA4B,EAAE,IAAI,CAAC,CAAC;YAClH,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpF,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9E,CAAC;QAED,4FAA4F;QAC5F,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC;QACnC,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,UAAU,EAAO,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAA0B,EAAE,aAAsB;QACjE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,+EAA+E;QAC/E,MAAM,iBAAiB,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAkB,CAAC,CAAC,CAAC;QAE9F,0CAA0C;QAC1C,MAAM,YAAY,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,oDAAoD,IAAI,CAAC,SAAS,6BAA6B,EAAE,SAAS,CAAC,CAAC;YACzH,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,8DAA8D;QAC9D,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,0DAA0D,CAAC,CAAC;QACzI,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CACvD,IAAI,CAAC,SAAS,EACd,YAAY,CACb,CAAC;QACF,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,mFAAmF;QACnF,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,OAAO,SAAS;aACb,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC;aAC7B,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACrB,GAAG,IAAI;YACP,EAAE,EAAE,OAAO,GAAG,KAAK;SACpB,CAAC,CAAQ,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAqB,EAAE,IAAgB,EAAE,aAAsB;QAC7E,+DAA+D;QAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEpD,6CAA6C;QAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,mDAAmD,IAAI,CAAC,SAAS,4BAA4B,EAAE,IAAI,CAAC,CAAC;YAClH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CACnD,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAC9B,YAAY,CACb,CAAC;QAEF,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9E,CAAC;QAED,wFAAwF;QACxF,sEAAsE;QACtE,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAqB,EAAE,IAAgB,EAAE,aAAsB;QAC9E,+DAA+D;QAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEpD,0CAA0C;QAC1C,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,oDAAoD,IAAI,CAAC,SAAS,4BAA4B,EAAE,IAAI,CAAC,CAAC;YACnH,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CACnD,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAC9B,YAAY,CACb,CAAC;QAEF,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAmB,EAAE,IAAgB,EAAE,aAAsB;QAC5E,gDAAgD;QAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,+DAA+D;QAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEpD,iDAAiD;QACjD,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,oDAAoD,IAAI,CAAC,SAAS,4BAA4B,EAAE,IAAI,CAAC,CAAC;YACnH,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CACvD,IAAI,CAAC,SAAS,EACd,EAAE,EACF,YAAY,CACb,CAAC;QAEF,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,uEAAuE;QACvE,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,EAAO,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAqB,EAAE,aAAsB;QAC3D,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACtG,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC9E,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAqB,EAAE,aAAsB;QAC5D,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACtG,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAmB,EAAE,aAAsB;QAC1D,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC9E,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAE3E,kDAAkD;QAClD,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,IAAI,CAAC,SAAS,EACd,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAClD,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,GAAG,CAAU,GAAW,EAAE,MAAc,EAAE,aAAsB;QACpE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY;aAC/B,aAAa,EAAE;aACf,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QAEpD,kBAAkB;QAClB,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAI,QAAQ,CAAC,CAAC;YACxD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,kDAAkD;gBAClD,IAAI,IAAI,CAAC,YAAY,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvE,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;oBAC7C,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;oBAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;wBAC7B,OAAO;wBACP,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS,EAAE,KAAK;wBAChB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;wBAC/D,eAAe,EAAE,aAAa;wBAC9B,QAAQ,EAAE,IAAI;wBACd,SAAS,EAAE,IAAI,IAAI,EAAE;qBACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;wBACZ,+BAA+B;oBACjC,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAI,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACzE,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE7C,2DAA2D;QAC3D,IAAI,IAAI,CAAC,YAAY,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvE,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC7B,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;gBAC/D,eAAe,EAAE,aAAa;gBAC9B,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,+BAA+B;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,0BAA0B;QAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,OAAY,EACZ,aAAuC,EACvC,aAAsB;QAEtB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;QAEnC,2DAA2D;QAC3D,IAAI,WAAW,GAAG,IAAI,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CACV,+CAA+C,WAAW,YAAY;gBACtE,kFAAkF;gBAClF,kCAAkC,CACnC,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAEpE,wBAAwB;QACxB,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,IAAI,cAAoC,CAAC;QACzC,IAAI,gBAAsC,CAAC;QAE3C,IAAI,OAAO,aAAa,KAAK,SAAS,EAAE,CAAC;YACvC,+BAA+B;YAC/B,eAAe,GAAG,aAAa,CAAC;YAChC,iBAAiB,GAAG,aAAa,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,0BAA0B;YAC1B,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBACtC,eAAe,GAAG,IAAI,CAAC;YACzB,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnD,eAAe,GAAG,IAAI,CAAC;gBACvB,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC;YAC5C,CAAC;YAED,IAAI,aAAa,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;gBACxC,iBAAiB,GAAG,IAAI,CAAC;YAC3B,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrD,iBAAiB,GAAG,IAAI,CAAC;gBACzB,gBAAgB,GAAG,aAAa,CAAC,YAAY,CAAC;YAChD,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAErD,4DAA4D;QAC5D,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,wBAAwB,GAAG,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEpF,KAAK,MAAM,GAAG,IAAI,wBAAwB,EAAE,CAAC;gBAC3C,2CAA2C;gBAC3C,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9D,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,mBAAmB,CACxC,GAAG,CAAC,SAAS,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,CACjB,CAAC;oBAEF,kDAAkD;oBAClD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAO,CAAC;oBAChC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAI,MAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC9C,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;wBACxB,CAAC;oBACH,CAAC;oBAED,6BAA6B;oBAC7B,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;wBACxB,SAAS;oBACX,CAAC;oBAED,sEAAsE;oBACtE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACrC,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;oBAClD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,WAAkB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;oBAErF,8CAA8C;oBAC9C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAc,CAAC;oBAC7C,KAAK,MAAM,aAAa,IAAI,WAAW,EAAE,CAAC;wBACxC,MAAM,OAAO,GAAI,aAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBACvD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;4BACjC,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBAClC,CAAC;wBACD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACnD,CAAC;oBAED,qCAAqC;oBACrC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAI,MAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC7C,MAAc,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;wBACrE,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC,mCAAmC,GAAG,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC3E,CAAC;YACH,CAAC;QACH,CAAC;QAED,8DAA8D;QAC9D,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,0BAA0B,GAAG,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAExF,KAAK,MAAM,GAAG,IAAI,0BAA0B,EAAE,CAAC;gBAC7C,2CAA2C;gBAC3C,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAChE,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,mBAAmB,CACxC,GAAG,CAAC,OAAO,EACX,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,CACjB,CAAC;oBAEF,+BAA+B;oBAC/B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAO,CAAC;oBAChC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAI,MAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBAChD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC9C,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;wBACxB,CAAC;oBACH,CAAC;oBAED,6BAA6B;oBAC7B,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;wBACxB,SAAS;oBACX,CAAC;oBAED,oFAAoF;oBACpF,+DAA+D;oBAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACrC,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;oBAChD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,WAAkB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;oBAErF,+BAA+B;oBAC/B,MAAM,cAAc,GAAG,IAAI,GAAG,EAAY,CAAC;oBAC3C,KAAK,MAAM,aAAa,IAAI,WAAW,EAAE,CAAC;wBACxC,MAAM,OAAO,GAAI,aAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBACrD,oCAAoC;wBACpC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC9C,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;wBAC7C,CAAC;oBACH,CAAC;oBAED,iCAAiC;oBACjC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAI,MAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBAChD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC9C,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;4BAClD,IAAI,aAAa,EAAE,CAAC;gCACjB,MAAc,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC;4BAC/C,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC,oCAAoC,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;QACH,CAAC;QAED,sBAAsB;QACtB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,eAAe,GAAG,iBAAiB,CAAC;QAE7D,IAAI,gBAAgB,GAAG,IAAI,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CACV,uCAAuC,gBAAgB,UAAU,WAAW,YAAY;gBACxF,iEAAiE,CAClE,CAAC;QACJ,CAAC;aAAM,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC;YAC7B,iDAAiD;YACjD,OAAO,CAAC,GAAG,CACT,mDAAmD,WAAW,eAAe,gBAAgB,KAAK;gBAClG,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAChE,CAAC;QACJ,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE;YAC7D,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAsB,EAAE,aAAsB;QAC5D,qCAAqC;QACrC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,KAAsB,EACtB,OAKC;QAED,MAAM,EACJ,aAAa,EACb,KAAK,GAAG,CAAC,EACT,cAAc,GAAG,IAAI,EACrB,gBAAgB,GAAG,IAAI,GACxB,GAAG,OAAO,IAAI,EAAE,CAAC;QAElB,+BAA+B;QAC/B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;QAEvE,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAEpE,mEAAmE;QACnE,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,wBAAwB,GAAG,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEpF,KAAK,MAAM,GAAG,IAAI,wBAAwB,EAAE,CAAC;gBAC3C,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,mBAAmB,CACxC,GAAG,CAAC,SAAS,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,CACjB,CAAC;oBAEF,2BAA2B;oBAC3B,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;oBAE7D,8DAA8D;oBAC9D,wFAAwF;oBACxF,KAAK,MAAM,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,+CAA+C;wBACnG,MAAM,OAAO,GAAI,MAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC9C,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;4BAClD,MAAM,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;wBACxE,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,+CAA+C;oBAC/C,OAAO,CAAC,IAAI,CAAC,4CAA4C,GAAG,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;gBACpF,CAAC;YACH,CAAC;QACH,CAAC;QAED,qEAAqE;QACrE,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,0BAA0B,GAAG,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAExF,KAAK,MAAM,GAAG,IAAI,0BAA0B,EAAE,CAAC;gBAC7C,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,mBAAmB,CACxC,GAAG,CAAC,OAAO,EACX,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,CACjB,CAAC;oBAEF,qBAAqB;oBACrB,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;oBAE7D,4CAA4C;oBAC5C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAO,CAAC;oBACrC,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;wBACtC,MAAM,OAAO,GAAI,MAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;wBAChD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;4BAC9C,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;wBAC7B,CAAC;oBACH,CAAC;oBAED,8BAA8B;oBAC9B,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,oBAAoB;wBAChF,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;wBAC9C,MAAM,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;oBACxE,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,+CAA+C;oBAC/C,OAAO,CAAC,IAAI,CAAC,6CAA6C,GAAG,CAAC,OAAO,GAAG,EAAE,KAAK,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,OAAuB;QACjD,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,CAAC,SAAS,KAAK;gBACvD,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,EACJ,MAAM,EACN,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,EACV,OAAO,EACP,OAAO,EACP,eAAe,EACf,QAAQ,GAAG,CAAC,GACb,GAAG,OAAO,IAAI,EAAE,CAAC;QAElB,oDAAoD;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;QAErF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,2CAA2C;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;QAExD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,kDAAkD;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAErC,8BAA8B;QAC9B,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAEjF,uEAAuE;QACvE,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5H,MAAM,GAAG,GAAG,YAAY;YACtB,CAAC,CAAC,iBAAiB,IAAI,CAAC,SAAS,UAAU,OAAO,QAAQ,YAAY,SAAS,YAAY,UAAU;YACrG,CAAC,CAAC,iBAAiB,IAAI,CAAC,SAAS,UAAU,OAAO,QAAQ,YAAY,WAAW,CAAC;QAEpF,MAAM,MAAM,GAAG,eAAe;YAC5B,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC;YAC3D,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,KAAK,CAAC,CAAC;QAE3B,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAM,GAAG,EAAE,MAAM,CAAC,CAAC;QAE/C,6DAA6D;QAC7D,IAAI,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,CAAC;YACvC,OAAO,GAAG,8BAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;QAED,8EAA8E;QAC9E,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,EAAE,OAAO;YACpD,CAAC,CAAC,8BAAa,CAAC,YAAY,CAAC,OAAO,CAAC;YACrC,CAAC,CAAC,OAAO,CAAC;QAEZ,gEAAgE;QAChE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAa,CAAC;QACxC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAI,MAAc,CAAC,WAAW,CAAC,CAAC;YACxC,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBACpC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QAED,+DAA+D;QAC/D,MAAM,OAAO,GAAsB,EAAE,CAAC;QAEtC,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM;gBAAE,SAAS;YAEtB,iDAAiD;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAE/D,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;gBACrB,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAoB;gBAC9B,KAAK;gBACL,IAAI,EAAE,MAAM;aACb,CAAC;YAEF,8BAA8B;YAC9B,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClD,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;gBACvB,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAEpD,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;oBACpC,MAAM,UAAU,GAAI,MAAc,CAAC,KAAK,CAAC,CAAC;oBAC1C,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;wBACjD,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CACxD,UAAU,EACV,UAAU,CACX,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,oBAAoB;YACpB,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEvD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE7C,0BAA0B;QAC1B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,IAAA,+BAAe,GAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC7B,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,QAAQ;gBACnB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;gBAC3C,eAAe,EAAE,aAAa;gBAC9B,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,+BAA+B;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,CAAC,SAAS,KAAK;gBACvD,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7D,kBAAkB;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,OAAgB,CAAC,CAAC;QAEnF,4DAA4D;QAC5D,IAAI,cAAc,CAAC;QACnB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;oBAC3D,gBAAgB,EAAE,CAAC;oBACnB,UAAU,EAAE,EAAE;oBACd,aAAa,EAAE,CAAC;iBACjB,CAAC,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,wBAAwB,cAAc,CAAC,YAAY,kBAAkB,CAAC,CAAC;YACrF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;gBACrD,wDAAwD;YAC1D,CAAC;QACH,CAAC;QAED,OAAO;YACL,GAAG,KAAK;YACR,UAAU,EAAE,cAAc;SAC3B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB;QACtB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,CAAC,SAAS,KAAK;gBACvD,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QAED,uBAAuB;QACvB,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEnD,uBAAuB;QACvB,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACK,oBAAoB,CAAC,KAAa,EAAE,MAAS,EAAE,MAAiB;QACtE,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAa,CAAC,CAAC;QAE1D,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,QAAQ,GAAG,CAAC,CAAC;QAEjB,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,UAAU,GAAI,MAAc,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;gBAClD,SAAS;YACX,CAAC;YAED,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5C,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC;YAE9B,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC9B,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,KAAK,IAAI,CAAC,CAAC;oBAEX,6BAA6B;oBAC7B,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,GAAG,CAAC,CAAC;oBAC3D,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;wBACvC,KAAK,IAAI,GAAG,CAAC;oBACf,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED;;;OAGG;IACK,aAAa;QACnB,kBAAkB;QAClB,yDAAyD;QACzD,+BAA+B;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB;QAC7E,OAAO,GAAG,aAAa,KAAK,CAAC;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,eAAe,CAAC,OAIrB;QACC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,SAAS,KAAK;gBAC3D,qDAAqD,CACtD,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,gBAAgB,EAAE,CAAC;YACnB,UAAU,EAAE,EAAE;YACd,aAAa,EAAE,CAAC;YAChB,GAAG,OAAO;SACX,CAAC;QAEF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,SAAS,KAAK;gBAC3D,qDAAqD,CACtD,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC;IACrD,CAAC;CACF;AA7xCD,kDA6xCC"}
|
|
@@ -10,6 +10,42 @@ export declare class QueryBuilder {
|
|
|
10
10
|
buildUpdateById(table: string, id: string | number, data: any): QueryResult;
|
|
11
11
|
buildDeleteById(table: string, id: string | number): QueryResult;
|
|
12
12
|
private buildWhereClause;
|
|
13
|
+
/**
|
|
14
|
+
* Build SELECT with JSON aggregation for one-to-many relations
|
|
15
|
+
*
|
|
16
|
+
* This creates a single SQL query that loads both main records and their relations
|
|
17
|
+
* using JSON_ARRAYAGG and JSON_OBJECT functions.
|
|
18
|
+
*
|
|
19
|
+
* Example output:
|
|
20
|
+
* SELECT
|
|
21
|
+
* u.*,
|
|
22
|
+
* JSON_ARRAYAGG(
|
|
23
|
+
* JSON_OBJECT(
|
|
24
|
+
* 'orderId', o.order_id,
|
|
25
|
+
* 'status', o.status,
|
|
26
|
+
* 'total', o.total
|
|
27
|
+
* )
|
|
28
|
+
* ) as orders
|
|
29
|
+
* FROM users u
|
|
30
|
+
* LEFT JOIN orders o ON u.user_id = o.user_id
|
|
31
|
+
* WHERE u.status = ?
|
|
32
|
+
* GROUP BY u.user_id
|
|
33
|
+
*
|
|
34
|
+
* Note: This requires explicit column mapping for relations.
|
|
35
|
+
* Columns should be provided in the relation metadata.
|
|
36
|
+
*/
|
|
37
|
+
buildSelectWithRelations(table: string, where?: WhereClause, options?: FindOptions, relations?: Array<{
|
|
38
|
+
relatedTable: string;
|
|
39
|
+
foreignKey: string;
|
|
40
|
+
primaryKey: string;
|
|
41
|
+
type: 'one-to-many' | 'many-to-one';
|
|
42
|
+
columns?: string[];
|
|
43
|
+
}>): QueryResult;
|
|
44
|
+
/**
|
|
45
|
+
* Detect primary key field for a table
|
|
46
|
+
* Convention: tableName + '_id' or 'id'
|
|
47
|
+
*/
|
|
48
|
+
private detectPrimaryKey;
|
|
13
49
|
private buildOrderBy;
|
|
14
50
|
}
|
|
15
51
|
//# sourceMappingURL=query-builder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../src/query/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAItF,qBAAa,YAAY;IACvB,WAAW,CACT,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,WAAW,GACpB,WAAW;IA6Bd,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW;IAc3D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,WAAW;IAUlD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,WAAW;IAsB7D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,GAAG,WAAW;IAetE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW;IAY3D,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW;IAMnF,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,WAAW;IAU3E,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW;IAKhE,OAAO,CAAC,gBAAgB;IAmJxB,OAAO,CAAC,YAAY;CAcrB"}
|
|
1
|
+
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../src/query/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAItF,qBAAa,YAAY;IACvB,WAAW,CACT,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,WAAW,GACpB,WAAW;IA6Bd,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW;IAc3D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,WAAW;IAUlD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,WAAW;IAsB7D,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,GAAG,WAAW;IAetE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW;IAY3D,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW;IAMnF,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,WAAW;IAU3E,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW;IAKhE,OAAO,CAAC,gBAAgB;IAmJxB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,wBAAwB,CACtB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,WAAW,EACnB,OAAO,CAAC,EAAE,WAAW,EACrB,SAAS,CAAC,EAAE,KAAK,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,aAAa,GAAG,aAAa,CAAC;QACpC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC,GACD,WAAW;IAgGd;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,YAAY;CAcrB"}
|
|
@@ -234,6 +234,123 @@ class QueryBuilder {
|
|
|
234
234
|
}
|
|
235
235
|
return conditions.join(' AND ');
|
|
236
236
|
}
|
|
237
|
+
/**
|
|
238
|
+
* Build SELECT with JSON aggregation for one-to-many relations
|
|
239
|
+
*
|
|
240
|
+
* This creates a single SQL query that loads both main records and their relations
|
|
241
|
+
* using JSON_ARRAYAGG and JSON_OBJECT functions.
|
|
242
|
+
*
|
|
243
|
+
* Example output:
|
|
244
|
+
* SELECT
|
|
245
|
+
* u.*,
|
|
246
|
+
* JSON_ARRAYAGG(
|
|
247
|
+
* JSON_OBJECT(
|
|
248
|
+
* 'orderId', o.order_id,
|
|
249
|
+
* 'status', o.status,
|
|
250
|
+
* 'total', o.total
|
|
251
|
+
* )
|
|
252
|
+
* ) as orders
|
|
253
|
+
* FROM users u
|
|
254
|
+
* LEFT JOIN orders o ON u.user_id = o.user_id
|
|
255
|
+
* WHERE u.status = ?
|
|
256
|
+
* GROUP BY u.user_id
|
|
257
|
+
*
|
|
258
|
+
* Note: This requires explicit column mapping for relations.
|
|
259
|
+
* Columns should be provided in the relation metadata.
|
|
260
|
+
*/
|
|
261
|
+
buildSelectWithRelations(table, where, options, relations) {
|
|
262
|
+
const params = [];
|
|
263
|
+
const tableAlias = table.charAt(0);
|
|
264
|
+
// Build SELECT clause with JSON aggregation for relations
|
|
265
|
+
let selectClause = `${tableAlias}.*`;
|
|
266
|
+
if (relations && relations.length > 0) {
|
|
267
|
+
for (let i = 0; i < relations.length; i++) {
|
|
268
|
+
const rel = relations[i];
|
|
269
|
+
const relAlias = `r${i}`;
|
|
270
|
+
// Build JSON_OBJECT with explicit columns
|
|
271
|
+
// If columns are provided, use them; otherwise use a simple marker
|
|
272
|
+
let jsonObjectClause;
|
|
273
|
+
if (rel.columns && rel.columns.length > 0) {
|
|
274
|
+
// Build explicit JSON_OBJECT with column mappings
|
|
275
|
+
const jsonPairs = rel.columns
|
|
276
|
+
.map(col => `'${col}', ${relAlias}.${col}`)
|
|
277
|
+
.join(', ');
|
|
278
|
+
jsonObjectClause = `JSON_OBJECT(${jsonPairs})`;
|
|
279
|
+
}
|
|
280
|
+
else {
|
|
281
|
+
// Fallback: create a simple JSON object with a marker
|
|
282
|
+
// This signals that we need to fetch columns dynamically
|
|
283
|
+
jsonObjectClause = `JSON_OBJECT('_ref', ${relAlias}.${rel.foreignKey})`;
|
|
284
|
+
}
|
|
285
|
+
if (rel.type === 'one-to-many') {
|
|
286
|
+
// Use JSON_ARRAYAGG for one-to-many (returns array of related records)
|
|
287
|
+
selectClause += `,
|
|
288
|
+
JSON_ARRAYAGG(
|
|
289
|
+
CASE
|
|
290
|
+
WHEN ${relAlias}.${rel.foreignKey} IS NOT NULL
|
|
291
|
+
THEN ${jsonObjectClause}
|
|
292
|
+
ELSE NULL
|
|
293
|
+
END
|
|
294
|
+
) as ${rel.relatedTable}`;
|
|
295
|
+
}
|
|
296
|
+
else {
|
|
297
|
+
// Use JSON_OBJECT for many-to-one (returns single related record)
|
|
298
|
+
selectClause += `,
|
|
299
|
+
CASE
|
|
300
|
+
WHEN ${relAlias}.${rel.primaryKey} IS NOT NULL
|
|
301
|
+
THEN ${jsonObjectClause}
|
|
302
|
+
ELSE NULL
|
|
303
|
+
END as ${rel.relatedTable}`;
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
let sql = `SELECT ${selectClause} FROM ${table} ${tableAlias}`;
|
|
308
|
+
// Add LEFT JOINs for relations
|
|
309
|
+
if (relations && relations.length > 0) {
|
|
310
|
+
for (let i = 0; i < relations.length; i++) {
|
|
311
|
+
const rel = relations[i];
|
|
312
|
+
const relAlias = `r${i}`;
|
|
313
|
+
sql += ` LEFT JOIN ${rel.relatedTable} ${relAlias} ON ${tableAlias}.${rel.primaryKey} = ${relAlias}.${rel.foreignKey}`;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
// Add WHERE clause
|
|
317
|
+
if (where) {
|
|
318
|
+
const whereClause = this.buildWhereClause(where, params);
|
|
319
|
+
if (whereClause) {
|
|
320
|
+
sql += ` WHERE ${whereClause}`;
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
// Add GROUP BY for JSON_ARRAYAGG (required when using aggregation)
|
|
324
|
+
if (relations && relations.some(r => r.type === 'one-to-many')) {
|
|
325
|
+
// Group by primary key to aggregate related records
|
|
326
|
+
const pkField = this.detectPrimaryKey(table);
|
|
327
|
+
sql += ` GROUP BY ${tableAlias}.${pkField}`;
|
|
328
|
+
}
|
|
329
|
+
// Add ORDER BY
|
|
330
|
+
if (options?.orderBy) {
|
|
331
|
+
sql += this.buildOrderBy(options.orderBy);
|
|
332
|
+
}
|
|
333
|
+
// Add LIMIT
|
|
334
|
+
if (options?.limit) {
|
|
335
|
+
sql += ` LIMIT ?`;
|
|
336
|
+
params.push(options.limit);
|
|
337
|
+
}
|
|
338
|
+
// Add OFFSET
|
|
339
|
+
if (options?.offset) {
|
|
340
|
+
sql += ` OFFSET ?`;
|
|
341
|
+
params.push(options.offset);
|
|
342
|
+
}
|
|
343
|
+
return { sql, params };
|
|
344
|
+
}
|
|
345
|
+
/**
|
|
346
|
+
* Detect primary key field for a table
|
|
347
|
+
* Convention: tableName + '_id' or 'id'
|
|
348
|
+
*/
|
|
349
|
+
detectPrimaryKey(table) {
|
|
350
|
+
// Remove trailing 's' for singular form
|
|
351
|
+
const singular = table.replace(/s$/, '');
|
|
352
|
+
return `${singular}_id`;
|
|
353
|
+
}
|
|
237
354
|
buildOrderBy(orderBy) {
|
|
238
355
|
if (typeof orderBy === 'string') {
|
|
239
356
|
return ` ORDER BY ${orderBy}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query/query-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query/query-builder.ts"],"names":[],"mappings":";;;AACA,kDAAyE;AACzE,2CAAoG;AAEpG,MAAa,YAAY;IACvB,WAAW,CACT,KAAa,EACb,KAAmB,EACnB,OAAqB;QAErB,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;QAClD,IAAI,GAAG,GAAG,UAAU,MAAM,SAAS,KAAK,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAU,EAAE,CAAC;QAEzB,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,WAAW,EAAE,CAAC;gBAChB,GAAG,IAAI,UAAU,WAAW,EAAE,CAAC;YACjC,CAAC;QACH,CAAC;QAED,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACrB,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,GAAG,IAAI,UAAU,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,GAAG,IAAI,WAAW,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,KAAmB;QAC3C,IAAI,GAAG,GAAG,iCAAiC,KAAK,EAAE,CAAC;QACnD,MAAM,MAAM,GAAU,EAAE,CAAC;QAEzB,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,WAAW,EAAE,CAAC;gBAChB,GAAG,IAAI,UAAU,WAAW,EAAE,CAAC;YACjC,CAAC;QACH,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,IAAS;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,eAAe,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,YAAY,GAAG,CAAC;QAEpF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,eAAe,CAAC,KAAa,EAAE,SAAgB;QAC7C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,SAAS;aAC3B,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;aACnD,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QAED,MAAM,GAAG,GAAG,eAAe,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,YAAY,EAAE,CAAC;QAElF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,KAAkB,EAAE,IAAS;QACtD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/C,IAAI,GAAG,GAAG,UAAU,KAAK,QAAQ,SAAS,EAAE,CAAC;QAE7C,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,WAAW,EAAE,CAAC;YAChB,GAAG,IAAI,UAAU,WAAW,EAAE,CAAC;QACjC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,KAAkB;QAC3C,IAAI,GAAG,GAAG,eAAe,KAAK,EAAE,CAAC;QACjC,MAAM,MAAM,GAAU,EAAE,CAAC;QAEzB,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,WAAW,EAAE,CAAC;YAChB,GAAG,IAAI,UAAU,WAAW,EAAE,CAAC;QACjC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,eAAe,CAAC,KAAa,EAAE,EAAmB,EAAE,MAAiB;QACnE,MAAM,OAAO,GAAG,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;QAC1C,MAAM,GAAG,GAAG,UAAU,OAAO,SAAS,KAAK,eAAe,CAAC;QAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;IAC/B,CAAC;IAED,eAAe,CAAC,KAAa,EAAE,EAAmB,EAAE,IAAS;QAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAExD,MAAM,GAAG,GAAG,UAAU,KAAK,QAAQ,SAAS,eAAe,CAAC;QAE5D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,eAAe,CAAC,KAAa,EAAE,EAAmB;QAChD,MAAM,GAAG,GAAG,eAAe,KAAK,eAAe,CAAC;QAChD,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;IAC/B,CAAC;IAEO,gBAAgB,CAAC,KAAkB,EAAE,MAAa;QACxD,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,0CAA0C;YAC1C,IAAI,IAAA,6BAAiB,EAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,MAAM,SAAS,GAAG,4BAAgB,CAAC,GAAG,CAAC,CAAC;gBACxC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;gBAC1E,IAAI,MAAM,EAAE,CAAC;oBACX,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC1B,CAAC;gBACD,SAAS;YACX,CAAC;YAED,0BAA0B;YAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YAED,qCAAqC;YACrC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC;gBAClC,SAAS;YACX,CAAC;YAED,0CAA0C;YAC1C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC1B,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;gBAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,wEAAwE;YACxE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,oEAAoE;gBACpE,6CAA6C;gBAC7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB;gBACrD,CAAC;qBAAM,CAAC;oBACN,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACrD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,QAAQ,YAAY,GAAG,CAAC,CAAC;oBAC/C,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;gBACxB,CAAC;gBACD,SAAS;YACX,CAAC;YAED,yDAAyD;YACzD,IAAI,IAAA,4BAAgB,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC5B,MAAM,kBAAkB,GAAa,EAAE,CAAC;gBACxC,IAAI,eAAe,GAAG,KAAK,CAAC;gBAE5B,+CAA+C;gBAC/C,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACjC,eAAe,GAAG,IAAI,CAAC;gBACzB,CAAC;gBAED,iDAAiD;gBACjD,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,IAAA,8BAAkB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAA,8BAAkB,EAAC,SAAS,CAAC,CAAC;gBAEtG,sCAAsC;gBACtC,KAAK,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9D,gDAAgD;oBAChD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;wBACxB,SAAS;oBACX,CAAC;oBAED,iCAAiC;oBACjC,IAAI,IAAA,2BAAe,EAAC,QAAQ,CAAC,EAAE,CAAC;wBAC9B,qEAAqE;wBACrE,IAAI,QAAQ,IAAI,SAAS,IAAI,eAAe,EAAE,CAAC;4BAC7C,MAAM,SAAS,GAAG,SAAS,CAAC,QAAkC,CAAC,CAAC;4BAChE,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;4BACvE,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBACrC,CAAC;6BAAM,IAAI,QAAQ,IAAI,0BAAc,EAAE,CAAC;4BACtC,MAAM,SAAS,GAAG,0BAAc,CAAC,QAAQ,CAAC,CAAC;4BAC3C,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;4BACvE,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBACrC,CAAC;6BAAM,CAAC;4BACN,iEAAiE;4BACjE,OAAO,CAAC,IAAI,CAAC,wBAAwB,QAAQ,oBAAoB,CAAC,CAAC;wBACrE,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,gFAAgF;wBAChF,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;wBAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACnB,MAAM;oBACR,CAAC;gBACH,CAAC;gBAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAClC,sDAAsD;oBACtD,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACpC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzC,CAAC;yBAAM,CAAC;wBACN,UAAU,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC3D,CAAC;gBACH,CAAC;gBACD,SAAS;YACX,CAAC;YAED,uDAAuD;YACvD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvC,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAEtC,qDAAqD;gBACrD,QAAQ,QAAQ,EAAE,CAAC;oBACjB,KAAK,KAAK;wBACR,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;wBAC9B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC3B,MAAM;oBACR,KAAK,MAAM;wBACT,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC;wBAC/B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC3B,MAAM;oBACR,KAAK,KAAK;wBACR,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;wBAC9B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC3B,MAAM;oBACR,KAAK,MAAM;wBACT,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC;wBAC/B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC3B,MAAM;oBACR,KAAK,KAAK;wBACR,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC;wBAC/B,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC3B,MAAM;oBACR,KAAK,OAAO;wBACV,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;wBACjC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,8DAA8D;wBAC9D,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;wBAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;gBACD,SAAS;YACX,CAAC;YAED,2BAA2B;YAC3B,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QAED,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,wBAAwB,CACtB,KAAa,EACb,KAAmB,EACnB,OAAqB,EACrB,SAME;QAEF,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAEnC,0DAA0D;QAC1D,IAAI,YAAY,GAAG,GAAG,UAAU,IAAI,CAAC;QAErC,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;gBAEzB,0CAA0C;gBAC1C,mEAAmE;gBACnE,IAAI,gBAAwB,CAAC;gBAE7B,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1C,kDAAkD;oBAClD,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO;yBAC1B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,MAAM,QAAQ,IAAI,GAAG,EAAE,CAAC;yBAC1C,IAAI,CAAC,IAAI,CAAC,CAAC;oBACd,gBAAgB,GAAG,eAAe,SAAS,GAAG,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,sDAAsD;oBACtD,yDAAyD;oBACzD,gBAAgB,GAAG,uBAAuB,QAAQ,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC;gBAC1E,CAAC;gBAED,IAAI,GAAG,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC/B,uEAAuE;oBACvE,YAAY,IAAI;;;qBAGL,QAAQ,IAAI,GAAG,CAAC,UAAU;qBAC1B,gBAAgB;;;iBAGpB,GAAG,CAAC,YAAY,EAAE,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,kEAAkE;oBAClE,YAAY,IAAI;;mBAEP,QAAQ,IAAI,GAAG,CAAC,UAAU;mBAC1B,gBAAgB;;mBAEhB,GAAG,CAAC,YAAY,EAAE,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,GAAG,GAAG,UAAU,YAAY,SAAS,KAAK,IAAI,UAAU,EAAE,CAAC;QAE/D,+BAA+B;QAC/B,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;gBACzB,GAAG,IAAI,cAAc,GAAG,CAAC,YAAY,IAAI,QAAQ,OAAO,UAAU,IAAI,GAAG,CAAC,UAAU,MAAM,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACzH,CAAC;QACH,CAAC;QAED,mBAAmB;QACnB,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,WAAW,EAAE,CAAC;gBAChB,GAAG,IAAI,UAAU,WAAW,EAAE,CAAC;YACjC,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,EAAE,CAAC;YAC/D,oDAAoD;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC7C,GAAG,IAAI,aAAa,UAAU,IAAI,OAAO,EAAE,CAAC;QAC9C,CAAC;QAED,eAAe;QACf,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACrB,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,YAAY;QACZ,IAAI,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,GAAG,IAAI,UAAU,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,aAAa;QACb,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,GAAG,IAAI,WAAW,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACK,gBAAgB,CAAC,KAAa;QACpC,wCAAwC;QACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACzC,OAAO,GAAG,QAAQ,KAAK,CAAC;IAC1B,CAAC;IAEO,YAAY,CAAC,OAAiD;QACpE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,aAAa,OAAO,EAAE,CAAC;QAChC,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CACzB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,CAC1C,CAAC;YACF,OAAO,aAAa,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,aAAa,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAC5D,CAAC;CACF;AA9aD,oCA8aC"}
|
|
@@ -184,6 +184,58 @@ export declare class BaseRepository<T = any> {
|
|
|
184
184
|
* Full-text search
|
|
185
185
|
*/
|
|
186
186
|
search(query: string, options?: any): Promise<T[]>;
|
|
187
|
+
/**
|
|
188
|
+
* Legacy: findByPK (alias for findById)
|
|
189
|
+
* @deprecated Use findById instead
|
|
190
|
+
*/
|
|
191
|
+
findByPK(id: string | number, relationsToFetch?: string[]): Promise<T | null>;
|
|
192
|
+
/**
|
|
193
|
+
* Legacy: findByQuery (accepts any query object)
|
|
194
|
+
* @deprecated Use find with proper options instead
|
|
195
|
+
*/
|
|
196
|
+
findByQuery(query: any): Promise<T[]>;
|
|
197
|
+
/**
|
|
198
|
+
* Legacy: findAllRecords
|
|
199
|
+
* @deprecated Use findAll instead
|
|
200
|
+
*/
|
|
201
|
+
findAllRecords(filters?: any): Promise<T[]>;
|
|
202
|
+
/**
|
|
203
|
+
* Legacy: findByPaginationQuery
|
|
204
|
+
* @deprecated Use find with limit/offset instead
|
|
205
|
+
*/
|
|
206
|
+
findByPaginationQuery(paginationQuery: {
|
|
207
|
+
page?: number;
|
|
208
|
+
limit?: number;
|
|
209
|
+
orderBy?: string;
|
|
210
|
+
order?: 'ASC' | 'DESC';
|
|
211
|
+
where?: any;
|
|
212
|
+
}): Promise<T[]>;
|
|
213
|
+
/**
|
|
214
|
+
* Legacy: findBySearchFilterModel
|
|
215
|
+
* @deprecated Use find with where clause instead
|
|
216
|
+
*/
|
|
217
|
+
findBySearchFilterModel(searchFilter: {
|
|
218
|
+
filters?: any;
|
|
219
|
+
search?: string;
|
|
220
|
+
searchFields?: string[];
|
|
221
|
+
limit?: number;
|
|
222
|
+
offset?: number;
|
|
223
|
+
}): Promise<T[]>;
|
|
224
|
+
/**
|
|
225
|
+
* Legacy: countByQuery
|
|
226
|
+
* @deprecated Use count with where clause instead
|
|
227
|
+
*/
|
|
228
|
+
countByQuery(query: any): Promise<number>;
|
|
229
|
+
/**
|
|
230
|
+
* Legacy: countAll
|
|
231
|
+
* @deprecated Use count() without parameters instead
|
|
232
|
+
*/
|
|
233
|
+
countAll(): Promise<number>;
|
|
234
|
+
/**
|
|
235
|
+
* Legacy: deleteByQuery
|
|
236
|
+
* @deprecated Use delete with where clause instead
|
|
237
|
+
*/
|
|
238
|
+
deleteByQuery(query: any): Promise<number>;
|
|
187
239
|
/**
|
|
188
240
|
* Access underlying table operations (escape hatch)
|
|
189
241
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-repository.d.ts","sourceRoot":"","sources":["../../src/repository/base-repository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base-repository.d.ts","sourceRoot":"","sources":["../../src/repository/base-repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -321,6 +321,116 @@ class BaseRepository {
|
|
|
321
321
|
return entity;
|
|
322
322
|
}));
|
|
323
323
|
}
|
|
324
|
+
// ==================== BACKWARD COMPATIBILITY API ====================
|
|
325
|
+
// Legacy methods for easy migration from custom CRUD services
|
|
326
|
+
/**
|
|
327
|
+
* Legacy: findByPK (alias for findById)
|
|
328
|
+
* @deprecated Use findById instead
|
|
329
|
+
*/
|
|
330
|
+
async findByPK(id, relationsToFetch) {
|
|
331
|
+
const options = {};
|
|
332
|
+
if (relationsToFetch && relationsToFetch.length > 0) {
|
|
333
|
+
options.withRelations = { dependents: relationsToFetch };
|
|
334
|
+
}
|
|
335
|
+
return this.findById(id, options);
|
|
336
|
+
}
|
|
337
|
+
/**
|
|
338
|
+
* Legacy: findByQuery (accepts any query object)
|
|
339
|
+
* @deprecated Use find with proper options instead
|
|
340
|
+
*/
|
|
341
|
+
async findByQuery(query) {
|
|
342
|
+
// Convert legacy query format to modern FindOptions
|
|
343
|
+
const options = {
|
|
344
|
+
where: query.where || query,
|
|
345
|
+
limit: query.limit,
|
|
346
|
+
offset: query.offset,
|
|
347
|
+
orderBy: query.orderBy,
|
|
348
|
+
};
|
|
349
|
+
if (query.relations || query.relationsToFetch) {
|
|
350
|
+
const relations = query.relations || query.relationsToFetch;
|
|
351
|
+
options.withRelations = Array.isArray(relations)
|
|
352
|
+
? { dependents: relations }
|
|
353
|
+
: relations;
|
|
354
|
+
}
|
|
355
|
+
return this.find(options);
|
|
356
|
+
}
|
|
357
|
+
/**
|
|
358
|
+
* Legacy: findAllRecords
|
|
359
|
+
* @deprecated Use findAll instead
|
|
360
|
+
*/
|
|
361
|
+
async findAllRecords(filters) {
|
|
362
|
+
if (!filters) {
|
|
363
|
+
return this.findAll();
|
|
364
|
+
}
|
|
365
|
+
return this.find({ where: filters });
|
|
366
|
+
}
|
|
367
|
+
/**
|
|
368
|
+
* Legacy: findByPaginationQuery
|
|
369
|
+
* @deprecated Use find with limit/offset instead
|
|
370
|
+
*/
|
|
371
|
+
async findByPaginationQuery(paginationQuery) {
|
|
372
|
+
const page = paginationQuery.page || 0;
|
|
373
|
+
const limit = paginationQuery.limit || 10;
|
|
374
|
+
const options = {
|
|
375
|
+
where: paginationQuery.where || {},
|
|
376
|
+
limit,
|
|
377
|
+
offset: page * limit,
|
|
378
|
+
};
|
|
379
|
+
// Handle orderBy with direction
|
|
380
|
+
if (paginationQuery.orderBy) {
|
|
381
|
+
if (paginationQuery.order) {
|
|
382
|
+
options.orderBy = {
|
|
383
|
+
column: paginationQuery.orderBy,
|
|
384
|
+
direction: paginationQuery.order,
|
|
385
|
+
};
|
|
386
|
+
}
|
|
387
|
+
else {
|
|
388
|
+
options.orderBy = paginationQuery.orderBy;
|
|
389
|
+
}
|
|
390
|
+
}
|
|
391
|
+
return this.find(options);
|
|
392
|
+
}
|
|
393
|
+
/**
|
|
394
|
+
* Legacy: findBySearchFilterModel
|
|
395
|
+
* @deprecated Use find with where clause instead
|
|
396
|
+
*/
|
|
397
|
+
async findBySearchFilterModel(searchFilter) {
|
|
398
|
+
// If search is provided, use search method
|
|
399
|
+
if (searchFilter.search && searchFilter.searchFields) {
|
|
400
|
+
return this.search(searchFilter.search, {
|
|
401
|
+
fields: searchFilter.searchFields,
|
|
402
|
+
limit: searchFilter.limit,
|
|
403
|
+
});
|
|
404
|
+
}
|
|
405
|
+
// Otherwise, use regular find
|
|
406
|
+
return this.find({
|
|
407
|
+
where: searchFilter.filters || {},
|
|
408
|
+
limit: searchFilter.limit,
|
|
409
|
+
offset: searchFilter.offset,
|
|
410
|
+
});
|
|
411
|
+
}
|
|
412
|
+
/**
|
|
413
|
+
* Legacy: countByQuery
|
|
414
|
+
* @deprecated Use count with where clause instead
|
|
415
|
+
*/
|
|
416
|
+
async countByQuery(query) {
|
|
417
|
+
return this.count(query.where || query);
|
|
418
|
+
}
|
|
419
|
+
/**
|
|
420
|
+
* Legacy: countAll
|
|
421
|
+
* @deprecated Use count() without parameters instead
|
|
422
|
+
*/
|
|
423
|
+
async countAll() {
|
|
424
|
+
return this.count();
|
|
425
|
+
}
|
|
426
|
+
/**
|
|
427
|
+
* Legacy: deleteByQuery
|
|
428
|
+
* @deprecated Use delete with where clause instead
|
|
429
|
+
*/
|
|
430
|
+
async deleteByQuery(query) {
|
|
431
|
+
return this.delete(query.where || query);
|
|
432
|
+
}
|
|
433
|
+
// ==================== HELPER METHODS ====================
|
|
324
434
|
/**
|
|
325
435
|
* Access underlying table operations (escape hatch)
|
|
326
436
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-repository.js","sourceRoot":"","sources":["../../src/repository/base-repository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base-repository.js","sourceRoot":"","sources":["../../src/repository/base-repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,11 +28,12 @@ export declare class CaseConverter {
|
|
|
28
28
|
static columnsToSnake(columns: string[]): string[];
|
|
29
29
|
/**
|
|
30
30
|
* Convert WHERE clause object keys from camelCase to snake_case
|
|
31
|
+
* This is smarter than objectKeysToSnake as it preserves SQL operators and logical operators
|
|
31
32
|
*/
|
|
32
|
-
static whereClauseToSnake(where:
|
|
33
|
+
static whereClauseToSnake(where: any): any;
|
|
33
34
|
/**
|
|
34
35
|
* Convert WHERE clause object keys from snake_case to camelCase
|
|
35
36
|
*/
|
|
36
|
-
static whereClauseToCamel(where:
|
|
37
|
+
static whereClauseToCamel(where: any): any;
|
|
37
38
|
}
|
|
38
39
|
//# sourceMappingURL=case-converter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case-converter.d.ts","sourceRoot":"","sources":["../../src/utils/case-converter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,aAAa;IACxB;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAuB9C;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAuB9C;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAIlD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAIlD
|
|
1
|
+
{"version":3,"file":"case-converter.d.ts","sourceRoot":"","sources":["../../src/utils/case-converter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,aAAa;IACxB;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIxC;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAuB9C;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAuB9C;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAIlD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAIlD;;;OAGG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IA6D1C;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;CAK3C"}
|
|
@@ -75,14 +75,68 @@ class CaseConverter {
|
|
|
75
75
|
}
|
|
76
76
|
/**
|
|
77
77
|
* Convert WHERE clause object keys from camelCase to snake_case
|
|
78
|
+
* This is smarter than objectKeysToSnake as it preserves SQL operators and logical operators
|
|
78
79
|
*/
|
|
79
80
|
static whereClauseToSnake(where) {
|
|
80
|
-
|
|
81
|
+
if (where === null || where === undefined || typeof where !== 'object' || Array.isArray(where) || where instanceof Date) {
|
|
82
|
+
return where;
|
|
83
|
+
}
|
|
84
|
+
const OPERATORS = new Set([
|
|
85
|
+
'AND', 'OR', 'NOT',
|
|
86
|
+
'equals', 'not', 'in', 'notIn', 'lt', 'lte', 'gt', 'gte',
|
|
87
|
+
'contains', 'startsWith', 'endsWith', 'mode',
|
|
88
|
+
'isNull', 'isNotNull',
|
|
89
|
+
'some', 'every', 'none', 'is', 'isNot',
|
|
90
|
+
// Legacy operators
|
|
91
|
+
'$gt', '$gte', '$lt', '$lte', '$ne', '$like', '$in', '$nin'
|
|
92
|
+
]);
|
|
93
|
+
const converted = {};
|
|
94
|
+
for (const key in where) {
|
|
95
|
+
if (!Object.prototype.hasOwnProperty.call(where, key))
|
|
96
|
+
continue;
|
|
97
|
+
const value = where[key];
|
|
98
|
+
// 1. If it's a logical operator (AND, OR, NOT), keep key and recurse on value
|
|
99
|
+
if (['AND', 'OR', 'NOT'].includes(key)) {
|
|
100
|
+
if (Array.isArray(value)) {
|
|
101
|
+
converted[key] = value.map(v => this.whereClauseToSnake(v));
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
converted[key] = this.whereClauseToSnake(value);
|
|
105
|
+
}
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
// 2. If the key is an operator itself (e.g. within an operator object), keep it
|
|
109
|
+
if (OPERATORS.has(key) || key.startsWith('$')) {
|
|
110
|
+
converted[key] = value;
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
// 3. Otherwise, it's a field name - convert it to snake_case
|
|
114
|
+
const snakeKey = this.camelToSnake(key);
|
|
115
|
+
// 4. Process the value - might be a primitive, an array (for IN), or an operator object
|
|
116
|
+
if (value !== null && typeof value === 'object' && !Array.isArray(value) && !(value instanceof Date)) {
|
|
117
|
+
// It's likely an operator object or a nested object
|
|
118
|
+
converted[snakeKey] = this.whereClauseToSnake(value);
|
|
119
|
+
}
|
|
120
|
+
else if (Array.isArray(value)) {
|
|
121
|
+
// Handle array values (e.g. for IN clause)
|
|
122
|
+
// If the elements are objects, they might need conversion (though unlikely for simple IN)
|
|
123
|
+
converted[snakeKey] = value.map(v => (v !== null && typeof v === 'object' && !(v instanceof Date))
|
|
124
|
+
? this.whereClauseToSnake(v)
|
|
125
|
+
: v);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
// Simple primitive value
|
|
129
|
+
converted[snakeKey] = value;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return converted;
|
|
81
133
|
}
|
|
82
134
|
/**
|
|
83
135
|
* Convert WHERE clause object keys from snake_case to camelCase
|
|
84
136
|
*/
|
|
85
137
|
static whereClauseToCamel(where) {
|
|
138
|
+
// Similar logic for reverse conversion if needed, but for now just return as is
|
|
139
|
+
// as database -> application conversion is usually handled on the whole result record
|
|
86
140
|
return this.objectKeysToCamel(where);
|
|
87
141
|
}
|
|
88
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case-converter.js","sourceRoot":"","sources":["../../src/utils/case-converter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"case-converter.js","sourceRoot":"","sources":["../../src/utils/case-converter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bhushanpawar/sqldb",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.27",
|
|
4
4
|
"description": "An intelligent MariaDB client with Redis-backed caching, automatic schema discovery, relationship mapping, and smart cache invalidation",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|