@azure-tools/typespec-ts 0.55.0-dev.2 → 0.55.0-dev.3

package/package.json

@@ -1,32 +1,32 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.55.0-dev.2",
+  "version": "0.55.0-dev.3",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
   "exports": {
     ".": {
-      "default": "./dist/src/index.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/src/index.js"
     },
     "./testing": {
-      "default": "./dist/src/testing/index.js",
-      "types": "./dist/src/testing/index.d.ts"
+      "types": "./dist/src/testing/index.d.ts",
+      "default": "./dist/src/testing/index.js"
     }
   },
   "author": "Jose Heredia <joheredi@microsoft.com>",
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "^0.1.0-alpha.37 || >=0.1.0-alpha.38-dev <0.1.0-alpha.38",
+    "@typespec/http-specs": "^0.1.0-alpha.38 || >=0.1.0-alpha.39-dev <0.1.0-alpha.39",
     "@typespec/spector": "^0.1.0-alpha.25 || >=0.1.0-alpha.26-dev <0.1.0-alpha.26",
     "@typespec/spec-api": "^0.1.0-alpha.14 || >=0.1.0-alpha.15-dev <0.1.0-alpha.15",
-    "@typespec/tspd": "^0.74.2 || >=0.75.0-dev <0.75.0",
-    "@azure-tools/azure-http-specs": "^0.1.0-alpha.40 || >=0.1.0-alpha.41-dev <0.1.0-alpha.41",
-    "@azure-tools/typespec-autorest": "^0.68.0 || >=0.69.0-dev <0.69.0",
-    "@azure-tools/typespec-azure-core": "^0.68.0 || >=0.69.0-dev <0.69.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.68.0 || >=0.69.0-dev <0.69.0",
-    "@azure-tools/typespec-client-generator-core": "^0.68.4 || >=0.69.0-dev <0.69.0",
+    "@typespec/tspd": "^0.75.0 || >=0.76.0-dev <0.76.0",
+    "@azure-tools/azure-http-specs": "^0.1.0-alpha.42 || >=0.1.0-alpha.43-dev <0.1.0-alpha.43",
+    "@azure-tools/typespec-autorest": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-client-generator-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -34,12 +34,12 @@
     "@azure/core-rest-pipeline": "^1.14.0",
     "@azure/core-util": "^1.4.0",
     "@azure/logger": "^1.0.4",
-    "@typespec/compiler": "^1.12.0",
-    "@typespec/http": "^1.12.0",
-    "@typespec/openapi": "^1.12.0",
-    "@typespec/rest": "^0.82.0 || >=0.83.0-dev <0.83.0",
-    "@typespec/versioning": "^0.82.0 || >=0.83.0-dev <0.83.0",
-    "@typespec/xml": "^0.82.0 || >=0.83.0-dev <0.83.0",
+    "@typespec/compiler": "^1.13.0",
+    "@typespec/http": "^1.13.0",
+    "@typespec/openapi": "^1.13.0",
+    "@typespec/rest": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/versioning": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0",
     "@typespec/ts-http-runtime": "0.3.5",
     "cross-env": "^10.1.0",
     "mkdirp": "^3.0.1",
@@ -53,13 +53,13 @@
     "yaml": "^2.8.3"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.68.0 || >=0.69.0-dev <0.69.0",
-    "@azure-tools/typespec-client-generator-core": "^0.68.4 || >=0.69.0-dev <0.69.0",
-    "@typespec/compiler": "^1.12.0",
-    "@typespec/http": "^1.12.0",
-    "@typespec/rest": "^0.82.0 || >=0.83.0-dev <0.83.0",
-    "@typespec/versioning": "^0.82.0 || >=0.83.0-dev <0.83.0",
-    "@typespec/xml": "^0.82.0 || >=0.83.0-dev <0.83.0"
+    "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-client-generator-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@typespec/compiler": "^1.13.0",
+    "@typespec/http": "^1.13.0",
+    "@typespec/rest": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/versioning": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0"
   },
   "dependencies": {
     "fast-xml-parser": "^5.7.0",
@@ -127,6 +127,6 @@
     "unit-test": "npm-run-all --parallel unit-test:rlc unit-test:modular",
     "unit-test:rlc": "vitest run --project unit-rlc",
     "unit-test:modular": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vitest run --project unit-modular",
-    "regen-docs": "npm run build && tspd doc . --enable-experimental --output-dir ./website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
+    "regen-docs": "npm run build && tspd doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
   }
 }

