@azure-tools/typespec-ts 0.54.0 → 0.54.1

package/src/modular/buildProjectFiles.ts

@@ -1,15 +1,12 @@
 import { NameType } from "../rlc-common/index.js";
 
-import { ModularEmitterOptions } from "./interfaces.js";
-import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
+import path from "path/posix";
+import { useContext } from "../contextManager.js";
+import { getClientHierarchyMap, getModularClientOptions } from "../utils/clientUtils.js";
 import { SdkContext } from "../utils/interfaces.js";
-import {
-  getClientHierarchyMap,
-  getModularClientOptions
-} from "../utils/clientUtils.js";
 import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
-import { useContext } from "../contextManager.js";
-import path from "path/posix";
+import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
+import { ModularEmitterOptions } from "./interfaces.js";
 
 /**
  * Computes the relative path prefix (e.g. `./src` or `./src/generated`) from
@@ -17,18 +14,9 @@ import path from "path/posix";
  * building export map entries so that they always point to the correct folder
  * even when the generated code lives under `src/generated` instead of `src`.
  */
-function getSourceRootPrefix(
-  emitterOptions: ModularEmitterOptions,
-  context: SdkContext
-): string {
-  const sourceRoot = emitterOptions.modularOptions.sourceRoot.replace(
-    /\\/g,
-    "/"
-  );
-  const rootDir = (context.generationPathDetail?.rootDir ?? "").replace(
-    /\\/g,
-    "/"
-  );
+function getSourceRootPrefix(emitterOptions: ModularEmitterOptions, context: SdkContext): string {
+  const sourceRoot = emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/");
+  const rootDir = (context.generationPathDetail?.rootDir ?? "").replace(/\\/g, "/");
 
   if (rootDir && sourceRoot.startsWith(rootDir)) {
     const relativePath = path.relative(rootDir, sourceRoot).replace(/\\/g, "/");
@@ -41,7 +29,7 @@ function getSourceRootPrefix(
 function buildExportsForMultiClient(
   context: SdkContext,
   emitterOptions: ModularEmitterOptions,
-  packageInfo: any
+  packageInfo: any,
 ) {
   const srcPrefix = getSourceRootPrefix(emitterOptions, context);
   const clientMap = getClientHierarchyMap(context);
@@ -53,11 +41,9 @@ function buildExportsForMultiClient(
     }
     const { subfolder } = getModularClientOptions([hierarchy, client]);
     if (subfolder !== "" && methodMap.size > 0) {
-      packageInfo.exports[`./${subfolder}`] =
-        `${srcPrefix}/${subfolder}/index.ts`;
+      packageInfo.exports[`./${subfolder}`] = `${srcPrefix}/${subfolder}/index.ts`;
 
-      packageInfo.exports[`./${subfolder}/api`] =
-        `${srcPrefix}/${subfolder}/api/index.ts`;
+      packageInfo.exports[`./${subfolder}/api`] = `${srcPrefix}/${subfolder}/api/index.ts`;
     }
   }
   if (!hasTopLevelClient) {
@@ -75,15 +61,9 @@ function buildExportsForMultiClient(
           if (prefixKey === "") {
             continue;
           }
-          const subApiPath = `api/${getClassicalLayerPrefix(
-            prefixes,
-            NameType.File,
-            "/"
-          )}`;
+          const subApiPath = `api/${getClassicalLayerPrefix(prefixes, NameType.File, "/")}`;
 
-          packageInfo.exports[
-            `./${subfolder ? subfolder + "/" : ""}${subApiPath}`
-          ] =
+          packageInfo.exports[`./${subfolder ? subfolder + "/" : ""}${subApiPath}`] =
             `${srcPrefix}/${subfolder ? subfolder + "/" : ""}${subApiPath}/index.ts`;
         }
       }
@@ -99,16 +79,13 @@ function buildExportsForMultiClient(
   return packageInfo.exports;
 }
 
-export function getModuleExports(
-  context: SdkContext,
-  emitterOptions: ModularEmitterOptions
-) {
+export function getModuleExports(context: SdkContext, emitterOptions: ModularEmitterOptions) {
   const srcPrefix = getSourceRootPrefix(emitterOptions, context);
   const exports: Record<string, any> = {
     exports: {
       ".": `${srcPrefix}/index.ts`,
-      "./models": `${srcPrefix}/models/index.ts`
-    }
+      "./models": `${srcPrefix}/models/index.ts`,
+    },
   };
   exports["exports"]["./api"] = `${srcPrefix}/api/index.ts`;
 
@@ -118,10 +95,7 @@ export function getModuleExports(
 function getModelSubpaths(emitterOptions: ModularEmitterOptions) {
   const outputProject = useContext("outputProject");
   const modelFiles = outputProject.getSourceFiles(
-    path.join(
-      emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"),
-      `models/**/*.ts`
-    )
+    path.join(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), `models/**/*.ts`),
   );
   const subpath = new Set<string>();
   for (const modelFile of modelFiles) {
@@ -130,10 +104,7 @@ function getModelSubpaths(emitterOptions: ModularEmitterOptions) {
       continue;
     }
     subpath.add(
-      path.relative(
-        emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"),
-        filepath
-      )
+      path.relative(emitterOptions.modularOptions.sourceRoot.replace(/\\/g, "/"), filepath),
     );
   }
   return Array.from(subpath);

package/src/modular/buildRestorePoller.ts

@@ -1,27 +1,24 @@
-import { SourceFile } from "ts-morph";
-import { isLroOnlyOperation } from "./helpers/operationHelpers.js";
-import { ModularEmitterOptions } from "./interfaces.js";
+import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import path from "path";
-import { buildLroDeserDetailMap } from "./buildOperations.js";
-import { getClassicalClientName } from "./helpers/namingHelpers.js";
-import { NameType, normalizeName } from "../rlc-common/index.js";
+import { SourceFile } from "ts-morph";
+import { useContext } from "../contextManager.js";
+import { useDependencies } from "../framework/hooks/useDependencies.js";
 import { resolveReference } from "../framework/reference.js";
-import { AzurePollingDependencies } from "./external-dependencies.js";
-import { PollingHelpers } from "./static-helpers-metadata.js";
-import {
-  SdkClientType,
-  SdkServiceOperation
-} from "@azure-tools/typespec-client-generator-core";
-import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { NameType, normalizeName } from "../rlc-common/index.js";
 import { getModularClientOptions } from "../utils/clientUtils.js";
 import { SdkContext } from "../utils/interfaces.js";
-import { useDependencies } from "../framework/hooks/useDependencies.js";
-import { useContext } from "../contextManager.js";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { buildLroDeserDetailMap } from "./buildOperations.js";
+import { AzurePollingDependencies } from "./external-dependencies.js";
+import { getClassicalClientName } from "./helpers/namingHelpers.js";
+import { isLroOnlyOperation } from "./helpers/operationHelpers.js";
+import { ModularEmitterOptions } from "./interfaces.js";
+import { PollingHelpers } from "./static-helpers-metadata.js";
 
 export function buildRestorePoller(
   context: SdkContext,
   clientMap: [string[], SdkClientType<SdkServiceOperation>],
-  emitterOptions: ModularEmitterOptions
+  emitterOptions: ModularEmitterOptions,
 ) {
   const project = useContext("outputProject");
   const [_, client] = clientMap;
@@ -36,35 +33,19 @@ export function buildRestorePoller(
   }
   const srcPath = emitterOptions.modularOptions.sourceRoot;
   const filePath = path.join(
-    `${srcPath}/${
-      subfolder && subfolder !== "" ? subfolder + "/" : ""
-    }restorePollerHelpers.ts`
+    `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`,
   );
   const restorePollerFile = project.createSourceFile(filePath, undefined, {
-    overwrite: true
+    overwrite: true,
   });
 
   const clientNames = importClassicalClient(client, restorePollerFile);
-  const deserializeMap = importDeserializeHelpers(
-    context,
-    client,
-    restorePollerFile
-  );
-  const pathUncheckedReference = resolveReference(
-    dependencies.PathUncheckedResponse
-  );
-  const pollerLikeReference = resolveReference(
-    AzurePollingDependencies.PollerLike
-  );
-  const operationStateReference = resolveReference(
-    AzurePollingDependencies.OperationState
-  );
-  const operationOptionsReference = resolveReference(
-    dependencies.OperationOptions
-  );
-  const deserializeStateReference = resolveReference(
-    AzurePollingDependencies.DeserializeState
-  );
+  const deserializeMap = importDeserializeHelpers(context, client, restorePollerFile);
+  const pathUncheckedReference = resolveReference(dependencies.PathUncheckedResponse);
+  const pollerLikeReference = resolveReference(AzurePollingDependencies.PollerLike);
+  const operationStateReference = resolveReference(AzurePollingDependencies.OperationState);
+  const operationOptionsReference = resolveReference(dependencies.OperationOptions);
+  const deserializeStateReference = resolveReference(AzurePollingDependencies.DeserializeState);
   const restorePollerHelperContent = `
     export interface RestorePollerOptions<
       TResult,
@@ -224,7 +205,7 @@ export function buildRestorePoller(
 function importDeserializeHelpers(
   context: SdkContext,
   client: SdkClientType<SdkServiceOperation>,
-  sourceFile: SourceFile
+  sourceFile: SourceFile,
 ) {
   const deserializeDetails = buildLroDeserDetailMap(context, client);
   const deserializeMap: string[] = [];
@@ -233,15 +214,15 @@ function importDeserializeHelpers(
       namedImports: value.map((detail) =>
         detail.renamedDeserName
           ? `${detail.deserName} as ${detail.renamedDeserName}`
-          : detail.deserName
+          : detail.deserName,
       ),
-      moduleSpecifier: key
+      moduleSpecifier: key,
     });
     value.forEach((detail) => {
       deserializeMap.push(
         `"${detail.path}": { deserializer: ${
           detail.renamedDeserName ?? detail.deserName
-        }, expectedStatuses: ${detail.expectedStatusesExpression} }`
+        }, expectedStatuses: ${detail.expectedStatusesExpression} }`,
       );
     });
   }
@@ -250,12 +231,12 @@ function importDeserializeHelpers(
 
 function importClassicalClient(
   client: SdkClientType<SdkServiceOperation>,
-  sourceFile: SourceFile
+  sourceFile: SourceFile,
 ): string[] {
   const classicalClientName = `${getClassicalClientName(client)}`;
   sourceFile.addImportDeclaration({
     namedImports: [`${classicalClientName}`],
-    moduleSpecifier: `./${normalizeName(classicalClientName, NameType.File)}.js`
+    moduleSpecifier: `./${normalizeName(classicalClientName, NameType.File)}.js`,
   });
   return [classicalClientName];
 }