typespec-typescript-emitter 1.1.1 → 1.1.2

package/.husky/pre-commit

@@ -1,3 +1,4 @@
+npm run test
 npm run lint
 npm run format
 npm run build

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.1.2](https://github.com/crowbait/typespec-typescript-emitter/compare/v1.1.1...v1.1.2) (2025-11-17)
+
+
+
 ## [1.1.1](https://github.com/crowbait/typespec-typescript-emitter/compare/v1.1.0...v1.1.1) (2025-09-26)
 
 
@@ -40,12 +44,3 @@
 
 
 
-# [0.4.0](https://github.com/crowbait/typespec-typescript-emitter/compare/v0.3.5...v0.4.0) (2025-02-25)
-
-
-### Features
-
-* option to emit relative URLs in routes object ([be50613](https://github.com/crowbait/typespec-typescript-emitter/commit/be50613ac94550899805faf2555b3f407d88be33))
-
-
-

package/dist/src/emit_types_resolve.d.ts

@@ -16,4 +16,6 @@ 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, opts: CommonOptions) => string;
+export declare const resolveEnumMemberValue: (e: Enum, name: string) => string | number | undefined;
+export declare const resolveEnumAsUnion: (e: Enum) => string;
 export {};

package/dist/src/emit_types_resolve.js

@@ -37,6 +37,17 @@ export const resolveType = (t, opts) => {
         case "Union":
             typeStr = resolveUnion(t, opts);
             break;
+        case "EnumMember":
+            if (opts.resolveEvenWithName) {
+                // If we're at routed typemap we will just emit enum value
+                const value = resolveEnumMemberValue(t.enum, t.name);
+                if (value) {
+                    typeStr = typeof value === "string" ? `'${value}'` : value.toString();
+                }
+                break;
+            }
+            typeStr = `${t.enum.name}.${t.name}`;
+            break;
         default:
             console.warn("Could not resolve type:", t.kind);
     }
@@ -45,7 +56,7 @@ export const resolveType = (t, opts) => {
 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, opts)})[]`;
+    return `(${resolveType(a.indexer.value, { ...opts, isNamespaceRoot: false })})[]`;
 };
 export const resolveRecord = (a, opts) => {
     if (a.name !== "Record")
@@ -55,9 +66,13 @@ export const resolveRecord = (a, opts) => {
 export const resolveEnum = (e, opts) => {
     if (e.name &&
         !opts.isNamespaceRoot &&
-        e.namespace?.enums.has(e.name) &&
-        !opts.resolveEvenWithName)
+        opts.currentNamespace.enums.has(e.name) &&
+        !opts.resolveEvenWithName) {
         return e.name;
+    }
+    if (opts.resolveEvenWithName) {
+        return resolveEnumAsUnion(e);
+    }
     let ret = "{\n";
     let i = 1;
     e.members.forEach((p) => {
@@ -81,7 +96,19 @@ export const resolveUnion = (u, opts) => {
         !opts.resolveEvenWithName)
         return u.name;
     return Array.from(u.variants)
-        .map((v) => resolveType(v[1].type, opts))
+        .map((v) => {
+        const variantType = v[1].type;
+        // If variant is a named model in the current namespace
+        // and it's not in routed typemap, reference it by name:
+        if (!opts.resolveEvenWithName &&
+            variantType.kind === "Model" &&
+            variantType.name &&
+            opts.currentNamespace.models.has(variantType.name)) {
+            return variantType.name;
+        }
+        // Otherwise resolve type inline
+        return resolveType(variantType, { ...opts, isNamespaceRoot: false });
+    })
         .join(" | ");
 };
 export const resolveScalar = (s) => {
@@ -118,7 +145,7 @@ export const resolveScalar = (s) => {
 export const resolveModel = (m, opts) => {
     if (m.name &&
         !opts.isNamespaceRoot &&
-        opts.currentNamespace.namespace === m.namespace &&
+        opts.currentNamespace.models.has(m.name) &&
         !opts.resolveEvenWithName)
         return m.name;
     let ret = "{\n";
@@ -134,6 +161,7 @@ export const resolveModel = (m, opts) => {
             const typeStr = resolveType(p.type, {
                 ...opts,
                 nestlevel: opts.nestlevel + 1,
+                isNamespaceRoot: false,
             });
             if (typeStr.includes("unknown"))
                 console.warn(`Could not resolve property ${p.name} on ${m.name}`);
@@ -144,4 +172,20 @@ export const resolveModel = (m, opts) => {
     ret = ret.addLine("}", opts.nestlevel, true);
     return ret;
 };
+export const resolveEnumMemberValue = (e, name) => {
+    const member = e.members.get(name);
+    if (!member) {
+        console.warn("Missing enum member under name:", name);
+        return;
+    }
+    return member?.value;
+};
+export const resolveEnumAsUnion = (e) => {
+    return Array.from(e.members.values())
+        .map((member, index) => {
+        const value = resolveEnumMemberValue(e, member.name) ?? index;
+        return typeof value === "string" ? `'${value}'` : value.toString();
+    })
+        .join(" | ");
+};
 //# 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/dist/src/index.d.ts

@@ -1,2 +1,2 @@
 export { $onEmit } from "./emitter.js";
-export { $lib } from "./lib.js";
+export { $lib, EmitterOptions } from "./lib.js";

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,IAAI,EAAkB,MAAM,UAAU,CAAC"}

package/eslint.config.js

@@ -9,6 +9,8 @@ export default tsEslint.config(
       "**/.temp/**/*",
       "**/*.md",
       "**/node_modules/**/*",
+      "**/test/out/**/*",
+      "**/test/targets/**/*",
     ],
   },
   eslint.configs.recommended,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespec-typescript-emitter",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "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",
@@ -23,12 +23,16 @@
   },
   "devDependencies": {
     "@types/node": "latest",
+    "@typespec/compiler": "^1.6.0",
+    "@typespec/http": "^1.6.0",
+    "@typespec/openapi3": "^1.6.0",
     "eslint": "^9.15.0",
     "husky": "^9.1.6",
     "prettier": "^3.0.3",
     "rimraf": "^6.0.1",
     "typescript": "^5.3.3",
-    "typescript-eslint": "^8.15.0"
+    "typescript-eslint": "^8.15.0",
+    "vitest": "^4.0.10"
   },
   "peerDependencies": {
     "@typespec/compiler": "^1.0.0",
@@ -37,12 +41,12 @@
   "scripts": {
     "build": "rimraf dist && tsc",
     "watch": "tsc --watch",
-    "test": "npm run build && node --test",
     "lint": "eslint src/ test/ --report-unused-disable-directives --max-warnings=0",
     "lint:fix": "eslint . --report-unused-disable-directives --fix",
     "format": "prettier . --write",
     "format:check": "prettier --check .",
     "prepare": "husky",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "test": "vitest run"
   }
 }

package/src/emit_types_resolve.ts

@@ -56,6 +56,17 @@ export const resolveType = (t: Type, opts: CommonOptions): string => {
     case "Union":
       typeStr = resolveUnion(t, opts);
       break;
+    case "EnumMember":
+      if (opts.resolveEvenWithName) {
+        // If we're at routed typemap we will just emit enum value
+        const value = resolveEnumMemberValue(t.enum, t.name);
+        if (value) {
+          typeStr = typeof value === "string" ? `'${value}'` : value.toString();
+        }
+        break;
+      }
+      typeStr = `${t.enum.name}.${t.name}`;
+      break;
     default:
       console.warn("Could not resolve type:", t.kind);
   }
@@ -68,7 +79,7 @@ export const resolveArray = (
 ): string => {
   if (a.name !== "Array")
     throw new Error(`Trying to parse model ${a.name} as Array`);
-  return `(${resolveType(a.indexer.value, opts)})[]`;
+  return `(${resolveType(a.indexer.value, { ...opts, isNamespaceRoot: false })})[]`;
 };
 
 export const resolveRecord = (
@@ -84,10 +95,16 @@ export const resolveEnum = (e: Enum, opts: CommonOptions): string => {
   if (
     e.name &&
     !opts.isNamespaceRoot &&
-    e.namespace?.enums.has(e.name) &&
+    opts.currentNamespace.enums.has(e.name) &&
     !opts.resolveEvenWithName
-  )
+  ) {
     return e.name;
+  }
+
+  if (opts.resolveEvenWithName) {
+    return resolveEnumAsUnion(e);
+  }
+
   let ret = "{\n";
   let i = 1;
   e.members.forEach((p) => {
@@ -119,7 +136,21 @@ export const resolveUnion = (u: Union, opts: CommonOptions): string => {
   )
     return u.name;
   return Array.from(u.variants)
-    .map((v) => resolveType(v[1].type, opts))
+    .map((v) => {
+      const variantType = v[1].type;
+      // If variant is a named model in the current namespace
+      // and it's not in routed typemap, reference it by name:
+      if (
+        !opts.resolveEvenWithName &&
+        variantType.kind === "Model" &&
+        variantType.name &&
+        opts.currentNamespace.models.has(variantType.name)
+      ) {
+        return variantType.name;
+      }
+      // Otherwise resolve type inline
+      return resolveType(variantType, { ...opts, isNamespaceRoot: false });
+    })
     .join(" | ");
 };
 export const resolveScalar = (s: Scalar): string => {
@@ -158,7 +189,7 @@ export const resolveModel = (m: Model, opts: CommonOptions): string => {
   if (
     m.name &&
     !opts.isNamespaceRoot &&
-    opts.currentNamespace.namespace === m.namespace &&
+    opts.currentNamespace.models.has(m.name) &&
     !opts.resolveEvenWithName
   )
     return m.name;
@@ -176,6 +207,7 @@ export const resolveModel = (m: Model, opts: CommonOptions): string => {
       const typeStr = resolveType(p.type, {
         ...opts,
         nestlevel: opts.nestlevel + 1,
+        isNamespaceRoot: false,
       });
       if (typeStr.includes("unknown"))
         console.warn(`Could not resolve property ${p.name} on ${m.name}`);
@@ -189,3 +221,24 @@ export const resolveModel = (m: Model, opts: CommonOptions): string => {
   ret = ret.addLine("}", opts.nestlevel, true);
   return ret;
 };
+
+export const resolveEnumMemberValue = (
+  e: Enum,
+  name: string,
+): string | number | undefined => {
+  const member = e.members.get(name);
+  if (!member) {
+    console.warn("Missing enum member under name:", name);
+    return;
+  }
+  return member?.value;
+};
+
+export const resolveEnumAsUnion = (e: Enum): string => {
+  return Array.from(e.members.values())
+    .map((member, index) => {
+      const value = resolveEnumMemberValue(e, member.name) ?? index;
+      return typeof value === "string" ? `'${value}'` : value.toString();
+    })
+    .join(" | ");
+};

package/src/index.ts

@@ -1,2 +1,2 @@
 export { $onEmit } from "./emitter.js";
-export { $lib } from "./lib.js";
+export { $lib, EmitterOptions } from "./lib.js";

package/test/main.test.ts

@@ -0,0 +1,83 @@
+import { readFileSync, writeFileSync } from "fs";
+import { join } from "path";
+import { expect, it } from "vitest";
+import { runner } from "./runner.js";
+
+const tests = ["simple-routes", "enum", "pr8", "union", "visibility"];
+
+const getTestData = (
+  testName: (typeof tests)[number],
+): {
+  input: string;
+  output: {
+    ts: string;
+    routes: string;
+    routedTypes: string;
+  };
+} => {
+  const targetsFolder = "targets";
+  return {
+    input: readFileSync(join(__dirname, `${targetsFolder}/${testName}.tsp`), {
+      encoding: "utf8",
+    }),
+    output: {
+      ts: readFileSync(
+        join(__dirname, `${targetsFolder}/${testName}.target.ts`),
+        { encoding: "utf8" },
+      )
+        .trim()
+        .replaceAll("\r\n", "\n"),
+      routes: readFileSync(
+        join(__dirname, `${targetsFolder}/${testName}.routes.ts`),
+        { encoding: "utf8" },
+      )
+        .trim()
+        .replaceAll("\r\n", "\n"),
+      routedTypes: readFileSync(
+        join(__dirname, `${targetsFolder}/${testName}.routed-types.ts`),
+        { encoding: "utf8" },
+      )
+        .trim()
+        .replaceAll("\r\n", "\n"),
+    },
+  };
+};
+
+const emitterOptions = {
+  "root-namespace": "test",
+  "enable-routes": true,
+  "enable-types": true,
+  "enable-typeguards": true,
+  "enable-routed-typemap": true,
+};
+
+tests.forEach((test) => {
+  it(`works for ${test}`, async () => {
+    const data = getTestData(test);
+    const emitter = await runner.emit(
+      "typespec-typescript-emitter",
+      emitterOptions,
+    );
+    const result = await emitter.compileAndDiagnose(data.input);
+
+    writeFileSync(
+      join(__dirname, `out/${test}.target.ts`),
+      result[0].outputs["Test.ts"],
+    );
+    writeFileSync(
+      join(__dirname, `out/${test}.routes.ts`),
+      result[0].outputs["routes_test.ts"],
+    );
+    writeFileSync(
+      join(__dirname, `out/${test}.routed-types.ts`),
+      result[0].outputs["routedTypemap_test.ts"],
+    );
+
+    expect(result[1].length).toBe(0);
+    expect(result[0].outputs["Test.ts"].trim()).toBe(data.output.ts);
+    expect(result[0].outputs["routes_test.ts"].trim()).toBe(data.output.routes);
+    expect(result[0].outputs["routedTypemap_test.ts"].trim()).toBe(
+      data.output.routedTypes,
+    );
+  });
+});

package/test/runner.ts

@@ -0,0 +1,5 @@
+import { createTester } from "@typespec/compiler/testing";
+
+export const runner = createTester(".", {
+  libraries: ["@typespec/http", "typespec-typescript-emitter"], // Add other libraries you depend on in your tests
+});

package/test/targets/enum.routed-types.ts

@@ -0,0 +1,59 @@
+/* eslint-disable */
+
+/*
+ * This file is automatically generated by typespec-typescript-emitter.
+ *
+ * You should not change or manipulate this file, as it will be overwritten.
+ * Instead, change the underlying spec.
+ */
+
+export type types_test = {
+  ["/test-simple"]: {
+    ["GET"]: {
+      request: null;
+      response: {
+        status: 200;
+        body: {
+          status: 0 | 1;
+          status_shifted: 1 | 2;
+          status_text: "Status 1" | "Status 2";
+        }[];
+      };
+    };
+    ["POST"]: {
+      request: {
+        status: 0 | 1;
+        status_shifted: 1 | 2;
+        status_text: "Status 1" | "Status 2";
+      };
+      response: {
+        status: 200;
+        body: {
+          /** The status code. */
+          statusCode: 200;
+        };
+      };
+    };
+  };
+  ["/test-simple/{id}"]: {
+    ["GET"]: {
+      request: null;
+      response:
+        | {
+            status: 200;
+            body: {
+              status: 0 | 1;
+              status_shifted: 1 | 2;
+              status_text: "Status 1" | "Status 2";
+            };
+          }
+        | {
+            status: 404;
+            body: {
+              /** The status code. */
+              statusCode: 404;
+            };
+          };
+    };
+  };
+};

package/test/targets/enum.routes.ts

@@ -0,0 +1,29 @@
+/* eslint-disable */
+
+/*
+ * This file is automatically generated by typespec-typescript-emitter.
+ *
+ * You should not change or manipulate this file, as it will be overwritten.
+ * Instead, change the underlying spec.
+ */
+
+export const routes_test = {
+  getAll: {
+    method: "GET",
+    path: "/test-simple",
+    getUrl: (): string => `/test-simple`,
+    auth: [null],
+  },
+  add: {
+    method: "POST",
+    path: "/test-simple",
+    getUrl: (): string => `/test-simple`,
+    auth: [null],
+  },
+  getOne: {
+    method: "GET",
+    path: "/test-simple/{id}",
+    getUrl: (params: { id: string }): string => `/test-simple/${params.id}`,
+    auth: [null],
+  },
+} as const;

package/test/targets/enum.target.ts

@@ -0,0 +1,39 @@
+/* eslint-disable */
+
+/*
+ * This file is automatically generated by typespec-typescript-emitter.
+ *
+ * You should not change or manipulate this file, as it will be overwritten.
+ * Instead, change the underlying spec.
+ */
+
+export enum Status {
+  STATUS_1,
+  STATUS_2,
+}
+
+export enum StatusShifted {
+  STATUS_1 = 1,
+  STATUS_2 = 2,
+}
+
+export enum StatusText {
+  STATUS_1 = "Status 1",
+  STATUS_2 = "Status 2",
+}
+
+export interface TestEnumModel {
+  status: Status;
+  status_shifted: StatusShifted;
+  status_text: StatusText;
+}
+export function isTestEnumModel(arg: any): arg is TestEnumModel {
+  return (
+    arg["status"] !== undefined &&
+    true &&
+    arg["status_shifted"] !== undefined &&
+    true &&
+    arg["status_text"] !== undefined &&
+    true
+  );
+}

package/test/targets/enum.tsp

@@ -0,0 +1,36 @@
+import "@typespec/http";
+using TypeSpec.Http;
+
+@route("/test-simple")
+namespace test {
+enum Status {
+    STATUS_1,
+    STATUS_2
+  }
+  enum StatusShifted {
+    STATUS_1: 1,
+    STATUS_2: 2
+  }
+  enum StatusText {
+    STATUS_1: "Status 1",
+    STATUS_2: "Status 2"
+  }
+  
+  model TestEnumModel {
+    status: Status,
+    status_shifted: StatusShifted,
+    status_text: StatusText
+  }
+
+  @get
+  op getAll(): {@body body: TestEnumModel[]};
+
+  @post
+  op add(@body body: TestEnumModel): OkResponse;
+
+  @get
+  @route("{id}")
+  op getOne(
+    @path id: int32
+  ): {@body body: TestEnumModel} | NotFoundResponse;
+}