fix(cli): module generation fixes

demo/.stl-codegen/index.ts

@@ -1,8 +1,8 @@
 export const typeSchemas = {
   "GET /api/params/{id}": () =>
-    import("./api/params/retrieve.js").then((mod) => mod.GET__api_params_$id$),
+    import("./api/params/retrieve").then((mod) => mod.GET__api_params_$id$),
   "POST /api/posts": () =>
-    import("./api/posts/create.js").then((mod) => mod.POST__api_posts),
+    import("./api/posts/create").then((mod) => mod.POST__api_posts),
   "GET /api/posts/{post}": () =>
-    import("./api/posts/retrieve.js").then((mod) => mod.GET__api_posts_$post$),
+    import("./api/posts/retrieve").then((mod) => mod.GET__api_posts_$post$),
 };

packages/cli/src/index.ts

@@ -42,7 +42,7 @@ import {
   preprocessEndpoint,
 } from "./endpointPreprocess";
 
-import { program as argParser } from "commander";
+import { program as argParser, Option } from "commander";
 import {
   convertPathToImport,
   isSymbolStlMethod,
@@ -64,6 +64,11 @@ argParser.option(
   "the directory in which to generate schemas",
   ".stl-codegen"
 );
+argParser.addOption(
+  new Option("-m, --module-type")
+    .choices(["module", "commonjs"])
+    .default("commonjs")
+);
 argParser.allowExcessArguments(false);
 
 interface CallDiagnostics {
@@ -118,6 +123,7 @@ async function main() {
     },
     rootPath,
     zPackage: "stainless",
+    moduleType: options.moduleType,
   } as const;
   const generationConfig = createGenerationConfig(generationOptions);
 
@@ -604,7 +610,7 @@ async function evaluate(
                 convertPathToImport(
                   generatePath(file.getFilePath(), generationConfig)
                 )
-              )}.js`
+              )}${generationConfig.moduleType === "module" ? ".js" : ""}`
             ),
           ]
         );

packages/ts-to-zod/src/convertType.ts

@@ -311,13 +311,16 @@ export function prefixValueWithModule(
   escapedName?: string
 ): ts.Expression {
   const currentFileInfo = ctx.getFileInfo(currentFilePath);
-  return ctx.generateInUserFile ||
-    (!importFromUserFile && currentFilePath === valueFilePath)
-    ? factory.createIdentifier(escapedName || name)
-    : factory.createPropertyAccessExpression(
-        getModuleIdentifier(currentFileInfo, valueFilePath, importFromUserFile),
-        name
-      );
+  if (ctx.generateInUserFile) {
+    return factory.createIdentifier(escapedName || name);
+  } else if (!importFromUserFile && currentFilePath === valueFilePath) {
+    return factory.createIdentifier(name);
+  } else {
+    return factory.createPropertyAccessExpression(
+      getModuleIdentifier(currentFileInfo, valueFilePath, importFromUserFile),
+      name
+    );
+  }
 }
 
 interface GeneratedSchema {

packages/ts-to-zod/src/filePathConfig.ts

@@ -15,6 +15,7 @@ export interface GenOptions {
   rootPath: string;
   /** the package from where to import the `z` constant */
   zPackage?: string;
+  moduleType?: "commonjs" | "module";
 }
 
 // produced via the _
@@ -24,6 +25,7 @@ export interface GenerationConfig {
   rootPath: string;
   suffix?: string;
   zPackage?: string;
+  moduleType: "commonjs" | "module";
 }
 
 export function createGenerationConfig(options: GenOptions): GenerationConfig {
@@ -52,5 +54,6 @@ export function createGenerationConfig(options: GenOptions): GenerationConfig {
     suffix,
     rootPath: options.rootPath,
     zPackage: options.zPackage,
+    moduleType: options.moduleType || "commonjs",
   };
 }

pnpm-workspace.yaml

@@ -2,4 +2,5 @@ packages:
   - "packages/*"
   - "packages/cli/test_project"
   - "demo"
+  - "todomvc"
   - "docs"

todomvc/.stl-codegen/index.ts

@@ -1,5 +1,5 @@
 export const typeSchemas = {
   "GET /items/:item": () =>
-    import("./src/index.js").then((mod) => mod.GET__items_$58item),
-  "POST /items": () => import("./src/index.js").then((mod) => mod.POST__items),
+    import("./src/index").then((mod) => mod.GET__items_$58item),
+  "POST /items": () => import("./src/index").then((mod) => mod.POST__items),
 };

todomvc/.stl-codegen/src/index.ts

@@ -5,7 +5,7 @@ export const ItemLoader: z.ZodTypeAny = z
   .uuid()
   .stlTransform(new Index.ItemLoader().transform);
 export const RetrievePathParams: z.ZodTypeAny = z.object({
-  item: z.lazy(() => ItemLoaderSchema),
+  item: z.lazy(() => ItemLoader),
 });
 export const Item: z.ZodTypeAny = z.object({
   completed: z.boolean(),

todomvc/src/index.ts

@@ -1,9 +1,5 @@
 import express, { Express, Request, Response } from "express";
 import { Stl, NotFoundError, z } from "stainless";
-import {
-  addStlEndpointToExpress,
-  stlExpressRouteHandler,
-} from "@stl-api/express";
 import * as crypto from "crypto";
 
 import { ItemLoader as ItemLoaderSchema } from "../.stl-codegen/src/index";