@tsed/json-mapper 7.35.0-beta.1 → 7.35.0-beta.2
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/jest.config.js +3 -3
- package/lib/browser/json-mapper.umd.min.js +1 -1
- package/lib/browser/json-mapper.umd.min.js.map +1 -1
- package/lib/cjs/domain/JsonMapperCompiler.js +3 -1
- package/lib/cjs/domain/JsonMapperCompiler.js.map +1 -1
- package/lib/cjs/domain/JsonSerializer.js +5 -1
- package/lib/cjs/domain/JsonSerializer.js.map +1 -1
- package/lib/esm/domain/JsonMapperCompiler.js +4 -2
- package/lib/esm/domain/JsonMapperCompiler.js.map +1 -1
- package/lib/esm/domain/JsonSerializer.js +6 -2
- package/lib/esm/domain/JsonSerializer.js.map +1 -1
- package/lib/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonSerializer.js","sourceRoot":"","sources":["../../../src/domain/JsonSerializer.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"JsonSerializer.js","sourceRoot":"","sources":["../../../src/domain/JsonSerializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ancestorsOf, classOf, getRandomId, hasJsonMethod, isClass, isCollection, isDate, isMomentObject, isMongooseObject, isNil, isObject, nameOf, objectKeys } from "@tsed/core";
|
|
1
|
+
import { ancestorsOf, classOf, getRandomId, hasJsonMethod, isClass, isCollection, isDate, isMomentObject, isMongooseObject, isNil, isObject, isObjectID, nameOf, objectKeys } from "@tsed/core";
|
|
2
2
|
export class JsonMapperCompiler {
|
|
3
3
|
/**
|
|
4
4
|
* Cached mappers metadata
|
|
@@ -100,7 +100,6 @@ export class JsonMapperCompiler {
|
|
|
100
100
|
});
|
|
101
101
|
const mapper = this.createMapper(model, id, groups);
|
|
102
102
|
try {
|
|
103
|
-
console.log(mapper);
|
|
104
103
|
return this.eval(mapper, { id, model, groupsId });
|
|
105
104
|
}
|
|
106
105
|
catch (err) {
|
|
@@ -110,6 +109,9 @@ export class JsonMapperCompiler {
|
|
|
110
109
|
return storeGroups.get(groupsId);
|
|
111
110
|
}
|
|
112
111
|
execMapper(id, value, options) {
|
|
112
|
+
if (isObjectID(value)) {
|
|
113
|
+
return value.toString();
|
|
114
|
+
}
|
|
113
115
|
return this.mappers[id](value, options);
|
|
114
116
|
}
|
|
115
117
|
getType(model) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonMapperCompiler.js","sourceRoot":"","sources":["../../../src/domain/JsonMapperCompiler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"JsonMapperCompiler.js","sourceRoot":"","sources":["../../../src/domain/JsonMapperCompiler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { classOf, hasJsonMethod, isClassObject, isCollection, isDate, isMomentObject, isMongooseObject, isNil, isObject, nameOf } from "@tsed/core";
|
|
1
|
+
import { classOf, hasJsonMethod, isClassObject, isCollection, isDate, isMomentObject, isMongooseObject, isNil, isObject, isPrimitive, nameOf } from "@tsed/core";
|
|
2
2
|
import { getPropertiesStores, JsonEntityStore } from "@tsed/schema";
|
|
3
3
|
import { alterOnSerialize } from "../hooks/alterOnSerialize.js";
|
|
4
4
|
import { getObjectProperties } from "../utils/getObjectProperties.js";
|
|
@@ -20,6 +20,7 @@ export class JsonSerializer extends JsonMapperCompiler {
|
|
|
20
20
|
this.addTypeMapper(Map, this.mapMap.bind(this));
|
|
21
21
|
this.addTypeMapper(Set, this.mapSet.bind(this));
|
|
22
22
|
this.addGlobal("mapJSON", this.mapJSON.bind(this));
|
|
23
|
+
this.addTypeMapper("ObjectId", (value) => String(value));
|
|
23
24
|
}
|
|
24
25
|
map(input, options = {}) {
|
|
25
26
|
if (isNil(input)) {
|
|
@@ -28,7 +29,6 @@ export class JsonSerializer extends JsonMapperCompiler {
|
|
|
28
29
|
options = this.mapOptions(options);
|
|
29
30
|
const model = getBestType(options.type, input);
|
|
30
31
|
const mapper = this.compile(model, options.groups);
|
|
31
|
-
console.log(input, model);
|
|
32
32
|
return mapper.fn(input, this.createContext(options));
|
|
33
33
|
}
|
|
34
34
|
alterValue(schemaId, value, options) {
|
|
@@ -149,6 +149,10 @@ export class JsonSerializer extends JsonMapperCompiler {
|
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
mapObject(input, { type, ...options }) {
|
|
152
|
+
if (input && isPrimitive(input)) {
|
|
153
|
+
// prevent mongoose mapping error
|
|
154
|
+
return input;
|
|
155
|
+
}
|
|
152
156
|
if (input && isCollection(input)) {
|
|
153
157
|
return this.execMapper(nameOf(classOf(input)), input, options);
|
|
154
158
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonSerializer.js","sourceRoot":"","sources":["../../../src/domain/JsonSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,YAAY,EACZ,MAAM,EACN,cAAc,EACd,gBAAgB,EAChB,KAAK,EACL,QAAQ,EACR,MAAM,EAEP,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,mBAAmB,EAAkB,eAAe,EAAoB,MAAM,cAAc,CAAC;AACrG,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC,SAAS,WAAW,CAAC,IAAe,EAAE,GAAQ;IAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACxC,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,IAAI,IAAI,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,kBAAyC;IAC3E;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"JsonSerializer.js","sourceRoot":"","sources":["../../../src/domain/JsonSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,aAAa,EACb,aAAa,EACb,YAAY,EACZ,MAAM,EACN,cAAc,EACd,gBAAgB,EAChB,KAAK,EACL,QAAQ,EACR,WAAW,EACX,MAAM,EAEP,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,mBAAmB,EAAkB,eAAe,EAAoB,MAAM,cAAc,CAAC;AACrG,OAAO,EAAC,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC,SAAS,WAAW,CAAC,IAAe,EAAE,GAAQ;IAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACxC,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,IAAI,IAAI,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,kBAAyC;IAC3E;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,GAAG,CAAC,KAAU,EAAE,UAAiC,EAAE;QACjD,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEnC,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE/C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAEnD,OAAO,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;IACvD,CAAC;IAES,UAAU,CAAC,QAAgB,EAAE,KAAU,EAAE,OAA8B;QAC/E,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAc,CAAC,CAAC;IACzE,CAAC;IAES,YAAY,CAAC,KAAgB,EAAE,EAAU,EAAE,MAAwB;QAC3E,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,MAAM,gBAAgB,GAAG,CAAC,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnE,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEtD,MAAM,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1C,kBAAkB;QAClB,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;QAEnD,2BAA2B;QAC3B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;QAErC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YAC5B,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;SACjD;QAED,aAAa;QACb,MAAM,CAAC,GAAG,CACR,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC5C,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,WAAqB,CAAC,CAAC;YAEpD,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;gBACjG,OAAO;aACR;YAED,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC,CAAC,CACH,CAAC;QAEF,gBAAgB;QAChB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAE1C,wBAAwB;QACxB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;QAE7D,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAEO,UAAU,CAAC,EAAC,MAAM,GAAG,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,EAAkC;QACtG,MAAM,aAAa,GAAwB,EAAE,CAAC;QAC9C,KAAK,GAAG,KAAK,IAAI,kBAAkB,EAAE,CAAC;QAEtC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAY,CAAC,EAAE;gBAC7C,IAAI,CAAC,aAAa,CAAC,KAAY,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aACjE;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,OAAO;YACV,MAAM;YACN,QAAQ;YACR,aAAa;SACd,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,aAAgC,EAAE,EAAU,EAAE,MAAwB;QACxF,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAW,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;QACpF,MAAM,QAAQ,GAAG,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC;QAEhC,IAAI,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC,GAAG,CAAC,UAAU,GAAG,IAAI,EAAE,IAAI,MAAM,IAAI,EAAE,EAAE,CAAC,CAAC;QAErE,2BAA2B;QAC3B,IAAI,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC/C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC;YAE9C,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,iBAAiB,QAAQ,+BAA+B,CAAC,CAAC;SAC9E;QAED,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,YAAY,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,gBAAgB,CAAC,CAAC;QAE7E,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAI,sBAAsB,MAAM,IAAI,CAAC;QAE9D,WAAW;QACX,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QACvE,IAAI,aAAa,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC;YAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAExC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,QAAQ,MAAM,GAAG,KAAK,IAAI,GAAG,CAAC,CAAC;SAC/D;QAED,IAAI,aAAa,CAAC,YAAY,EAAE;YAC9B,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;YAEzC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEhD,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,QAAQ,YAAY,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;SACtG;aAAM;YACL,MAAM,IAAI,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAEhD,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;YAErF,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC;aAC5C;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,CAAC;aACd;SACF;QAED,IAAI,QAAQ,KAAK,GAAG,EAAE;YACpB,MAAM,CAAC,GAAG,CAAC,2BAA2B,QAAQ,QAAQ,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;SACrE;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;SAC/B;QAED,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAEO,eAAe,CAAC,EAAU;QAChC,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAE5B,MAAM,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC;QAE1G,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAEtF,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,MAAsB;QAC7C,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAChC,MAAM,aAAa,GAAG,MAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1E,MAAM,IAAI,GAAG,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAE1D,IAAI,IAAI,EAAE;gBACR,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;gBAC5B,MAAM,CAAC,EAAE,CAAC,QAAQ,aAAa,CAAC,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,aAAa,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI,GAAG,CAAC,CAAC;gBAEtG,OAAO,MAAM,CAAC;aACf;SACF;IACH,CAAC;IAEO,uBAAuB,CAAC,MAAsB,EAAE,UAAuB;QAC7E,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAEzE,IAAI,oBAAoB,EAAE;YACxB,MAAM,OAAO,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,iBAAiB,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAE1G,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IAEO,SAAS,CAAC,KAAU,EAAE,EAAC,IAAI,EAAE,GAAG,OAAO,EAAwB;QACrE,IAAI,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE;YAC/B,iCAAiC;YACjC,OAAO,KAAK,CAAC;SACd;QAED,IAAI,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SAChE;QAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACrC;QAED,OAAO,mBAAmB,CAAC,KAAK,CAAC;aAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;aAC1C,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5B,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;gBAChB,OAAO;oBACL,GAAG,GAAG;oBACN,CAAC,GAAG,CAAC,EAAE,KAAK;iBACb,CAAC;aACH;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAE5D,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;aACjC,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAEO,MAAM,CAAC,KAAU,EAAE,OAA8B;QACvD,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,QAAQ,CAAC,KAAU,EAAE,OAA8B;QACzD,OAAO,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;YACxC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,KAAU,EAAE,OAA8B;QACvD,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;YACtD,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;aACnC,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAEO,OAAO,CAAC,KAAU,EAAE,EAAC,EAAE,EAAE,GAAG,OAAO,EAAwB;QACjE,IAAI,CAAC,EAAE,IAAI,KAAK,EAAE;YAChB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACxE;QAED,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1D,CAAC;IAEO,OAAO,CAAC,KAAU,EAAE,EAAC,EAAE,EAAE,GAAG,OAAO,EAAwB;QACjE,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;YAC3B,OAAO,KAAK,CAAC,MAAM,CAAC,EAAC,GAAG,OAAO,EAAE,EAAE,EAAC,CAAC,CAAC;SACvC;QAED,EAAE,GAAG,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAElC,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAEvB,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACvE,CAAC;CACF"}
|