typespec-typescript-emitter 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.1.1](https://github.com/crowbait/typespec-typescript-emitter/compare/v1.1.0...v1.1.1) (2025-09-26)
+
+
+### Bug Fixes
+
+* routed typemap respects visibility modifiers ([13c0a45](https://github.com/crowbait/typespec-typescript-emitter/commit/13c0a45f38b949a36ad2e8b6c40a1829ff3b54da))
+* routed-typemap handling of multiple verbs on same path ([f33e6d9](https://github.com/crowbait/typespec-typescript-emitter/commit/f33e6d94d78523206813ab4191feee29cb6c3b2e))
+* routes / routed typemap emitters now resolve ops inside interfaces ([21504bc](https://github.com/crowbait/typespec-typescript-emitter/commit/21504bc74cc4f77aeac1f1bcb4e52a42917d9146))
+* thorough resolution of nested types in typemap ([95af299](https://github.com/crowbait/typespec-typescript-emitter/commit/95af299b662dbcba0d21b56aa8ebe2f91c6e6e92))
+
+
+
 # [1.1.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v1.0.0...v1.1.0) (2025-05-23)
 
 
@@ -37,12 +49,3 @@
 
 
 
-## [0.3.5](https://github.com/crowbait/typespec-typescript-emitter/compare/v0.3.4...v0.3.5) (2025-02-23)
-
-
-### Bug Fixes
-
-* ci (no skip on chore-only) ([75b2e5d](https://github.com/crowbait/typespec-typescript-emitter/commit/75b2e5d4346fd17de5c7baf689de6e4cac259542))
-
-
-

package/README.md

@@ -1,29 +1,29 @@
 # typespec-typescript-emitter
 
-This is a [TypeSpec](https://typespec.io) library aiming to provide
-TypeScript output to a TypeSpec project.
+This is a [TypeSpec](https://typespec.io) library aiming to provide TypeScript output to a TypeSpec project.
 
-Currently, this library is tailored to my specific use case, which is defining
-an HTTP API. The 'routes'-emitter will only work on HTTP operations. **However**, exporting all models as types is independent of HTTP, and so may also benefit projects with a different usage scenario.
+Currently, this library is tailored to my specific use case, which is defining HTTP APIs.
+The 'routes'-emitter will only work on HTTP operations. **However**, exporting all models as types is independent of HTTP, and so may also benefit projects with a different usage scenario.
 
 It can the following things:
 
-- ts files exporting every model present in the spec
-  - 1 file for each (nested) namespace
+- ts files exporting every model present in a namespace
+  - 1 file for each nested namespace
   - exports models, enums and unions
   - does NOT export aliases (see below)
 - optional typeguards, *if* type export is enabled
-  - referenced or generated in the routes object as well, if enabled (experimental)
-- for `TypeSpec.Http`: ts file containing a nested object containing information about every route
-  - this can be imported at runtime to provide a robust way of eg. accessing URLs
+- for `TypeSpec.Http`: ts file containing a nested object (by namespace-opname) containing information about every route (eg. url-from-parameters, method, etc.)
+- for `TypeSpec.Http`: "routed typemap" mapping types to their routes (path and verb) (respects Lifecycle visibility)
 
 ## Content <!-- omit from toc -->
 
-- [Installation](#installation)
-- [Configuration](#configuration)
-- [Types emitter](#types-emitter)
-  - [Alias's](#aliass)
-- [Routes emitter](#routes-emitter)
+- [typespec-typescript-emitter](#typespec-typescript-emitter)
+  - [Installation](#installation)
+  - [Configuration](#configuration)
+  - [Types Emitter](#types-emitter)
+    - [Aliases](#aliases)
+  - [Routes Emitter](#routes-emitter)
+  - [Routed Typemap](#routed-typemap)
 
 ## Installation
 
@@ -45,6 +45,7 @@ options:
     enable-types: true
     enable-typeguards: false
     enable-routes: false
+    enable-routed-typemap: false
 ```
 
 The following options are available:
@@ -54,15 +55,21 @@ The following options are available:
 - `enable-types` (default: true): enables output of TypeScript types.
 - `enable-typeguards` (default: false): enables output of typeguards, *IF* type-output is enabled.
 - `enable-routes` (default: false): enables output of the HTTP-routes object.
+- `enable-routed-typemap` (default: false): enables output of an indexable type mapping paths and HTTP verbs to request and response bodies.
 
-## Types emitter
+## Types Emitter
 
 This emitter will traverse your configured root namespace and all nested namespaces, generating a `{namespace-name}.ts`-file.
 
-The emitter can handle `Model`s, `Enum`s and `Union`s. ~~`Alias`'s~~ are _not_ emitted - more on that [later](#aliass). It will also preserve docs as JSDoc-style comments.
+The emitter can handle `Model`s, `Enum`s and `Union`s. ~~`Alias`'s~~ are *not* emitted - more on that [later](#aliases). It will also preserve docs as JSDoc-style comments.
 
 The emitter should be able to handle most basic TS contructs, like scalars, literals, object, arrays, tuples and intrinsics (eg. `null`).
 
+> [!IMPORTANT]
+> These types do not respect most transformative decorators, notable `@visibility`.
+> This is because it's non-trivial to do, has unexpected problems and the functionality is *somewhat* already there, in the form of [Routed Typemaps](#routed-typemap).
+> For additional information, see [#7](https://github.com/crowbait/typespec-typescript-emitter/issues/7).
+
 Example:
 
 ```ts
@@ -126,9 +133,9 @@ export function isBook(arg: any): arg is Book {
 Typeguards *should* create comprehensive checks that adhere as strictly to the source model as possible.
 If you find a case where the typeguard is looser than it needs to be, please report that as a bug.
 
-### Alias's
+### Aliases
 
-There seems to be no way to extract aliases from TypeSpec's emitter framework. Because of that, `Alias`'s are ignored by the emitter (or, to be more precise: `Alias`'s reach the emitter already resolved. They won't be exported as their own type but directly substituted where they're needed).
+There seems to be no way to extract aliases from TypeSpec's emitter framework. Because of that, `Alias`es are ignored by the emitter (or, to be more precise: `Alias`es reach the emitter already resolved. They won't be exported as their own type but directly substituted where they're needed).
 
 That means, if you want something to be emitted, it can't be an alias:
 
@@ -145,16 +152,17 @@ alias Derived1 = OmitProperties<Demo, "prop1">;
 model Derived2 {...OmitProperties<Demo, "prop1">};
 ```
 
-## Routes emitter
+## Routes Emitter
 
 **This emitter depends on your use of the `TypeSpec.Http` library**.
 
 If you're using `TypeSpec.Http` to define your API routes and endpoints, this library offers an emitter to export a `routes` object.
 It will generate a nested object containing information about every `op` you have defined, nested by namespace.
 I contains the following data (per `op`):
+
 - `method`: HTTP method
-- `path`: Path (as defined as `route`-string; parameters are not substituted)
-- `getUrl`: Function for generating a valid URL to this `op`; if the path has parameters, this function will have analogue parameters
+- `path`: Path (as defined in the `route` string; parameters are not substituted)
+- `getUrl`: Function for generating a valid URL to this `op`; if the path has parameters, this function will have matching parameters
 - `auth`: Array of valid authentication schemes (or `[null]`, if none)
 Just as the types emitter, this emitter will also preserve docs as JSDoc-style comments.
 
@@ -212,4 +220,102 @@ export const routes_myProject = {
     }
   }
 } as const;
-```
+```
+
+## Routed Typemap
+
+This emitter produces a Typemap (a typescript type indexed by string keys mapping other types) based on your HTTP routes and verbs.
+In short, this allows you to select a type *used in a body of your HTTP ops* using it's path and verb. This includes request and response bodies. Path parameters are not relevant for this emitter; those are already handled in the Routes object.
+This can be helpful when, for example, building a wrapper around your API.
+
+> [!NOTE]
+> The Typemap is not nested! This means that, let's say the route "/user/account" will not be mapped to `{user: {account: /* ... */}}` (somewhat similar to how the Routes Emitter works), but to `{"/user/account": /* ... */}`. Crucially, those map keys are *the same as the `path` property in the Routes object* emitted from the Routes Emitter.
+> This means you can select from the Typemap *using* the structured Routes object.
+
+Example:
+
+```ts
+@route("/typemap")
+namespace namespaceA.typemap {
+  model ModelA {
+    id: int32,
+    name: string
+  }
+
+  @get
+  op getAll(): {@body body: ModelA[]} | {@statusCode status: 418, @body body: "Me teapot"};
+
+  @post
+  op add(@body body: ModelA): OkResponse;
+
+  @post
+  @route("{id}")
+  op getOne(
+    @path id: int32
+  ): {@body body: ModelA}| NotFoundResponse | {@statusCode status: 418} | {@statusCode status: 419, @body body: null};
+}
+```
+
+...will be transformed into:
+
+```ts
+/* /path/to/outdir/routedTypemap_{root-namespace}.ts */
+export type types_namespaceA = {
+  ['/typemap']: {
+    ['GET']: {
+      request: null
+      response: {status: 200, body: {
+        id: number,
+        name: string
+      }[]} | {status: 418, body: 'Me teapot'}
+    },
+    ['POST']: {
+      request: {
+        id: number,
+        name: string
+      }
+      response: {status: 200, body: {
+        /** The status code. */
+        statusCode: 200
+      }}
+    }
+  },
+  ['/typemap/{id}']: {
+    ['POST']: {
+      request: null
+      response: {status: 200, body: {
+        id: number,
+        name: string
+      }} | {status: 404, body: {
+        /** The status code. */
+        statusCode: 404
+      }} | {status: 418, body: {
+        status: 418
+      }} | {status: 419, body: null}
+    }
+  }
+};
+```
+
+...which can be accessed like this:
+
+```ts
+// Accessing type of response body directly by knowing path and verb
+type T_update1 = types_namespaceA['/typemap']['POST']['response']['body']
+
+// Accessing type of request body by indexing Routes object
+// namespace "namespaceA.typemap", op "add"
+type T_update2 = types_namespaceA[typeof routes_namespaceA.typemap.add.path]['POST']['request']
+// One could also use `typeof routes_namespace.testSimple.update.method` instead of 'POST'.
+```
+
+> [!NOTE]
+> Observe how the emitter
+>
+> - assumes a `200` status code for an op's response type if you didn't define any (first responses on `getAll` and `getOne` ops)
+> - assumes the entire response type is the body of no body is explicitely decorated (418 on `getOne` op) (this is non-standard; I have seen quite a few projects not realizing the response definition should have a body *in* it and treating the whole thing as a body; so while technically "wrong", this accomodates those projects. You can easily define a truly empty body using `{}`, `""`, `null`..., see 419 on `getOne` op)
+
+Additional notes:
+
+- There is currently no built-in way of accessing typeguards from paths their types may be associated with.
+- Models are not reused in or imported by this emitter. Reasoning involves "no runtime overhead either way", "simpler code", "self-contained emitter modules" and "you're not supposed to rummage around in the generated files anyway, just import them"; this has been touched upon in [#4](https://github.com/crowbait/typespec-typescript-emitter/issues/4#issuecomment-2720955282) and [#6](https://github.com/crowbait/typespec-typescript-emitter/issues/6#issuecomment-3049999155).

package/dist/src/emit_mapped_types.js

@@ -1,22 +1,32 @@
-import { getHttpOperation } from "@typespec/http";
+import { isTemplateDeclaration, } from "@typespec/compiler";
+import { getHttpOperation, resolveRequestVisibility, Visibility, } from "@typespec/http";
 import { resolveType } from "./emit_types_resolve.js";
 export const emitRoutedTypemap = (context, namespace) => {
     const ops = {};
     const traverseNamespace = (n) => {
         // operations
-        n.operations.forEach((op) => {
+        const processOp = (op) => {
             const httpOp = getHttpOperation(context.program, op);
-            const identifier = httpOp[0].path;
-            ops[identifier] = {
+            const path = httpOp[0].path;
+            const verb = httpOp[0].verb.toUpperCase();
+            if (!ops[path])
+                ops[path] = {};
+            ops[path][verb] = {
                 request: "null",
-                response: [{ status: 200, body: "unknown" }],
+                response: [{ status: 200, body: "{}" }],
             };
             // request
             let request = "null";
-            if (op.parameters.properties.has("body")) {
-                request = resolveType(op.parameters.properties.get("body").type, 1, namespace, context);
+            if (httpOp[0].parameters.body) {
+                request = resolveType(httpOp[0].parameters.body.type, {
+                    nestlevel: 2,
+                    currentNamespace: namespace,
+                    context,
+                    visibility: resolveRequestVisibility(context.program, op, httpOp[0].verb),
+                    resolveEvenWithName: true,
+                }).replaceAll("\n", "\n  ");
             }
-            ops[identifier].request = request;
+            ops[path][verb].request = request;
             // response
             if (op.returnType && op.returnType.kind) {
                 const getReturnType = (t) => {
@@ -25,7 +35,7 @@ export const emitRoutedTypemap = (context, namespace) => {
                         // if the return type is a model, it may have a fully qualified body
                         const modelret = {
                             status: 200,
-                            body: "unknown",
+                            body: "{}",
                         };
                         let wasQualifiedBody = false;
                         t.properties.forEach((prop) => {
@@ -36,14 +46,26 @@ export const emitRoutedTypemap = (context, namespace) => {
                                     modelret.status = prop.type.value;
                                 // one of the properties may be the body definition
                                 if (dec.definition?.name === "@body") {
-                                    modelret.body = resolveType(prop.type, 1, namespace, context);
+                                    modelret.body = resolveType(prop.type, {
+                                        nestlevel: 2,
+                                        currentNamespace: namespace,
+                                        context,
+                                        visibility: Visibility.Read,
+                                        resolveEvenWithName: true,
+                                    }).replaceAll("\n", "\n  ");
                                     wasQualifiedBody = true;
                                 }
                             });
                         });
                         // ... if not, we assume status 200 and treat the model as the body
                         if (!wasQualifiedBody) {
-                            modelret.body = resolveType(t, 1, namespace, context);
+                            modelret.body = resolveType(t, {
+                                nestlevel: 2,
+                                currentNamespace: namespace,
+                                context,
+                                visibility: Visibility.Read,
+                                resolveEvenWithName: true,
+                            }).replaceAll("\n", "\n  ");
                         }
                         ret.push(modelret);
                     }
@@ -55,24 +77,45 @@ export const emitRoutedTypemap = (context, namespace) => {
                         });
                     }
                     else
-                        ret.push({ status: 200, body: resolveType(t, 1, namespace) });
+                        ret.push({
+                            status: 200,
+                            body: resolveType(t, {
+                                nestlevel: 1,
+                                currentNamespace: namespace,
+                                context,
+                                visibility: Visibility.Read,
+                                resolveEvenWithName: true,
+                            }),
+                        });
                     return ret;
                 };
-                ops[identifier].response = getReturnType(op.returnType);
+                ops[path][verb].response = getReturnType(op.returnType);
             }
-        }); // end operations
+        }; // end operations
+        n.operations.forEach(processOp);
+        n.interfaces.forEach((itf) => {
+            if (!isTemplateDeclaration(itf))
+                itf.operations.forEach(processOp);
+        });
         // get and traverse all namespaces
         n.namespaces.forEach((ns) => traverseNamespace(ns));
     };
     traverseNamespace(namespace);
     let out = `export type types_${context.options["root-namespace"]} = {\n`;
     out += Object.entries(ops)
-        .map((op) => {
-        let ret = `  ['${op[0]}']: {\n`;
-        ret += `    request: ${op[1].request}\n`;
-        ret += `    response: ${op[1].response.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}\n`;
-        ret += "  }";
-        return ret;
+        .map((path) => {
+        let pathret = `  ['${path[0]}']: {\n`;
+        pathret += Object.entries(path[1])
+            .map((verb) => {
+            let verbret = `    ['${verb[0]}']: {\n`;
+            verbret += `      request: ${verb[1].request}\n`;
+            verbret += `      response: ${verb[1].response.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}\n`;
+            verbret += "    }";
+            return verbret;
+        })
+            .join(",\n");
+        pathret += "\n  }";
+        return pathret;
     })
         .join(",\n");
     out += "\n};\n";

package/dist/src/emit_mapped_types.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit_mapped_types.js","sourceRoot":"","sources":["../../src/emit_mapped_types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emit_mapped_types.js","sourceRoot":"","sources":["../../src/emit_mapped_types.ts"],"names":[],"mappings":"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"}

package/dist/src/emit_routes.js

@@ -1,12 +1,10 @@
-import { getDoc } from "@typespec/compiler";
+import { getDoc, isTemplateDeclaration, } from "@typespec/compiler";
 import { getAuthentication, getHttpOperation } from "@typespec/http";
 export const emitRoutes = (context, namespace) => {
     let out = `export const routes_${context.options["root-namespace"]} = {\n`;
     const traverseNamespace = (n, nestLevel) => {
         // operations
-        let opnum = 0;
-        n.operations.forEach((op) => {
-            opnum++;
+        const processOp = (op) => {
             const httpOp = getHttpOperation(context.program, op);
             // jsdoc comment
             const doc = getDoc(context.program, op);
@@ -58,8 +56,13 @@ export const emitRoutes = (context, namespace) => {
                         .join(", ")}}`)
                 .join(", ")}]`, nestLevel + 2);
             // finalize route entry
-            out = out.addLine(`}${opnum < n.operations.size || n.namespaces.size > 0 ? "," : ""}`, nestLevel + 1);
-        }); // end operations
+            out = out.addLine("},", nestLevel + 1);
+        }; // end operations
+        n.operations.forEach(processOp);
+        n.interfaces.forEach((itf) => {
+            if (!isTemplateDeclaration(itf))
+                itf.operations.forEach(processOp);
+        });
         // get and traverse all namespaces
         let nsnum = 0;
         n.namespaces.forEach((ns) => {

package/dist/src/emit_routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit_routes.js","sourceRoot":"","sources":["../../src/emit_routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emit_routes.js","sourceRoot":"","sources":["../../src/emit_routes.ts"],"names":[],"mappings":"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"}

package/dist/src/emit_types.js

@@ -7,7 +7,12 @@ const emitTypes = (context, namespace, options) => {
         let file = "";
         n.enums.forEach((e) => {
             if (options["enable-types"]) {
-                const resolved = resolveEnum(e, 0, true);
+                const resolved = resolveEnum(e, {
+                    context: context,
+                    currentNamespace: n,
+                    nestlevel: 0,
+                    isNamespaceRoot: true,
+                });
                 if (resolved) {
                     const doc = getDoc(context.program, e);
                     if (doc)
@@ -18,7 +23,12 @@ const emitTypes = (context, namespace, options) => {
         });
         n.unions.forEach((u) => {
             if (options["enable-types"]) {
-                const resolved = resolveUnion(u, 0, n, context, true);
+                const resolved = resolveUnion(u, {
+                    currentNamespace: n,
+                    context,
+                    nestlevel: 0,
+                    isNamespaceRoot: true,
+                });
                 if (resolved) {
                     const doc = getDoc(context.program, u);
                     if (doc)
@@ -29,7 +39,12 @@ const emitTypes = (context, namespace, options) => {
         });
         n.models.forEach((m) => {
             if (options["enable-types"]) {
-                const resolved = resolveModel(m, 0, n, context, true);
+                const resolved = resolveModel(m, {
+                    nestlevel: 0,
+                    currentNamespace: n,
+                    context,
+                    isNamespaceRoot: true,
+                });
                 if (resolved) {
                     const doc = getDoc(context.program, m);
                     if (doc)

package/dist/src/emit_types.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit_types.js","sourceRoot":"","sources":["../../src/emit_types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emit_types.js","sourceRoot":"","sources":["../../src/emit_types.ts"],"names":[],"mappings":"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"}

package/dist/src/emit_types_resolve.d.ts

@@ -1,9 +1,19 @@
 import { ArrayModelType, EmitContext, Enum, Model, Namespace, RecordModelType, Scalar, Tuple, Type, Union } from "@typespec/compiler";
-export declare const resolveType: (t: Type, nestlevel: number, currentNamespace: Namespace, context?: EmitContext) => string;
-export declare const resolveArray: (a: ArrayModelType, nestlevel: number, currentNamespace: Namespace, context?: EmitContext) => string;
-export declare const resolveRecord: (a: RecordModelType, nestlevel: number, currentNamespace: Namespace, context?: EmitContext) => string;
-export declare const resolveEnum: (e: Enum, nestlevel: number, isNamespaceRoot?: boolean) => string;
-export declare const resolveTuple: (t: Tuple, nestlevel: number, currentNamespace: Namespace, context?: EmitContext) => string;
-export declare const resolveUnion: (u: Union, nestlevel: number, currentNamespace: Namespace, context?: EmitContext, isNamespaceRoot?: boolean) => string;
+import { Visibility } from "@typespec/http";
+type CommonOptions = {
+    nestlevel: number;
+    currentNamespace: Namespace;
+    context: EmitContext;
+    visibility?: Visibility;
+    resolveEvenWithName?: boolean;
+    isNamespaceRoot?: boolean;
+};
+export declare const resolveType: (t: Type, opts: CommonOptions) => string;
+export declare const resolveArray: (a: ArrayModelType, opts: CommonOptions) => string;
+export declare const resolveRecord: (a: RecordModelType, opts: CommonOptions) => string;
+export declare const resolveEnum: (e: Enum, opts: CommonOptions) => string;
+export declare const resolveTuple: (t: Tuple, opts: CommonOptions) => string;
+export declare const resolveUnion: (u: Union, opts: CommonOptions) => string;
 export declare const resolveScalar: (s: Scalar) => string;
-export declare const resolveModel: (m: Model, nestlevel: number | undefined, currentNamespace: Namespace, context?: EmitContext, isNamespaceRoot?: boolean) => string;
+export declare const resolveModel: (m: Model, opts: CommonOptions) => string;
+export {};

package/dist/src/emit_types_resolve.js

@@ -1,22 +1,23 @@
 import { getDoc, } from "@typespec/compiler";
-export const resolveType = (t, nestlevel, currentNamespace, context) => {
+import { isVisible } from "@typespec/http";
+export const resolveType = (t, opts) => {
     let typeStr = "unknown";
     switch (t.kind) {
         case "Model":
             if (t.name === "Array") {
-                typeStr = resolveArray(t, nestlevel, currentNamespace, context);
+                typeStr = resolveArray(t, opts);
             }
             else if (t.name === "Record") {
-                typeStr = resolveRecord(t, nestlevel, currentNamespace, context);
+                typeStr = resolveRecord(t, opts);
             }
             else
-                typeStr = resolveModel(t, nestlevel + 1, currentNamespace, context);
+                typeStr = resolveModel(t, opts);
             break;
         case "Boolean":
             typeStr = "boolean";
             break;
         case "Enum":
-            typeStr = resolveEnum(t, nestlevel);
+            typeStr = resolveEnum(t, opts);
             break;
         case "Intrinsic":
             typeStr = t.name;
@@ -31,28 +32,31 @@ export const resolveType = (t, nestlevel, currentNamespace, context) => {
             typeStr = `'${t.value}'`;
             break;
         case "Tuple":
-            typeStr = resolveTuple(t, nestlevel, currentNamespace, context);
+            typeStr = resolveTuple(t, opts);
             break;
         case "Union":
-            typeStr = resolveUnion(t, nestlevel, currentNamespace, context);
+            typeStr = resolveUnion(t, opts);
             break;
         default:
             console.warn("Could not resolve type:", t.kind);
     }
     return typeStr;
 };
-export const resolveArray = (a, nestlevel, currentNamespace, context) => {
+export const resolveArray = (a, opts) => {
     if (a.name !== "Array")
         throw new Error(`Trying to parse model ${a.name} as Array`);
-    return `${resolveType(a.indexer.value, nestlevel, currentNamespace, context)}[]`;
+    return `(${resolveType(a.indexer.value, opts)})[]`;
 };
-export const resolveRecord = (a, nestlevel, currentNamespace, context) => {
+export const resolveRecord = (a, opts) => {
     if (a.name !== "Record")
         throw new Error(`Trying to parse model ${a.name} as Record`);
-    return `{[k: string]: ${resolveType(a.indexer.value, nestlevel, currentNamespace, context)}}`;
+    return `{[k: string]: ${resolveType(a.indexer.value, opts)}}`;
 };
-export const resolveEnum = (e, nestlevel, isNamespaceRoot) => {
-    if (e.name && !isNamespaceRoot && e.namespace?.enums.has(e.name))
+export const resolveEnum = (e, opts) => {
+    if (e.name &&
+        !opts.isNamespaceRoot &&
+        e.namespace?.enums.has(e.name) &&
+        !opts.resolveEvenWithName)
         return e.name;
     let ret = "{\n";
     let i = 1;
@@ -61,20 +65,23 @@ export const resolveEnum = (e, nestlevel, isNamespaceRoot) => {
             ? ""
             : " = " +
                 (typeof p.value === "string" ? `'${p.value}'` : p.value.toString());
-        ret = ret.addLine(`${p.name.includes("-") ? `'${p.name}'` : p.name}${val}${i < e.members.size ? "," : ""}`, nestlevel + 1);
+        ret = ret.addLine(`${p.name.includes("-") ? `'${p.name}'` : p.name}${val}${i < e.members.size ? "," : ""}`, opts.nestlevel + 1);
         i++;
     });
-    ret = ret.addLine("}", nestlevel, true);
+    ret = ret.addLine("}", opts.nestlevel, true);
     return ret;
 };
-export const resolveTuple = (t, nestlevel, currentNamespace, context) => {
-    return `[${t.values.map((v) => resolveType(v, nestlevel, currentNamespace, context)).join(", ")}]`;
+export const resolveTuple = (t, opts) => {
+    return `[${t.values.map((v) => resolveType(v, opts)).join(", ")}]`;
 };
-export const resolveUnion = (u, nestlevel, currentNamespace, context, isNamespaceRoot) => {
-    if (u.name && !isNamespaceRoot && u.namespace?.unions.has(u.name))
+export const resolveUnion = (u, opts) => {
+    if (u.name &&
+        !opts.isNamespaceRoot &&
+        u.namespace?.unions.has(u.name) &&
+        !opts.resolveEvenWithName)
         return u.name;
     return Array.from(u.variants)
-        .map((v) => resolveType(v[1].type, nestlevel, currentNamespace, context))
+        .map((v) => resolveType(v[1].type, opts))
         .join(" | ");
 };
 export const resolveScalar = (s) => {
@@ -108,24 +115,33 @@ export const resolveScalar = (s) => {
     }
     return s.baseScalar ? resolveScalar(s.baseScalar) : ret;
 };
-export const resolveModel = (m, nestlevel = 0, currentNamespace, context, isNamespaceRoot) => {
-    if (m.name && !isNamespaceRoot && currentNamespace.namespace === m.namespace)
+export const resolveModel = (m, opts) => {
+    if (m.name &&
+        !opts.isNamespaceRoot &&
+        opts.currentNamespace.namespace === m.namespace &&
+        !opts.resolveEvenWithName)
         return m.name;
     let ret = "{\n";
     let i = 1;
     m.properties.forEach((p) => {
-        if (context) {
-            const doc = getDoc(context.program, p);
-            if (doc)
-                ret = ret.addLine(`/** ${doc} */`, nestlevel + 1);
+        if (opts.visibility === undefined ||
+            isVisible(opts.context.program, p, opts.visibility)) {
+            if (opts.context) {
+                const doc = getDoc(opts.context.program, p);
+                if (doc)
+                    ret = ret.addLine(`/** ${doc} */`, opts.nestlevel + 1);
+            }
+            const typeStr = resolveType(p.type, {
+                ...opts,
+                nestlevel: opts.nestlevel + 1,
+            });
+            if (typeStr.includes("unknown"))
+                console.warn(`Could not resolve property ${p.name} on ${m.name}`);
+            ret = ret.addLine(`${p.name}${p.optional ? "?" : ""}: ${typeStr}${i < m.properties.size ? "," : ""}`, opts.nestlevel + 1);
         }
-        const typeStr = resolveType(p.type, nestlevel, currentNamespace, context);
-        if (typeStr.includes("unknown"))
-            console.warn(`Could not resolve property ${p.name} on ${m.name}`);
-        ret = ret.addLine(`${p.name}${p.optional ? "?" : ""}: ${typeStr}${i < m.properties.size ? "," : ""}`, nestlevel + 1);
         i++;
     });
-    ret = ret.addLine("}", nestlevel, true);
+    ret = ret.addLine("}", opts.nestlevel, true);
     return ret;
 };
 //# sourceMappingURL=emit_types_resolve.js.map

package/dist/src/emit_types_resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit_types_resolve.js","sourceRoot":"","sources":["../../src/emit_types_resolve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emit_types_resolve.js","sourceRoot":"","sources":["../../src/emit_types_resolve.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-typescript-emitter",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A TypeSpec library providing an emitter that generates TypeScript types and a structured routes object for robust importing",
   "homepage": "https://github.com/crowbait/typespec-typescript-emitter#readme",
   "bugs": "https://github.com/crowbait/typespec-typescript-emitter/issues",

package/src/emit_mapped_types.ts

@@ -1,5 +1,15 @@
-import { EmitContext, Namespace, Type } from "@typespec/compiler";
-import { getHttpOperation } from "@typespec/http";
+import {
+  EmitContext,
+  isTemplateDeclaration,
+  Namespace,
+  Operation,
+  Type,
+} from "@typespec/compiler";
+import {
+  getHttpOperation,
+  resolveRequestVisibility,
+  Visibility,
+} from "@typespec/http";
 import { resolveType } from "./emit_types_resolve.js";
 
 export const emitRoutedTypemap = (
@@ -7,44 +17,55 @@ export const emitRoutedTypemap = (
   namespace: Namespace,
 ): string => {
   const ops: {
-    [K: string]: {
-      // "string" in these does not refer to the type "string"! It's the typescript code as string.
-      request: string;
-      response: Array<{ status: number | "unknown"; body: string }>;
+    [path: string]: {
+      [verb: string]: {
+        // "string" in these does not refer to the type "string"! It's the typescript code as string.
+        request: string;
+        response: Array<{ status: number | "unknown"; body: string }>;
+      };
     };
   } = {};
 
   const traverseNamespace = (n: Namespace): void => {
     // operations
-    n.operations.forEach((op) => {
+    const processOp = (op: Operation) => {
       const httpOp = getHttpOperation(context.program, op);
-      const identifier = httpOp[0].path;
-      ops[identifier] = {
+      const path = httpOp[0].path;
+      const verb = httpOp[0].verb.toUpperCase();
+      if (!ops[path]) ops[path] = {};
+      ops[path][verb] = {
         request: "null",
-        response: [{ status: 200, body: "unknown" }],
+        response: [{ status: 200, body: "{}" }],
       };
 
       // request
       let request = "null";
-      if (op.parameters.properties.has("body")) {
-        request = resolveType(
-          op.parameters.properties.get("body")!.type,
-          1,
-          namespace,
+      if (httpOp[0].parameters.body) {
+        request = resolveType(httpOp[0].parameters.body.type, {
+          nestlevel: 2,
+          currentNamespace: namespace,
           context,
-        );
+          visibility: resolveRequestVisibility(
+            context.program,
+            op,
+            httpOp[0].verb,
+          ),
+          resolveEvenWithName: true,
+        }).replaceAll("\n", "\n  ");
       }
-      ops[identifier].request = request;
+      ops[path][verb].request = request;
 
       // response
       if (op.returnType && op.returnType.kind) {
-        const getReturnType = (t: Type): (typeof ops)[string]["response"] => {
-          const ret: (typeof ops)[string]["response"] = [];
+        const getReturnType = (
+          t: Type,
+        ): (typeof ops)[string][string]["response"] => {
+          const ret: (typeof ops)[string][string]["response"] = [];
           if (t.kind === "Model") {
             // if the return type is a model, it may have a fully qualified body
             const modelret: (typeof ret)[number] = {
               status: 200,
-              body: "unknown",
+              body: "{}",
             };
             let wasQualifiedBody = false;
             t.properties.forEach((prop) => {
@@ -57,14 +78,26 @@ export const emitRoutedTypemap = (
                   modelret.status = prop.type.value;
                 // one of the properties may be the body definition
                 if (dec.definition?.name === "@body") {
-                  modelret.body = resolveType(prop.type, 1, namespace, context);
+                  modelret.body = resolveType(prop.type, {
+                    nestlevel: 2,
+                    currentNamespace: namespace,
+                    context,
+                    visibility: Visibility.Read,
+                    resolveEvenWithName: true,
+                  }).replaceAll("\n", "\n  ");
                   wasQualifiedBody = true;
                 }
               });
             });
             // ... if not, we assume status 200 and treat the model as the body
             if (!wasQualifiedBody) {
-              modelret.body = resolveType(t, 1, namespace, context);
+              modelret.body = resolveType(t, {
+                nestlevel: 2,
+                currentNamespace: namespace,
+                context,
+                visibility: Visibility.Read,
+                resolveEvenWithName: true,
+              }).replaceAll("\n", "\n  ");
             }
             ret.push(modelret);
           } else if (t.kind === "Union") {
@@ -73,12 +106,27 @@ export const emitRoutedTypemap = (
             t.variants.forEach((variant) => {
               ret.push(...getReturnType(variant.type));
             });
-          } else ret.push({ status: 200, body: resolveType(t, 1, namespace) });
+          } else
+            ret.push({
+              status: 200,
+              body: resolveType(t, {
+                nestlevel: 1,
+                currentNamespace: namespace,
+                context,
+                visibility: Visibility.Read,
+                resolveEvenWithName: true,
+              }),
+            });
           return ret;
         };
-        ops[identifier].response = getReturnType(op.returnType);
+        ops[path][verb].response = getReturnType(op.returnType);
       }
-    }); // end operations
+    }; // end operations
+
+    n.operations.forEach(processOp);
+    n.interfaces.forEach((itf) => {
+      if (!isTemplateDeclaration(itf)) itf.operations.forEach(processOp);
+    });
 
     // get and traverse all namespaces
     n.namespaces.forEach((ns) => traverseNamespace(ns));
@@ -87,12 +135,19 @@ export const emitRoutedTypemap = (
   traverseNamespace(namespace);
   let out = `export type types_${context.options["root-namespace"]} = {\n`;
   out += Object.entries(ops)
-    .map((op) => {
-      let ret = `  ['${op[0]}']: {\n`;
-      ret += `    request: ${op[1].request}\n`;
-      ret += `    response: ${op[1].response.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}\n`;
-      ret += "  }";
-      return ret;
+    .map((path) => {
+      let pathret = `  ['${path[0]}']: {\n`;
+      pathret += Object.entries(path[1])
+        .map((verb) => {
+          let verbret = `    ['${verb[0]}']: {\n`;
+          verbret += `      request: ${verb[1].request}\n`;
+          verbret += `      response: ${verb[1].response.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}\n`;
+          verbret += "    }";
+          return verbret;
+        })
+        .join(",\n");
+      pathret += "\n  }";
+      return pathret;
     })
     .join(",\n");
   out += "\n};\n";

package/src/emit_routes.ts

@@ -1,4 +1,10 @@
-import { EmitContext, getDoc, Namespace } from "@typespec/compiler";
+import {
+  EmitContext,
+  getDoc,
+  isTemplateDeclaration,
+  Namespace,
+  Operation,
+} from "@typespec/compiler";
 import { getAuthentication, getHttpOperation } from "@typespec/http";
 
 export const emitRoutes = (
@@ -9,9 +15,7 @@ export const emitRoutes = (
 
   const traverseNamespace = (n: Namespace, nestLevel: number): void => {
     // operations
-    let opnum = 0;
-    n.operations.forEach((op) => {
-      opnum++;
+    const processOp = (op: Operation) => {
       const httpOp = getHttpOperation(context.program, op);
 
       // jsdoc comment
@@ -90,11 +94,13 @@ export const emitRoutes = (
       );
 
       // finalize route entry
-      out = out.addLine(
-        `}${opnum < n.operations.size || n.namespaces.size > 0 ? "," : ""}`,
-        nestLevel + 1,
-      );
-    }); // end operations
+      out = out.addLine("},", nestLevel + 1);
+    }; // end operations
+
+    n.operations.forEach(processOp);
+    n.interfaces.forEach((itf) => {
+      if (!isTemplateDeclaration(itf)) itf.operations.forEach(processOp);
+    });
 
     // get and traverse all namespaces
     let nsnum = 0;

package/src/emit_types.ts

@@ -22,7 +22,12 @@ const emitTypes = (
 
     n.enums.forEach((e) => {
       if (options["enable-types"]) {
-        const resolved = resolveEnum(e, 0, true);
+        const resolved = resolveEnum(e, {
+          context: context,
+          currentNamespace: n,
+          nestlevel: 0,
+          isNamespaceRoot: true,
+        });
         if (resolved) {
           const doc = getDoc(context.program, e);
           if (doc) file = file.addLine(`/** ${doc} */`);
@@ -32,7 +37,12 @@ const emitTypes = (
     });
     n.unions.forEach((u) => {
       if (options["enable-types"]) {
-        const resolved = resolveUnion(u, 0, n, context, true);
+        const resolved = resolveUnion(u, {
+          currentNamespace: n,
+          context,
+          nestlevel: 0,
+          isNamespaceRoot: true,
+        });
         if (resolved) {
           const doc = getDoc(context.program, u);
           if (doc) file = file.addLine(`/** ${doc} */`);
@@ -42,13 +52,19 @@ const emitTypes = (
     });
     n.models.forEach((m) => {
       if (options["enable-types"]) {
-        const resolved = resolveModel(m, 0, n, context, true);
+        const resolved = resolveModel(m, {
+          nestlevel: 0,
+          currentNamespace: n,
+          context,
+          isNamespaceRoot: true,
+        });
         if (resolved) {
           const doc = getDoc(context.program, m);
           if (doc) file = file.addLine(`/** ${doc} */`);
           file = file.addLine(`export interface ${m.name} ${resolved};`);
         }
       }
+
       if (options["enable-typeguards"]) {
         file = file.addLine(
           `export function is${m.name}(arg: any): arg is ${m.name} {`,

package/src/emit_types_resolve.ts

@@ -11,38 +11,32 @@ import {
   Type,
   Union,
 } from "@typespec/compiler";
+import { isVisible, Visibility } from "@typespec/http";
 
-export const resolveType = (
-  t: Type,
-  nestlevel: number,
-  currentNamespace: Namespace,
-  context?: EmitContext,
-): string => {
+type CommonOptions = {
+  nestlevel: number;
+  currentNamespace: Namespace;
+  context: EmitContext;
+  visibility?: Visibility;
+  resolveEvenWithName?: boolean;
+  isNamespaceRoot?: boolean;
+};
+
+export const resolveType = (t: Type, opts: CommonOptions): string => {
   let typeStr = "unknown";
   switch (t.kind) {
     case "Model":
       if (t.name === "Array") {
-        typeStr = resolveArray(
-          t as ArrayModelType,
-          nestlevel,
-          currentNamespace,
-          context,
-        );
+        typeStr = resolveArray(t as ArrayModelType, opts);
       } else if (t.name === "Record") {
-        typeStr = resolveRecord(
-          t as RecordModelType,
-          nestlevel,
-          currentNamespace,
-          context,
-        );
-      } else
-        typeStr = resolveModel(t, nestlevel + 1, currentNamespace, context);
+        typeStr = resolveRecord(t as RecordModelType, opts);
+      } else typeStr = resolveModel(t, opts);
       break;
     case "Boolean":
       typeStr = "boolean";
       break;
     case "Enum":
-      typeStr = resolveEnum(t, nestlevel);
+      typeStr = resolveEnum(t, opts);
       break;
     case "Intrinsic":
       typeStr = t.name;
@@ -57,10 +51,10 @@ export const resolveType = (
       typeStr = `'${t.value}'`;
       break;
     case "Tuple":
-      typeStr = resolveTuple(t, nestlevel, currentNamespace, context);
+      typeStr = resolveTuple(t, opts);
       break;
     case "Union":
-      typeStr = resolveUnion(t, nestlevel, currentNamespace, context);
+      typeStr = resolveUnion(t, opts);
       break;
     default:
       console.warn("Could not resolve type:", t.kind);
@@ -70,32 +64,29 @@ export const resolveType = (
 
 export const resolveArray = (
   a: ArrayModelType,
-  nestlevel: number,
-  currentNamespace: Namespace,
-  context?: EmitContext,
+  opts: CommonOptions,
 ): string => {
   if (a.name !== "Array")
     throw new Error(`Trying to parse model ${a.name} as Array`);
-  return `${resolveType(a.indexer.value, nestlevel, currentNamespace, context)}[]`;
+  return `(${resolveType(a.indexer.value, opts)})[]`;
 };
 
 export const resolveRecord = (
   a: RecordModelType,
-  nestlevel: number,
-  currentNamespace: Namespace,
-  context?: EmitContext,
+  opts: CommonOptions,
 ): string => {
   if (a.name !== "Record")
     throw new Error(`Trying to parse model ${a.name} as Record`);
-  return `{[k: string]: ${resolveType(a.indexer.value, nestlevel, currentNamespace, context)}}`;
+  return `{[k: string]: ${resolveType(a.indexer.value, opts)}}`;
 };
 
-export const resolveEnum = (
-  e: Enum,
-  nestlevel: number,
-  isNamespaceRoot?: boolean,
-): string => {
-  if (e.name && !isNamespaceRoot && e.namespace?.enums.has(e.name))
+export const resolveEnum = (e: Enum, opts: CommonOptions): string => {
+  if (
+    e.name &&
+    !opts.isNamespaceRoot &&
+    e.namespace?.enums.has(e.name) &&
+    !opts.resolveEvenWithName
+  )
     return e.name;
   let ret = "{\n";
   let i = 1;
@@ -107,34 +98,28 @@ export const resolveEnum = (
           (typeof p.value === "string" ? `'${p.value}'` : p.value.toString());
     ret = ret.addLine(
       `${p.name.includes("-") ? `'${p.name}'` : p.name}${val}${i < e.members.size ? "," : ""}`,
-      nestlevel + 1,
+      opts.nestlevel + 1,
     );
     i++;
   });
-  ret = ret.addLine("}", nestlevel, true);
+  ret = ret.addLine("}", opts.nestlevel, true);
   return ret;
 };
 
-export const resolveTuple = (
-  t: Tuple,
-  nestlevel: number,
-  currentNamespace: Namespace,
-  context?: EmitContext,
-): string => {
-  return `[${t.values.map((v) => resolveType(v, nestlevel, currentNamespace, context)).join(", ")}]`;
+export const resolveTuple = (t: Tuple, opts: CommonOptions): string => {
+  return `[${t.values.map((v) => resolveType(v, opts)).join(", ")}]`;
 };
 
-export const resolveUnion = (
-  u: Union,
-  nestlevel: number,
-  currentNamespace: Namespace,
-  context?: EmitContext,
-  isNamespaceRoot?: boolean,
-): string => {
-  if (u.name && !isNamespaceRoot && u.namespace?.unions.has(u.name))
+export const resolveUnion = (u: Union, opts: CommonOptions): string => {
+  if (
+    u.name &&
+    !opts.isNamespaceRoot &&
+    u.namespace?.unions.has(u.name) &&
+    !opts.resolveEvenWithName
+  )
     return u.name;
   return Array.from(u.variants)
-    .map((v) => resolveType(v[1].type, nestlevel, currentNamespace, context))
+    .map((v) => resolveType(v[1].type, opts))
     .join(" | ");
 };
 export const resolveScalar = (s: Scalar): string => {
@@ -169,31 +154,38 @@ export const resolveScalar = (s: Scalar): string => {
   return s.baseScalar ? resolveScalar(s.baseScalar) : ret;
 };
 
-export const resolveModel = (
-  m: Model,
-  nestlevel: number = 0,
-  currentNamespace: Namespace,
-  context?: EmitContext,
-  isNamespaceRoot?: boolean,
-): string => {
-  if (m.name && !isNamespaceRoot && currentNamespace.namespace === m.namespace)
+export const resolveModel = (m: Model, opts: CommonOptions): string => {
+  if (
+    m.name &&
+    !opts.isNamespaceRoot &&
+    opts.currentNamespace.namespace === m.namespace &&
+    !opts.resolveEvenWithName
+  )
     return m.name;
   let ret = "{\n";
   let i = 1;
   m.properties.forEach((p) => {
-    if (context) {
-      const doc = getDoc(context.program, p);
-      if (doc) ret = ret.addLine(`/** ${doc} */`, nestlevel + 1);
+    if (
+      opts.visibility === undefined ||
+      isVisible(opts.context.program, p, opts.visibility)
+    ) {
+      if (opts.context) {
+        const doc = getDoc(opts.context.program, p);
+        if (doc) ret = ret.addLine(`/** ${doc} */`, opts.nestlevel! + 1);
+      }
+      const typeStr = resolveType(p.type, {
+        ...opts,
+        nestlevel: opts.nestlevel + 1,
+      });
+      if (typeStr.includes("unknown"))
+        console.warn(`Could not resolve property ${p.name} on ${m.name}`);
+      ret = ret.addLine(
+        `${p.name}${p.optional ? "?" : ""}: ${typeStr}${i < m.properties.size ? "," : ""}`,
+        opts.nestlevel + 1,
+      );
     }
-    const typeStr = resolveType(p.type, nestlevel, currentNamespace, context);
-    if (typeStr.includes("unknown"))
-      console.warn(`Could not resolve property ${p.name} on ${m.name}`);
-    ret = ret.addLine(
-      `${p.name}${p.optional ? "?" : ""}: ${typeStr}${i < m.properties.size ? "," : ""}`,
-      nestlevel + 1,
-    );
     i++;
   });
-  ret = ret.addLine("}", nestlevel, true);
+  ret = ret.addLine("}", opts.nestlevel, true);
   return ret;
 };