@azure-tools/typespec-ts 0.54.0 → 0.54.1

package/src/utils/emitUtil.ts

@@ -1,18 +1,14 @@
+import { CompilerHost, NoTarget, Program } from "@typespec/compiler";
+import { dirname, join } from "path";
+import { format } from "prettier";
+import { prettierJSONOptions, prettierTypeScriptOptions, reportDiagnostic } from "../lib.js";
 import {
   buildSchemaTypes,
   ContentBuilder,
   File,
   isAzurePackage,
-  RLCModel
+  RLCModel,
 } from "../rlc-common/index.js";
-import { CompilerHost, Program, NoTarget } from "@typespec/compiler";
-import { dirname, join } from "path";
-import { format } from "prettier";
-import {
-  prettierJSONOptions,
-  prettierTypeScriptOptions,
-  reportDiagnostic
-} from "../lib.js";
 
 export async function emitModels(rlcModels: RLCModel, program: Program) {
   const schemaOutput = buildSchemaTypes(rlcModels);
@@ -32,7 +28,7 @@ export async function emitContentByBuilder(
   program: Program,
   builderFnOrList: ContentBuilder | ContentBuilder[],
   rlcModels: RLCModel,
-  emitterOutputDir?: string
+  emitterOutputDir?: string,
 ) {
   if (!Array.isArray(builderFnOrList)) {
     builderFnOrList = [builderFnOrList];
@@ -56,7 +52,7 @@ async function emitFile(
   file: File,
   program: Program,
   isAzureFlavor: boolean,
-  emitterOutputDir?: string
+  emitterOutputDir?: string,
 ) {
   if (program.compilerOptions.noEmit || program.hasError()) {
     return;
@@ -65,9 +61,7 @@ async function emitFile(
   const filePath = join(emitterOutputDir ?? "", file.path);
   const isJson = /\.json$/gi.test(filePath);
   const isSourceCode = /\.(ts|js)$/gi.test(filePath);
-  const microsoftHeader = isAzureFlavor
-    ? `// Copyright (c) Microsoft Corporation.\n`
-    : "";
+  const microsoftHeader = isAzureFlavor ? `// Copyright (c) Microsoft Corporation.\n` : "";
   const licenseHeader = `${microsoftHeader}// Licensed under the MIT License.\n`;
   let prettierFileContent = file.content;
 
@@ -79,16 +73,16 @@ async function emitFile(
     try {
       prettierFileContent = await format(
         prettierFileContent,
-        isJson ? prettierJSONOptions : prettierTypeScriptOptions
+        isJson ? prettierJSONOptions : prettierTypeScriptOptions,
       );
     } catch (e) {
       reportDiagnostic(program, {
         code: "file-formatting-error",
         format: {
           filePath: filePath,
-          error: String(e)
+          error: String(e),
         },
-        target: NoTarget
+        target: NoTarget,
       });
       // Continue with unformatted content rather than crashing
     }

package/src/utils/fileSystemUtils.ts

@@ -1,21 +1,43 @@
-import * as fsextra from "fs-extra";
-import { readdir, rm } from "fs/promises";
-import { resolve } from "path";
 import { NoTarget, Program } 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> {
+  try {
+    await stat(targetPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function emptyDir(dirPath: string): Promise<void> {
+  let entries: string[];
+  try {
+    entries = await readdir(dirPath);
+  } catch {
+    await mkdir(dirPath, { recursive: true });
+    return;
+  }
+
+  await Promise.all(
+    entries.map((entry) => rm(resolve(dirPath, entry), { recursive: true, force: true })),
+  );
+}
+
 export async function clearDirectory(
   dirPath: string,
   excludeNames: string[] = [],
-  program?: Program
+  program?: Program,
 ): Promise<void> {
-  if (!(await fsextra.pathExists(dirPath))) {
+  if (!(await pathExists(dirPath))) {
     return;
   }
 
   // If no exclude names, just use regular emptyDir for efficiency
   if (excludeNames.length === 0) {
-    await fsextra.emptyDir(dirPath);
+    await emptyDir(dirPath);
     return;
   }
 
@@ -39,9 +61,9 @@ export async function clearDirectory(
       reportDiagnostic(program, {
         code: "directory-traversal-error",
         format: { directory: dirPath, error: String(error) },
-        target: NoTarget
+        target: NoTarget,
       });
     }
-    await fsextra.emptyDir(dirPath);
+    await emptyDir(dirPath);
   }
 }

package/src/utils/importHelper.ts

@@ -1,6 +1,6 @@
 import { dirname, relative, resolve } from "path";
-import { useContext } from "../contextManager.js";
 import { SourceFile } from "ts-morph";
+import { useContext } from "../contextManager.js";
 
 /**
  * Adds a named import to a TypeScript source file if it does not already exist.
@@ -21,22 +21,17 @@ 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 relativeImportPath = getRelativeImportPath(
-    currentFile.getFilePath(),
-    moduleAbsolutePath
-  )
+  const relativeImportPath = getRelativeImportPath(currentFile.getFilePath(), moduleAbsolutePath)
     .replace(/\\/g, "/")
     .replace(/\.ts$/, ".js");
 
   // Check if the import declaration already exists and if it includes the symbol.
   const existing = currentFile.getImportDeclaration(
-    (i) => i.getModuleSpecifierValue() === relativeImportPath
+    (i) => i.getModuleSpecifierValue() === relativeImportPath,
   );
 
   if (existing) {
-    const sameImport = existing
-      .getNamedImports()
-      .some((i) => i.getName() === symbol);
+    const sameImport = existing.getNamedImports().some((i) => i.getName() === symbol);
 
     if (!sameImport) {
       existing.addNamedImport(symbol);
@@ -44,7 +39,7 @@ export function addImportBySymbol(symbol: string, currentFile: SourceFile) {
   } else {
     currentFile.addImportDeclaration({
       moduleSpecifier: relativeImportPath,
-      namedImports: [symbol]
+      namedImports: [symbol],
     });
   }
 }

package/src/utils/interfaces.ts

@@ -1,6 +1,6 @@
-import { RLCOptions, SchemaContext } from "../rlc-common/index.js";
 import { SdkContext as TCGCSdkContext } from "@azure-tools/typespec-client-generator-core";
 import { ModelProperty, Namespace } from "@typespec/compiler";
+import { RLCOptions, SchemaContext } from "../rlc-common/index.js";
 import { KnownMediaType } from "./mediaTypes.js";
 
 export interface SdkContext extends TCGCSdkContext {

package/src/utils/mediaTypes.ts

@@ -18,21 +18,21 @@ export enum KnownMediaType {
   Binary = "binary",
   MultipartFormData = "multipart/form-data",
   Text = "text",
-  Unknown = "unknown"
+  Unknown = "unknown",
 }
 
 export function parseMediaType(mediaType: string) {
   if (mediaType) {
     const parsed =
       /(application|audio|font|example|image|message|model|multipart|text|video|x-(?:[0-9A-Za-z!#$%&'*+.^_`|~-]+))\/([0-9A-Za-z!#$%&'*.^_`|~-]+)\s*(?:\+([0-9A-Za-z!#$%&'*.^_`|~-]+))?\s*(?:;.\s*(\S*))?/g.exec(
-        mediaType
+        mediaType,
       );
     if (parsed) {
       return {
         type: parsed[1],
         subtype: parsed[2],
         suffix: parsed[3],
-        parameter: parsed[4]
+        parameter: parsed[4],
       };
     }
   }
@@ -85,9 +85,7 @@ export function normalizeMediaType(contentType: string) {
   if (contentType) {
     const mt = parseMediaType(contentType);
     if (mt) {
-      return mt.suffix
-        ? `${mt.type}/${mt.subtype}+${mt.suffix}`
-        : `${mt.type}/${mt.subtype}`;
+      return mt.suffix ? `${mt.type}/${mt.subtype}+${mt.suffix}` : `${mt.type}/${mt.subtype}`;
     }
   }
   return undefined;
@@ -96,45 +94,31 @@ export function normalizeMediaType(contentType: string) {
 export function isMediaTypeJson(mediaType: string): boolean {
   const mt = parseMediaType(mediaType);
   return mt
-    ? (mt.subtype === json || mt.suffix === json) &&
-        (mt.type === application || mt.type === text)
+    ? (mt.subtype === json || mt.suffix === json) && (mt.type === application || mt.type === text)
     : false;
 }
 
-export function isMediaTypeJsonMergePatch(
-  mediaType: string | string[]
-): boolean {
+export function isMediaTypeJsonMergePatch(mediaType: string | string[]): boolean {
   if (Array.isArray(mediaType)) {
     return Boolean(
-      mediaType.length === 1 &&
-      mediaType[0] &&
-      isMediaTypeJsonMergePatch(mediaType[0])
+      mediaType.length === 1 && mediaType[0] && isMediaTypeJsonMergePatch(mediaType[0]),
     );
   }
   const mt = parseMediaType(mediaType);
-  return mt
-    ? mt.type === application &&
-        mt.subtype === "merge-patch" &&
-        mt.suffix === json
-    : false;
+  return mt ? mt.type === application && mt.subtype === "merge-patch" && mt.suffix === json : false;
 }
 
 export function isMediaTypeXml(mediaType: string): boolean {
   const mt = parseMediaType(mediaType);
   return mt
-    ? (mt.subtype === xml || mt.suffix === xml) &&
-        (mt.type === application || mt.type === text)
+    ? (mt.subtype === xml || mt.suffix === xml) && (mt.type === application || mt.type === text)
     : false;
 }
 
-export function isMediaTypeMultipartFormData(
-  mediaType: string | string[]
-): boolean {
+export function isMediaTypeMultipartFormData(mediaType: string | string[]): boolean {
   if (Array.isArray(mediaType)) {
     return Boolean(
-      mediaType.length === 1 &&
-      mediaType[0] &&
-      isMediaTypeMultipartFormData(mediaType[0])
+      mediaType.length === 1 && mediaType[0] && isMediaTypeMultipartFormData(mediaType[0]),
     );
   }
 
@@ -154,16 +138,11 @@ export function isMediaTypeMultipart(mediaType: string | string[]): boolean {
   return mt ? mt.type === multipart : false;
 }
 
-export function hasMediaType(
-  target: KnownMediaType,
-  sourceTypes: KnownMediaType[] = []
-) {
+export function hasMediaType(target: KnownMediaType, sourceTypes: KnownMediaType[] = []) {
   return sourceTypes.some((type) => type === target);
 }
 
-export function extractMediaTypes(
-  mediaTypes: string[] | string
-): KnownMediaType[] {
+export function extractMediaTypes(mediaTypes: string[] | string): KnownMediaType[] {
   if (typeof mediaTypes === "string") {
     mediaTypes = [mediaTypes];
   }