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

package/src/rlc-common/build-client.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 {
   InterfaceDeclarationStructure,
   OptionalKind,
@@ -63,7 +63,7 @@ export function buildClient(model: RLCModel): File | undefined {
   const name = normalizeName(model.libraryName, NameType.File);
   const { srcPath } = model;
   const project = new Project();
-  const filePath = path.join(srcPath, `${name}.ts`);
+  const filePath = joinPaths(srcPath, `${name}.ts`);
   const clientFile = project.createSourceFile(filePath, undefined, {
     overwrite: true,
   });
@@ -171,7 +171,7 @@ export function buildClient(model: RLCModel): File | undefined {
   }
   clientFile.addFunction(functionStatement);
 
-  const paths = srcPath.replace(/\//g, path.sep).split(path.sep);
+  const paths = srcPath.split("/");
   while (paths.length > 0 && paths[paths.length - 1] === "") {
     paths.pop();
   }

package/src/rlc-common/build-index-file.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 { Project, SourceFile } from "ts-morph";
 import { getImportModuleName } from "./helpers/name-constructors.js";
 import { NameType, normalizeName } from "./helpers/name-utils.js";
@@ -25,7 +25,7 @@ export function buildIndexFile(model: RLCModel) {
     batch = model.options?.batch;
   const project = new Project();
   const { srcPath } = model;
-  const filePath = path.join(srcPath, `index.ts`);
+  const filePath = joinPaths(srcPath, `index.ts`);
   const indexFile = project.createSourceFile(filePath, undefined, {
     overwrite: true,
   });

package/src/rlc-common/build-is-unexpected-helper.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 {
   FunctionDeclarationOverloadStructure,
   OptionalKind,
@@ -17,7 +17,7 @@ export function buildIsUnexpectedHelper(model: RLCModel) {
   }
   const project = new Project();
   const srcPath = model.srcPath;
-  const filePath = path.join(srcPath, `isUnexpected.ts`);
+  const filePath = joinPaths(srcPath, `isUnexpected.ts`);
   const isErrorHelper = project.createSourceFile(filePath, undefined, {
     overwrite: true,
   });

package/src/rlc-common/build-logger.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 { Project } from "ts-morph";
 import { RLCModel } from "./interfaces.js";
 
@@ -16,7 +16,7 @@ export function buildLogger(model: RLCModel) {
   const project = new Project();
   const { srcPath, rlcSourceDir } = model;
   const { packageDetails } = model.options;
-  const filePath = path.join(
+  const filePath = joinPaths(
     model.options.sourceFrom === "Swagger"
       ? srcPath.substring(
           0,

package/src/rlc-common/build-paginate-helper.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import { joinPaths } from "@typespec/compiler";
 import { RLCModel } from "./interfaces.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
@@ -25,7 +25,7 @@ export function buildPaginateHelper(model: RLCModel) {
     noEscape: true,
   });
   return {
-    path: path.join(srcPath, "paginateHelper.ts"),
+    path: joinPaths(srcPath, "paginateHelper.ts"),
     content: paginateHelperContents(pagingInfo.pageDetails),
   };
 }

package/src/rlc-common/build-parameter-types.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 {
   InterfaceDeclarationStructure,
   Project,
@@ -29,7 +29,7 @@ import {
 export function buildParameterTypes(model: RLCModel) {
   const project = new Project();
   const srcPath = model.srcPath;
-  const filePath = path.join(srcPath, `parameters.ts`);
+  const filePath = joinPaths(srcPath, `parameters.ts`);
   const partialBodyTypeNames = new Set<string>();
   const parametersFile = project.createSourceFile(filePath, undefined, {
     overwrite: true,

package/src/rlc-common/build-polling-helper.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import { joinPaths } from "@typespec/compiler";
 import { OPERATION_LRO_HIGH_PRIORITY, RLCModel } from "./interfaces.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
@@ -28,7 +28,7 @@ export function buildPollingHelper(model: RLCModel) {
   const readmeFileContents = hbs.compile(pollingContent, { noEscape: true });
   const { srcPath } = model;
   return {
-    path: path.join(srcPath, "pollingHelper.ts"),
+    path: joinPaths(srcPath, "pollingHelper.ts"),
     content: readmeFileContents(lroDetail),
   };
 }

package/src/rlc-common/build-response-types.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 {
   InterfaceDeclarationStructure,
   OptionalKind,
@@ -21,7 +21,7 @@ let hasErrorResponse = false;
 export function buildResponseTypes(model: RLCModel) {
   const project = new Project();
   const srcPath = model.srcPath;
-  const filePath = path.join(srcPath, `responses.ts`);
+  const filePath = joinPaths(srcPath, `responses.ts`);
   hasErrorResponse = false;
   const responsesFile = project.createSourceFile(filePath, undefined, {
     overwrite: true,

package/src/rlc-common/build-samples.ts

@@ -5,8 +5,8 @@ import { File as RLCFile, RLCModel, RLCSampleGroup } from "./interfaces.js";
 import { sampleTemplate } from "./static/sample-template.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
+import { joinPaths } from "@typespec/compiler";
 import hbs from "handlebars";
-import * as path from "path";
 
 // Build sample files for the model based on the sample groups
 export function buildSamples(model: RLCModel) {
@@ -22,7 +22,7 @@ export function buildSamples(model: RLCModel) {
     const sampleGroupFileContents = hbs.compile(sampleTemplate, {
       noEscape: true,
     });
-    const filePath = path.join("samples-dev", `${sampleGroup.filename}.ts`);
+    const filePath = joinPaths("samples-dev", `${sampleGroup.filename}.ts`);
     sampleFiles.push({
       path: filePath,
       content: sampleGroupFileContents(sampleGroup),

package/src/rlc-common/build-schema-type.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 { Project } from "ts-morph";
 import {
   buildObjectAliases,
@@ -18,9 +18,9 @@ import { RLCModel, SchemaContext } from "./interfaces.js";
 export function buildSchemaTypes(model: RLCModel) {
   const { srcPath } = model;
   const project = new Project();
-  let filePath = path.join(srcPath, `models.ts`);
+  let filePath = joinPaths(srcPath, `models.ts`);
   const inputModelFile = generateModelFiles(model, project, filePath, [SchemaContext.Input]);
-  filePath = path.join(srcPath, `outputModels.ts`);
+  filePath = joinPaths(srcPath, `outputModels.ts`);
   const outputModelFile = generateModelFiles(model, project, filePath, [
     SchemaContext.Output,
     SchemaContext.Exception,

package/src/rlc-common/build-serialize-helper.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import { joinPaths } from "@typespec/compiler";
 import { RLCModel } from "./interfaces.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
@@ -41,7 +41,7 @@ export function buildSerializeHelper(model: RLCModel) {
     });
     const { srcPath } = model;
     return {
-      path: path.join(srcPath, "serializeHelper.ts"),
+      path: joinPaths(srcPath, "serializeHelper.ts"),
       content: readmeFileContents({}),
     };
   }

package/src/rlc-common/build-top-level-index-file.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 { Project } from "ts-morph";
 import { getImportModuleName } from "./helpers/name-constructors.js";
 import { NameType, normalizeName } from "./helpers/name-utils.js";
@@ -47,7 +47,7 @@ export function buildTopLevelIndex(model: RLCModel) {
       namedExports: [...allModules],
     });
     const content = indexFile.getFullText();
-    const filePath = path.join(
+    const filePath = joinPaths(
       srcPath.substring(0, srcPath.lastIndexOf("src") + 4),
       model.options.isModularLibrary ? "rest" : "",
       `index.ts`,

package/src/rlc-common/helpers/path-utils.ts

@@ -1,7 +1,5 @@
-import * as path from "path";
-
 export function getRelativePartFromSrcPath(srcPath: string, isModularLibrary: boolean = false) {
-  const sep = srcPath.includes(path.sep + "src") ? path.sep : "/";
+  const sep = "/";
   let relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
   if (isModularLibrary) {
     relativePart = relativePart.substring(srcPath.indexOf(sep + "rest"), +5);

package/src/rlc-common/metadata/build-readme-file.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { RLCModel } from "../interfaces.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: to fix the handlebars issue
 import { readFileSync } from "fs";
@@ -9,6 +8,7 @@ import hbs from "handlebars";
 import { getClientName } from "../helpers/name-constructors.js";
 import { NameType, normalizeName } from "../helpers/name-utils.js";
 import { isAzurePackage } from "../helpers/package-util.js";
+import { RLCModel } from "../interfaces.js";
 
 const azureReadmeRLCTemplate = `# {{ clientDescriptiveName }} library for JavaScript
 
@@ -58,11 +58,11 @@ npm install {{ clientPackageName }}
 
 ### Create and authenticate a \`{{ clientClassName }}\`
 
-To use an [Azure Active Directory (AAD) token credential](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token),
+To use a [Microsoft Entra token credential](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token),
 provide an instance of the desired credential type obtained from the
 [@azure/identity](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) library.
 
-To authenticate with AAD, you must first \`npm\` install [\`@azure/identity\`](https://www.npmjs.com/package/@azure/identity) {{#if dependencyLink}}and
+To authenticate with Microsoft Entra ID, you must first \`npm\` install [\`@azure/identity\`](https://www.npmjs.com/package/@azure/identity) {{#if dependencyLink}}and
 [{{dependencyDescription }}]({{ dependencyLink }}){{/if}}
 
 After setup, you can choose which type of [credential](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) from \`@azure/identity\` to use.
@@ -134,10 +134,10 @@ npm install {{ clientPackageName }}
 {{#if addCredentials}}
 ### Create and authenticate a \`{{ clientClassName}}\`
 
-To create a client object to access the {{ serviceName }} API, you will need the \`endpoint\` of your {{ serviceName }} resource and a \`credential\`. The {{ clientDescriptiveName }} can use Azure Active Directory credentials to authenticate.
+To create a client object to access the {{ serviceName }} API, you will need the \`endpoint\` of your {{ serviceName }} resource and a \`credential\`. The {{ clientDescriptiveName }} can use Microsoft Entra credentials to authenticate.
 You can find the endpoint for your {{ serviceName }} resource in the [Azure Portal][azure_portal].
 
-You can authenticate with Azure Active Directory using a credential from the [@azure/identity][azure_identity] library or [an existing AAD Token](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token).
+You can authenticate with Microsoft Entra ID using a credential from the [@azure/identity][azure_identity] library or [an existing Microsoft Entra token](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token).
 
 To use the [DefaultAzureCredential][defaultazurecredential] provider shown below, or other credential providers provided with the Azure SDK, please install the \`@azure/identity\` package:
 
@@ -145,9 +145,9 @@ To use the [DefaultAzureCredential][defaultazurecredential] provider shown below
 npm install @azure/identity
 \`\`\`
 
-You will also need to **register a new AAD application and grant access to {{ serviceName}}** by assigning the suitable role to your service principal (note: roles such as \`"Owner"\` will not grant the necessary permissions).
+You will also need to **register a new Microsoft Entra application and grant access to {{ serviceName}}** by assigning the suitable role to your service principal (note: roles such as \`"Owner"\` will not grant the necessary permissions).
 
-For more information about how to create an Azure AD Application check out [this guide](https://learn.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal).
+For more information about how to create a Microsoft Entra application check out [this guide](https://learn.microsoft.com/entra/identity-platform/howto-create-service-principal-portal).
 
 {{#if azureArm}}
 Using Node.js and Node-like environments, you can use the \`DefaultAzureCredential\` class to authenticate the client.

package/src/transform/transform.ts

@@ -2,9 +2,8 @@
 // Licensed under the MIT License.
 
 import { SdkClient } from "@azure-tools/typespec-client-generator-core";
-import { getDoc } from "@typespec/compiler";
+import { getDoc, joinPaths } from "@typespec/compiler";
 import { getServers } from "@typespec/http";
-import * as path from "path";
 import {
   buildRuntimeImports,
   Imports,
@@ -47,7 +46,7 @@ export async function transformRLCModel(
   const program = dpgContext.program;
   const options: RLCOptions = dpgContext.rlcOptions!;
   const rlcSourceDir = dpgContext.generationPathDetail?.rlcSourcesDir;
-  const srcPath = path.join(
+  const srcPath = joinPaths(
     dpgContext.generationPathDetail?.rlcSourcesDir ?? "",
     options.batch && options.batch.length > 1
       ? normalizeName(client.name.replace("Client", ""), NameType.File)

package/src/utils/emit-util.ts

@@ -1,5 +1,4 @@
-import { CompilerHost, NoTarget, Program } from "@typespec/compiler";
-import { dirname, join } from "path";
+import { CompilerHost, getDirectoryPath, joinPaths, NoTarget, Program } from "@typespec/compiler";
 import { format } from "prettier";
 import { prettierJSONOptions, prettierTypeScriptOptions, reportDiagnostic } from "../lib.js";
 import {
@@ -58,7 +57,7 @@ async function emitFile(
     return;
   }
   const host: CompilerHost = program.host;
-  const filePath = join(emitterOutputDir ?? "", file.path);
+  const filePath = joinPaths(emitterOutputDir ?? "", file.path);
   const isJson = /\.json$/gi.test(filePath);
   const isSourceCode = /\.(ts|js)$/gi.test(filePath);
   const microsoftHeader = isAzureFlavor ? `// Copyright (c) Microsoft Corporation.\n` : "";
@@ -87,6 +86,6 @@ async function emitFile(
       // Continue with unformatted content rather than crashing
     }
   }
-  await host.mkdirp(dirname(filePath));
+  await host.mkdirp(getDirectoryPath(filePath));
   await host.writeFile(filePath, prettierFileContent);
 }

package/src/utils/file-system-utils.ts

@@ -1,6 +1,5 @@
-import { NoTarget, Program } from "@typespec/compiler";
+import { NoTarget, Program, resolvePath } from "@typespec/compiler";
 import { mkdir, readdir, rm, stat } from "fs/promises";
-import { resolve } from "path";
 import { reportDiagnostic } from "../lib.js";
 
 export async function pathExists(targetPath: string): Promise<boolean> {
@@ -22,7 +21,7 @@ export async function emptyDir(dirPath: string): Promise<void> {
   }
 
   await Promise.all(
-    entries.map((entry) => rm(resolve(dirPath, entry), { recursive: true, force: true })),
+    entries.map((entry) => rm(resolvePath(dirPath, entry), { recursive: true, force: true })),
   );
 }
 
@@ -52,7 +51,7 @@ export async function clearDirectory(
 
     // Process each entry
     for (const entry of filteredEntries) {
-      const entryPath = resolve(dirPath, entry);
+      const entryPath = resolvePath(dirPath, entry);
       await rm(entryPath, { recursive: true, force: true });
     }
   } catch (error) {

package/src/utils/import-helper.ts

@@ -1,4 +1,4 @@
-import { dirname, relative, resolve } from "path";
+import { getDirectoryPath, getRelativePathFromDirectory, resolvePath } from "@typespec/compiler";
 import { SourceFile } from "ts-morph";
 import { useContext } from "../context-manager.js";
 
@@ -20,7 +20,7 @@ export function addImportBySymbol(symbol: string, currentFile: SourceFile) {
   }
 
   // Resolve absolute path and compute a relative path from the current file to the module.
-  const moduleAbsolutePath = resolve(modulePath);
+  const moduleAbsolutePath = resolvePath(modulePath);
   const relativeImportPath = getRelativeImportPath(currentFile.getFilePath(), moduleAbsolutePath)
     .replace(/\\/g, "/")
     .replace(/\.ts$/, ".js");
@@ -53,7 +53,7 @@ export function addImportBySymbol(symbol: string, currentFile: SourceFile) {
  * @returns {string} The relative path adjusted for import syntax.
  */
 function getRelativeImportPath(from: string, to: string) {
-  const relativePath = relative(dirname(from), to);
+  const relativePath = getRelativePathFromDirectory(getDirectoryPath(from), to, false);
   // Adjust the path format to TypeScript module syntax
   return relativePath.startsWith(".") ? relativePath : "./" + relativePath;
 }

package/src/utils/resolve-project-root.ts

@@ -13,16 +13,14 @@ export function resolveProjectRoot(
   const packageJsonPath = resolve(currentDir, "package.json");
 
   if (existsSync(packageJsonPath)) {
-    return currentDir; // Return the directory containing the package.json
+    return currentDir;
   }
 
   const parentDir = resolve(currentDir, "..");
 
   if (parentDir === currentDir) {
-    // If we've reached the root directory and haven't found package.json
     throw new Error("Could not find package.json");
   }
 
-  // Recursively search the parent directory
   return resolveProjectRoot(parentDir);
 }

package/dist/src/utils/dirname.d.ts

@@ -1,9 +0,0 @@
-/**
- *
- * @param metaUrl usually import.meta.url
- */
-export declare function getDirname(metaUrl: string): {
-    __dirname: string;
-    __filename: string;
-};
-//# sourceMappingURL=dirname.d.ts.map

package/dist/src/utils/dirname.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dirname.d.ts","sourceRoot":"","sources":["../../../src/utils/dirname.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM;;;EAIzC"}

package/dist/src/utils/dirname.js

@@ -1,12 +0,0 @@
-import path from "path";
-import { fileURLToPath } from "url";
-/**
- *
- * @param metaUrl usually import.meta.url
- */
-export function getDirname(metaUrl) {
-    const __filename = fileURLToPath(metaUrl);
-    const __dirname = path.dirname(__filename);
-    return { __dirname, __filename };
-}
-//# sourceMappingURL=dirname.js.map

package/dist/src/utils/dirname.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dirname.js","sourceRoot":"","sources":["../../../src/utils/dirname.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;AACnC,CAAC"}

package/src/utils/dirname.ts

@@ -1,12 +0,0 @@
-import path from "path";
-import { fileURLToPath } from "url";
-
-/**
- *
- * @param metaUrl usually import.meta.url
- */
-export function getDirname(metaUrl: string) {
-  const __filename = fileURLToPath(metaUrl);
-  const __dirname = path.dirname(__filename);
-  return { __dirname, __filename };
-}