@typespec/http-server-js 0.58.0-alpha.15-dev.2 → 0.58.0-alpha.15-dev.4
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 +1 -1
- package/dist/src/common/namespace.d.ts.map +1 -1
- package/dist/src/common/namespace.js +10 -5
- package/dist/src/common/namespace.js.map +1 -1
- package/dist/src/ctx.d.ts.map +1 -1
- package/dist/src/ctx.js +10 -1
- package/dist/src/ctx.js.map +1 -1
- package/dist/src/http/server/index.js +5 -1
- package/dist/src/http/server/index.js.map +1 -1
- package/dist/src/util/case.d.ts.map +1 -1
- package/dist/src/util/case.js +34 -8
- package/dist/src/util/case.js.map +1 -1
- package/package.json +1 -1
- package/src/common/namespace.ts +14 -6
- package/src/ctx.ts +11 -1
- package/src/http/server/index.ts +7 -1
- package/src/util/case.ts +35 -8
- package/temp/tsconfig.tsbuildinfo +1 -1
- package/test/case.test.ts +68 -0
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/common/namespace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAwB,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAEL,SAAS,EACT,MAAM,EAIP,MAAM,WAAW,CAAC;AAInB,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,QA+CjE;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,IAAI,GAAE,MAAkC,GACvC,MAAM,CAoBR;AAED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,MAAM,CAaR;
|
|
1
|
+
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/common/namespace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAwB,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAEL,SAAS,EACT,MAAM,EAIP,MAAM,WAAW,CAAC;AAInB,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,QA+CjE;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,IAAI,GAAE,MAAkC,GACvC,MAAM,CAoBR;AAED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,MAAM,CAaR;AA6GD;;;;;;GAMG;AACH,wBAAiB,cAAc,CAC7B,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GACvB,QAAQ,CAAC,MAAM,CAAC,CASlB"}
|
|
@@ -121,7 +121,7 @@ function computeRelativeFilePath(from, to) {
|
|
|
121
121
|
/**
|
|
122
122
|
* Deduplicates, consolidates, and writes the import statements for a module.
|
|
123
123
|
*/
|
|
124
|
-
function* writeImportsNormalized(ctx, module) {
|
|
124
|
+
function* writeImportsNormalized(ctx, module, queue) {
|
|
125
125
|
const allTargets = new Set();
|
|
126
126
|
const importMap = new Map();
|
|
127
127
|
const starAsMap = new Map();
|
|
@@ -130,9 +130,14 @@ function* writeImportsNormalized(ctx, module) {
|
|
|
130
130
|
// check for same module and continue
|
|
131
131
|
if (_import.from === module)
|
|
132
132
|
continue;
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
133
|
+
let target;
|
|
134
|
+
if (typeof _import.from === "string") {
|
|
135
|
+
target = _import.from;
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
target = computeRelativeFilePath(module, _import.from);
|
|
139
|
+
queue.add(_import.from);
|
|
140
|
+
}
|
|
136
141
|
allTargets.add(target);
|
|
137
142
|
if (typeof _import.binder === "string") {
|
|
138
143
|
if (starAsMap.has(target)) {
|
|
@@ -176,7 +181,7 @@ function* writeImportsNormalized(ctx, module) {
|
|
|
176
181
|
* @param queue - The queue to add any submodules to for later processing.
|
|
177
182
|
*/
|
|
178
183
|
export function* emitModuleBody(ctx, module, queue) {
|
|
179
|
-
yield* writeImportsNormalized(ctx, module);
|
|
184
|
+
yield* writeImportsNormalized(ctx, module, queue);
|
|
180
185
|
if (module.imports.length > 0)
|
|
181
186
|
yield "";
|
|
182
187
|
for (const decl of module.declarations) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/common/namespace.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/common/namespace.ts"],"names":[],"mappings":"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"}
|
package/dist/src/ctx.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../src/ctx.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,IAAI,EACJ,SAAS,EAIT,KAAK,EACL,SAAS,EAET,OAAO,EACP,MAAM,EACN,OAAO,EACP,IAAI,EACJ,KAAK,EACL,YAAY,EACb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAoB,MAAM,UAAU,CAAC;AAG9D,OAAO,EAAmB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC;AAExE;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,eAAe,CAQ9E;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAE1B;;OAEG;IACH,eAAe,EAAE,SAAS,CAAC;IAE3B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;OAIG;IACH,SAAS,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IACtC;;;OAGG;IACH,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB;;;OAGG;IACH,cAAc,EAAE,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAE7C;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IACH,gBAAgB,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACzC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,cAAc,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAE5C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAEjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,qBAAqB,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAA;KAAE,CAAC;CACxE;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"ctx.d.ts","sourceRoot":"","sources":["../../src/ctx.ts"],"names":[],"mappings":"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"}
|
package/dist/src/ctx.js
CHANGED
|
@@ -54,9 +54,18 @@ export async function createInitialContext(program, options) {
|
|
|
54
54
|
};
|
|
55
55
|
const srcModule = createModule("src", rootModule);
|
|
56
56
|
const generatedModule = createModule("generated", srcModule);
|
|
57
|
+
// This dummy module hosts the root of the helper tree. It's not a "real" module
|
|
58
|
+
// because we want the modules to be emitted lazily, but we need some module to
|
|
59
|
+
// pass in to the root helper index.
|
|
60
|
+
const dummyModule = {
|
|
61
|
+
name: "generated",
|
|
62
|
+
cursor: generatedModule.cursor,
|
|
63
|
+
imports: [],
|
|
64
|
+
declarations: [],
|
|
65
|
+
};
|
|
57
66
|
// This has the side effect of setting the `module` property of all helpers.
|
|
58
67
|
// Don't do anything with the emitter code before this is called.
|
|
59
|
-
await initializeHelperModule(
|
|
68
|
+
await initializeHelperModule(dummyModule);
|
|
60
69
|
// Module for all models, including synthetic and all.
|
|
61
70
|
const modelsModule = createModule("models", generatedModule);
|
|
62
71
|
// Module for all types in all namespaces.
|
package/dist/src/ctx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ctx.js","sourceRoot":"","sources":["../../src/ctx.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAElC,OAAO,EACL,cAAc,EAGd,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EAGZ,QAAQ,GAOT,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAEtE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAoB,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAa,MAAM,sBAAsB,CAAC;AAIlE,OAAO,EAAE,YAAY,IAAI,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAI5F;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAc,EAAE,CAAO;IACtD,OAAO,CACL,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO;QACjB,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACjC,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,IAAI,KAAK,MAAM;QACjB,CAAC,CAAC,IAAI,KAAK,WAAW,CACvB,CAAC;AACJ,CAAC;AA0FD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAgB,EAChB,OAAyB;IAEzB,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEvC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,gBAAgB,CAAC,OAAO,EAAE;YACxB,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,kBAAkB,CAAC,2CAA2C,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;IAE3B,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;IAEjE,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IAEtC,MAAM,eAAe,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAEzD,wBAAwB;IACxB,MAAM,UAAU,GAAW;QACzB,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,UAAU;QAElB,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAElD,MAAM,eAAe,GAAG,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAE7D,4EAA4E;IAC5E,iEAAiE;IACjE,MAAM,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"ctx.js","sourceRoot":"","sources":["../../src/ctx.ts"],"names":[],"mappings":"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"}
|
|
@@ -304,7 +304,11 @@ function* emitRawServerOperation(ctx, operation, module, responderNames) {
|
|
|
304
304
|
const paramNameSafe = keywordSafe(paramNameCase.camelCase);
|
|
305
305
|
const isBodyField = bodyFields.has(param.name) && bodyFields.get(param.name) === param.type;
|
|
306
306
|
const isBodyExact = operation.parameters.body?.property === param;
|
|
307
|
-
|
|
307
|
+
const isPathParameter = operation.parameters.parameters.some((p) => p.type === "path" && p.param === param);
|
|
308
|
+
if (isPathParameter) {
|
|
309
|
+
paramBaseExpression = `${paramNameSafe}`;
|
|
310
|
+
}
|
|
311
|
+
else if (isBodyField) {
|
|
308
312
|
paramBaseExpression = `${bodyName}.${paramNameCase.camelCase}`;
|
|
309
313
|
}
|
|
310
314
|
else if (isBodyExact) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/server/index.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAElC,OAAO,EAEL,QAAQ,EAER,cAAc,EACd,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,4BAA4B,CAAC;AAC/C,OAAO,EAGL,kBAAkB,EAClB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,YAAY,GACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAEL,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAU,2BAA2B,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,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,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,GAAgB,EAAE,gBAAwB;IACtE,MAAM,eAAe,GAAG,YAAY,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAErE,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAE,CAAC,aAAa,CAAC;QACvB,IAAI,EAAE,aAAa;KACpB,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3D,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3B,MAAM,EAAE,CAAC,sBAAsB,eAAe,EAAE,EAAE,qBAAqB,gBAAgB,EAAE,CAAC;QAC1F,IAAI,EAAE,WAAW;KAClB,CAAC,CAAC;IAEH,KAAK,MAAM,SAAS,IAAI,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACnD,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC;YAChC,GAAG,sBAAsB,CAAC,GAAG,EAAE,SAAS,EAAE,eAAe,EAAE;gBACzD,eAAe;gBACf,gBAAgB;aACjB,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;;GAKG;AACH,QAAQ,CAAC,CAAC,sBAAsB,CAC9B,GAAgB,EAChB,SAAwB,EACxB,MAAc,EACd,cAAmE;IAEnE,IAAI,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC;IAC7B,MAAM,iBAAiB,GAAG,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,SAAU,CAAC;IAChD,MAAM,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEpD,EAAE,GAAG,yBAAyB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAEhD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAClB,MAAM,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC;QACtC,IAAI,EAAE,6BAA6B,CAAC,GAAG,EAAE,SAAS,CAAC,SAAU,CAAC;KAC/D,CAAC,CAAC;IAEH,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAEjC,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,KAAK;QAC1F,OAAO,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;IAC/B,CAAC,CAAwD,CAAC;IAE1D,MAAM,YAAY,GAAG,WAAW,CAAC,iBAAiB,CAAC,SAAS,GAAG,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAElG,MAAM,KAAK,GAAU;QACnB,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC5B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QACpC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;QACtC,GAAG,cAAc;KAClB,CAAC;IAEF,MAAM,yBAAyB,YAAY,GAAG,CAAC;IAC/C,MAAM,KAAK,KAAK,CAAC,GAAG,gBAAgB,CAAC;IACrC,MAAM,KAAK,KAAK,CAAC,UAAU,KAAK,iBAAiB,CAAC,UAAU,GAAG,CAAC;IAEhE,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACvC,MAAM,KAAK,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,WAAW,CAAC;IAClE,CAAC;IAED,MAAM,oBAAoB,CAAC;IAE3B,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAC5E,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAC/B,CAAC;IAEF,MAAM,WAAW,GAAyD,EAAE,CAAC;IAE7E,MAAM,YAAY,GAAG,IAAI,GAAG,EAAyC,CAAC;IAEtE,KAAK,MAAM,SAAS,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACxD,MAAM,iBAAiB,GACrB,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC;QACzF,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,KAAK,QAAQ;gBACX,KAAK,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,QAAQ;gBACX,MAAM,IAAI,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;YACpD,KAAK,OAAO;gBACV,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5B,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;gBAC/C,MAAM;YACR,KAAK,MAAM;gBACT,yBAAyB;gBACzB,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;gBAC/C,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CACb,+BACG,SAAoD,CAAC,IACxD,EAAE,CACH,CAAC;QACN,CAAC;IACH,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,WAAW,KAAK,CAAC,WAAW,0BAA0B,KAAK,CAAC,GAAG,wCAAwC,CAAC;QAC9G,MAAM,EAAE,CAAC;IACX,CAAC;IAED,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC7B,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO;QAC1E,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAU,CAAC;QACxF,CAAC,CAAC,EAAE,CACP,CAAC;IAEF,IAAI,QAAQ,GAAuB,SAAS,CAAC;IAE7C,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC;QAEvC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC5B,IAAI,EAAE,8BAA8B;gBACpC,MAAM,EAAE,SAAS,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,oBAAoB,CAAC;QAEjE,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,UAAU,GAAG,aAAa,CAAC;QAEzE,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,mBAAmB,CAAC,CAAC;QAE3E,MAAM,YAAY,GAAG,iBAAiB,CACpC,GAAG,EACH,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,SAAS,CAAC,SAAS,EAC1C,MAAM,EACN,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC,CAAC;QAEF,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAE9C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,4BAA4B,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAErF,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEpD,MAAM,WAAW,iBAAiB,iCAAiC,KAAK,CAAC,GAAG,0DAA0D,CAAC;QAEvI,MAAM,SAAS,iBAAiB,eAAe,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC;QAEhF,MAAM,cAAc,KAAK,CAAC,GAAG,kCAAkC,CAAC;QAChE,MAAM,SAAS,KAAK,CAAC,GAAG,GAAG,CAAC;QAC5B,MAAM,SAAS,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;QACjD,MAAM,0CAA0C,iBAAiB,wBAAwB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC;QAC1H,MAAM,QAAQ,CAAC;QAEf,MAAM,KAAK,CAAC;QACZ,MAAM,EAAE,CAAC;QAET,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,8BAA8B,CAAC;YACpC,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAwB,EAAE,kBAAkB,CAAC,CAAC;gBAC7E,MAAM,WAAW,QAAQ,sCAAsC,YAAY,CAAC,UAAU,qBAAqB,CAAC;gBAC5G,MAAM,uCAAuC,CAAC;gBAC9C,MAAM,OAAO,KAAK,CAAC,GAAG,2EAA2E,CAAC;gBAClG,MAAM,OAAO,KAAK,CAAC,GAAG,0CAA0C,CAAC;gBACjE,MAAM,aAAa,CAAC;gBACpB,MAAM,wDAAwD,CAAC;gBAE/D,IAAI,KAAa,CAAC;gBAElB,IAAI,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC3E,MAAM,aAAa,GAAG,iBAAiB,CACrC,GAAG,EACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EACvB,IAAI,CAAC,IAAI,EACT,MAAM,EACN,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC7B,CAAC;wBACF,MAAM,+CAA+C,CAAC;wBACtD,MAAM,4CAA4C,CAAC;wBACnD,MAAM,aAAa,KAAK,CAAC,GAAG,kCAAkC,CAAC;wBAC/D,MAAM,eAAe,KAAK,CAAC,GAAG,GAAG,CAAC;wBAClC,MAAM,eAAe,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;wBACvD,MAAM,oDAAoD,CAAC;wBAC3D,MAAM,cAAc,CAAC;wBACrB,MAAM,4BAA4B,CAAC;wBACnC,MAAM,WAAW,CAAC;wBAClB,KAAK,GAAG,6BAA6B,aAAa,oCAAoC,CAAC;oBACzF,CAAC;yBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;wBACnF,MAAM,aAAa,GAAG,iBAAiB,CACrC,GAAG,EACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EACvB,IAAI,CAAC,IAAI,EACT,MAAM,EACN,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC7B,CAAC;wBAEF,MAAM,gDAAgD,CAAC;wBACvD,MAAM,0EAA0E,CAAC;wBACjF,MAAM,aAAa,KAAK,CAAC,GAAG,kCAAkC,CAAC;wBAC/D,MAAM,eAAe,KAAK,CAAC,GAAG,GAAG,CAAC;wBAClC,MAAM,eAAe,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;wBACvD,MAAM,qDAAqD,CAAC;wBAC5D,MAAM,cAAc,CAAC;wBACrB,MAAM,4BAA4B,CAAC;wBACnC,MAAM,WAAW,CAAC;wBAClB,KAAK,GAAG,+EAA+E,aAAa,2BAA2B,CAAC;oBAClI,CAAC;yBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACvC,KAAK,GAAG,2BAA2B,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;oBAClF,CAAC;yBAAM,CAAC;wBACN,KAAK,GAAG,GAAG,YAAY,mCAAmC,CAAC;oBAC7D,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,kBAAkB,CAAC;gBAC7B,CAAC;gBAED,MAAM,mBAAmB,KAAK,IAAI,CAAC;gBACnC,MAAM,iBAAiB,CAAC;gBACxB,MAAM,WAAW,KAAK,CAAC,GAAG,kCAAkC,CAAC;gBAC7D,MAAM,aAAa,KAAK,CAAC,GAAG,GAAG,CAAC;gBAChC,MAAM,aAAa,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;gBACrD,MAAM,2CAA2C,CAAC;gBAClD,MAAM,YAAY,CAAC;gBACnB,MAAM,mBAAmB,CAAC;gBAC1B,MAAM,SAAS,CAAC;gBAChB,MAAM,SAAS,CAAC;gBAChB,MAAM,OAAO,KAAK,CAAC,GAAG,+BAA+B,CAAC;gBACtD,MAAM,WAAW,YAAY,GAAG,CAAC;gBACjC,MAAM,EAAE,CAAC;gBAET,MAAM;YACR,CAAC;YACD,KAAK,qBAAqB,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;oBAClC,KAAK,CAAC,CAAC,MAAM,CACX,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,CAAC,CAC/E,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;gBACxE,CAAC;gBACD,MAAM;YACR,CAAC;YACD,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACxD,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,cAAc,CACnD,IAAI,CAAC,IAAI,EACT,MAAM,EACN,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAC3B,CAAC;gBACF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,GACR,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI;wBACvB,IAAI,CAAC,IAAI,CAAC,SAAS;wBACnB,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACvC,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;wBAC7E,WAAW,CAAC;oBACd,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;wBAC5B,IAAI,EAAE,yBAAyB;wBAC/B,MAAM,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;wBAClC,MAAM,EAAE;4BACN,SAAS,EAAE,WAAW;4BACtB,IAAI,EAAE,IAAI;yBACX;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,WAAW,QAAQ,sCAAsC,YAAY,CAAC,UAAU,qBAAqB,CAAC;gBAC5G,MAAM,uCAAuC,CAAC;gBAC9C,MAAM,OAAO,KAAK,CAAC,GAAG,2EAA2E,CAAC;gBAClG,MAAM,OAAO,KAAK,CAAC,GAAG,0CAA0C,CAAC;gBACjE,MAAM,aAAa,CAAC;gBACpB,MAAM,wDAAwD,CAAC;gBAC/D,MAAM,wBAAwB,CAAC;gBAC/B,MAAM,qBAAqB,CAAC;gBAC5B,MAAM,WAAW,KAAK,CAAC,GAAG,kCAAkC,CAAC;gBAC7D,MAAM,aAAa,KAAK,CAAC,GAAG,GAAG,CAAC;gBAChC,MAAM,aAAa,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;gBACrD,MAAM,2CAA2C,CAAC;gBAClD,MAAM,YAAY,CAAC;gBACnB,MAAM,oBAAoB,CAAC;gBAC3B,MAAM,SAAS,CAAC;gBAChB,MAAM,SAAS,CAAC;gBAChB,MAAM,OAAO,KAAK,CAAC,GAAG,+BAA+B,CAAC;gBACtD,MAAM,iBAAiB,CAAC;gBACxB,MAAM,EAAE,CAAC;gBACT,MAAM;YACR,CAAC;YACD,KAAK,0BAA0B,CAAC;YAChC;gBACE,CAAC;oBACC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;wBACvD,MAAM,IAAI,GACR,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI;4BACvB,IAAI,CAAC,IAAI,CAAC,SAAS;4BACnB,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BACvC,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;4BAC7E,WAAW,CAAC;wBAEd,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;4BAC5B,IAAI,EAAE,yBAAyB;4BAC/B,MAAM,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;4BAClC,MAAM,EAAE;gCACN,SAAS,EAAE,WAAW;gCACtB,IAAI,EAAE,IAAI;6BACX;yBACF,CAAC,CAAC;oBACL,CAAC;oBACD,MAAM,WAAW,QAAQ,sCAAsC,YAAY,CAAC,UAAU,qBAAqB,CAAC;oBAC5G,MAAM,uCAAuC,CAAC;oBAC9C,MAAM,OAAO,KAAK,CAAC,GAAG,2EAA2E,CAAC;oBAClG,MAAM,OAAO,KAAK,CAAC,GAAG,0CAA0C,CAAC;oBACjE,MAAM,aAAa,CAAC;oBACpB,MAAM,6CAA6C,CAAC;oBACpD,MAAM,wBAAwB,CAAC;oBAC/B,MAAM,qBAAqB,CAAC;oBAC5B,MAAM,oBAAoB,CAAC;oBAC3B,MAAM,SAAS,CAAC;oBAChB,MAAM,SAAS,CAAC;oBAChB,MAAM,OAAO,KAAK,CAAC,GAAG,+BAA+B,CAAC;oBACtD,MAAM,iBAAiB,CAAC;oBACxB,MAAM,EAAE,CAAC;oBACT,MAAM;gBACR,CAAC;gBACD,MAAM,IAAI,kBAAkB,CAAC,8CAA8C,WAAW,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,EAAE,CAAC;IACX,CAAC;IAED,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEjD,MAAM,cAAc,GAAG,EAAE,CAAC;IAE1B,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC/B,IAAI,mBAAmB,CAAC;QACxB,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC;QAC5F,MAAM,WAAW,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,KAAK,KAAK,CAAC;QAClE,IAAI,WAAW,EAAE,CAAC;YAChB,mBAAmB,GAAG,GAAG,QAAQ,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QACjE,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,mBAAmB,GAAG,QAAS,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAEnF,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAE/D,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,kBAAkB,EAAE,CAAC;gBACnE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;gBAErF,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAEvD,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,mBAAmB,GAAG,aAAa,CAAC;YACtC,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,UAAU,GAAG,IAAI,CAAC;YAClB,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAEnE,IAAI,UAAU,EAAE,CAAC;QACf,UAAU,CAAC,IAAI,CACb,KAAK,CAAC,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CACrH,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE;QACzE,OAAO,EAAE,iBAAiB,CAAC,UAAU,GAAG,QAAQ;KACjD,CAAC,CAAC;IAEH,MAAM,SAAS,KAAK,CAAC,MAAM,KAAK,UAAU,GAAG,CAAC;IAC9C,MAAM,EAAE,CAAC;IACT,MAAM,SAAS,CAAC;IAChB,MAAM,OAAO,KAAK,CAAC,MAAM,YAAY,KAAK,CAAC,UAAU,IAAI,iBAAiB,CAAC,SAAS,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC;IACtG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,QAAQ,CAAC;IACf,MAAM,gBAAgB,CAAC;IACvB,MAAM,WAAW,KAAK,CAAC,eAAe,QAAQ,CAAC;IAC/C,MAAM,kBAAkB,KAAK,CAAC,gBAAgB,KAAK,KAAK,CAAC,GAAG,IAAI,CAAC;IACjE,MAAM,qBAAqB,CAAC;IAC5B,MAAM,KAAK,CAAC;IACZ,MAAM,EAAE,CAAC;IAET,KAAK,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvE,MAAM,GAAG,CAAC;IAEV,MAAM,EAAE,CAAC;AACX,CAAC;AAWD;;;;;;;;GAQG;AACH,QAAQ,CAAC,CAAC,oBAAoB,CAC5B,GAAgB,EAChB,KAAY,EACZ,CAAO,EACP,MAAc;IAEd,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACvB,qBAAqB;QACrB,KAAK,CAAC,CAAC,2BAA2B,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAEpD,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE;YAClC,OAAO,EAAE,KAAK,CAAC,MAAM;YACrB,sBAAsB,CAAC,CAAC;gBACtB,OAAO,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;YAC1D,CAAC;YACD,kFAAkF;YAClF,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC;SACxE,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,QAAQ,CAAC,CAAC,2BAA2B,CACnC,GAAgB,EAChB,KAAY,EACZ,MAAY,EACZ,MAAc;IAEd,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,MAAM;gBACT,MAAM,GAAG,KAAK,CAAC,GAAG,6BAA6B,CAAC;gBAChD,MAAM,GAAG,KAAK,CAAC,GAAG,kBAAkB,CAAC;gBACrC,OAAO;YACT,KAAK,MAAM;gBACT,MAAM,GAAG,KAAK,CAAC,GAAG,6BAA6B,CAAC;gBAChD,MAAM,GAAG,KAAK,CAAC,GAAG,0DAA0D,CAAC;gBAC7E,MAAM,GAAG,KAAK,CAAC,GAAG,wBAAwB,CAAC;gBAC3C,OAAO;YACT,KAAK,SAAS;gBACZ,MAAM,GAAG,KAAK,CAAC,GAAG,6BAA6B,CAAC;gBAChD,MAAM,GAAG,KAAK,CAAC,GAAG,0DAA0D,CAAC;gBAC7E,MAAM,GAAG,KAAK,CAAC,GAAG,gCAAgC,KAAK,CAAC,MAAM,KAAK,CAAC;gBACpE,OAAO;YACT,KAAK,OAAO;gBACV,MAAM,UAAU,KAAK,CAAC,GAAG,kCAAkC,KAAK,CAAC,GAAG,8BAA8B,CAAC;gBACnG,OAAO;YACT;gBACE,MAAM,IAAI,kBAAkB,CAAC,yCAAyC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1F,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,IAAI,kBAAkB,CAAC,oCAAoC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAEjF,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;QAClD,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC7D,MAAM,GAAG,KAAK,CAAC,GAAG,uBAAuB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC;YAC7I,IAAI,CAAC,IAAI;gBAAE,MAAM,WAAW,KAAK,CAAC,MAAM,YAAY,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC;QAC5F,CAAC;aAAM,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC/C,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;wBAC5B,IAAI,EAAE,yBAAyB;wBAC/B,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAE;4BACN,IAAI,EAAE,QAAQ,CAAC,IAAI;yBACpB;qBACF,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,+BAA+B,CAAC,CAAC;gBAEjF,MAAM,GAAG,KAAK,CAAC,GAAG,0BAA0B,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,KAAK,CAAC,GAAG,0BAA0B,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC;gBAClG,IAAI,CAAC,IAAI;oBAAE,MAAM,WAAW,KAAK,CAAC,MAAM,YAAY,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC;YAC5F,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,oBAAoB,GACxB,CAAC,IAAI;QACL,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1C,OAAO,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IAEL,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,qBAAqB,GAAG,uBAAuB,CACnD,GAAG,EACH,MAAM,EACN,IAAI,CAAC,IAAI,EACT,kBAAkB,CACnB,CAAC;QACF,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEzD,MAAM,GAAG,KAAK,CAAC,GAAG,0DAA0D,CAAC;QAE7E,IAAI,qBAAqB,EAAE,CAAC;YAC1B,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;gBACpE,kBAAkB,EAAE,IAAI;aACzB,CAAC,CAAC;YACH,MAAM,GAAG,KAAK,CAAC,GAAG,gCAAgC,aAAa,iBAAiB,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS,KAAK,CAAC;QAC1H,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,KAAK,CAAC,GAAG,gCAAgC,KAAK,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS,KAAK,CAAC;QAC5F,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,oBAAoB,EAAE,CAAC;YACzB,MAAM,GAAG,KAAK,CAAC,GAAG,kBAAkB,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,MAAM,qBAAqB,GAAG,uBAAuB,CACnD,GAAG,EACH,MAAM,EACN,MAAM,EACN,kBAAkB,CACnB,CAAC;YACF,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;YAEtD,MAAM,GAAG,KAAK,CAAC,GAAG,0DAA0D,CAAC;YAE7E,IAAI,qBAAqB,EAAE,CAAC;gBAC1B,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;oBACnE,kBAAkB,EAAE,IAAI;iBACzB,CAAC,CAAC;gBACH,MAAM,GAAG,KAAK,CAAC,GAAG,gCAAgC,aAAa,iBAAiB,KAAK,CAAC,MAAM,OAAO,aAAa,MAAM,CAAC;YACzH,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,KAAK,CAAC,GAAG,gCAAgC,KAAK,CAAC,MAAM,KAAK,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,QAAQ,CAAC,CAAC,sBAAsB,CAC9B,GAAgB,EAChB,SAAwB,EACxB,KAAY,EACZ,SAA8D;IAE9D,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAEhD,sDAAsD;IACtD,+CAA+C;IAC/C,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,KAAK,YAAY,CAAC;IAEvD,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC;IAEjE,MAAM,SAAS,IAAI,MAAM,KAAK,CAAC,GAAG,oBAAoB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,SAAS,GAAG,CAAC;IAEjG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,OAAO,IAAI,mBAAmB,CAAC;QACrC,kBAAkB;QAClB,MAAM,YAAY,KAAK,CAAC,GAAG,mCAAmC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,+BAA+B,UAAU,MAAM,CAAC;QAC1J,MAAM,GAAG,CAAC;QACV,MAAM,EAAE,CAAC;IACX,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,QAAQ,CAAC,CAAC,qBAAqB,CAC7B,GAAgB,EAChB,SAAwB,EACxB,KAAY,EACZ,SAA6D;IAE7D,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEjD,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAE7C,uFAAuF;IACvF,MAAM,SAAS,IAAI,MAAM,KAAK,CAAC,WAAW,QAAQ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;IAElG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,QAAQ,IAAI,KAAK,CAAC;QACxB,MAAM,YAAY,KAAK,CAAC,GAAG,mCAAmC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,wCAAwC,SAAS,CAAC,IAAI,MAAM,CAAC;QACvK,MAAM,GAAG,CAAC;QACV,MAAM,EAAE,CAAC;IACX,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case.d.ts","sourceRoot":"","sources":["../../../src/util/case.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"case.d.ts","sourceRoot":"","sources":["../../../src/util/case.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQnD;AAID;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAOpE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAuD9C;AAED;;GAEG;AACH,MAAM,WAAW,MAAO,SAAQ,WAAW;IACzC;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AAED,UAAU,WAAW;IACnB;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC"}
|
package/dist/src/util/case.js
CHANGED
|
@@ -4,6 +4,10 @@
|
|
|
4
4
|
* Separators recognized by the case parser.
|
|
5
5
|
*/
|
|
6
6
|
const SEPARATORS = /[\s:_\-./\\]/;
|
|
7
|
+
/**
|
|
8
|
+
* Separators that are considered unspeakable.
|
|
9
|
+
*/
|
|
10
|
+
const UNSPEAKABLE_SEPARATORS = /[\s:\-./\\]/;
|
|
7
11
|
/**
|
|
8
12
|
* Returns true if a name cannot be spoken. A name is unspeakable if:
|
|
9
13
|
*
|
|
@@ -18,7 +22,7 @@ const SEPARATORS = /[\s:_\-./\\]/;
|
|
|
18
22
|
*/
|
|
19
23
|
export function isUnspeakable(name) {
|
|
20
24
|
for (const c of name) {
|
|
21
|
-
if (!
|
|
25
|
+
if (!UNSPEAKABLE_SEPARATORS.test(c)) {
|
|
22
26
|
return /[0-9]/.test(c);
|
|
23
27
|
}
|
|
24
28
|
}
|
|
@@ -63,6 +67,7 @@ export function parseCase(name) {
|
|
|
63
67
|
const components = [];
|
|
64
68
|
let currentComponent = "";
|
|
65
69
|
let inAcronym = false;
|
|
70
|
+
let inLeadingUnderscore = false;
|
|
66
71
|
for (let i = 0; i < name.length; i++) {
|
|
67
72
|
const char = name[i];
|
|
68
73
|
// cSpell:ignore presponse
|
|
@@ -73,11 +78,22 @@ export function parseCase(name) {
|
|
|
73
78
|
// : "OpenAIContext" => ["open", "ai", "context"]
|
|
74
79
|
// but : "HTTPresponse" (wrong) => ["htt", "presponse"]
|
|
75
80
|
// however : "HTTP_response" (okay I guess) => ["http", "response"]
|
|
81
|
+
// allow leading underscores to be part of the first component
|
|
82
|
+
if (!components.length && char === "_") {
|
|
83
|
+
inLeadingUnderscore = true;
|
|
84
|
+
currentComponent += char;
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
else if (inLeadingUnderscore && char !== "_") {
|
|
88
|
+
inLeadingUnderscore = false;
|
|
89
|
+
components.push(currentComponent);
|
|
90
|
+
currentComponent = "";
|
|
91
|
+
}
|
|
76
92
|
// If the character is a separator or an upper case character, we push the current component and start a new one.
|
|
77
93
|
if (char === char.toUpperCase() && !/[0-9]/.test(char)) {
|
|
78
94
|
// If we're in an acronym, we need to check if the next character is lower case.
|
|
79
95
|
// If it is, then this is the start of a new component.
|
|
80
|
-
const acronymRestart = inAcronym && /[A-Z]/.test(char) && i + 1 < name.length && /[
|
|
96
|
+
const acronymRestart = inAcronym && /[A-Z]/.test(char) && i + 1 < name.length && /[a-z]/.test(name[i + 1]);
|
|
81
97
|
if (currentComponent.length > 0 && (acronymRestart || !inAcronym)) {
|
|
82
98
|
components.push(currentComponent.trim());
|
|
83
99
|
currentComponent = "";
|
|
@@ -94,6 +110,14 @@ export function parseCase(name) {
|
|
|
94
110
|
return recase(components);
|
|
95
111
|
}
|
|
96
112
|
function recase(components) {
|
|
113
|
+
const hasLeadingUnderscores = components.length > 0 && components[0].startsWith("_");
|
|
114
|
+
function joinComponents(joiner) {
|
|
115
|
+
if (hasLeadingUnderscores) {
|
|
116
|
+
// The first component contains the leading underscores, so no need to add one.
|
|
117
|
+
return `${components[0]}${components.slice(1).join(joiner)}`;
|
|
118
|
+
}
|
|
119
|
+
return components.join(joiner);
|
|
120
|
+
}
|
|
97
121
|
return Object.freeze({
|
|
98
122
|
components,
|
|
99
123
|
get pascalCase() {
|
|
@@ -103,26 +127,28 @@ function recase(components) {
|
|
|
103
127
|
},
|
|
104
128
|
get camelCase() {
|
|
105
129
|
return components
|
|
106
|
-
.map((component, index) => index === 0
|
|
130
|
+
.map((component, index) => index === 0 || (hasLeadingUnderscores && index === 1)
|
|
131
|
+
? component
|
|
132
|
+
: component[0].toUpperCase() + component.slice(1))
|
|
107
133
|
.join("");
|
|
108
134
|
},
|
|
109
135
|
get snakeCase() {
|
|
110
|
-
return
|
|
136
|
+
return joinComponents("_");
|
|
111
137
|
},
|
|
112
138
|
get kebabCase() {
|
|
113
|
-
return
|
|
139
|
+
return joinComponents("-");
|
|
114
140
|
},
|
|
115
141
|
get dotCase() {
|
|
116
|
-
return
|
|
142
|
+
return joinComponents(".");
|
|
117
143
|
},
|
|
118
144
|
get pathCase() {
|
|
119
|
-
return
|
|
145
|
+
return joinComponents("/");
|
|
120
146
|
},
|
|
121
147
|
get upper() {
|
|
122
148
|
return recase(components.map((component) => component.toUpperCase()));
|
|
123
149
|
},
|
|
124
150
|
join(separator) {
|
|
125
|
-
return
|
|
151
|
+
return joinComponents(separator);
|
|
126
152
|
},
|
|
127
153
|
});
|
|
128
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case.js","sourceRoot":"","sources":["../../../src/util/case.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kCAAkC;AAElC;;GAEG;AACH,MAAM,UAAU,GAAG,cAAc,CAAC;AAElC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"case.js","sourceRoot":"","sources":["../../../src/util/case.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/http-server-js",
|
|
3
|
-
"version": "0.58.0-alpha.15-dev.
|
|
3
|
+
"version": "0.58.0-alpha.15-dev.4",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec HTTP server code generator for JavaScript",
|
|
6
6
|
"homepage": "https://github.com/microsoft/typespec",
|
package/src/common/namespace.ts
CHANGED
|
@@ -180,7 +180,11 @@ function computeRelativeFilePath(from: Module, to: Module): string {
|
|
|
180
180
|
/**
|
|
181
181
|
* Deduplicates, consolidates, and writes the import statements for a module.
|
|
182
182
|
*/
|
|
183
|
-
function* writeImportsNormalized(
|
|
183
|
+
function* writeImportsNormalized(
|
|
184
|
+
ctx: JsContext,
|
|
185
|
+
module: Module,
|
|
186
|
+
queue: OnceQueue<Module>,
|
|
187
|
+
): Iterable<string> {
|
|
184
188
|
const allTargets = new Set<string>();
|
|
185
189
|
const importMap = new Map<string, Set<string>>();
|
|
186
190
|
const starAsMap = new Map<string, string>();
|
|
@@ -190,10 +194,14 @@ function* writeImportsNormalized(ctx: JsContext, module: Module): Iterable<strin
|
|
|
190
194
|
// check for same module and continue
|
|
191
195
|
if (_import.from === module) continue;
|
|
192
196
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
+
let target: string;
|
|
198
|
+
|
|
199
|
+
if (typeof _import.from === "string") {
|
|
200
|
+
target = _import.from;
|
|
201
|
+
} else {
|
|
202
|
+
target = computeRelativeFilePath(module, _import.from);
|
|
203
|
+
queue.add(_import.from);
|
|
204
|
+
}
|
|
197
205
|
|
|
198
206
|
allTargets.add(target);
|
|
199
207
|
|
|
@@ -244,7 +252,7 @@ export function* emitModuleBody(
|
|
|
244
252
|
module: Module,
|
|
245
253
|
queue: OnceQueue<Module>,
|
|
246
254
|
): Iterable<string> {
|
|
247
|
-
yield* writeImportsNormalized(ctx, module);
|
|
255
|
+
yield* writeImportsNormalized(ctx, module, queue);
|
|
248
256
|
|
|
249
257
|
if (module.imports.length > 0) yield "";
|
|
250
258
|
|
package/src/ctx.ts
CHANGED
|
@@ -181,9 +181,19 @@ export async function createInitialContext(
|
|
|
181
181
|
|
|
182
182
|
const generatedModule = createModule("generated", srcModule);
|
|
183
183
|
|
|
184
|
+
// This dummy module hosts the root of the helper tree. It's not a "real" module
|
|
185
|
+
// because we want the modules to be emitted lazily, but we need some module to
|
|
186
|
+
// pass in to the root helper index.
|
|
187
|
+
const dummyModule: Module = {
|
|
188
|
+
name: "generated",
|
|
189
|
+
cursor: generatedModule.cursor,
|
|
190
|
+
imports: [],
|
|
191
|
+
declarations: [],
|
|
192
|
+
};
|
|
193
|
+
|
|
184
194
|
// This has the side effect of setting the `module` property of all helpers.
|
|
185
195
|
// Don't do anything with the emitter code before this is called.
|
|
186
|
-
await initializeHelperModule(
|
|
196
|
+
await initializeHelperModule(dummyModule);
|
|
187
197
|
|
|
188
198
|
// Module for all models, including synthetic and all.
|
|
189
199
|
const modelsModule: Module = createModule("models", generatedModule);
|
package/src/http/server/index.ts
CHANGED
|
@@ -416,7 +416,13 @@ function* emitRawServerOperation(
|
|
|
416
416
|
const paramNameSafe = keywordSafe(paramNameCase.camelCase);
|
|
417
417
|
const isBodyField = bodyFields.has(param.name) && bodyFields.get(param.name) === param.type;
|
|
418
418
|
const isBodyExact = operation.parameters.body?.property === param;
|
|
419
|
-
|
|
419
|
+
const isPathParameter = operation.parameters.parameters.some(
|
|
420
|
+
(p) => p.type === "path" && p.param === param,
|
|
421
|
+
);
|
|
422
|
+
|
|
423
|
+
if (isPathParameter) {
|
|
424
|
+
paramBaseExpression = `${paramNameSafe}`;
|
|
425
|
+
} else if (isBodyField) {
|
|
420
426
|
paramBaseExpression = `${bodyName}.${paramNameCase.camelCase}`;
|
|
421
427
|
} else if (isBodyExact) {
|
|
422
428
|
paramBaseExpression = bodyName!;
|
package/src/util/case.ts
CHANGED
|
@@ -6,6 +6,11 @@
|
|
|
6
6
|
*/
|
|
7
7
|
const SEPARATORS = /[\s:_\-./\\]/;
|
|
8
8
|
|
|
9
|
+
/**
|
|
10
|
+
* Separators that are considered unspeakable.
|
|
11
|
+
*/
|
|
12
|
+
const UNSPEAKABLE_SEPARATORS = /[\s:\-./\\]/;
|
|
13
|
+
|
|
9
14
|
/**
|
|
10
15
|
* Returns true if a name cannot be spoken. A name is unspeakable if:
|
|
11
16
|
*
|
|
@@ -20,7 +25,7 @@ const SEPARATORS = /[\s:_\-./\\]/;
|
|
|
20
25
|
*/
|
|
21
26
|
export function isUnspeakable(name: string): boolean {
|
|
22
27
|
for (const c of name) {
|
|
23
|
-
if (!
|
|
28
|
+
if (!UNSPEAKABLE_SEPARATORS.test(c)) {
|
|
24
29
|
return /[0-9]/.test(c);
|
|
25
30
|
}
|
|
26
31
|
}
|
|
@@ -69,6 +74,7 @@ export function parseCase(name: string): ReCase {
|
|
|
69
74
|
|
|
70
75
|
let currentComponent = "";
|
|
71
76
|
let inAcronym = false;
|
|
77
|
+
let inLeadingUnderscore = false;
|
|
72
78
|
|
|
73
79
|
for (let i = 0; i < name.length; i++) {
|
|
74
80
|
const char = name[i];
|
|
@@ -82,12 +88,23 @@ export function parseCase(name: string): ReCase {
|
|
|
82
88
|
// but : "HTTPresponse" (wrong) => ["htt", "presponse"]
|
|
83
89
|
// however : "HTTP_response" (okay I guess) => ["http", "response"]
|
|
84
90
|
|
|
91
|
+
// allow leading underscores to be part of the first component
|
|
92
|
+
if (!components.length && char === "_") {
|
|
93
|
+
inLeadingUnderscore = true;
|
|
94
|
+
currentComponent += char;
|
|
95
|
+
continue;
|
|
96
|
+
} else if (inLeadingUnderscore && char !== "_") {
|
|
97
|
+
inLeadingUnderscore = false;
|
|
98
|
+
components.push(currentComponent);
|
|
99
|
+
currentComponent = "";
|
|
100
|
+
}
|
|
101
|
+
|
|
85
102
|
// If the character is a separator or an upper case character, we push the current component and start a new one.
|
|
86
103
|
if (char === char.toUpperCase() && !/[0-9]/.test(char)) {
|
|
87
104
|
// If we're in an acronym, we need to check if the next character is lower case.
|
|
88
105
|
// If it is, then this is the start of a new component.
|
|
89
106
|
const acronymRestart =
|
|
90
|
-
inAcronym && /[A-Z]/.test(char) && i + 1 < name.length && /[
|
|
107
|
+
inAcronym && /[A-Z]/.test(char) && i + 1 < name.length && /[a-z]/.test(name[i + 1]);
|
|
91
108
|
|
|
92
109
|
if (currentComponent.length > 0 && (acronymRestart || !inAcronym)) {
|
|
93
110
|
components.push(currentComponent.trim());
|
|
@@ -163,6 +180,14 @@ interface ReCaseUpper {
|
|
|
163
180
|
}
|
|
164
181
|
|
|
165
182
|
function recase(components: readonly string[]): ReCase {
|
|
183
|
+
const hasLeadingUnderscores = components.length > 0 && components[0].startsWith("_");
|
|
184
|
+
function joinComponents(joiner: string): string {
|
|
185
|
+
if (hasLeadingUnderscores) {
|
|
186
|
+
// The first component contains the leading underscores, so no need to add one.
|
|
187
|
+
return `${components[0]}${components.slice(1).join(joiner)}`;
|
|
188
|
+
}
|
|
189
|
+
return components.join(joiner);
|
|
190
|
+
}
|
|
166
191
|
return Object.freeze({
|
|
167
192
|
components,
|
|
168
193
|
get pascalCase() {
|
|
@@ -173,21 +198,23 @@ function recase(components: readonly string[]): ReCase {
|
|
|
173
198
|
get camelCase() {
|
|
174
199
|
return components
|
|
175
200
|
.map((component, index) =>
|
|
176
|
-
index === 0
|
|
201
|
+
index === 0 || (hasLeadingUnderscores && index === 1)
|
|
202
|
+
? component
|
|
203
|
+
: component[0].toUpperCase() + component.slice(1),
|
|
177
204
|
)
|
|
178
205
|
.join("");
|
|
179
206
|
},
|
|
180
207
|
get snakeCase() {
|
|
181
|
-
return
|
|
208
|
+
return joinComponents("_");
|
|
182
209
|
},
|
|
183
210
|
get kebabCase() {
|
|
184
|
-
return
|
|
211
|
+
return joinComponents("-");
|
|
185
212
|
},
|
|
186
213
|
get dotCase() {
|
|
187
|
-
return
|
|
214
|
+
return joinComponents(".");
|
|
188
215
|
},
|
|
189
216
|
get pathCase() {
|
|
190
|
-
return
|
|
217
|
+
return joinComponents("/");
|
|
191
218
|
},
|
|
192
219
|
|
|
193
220
|
get upper() {
|
|
@@ -195,7 +222,7 @@ function recase(components: readonly string[]): ReCase {
|
|
|
195
222
|
},
|
|
196
223
|
|
|
197
224
|
join(separator: string) {
|
|
198
|
-
return
|
|
225
|
+
return joinComponents(separator);
|
|
199
226
|
},
|
|
200
227
|
});
|
|
201
228
|
}
|