package/src/framework/hooks/binder.ts

@@ -1,5 +1,4 @@
-import { normalizePath } from "@typespec/compiler";
-import path from "path/posix";
+import { joinPaths, normalizePath } from "@typespec/compiler";
 import {
   ImportDeclarationStructure,
   ImportSpecifierStructure,
@@ -354,7 +353,7 @@ class BinderImp implements Binder {
 
     // Also keep files that are imported by any used helper file
     const helperFiles = this.project.getSourceFiles(
-      normalizePath(path.join(sourceRoot, "static-helpers/**/*.*ts")),
+      normalizePath(joinPaths(sourceRoot, "static-helpers/**/*.*ts")),
     );
     const usedFiles = helperFiles.filter((file) => !isFileUnused(file, usedHelperNames));
     for (const usedFile of usedFiles) {
@@ -378,7 +377,7 @@ class BinderImp implements Binder {
     }
     this.project
       //normalizae the final path to adapt to different systems
-      .getSourceFiles(normalizePath(path.join(testRoot, "test/generated/util/**/*.*ts")))
+      .getSourceFiles(normalizePath(joinPaths(testRoot, "test/generated/util/**/*.*ts")))
       .filter((file) => isFileUnused(file, usedHelperNames))
       .forEach((helperFile) => helperFile.delete());
   }

package/src/framework/load-static-helpers.ts

@@ -1,6 +1,5 @@
-import { NoTarget, Program } from "@typespec/compiler";
+import { joinPaths, NoTarget, Program } from "@typespec/compiler";
 import { readdir, readFile, stat } from "fs/promises";
-import * as path from "path";
 import {
   ClassDeclaration,
   EnumDeclaration,
@@ -55,7 +54,7 @@ export async function loadStaticHelpers(
 ): Promise<Map<string, StaticHelperMetadata>> {
   const helpersMap = new Map<string, StaticHelperMetadata>();
   // Load static helpers used in sources code
-  const defaultStaticHelpersPath = path.join(
+  const defaultStaticHelpersPath = joinPaths(
     resolveProjectRoot(),
     DEFAULT_SOURCES_STATIC_HELPERS_PATH,
   );
@@ -69,7 +68,7 @@ export async function loadStaticHelpers(
     options.loadTestHelpers ??
     (options.options?.generateTest && isAzurePackage({ options: options.options }))
   ) {
-    const defaultTestingHelpersPath = path.join(
+    const defaultTestingHelpersPath = joinPaths(
       resolveProjectRoot(),
       DEFAULT_SOURCES_TESTING_HELPERS_PATH,
     );
@@ -86,7 +85,7 @@ export async function loadStaticHelpers(
 
   async function loadFiles(files: FileMetadata[], generateDir: string) {
     for (const file of files) {
-      const targetPath = path.join(generateDir, file.target);
+      const targetPath = joinPaths(generateDir, file.target);
       const contents = await readFile(file.source, "utf-8");
       const addedFile = project.createSourceFile(targetPath, contents, {
         overwrite: true,
@@ -200,7 +199,7 @@ async function traverseDirectory(
 
     await Promise.all(
       files.map(async (file) => {
-        const filePath = path.join(directory, file);
+        const filePath = joinPaths(directory, file);
         const fileStat = await stat(filePath);
 
         if (fileStat.isDirectory()) {
@@ -208,11 +207,11 @@ async function traverseDirectory(
             filePath,
             program,
             result,
-            path.join(relativePath, file),
+            joinPaths(relativePath, file),
             targetBaseDir,
           );
         } else if (fileStat.isFile() && !file.endsWith(".d.ts") && /.*\..?ts$/.test(file)) {
-          const target = path.join(targetBaseDir, relativePath, file);
+          const target = joinPaths(targetBaseDir, relativePath, file);
           result.push({ source: filePath, target });
         }
       }),

package/src/index.ts

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { EmitContext, Program } from "@typespec/compiler";
+import { EmitContext, Program, getBaseFileName, joinPaths } from "@typespec/compiler";
+import { existsSync } from "fs";
 import { provideContext, useContext } from "./context-manager.js";
 import { buildRootIndex, buildSubClientIndexFile } from "./modular/build-root-index.js";
 import {
@@ -79,8 +80,6 @@ import {
   createSdkContext,
   listAllServiceNamespaces,
 } from "@azure-tools/typespec-client-generator-core";
-import { existsSync } from "fs";
-import { basename, join } from "path";
 import { Project } from "ts-morph";
 import { provideBinder } from "./framework/hooks/binder.js";
 import { provideSdkTypes } from "./framework/hooks/sdk-types.js";
@@ -220,7 +219,7 @@ export async function $onEmit(context: EmitContext) {
       await clearDirectory(context.emitterOutputDir, ["TempTypeSpecFiles"], program);
     }
     const hasTestFolder = await pathExists(
-      join(dpgContext.generationPathDetail?.metadataDir ?? "", "test"),
+      joinPaths(dpgContext.generationPathDetail?.metadataDir ?? "", "test"),
     );
     options.generateTest =
       options.generateTest === true ||
@@ -232,15 +231,15 @@ export async function $onEmit(context: EmitContext) {
 
   async function calculateGenerationDir(): Promise<GenerationDirDetail> {
     const projectRoot = context.emitterOutputDir ?? "";
-    const customizationFolder = join(projectRoot, "generated");
-    const srcGeneratedFolder = join(projectRoot, "src", "generated");
+    const customizationFolder = joinPaths(projectRoot, "generated");
+    const srcGeneratedFolder = joinPaths(projectRoot, "src", "generated");
     // if customization folder exists, use it as sources root
     const finalCustomizationFolder = (await pathExists(srcGeneratedFolder))
       ? srcGeneratedFolder
       : customizationFolder;
     const sourcesRoot = (await pathExists(finalCustomizationFolder))
       ? finalCustomizationFolder
-      : join(projectRoot, "src");
+      : joinPaths(projectRoot, "src");
     return {
       rootDir: projectRoot,
       metadataDir: projectRoot,
@@ -259,7 +258,10 @@ export async function $onEmit(context: EmitContext) {
 
   async function clearSamplesDevFolder() {
     if (emitterOptions["generate-sample"] === true) {
-      const samplesDevPath = join(dpgContext.generationPathDetail?.rootDir ?? "", "samples-dev");
+      const samplesDevPath = joinPaths(
+        dpgContext.generationPathDetail?.rootDir ?? "",
+        "samples-dev",
+      );
       if (await pathExists(samplesDevPath)) {
         await emptyDir(samplesDevPath);
       }
@@ -316,7 +318,7 @@ export async function $onEmit(context: EmitContext) {
       // platform-types (and its browser/react-native variants); emit those
       // files directly under src/ (strip the static-helpers/ segment) to match
       // the RLC design where all generated output lives in src/.
-      if (!basename(filePath).startsWith("platform-types")) {
+      if (!getBaseFileName(filePath).startsWith("platform-types")) {
         continue;
       }
       const outputPath = filePath.replace(/\/static-helpers\//g, "/");
@@ -450,27 +452,30 @@ export async function $onEmit(context: EmitContext) {
     // to avoid unexpected modifications to files like package.json, README.md,
     // warp.config.yml, and snippets.spec.ts. metadata.json is still updated.
     const sourcesDir = dpgContext.generationPathDetail?.modularSourcesDir ?? "";
-    const hasManualConvenienceLayer = basename(sourcesDir) === "generated";
+    const hasManualConvenienceLayer = getBaseFileName(sourcesDir) === "generated";
     const isAzureFlavor = isAzurePackage({ options: option });
     // Generate metadata
-    const existingPackageFilePath = join(
+    const existingPackageFilePath = joinPaths(
       dpgContext.generationPathDetail?.metadataDir ?? "",
       "package.json",
     );
-    const hasPackageFile = await existsSync(existingPackageFilePath);
-    const existingReadmeFilePath = join(
+    const hasPackageFile = existsSync(existingPackageFilePath);
+    const existingReadmeFilePath = joinPaths(
       dpgContext.generationPathDetail?.metadataDir ?? "",
       "README.md",
     );
-    const hasReadmeFile = await existsSync(existingReadmeFilePath);
-    const existingChangelogFilePath = join(
+    const hasReadmeFile = existsSync(existingReadmeFilePath);
+    const existingChangelogFilePath = joinPaths(
       dpgContext.generationPathDetail?.metadataDir ?? "",
       "CHANGELOG.md",
     );
-    const hasChangelogFile = await existsSync(existingChangelogFilePath);
+    const hasChangelogFile = existsSync(existingChangelogFilePath);
     const shouldGenerateMetadata = option.generateMetadata === true || !hasPackageFile;
-    const existingTestFolderPath = join(dpgContext.generationPathDetail?.metadataDir ?? "", "test");
-    const hasTestFolder = await existsSync(existingTestFolderPath);
+    const existingTestFolderPath = joinPaths(
+      dpgContext.generationPathDetail?.metadataDir ?? "",
+      "test",
+    );
+    const hasTestFolder = existsSync(existingTestFolderPath);
     if (option.generateTest === undefined) {
       if (hasTestFolder) {
         option.generateTest = false;

package/src/lib.ts

@@ -145,18 +145,18 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     "add-credentials": {
       type: "boolean",
       nullable: true,
-      description: `
-      We support two types of authentication: Azure Key Credential(AzureKey) and Token credential(AADToken), any other will need to be handled manually.
-
-      There are two ways to set up our credential details
-
-      - To use \`@useAuth\` decorator in TypeSpec
-      - To config in yaml file
-
-      Please notice defining in TypeSpec is recommended and also has higher priority than second one.
-
-      To enable credential in \`tspconfig.yaml\` and we need to provide more details to let codegen know types.
-      `,
+      description: [
+        "We support two types of authentication: Azure Key Credential(AzureKey) and Token credential(AADToken), any other will need to be handled manually.",
+        "",
+        "There are two ways to set up our credential details",
+        "",
+        "- To use `@useAuth` decorator in TypeSpec",
+        "- To config in yaml file",
+        "",
+        "Please notice defining in TypeSpec is recommended and also has higher priority than second one.",
+        "",
+        "To enable credential in `tspconfig.yaml` and we need to provide more details to let codegen know types.",
+      ].join("\n"),
     },
     "credential-scopes": {
       type: "array",
@@ -186,20 +186,19 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
     "generate-metadata": {
       type: "boolean",
       nullable: true,
-      description: `
-      Whether to generate metadata files which includes package.json, README.md and tsconfig.json etc. Defaults to \`undefined\`. If there's not a package.json under package-dir, defaults to \`true\`. but if you'd like to disable this feature you could set it as \`false\`.
-      `,
+      description:
+        "Whether to generate metadata files which includes package.json, README.md and tsconfig.json etc. Defaults to `undefined`. If there's not a package.json under package-dir, defaults to `true`. but if you'd like to disable this feature you could set it as `false`.",
     },
     "generate-test": {
       type: "boolean",
       nullable: true,
-      description: `
-      Whether to generate test files, for basic testing of your generated sdks. Defaults to \`undefined\`.
-      other cases:
-      - If azure-sdk-for-js is \`false\`. Defaults to \`false\`.
-      - If azure-sdk-for-js is \`true\` but there's a test folder under package-dir. Defaults to \`false\`.
-      - If azure-sdk-for-js is \`true\` but there's not a test folder under package-dir. Defaults to \`true\`.
-      `,
+      description: [
+        "Whether to generate test files, for basic testing of your generated sdks. Defaults to `undefined`.",
+        "other cases:",
+        "- If azure-sdk-for-js is `false`. Defaults to `false`.",
+        "- If azure-sdk-for-js is `true` but there's a test folder under package-dir. Defaults to `false`.",
+        "- If azure-sdk-for-js is `true` but there's not a test folder under package-dir. Defaults to `true`.",
+      ].join("\n"),
     },
     "generate-sample": {
       type: "boolean",
@@ -359,15 +358,16 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       },
       required: [],
       nullable: true,
-      description: `Only for Modular generation
-      By default, code generation uses the titles specified in the \`@client\` and \`@service\` decorators in TypeSpec to name modular clients. If you need to override these names, you can configure the \`typespec-title-map\`. The map's keys represent the original client names from TypeSpec, and the values are the desired client names. This configuration supports renaming multiple clients.
-
-      \`\`\`yaml
-      typespec-title-map: 
-        AnomalyDetectorClient: AnomalyDetectorRest
-        AnomalyDetectorClient2: AnomalyDetectorRest2
-      \`\`\`
-      `,
+      description: [
+        "Only for Modular generation",
+        "By default, code generation uses the titles specified in the `@client` and `@service` decorators in TypeSpec to name modular clients. If you need to override these names, you can configure the `typespec-title-map`. The map's keys represent the original client names from TypeSpec, and the values are the desired client names. This configuration supports renaming multiple clients.",
+        "",
+        "```yaml",
+        "typespec-title-map:",
+        "  AnomalyDetectorClient: AnomalyDetectorRest",
+        "  AnomalyDetectorClient2: AnomalyDetectorRest2",
+        "```",
+      ].join("\n"),
     },
     "should-use-pnpm-dep": {
       type: "boolean",

package/src/modular/build-project-files.ts

@@ -1,6 +1,6 @@
 import { NameType } from "../rlc-common/index.js";
 
-import path from "path/posix";
+import { getRelativePathFromDirectory, joinPaths } from "@typespec/compiler";
 import { useContext } from "../context-manager.js";
 import { getClientHierarchyMap, getModularClientOptions } from "../utils/client-utils.js";
 import { SdkContext } from "../utils/interfaces.js";
@@ -19,7 +19,10 @@ function getSourceRootPrefix(emitterOptions: ModularEmitterOptions, context: Sdk
   const rootDir = (context.generationPathDetail?.rootDir ?? "").replace(/\\/g, "/");
 
   if (rootDir && sourceRoot.startsWith(rootDir)) {
-    const relativePath = path.relative(rootDir, sourceRoot).replace(/\\/g, "/");
+    const relativePath = getRelativePathFromDirectory(rootDir, sourceRoot, false).replace(
+      /\\/g,
+      "/",
+    );
     return `./${relativePath}`;
   }
 
@@ -95,7 +98,7 @@ export function getModuleExports(context: SdkContext, emitterOptions: ModularEmi
 function getModelSubpaths(emitterOptions: ModularEmitterOptions) {
   const outputProject = useContext("outputProject");
   const modelFiles = outputProject.getSourceFiles(
-    path.join(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), `models/**/*.ts`),
+    joinPaths(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), `models/**/*.ts`),
   );
   const subpath = new Set<string>();
   for (const modelFile of modelFiles) {
@@ -104,7 +107,11 @@ function getModelSubpaths(emitterOptions: ModularEmitterOptions) {
       continue;
     }
     subpath.add(
-      path.relative(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), filepath),
+      getRelativePathFromDirectory(
+        emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"),
+        filepath,
+        false,
+      ),
     );
   }
   return Array.from(subpath);

package/src/modular/build-restore-poller.ts

@@ -1,5 +1,5 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
-import path from "path";
+import { joinPaths } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
@@ -32,7 +32,7 @@ export function buildRestorePoller(
     return;
   }
   const srcPath = emitterOptions.modularOptions.sourceRoot;
-  const filePath = path.join(
+  const filePath = joinPaths(
     `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`,
   );
   const restorePollerFile = project.createSourceFile(filePath, undefined, {

package/src/modular/build-root-index.ts

@@ -1,6 +1,5 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
-import { NoTarget } from "@typespec/compiler";
-import { join } from "path/posix";
+import { joinPaths, NoTarget } from "@typespec/compiler";
 import { Project, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
@@ -298,7 +297,7 @@ function exportModules(
       .getDirectories()
       .filter((dir) => {
         const formattedDir = dir.getPath().replace(/\\/g, "/");
-        const targetPath = join(srcPath, subfolder, moduleName).replace(/\\/g, "/");
+        const targetPath = joinPaths(srcPath, subfolder, moduleName).replace(/\\/g, "/");
         return formattedDir.startsWith(targetPath);
       })
       .map((dir) => {
@@ -309,17 +308,17 @@ function exportModules(
       .getDirectories()
       .filter((dir) => {
         const formattedDir = dir.getPath().replace(/\\/g, "/");
-        const targetPath = join(srcPath, subfolder, moduleName).replace(/\\/g, "/");
+        const targetPath = joinPaths(srcPath, subfolder, moduleName).replace(/\\/g, "/");
         return formattedDir.startsWith(targetPath);
       })
       .map((dir) => {
         return dir.getPath().replace(/\\/g, "/");
       });
   } else {
-    folders = [join(srcPath, subfolder, moduleName).replace(/\\/g, "/")];
+    folders = [joinPaths(srcPath, subfolder, moduleName).replace(/\\/g, "/")];
   }
   for (const folder of folders) {
-    const apiFilePattern = join(folder, "index.ts").replace(/\\/g, "/");
+    const apiFilePattern = joinPaths(folder, "index.ts").replace(/\\/g, "/");
     const modelsFile = project.getSourceFile(apiFilePattern);
     if (!modelsFile) {
       continue;

package/src/modular/build-subpath-index.ts

@@ -1,7 +1,7 @@
 import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+import { joinPaths } from "@typespec/compiler";
 import { ModularEmitterOptions } from "./interfaces.js";
 
-import { join } from "path";
 import { Node, SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { getModularClientOptions } from "../utils/client-utils.js";
@@ -29,7 +29,7 @@ export function buildSubpathIndexFile(
       .getDirectories()
       .filter((dir) => {
         const formattedDir = dir.getPath().replace(/\\/g, "/");
-        const targetPath = join(srcPath, subfolder, subpath).replace(/\\/g, "/");
+        const targetPath = joinPaths(srcPath, subfolder, subpath).replace(/\\/g, "/");
         return (
           formattedDir.startsWith(targetPath) && !project.getSourceFile(`${formattedDir}/index.ts`)
         );
@@ -38,10 +38,10 @@ export function buildSubpathIndexFile(
         return dir.getPath().replace(/\\/g, "/");
       });
   } else {
-    folders = [join(srcPath, subfolder, subpath).replace(/\\/g, "/")];
+    folders = [joinPaths(srcPath, subfolder, subpath).replace(/\\/g, "/")];
   }
   for (const folder of folders) {
-    const apiFilePattern = subpath === "models" ? join(folder, "models.ts") : folder;
+    const apiFilePattern = subpath === "models" ? joinPaths(folder, "models.ts") : folder;
     const apiFiles = project.getSourceFiles().filter((file) => {
       if (subpath === "api" && options.recursive) {
         return file.getDirectoryPath().replace(/\\/g, "/") === apiFilePattern.replace(/\\/g, "/");

package/src/modular/emit-models-options.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import { joinPaths } from "@typespec/compiler";
 
 import { ModularEmitterOptions } from "./interfaces.js";
 
@@ -25,7 +25,7 @@ export function buildApiOptions(
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
     const modelOptionsFile = project.createSourceFile(
-      path.join(
+      joinPaths(
         emitterOptions.modularOptions.sourceRoot,
         subfolder ?? "",
         `api`,

package/src/modular/emit-models.ts

@@ -36,9 +36,8 @@ import {
   getMultipartFileTypeExpression,
 } from "./type-expressions/get-model-expression.js";
 
-import { getNamespaceFullName, NoTarget } from "@typespec/compiler";
+import { getNamespaceFullName, joinPaths, NoTarget } from "@typespec/compiler";
 import { isMetadata, isOrExtendsHttpFile, Visibility } from "@typespec/http";
-import path from "path";
 import { useContext } from "../context-manager.js";
 import { addDeclaration } from "../framework/declaration.js";
 import {
@@ -304,7 +303,7 @@ export function getApiVersionEnum(context: SdkContext) {
 }
 
 export function getModelsPath(sourceRoot: string, modelNamespace: string[] = []): string {
-  return path.join(
+  return joinPaths(
     ...[
       sourceRoot,
       "models",

package/src/modular/emit-samples.ts

@@ -8,8 +8,7 @@ import {
   SdkModelPropertyType,
   SdkServiceOperation,
 } from "@azure-tools/typespec-client-generator-core";
-import { NoTarget } from "@typespec/compiler";
-import { join } from "path";
+import { joinPaths, NoTarget } from "@typespec/compiler";
 import { FunctionDeclarationStructure, SourceFile, StructureKind } from "ts-morph";
 import { useContext } from "../context-manager.js";
 import { resolveReference } from "../framework/reference.js";
@@ -105,13 +104,13 @@ function emitMethodSamples(
   }
   const project = useContext("outputProject");
   const operationPrefix = `${options.classicalMethodPrefix ?? ""} ${method.oriName ?? method.name}`;
-  const sampleFolder = join(
+  const sampleFolder = joinPaths(
     dpgContext.generationPathDetail?.rootDir ?? "",
     "samples-dev",
     options.subFolder ?? "",
   );
   const fileName = normalizeName(`${operationPrefix} Sample`, NameType.File);
-  const sourceFile = project.createSourceFile(join(sampleFolder, `${fileName}.ts`), "", {
+  const sourceFile = project.createSourceFile(joinPaths(sampleFolder, `${fileName}.ts`), "", {
     overwrite: true,
   });
   const exampleFunctions = [];

package/src/modular/emit-tests.ts

@@ -1,5 +1,5 @@
+import { joinPaths } from "@typespec/compiler";
 import { existsSync, rmSync } from "fs";
-import { join } from "path";
 import { SourceFile } from "ts-morph";
 import { resolveReference } from "../framework/reference.js";
 import { NameType, normalizeName } from "../rlc-common/index.js";
@@ -24,13 +24,17 @@ import { CreateRecorderHelpers } from "./static-helpers-metadata.js";
  */
 async function cleanupTestFolder(dpgContext: SdkContext) {
   const clients = dpgContext.sdkPackage.clients;
-  const baseTestFolder = join(dpgContext.generationPathDetail?.rootDir ?? "", "test", "generated");
+  const baseTestFolder = joinPaths(
+    dpgContext.generationPathDetail?.rootDir ?? "",
+    "test",
+    "generated",
+  );
 
   // If there are multiple clients, clean up subfolders
   if (clients.length > 1) {
     for (const client of clients) {
       const subFolder = normalizeName(getClassicalClientName(client), NameType.File);
-      const clientTestFolder = join(baseTestFolder, subFolder);
+      const clientTestFolder = joinPaths(baseTestFolder, subFolder);
       if (existsSync(clientTestFolder)) {
         rmSync(clientTestFolder, { recursive: true, force: true });
       }

package/src/modular/helpers/example-value-helpers.ts

@@ -8,7 +8,7 @@ import {
   SdkModelPropertyType,
   SdkServiceOperation,
 } from "@azure-tools/typespec-client-generator-core";
-import { join } from "path";
+import { joinPaths } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../../context-manager.js";
 import { resolveReference } from "../../framework/reference.js";
@@ -596,8 +596,8 @@ export function createSourceFile(
 ): SourceFile {
   const project = useContext("outputProject");
   const operationPrefix = `${options.classicalMethodPrefix ?? ""} ${method.oriName ?? method.name}`;
-  const baseFolder = type === "sample" ? "samples-dev" : join("test", "generated");
-  const folder = join(
+  const baseFolder = type === "sample" ? "samples-dev" : joinPaths("test", "generated");
+  const folder = joinPaths(
     dpgContext.generationPathDetail?.rootDir ?? "",
     baseFolder,
     options.subFolder ?? "",
@@ -605,7 +605,7 @@ export function createSourceFile(
   const fileExtension = type === "sample" ? ".ts" : ".spec.ts";
   const normalizedFileName = normalizeName(fileName || `${operationPrefix} ${type}`, NameType.File);
 
-  return project.createSourceFile(join(folder, `${normalizedFileName}${fileExtension}`), "", {
+  return project.createSourceFile(joinPaths(folder, `${normalizedFileName}${fileExtension}`), "", {
     overwrite: true,
   });
 }

package/src/rlc-common/build-client-definitions.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import * as path from "path";
+import { joinPaths } from "@typespec/compiler";
 import {
   CallSignatureDeclarationStructure,
   InterfaceDeclarationStructure,
@@ -32,7 +32,7 @@ export function buildClientDefinitions(model: RLCModel) {
   };
   const project = new Project();
   const srcPath = model.srcPath;
-  const filePath = path.join(srcPath, `clientDefinitions.ts`);
+  const filePath = joinPaths(srcPath, `clientDefinitions.ts`);
   const clientDefinitionsFile = project.createSourceFile(filePath, undefined, {
     overwrite: true,
   });