@simplysm/orm-common 14.0.16 → 14.0.18
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 +25 -19
- package/dist/db-context.d.ts +133 -0
- package/dist/db-context.d.ts.map +1 -0
- package/dist/db-context.js +325 -0
- package/dist/db-context.js.map +1 -0
- package/dist/ddl/initialize.d.ts +5 -3
- package/dist/ddl/initialize.d.ts.map +1 -1
- package/dist/ddl/initialize.js +39 -32
- package/dist/ddl/initialize.js.map +1 -1
- package/dist/exec/executable.js +1 -1
- package/dist/exec/executable.js.map +1 -1
- package/dist/exec/queryable.js +2 -2
- package/dist/exec/queryable.js.map +1 -1
- package/dist/exec/search-parser.d.ts.map +1 -1
- package/dist/exec/search-parser.js +2 -1
- package/dist/exec/search-parser.js.map +1 -1
- package/dist/expr/expr.d.ts +2 -2
- package/dist/expr/expr.js +2 -2
- package/dist/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -3
- package/dist/index.js.map +1 -1
- package/dist/query-builder/mssql/mssql-expr-renderer.js +1 -1
- package/dist/query-builder/mssql/mssql-expr-renderer.js.map +1 -1
- package/dist/query-builder/mysql/mysql-expr-renderer.js +1 -1
- package/dist/query-builder/mysql/mysql-query-builder.js +1 -1
- package/dist/query-builder/mysql/mysql-query-builder.js.map +1 -1
- package/dist/query-builder/postgresql/postgresql-query-builder.d.ts +7 -0
- package/dist/query-builder/postgresql/postgresql-query-builder.d.ts.map +1 -1
- package/dist/query-builder/postgresql/postgresql-query-builder.js +86 -16
- package/dist/query-builder/postgresql/postgresql-query-builder.js.map +1 -1
- package/dist/schema/factory/relation-builder.d.ts +44 -67
- package/dist/schema/factory/relation-builder.d.ts.map +1 -1
- package/dist/schema/factory/relation-builder.js +37 -78
- package/dist/schema/factory/relation-builder.js.map +1 -1
- package/dist/schema/view-builder.d.ts +1 -1
- package/dist/schema/view-builder.d.ts.map +1 -1
- package/dist/schema/view-builder.js +0 -2
- package/dist/schema/view-builder.js.map +1 -1
- package/dist/types/column.js +1 -1
- package/dist/types/column.js.map +1 -1
- package/dist/types/db-context-def.d.ts +2 -42
- package/dist/types/db-context-def.d.ts.map +1 -1
- package/dist/utils/result-parser.js +31 -23
- package/dist/utils/result-parser.js.map +1 -1
- package/docs/core.md +110 -50
- package/docs/schema-builders.md +13 -19
- package/docs/types.md +2 -41
- package/package.json +3 -3
- package/src/db-context.ts +455 -0
- package/src/ddl/initialize.ts +49 -37
- package/src/exec/executable.ts +1 -1
- package/src/exec/queryable.ts +2 -2
- package/src/exec/search-parser.ts +2 -1
- package/src/expr/expr.ts +2 -2
- package/src/index.ts +2 -3
- package/src/query-builder/mssql/mssql-expr-renderer.ts +1 -1
- package/src/query-builder/mysql/mysql-expr-renderer.ts +1 -1
- package/src/query-builder/mysql/mysql-query-builder.ts +1 -1
- package/src/query-builder/postgresql/postgresql-query-builder.ts +93 -14
- package/src/schema/factory/relation-builder.ts +56 -87
- package/src/schema/view-builder.ts +1 -3
- package/src/types/column.ts +1 -1
- package/src/types/db-context-def.ts +2 -60
- package/src/utils/result-parser.ts +29 -22
- package/dist/create-db-context.d.ts +0 -34
- package/dist/create-db-context.d.ts.map +0 -1
- package/dist/create-db-context.js +0 -329
- package/dist/create-db-context.js.map +0 -1
- package/dist/define-db-context.d.ts +0 -15
- package/dist/define-db-context.d.ts.map +0 -1
- package/dist/define-db-context.js +0 -12
- package/dist/define-db-context.js.map +0 -1
- package/src/create-db-context.ts +0 -409
- package/src/define-db-context.ts +0 -28
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-builder.d.ts","sourceRoot":"","sources":["../../../src/schema/factory/relation-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAMnD
|
|
1
|
+
{"version":3,"file":"relation-builder.d.ts","sourceRoot":"","sources":["../../../src/schema/factory/relation-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,9 @@ import {} from "./column-builder.js";
|
|
|
8
8
|
* 현재 Table에서 대상 Table로의 FK 관계를 정의
|
|
9
9
|
* DB에 실제 FK 제약조건을 생성
|
|
10
10
|
*
|
|
11
|
+
* description 설정은 factory 함수의 opts 파라미터로 전달한다.
|
|
12
|
+
* 메서드 체이닝(.description())은 TypeScript 순환 참조 시 TS7022를 유발하므로 제거됨.
|
|
13
|
+
*
|
|
11
14
|
* @template TOwner - 소유 Table builder 타입
|
|
12
15
|
* @template TTargetFn - 대상 Table builder factory 타입
|
|
13
16
|
*
|
|
@@ -21,7 +24,7 @@ import {} from "./column-builder.js";
|
|
|
21
24
|
* .primaryKey("id")
|
|
22
25
|
* .relations((r) => ({
|
|
23
26
|
* // N:1 relationship - Post → User
|
|
24
|
-
* author: r.foreignKey(["authorId"], () => User),
|
|
27
|
+
* author: r.foreignKey(["authorId"], () => User, { description: "작성자" }),
|
|
25
28
|
* }));
|
|
26
29
|
* ```
|
|
27
30
|
*
|
|
@@ -40,21 +43,15 @@ export class ForeignKeyBuilder {
|
|
|
40
43
|
constructor(meta) {
|
|
41
44
|
this.meta = meta;
|
|
42
45
|
}
|
|
43
|
-
/**
|
|
44
|
-
* 관계 설명 설정
|
|
45
|
-
*
|
|
46
|
-
* @param desc - 관계 설명
|
|
47
|
-
* @returns 새 ForeignKeyBuilder 인스턴스
|
|
48
|
-
*/
|
|
49
|
-
description(desc) {
|
|
50
|
-
return new ForeignKeyBuilder({ ...this.meta, description: desc });
|
|
51
|
-
}
|
|
52
46
|
}
|
|
53
47
|
/**
|
|
54
48
|
* Foreign Key 역참조 builder (1:N)
|
|
55
49
|
*
|
|
56
50
|
* 다른 Table이 현재 Table을 참조하는 FK의 역참조를 정의
|
|
57
|
-
* include() 시 배열로 로드됨 (single
|
|
51
|
+
* include() 시 배열로 로드됨 (opts.single: true 시 단일 객체)
|
|
52
|
+
*
|
|
53
|
+
* description, single 설정은 factory 함수의 opts 파라미터로 전달한다.
|
|
54
|
+
* 메서드 체이닝(.description(), .single())은 TypeScript 순환 참조 시 TS7022를 유발하므로 제거됨.
|
|
58
55
|
*
|
|
59
56
|
* @template TTargetTableFn - 참조하는 Table builder factory 타입
|
|
60
57
|
* @template TIsSingle - 단일 객체 여부
|
|
@@ -72,7 +69,10 @@ export class ForeignKeyBuilder {
|
|
|
72
69
|
* posts: r.foreignKeyTarget(() => Post, "author"),
|
|
73
70
|
*
|
|
74
71
|
* // 1:1 relation (single object)
|
|
75
|
-
* profile: r.foreignKeyTarget(() => Profile, "user"
|
|
72
|
+
* profile: r.foreignKeyTarget(() => Profile, "user", { single: true }),
|
|
73
|
+
*
|
|
74
|
+
* // with description
|
|
75
|
+
* comments: r.foreignKeyTarget(() => Comment, "user", { description: "댓글목록" }),
|
|
76
76
|
* }));
|
|
77
77
|
* ```
|
|
78
78
|
*
|
|
@@ -90,30 +90,6 @@ export class ForeignKeyTargetBuilder {
|
|
|
90
90
|
constructor(meta) {
|
|
91
91
|
this.meta = meta;
|
|
92
92
|
}
|
|
93
|
-
/**
|
|
94
|
-
* 관계 설명 설정
|
|
95
|
-
*
|
|
96
|
-
* @param desc - 관계 설명
|
|
97
|
-
* @returns 새 ForeignKeyTargetBuilder 인스턴스
|
|
98
|
-
*/
|
|
99
|
-
description(desc) {
|
|
100
|
-
return new ForeignKeyTargetBuilder({ ...this.meta, description: desc });
|
|
101
|
-
}
|
|
102
|
-
/**
|
|
103
|
-
* 단일 객체 관계로 설정 (1:1)
|
|
104
|
-
*
|
|
105
|
-
* 기본값은 배열(1:N), single() 호출 시 단일 객체
|
|
106
|
-
*
|
|
107
|
-
* @returns 새 ForeignKeyTargetBuilder 인스턴스 (isSingle=true)
|
|
108
|
-
*
|
|
109
|
-
* @example
|
|
110
|
-
* ```typescript
|
|
111
|
-
* profile: r.foreignKeyTarget(() => Profile, "user").single()
|
|
112
|
-
* ```
|
|
113
|
-
*/
|
|
114
|
-
single() {
|
|
115
|
-
return new ForeignKeyTargetBuilder({ ...this.meta, isSingle: true });
|
|
116
|
-
}
|
|
117
93
|
}
|
|
118
94
|
// ============================================
|
|
119
95
|
// RelationKeyBuilder (FK와 동일하지만 DB에 FK를 등록하지 않음)
|
|
@@ -124,6 +100,8 @@ export class ForeignKeyTargetBuilder {
|
|
|
124
100
|
* ForeignKeyBuilder와 동일하지만 DB에 FK 제약조건을 생성하지 않음
|
|
125
101
|
* View에서도 사용 가능
|
|
126
102
|
*
|
|
103
|
+
* description 설정은 factory 함수의 opts 파라미터로 전달한다.
|
|
104
|
+
*
|
|
127
105
|
* @template TOwner - 소유 Table/View builder 타입
|
|
128
106
|
* @template TTargetFn - 대상 Table/View builder factory 타입
|
|
129
107
|
*
|
|
@@ -134,14 +112,7 @@ export class ForeignKeyTargetBuilder {
|
|
|
134
112
|
* .query((db: MyDb) => db.user().select(...))
|
|
135
113
|
* .relations((r) => ({
|
|
136
114
|
* // View → Table (FK 미생성)
|
|
137
|
-
* company: r.relationKey(["companyId"], () => Company),
|
|
138
|
-
* }));
|
|
139
|
-
*
|
|
140
|
-
* // FK 없는 Table 관계 정의
|
|
141
|
-
* const Report = Table("Report")
|
|
142
|
-
* .columns((c) => ({ userId: c.bigint() }))
|
|
143
|
-
* .relations((r) => ({
|
|
144
|
-
* user: r.relationKey(["userId"], () => User),
|
|
115
|
+
* company: r.relationKey(["companyId"], () => Company, { description: "소속회사" }),
|
|
145
116
|
* }));
|
|
146
117
|
* ```
|
|
147
118
|
*
|
|
@@ -159,15 +130,6 @@ export class RelationKeyBuilder {
|
|
|
159
130
|
constructor(meta) {
|
|
160
131
|
this.meta = meta;
|
|
161
132
|
}
|
|
162
|
-
/**
|
|
163
|
-
* 관계 설명 설정
|
|
164
|
-
*
|
|
165
|
-
* @param desc - 관계 설명
|
|
166
|
-
* @returns 새 RelationKeyBuilder 인스턴스
|
|
167
|
-
*/
|
|
168
|
-
description(desc) {
|
|
169
|
-
return new RelationKeyBuilder({ ...this.meta, description: desc });
|
|
170
|
-
}
|
|
171
133
|
}
|
|
172
134
|
/**
|
|
173
135
|
* 논리적 관계 역참조 builder (1:N) - DB FK 미생성
|
|
@@ -175,6 +137,8 @@ export class RelationKeyBuilder {
|
|
|
175
137
|
* ForeignKeyTargetBuilder와 동일하지만 DB에 FK 제약조건을 생성하지 않음
|
|
176
138
|
* View에서도 사용 가능
|
|
177
139
|
*
|
|
140
|
+
* description, single 설정은 factory 함수의 opts 파라미터로 전달한다.
|
|
141
|
+
*
|
|
178
142
|
* @template TTargetTableFn - 참조하는 Table/View builder factory 타입
|
|
179
143
|
* @template TIsSingle - 단일 객체 여부
|
|
180
144
|
*
|
|
@@ -185,6 +149,8 @@ export class RelationKeyBuilder {
|
|
|
185
149
|
* .relations((r) => ({
|
|
186
150
|
* // 역참조 (FK 미생성)
|
|
187
151
|
* employees: r.relationKeyTarget(() => UserSummary, "company"),
|
|
152
|
+
* // 단일 객체 + 설명
|
|
153
|
+
* ceo: r.relationKeyTarget(() => UserSummary, "company", { single: true, description: "대표" }),
|
|
188
154
|
* }));
|
|
189
155
|
* ```
|
|
190
156
|
*
|
|
@@ -202,25 +168,6 @@ export class RelationKeyTargetBuilder {
|
|
|
202
168
|
constructor(meta) {
|
|
203
169
|
this.meta = meta;
|
|
204
170
|
}
|
|
205
|
-
/**
|
|
206
|
-
* 관계 설명 설정
|
|
207
|
-
*
|
|
208
|
-
* @param desc - 관계 설명
|
|
209
|
-
* @returns 새 RelationKeyTargetBuilder 인스턴스
|
|
210
|
-
*/
|
|
211
|
-
description(desc) {
|
|
212
|
-
return new RelationKeyTargetBuilder({ ...this.meta, description: desc });
|
|
213
|
-
}
|
|
214
|
-
/**
|
|
215
|
-
* 단일 객체 관계로 설정 (1:1)
|
|
216
|
-
*
|
|
217
|
-
* 기본값은 배열(1:N), single() 호출 시 단일 객체
|
|
218
|
-
*
|
|
219
|
-
* @returns 새 RelationKeyTargetBuilder 인스턴스 (isSingle=true)
|
|
220
|
-
*/
|
|
221
|
-
single() {
|
|
222
|
-
return new RelationKeyTargetBuilder({ ...this.meta, isSingle: true });
|
|
223
|
-
}
|
|
224
171
|
}
|
|
225
172
|
/**
|
|
226
173
|
* 관계 builder factory 생성
|
|
@@ -255,25 +202,37 @@ export class RelationKeyTargetBuilder {
|
|
|
255
202
|
*/
|
|
256
203
|
export function createRelationFactory(ownerFn) {
|
|
257
204
|
return {
|
|
258
|
-
foreignKey(columns, targetFn) {
|
|
205
|
+
foreignKey(columns, targetFn, opts) {
|
|
259
206
|
return new ForeignKeyBuilder({
|
|
260
207
|
ownerFn: ownerFn,
|
|
261
208
|
columns,
|
|
262
209
|
targetFn,
|
|
210
|
+
description: opts?.description,
|
|
263
211
|
});
|
|
264
212
|
},
|
|
265
|
-
foreignKeyTarget(targetTableFn, relationName) {
|
|
266
|
-
return new ForeignKeyTargetBuilder({
|
|
213
|
+
foreignKeyTarget(targetTableFn, relationName, opts) {
|
|
214
|
+
return new ForeignKeyTargetBuilder({
|
|
215
|
+
targetTableFn,
|
|
216
|
+
relationName,
|
|
217
|
+
description: opts?.description,
|
|
218
|
+
isSingle: opts?.single,
|
|
219
|
+
});
|
|
267
220
|
},
|
|
268
|
-
relationKey(columns, targetFn) {
|
|
221
|
+
relationKey(columns, targetFn, opts) {
|
|
269
222
|
return new RelationKeyBuilder({
|
|
270
223
|
ownerFn: ownerFn,
|
|
271
224
|
columns,
|
|
272
225
|
targetFn,
|
|
226
|
+
description: opts?.description,
|
|
273
227
|
});
|
|
274
228
|
},
|
|
275
|
-
relationKeyTarget(targetTableFn, relationName) {
|
|
276
|
-
return new RelationKeyTargetBuilder({
|
|
229
|
+
relationKeyTarget(targetTableFn, relationName, opts) {
|
|
230
|
+
return new RelationKeyTargetBuilder({
|
|
231
|
+
targetTableFn,
|
|
232
|
+
relationName,
|
|
233
|
+
description: opts?.description,
|
|
234
|
+
isSingle: opts?.single,
|
|
235
|
+
});
|
|
277
236
|
},
|
|
278
237
|
};
|
|
279
238
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-builder.js","sourceRoot":"","sources":["../../../src/schema/factory/relation-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,kBAAkB,CAAC;AAIrD,+CAA+C;AAC/C,oBAAoB;AACpB,+CAA+C;AAE/C
|
|
1
|
+
{"version":3,"file":"relation-builder.js","sourceRoot":"","sources":["../../../src/schema/factory/relation-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,kBAAkB,CAAC;AAIrD,+CAA+C;AAC/C,oBAAoB;AACpB,+CAA+C;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,OAAO,iBAAiB;IAYjB;IARX;;;;;;OAMG;IACH,YACW,IAKR;QALQ,SAAI,GAAJ,IAAI,CAKZ;IACA,CAAC;CACL;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,OAAO,uBAAuB;IAYvB;IARX;;;;;;OAMG;IACH,YACW,IAKR;QALQ,SAAI,GAAJ,IAAI,CAKZ;IACA,CAAC;CACL;AAED,+CAA+C;AAC/C,iDAAiD;AACjD,+CAA+C;AAE/C;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,OAAO,kBAAkB;IAYlB;IARX;;;;;;OAMG;IACH,YACW,IAKR;QALQ,SAAI,GAAJ,IAAI,CAKZ;IACA,CAAC;CACL;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,OAAO,wBAAwB;IAYxB;IARX;;;;;;OAMG;IACH,YACW,IAKR;QALQ,SAAI,GAAJ,IAAI,CAKZ;IACA,CAAC;CACL;AA6DD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,qBAAqB,CAInC,OAAqB;IAIrB,OAAO;QACL,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAK;YACjC,OAAO,IAAI,iBAAiB,CAAC;gBAC3B,OAAO,EAAE,OAAuC;gBAChD,OAAO;gBACP,QAAQ;gBACR,WAAW,EAAE,IAAI,EAAE,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC;QACD,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,IAAK;YACjD,OAAO,IAAI,uBAAuB,CAAC;gBACjC,aAAa;gBACb,YAAY;gBACZ,WAAW,EAAE,IAAI,EAAE,WAAW;gBAC9B,QAAQ,EAAE,IAAI,EAAE,MAAM;aACvB,CAAC,CAAC;QACL,CAAC;QACD,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAK;YAClC,OAAO,IAAI,kBAAkB,CAAC;gBAC5B,OAAO,EAAE,OAAO;gBAChB,OAAO;gBACP,QAAQ;gBACR,WAAW,EAAE,IAAI,EAAE,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC;QACD,iBAAiB,CAAC,aAAa,EAAE,YAAY,EAAE,IAAK;YAClD,OAAO,IAAI,wBAAwB,CAAC;gBAClC,aAAa;gBACb,YAAY;gBACZ,WAAW,EAAE,IAAI,EAAE,WAAW;gBAC9B,QAAQ,EAAE,IAAI,EAAE,MAAM;aACvB,CAAC,CAAC;QACL,CAAC;KAGsC,CAAC;AAC5C,CAAC"}
|
|
@@ -143,7 +143,7 @@ export declare class ViewBuilder<TDbContext extends DbContextBase, TData extends
|
|
|
143
143
|
* @see {@link ForeignKeyBuilder} FK builder
|
|
144
144
|
* @see {@link ForeignKeyTargetBuilder} FK reverse-reference builder
|
|
145
145
|
*/
|
|
146
|
-
relations<T extends RelationBuilderRecord>(fn: (r: ReturnType<typeof createRelationFactory<this, keyof TData & string>>) => T): ViewBuilder<TDbContext, TData & InferDeepRelations<T>,
|
|
146
|
+
relations<T extends RelationBuilderRecord>(fn: (r: ReturnType<typeof createRelationFactory<this, keyof TData & string>>) => T): ViewBuilder<TDbContext, TData & InferDeepRelations<T>, T>;
|
|
147
147
|
}
|
|
148
148
|
/**
|
|
149
149
|
* View builder factory 함수
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-builder.d.ts","sourceRoot":"","sources":["../../src/schema/view-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,qBAAqB,EACrB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,4BAA4B,CAAC;AAMpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,qBAAa,WAAW,CACtB,UAAU,SAAS,aAAa,EAChC,KAAK,SAAS,UAAU,EACxB,UAAU,SAAS,qBAAqB;IAiBtC,QAAQ,CAAC,IAAI,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnD,SAAS,CAAC,EAAE,UAAU,CAAC;KACxB;IAtBH,qBAAqB;IACrB,QAAQ,CAAC,UAAU,EAAG,UAAU,CAAC;IACjC,eAAe;IACf,QAAQ,CAAC,YAAY,EAAG,KAAK,CAAC;IAE9B;;;;;;;;OAQG;gBAEQ,IAAI,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnD,SAAS,CAAC,EAAE,UAAU,CAAC;KACxB;IAGH;;;;;OAKG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;IAIrE;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;IAIhE;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;IAIlE;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,KAAK,CAAC,SAAS,SAAS,UAAU,EAAE,GAAG,SAAS,aAAa,EAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,GAAG,KAAK,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAC7C,WAAW,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC;IAI1C;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,SAAS,CAAC,CAAC,SAAS,qBAAqB,EACvC,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,GACjF,WAAW,CAAC,UAAU,EAAE,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"view-builder.d.ts","sourceRoot":"","sources":["../../src/schema/view-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,qBAAqB,EACrB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,4BAA4B,CAAC;AAMpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,qBAAa,WAAW,CACtB,UAAU,SAAS,aAAa,EAChC,KAAK,SAAS,UAAU,EACxB,UAAU,SAAS,qBAAqB;IAiBtC,QAAQ,CAAC,IAAI,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnD,SAAS,CAAC,EAAE,UAAU,CAAC;KACxB;IAtBH,qBAAqB;IACrB,QAAQ,CAAC,UAAU,EAAG,UAAU,CAAC;IACjC,eAAe;IACf,QAAQ,CAAC,YAAY,EAAG,KAAK,CAAC;IAE9B;;;;;;;;OAQG;gBAEQ,IAAI,EAAE;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,KAAK,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnD,SAAS,CAAC,EAAE,UAAU,CAAC;KACxB;IAGH;;;;;OAKG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;IAIrE;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;IAIhE;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;IAIlE;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,KAAK,CAAC,SAAS,SAAS,UAAU,EAAE,GAAG,SAAS,aAAa,EAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,GAAG,KAAK,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAC7C,WAAW,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC;IAI1C;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,SAAS,CAAC,CAAC,SAAS,qBAAqB,EACvC,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,GACjF,WAAW,CAAC,UAAU,EAAE,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;CAM7D;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,iEAEhC"}
|
|
@@ -140,8 +140,6 @@ export class ViewBuilder {
|
|
|
140
140
|
* @see {@link ForeignKeyTargetBuilder} FK reverse-reference builder
|
|
141
141
|
*/
|
|
142
142
|
relations(fn) {
|
|
143
|
-
// TypeScript 제네릭 타입 추론 한계로 인해 캐스팅이 불가피
|
|
144
|
-
// TRelations 타입 파라미터와 새로 생성된 관계 타입 T 간의 타입 불일치 해결
|
|
145
143
|
return new ViewBuilder({
|
|
146
144
|
...this.meta,
|
|
147
145
|
relations: fn(createRelationFactory(() => this)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-builder.js","sourceRoot":"","sources":["../../src/schema/view-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,GAGtB,MAAM,4BAA4B,CAAC;AAEpC,+CAA+C;AAC/C,cAAc;AACd,+CAA+C;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,OAAO,WAAW;IAoBX;IAfX,qBAAqB;IACZ,UAAU,CAAc;IACjC,eAAe;IACN,YAAY,CAAS;IAE9B;;;;;;;;OAQG;IACH,YACW,IAOR;QAPQ,SAAI,GAAJ,IAAI,CAOZ;IACA,CAAC;IAEJ;;;;;OAKG;IACH,WAAW,CAAC,IAAY;QACtB,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,EAAU;QACjB,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,KAAK,CACH,MAA8C;QAE9C,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,SAAS,CACP,EAAkF;QAElF,
|
|
1
|
+
{"version":3,"file":"view-builder.js","sourceRoot":"","sources":["../../src/schema/view-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,GAGtB,MAAM,4BAA4B,CAAC;AAEpC,+CAA+C;AAC/C,cAAc;AACd,+CAA+C;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,OAAO,WAAW;IAoBX;IAfX,qBAAqB;IACZ,UAAU,CAAc;IACjC,eAAe;IACN,YAAY,CAAS;IAE9B;;;;;;;;OAQG;IACH,YACW,IAOR;QAPQ,SAAI,GAAJ,IAAI,CAOZ;IACA,CAAC;IAEJ;;;;;OAKG;IACH,WAAW,CAAC,IAAY;QACtB,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,EAAU;QACjB,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,KAAK,CACH,MAA8C;QAE9C,OAAO,IAAI,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,SAAS,CACP,EAAkF;QAElF,OAAO,IAAI,WAAW,CAAC;YACrB,GAAG,IAAI,CAAC,IAAI;YACZ,SAAS,EAAE,EAAE,CAAC,qBAAqB,CAA6B,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;SAC7E,CAAQ,CAAC;IACZ,CAAC;CACF;AAED,+CAA+C;AAC/C,UAAU;AACV,+CAA+C;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;AACnC,CAAC"}
|
package/dist/types/column.js
CHANGED
|
@@ -58,6 +58,6 @@ export function inferColumnPrimitiveStr(value) {
|
|
|
58
58
|
return "Uuid";
|
|
59
59
|
if (value instanceof Uint8Array)
|
|
60
60
|
return "Bytes";
|
|
61
|
-
throw new Error(
|
|
61
|
+
throw new Error("NULL 값으로는 타입을 추론할 수 없습니다.");
|
|
62
62
|
}
|
|
63
63
|
//# sourceMappingURL=column.js.map
|
package/dist/types/column.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"column.js","sourceRoot":"","sources":["../../src/types/column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAc,MAAM,uBAAuB,CAAC;AA4FnF,+CAA+C;AAC/C,qCAAqC;AACrC,+CAA+C;AAE/C;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,GAAG,EAAE,QAAiB;IACtB,MAAM,EAAE,QAAiB;IACzB,KAAK,EAAE,QAAiB;IACxB,MAAM,EAAE,QAAiB;IACzB,OAAO,EAAE,QAAiB;IAC1B,OAAO,EAAE,QAAiB;IAC1B,IAAI,EAAE,QAAiB;IACvB,IAAI,EAAE,QAAiB;IACvB,MAAM,EAAE,OAAgB;IACxB,OAAO,EAAE,SAAkB;IAC3B,QAAQ,EAAE,UAAmB;IAC7B,IAAI,EAAE,UAAmB;IACzB,IAAI,EAAE,MAAe;IACrB,IAAI,EAAE,MAAe;CACtB,CAAC;AAgBF;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAsB;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC/C,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACjD,IAAI,KAAK,YAAY,QAAQ;QAAE,OAAO,UAAU,CAAC;IACjD,IAAI,KAAK,YAAY,QAAQ;QAAE,OAAO,UAAU,CAAC;IACjD,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,MAAM,CAAC;IACzC,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,MAAM,CAAC;IACzC,IAAI,KAAK,YAAY,UAAU;QAAE,OAAO,OAAO,CAAC;IAChD,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"column.js","sourceRoot":"","sources":["../../src/types/column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAc,MAAM,uBAAuB,CAAC;AA4FnF,+CAA+C;AAC/C,qCAAqC;AACrC,+CAA+C;AAE/C;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,GAAG,EAAE,QAAiB;IACtB,MAAM,EAAE,QAAiB;IACzB,KAAK,EAAE,QAAiB;IACxB,MAAM,EAAE,QAAiB;IACzB,OAAO,EAAE,QAAiB;IAC1B,OAAO,EAAE,QAAiB;IAC1B,IAAI,EAAE,QAAiB;IACvB,IAAI,EAAE,QAAiB;IACvB,MAAM,EAAE,OAAgB;IACxB,OAAO,EAAE,SAAkB;IAC3B,QAAQ,EAAE,UAAmB;IAC7B,IAAI,EAAE,UAAmB;IACzB,IAAI,EAAE,MAAe;IACrB,IAAI,EAAE,MAAe;CACtB,CAAC;AAgBF;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAsB;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC/C,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACjD,IAAI,KAAK,YAAY,QAAQ;QAAE,OAAO,UAAU,CAAC;IACjD,IAAI,KAAK,YAAY,QAAQ;QAAE,OAAO,UAAU,CAAC;IACjD,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,MAAM,CAAC;IACzC,IAAI,KAAK,YAAY,IAAI;QAAE,OAAO,MAAM,CAAC;IACzC,IAAI,KAAK,YAAY,UAAU;QAAE,OAAO,OAAO,CAAC;IAChD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -4,14 +4,13 @@ import type { ProcedureBuilder } from "../schema/procedure-builder";
|
|
|
4
4
|
import type { ColumnBuilder } from "../schema/factory/column-builder";
|
|
5
5
|
import type { ForeignKeyBuilder } from "../schema/factory/relation-builder";
|
|
6
6
|
import type { IndexBuilder } from "../schema/factory/index-builder";
|
|
7
|
-
import type { DataRecord,
|
|
7
|
+
import type { DataRecord, ResultMeta } from "./db";
|
|
8
8
|
import type { QueryDef, QueryDefObjectName } from "./query-def";
|
|
9
9
|
/**
|
|
10
10
|
* DbContext 핵심 인터페이스
|
|
11
11
|
*
|
|
12
12
|
* Queryable, Executable, ViewBuilder에서 사용하는 내부 인터페이스.
|
|
13
|
-
*
|
|
14
|
-
* 이 인터페이스를 만족함.
|
|
13
|
+
* DbContext class가 이 인터페이스를 구현한다.
|
|
15
14
|
*/
|
|
16
15
|
export interface DbContextBase {
|
|
17
16
|
status: DbContextStatus;
|
|
@@ -24,45 +23,6 @@ export interface DbContextBase {
|
|
|
24
23
|
switchFk(table: QueryDefObjectName, enabled: boolean): Promise<void>;
|
|
25
24
|
}
|
|
26
25
|
export type DbContextStatus = "ready" | "connect" | "transact";
|
|
27
|
-
/**
|
|
28
|
-
* DbContext 정의 (blueprint)
|
|
29
|
-
*
|
|
30
|
-
* defineDbContext()로 생성됨. Schema 메타데이터만 포함하며 런타임 상태는 없음.
|
|
31
|
-
*/
|
|
32
|
-
export interface DbContextDef<TTables extends Record<string, TableBuilder<any, any>>, TViews extends Record<string, ViewBuilder<any, any, any>>, TProcedures extends Record<string, ProcedureBuilder<any, any>> = {}> {
|
|
33
|
-
readonly meta: {
|
|
34
|
-
readonly tables: TTables;
|
|
35
|
-
readonly views: TViews;
|
|
36
|
-
readonly procedures: TProcedures;
|
|
37
|
-
readonly migrations: Migration[];
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
/**
|
|
41
|
-
* 전체 DbContext 인스턴스 타입 (createDbContext로 생성)
|
|
42
|
-
*
|
|
43
|
-
* DbContextBase를 queryable 접근자, DDL 메서드,
|
|
44
|
-
* 연결/트랜잭션 관리로 확장.
|
|
45
|
-
*/
|
|
46
|
-
export type DbContextInstance<TDef extends DbContextDef<any, any, any>> = DbContextBase & DbContextConnectionMethods & DbContextDdlMethods & {
|
|
47
|
-
[K in keyof TDef["meta"]["tables"]]: () => import("../exec/queryable").Queryable<TDef["meta"]["tables"][K]["$inferSelect"], TDef["meta"]["tables"][K]>;
|
|
48
|
-
} & {
|
|
49
|
-
[K in keyof TDef["meta"]["views"]]: () => import("../exec/queryable").Queryable<TDef["meta"]["views"][K]["$inferSelect"], never>;
|
|
50
|
-
} & {
|
|
51
|
-
[K in keyof TDef["meta"]["procedures"]]: () => import("../exec/executable").Executable<TDef["meta"]["procedures"][K]["$params"], TDef["meta"]["procedures"][K]["$returns"]>;
|
|
52
|
-
} & {
|
|
53
|
-
_migration: () => import("../exec/queryable").Queryable<{
|
|
54
|
-
code: string;
|
|
55
|
-
}, any>;
|
|
56
|
-
initialize(options?: {
|
|
57
|
-
dbs?: string[];
|
|
58
|
-
force?: boolean;
|
|
59
|
-
}): Promise<void>;
|
|
60
|
-
};
|
|
61
|
-
export interface DbContextConnectionMethods {
|
|
62
|
-
connect<TResult>(fn: () => Promise<TResult>, isolationLevel?: IsolationLevel): Promise<TResult>;
|
|
63
|
-
connectWithoutTransaction<TResult>(callback: () => Promise<TResult>): Promise<TResult>;
|
|
64
|
-
transaction<TResult>(fn: () => Promise<TResult>, isolationLevel?: IsolationLevel): Promise<TResult>;
|
|
65
|
-
}
|
|
66
26
|
export interface DbContextDdlMethods {
|
|
67
27
|
createTable(table: TableBuilder<any, any>): Promise<void>;
|
|
68
28
|
dropTable(table: QueryDefObjectName): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-context-def.d.ts","sourceRoot":"","sources":["../../src/types/db-context-def.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"db-context-def.d.ts","sourceRoot":"","sources":["../../src/types/db-context-def.ts"],"names":[],"mappings":"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"}
|
|
@@ -209,18 +209,31 @@ async function parseJoinedRecords(rawResults, meta) {
|
|
|
209
209
|
/**
|
|
210
210
|
* 그룹 key를 문자열로 직렬화 (Map key로 사용)
|
|
211
211
|
*
|
|
212
|
-
*
|
|
212
|
+
* length-prefixed 인코딩으로 값 내부의 구분자 문자 충돌을 방지한다.
|
|
213
|
+
* null/undefined와 문자열 "null"/"undefined"도 구분된다.
|
|
214
|
+
* 객체 타입 값(하위 JOIN 데이터)은 직렬화에서 제외한다.
|
|
213
215
|
*/
|
|
214
216
|
function serializeGroupKey(groupKey, cachedKeyOrder) {
|
|
215
217
|
const keys = cachedKeyOrder ?? Object.keys(groupKey).sort((a, b) => a.localeCompare(b));
|
|
216
218
|
let result = "";
|
|
217
|
-
for (
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
const v = groupKey[keys[i]];
|
|
221
|
-
result += keys[i];
|
|
219
|
+
for (const key of keys) {
|
|
220
|
+
const v = groupKey[key];
|
|
221
|
+
result += key.length.toString();
|
|
222
222
|
result += ":";
|
|
223
|
-
result +=
|
|
223
|
+
result += key;
|
|
224
|
+
if (v == null) {
|
|
225
|
+
result += "N;";
|
|
226
|
+
}
|
|
227
|
+
else if (typeof v === "object") {
|
|
228
|
+
result += "O;";
|
|
229
|
+
}
|
|
230
|
+
else {
|
|
231
|
+
const str = String(v);
|
|
232
|
+
result += str.length.toString();
|
|
233
|
+
result += ":";
|
|
234
|
+
result += str;
|
|
235
|
+
result += ";";
|
|
236
|
+
}
|
|
224
237
|
}
|
|
225
238
|
return result;
|
|
226
239
|
}
|
|
@@ -254,6 +267,8 @@ function groupRecordsRecursively(records, allJoinKeys, joinsConfig, currentPath)
|
|
|
254
267
|
}
|
|
255
268
|
// Map 기반 그룹핑 (O(n) 복잡도)
|
|
256
269
|
const groupMap = new Map();
|
|
270
|
+
// 중복 검사용 hashSet을 데이터 객체와 분리 (DESIGN-003)
|
|
271
|
+
const hashSetsMap = new Map();
|
|
257
272
|
// O(1) 조회를 위한 JOIN key 제외 집합 사전 계산
|
|
258
273
|
const joinKeyExclusions = buildJoinKeyExclusionSet(childJoinKeys);
|
|
259
274
|
// Key 순서 캐싱 (첫 번째 레코드에서 결정 후 재사용)
|
|
@@ -268,21 +283,23 @@ function groupRecordsRecursively(records, allJoinKeys, joinsConfig, currentPath)
|
|
|
268
283
|
const existingGroup = groupMap.get(keyStr);
|
|
269
284
|
if (existingGroup != null) {
|
|
270
285
|
// 기존 그룹에 JOIN 데이터 병합
|
|
286
|
+
const hashSets = hashSetsMap.get(keyStr);
|
|
271
287
|
for (const joinKey of childJoinKeys) {
|
|
272
288
|
const localKey = currentPath === "" ? joinKey : joinKey.slice(currentPath.length + 1);
|
|
273
|
-
mergeJoinData(existingGroup, record, localKey, joinsConfig[joinKey].isSingle);
|
|
289
|
+
mergeJoinData(existingGroup, record, localKey, joinsConfig[joinKey].isSingle, hashSets);
|
|
274
290
|
}
|
|
275
291
|
}
|
|
276
292
|
else {
|
|
277
293
|
// 새 그룹 생성
|
|
278
294
|
const newGroup = { ...record };
|
|
295
|
+
const hashSets = {};
|
|
279
296
|
// 각 JOIN key를 배열 또는 단일 객체로 초기화
|
|
280
297
|
for (const joinKey of childJoinKeys) {
|
|
281
298
|
const localKey = currentPath === "" ? joinKey : joinKey.slice(currentPath.length + 1);
|
|
282
299
|
const joinData = newGroup[localKey];
|
|
283
300
|
if (joinData != null && !isEmptyObject(joinData)) {
|
|
284
301
|
if (!joinsConfig[joinKey].isSingle) {
|
|
285
|
-
// 배열로 변환
|
|
302
|
+
// 배열로 변환 (hashSet은 첫 merge 시 초기화)
|
|
286
303
|
newGroup[localKey] = [joinData];
|
|
287
304
|
}
|
|
288
305
|
}
|
|
@@ -292,6 +309,7 @@ function groupRecordsRecursively(records, allJoinKeys, joinsConfig, currentPath)
|
|
|
292
309
|
}
|
|
293
310
|
}
|
|
294
311
|
groupMap.set(keyStr, newGroup);
|
|
312
|
+
hashSetsMap.set(keyStr, hashSets);
|
|
295
313
|
}
|
|
296
314
|
}
|
|
297
315
|
// Map을 배열로 변환
|
|
@@ -314,14 +332,6 @@ function groupRecordsRecursively(records, allJoinKeys, joinsConfig, currentPath)
|
|
|
314
332
|
}
|
|
315
333
|
}
|
|
316
334
|
}
|
|
317
|
-
// __hashSet__ 내부 속성 제거 (중복 검사용 임시 속성)
|
|
318
|
-
for (const group of grouped) {
|
|
319
|
-
for (const key of Object.keys(group)) {
|
|
320
|
-
if (key.startsWith("__hashSet__")) {
|
|
321
|
-
delete group[key];
|
|
322
|
-
}
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
335
|
return grouped;
|
|
326
336
|
}
|
|
327
337
|
/**
|
|
@@ -358,7 +368,7 @@ function extractGroupKey(record, joinKeyExclusions) {
|
|
|
358
368
|
/**
|
|
359
369
|
* 기존 그룹에 JOIN 데이터 병합
|
|
360
370
|
*/
|
|
361
|
-
function mergeJoinData(existingGroup, newRecord, localKey, isSingle) {
|
|
371
|
+
function mergeJoinData(existingGroup, newRecord, localKey, isSingle, hashSets) {
|
|
362
372
|
const newJoinData = newRecord[localKey];
|
|
363
373
|
if (newJoinData == null || isEmptyObject(newJoinData)) {
|
|
364
374
|
return; // 병합할 데이터 없음
|
|
@@ -377,15 +387,13 @@ function mergeJoinData(existingGroup, newRecord, localKey, isSingle) {
|
|
|
377
387
|
}
|
|
378
388
|
else {
|
|
379
389
|
// isSingle: false → 배열에 추가
|
|
380
|
-
const hashSetKey = `__hashSet__${localKey}`;
|
|
381
390
|
if (!Array.isArray(existingJoinData)) {
|
|
382
391
|
existingGroup[localKey] = [newJoinData];
|
|
383
|
-
|
|
384
|
-
existingGroup[hashSetKey] = new Set([serializeGroupKey(newJoinData)]);
|
|
392
|
+
hashSets[localKey] = new Set([serializeGroupKey(newJoinData)]);
|
|
385
393
|
}
|
|
386
394
|
else {
|
|
387
395
|
// Set 기반 중복 검사 (O(1))
|
|
388
|
-
const hashSet =
|
|
396
|
+
const hashSet = hashSets[localKey];
|
|
389
397
|
const newHash = serializeGroupKey(newJoinData);
|
|
390
398
|
if (hashSet != null) {
|
|
391
399
|
if (!hashSet.has(newHash)) {
|
|
@@ -394,7 +402,7 @@ function mergeJoinData(existingGroup, newRecord, localKey, isSingle) {
|
|
|
394
402
|
}
|
|
395
403
|
}
|
|
396
404
|
else {
|
|
397
|
-
// hashSet
|
|
405
|
+
// hashSet 미초기화: obj.equal 폴백 (중첩 객체 포함 시 정확한 비교)
|
|
398
406
|
const isDuplicate = existingJoinData.some((item) => obj.equal(item, newJoinData));
|
|
399
407
|
if (!isDuplicate) {
|
|
400
408
|
existingJoinData.push(newJoinData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result-parser.js","sourceRoot":"","sources":["../../src/utils/result-parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"result-parser.js","sourceRoot":"","sources":["../../src/utils/result-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAMnF,+CAA+C;AAC/C,QAAQ;AACR,+CAA+C;AAE/C;;;;;;;GAOG;AACH,SAAS,UAAU,CAAC,KAAc,EAAE,IAAwB;IAC1D,2CAA2C;IAC3C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,aAAa,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvB,KAAK,SAAS;YACZ,mCAAmC;YACnC,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,KAAK;gBAAE,OAAO,KAAK,CAAC;YAClE,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAChE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;QAExB,KAAK,UAAU;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;QAEzC,KAAK,UAAU;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;QAEzC,KAAK,MAAM;YACT,OAAO,IAAI,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;QAErC,KAAK,MAAM;YACT,IAAI,KAAK,YAAY,UAAU;gBAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC9D,OAAO,IAAI,IAAI,CAAC,KAAe,CAAC,CAAC;QAEnC,KAAK,OAAO;YACV,IAAI,KAAK,YAAY,UAAU;gBAAE,OAAO,KAAK,CAAC;YAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;AACH,CAAC;AAaD,6CAA6C;AAC7C,SAAS,gBAAgB,CAAC,OAA2C;IACnE,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACnD,GAAG;QACH,IAAI;QACJ,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;KACtD,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CACnB,MAA+B,EAC/B,WAAyB;IAEzB,MAAM,MAAM,GAA4B,EAAE,CAAC;IAE3C,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,WAAW,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE/C,4BAA4B;QAC5B,IAAI,WAAW,KAAK,SAAS;YAAE,SAAS;QAExC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,8CAA8C;YAC9C,IAAI,OAAO,GAAG,MAAM,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC1B,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACrB,CAAC;gBACD,OAAO,GAAG,OAAO,CAAC,IAAI,CAA4B,CAAC;YACrD,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,SAAS;YACT,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,MAA+B;IACpD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED,+CAA+C;AAC/C,QAAQ;AACR,+CAA+C;AAE/C,iCAAiC;AACjC,MAAM,cAAc,GAAG,GAAG,CAAC;AAE3B,4DAA4D;AAC5D,MAAM,gBAAgB,GACpB,OAAO,YAAY,KAAK,WAAW;IACjC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAAqC,EACrC,IAAgB;IAEhB,UAAU;IACV,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEzC,wBAAwB;IACxB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,kBAAkB,CAAU,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,oBAAoB;IACpB,OAAO,kBAAkB,CAAU,UAAU,EAAE,IAAI,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,kBAAkB,CAC/B,UAAqC,EACrC,OAA2C;IAE3C,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,OAAO,GAA8B,EAAE,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,aAAa;QACb,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,cAAc,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,gBAAgB,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAExD,UAAU;QACV,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,qBAAqB;IACrB,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAE,OAAqB,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACnC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACnC,OAAO,MAAM,GAAG,MAAM,CAAC,CAAC,UAAU;IACpC,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,kBAAkB,CAC/B,UAAqC,EACrC,IAAgB;IAEhB,uBAAuB;IACvB,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,aAAa,GAA8B,EAAE,CAAC;IACpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,cAAc,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,gBAAgB,EAAE,CAAC;QAC3B,CAAC;QACD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,kCAAkC;IAClC,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,uBAAuB;IACvB,MAAM,OAAO,GAAG,uBAAuB,CAAC,aAAa,EAAE,cAAc,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEvF,cAAc;IACd,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,OAAO,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAE,eAA6B,CAAC,CAAC,CAAC,SAAS,CAAC;AACjF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,QAAiC,EAAE,cAAyB;IACrF,MAAM,IAAI,GAAG,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACxF,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,CAAC;QACd,MAAM,IAAI,GAAG,CAAC;QACd,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACd,MAAM,IAAI,IAAI,CAAC;QACjB,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,IAAI,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,CAAC;YACd,MAAM,IAAI,GAAG,CAAC;YACd,MAAM,IAAI,GAAG,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,uBAAuB,CAC9B,OAAkC,EAClC,WAAqB,EACrB,WAAkD,EAClD,WAAmB;IAEnB,6BAA6B;IAC7B,2CAA2C;IAC3C,8CAA8C;IAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/C,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;YACvB,mBAAmB;YACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,2BAA2B;YAC3B,OAAO,CACL,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAC3F,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,oBAAoB;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,wBAAwB;IACxB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmC,CAAC;IAC5D,0CAA0C;IAC1C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAuC,CAAC;IAEnE,mCAAmC;IACnC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAElE,kCAAkC;IAClC,IAAI,aAAmC,CAAC;IAExC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,gCAAgC;QAChC,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;QAC5D,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;YAC1B,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAE1D,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3C,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;YAC1B,qBAAqB;YACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;YAC1C,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACtF,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;aAAM,CAAC;YACN,UAAU;YACV,MAAM,QAAQ,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAgC,EAAE,CAAC;YAEjD,+BAA+B;YAC/B,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACtF,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAwC,CAAC;gBAE3E,IAAI,QAAQ,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACjD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACnC,kCAAkC;wBAClC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,oBAAoB;oBACpB,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YAED,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/B,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,cAAc;IACd,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9C,0BAA0B;IAC1B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACtF,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEjC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACnD,0BAA0B;gBAC1B,KAAK,CAAC,QAAQ,CAAC,GAAG,uBAAuB,CACvC,QAAqC,EACrC,WAAW,EACX,WAAW,EACX,OAAO,CACR,CAAC;YACJ,CAAC;iBAAM,IAAI,QAAQ,IAAI,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxF,6BAA6B;gBAC7B,MAAM,SAAS,GAAG,uBAAuB,CACvC,CAAC,QAAmC,CAAC,EACrC,WAAW,EACX,WAAW,EACX,OAAO,CACR,CAAC;gBACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzB,KAAK,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAAC,QAAkB;IAClD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;QAC1B,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnB,uDAAuD;QACvD,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CACtB,MAA+B,EAC/B,iBAA8B;IAE9B,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,mBAAmB;QACnB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,iCAAiC;YACjC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CACpB,aAAsC,EACtC,SAAkC,EAClC,QAAgB,EAChB,QAAiB,EACjB,QAAqC;IAErC,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAwC,CAAC;IAE/E,IAAI,WAAW,IAAI,IAAI,IAAI,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QACtD,OAAO,CAAC,aAAa;IACvB,CAAC;IAED,MAAM,gBAAgB,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEjD,IAAI,QAAQ,EAAE,CAAC;QACb,uCAAuC;QACvC,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAA2C,EAAE,WAAW,CAAC,EAAE,CAAC;gBACzE,MAAM,IAAI,KAAK,CAAC,gBAAgB,QAAQ,uBAAuB,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;QACxC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,2BAA2B;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACxC,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACN,sBAAsB;YACtB,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAA4B,CAAC;YAC9D,MAAM,OAAO,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBACrB,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,iDAAiD;gBACjD,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACjD,GAAG,CAAC,KAAK,CAAC,IAA+B,EAAE,WAAW,CAAC,CACxD,CAAC;gBACF,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|