typespec-typescript-emitter 2.1.0 → 2.3.0
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/CHANGELOG.md +14 -21
- package/README.md +4 -0
- package/dist/src/emit_routedTypemap.js +8 -7
- package/dist/src/emit_routedTypemap.js.map +1 -1
- package/dist/src/emit_types.js +6 -5
- package/dist/src/emit_types.js.map +1 -1
- package/dist/src/helpers/getImports.d.ts +1 -1
- package/dist/src/helpers/getImports.js +1 -1
- package/dist/src/helpers/getImports.js.map +1 -1
- package/dist/src/helpers/namespaces.d.ts +1 -1
- package/dist/src/helpers/namespaces.js +1 -1
- package/dist/src/helpers/namespaces.js.map +1 -1
- package/dist/src/helpers/visibilityHelperFile.d.ts +1 -1
- package/dist/src/helpers/visibilityHelperFile.js +2 -2
- package/dist/src/helpers/visibilityHelperFile.js.map +1 -1
- package/dist/src/lib.d.ts +2 -0
- package/dist/src/lib.js +7 -3
- package/dist/src/lib.js.map +1 -1
- package/dist/src/resolve/operationTypemap.d.ts +4 -0
- package/dist/src/resolve/operationTypemap.js +31 -0
- package/dist/src/resolve/operationTypemap.js.map +1 -1
- package/package.json +1 -1
- package/src/emit_routedTypemap.ts +13 -7
- package/src/emit_types.ts +8 -5
- package/src/helpers/getImports.ts +3 -1
- package/src/helpers/namespaces.ts +4 -2
- package/src/helpers/visibilityHelperFile.ts +3 -2
- package/src/lib.ts +19 -3
- package/src/resolve/operationTypemap.ts +49 -1
- package/test/helpers/wrapper.ts +2 -0
- package/test/typemap/typemap-novis.target.ts +3 -3
- package/test/typemap/typemap.target.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,47 +1,40 @@
|
|
|
1
|
-
# [2.
|
|
1
|
+
# [2.3.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v2.2.0...v2.3.0) (2026-01-15)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* proper comma-separation of props in routed typemap ([0e27831](https://github.com/crowbait/typespec-typescript-emitter/commit/0e278310dbb705b59b40fa933449e058d83950fb))
|
|
2
7
|
|
|
3
8
|
|
|
4
9
|
### Features
|
|
5
10
|
|
|
6
|
-
*
|
|
11
|
+
* option to emit path params types in routed typemap ([38b4ddf](https://github.com/crowbait/typespec-typescript-emitter/commit/38b4ddf8a2ff9d1a356b4bf76c9c7d3abe4fac1b))
|
|
7
12
|
|
|
8
13
|
|
|
9
14
|
|
|
10
|
-
|
|
15
|
+
# [2.2.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v2.1.0...v2.2.0) (2026-01-14)
|
|
11
16
|
|
|
12
17
|
|
|
18
|
+
### Features
|
|
13
19
|
|
|
14
|
-
|
|
20
|
+
* option to enabled/disable .ts file extensions on import statements ([c6a423e](https://github.com/crowbait/typespec-typescript-emitter/commit/c6a423e73139a35b36f8c413431f408a09dd9d89))
|
|
15
21
|
|
|
16
22
|
|
|
17
|
-
### Bug Fixes
|
|
18
23
|
|
|
19
|
-
|
|
20
|
-
* false warning on resolving scalars, related to [#10](https://github.com/crowbait/typespec-typescript-emitter/issues/10) ([95f9ec2](https://github.com/crowbait/typespec-typescript-emitter/commit/95f9ec2b1b214ad5997bb1c25829dc7969975f33))
|
|
21
|
-
* handle prev. unhandled types / typeguards (enum, enum-member, template-parameter) ([9baefd8](https://github.com/crowbait/typespec-typescript-emitter/commit/9baefd86c1532e66971a51084a330e5e94ac82f7))
|
|
22
|
-
* lifecycle-related imports, type parameters and typeguard signatures now omitted if type does not have visibility , related to [#14](https://github.com/crowbait/typespec-typescript-emitter/issues/14) ([32069c0](https://github.com/crowbait/typespec-typescript-emitter/commit/32069c004011365b1d82132d9a08ff965dc693e2))
|
|
23
|
-
* nominal-enums option should not use member names as values if an actual value exists ([6d9f870](https://github.com/crowbait/typespec-typescript-emitter/commit/6d9f870ac01680883719b6d4be4c081f4049e16c))
|
|
24
|
-
* special handling for intrinsic `void`, `unknown`, `never`, closes [#13](https://github.com/crowbait/typespec-typescript-emitter/issues/13) ([71595f9](https://github.com/crowbait/typespec-typescript-emitter/commit/71595f9794cb9508c8cb46694189e5e82fed9610))
|
|
25
|
-
* support "unknown" in typeguards ([4ea3054](https://github.com/crowbait/typespec-typescript-emitter/commit/4ea3054fa2536a5bdd3f9745a9d32fb52ff56a68))
|
|
26
|
-
* type order in emitted files now: enum -> model (type) -> union (type) , related to [#14](https://github.com/crowbait/typespec-typescript-emitter/issues/14) ([8eb6833](https://github.com/crowbait/typespec-typescript-emitter/commit/8eb6833b7a67458aa8777280445263a6fc41f8ee))
|
|
24
|
+
# [2.1.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v2.0.1...v2.1.0) (2025-12-18)
|
|
27
25
|
|
|
28
26
|
|
|
29
27
|
### Features
|
|
30
28
|
|
|
31
|
-
* (
|
|
32
|
-
* declared scalars (`scalar X extends string`) are now resolved and emitted as well ([224ac68](https://github.com/crowbait/typespec-typescript-emitter/commit/224ac68e66a3984facc45fb5fce92f5a01472a89))
|
|
33
|
-
* support `extends` on models ([dfb8f8b](https://github.com/crowbait/typespec-typescript-emitter/commit/dfb8f8b34752b851f4e5f12ce83a3e3120e0209a))
|
|
34
|
-
* visibility system ([adb28ab](https://github.com/crowbait/typespec-typescript-emitter/commit/adb28abdeb87ae99622302126633381a477c8247)), closes [#12](https://github.com/crowbait/typespec-typescript-emitter/issues/12) [#7](https://github.com/crowbait/typespec-typescript-emitter/issues/7)
|
|
29
|
+
* overridable types + typeguards, closes [#15](https://github.com/crowbait/typespec-typescript-emitter/issues/15) ([71a6fef](https://github.com/crowbait/typespec-typescript-emitter/commit/71a6fef82569a4d378e1ba3c4e9dd94a2e6ccc80))
|
|
35
30
|
|
|
36
31
|
|
|
37
32
|
|
|
38
|
-
|
|
33
|
+
## [2.0.1](https://github.com/crowbait/typespec-typescript-emitter/compare/v1.3.0...v2.0.1) (2025-11-30)
|
|
39
34
|
|
|
40
35
|
|
|
41
|
-
### Features
|
|
42
36
|
|
|
43
|
-
|
|
44
|
-
* string-nominal-enums ([a0b572c](https://github.com/crowbait/typespec-typescript-emitter/commit/a0b572c2f19baa5d100663458f2ea1ad182b4323))
|
|
37
|
+
# [1.3.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v2.0.0...v1.3.0) (2025-11-30)
|
|
45
38
|
|
|
46
39
|
|
|
47
40
|
|
package/README.md
CHANGED
|
@@ -52,6 +52,8 @@ options:
|
|
|
52
52
|
enable-typeguards: false
|
|
53
53
|
enable-routes: false
|
|
54
54
|
enable-routed-typemap: false
|
|
55
|
+
enable-routed-path-params: false
|
|
56
|
+
import-file-extensions: false
|
|
55
57
|
string-nominal-enums: false
|
|
56
58
|
serializable-date-types: false
|
|
57
59
|
```
|
|
@@ -64,6 +66,8 @@ The following options are available:
|
|
|
64
66
|
- `enable-typeguards` (default: false, **requires** `enable-types`): enables output of [typeguards](#typeguards).
|
|
65
67
|
- `enable-routes` (default: false): enables output of the [HTTP-routes object](#emitter-routes).
|
|
66
68
|
- `enable-routed-typemap` (default: false, **requires** `enable-types`): enables output of an [indexable type](#emitter-routed-typemap), mapping paths and HTTP verbs to request and response bodies.
|
|
69
|
+
- `enable-routed-path-params` (default: false, **requires** `enable-routed-typemap`): includes a `pathParams` object in the routed typemap for each operation.
|
|
70
|
+
- `import-file-extensions` (default: false): if true, import statements get the `.ts` extension, otherwise, the file extension is omitted for import statements.
|
|
67
71
|
- `string-nominal-enums` (default: false): outputs member names as strings instead of index values for enum members declared without explicit values.
|
|
68
72
|
- `serializable-date-types` (default: false): outputs serializable types for typespec's dates types that match OpenApi spec. Types like `offsetDateTime`, `plainDate` and `utcDateTime` will be emitted as `string` and `unixTimestamp32` as `number`. If disabled, all these types resolve to `Date`.
|
|
69
73
|
- `type-mappings` (default: undefined): see [Overriding Types \& Typeguards](#overriding-types--typeguards)
|
|
@@ -49,9 +49,9 @@ export const emitRoutedTypemap = async (program, options, typemap) => {
|
|
|
49
49
|
}
|
|
50
50
|
// emitting
|
|
51
51
|
for (const ns of Object.entries(namespaceOps)) {
|
|
52
|
-
const importStrings = getImports(unique2D(namespaceImports[ns[0]]));
|
|
52
|
+
const importStrings = getImports(unique2D(namespaceImports[ns[0]]), options["import-file-extensions"]);
|
|
53
53
|
if (ns[1].hasVisibility) {
|
|
54
|
-
importStrings.push(`import {Lifecycle, FilterLifecycle} from './${visibilityHelperFileName}';`);
|
|
54
|
+
importStrings.push(`import {Lifecycle, FilterLifecycle} from './${visibilityHelperFileName(options["import-file-extensions"])}';`);
|
|
55
55
|
}
|
|
56
56
|
let out = `export type types_${ns[0]}${ns[1].hasVisibility ? "<V extends Lifecycle = Lifecycle.All>" : ""} = {\n`;
|
|
57
57
|
out += Object.entries(ns[1].ops)
|
|
@@ -59,11 +59,12 @@ export const emitRoutedTypemap = async (program, options, typemap) => {
|
|
|
59
59
|
let pathret = ` ['${path[0]}']: {\n`;
|
|
60
60
|
pathret += Object.entries(path[1])
|
|
61
61
|
.map((verb) => {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
verbret
|
|
66
|
-
|
|
62
|
+
const verbret = [];
|
|
63
|
+
if (options["enable-routed-path-params"])
|
|
64
|
+
verbret.push(` pathParams: ${verb[1].parameters.content}`);
|
|
65
|
+
verbret.push(` request: ${verb[1].request.content}`);
|
|
66
|
+
verbret.push(` response: ${verb[1].response.content.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}`);
|
|
67
|
+
return ` ['${verb[0]}']: {\n${verbret.join(",\n")}\n }`;
|
|
67
68
|
})
|
|
68
69
|
.join(",\n");
|
|
69
70
|
pathret += "\n }";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit_routedTypemap.js","sourceRoot":"","sources":["../../src/emit_routedTypemap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"emit_routedTypemap.js","sourceRoot":"","sources":["../../src/emit_routedTypemap.ts"],"names":[],"mappings":"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"}
|
package/dist/src/emit_types.js
CHANGED
|
@@ -14,8 +14,8 @@ export const emitTypes = async (program, options, typemap) => {
|
|
|
14
14
|
const imports = {};
|
|
15
15
|
// generate files
|
|
16
16
|
typemap.forEach((t) => {
|
|
17
|
-
files[filenameFromNamespaces(t.namespaces)] = new AppendableString();
|
|
18
|
-
imports[filenameFromNamespaces(t.namespaces)] = {
|
|
17
|
+
files[filenameFromNamespaces(t.namespaces, true)] = new AppendableString();
|
|
18
|
+
imports[filenameFromNamespaces(t.namespaces, true)] = {
|
|
19
19
|
namespaces: [],
|
|
20
20
|
lifecycleTypes: [],
|
|
21
21
|
};
|
|
@@ -25,7 +25,7 @@ export const emitTypes = async (program, options, typemap) => {
|
|
|
25
25
|
// resolve all types
|
|
26
26
|
for (let i = 0; i < typemap.length; i++) {
|
|
27
27
|
const t = typemap[i];
|
|
28
|
-
const filename = filenameFromNamespaces(t.namespaces);
|
|
28
|
+
const filename = filenameFromNamespaces(t.namespaces, true);
|
|
29
29
|
const resolved = await Resolvable.resolve(Resolver.Type, t.type, {
|
|
30
30
|
program,
|
|
31
31
|
options,
|
|
@@ -104,9 +104,10 @@ export const emitTypes = async (program, options, typemap) => {
|
|
|
104
104
|
continue;
|
|
105
105
|
const filename = filesArr[i][0];
|
|
106
106
|
imports[filename].namespaces = unique2D(imports[filename].namespaces);
|
|
107
|
-
const importStrings = getImports(imports[filename].namespaces.filter((i) => filenameFromNamespaces(i) !==
|
|
107
|
+
const importStrings = getImports(imports[filename].namespaces.filter((i) => filenameFromNamespaces(i, options["import-file-extensions"]) !==
|
|
108
|
+
filename), options["import-file-extensions"]);
|
|
108
109
|
if (imports[filename].lifecycleTypes.length > 0) {
|
|
109
|
-
importStrings.push(`import {${[...new Set(imports[filename].lifecycleTypes)].join(", ")}} from './${visibilityHelperFileName}';`); // unique-ify
|
|
110
|
+
importStrings.push(`import {${[...new Set(imports[filename].lifecycleTypes)].join(", ")}} from './${visibilityHelperFileName(options["import-file-extensions"])}';`); // unique-ify
|
|
110
111
|
}
|
|
111
112
|
const content = `/* eslint-disable */\n\n${autogenerateWarning}${importStrings.join("\n")}${importStrings.length > 0 ? "\n\n" : ""}${filesArr[i][1].value}`;
|
|
112
113
|
await emitFile(program, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit_types.js","sourceRoot":"","sources":["../../src/emit_types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAW,WAAW,EAAQ,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,mBAAmB,MAAM,kCAAkC,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAE3D,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC5B,OAAgB,EAChB,OAAuB,EACvB,OAAiB,EACF,EAAE;IACjB,mCAAmC;IACnC,MAAM,KAAK,GAAqC,EAAE,CAAC;IACnD,8CAA8C;IAC9C,MAAM,OAAO,GAMT,EAAE,CAAC;IAEP,iBAAiB;IACjB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,gBAAgB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"emit_types.js","sourceRoot":"","sources":["../../src/emit_types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { TTypeMap } from "./buildTypeMap.js";
|
|
2
|
-
export declare const getImports: (imports: TTypeMap[number]["namespaces"][]) => string[];
|
|
2
|
+
export declare const getImports: (imports: TTypeMap[number]["namespaces"][], includeExtension: boolean) => string[];
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { filenameFromNamespaces } from "./namespaces.js";
|
|
2
|
-
export const getImports = (imports) => imports.map((i) => `import * as ${i.join("_")} from './${filenameFromNamespaces(i)}';`);
|
|
2
|
+
export const getImports = (imports, includeExtension) => imports.map((i) => `import * as ${i.join("_")} from './${filenameFromNamespaces(i, includeExtension)}';`);
|
|
3
3
|
//# sourceMappingURL=getImports.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getImports.js","sourceRoot":"","sources":["../../../src/helpers/getImports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAyC,
|
|
1
|
+
{"version":3,"file":"getImports.js","sourceRoot":"","sources":["../../../src/helpers/getImports.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAyC,EACzC,gBAAyB,EACf,EAAE,CACZ,OAAO,CAAC,GAAG,CACT,CAAC,CAAC,EAAE,EAAE,CACJ,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,sBAAsB,CAAC,CAAC,EAAE,gBAAgB,CAAC,IAAI,CACxF,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Namespace } from "@typespec/compiler";
|
|
2
2
|
/** Traverses *up* a namespace, generating a hierarchy array from itself and its parents. */
|
|
3
3
|
export declare const namespaceListFromNamespace: (n: Namespace | undefined) => string[] | null;
|
|
4
|
-
export declare const filenameFromNamespaces: (ns: string[]) => string;
|
|
4
|
+
export declare const filenameFromNamespaces: (ns: string[], includeExtension: boolean) => string;
|
|
@@ -10,5 +10,5 @@ export const namespaceListFromNamespace = (n) => {
|
|
|
10
10
|
}
|
|
11
11
|
return ret;
|
|
12
12
|
};
|
|
13
|
-
export const filenameFromNamespaces = (ns) => `${ns.join(".")}.ts`;
|
|
13
|
+
export const filenameFromNamespaces = (ns, includeExtension) => `${ns.join(".")}${includeExtension ? ".ts" : ""}`;
|
|
14
14
|
//# sourceMappingURL=namespaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespaces.js","sourceRoot":"","sources":["../../../src/helpers/namespaces.ts"],"names":[],"mappings":"AAEA,4FAA4F;AAC5F,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,CAAwB,EACP,EAAE;IACnB,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,GAAG,GAA0B,CAAC,CAAC;IACnC,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC;IACtB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"namespaces.js","sourceRoot":"","sources":["../../../src/helpers/namespaces.ts"],"names":[],"mappings":"AAEA,4FAA4F;AAC5F,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,CAAwB,EACP,EAAE;IACnB,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,GAAG,GAA0B,CAAC,CAAC;IACnC,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC;IACtB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,EAAY,EACZ,gBAAyB,EACjB,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Program } from "@typespec/compiler";
|
|
2
2
|
import { EmitterOptions } from "../lib.js";
|
|
3
|
-
export declare const visibilityHelperFileName
|
|
3
|
+
export declare const visibilityHelperFileName: (includeExtension: boolean) => string;
|
|
4
4
|
export declare const emitVisibilityHelperFile: (program: Program, options: EmitterOptions) => Promise<void>;
|
|
@@ -47,10 +47,10 @@ export type FilterLifecycle<
|
|
|
47
47
|
: T[K]
|
|
48
48
|
}
|
|
49
49
|
`;
|
|
50
|
-
export const visibilityHelperFileName = "
|
|
50
|
+
export const visibilityHelperFileName = (includeExtension) => `lifecycleVisibility${includeExtension ? ".ts" : ""}`;
|
|
51
51
|
export const emitVisibilityHelperFile = async (program, options) => {
|
|
52
52
|
await emitFile(program, {
|
|
53
|
-
path: resolvePath(options["out-dir"], visibilityHelperFileName),
|
|
53
|
+
path: resolvePath(options["out-dir"], visibilityHelperFileName(true)),
|
|
54
54
|
content: visibilityHelperFile,
|
|
55
55
|
});
|
|
56
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibilityHelperFile.js","sourceRoot":"","sources":["../../../src/helpers/visibilityHelperFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGpE,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+C5B,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,
|
|
1
|
+
{"version":3,"file":"visibilityHelperFile.js","sourceRoot":"","sources":["../../../src/helpers/visibilityHelperFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGpE,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+C5B,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,gBAAyB,EAAE,EAAE,CACpE,sBAAsB,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,OAAgB,EAChB,OAAuB,EACR,EAAE;IACjB,MAAM,QAAQ,CAAC,OAAO,EAAE;QACtB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACrE,OAAO,EAAE,oBAAoB;KAC9B,CAAC,CAAC;AACL,CAAC,CAAC"}
|
package/dist/src/lib.d.ts
CHANGED
|
@@ -6,6 +6,8 @@ export interface EmitterOptions {
|
|
|
6
6
|
"enable-typeguards": boolean;
|
|
7
7
|
"enable-routes": boolean;
|
|
8
8
|
"enable-routed-typemap": boolean;
|
|
9
|
+
"enable-routed-path-params": boolean;
|
|
10
|
+
"import-file-extensions": boolean;
|
|
9
11
|
"string-nominal-enums": boolean;
|
|
10
12
|
"serializable-date-types": boolean;
|
|
11
13
|
"type-mappings": Record<string, string>;
|
package/dist/src/lib.js
CHANGED
|
@@ -8,6 +8,8 @@ const EmitterOptionsSchema = {
|
|
|
8
8
|
"enable-typeguards": { type: "boolean" },
|
|
9
9
|
"enable-routes": { type: "boolean" },
|
|
10
10
|
"enable-routed-typemap": { type: "boolean" },
|
|
11
|
+
"enable-routed-path-params": { type: "boolean" },
|
|
12
|
+
"import-file-extensions": { type: "boolean" },
|
|
11
13
|
"string-nominal-enums": { type: "boolean" },
|
|
12
14
|
"serializable-date-types": { type: "boolean" },
|
|
13
15
|
"type-mappings": {
|
|
@@ -29,11 +31,13 @@ export const optionDependencies = (context) => ({
|
|
|
29
31
|
["root-namespaces"]: [[], []],
|
|
30
32
|
["out-dir"]: [context.emitterOutputDir, []],
|
|
31
33
|
["enable-types"]: [false, []],
|
|
32
|
-
["enable-routes"]: [false, []],
|
|
33
|
-
["string-nominal-enums"]: [false, []],
|
|
34
|
-
["serializable-date-types"]: [false, []],
|
|
35
34
|
["enable-typeguards"]: [false, ["enable-types"]],
|
|
35
|
+
["enable-routes"]: [false, []],
|
|
36
36
|
["enable-routed-typemap"]: [false, ["enable-types"]],
|
|
37
|
+
["enable-routed-path-params"]: [false, ["enable-routed-typemap"]],
|
|
38
|
+
["import-file-extensions"]: [false, []],
|
|
39
|
+
["serializable-date-types"]: [false, []],
|
|
40
|
+
["string-nominal-enums"]: [false, []],
|
|
37
41
|
["type-mappings"]: [{}, []],
|
|
38
42
|
["typeguard-mappings"]: [{}, []],
|
|
39
43
|
});
|
package/dist/src/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAGtB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAGtB,MAAM,oBAAoB,CAAC;AAqB5B,MAAM,oBAAoB,GAAmC;IAC3D,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,iBAAiB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QAC/D,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE;QAEtD,cAAc,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACnC,mBAAmB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAExC,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAEpC,uBAAuB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5C,2BAA2B,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAEhD,wBAAwB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7C,sBAAsB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3C,yBAAyB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC9C,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,EAAE;YACZ,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACzC;QACD,oBAAoB,EAAE;YACpB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,EAAE;YACZ,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACzC;KACF;IACD,QAAQ,EAAE,CAAC,iBAAiB,CAAC;IAC7B,oBAAoB,EAAE,KAAK;CAC5B,CAAC;AAEF,mGAAmG;AACnG,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,OAAoB,EAGpB,EAAE,CAAC,CAAC;IACJ,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;IAC7B,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;IAE3C,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;IAC7B,CAAC,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,cAAc,CAAC,CAAC;IAEhD,CAAC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;IAE9B,CAAC,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,uBAAuB,CAAC,CAAC;IAEjE,CAAC,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;IACvC,CAAC,yBAAyB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;IACxC,CAAC,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;IACrC,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,IAAI,GAAG,qBAAqB,CAAC;IACxC,IAAI,EAAE,6BAA6B;IACnC,WAAW,EAAE,EAAE;IACf,OAAO,EAAE;QACP,OAAO,EAAE,oBAAoB;KAC9B;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC"}
|
|
@@ -3,6 +3,10 @@ import { TTypeMap } from "../helpers/buildTypeMap.js";
|
|
|
3
3
|
import { EmitterOptions } from "../lib.js";
|
|
4
4
|
/** Maps a route path to its typemap definition and required imports */
|
|
5
5
|
export type TOperationTypemap = {
|
|
6
|
+
parameters: {
|
|
7
|
+
content: string | null;
|
|
8
|
+
hasVisibility: boolean;
|
|
9
|
+
};
|
|
6
10
|
request: {
|
|
7
11
|
content: string;
|
|
8
12
|
hasVisibility: boolean;
|
|
@@ -1,15 +1,46 @@
|
|
|
1
1
|
import { getHttpOperation } from "@typespec/http";
|
|
2
|
+
import { AppendableString } from "../helpers/appendableString.js";
|
|
2
3
|
import { Resolvable } from "./Resolvable.js";
|
|
3
4
|
import { Resolver } from "./Resolvable_helpers.js";
|
|
4
5
|
export const resolveOperationTypemap = async (program, options, typemap, op) => {
|
|
5
6
|
const httpOp = getHttpOperation(program, op)[0];
|
|
6
7
|
const ret = {
|
|
7
8
|
types: {
|
|
9
|
+
parameters: { content: "null", hasVisibility: false },
|
|
8
10
|
request: { content: "null", hasVisibility: false },
|
|
9
11
|
response: { content: [] },
|
|
10
12
|
},
|
|
11
13
|
imports: [],
|
|
12
14
|
};
|
|
15
|
+
// path parameters
|
|
16
|
+
const pathParams = httpOp.parameters.parameters.filter((p) => p.type === "path");
|
|
17
|
+
if (options["enable-routed-path-params"] && pathParams.length) {
|
|
18
|
+
console.log(httpOp.path, pathParams.map((p) => [p.name, p.param, p.param.type, p.param.type.kind]));
|
|
19
|
+
const paramsString = new AppendableString("{");
|
|
20
|
+
if (pathParams.length > 1)
|
|
21
|
+
paramsString.append("\n");
|
|
22
|
+
let i = 1;
|
|
23
|
+
for (const param of pathParams) {
|
|
24
|
+
const resolved = await Resolvable.resolve(Resolver.Type, param.param.type, {
|
|
25
|
+
program,
|
|
26
|
+
options,
|
|
27
|
+
emitDocs: false,
|
|
28
|
+
nestlevel: 4,
|
|
29
|
+
rootType: null,
|
|
30
|
+
typemap,
|
|
31
|
+
rootTypeReady: true,
|
|
32
|
+
ancestryPath: [],
|
|
33
|
+
});
|
|
34
|
+
if (resolved.hasVisibility)
|
|
35
|
+
ret.types.parameters.hasVisibility = true;
|
|
36
|
+
ret.imports.push(...resolved.imports);
|
|
37
|
+
paramsString.addLine(`${param.name}: ${replaceLifecycle(resolved.resolved.value, httpOp.verb.toUpperCase(), resolved.hasVisibility)}${i === pathParams.length ? "" : ","}`, pathParams.length > 1 ? 4 : 0, pathParams.length > 1 ? "line-end" : "continued");
|
|
38
|
+
i++;
|
|
39
|
+
}
|
|
40
|
+
paramsString.addLine("}", pathParams.length > 1 ? 3 : 0, "continued");
|
|
41
|
+
ret.types.parameters.content = paramsString.value;
|
|
42
|
+
console.log(ret.types.parameters);
|
|
43
|
+
}
|
|
13
44
|
// request
|
|
14
45
|
if (httpOp.parameters.body) {
|
|
15
46
|
const resolved = await Resolvable.resolve(Resolver.Type, httpOp.parameters.body.type, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationTypemap.js","sourceRoot":"","sources":["../../../src/resolve/operationTypemap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"operationTypemap.js","sourceRoot":"","sources":["../../../src/resolve/operationTypemap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "typespec-typescript-emitter",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "A TypeSpec library providing an emitter that generates TypeScript types and a structured routes object for robust importing",
|
|
5
5
|
"homepage": "https://github.com/crowbait/typespec-typescript-emitter#readme",
|
|
6
6
|
"repository": "https://github.com/crowbait/typespec-typescript-emitter",
|
|
@@ -90,11 +90,14 @@ export const emitRoutedTypemap = async (
|
|
|
90
90
|
|
|
91
91
|
// emitting
|
|
92
92
|
for (const ns of Object.entries(namespaceOps)) {
|
|
93
|
-
const importStrings = getImports(
|
|
93
|
+
const importStrings = getImports(
|
|
94
|
+
unique2D(namespaceImports[ns[0]]),
|
|
95
|
+
options["import-file-extensions"],
|
|
96
|
+
);
|
|
94
97
|
|
|
95
98
|
if (ns[1].hasVisibility) {
|
|
96
99
|
importStrings.push(
|
|
97
|
-
`import {Lifecycle, FilterLifecycle} from './${visibilityHelperFileName}';`,
|
|
100
|
+
`import {Lifecycle, FilterLifecycle} from './${visibilityHelperFileName(options["import-file-extensions"])}';`,
|
|
98
101
|
);
|
|
99
102
|
}
|
|
100
103
|
|
|
@@ -104,11 +107,14 @@ export const emitRoutedTypemap = async (
|
|
|
104
107
|
let pathret = ` ['${path[0]}']: {\n`;
|
|
105
108
|
pathret += Object.entries(path[1])
|
|
106
109
|
.map((verb) => {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
verbret
|
|
111
|
-
|
|
110
|
+
const verbret: string[] = [];
|
|
111
|
+
if (options["enable-routed-path-params"])
|
|
112
|
+
verbret.push(` pathParams: ${verb[1].parameters.content}`);
|
|
113
|
+
verbret.push(` request: ${verb[1].request.content}`);
|
|
114
|
+
verbret.push(
|
|
115
|
+
` response: ${verb[1].response.content.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}`,
|
|
116
|
+
);
|
|
117
|
+
return ` ['${verb[0]}']: {\n${verbret.join(",\n")}\n }`;
|
|
112
118
|
})
|
|
113
119
|
.join(",\n");
|
|
114
120
|
pathret += "\n }";
|
package/src/emit_types.ts
CHANGED
|
@@ -28,8 +28,8 @@ export const emitTypes = async (
|
|
|
28
28
|
|
|
29
29
|
// generate files
|
|
30
30
|
typemap.forEach((t) => {
|
|
31
|
-
files[filenameFromNamespaces(t.namespaces)] = new AppendableString();
|
|
32
|
-
imports[filenameFromNamespaces(t.namespaces)] = {
|
|
31
|
+
files[filenameFromNamespaces(t.namespaces, true)] = new AppendableString();
|
|
32
|
+
imports[filenameFromNamespaces(t.namespaces, true)] = {
|
|
33
33
|
namespaces: [],
|
|
34
34
|
lifecycleTypes: [],
|
|
35
35
|
};
|
|
@@ -43,7 +43,7 @@ export const emitTypes = async (
|
|
|
43
43
|
// resolve all types
|
|
44
44
|
for (let i = 0; i < typemap.length; i++) {
|
|
45
45
|
const t = typemap[i];
|
|
46
|
-
const filename = filenameFromNamespaces(t.namespaces);
|
|
46
|
+
const filename = filenameFromNamespaces(t.namespaces, true);
|
|
47
47
|
const resolved = await Resolvable.resolve(Resolver.Type, t.type, {
|
|
48
48
|
program,
|
|
49
49
|
options,
|
|
@@ -132,12 +132,15 @@ export const emitTypes = async (
|
|
|
132
132
|
imports[filename].namespaces = unique2D(imports[filename].namespaces);
|
|
133
133
|
const importStrings = getImports(
|
|
134
134
|
imports[filename].namespaces.filter(
|
|
135
|
-
(i) =>
|
|
135
|
+
(i) =>
|
|
136
|
+
filenameFromNamespaces(i, options["import-file-extensions"]) !==
|
|
137
|
+
filename,
|
|
136
138
|
),
|
|
139
|
+
options["import-file-extensions"],
|
|
137
140
|
);
|
|
138
141
|
if (imports[filename].lifecycleTypes.length > 0) {
|
|
139
142
|
importStrings.push(
|
|
140
|
-
`import {${[...new Set(imports[filename].lifecycleTypes)].join(", ")}} from './${visibilityHelperFileName}';`,
|
|
143
|
+
`import {${[...new Set(imports[filename].lifecycleTypes)].join(", ")}} from './${visibilityHelperFileName(options["import-file-extensions"])}';`,
|
|
141
144
|
); // unique-ify
|
|
142
145
|
}
|
|
143
146
|
|
|
@@ -3,7 +3,9 @@ import { filenameFromNamespaces } from "./namespaces.js";
|
|
|
3
3
|
|
|
4
4
|
export const getImports = (
|
|
5
5
|
imports: TTypeMap[number]["namespaces"][],
|
|
6
|
+
includeExtension: boolean,
|
|
6
7
|
): string[] =>
|
|
7
8
|
imports.map(
|
|
8
|
-
(i) =>
|
|
9
|
+
(i) =>
|
|
10
|
+
`import * as ${i.join("_")} from './${filenameFromNamespaces(i, includeExtension)}';`,
|
|
9
11
|
);
|
|
@@ -14,5 +14,7 @@ export const namespaceListFromNamespace = (
|
|
|
14
14
|
return ret;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
|
-
export const filenameFromNamespaces = (
|
|
18
|
-
|
|
17
|
+
export const filenameFromNamespaces = (
|
|
18
|
+
ns: string[],
|
|
19
|
+
includeExtension: boolean,
|
|
20
|
+
): string => `${ns.join(".")}${includeExtension ? ".ts" : ""}`;
|
|
@@ -50,14 +50,15 @@ export type FilterLifecycle<
|
|
|
50
50
|
}
|
|
51
51
|
`;
|
|
52
52
|
|
|
53
|
-
export const visibilityHelperFileName =
|
|
53
|
+
export const visibilityHelperFileName = (includeExtension: boolean) =>
|
|
54
|
+
`lifecycleVisibility${includeExtension ? ".ts" : ""}`;
|
|
54
55
|
|
|
55
56
|
export const emitVisibilityHelperFile = async (
|
|
56
57
|
program: Program,
|
|
57
58
|
options: EmitterOptions,
|
|
58
59
|
): Promise<void> => {
|
|
59
60
|
await emitFile(program, {
|
|
60
|
-
path: resolvePath(options["out-dir"], visibilityHelperFileName),
|
|
61
|
+
path: resolvePath(options["out-dir"], visibilityHelperFileName(true)),
|
|
61
62
|
content: visibilityHelperFile,
|
|
62
63
|
});
|
|
63
64
|
};
|
package/src/lib.ts
CHANGED
|
@@ -7,10 +7,16 @@ import {
|
|
|
7
7
|
export interface EmitterOptions {
|
|
8
8
|
"root-namespaces": string[];
|
|
9
9
|
"out-dir": string;
|
|
10
|
+
|
|
10
11
|
"enable-types": boolean;
|
|
11
12
|
"enable-typeguards": boolean;
|
|
13
|
+
|
|
12
14
|
"enable-routes": boolean;
|
|
15
|
+
|
|
13
16
|
"enable-routed-typemap": boolean;
|
|
17
|
+
"enable-routed-path-params": boolean;
|
|
18
|
+
|
|
19
|
+
"import-file-extensions": boolean;
|
|
14
20
|
"string-nominal-enums": boolean;
|
|
15
21
|
"serializable-date-types": boolean;
|
|
16
22
|
"type-mappings": Record<string, string>;
|
|
@@ -22,10 +28,16 @@ const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
|
|
|
22
28
|
properties: {
|
|
23
29
|
"root-namespaces": { type: "array", items: { type: "string" } },
|
|
24
30
|
"out-dir": { type: "string", format: "absolute-path" },
|
|
31
|
+
|
|
25
32
|
"enable-types": { type: "boolean" },
|
|
26
33
|
"enable-typeguards": { type: "boolean" },
|
|
34
|
+
|
|
27
35
|
"enable-routes": { type: "boolean" },
|
|
36
|
+
|
|
28
37
|
"enable-routed-typemap": { type: "boolean" },
|
|
38
|
+
"enable-routed-path-params": { type: "boolean" },
|
|
39
|
+
|
|
40
|
+
"import-file-extensions": { type: "boolean" },
|
|
29
41
|
"string-nominal-enums": { type: "boolean" },
|
|
30
42
|
"serializable-date-types": { type: "boolean" },
|
|
31
43
|
"type-mappings": {
|
|
@@ -51,14 +63,18 @@ export const optionDependencies = (
|
|
|
51
63
|
} => ({
|
|
52
64
|
["root-namespaces"]: [[], []],
|
|
53
65
|
["out-dir"]: [context.emitterOutputDir, []],
|
|
66
|
+
|
|
54
67
|
["enable-types"]: [false, []],
|
|
68
|
+
["enable-typeguards"]: [false, ["enable-types"]],
|
|
69
|
+
|
|
55
70
|
["enable-routes"]: [false, []],
|
|
56
|
-
["string-nominal-enums"]: [false, []],
|
|
57
|
-
["serializable-date-types"]: [false, []],
|
|
58
71
|
|
|
59
|
-
["enable-typeguards"]: [false, ["enable-types"]],
|
|
60
72
|
["enable-routed-typemap"]: [false, ["enable-types"]],
|
|
73
|
+
["enable-routed-path-params"]: [false, ["enable-routed-typemap"]],
|
|
61
74
|
|
|
75
|
+
["import-file-extensions"]: [false, []],
|
|
76
|
+
["serializable-date-types"]: [false, []],
|
|
77
|
+
["string-nominal-enums"]: [false, []],
|
|
62
78
|
["type-mappings"]: [{}, []],
|
|
63
79
|
["typeguard-mappings"]: [{}, []],
|
|
64
80
|
});
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Operation, Program, Type } from "@typespec/compiler";
|
|
2
2
|
import { getHttpOperation } from "@typespec/http";
|
|
3
|
+
import { AppendableString } from "../helpers/appendableString.js";
|
|
3
4
|
import { TTypeMap } from "../helpers/buildTypeMap.js";
|
|
4
5
|
import { EmitterOptions } from "../lib.js";
|
|
5
6
|
import { Resolvable } from "./Resolvable.js";
|
|
@@ -7,7 +8,8 @@ import { Resolver } from "./Resolvable_helpers.js";
|
|
|
7
8
|
|
|
8
9
|
/** Maps a route path to its typemap definition and required imports */
|
|
9
10
|
export type TOperationTypemap = {
|
|
10
|
-
// "string" in these does not refer to the type "string"; it's the typescript code *as* string.
|
|
11
|
+
// "string" in these does not simply refer to the type "string"; it's the typescript code *as* string.
|
|
12
|
+
parameters: { content: string | null; hasVisibility: boolean };
|
|
11
13
|
request: { content: string; hasVisibility: boolean };
|
|
12
14
|
response: {
|
|
13
15
|
content: Array<{
|
|
@@ -30,12 +32,58 @@ export const resolveOperationTypemap = async (
|
|
|
30
32
|
const httpOp = getHttpOperation(program, op)[0];
|
|
31
33
|
const ret: Awaited<ReturnType<typeof resolveOperationTypemap>> = {
|
|
32
34
|
types: {
|
|
35
|
+
parameters: { content: "null", hasVisibility: false },
|
|
33
36
|
request: { content: "null", hasVisibility: false },
|
|
34
37
|
response: { content: [] },
|
|
35
38
|
},
|
|
36
39
|
imports: [],
|
|
37
40
|
};
|
|
38
41
|
|
|
42
|
+
// path parameters
|
|
43
|
+
const pathParams = httpOp.parameters.parameters.filter(
|
|
44
|
+
(p) => p.type === "path",
|
|
45
|
+
);
|
|
46
|
+
if (options["enable-routed-path-params"] && pathParams.length) {
|
|
47
|
+
console.log(
|
|
48
|
+
httpOp.path,
|
|
49
|
+
pathParams.map((p) => [p.name, p.param, p.param.type, p.param.type.kind]),
|
|
50
|
+
);
|
|
51
|
+
const paramsString = new AppendableString("{");
|
|
52
|
+
if (pathParams.length > 1) paramsString.append("\n");
|
|
53
|
+
let i = 1;
|
|
54
|
+
for (const param of pathParams) {
|
|
55
|
+
const resolved = await Resolvable.resolve(
|
|
56
|
+
Resolver.Type,
|
|
57
|
+
param.param.type,
|
|
58
|
+
{
|
|
59
|
+
program,
|
|
60
|
+
options,
|
|
61
|
+
emitDocs: false,
|
|
62
|
+
nestlevel: 4,
|
|
63
|
+
rootType: null,
|
|
64
|
+
typemap,
|
|
65
|
+
rootTypeReady: true,
|
|
66
|
+
ancestryPath: [],
|
|
67
|
+
},
|
|
68
|
+
);
|
|
69
|
+
if (resolved.hasVisibility) ret.types.parameters.hasVisibility = true;
|
|
70
|
+
ret.imports.push(...resolved.imports);
|
|
71
|
+
paramsString.addLine(
|
|
72
|
+
`${param.name}: ${replaceLifecycle(
|
|
73
|
+
resolved.resolved.value,
|
|
74
|
+
httpOp.verb.toUpperCase(),
|
|
75
|
+
resolved.hasVisibility,
|
|
76
|
+
)}${i === pathParams.length ? "" : ","}`,
|
|
77
|
+
pathParams.length > 1 ? 4 : 0,
|
|
78
|
+
pathParams.length > 1 ? "line-end" : "continued",
|
|
79
|
+
);
|
|
80
|
+
i++;
|
|
81
|
+
}
|
|
82
|
+
paramsString.addLine("}", pathParams.length > 1 ? 3 : 0, "continued");
|
|
83
|
+
ret.types.parameters.content = paramsString.value;
|
|
84
|
+
console.log(ret.types.parameters);
|
|
85
|
+
}
|
|
86
|
+
|
|
39
87
|
// request
|
|
40
88
|
if (httpOp.parameters.body) {
|
|
41
89
|
const resolved = await Resolvable.resolve(
|
package/test/helpers/wrapper.ts
CHANGED
|
@@ -13,10 +13,12 @@ export const defaultConfig: Omit<EmitterOptions, "out-dir"> = {
|
|
|
13
13
|
"enable-typeguards": false,
|
|
14
14
|
"enable-routes": false,
|
|
15
15
|
"enable-routed-typemap": false,
|
|
16
|
+
"enable-routed-path-params": false,
|
|
16
17
|
"string-nominal-enums": true,
|
|
17
18
|
"serializable-date-types": true,
|
|
18
19
|
"type-mappings": {},
|
|
19
20
|
"typeguard-mappings": {},
|
|
21
|
+
"import-file-extensions": true,
|
|
20
22
|
};
|
|
21
23
|
|
|
22
24
|
type Filename = string;
|
|
@@ -15,11 +15,11 @@ import * as test_inner from './test.inner.ts';
|
|
|
15
15
|
export type types_test = {
|
|
16
16
|
['/']: {
|
|
17
17
|
['GET']: {
|
|
18
|
-
request: null
|
|
18
|
+
request: null,
|
|
19
19
|
response: {status: 200, body: test.Resource}
|
|
20
20
|
},
|
|
21
21
|
['PUT']: {
|
|
22
|
-
request: test.Resource | test_inner.InnerModel
|
|
22
|
+
request: test.Resource | test_inner.InnerModel,
|
|
23
23
|
response: {status: 200, body: {
|
|
24
24
|
statusCode: 200
|
|
25
25
|
}}
|
|
@@ -27,7 +27,7 @@ export type types_test = {
|
|
|
27
27
|
},
|
|
28
28
|
['/inner']: {
|
|
29
29
|
['DELETE']: {
|
|
30
|
-
request: test_inner.InnerModel | test_inner.InnerModel2
|
|
30
|
+
request: test_inner.InnerModel | test_inner.InnerModel2,
|
|
31
31
|
response: {status: 200, body: {
|
|
32
32
|
statusCode: 200
|
|
33
33
|
}} | {status: 401, body: {
|
|
@@ -16,11 +16,11 @@ import {Lifecycle, FilterLifecycle} from './lifecycleVisibility.ts';
|
|
|
16
16
|
export type types_test<V extends Lifecycle = Lifecycle.All> = {
|
|
17
17
|
['/']: {
|
|
18
18
|
['GET']: {
|
|
19
|
-
request: null
|
|
19
|
+
request: null,
|
|
20
20
|
response: {status: 200, body: test.Resource<V extends Lifecycle.All ? (Lifecycle.Read) : V>}
|
|
21
21
|
},
|
|
22
22
|
['PUT']: {
|
|
23
|
-
request: test.Resource<V extends Lifecycle.All ? (Lifecycle.Create | Lifecycle.Update) : V> | test_inner.InnerModel<V extends Lifecycle.All ? (Lifecycle.Create | Lifecycle.Update) : V
|
|
23
|
+
request: test.Resource<V extends Lifecycle.All ? (Lifecycle.Create | Lifecycle.Update) : V> | test_inner.InnerModel<V extends Lifecycle.All ? (Lifecycle.Create | Lifecycle.Update) : V>,
|
|
24
24
|
response: {status: 200, body: {
|
|
25
25
|
statusCode: 200
|
|
26
26
|
}}
|
|
@@ -28,7 +28,7 @@ export type types_test<V extends Lifecycle = Lifecycle.All> = {
|
|
|
28
28
|
},
|
|
29
29
|
['/inner']: {
|
|
30
30
|
['DELETE']: {
|
|
31
|
-
request: test_inner.InnerModel<V extends Lifecycle.All ? (Lifecycle.Delete) : V> | test_inner.InnerModel2
|
|
31
|
+
request: test_inner.InnerModel<V extends Lifecycle.All ? (Lifecycle.Delete) : V> | test_inner.InnerModel2,
|
|
32
32
|
response: {status: 200, body: {
|
|
33
33
|
statusCode: 200
|
|
34
34
|
}} | {status: 401, body: {
|