@typespec/http-server-js 0.58.0-alpha.13-dev.0 → 0.58.0-alpha.13-dev.3
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/.testignore +0 -6
- package/dist/src/common/enum.d.ts.map +1 -1
- package/dist/src/common/enum.js +2 -1
- package/dist/src/common/enum.js.map +1 -1
- package/dist/src/common/model.js +2 -2
- package/dist/src/common/model.js.map +1 -1
- package/dist/src/common/reference.d.ts.map +1 -1
- package/dist/src/common/reference.js +21 -1
- package/dist/src/common/reference.js.map +1 -1
- package/dist/src/common/serialization/index.d.ts +2 -2
- package/dist/src/common/serialization/index.d.ts.map +1 -1
- package/dist/src/common/serialization/index.js +5 -1
- package/dist/src/common/serialization/index.js.map +1 -1
- package/dist/src/common/serialization/json.d.ts.map +1 -1
- package/dist/src/common/serialization/json.js +20 -6
- package/dist/src/common/serialization/json.js.map +1 -1
- package/dist/src/http/server/router.js +4 -4
- package/dist/src/http/server/router.js.map +1 -1
- package/package.json +2 -2
- package/src/common/enum.ts +2 -1
- package/src/common/model.ts +2 -2
- package/src/common/reference.ts +19 -1
- package/src/common/serialization/index.ts +9 -3
- package/src/common/serialization/json.ts +25 -8
- package/src/http/server/router.ts +4 -4
- package/temp/tsconfig.tsbuildinfo +1 -1
package/.testignore
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
authentication/oauth2
|
|
2
|
-
authentication/union
|
|
3
1
|
encode/bytes
|
|
4
2
|
encode/datetime
|
|
5
3
|
encode/duration
|
|
@@ -9,7 +7,3 @@ payload/multipart
|
|
|
9
7
|
payload/xml
|
|
10
8
|
response/status-code-range
|
|
11
9
|
streaming/jsonl
|
|
12
|
-
type/enum/fixed
|
|
13
|
-
type/property/additional-properties
|
|
14
|
-
type/property/value-types
|
|
15
|
-
type/model/inheritance/enum-discriminator
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/common/enum.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC;;;;;GAKG;AACH,wBAAiB,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/common/enum.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC;;;;;GAKG;AACH,wBAAiB,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAcvE"}
|
package/dist/src/common/enum.js
CHANGED
|
@@ -14,7 +14,8 @@ export function* emitEnum(ctx, enum_) {
|
|
|
14
14
|
yield `export enum ${name.pascalCase} {`;
|
|
15
15
|
for (const member of enum_.members.values()) {
|
|
16
16
|
const nameCase = parseCase(member.name);
|
|
17
|
-
|
|
17
|
+
const value = member.value ?? member.name;
|
|
18
|
+
yield ` ${nameCase.pascalCase} = ${JSON.stringify(value)},`;
|
|
18
19
|
}
|
|
19
20
|
yield `}`;
|
|
20
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/common/enum.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAIlC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAc,EAAE,KAAW;IACnD,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAErC,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC;IAEzC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/common/enum.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAIlC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAc,EAAE,KAAW;IACnD,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAErC,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC;IAEzC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC;QAC1C,MAAM,KAAK,QAAQ,CAAC,UAAU,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/D,CAAC;IAED,MAAM,GAAG,CAAC;AACZ,CAAC"}
|
package/dist/src/common/model.js
CHANGED
|
@@ -89,9 +89,9 @@ export function emitWellKnownModel(ctx, type, module, preferredAlternativeName)
|
|
|
89
89
|
switch (type.name) {
|
|
90
90
|
case "Record": {
|
|
91
91
|
const arg = type.indexer.value;
|
|
92
|
-
return `
|
|
92
|
+
return `Record<string, ${emitTypeReference(ctx, arg, type, module, {
|
|
93
93
|
altName: preferredAlternativeName && getRecordValueName(preferredAlternativeName),
|
|
94
|
-
})}
|
|
94
|
+
})}>`;
|
|
95
95
|
}
|
|
96
96
|
case "Array": {
|
|
97
97
|
const arg = type.indexer.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/common/model.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAElC,OAAO,EAEL,eAAe,EACf,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD;;;;;;;GAOG;AACH,MAAM,SAAS,CAAC,CAAC,SAAS,CACxB,GAAc,EACd,KAAY,EACZ,MAAc,EACd,OAAgB;IAEhB,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAEzD,IAAI,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,aAAa,GAAG,SAAS,CAC7B,YAAY;QACV,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,UAAU;YACV,CAAC,CAAC,KAAK,CAAC,cAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACpF,KAAK,CAAC,IAAI;YACZ,CAAC,CAAC,KAAK,CAAC,IAAI,CACjB,CAAC;IAEF,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAErC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,OAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC;IAE1E,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS;QACnC,CAAC,CAAC,WAAW,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG;QACtE,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,oBAAoB,SAAS,IAAI,aAAa,GAAG,CAAC;IAExD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,0CAA0C;QAC1C,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QAErC,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE;YACtE,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU;SACxD,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnE,KAAK,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE/C,MAAM,KAAK,IAAI,GAAG,YAAY,KAAK,aAAa,GAAG,CAAC;QACpD,MAAM,EAAE,CAAC;IACX,CAAC;IAED,MAAM,GAAG,CAAC;IACV,MAAM,EAAE,CAAC;AACX,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAc,EAAE,KAAY,EAAE,MAAc;IAC3E,MAAM,UAAU,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;SAC9C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE9C,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QAE9F,OAAO,GAAG,IAAI,GAAG,YAAY,KAAK,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;IACtF,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtB,OAAO,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACxC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAc,EAAE,IAAW;IAC1D,MAAM,QAAQ,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IACjD,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC5F,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAc,EACd,IAAW,EACX,MAAc,EACd,wBAAiC;IAEjC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,GAAG,GAAG,IAAI,CAAC,OAAQ,CAAC,KAAK,CAAC;YAChC,OAAO,kBAAkB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE;gBACjE,OAAO,EAAE,wBAAwB,IAAI,kBAAkB,CAAC,wBAAwB,CAAC;aAClF,CAAC,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/common/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/common/reference.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,WAAW,EACX,SAAS,EACT,QAAQ,EACR,IAAI,EAKL,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAoB,MAAM,WAAW,CAAC;AAShE,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE;IAAE,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,gBAAgB,GAAG,OAAO,QAAQ,EAC5C,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,wBAA6B,GACrC,MAAM,
|
|
1
|
+
{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/common/reference.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,WAAW,EACX,SAAS,EACT,QAAQ,EACR,IAAI,EAKL,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAoB,MAAM,WAAW,CAAC;AAShE,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE;IAAE,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,gBAAgB,GAAG,OAAO,QAAQ,EAC5C,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,wBAA6B,GACrC,MAAM,CA2OR;AAgBD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,UAE1C;AAED,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,CAAC,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAErF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,qBAAqB,CAWtE"}
|
|
@@ -167,6 +167,21 @@ export function emitTypeReference(ctx, type, position, module, options = {}) {
|
|
|
167
167
|
case "Number":
|
|
168
168
|
case "Boolean":
|
|
169
169
|
return String(type.value);
|
|
170
|
+
case "EnumMember": {
|
|
171
|
+
if (typeof type.value === "string") {
|
|
172
|
+
return escapeUnsafeChars(JSON.stringify(type.value));
|
|
173
|
+
}
|
|
174
|
+
else if (typeof type.value === "number") {
|
|
175
|
+
return String(type.value);
|
|
176
|
+
}
|
|
177
|
+
else if (type.value === undefined) {
|
|
178
|
+
return escapeUnsafeChars(JSON.stringify(type.name));
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
void type.value;
|
|
182
|
+
return "unknown";
|
|
183
|
+
}
|
|
184
|
+
}
|
|
170
185
|
case "Intrinsic":
|
|
171
186
|
switch (type.name) {
|
|
172
187
|
case "never":
|
|
@@ -203,7 +218,12 @@ export function emitTypeReference(ctx, type, position, module, options = {}) {
|
|
|
203
218
|
});
|
|
204
219
|
return typeName;
|
|
205
220
|
}
|
|
206
|
-
case "
|
|
221
|
+
case "Tuple": {
|
|
222
|
+
const elementTypes = type.values.map((e) => emitTypeReference(ctx, e, position, module));
|
|
223
|
+
return `[${elementTypes.join(", ")}]`;
|
|
224
|
+
}
|
|
225
|
+
case "ModelProperty":
|
|
226
|
+
case "UnionVariant": {
|
|
207
227
|
// Forward to underlying type.
|
|
208
228
|
return emitTypeReference(ctx, type.type, position, module, options);
|
|
209
229
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../../src/common/reference.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../../../src/common/reference.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Model, Scalar, Type, Union } from "@typespec/compiler";
|
|
1
|
+
import { Enum, Model, Scalar, Type, Union } from "@typespec/compiler";
|
|
2
2
|
import { JsContext, Module } from "../../ctx.js";
|
|
3
|
-
export type SerializableType = Model | Scalar | Union;
|
|
3
|
+
export type SerializableType = Model | Scalar | Union | Enum;
|
|
4
4
|
export declare function isSerializableType(t: Type): t is SerializableType;
|
|
5
5
|
export type SerializationContentType = "application/json";
|
|
6
6
|
export declare function requireSerialization(ctx: JsContext, type: Type, contentType: SerializationContentType): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/serialization/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAY,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/serialization/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAY,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhF,OAAO,EAAE,SAAS,EAAE,MAAM,EAA+B,MAAM,cAAc,CAAC;AAO9E,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC;AAE7D,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,gBAAgB,CAQjE;AAED,MAAM,MAAM,wBAAwB,GAAG,kBAAkB,CAAC;AAI1D,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,wBAAwB,GACpC,IAAI,CAoBN;AAED,MAAM,WAAW,oBAAqB,SAAQ,SAAS;CAAG;AAE1D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CA4BtD;AAED,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,wBAAwB,GACtC,OAAO,CAQT"}
|
|
@@ -9,7 +9,11 @@ import { createOrGetModuleForNamespace } from "../namespace.js";
|
|
|
9
9
|
import { emitTypeReference } from "../reference.js";
|
|
10
10
|
import { emitJsonSerialization, requiresJsonSerialization } from "./json.js";
|
|
11
11
|
export function isSerializableType(t) {
|
|
12
|
-
return t.kind === "Model" ||
|
|
12
|
+
return (t.kind === "Model" ||
|
|
13
|
+
t.kind === "Scalar" ||
|
|
14
|
+
t.kind === "Union" ||
|
|
15
|
+
t.kind === "Intrinsic" ||
|
|
16
|
+
t.kind === "Enum");
|
|
13
17
|
}
|
|
14
18
|
const _SERIALIZATIONS_MAP = new WeakMap();
|
|
15
19
|
export function requireSerialization(ctx, type, contentType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/serialization/index.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAElC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/serialization/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../../src/common/serialization/json.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,gBAAgB,EAGhB,QAAQ,EAIR,IAAI,EAML,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAUjD,OAAO,
|
|
1
|
+
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../../src/common/serialization/json.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,gBAAgB,EAGhB,QAAQ,EAIR,IAAI,EAML,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAUjD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAOpB,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,gBAAgB,GAAE,gBAAgB,GAAG,OAAO,QAAmB,GAC9D,OAAO,CAmDT;AA4BD,wBAAiB,qBAAqB,CACpC,GAAG,EAAE,oBAAoB,EACzB,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,QAAQ,CAAC,MAAM,CAAC,CAQlB"}
|
|
@@ -11,7 +11,7 @@ import { keywordSafe } from "../../util/keywords.js";
|
|
|
11
11
|
import { getFullyQualifiedTypeName } from "../../util/name.js";
|
|
12
12
|
import { emitTypeReference, escapeUnsafeChars } from "../reference.js";
|
|
13
13
|
import { JS_SCALAR_UNKNOWN, getJsScalar } from "../scalar.js";
|
|
14
|
-
import { requireSerialization } from "./index.js";
|
|
14
|
+
import { isSerializableType, requireSerialization, } from "./index.js";
|
|
15
15
|
/**
|
|
16
16
|
* Memoization cache for requiresJsonSerialization.
|
|
17
17
|
*/
|
|
@@ -52,6 +52,8 @@ export function requiresJsonSerialization(ctx, module, type, diagnosticTarget =
|
|
|
52
52
|
case "ModelProperty":
|
|
53
53
|
requiresSerialization = requiresJsonSerialization(ctx, module, type.type);
|
|
54
54
|
break;
|
|
55
|
+
case "Enum":
|
|
56
|
+
requiresSerialization = false;
|
|
55
57
|
}
|
|
56
58
|
_REQUIRES_JSON_SERIALIZATION.set(type, requiresSerialization);
|
|
57
59
|
return requiresSerialization;
|
|
@@ -69,10 +71,7 @@ function isHttpMetadata(ctx, property) {
|
|
|
69
71
|
getPathParamOptions(ctx.program, property) !== undefined);
|
|
70
72
|
}
|
|
71
73
|
function isSerializable(type) {
|
|
72
|
-
return
|
|
73
|
-
type.kind === "Scalar" ||
|
|
74
|
-
type.kind === "Union" ||
|
|
75
|
-
type.kind === "ModelProperty");
|
|
74
|
+
return type.kind === "ModelProperty" || isSerializableType(type);
|
|
76
75
|
}
|
|
77
76
|
export function* emitJsonSerialization(ctx, type, module, typeName) {
|
|
78
77
|
yield `toJsonObject(input: ${typeName}): any {`;
|
|
@@ -137,6 +136,14 @@ function* emitToJson(ctx, type, module) {
|
|
|
137
136
|
});
|
|
138
137
|
return;
|
|
139
138
|
}
|
|
139
|
+
case "Enum": {
|
|
140
|
+
yield `return input;`;
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
default: {
|
|
144
|
+
void type;
|
|
145
|
+
throw new UnimplementedError(`emitToJson: ${type.kind}`);
|
|
146
|
+
}
|
|
140
147
|
}
|
|
141
148
|
}
|
|
142
149
|
function transposeExpressionToJson(ctx, type, expr, module) {
|
|
@@ -215,7 +222,6 @@ function transposeExpressionToJson(ctx, type, expr, module) {
|
|
|
215
222
|
case "Boolean":
|
|
216
223
|
return literalToExpr(type);
|
|
217
224
|
case "Interface":
|
|
218
|
-
case "Enum":
|
|
219
225
|
case "EnumMember":
|
|
220
226
|
case "TemplateParameter":
|
|
221
227
|
case "Namespace":
|
|
@@ -335,6 +341,14 @@ function* emitFromJson(ctx, type, module) {
|
|
|
335
341
|
});
|
|
336
342
|
return;
|
|
337
343
|
}
|
|
344
|
+
case "Enum": {
|
|
345
|
+
yield `return input;`;
|
|
346
|
+
return;
|
|
347
|
+
}
|
|
348
|
+
default: {
|
|
349
|
+
void type;
|
|
350
|
+
throw new UnimplementedError(`emitFromJson: ${type.kind}`);
|
|
351
|
+
}
|
|
338
352
|
}
|
|
339
353
|
}
|
|
340
354
|
function transposeExpressionFromJson(ctx, type, expr, module) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../src/common/serialization/json.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../src/common/serialization/json.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAElC,OAAO,EAKL,QAAQ,EAKR,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAElG,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAW,iBAAiB,EAAY,WAAW,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAGL,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,MAAM,4BAA4B,GAAG,IAAI,OAAO,EAA6C,CAAC;AAE9F,MAAM,UAAU,yBAAyB,CACvC,GAAc,EACd,MAAc,EACd,IAAU,EACV,mBAAuD,QAAQ;IAE/D,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAExC,IAAI,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IACjD,CAAC;IAED,yGAAyG;IACzG,6GAA6G;IAC7G,cAAc;IACd,4BAA4B,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAE7C,IAAI,qBAA8B,CAAC;IAEnC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBACxC,qBAAqB,GAAG,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;gBAC7E,MAAM;YACR,CAAC;YAED,qBAAqB,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CACtE,iCAAiC,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CACzD,CAAC;YACF,MAAM;QACR,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAChE,qBAAqB;gBACnB,CAAC,MAAM,CAAC,gBAAgB;oBACxB,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,SAAS;oBAC1C,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,KAAK,SAAS,CAAC;YAClE,MAAM;QACR,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,qBAAqB,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CACnE,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAChD,CAAC;YACF,MAAM;QACR,CAAC;QACD,KAAK,eAAe;YAClB,qBAAqB,GAAG,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1E,MAAM;QACR,KAAK,MAAM;YACT,qBAAqB,GAAG,KAAK,CAAC;IAClC,CAAC;IAED,4BAA4B,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAE9D,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,SAAS,iCAAiC,CACxC,GAAc,EACd,MAAc,EACd,QAAuB;IAEvB,OAAO,CAAC,CAAC,CACP,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC;QAC7B,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC;QAChC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,KAAK,QAAQ,CAAC,IAAI;QAC/E,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5B,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CACnE,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,GAAc,EAAE,QAAuB;IAC7D,OAAO,CACL,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,SAAS;QACzD,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,SAAS;QAC1D,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,SAAS,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAI,CAAC,IAAI,KAAK,eAAe,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,qBAAqB,CACpC,GAAyB,EACzB,IAAsB,EACtB,MAAc,EACd,QAAgB;IAEhB,MAAM,uBAAuB,QAAQ,UAAU,CAAC;IAChD,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,MAAM,IAAI,CAAC;IAEX,MAAM,+BAA+B,QAAQ,IAAI,CAAC;IAClD,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C,MAAM,IAAI,CAAC;AACb,CAAC;AAED,QAAQ,CAAC,CAAC,UAAU,CAClB,GAAyB,EACzB,IAAsB,EACtB,MAAc;IAEd,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,UAAU,CAAC;YAEjB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;gBAChD,MAAM,WAAW,GACf,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC;gBAEjF,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;gBAErE,IAAI,IAAI,GAAW,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBAEjD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAElD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE,CAAC;oBAChD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACtE,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,IAAI,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAExF,IAAI,aAAa,EAAE,CAAC;wBAClB,IAAI,GAAG,yBAAyB,CAC9B,GAAG;wBACH,oFAAoF;wBACpF,aAAa,CAAC,MAAM,CAAC,MAAgB,EACrC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAC1B,MAAM,CACP,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;4BAC5B,IAAI,EAAE,kBAAkB;4BACxB,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAE;gCACN,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,WAAW;gCAC1C,IAAI,EAAE,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC;gCAC9C,MAAM,EAAE,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC;6BACjD;yBACF,CAAC,CAAC;wBAEH,8EAA8E;oBAChF,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,yBAAyB,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBACrE,CAAC;gBAED,MAAM,KAAK,WAAW,KAAK,IAAI,GAAG,CAAC;YACrC,CAAC;YAED,MAAM,IAAI,CAAC;YAEX,OAAO;QACT,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,8DAA8D,CAAC;YACrE,OAAO;QACT,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAEvD,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE;gBAClC,OAAO,EAAE,OAAO;gBAChB,sBAAsB,CAAC,CAAC;oBACtB,OAAO,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;gBACtD,CAAC;gBACD,YAAY,CAAC,IAAI;oBACf,OAAO,CAAC,UAAU,yBAAyB,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC9E,CAAC;aACF,CAAC,CAAC;YAEH,OAAO;QACT,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,eAAe,CAAC;YACtB,OAAO;QACT,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,KAAM,IAAqB,CAAC;YAC5B,MAAM,IAAI,kBAAkB,CAAC,eAAgB,IAAa,CAAC,IAAI,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,GAAyB,EACzB,IAAU,EACV,IAAY,EACZ,MAAc;IAEd,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBAExC,IAAI,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;oBACzD,OAAO,IAAI,IAAI,oBAAoB,yBAAyB,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC;gBACrG,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBAChD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBAExC,IAAI,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;oBACzD,OAAO,qCAAqC,IAAI,yCAAyC,yBAAyB,CAChH,GAAG,EACH,YAAY,EACZ,OAAO,EACP,MAAM,CACP,KAAK,CAAC;gBACT,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBACzD,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBACpD,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAErE,OAAO,GAAG,aAAa,iBAAiB,IAAI,GAAG,CAAC;YAClD,CAAC;QACH,CAAC;QACD,KAAK,QAAQ;YACX,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAExD,MAAM,OAAO,GAAY,gBAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAErC,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC9D,OAAO,OAAO,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,qFAAqF;gBACrF,OAAO,yBAAyB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,MAAgB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1F,CAAC;QACH,KAAK,OAAO;YACV,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBACpD,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE;oBACnE,OAAO,EAAE,YAAY;oBACrB,kBAAkB,EAAE,IAAI;iBACzB,CAAC,CAAC;gBAEH,OAAO,GAAG,aAAa,iBAAiB,IAAI,GAAG,CAAC;YAClD,CAAC;QACH,KAAK,eAAe;YAClB,OAAO,yBAAyB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACjE,KAAK,WAAW;YACd,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,OAAO,WAAW,CAAC;gBACrB,KAAK,MAAM;oBACT,OAAO,MAAM,CAAC;gBAChB,KAAK,WAAW;oBACd,cAAc,CAAC,KAAK,EAAE,6CAA6C,EAAE,IAAI,CAAC,CAAC;oBAC3E,OAAO,IAAI,CAAC;gBACd,KAAK,OAAO,CAAC;gBACb,KAAK,SAAS,CAAC;gBACf;oBACE,6FAA6F;oBAC7F,8BAA8B;oBAC9B,OAAO,IAAI,CAAC;YAChB,CAAC;QACH,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY,CAAC;QAClB,KAAK,mBAAmB,CAAC;QACzB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB,CAAC;QAC1B,KAAK,OAAO,CAAC;QACb,KAAK,cAAc,CAAC;QACpB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB,CAAC;QACzB,KAAK,mBAAmB,CAAC;QACzB;YACE,MAAM,IAAI,kBAAkB,CAAC,6BAA6B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAyB,EAAE,IAAY,EAAE,MAAgB;IACjF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE9C,IAAI,OAAgB,CAAC;IAErB,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,IAAI,SAAS,CAAC;QACpD,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEtE,wFAAwF;QACxF,oDAAoD;QACpD,yDAAyD;QACzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC5B,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE;oBACN,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,WAAW;oBAC1C,IAAI,EAAE,yBAAyB,CAAC,IAAI,CAAC;oBACrC,MAAM,EAAE,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC;iBACjD;aACF,CAAC,CAAC;YAEH,OAAO,GAAG;gBACR,MAAM,EAAE,iBAAiB;gBACzB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;gBACtB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;aACvB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,aAAa,CAAC;QAC1B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,wEAAwE;QACxE,OAAO,GAAG,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,IAAI;YAC7D,MAAM,EAAE,iBAAiB;YACzB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;YACtB,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;SACvB,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,IAAqD;IAC1E,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,YAAY,CACpB,GAAyB,EACzB,IAAsB,EACtB,MAAc;IAEd,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,UAAU,CAAC;YAEjB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;gBAChD,MAAM,WAAW,GACf,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC;gBAEjF,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBAExC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAElD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,EAAE,CAAC;oBAChD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACtE,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,IAAI,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAExF,IAAI,aAAa,EAAE,CAAC;wBAClB,IAAI,GAAG,2BAA2B,CAChC,GAAG;wBACH,oFAAoF;wBACpF,aAAa,CAAC,MAAM,CAAC,MAAgB,EACrC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAC1B,MAAM,CACP,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;4BAC5B,IAAI,EAAE,kBAAkB;4BACxB,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAE;gCACN,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,WAAW;gCAC1C,IAAI,EAAE,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC;gCAC9C,MAAM,EAAE,yBAAyB,CAAC,QAAQ,CAAC,IAAI,CAAC;6BACjD;yBACF,CAAC,CAAC;wBAEH,8EAA8E;oBAChF,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,2BAA2B,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBACvE,CAAC;gBAED,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;gBAErE,MAAM,KAAK,YAAY,KAAK,IAAI,GAAG,CAAC;YACtC,CAAC;YAED,MAAM,IAAI,CAAC;YAEX,OAAO;QACT,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,8DAA8D,CAAC;YACrE,OAAO;QACT,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAEvD,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE;gBAClC,OAAO,EAAE,OAAO;gBAChB,sBAAsB,CAAC,CAAC;oBACtB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;oBAClF,OAAO,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACnC,CAAC;gBACD,YAAY,CAAC,IAAI;oBACf,OAAO,CAAC,UAAU,2BAA2B,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChF,CAAC;aACF,CAAC,CAAC;YAEH,OAAO;QACT,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,eAAe,CAAC;YACtB,OAAO;QACT,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,KAAM,IAAqB,CAAC;YAC5B,MAAM,IAAI,kBAAkB,CAAC,iBAAkB,IAAa,CAAC,IAAI,EAAE,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,GAAyB,EACzB,IAAU,EACV,IAAY,EACZ,MAAc;IAEd,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,IAAI,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBAExC,IAAI,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;oBACzD,OAAO,IAAI,IAAI,yBAAyB,2BAA2B,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC;gBAC5G,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBAChD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBAExC,IAAI,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;oBACzD,OAAO,qCAAqC,IAAI,iCAAiC,2BAA2B,CAC1G,GAAG,EACH,YAAY,EACZ,OAAO,EACP,MAAM,CACP,KAAK,CAAC;gBACT,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBACzD,OAAO,GAAG,IAAI,OAAO,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YACxE,CAAC;iBAAM,CAAC;gBACN,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBACpD,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAErE,OAAO,GAAG,aAAa,mBAAmB,IAAI,GAAG,CAAC;YACpD,CAAC;QACH,CAAC;QACD,KAAK,QAAQ;YACX,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAErC,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAC9D,OAAO,OAAO,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,qFAAqF;gBACrF,OAAO,2BAA2B,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,MAAgB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5F,CAAC;QACH,KAAK,OAAO;YACV,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBACpD,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE;oBACnE,OAAO,EAAE,YAAY;oBACrB,kBAAkB,EAAE,IAAI;iBACzB,CAAC,CAAC;gBAEH,OAAO,GAAG,aAAa,mBAAmB,IAAI,GAAG,CAAC;YACpD,CAAC;QACH,KAAK,eAAe;YAClB,OAAO,2BAA2B,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnE,KAAK,WAAW;YACd,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,KAAK,WAAW;oBACd,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,KAAK,MAAM;oBACT,OAAO,WAAW,CAAC;gBACrB,KAAK,MAAM;oBACT,OAAO,MAAM,CAAC;gBAChB,KAAK,OAAO,CAAC;gBACb,KAAK,SAAS;oBACZ,OAAO,IAAI,CAAC;gBACd;oBACE,MAAM,IAAI,KAAK,CACb,+BAAgC,IAAsC,CAAC,IAAI,EAAE,CAC9E,CAAC;YACN,CAAC;QACH,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,YAAY,CAAC;QAClB,KAAK,mBAAmB,CAAC;QACzB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,gBAAgB,CAAC;QACtB,KAAK,oBAAoB,CAAC;QAC1B,KAAK,OAAO,CAAC;QACb,KAAK,cAAc,CAAC;QACpB,KAAK,WAAW,CAAC;QACjB,KAAK,mBAAmB,CAAC;QACzB,KAAK,mBAAmB,CAAC;QACzB;YACE,MAAM,IAAI,kBAAkB,CAAC,6BAA6B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC"}
|
|
@@ -96,11 +96,11 @@ function* emitRouterDefinition(ctx, service, routeTree, module) {
|
|
|
96
96
|
yield "";
|
|
97
97
|
yield `export function create${routerName}(`;
|
|
98
98
|
for (const [param] of backends.values()) {
|
|
99
|
-
yield ` ${param.camelCase}: ${param.pascalCase},`;
|
|
99
|
+
yield ` ${keywordSafe(param.camelCase)}: ${param.pascalCase},`;
|
|
100
100
|
}
|
|
101
101
|
yield ` options: RouterOptions<{`;
|
|
102
102
|
for (const [param] of backends.values()) {
|
|
103
|
-
yield ` ${param.camelCase}: ${param.pascalCase}<HttpContext>,`;
|
|
103
|
+
yield ` ${keywordSafe(param.camelCase)}: ${param.pascalCase}<HttpContext>,`;
|
|
104
104
|
}
|
|
105
105
|
yield ` }> = {}`;
|
|
106
106
|
yield `): ${routerName} {`;
|
|
@@ -251,7 +251,7 @@ function* emitRouteOperationDispatch(ctx, routeHandlers, operations, backends) {
|
|
|
251
251
|
const operation = operationList[0];
|
|
252
252
|
const [backend] = backends.get(operation.container);
|
|
253
253
|
const operationName = keywordSafe(backend.snakeCase + "_" + parseCase(operation.operation.name).snakeCase);
|
|
254
|
-
const backendMemberName = backend.camelCase;
|
|
254
|
+
const backendMemberName = keywordSafe(backend.camelCase);
|
|
255
255
|
const parameters = operation.parameters.length > 0
|
|
256
256
|
? ", " + operation.parameters.map((param) => parseCase(param.name).camelCase).join(", ")
|
|
257
257
|
: "";
|
|
@@ -300,7 +300,7 @@ function* emitRouteOperationDispatchMultiple(ctx, routeHandlers, operations, rou
|
|
|
300
300
|
for (const [operation, contentType] of contentTypeMap.entries()) {
|
|
301
301
|
const [backend] = backends.get(operation.container);
|
|
302
302
|
const operationName = keywordSafe(backend.snakeCase + "_" + parseCase(operation.operation.name).snakeCase);
|
|
303
|
-
const backendMemberName = backend.camelCase;
|
|
303
|
+
const backendMemberName = keywordSafe(backend.camelCase);
|
|
304
304
|
const parameters = operation.parameters.length > 0
|
|
305
305
|
? ", " + operation.parameters.map((param) => parseCase(param.name).camelCase).join(", ")
|
|
306
306
|
: "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../src/http/server/router.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../src/http/server/router.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAGlC,OAAO,EAKL,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,6BAA6B,EAC7B,+BAA+B,GAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAU,YAAY,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAU,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;;;;;;GASG;AACH,MAAM,UAAU,UAAU,CAAC,GAAgB,EAAE,OAAoB,EAAE,eAAuB;IACxF,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAEhD,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC;IAEH,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,gBAAgB;QACxB,IAAI,EAAE,eAAe;KACtB,CAAC,CAAC;IAEH,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,CAAC,4BAA4B,CAAC;QACtC,IAAI,EAAE,aAAa;KACpB,CAAC,CAAC;IAEH,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;AACnG,CAAC;AAED;;;;;;;GAOG;AACH,QAAQ,CAAC,CAAC,oBAAoB,CAC5B,GAAgB,EAChB,OAAoB,EACpB,SAAoB,EACpB,MAAc;IAEd,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC;IAE3E,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IAE7F,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAwC,CAAC;IAEjE,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAExC,MAAM,eAAe,GACnB,SAAS,CAAC,IAAI,KAAK,WAAW;YAC5B,CAAC,CAAC,+BAA+B,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC;YACzD,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAE3D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAClB,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;YAC1B,IAAI,EAAE,6BAA6B,CAAC,GAAG,EAAE,SAAS,CAAC,SAAU,CAAC;SAC/D,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAClB,MAAM,EAAE,CAAC,eAAe,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,aAAa,CAAC;QAC1F,IAAI,EAAE,YAAY;KACnB,CAAC,CAAC;IAEH,MAAM,oBAAoB,UAAU,IAAI,CAAC;IACzC,MAAM,OAAO,CAAC;IACd,MAAM,mFAAmF,CAAC;IAC1F,MAAM,MAAM,CAAC;IACb,MAAM,qFAAqF,CAAC;IAC5F,MAAM,MAAM,CAAC;IACb,MAAM,kDAAkD,CAAC;IACzD,MAAM,oDAAoD,CAAC;IAC3D,MAAM,OAAO,CAAC;IACd,MAAM,iFAAiF,CAAC;IAExF,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,CAAC;QACT,MAAM,OAAO,CAAC;QACd,MAAM,uHAAuH,CAAC;QAC9H,MAAM,MAAM,CAAC;QACb,MAAM,+GAA+G,CAAC;QACtH,MAAM,MAAM,CAAC;QACb,MAAM,kHAAkH,CAAC;QACzH,MAAM,4FAA4F,CAAC;QACnG,MAAM,MAAM,CAAC;QACb,MAAM,8CAA8C,CAAC;QACrD,MAAM,+CAA+C,CAAC;QACtD,MAAM,+DAA+D,CAAC;QACtE,MAAM,OAAO,CAAC;QACd,MAAM,mGAAmG,CAAC;IAC5G,CAAC;IAED,MAAM,GAAG,CAAC;IACV,MAAM,EAAE,CAAC;IAET,MAAM,yBAAyB,UAAU,GAAG,CAAC;IAE7C,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QACxC,MAAM,KAAK,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,KAAK,CAAC,UAAU,GAAG,CAAC;IAClE,CAAC;IAED,MAAM,4BAA4B,CAAC;IACnC,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,KAAK,CAAC,UAAU,gBAAgB,CAAC;IACjF,CAAC;IACD,MAAM,WAAW,CAAC;IAClB,MAAM,MAAM,UAAU,IAAI,CAAC;IAE3B,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,CAAC,GAAG;QAC7D,mBAAmB;QACnB,kBAAkB;QAClB,iBAAiB;KAClB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAElB,6BAA6B;IAC7B,MAAM,WAAW,iBAAiB,6CAA6C,CAAC;IAChF,MAAM,oCAAoC,CAAC;IAC3C,MAAM,2DAA2D,CAAC;IAClE,MAAM,oCAAoC,CAAC;IAC3C,MAAM,OAAO,CAAC;IACd,MAAM,EAAE,CAAC;IACT,MAAM,WAAW,gBAAgB,0DAA0D,CAAC;IAC5F,MAAM,oCAAoC,CAAC;IAC3C,MAAM,iEAAiE,CAAC;IACxE,MAAM,kDAAkD,CAAC;IACzD,MAAM,OAAO,CAAC;IACd,MAAM,EAAE,CAAC;IACT,MAAM,WAAW,eAAe,kDAAkD,CAAC;IACnF,MAAM,oCAAoC,CAAC;IAC3C,MAAM,2DAA2D,CAAC;IAClE,MAAM,iDAAiD,CAAC;IACxD,MAAM,OAAO,CAAC;IACd,MAAM,EAAE,CAAC;IAET,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAElD,MAAM,WAAW,aAAa,iCAAiC,CAAC;IAChE,MAAM,EAAE,CAAC;IACT,MAAM,WAAW,aAAa,MAAM,CAAC;IAErC,mCAAmC;IACnC,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE1D,MAAM,OAAO,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS,8BAA8B,CAAC;QAC9F,MAAM,UAAU,aAAa,CAAC,SAAS,GAAG,aAAa,CAAC,UAAU,GAAG,UAAU,IAAI,CAAC;QACpF,MAAM,SAAS,aAAa,GAAG,CAAC;QAChC,MAAM,UAAU,aAAa,CAAC,SAAS,IAAI,CAAC;QAC5C,MAAM,UAAU,aAAa,CAAC,SAAS,IAAI,CAAC;QAC5C,MAAM,mBAAmB,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS,GAAG,CAAC;QAC/E,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,eAAe,CAAC;IACtB,MAAM,EAAE,CAAC;IAET,mCAAmC;IACnC,MAAM,yCAAyC,UAAU,6EAA6E,CAAC;IACvI,MAAM,6EAA6E,CAAC;IACpF,MAAM,8BAA8B,CAAC;IACrC,MAAM,EAAE,CAAC;IAET,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAEzF,MAAM,EAAE,CAAC;IAET,MAAM,sDAAsD,CAAC;IAC7D,MAAM,OAAO,CAAC;IACd,MAAM,EAAE,CAAC;IAET,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAElD,MAAM,WAAW,aAAa,MAAM,CAAC;IACrC,MAAM,0BAA0B,iBAAiB,GAAG,CAAC;IACrD,MAAM,yBAAyB,gBAAgB,GAAG,CAAC;IACnD,MAAM,wBAAwB,eAAe,GAAG,CAAC;IACjD,MAAM,MAAM,CAAC;IAEb,MAAM,YAAY,CAAC;IACnB,MAAM,mCAAmC,CAAC;IAC1C,MAAM,yDAAyD,aAAa,KAAK,CAAC;IAClF,MAAM,8DAA8D,eAAe,YAAY,CAAC;IAChG,MAAM,QAAQ,CAAC;IAEf,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,6DAA6D,CAAC;QACpE,MAAM,yDAAyD,aAAa,KAAK,CAAC;QAClF,MAAM,sBAAsB,CAAC;QAC7B,MAAM,+CAA+C,CAAC;QACtD,MAAM,gBAAgB,aAAa,GAAG,CAAC;QACvC,MAAM,qDAAqD,CAAC;QAC5D,MAAM,aAAa,CAAC;QACpB,MAAM,kBAAkB,CAAC;QACzB,MAAM,kBAAkB,CAAC;QACzB,MAAM,wBAAwB,eAAe,YAAY,CAAC;QAC1D,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,KAAK,CAAC;IACZ,MAAM,GAAG,CAAC;AACZ,CAAC;AAED;;;;;;;GAOG;AACH,QAAQ,CAAC,CAAC,gBAAgB,CACxB,GAAgB,EAChB,aAAqB,EACrB,SAAoB,EACpB,QAAmD,EACnD,MAAc;IAEd,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAEtE,MAAM,eAAe,GAAG,qCAAqC,CAAC;IAE9D,MAAM,0BAA0B,CAAC;IACjC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAClC,KAAK,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAAC,GAAG,EAAE,aAAa,EAAE,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChG,CAAC;SAAM,CAAC;QACN,YAAY;QACZ,MAAM,YAAY,eAAe,QAAQ,CAAC;IAC5C,CAAC;IACD,MAAM,GAAG,CAAC;IAEV,IAAI,aAAa,EAAE,CAAC;QAClB,YAAY;QACZ,MAAM,QAAQ,CAAC;QACf,MAAM,YAAY,eAAe,QAAQ,CAAC;QAC1C,MAAM,GAAG,CAAC;QACV,OAAO;IACT,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3E,MAAM,4BAA4B,WAAW,MAAM,CAAC;QACpD,MAAM,uBAAuB,IAAI,CAAC,MAAM,IAAI,CAAC;QAC7C,KAAK,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAChF,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC;QAChD,MAAM,UAAU,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;QAErC,MAAM,QAAQ,CAAC;QACf,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACpE,MAAM,OAAO,GAAG,KAAK,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC;QAC1D,MAAM,SAAS,OAAO,uBAAuB,CAAC;QAC9C,MAAM,KAAK,OAAO,MAAM,OAAO,2BAA2B,OAAO,GAAG,CAAC;QACrE,MAAM,WAAW,SAAS,oBAAoB,OAAO,IAAI,CAAC;QAC1D,MAAM,uBAAuB,OAAO,IAAI,CAAC;QACzC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC3B,MAAM,WAAW,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,WAAW,CAAC;YACrD,CAAC;QACH,CAAC;QACD,KAAK,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAEhF,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,QAAQ,CAAC,CAAC,0BAA0B,CAClC,GAAgB,EAChB,aAAqB,EACrB,UAA2C,EAC3C,QAAmD;IAEnD,MAAM,2BAA2B,CAAC;IAClC,KAAK,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACzD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAE,CAAC;YACrD,MAAM,aAAa,GAAG,WAAW,CAC/B,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,CACxE,CAAC;YAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEzD,MAAM,UAAU,GACd,SAAS,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;gBAC7B,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBACxF,CAAC,CAAC,EAAE,CAAC;YAET,MAAM,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC;YACtD,MAAM,cAAc,aAAa,IAAI,aAAa,SAAS,iBAAiB,GAAG,UAAU,IAAI,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,eAAe;YACf,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAChF,MAAM,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC;YACtD,KAAK,CAAC,CAAC,MAAM,CACX,MAAM,CACJ,kCAAkC,CAAC,GAAG,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,CACvF,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,YAAY,CAAC;IACnB,MAAM,sDAAsD,CAAC;IAE7D,MAAM,GAAG,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,QAAQ,CAAC,CAAC,kCAAkC,CAC1C,GAAgB,EAChB,aAAqB,EACrB,UAA4B,EAC5B,KAAa,EACb,QAAmD;IAEnD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,MAAM,cAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;IAEzD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3E,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CACnE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,cAAc,CAClF,EAAE,KAAK,CAAC,IAAI,CAAC;QAEd,IAAI,CAAC,oBAAoB,IAAI,oBAAoB,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpE,MAAM,IAAI,kBAAkB,CAC1B,oEAAoE,CACrE,CAAC;QACJ,CAAC;QAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;YACrD,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC5B,IAAI,EAAE,wBAAwB;gBAC9B,MAAM,EAAE,aAAa,CAAC,SAAS;aAChC,CAAC,CAAC;QACL,CAAC;QAED,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAEjD,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAElD,MAAM,SAAS,eAAe,wEAAwE,CAAC;IAEvG,MAAM,WAAW,eAAe,KAAK,CAAC;IAEtC,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;QAChE,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAE,CAAC;QACrD,MAAM,aAAa,GAAG,WAAW,CAC/B,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,CACxE,CAAC;QAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzD,MAAM,UAAU,GACd,SAAS,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YAC7B,CAAC,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACxF,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC;QAEvE,MAAM,UAAU,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC;QACpD,MAAM,cAAc,aAAa,IAAI,aAAa,SAAS,iBAAiB,GAAG,UAAU,IAAI,CAAC;IAChG,CAAC;IAED,MAAM,YAAY,CAAC;IACnB,MAAM,sDAAsD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,8BAA8B,KAAK,8BAA8B,eAAe,QAAQ,CAAC;IAC1K,MAAM,GAAG,CAAC;AACZ,CAAC;AAmED;;GAEG;AACH,SAAS,eAAe,CAAC,GAAgB,EAAE,OAAoB;IAC7D,yDAAyD;IACzD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,SAAS;QACvD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAClD,OAAO;YACL,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC;YACrE,QAAQ;SACA,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,iFAAiF;IAEjF,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAEnC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,aAAa,CAAC,MAAe;IACpC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IACpF,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,GAAG,QAAQ,CACvC,IAAI,EACJ,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAE,KAAK,QAAQ,CAClD,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmB,CAAC;IAE3C,oCAAoC;IAEpC,KAAK,EAAE,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAW,CAAC;QAEnD,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAE3C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;gBACpC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;gBACjD,SAAS,KAAK,CAAC;YACjB,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CACtC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CACjB;QACE,IAAI;QACJ,aAAa,CACX,MAAM,CAAC,GAAG,CAAC,SAAS,YAAY,CAAC,KAAK;YACpC,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,QAAuC,CAAC;YAExE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,GAAG,KAAK;oBACR,QAAQ,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;iBACnD,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CACH;KACO,CACb,CAAC;IAEF,IAAI,IAA0C,CAAC;IAE/C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,MAAM,UAAU,GAAY,EAAE,CAAC;QAC/B,KAAK,MAAM,kBAAkB,IAAI,aAAa,EAAE,CAAC;YAC/C,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,kBAAkB,CAAC,QAG9C,CAAC;YAEF,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrB,UAAU,CAAC,IAAI,CAAC,EAAE,GAAG,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAA8B,CAAC;IAE3D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,UAAU,GAAG,EAAE,CAAC;YAChB,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC/C,CAAC;QAED,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,UAAU,EAAE,YAAY;QACxB,IAAI;QACJ,KAAK;KACN,CAAC;IAEF,SAAS,YAAY,CAAC,CAAS,EAAE,CAAS;QACxC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,CAAC,EAAE,CAAC;QACN,CAAC;QACD,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAgB,EAAE,SAAwB;IAClE,8EAA8E;IAC9E,8EAA8E;IAC9E,gFAAgF;IAChF,OAAO;IACP,EAAE;IACF,YAAY;IACZ,YAAY;IACZ,0BAA0B;IAC1B,sDAAsD;IACtD,kGAAkG;IAElG,MAAM,QAAQ,GAAmB,EAAE,CAAC;IAEpC,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC9B,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAC/C,CAAC,CAAC,EAAE,EAAE,CACJ;QACE,CAAC,CAAC,KAAK,CAAC,IAAI;QACZ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI;KAChE,CACb,CACF,CAAC;IAEF,IAAI,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC;IAEvC,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,8BAA8B;QAC9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEtD,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1B,iEAAiE;YACjE,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACjC,MAAM;QACR,CAAC;QAED,uDAAuD;QACvD,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,8BAA8B;QAC9B,MAAM,eAAe,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAEvE,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3B,2FAA2F;YAC3F,mDAAmD;YACnD,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,CAAC;gBACrD,IAAI,EAAE,SAAgB;aACvB,CAAC,CAAC;YACH,MAAM;QACR,CAAC;QAED,6BAA6B;QAC7B,MAAM,aAAa,GAAG,iBAAiB,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;QAEvF,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAE;SAC3C,CAAC,CAAC;QAEH,2BAA2B;QAC3B,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/http-server-js",
|
|
3
|
-
"version": "0.58.0-alpha.13-dev.
|
|
3
|
+
"version": "0.58.0-alpha.13-dev.3",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec HTTP server code generator for JavaScript",
|
|
6
6
|
"homepage": "https://github.com/microsoft/typespec",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@typespec/http-specs": "^0.1.0-alpha.17 || >=0.1.0-alpha.18-dev <0.1.0-alpha.18",
|
|
53
53
|
"@typespec/internal-build-utils": "^0.68.0 || >=0.69.0-dev <0.69.0",
|
|
54
54
|
"@typespec/openapi3": "^1.0.0-rc.0",
|
|
55
|
-
"@typespec/spector": "^0.1.0-alpha.
|
|
55
|
+
"@typespec/spector": "^0.1.0-alpha.11 || >=0.1.0-alpha.12-dev <0.1.0-alpha.12",
|
|
56
56
|
"@vitest/coverage-v8": "^3.0.9",
|
|
57
57
|
"@vitest/ui": "^3.0.9",
|
|
58
58
|
"fs-extra": "^11.2.0",
|
package/src/common/enum.ts
CHANGED
|
@@ -21,7 +21,8 @@ export function* emitEnum(ctx: JsContext, enum_: Enum): Iterable<string> {
|
|
|
21
21
|
|
|
22
22
|
for (const member of enum_.members.values()) {
|
|
23
23
|
const nameCase = parseCase(member.name);
|
|
24
|
-
|
|
24
|
+
const value = member.value ?? member.name;
|
|
25
|
+
yield ` ${nameCase.pascalCase} = ${JSON.stringify(value)},`;
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
yield `}`;
|
package/src/common/model.ts
CHANGED
|
@@ -131,9 +131,9 @@ export function emitWellKnownModel(
|
|
|
131
131
|
switch (type.name) {
|
|
132
132
|
case "Record": {
|
|
133
133
|
const arg = type.indexer!.value;
|
|
134
|
-
return `
|
|
134
|
+
return `Record<string, ${emitTypeReference(ctx, arg, type, module, {
|
|
135
135
|
altName: preferredAlternativeName && getRecordValueName(preferredAlternativeName),
|
|
136
|
-
})}
|
|
136
|
+
})}>`;
|
|
137
137
|
}
|
|
138
138
|
case "Array": {
|
|
139
139
|
const arg = type.indexer!.value;
|
package/src/common/reference.ts
CHANGED
|
@@ -231,6 +231,18 @@ export function emitTypeReference(
|
|
|
231
231
|
case "Number":
|
|
232
232
|
case "Boolean":
|
|
233
233
|
return String(type.value);
|
|
234
|
+
case "EnumMember": {
|
|
235
|
+
if (typeof type.value === "string") {
|
|
236
|
+
return escapeUnsafeChars(JSON.stringify(type.value));
|
|
237
|
+
} else if (typeof type.value === "number") {
|
|
238
|
+
return String(type.value);
|
|
239
|
+
} else if (type.value === undefined) {
|
|
240
|
+
return escapeUnsafeChars(JSON.stringify(type.name));
|
|
241
|
+
} else {
|
|
242
|
+
void (type.value satisfies never);
|
|
243
|
+
return "unknown";
|
|
244
|
+
}
|
|
245
|
+
}
|
|
234
246
|
case "Intrinsic":
|
|
235
247
|
switch (type.name) {
|
|
236
248
|
case "never":
|
|
@@ -276,7 +288,13 @@ export function emitTypeReference(
|
|
|
276
288
|
|
|
277
289
|
return typeName;
|
|
278
290
|
}
|
|
279
|
-
case "
|
|
291
|
+
case "Tuple": {
|
|
292
|
+
const elementTypes = type.values.map((e) => emitTypeReference(ctx, e, position, module));
|
|
293
|
+
|
|
294
|
+
return `[${elementTypes.join(", ")}]`;
|
|
295
|
+
}
|
|
296
|
+
case "ModelProperty":
|
|
297
|
+
case "UnionVariant": {
|
|
280
298
|
// Forward to underlying type.
|
|
281
299
|
return emitTypeReference(ctx, type.type, position, module, options);
|
|
282
300
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright (c) Microsoft Corporation
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
|
|
4
|
-
import { Model, NoTarget, Scalar, Type, Union } from "@typespec/compiler";
|
|
4
|
+
import { Enum, Model, NoTarget, Scalar, Type, Union } from "@typespec/compiler";
|
|
5
5
|
import { $ } from "@typespec/compiler/experimental/typekit";
|
|
6
6
|
import { JsContext, Module, completePendingDeclarations } from "../../ctx.js";
|
|
7
7
|
import { UnimplementedError } from "../../util/error.js";
|
|
@@ -10,10 +10,16 @@ import { createOrGetModuleForNamespace } from "../namespace.js";
|
|
|
10
10
|
import { emitTypeReference } from "../reference.js";
|
|
11
11
|
import { emitJsonSerialization, requiresJsonSerialization } from "./json.js";
|
|
12
12
|
|
|
13
|
-
export type SerializableType = Model | Scalar | Union;
|
|
13
|
+
export type SerializableType = Model | Scalar | Union | Enum;
|
|
14
14
|
|
|
15
15
|
export function isSerializableType(t: Type): t is SerializableType {
|
|
16
|
-
return
|
|
16
|
+
return (
|
|
17
|
+
t.kind === "Model" ||
|
|
18
|
+
t.kind === "Scalar" ||
|
|
19
|
+
t.kind === "Union" ||
|
|
20
|
+
t.kind === "Intrinsic" ||
|
|
21
|
+
t.kind === "Enum"
|
|
22
|
+
);
|
|
17
23
|
}
|
|
18
24
|
|
|
19
25
|
export type SerializationContentType = "application/json";
|