Fix tsp rlc logger.ts generation (#2904)

* fix tsp rlc logger.ts generation * update * resolve comment * fix issue --------- Co-authored-by: Qiaoqiao Zhang <[email protected]>
Azure · Nov 13, 2024 · f8429c7 · f8429c7
1 parent ff9e2dd
commit f8429c7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/packages/rlc-common/src/buildLogger.ts b/packages/rlc-common/src/buildLogger.ts
@@ -14,15 +14,17 @@ export function buildLogger(model: RLCModel) {
     return undefined;
   }
   const project = new Project();
-  const { srcPath } = model;
+  const { srcPath, rlcSourceDir } = model;
   const { packageDetails } = model.options;
   const filePath = path.join(
-    srcPath.substring(
-      0,
-      srcPath.includes("generated") && !srcPath.includes("src")
-        ? srcPath.lastIndexOf("generated") + 10
-        : srcPath.lastIndexOf("src") + 4
-    ),
+    model.options.sourceFrom == "Swagger"
+      ? srcPath.substring(
+          0,
+          srcPath.includes("generated") && !srcPath.includes("src")
+            ? srcPath.lastIndexOf("generated") + 10
+            : srcPath.lastIndexOf("src") + 4
+        )
+      : rlcSourceDir!,
     `logger.ts`
   );
   const loggerFile = project.createSourceFile("logger.ts", undefined, {

diff --git a/packages/rlc-common/src/interfaces.ts b/packages/rlc-common/src/interfaces.ts
@@ -14,6 +14,7 @@ export interface RLCModel {
   urlInfo?: UrlInfo;
   telemetryOptions?: TelemetryInfo;
   sampleGroups?: RLCSampleGroup[];
+  rlcSourceDir?: string;
 }
 
 export interface ImportInfo {

diff --git a/packages/typespec-ts/src/transform/transform.ts b/packages/typespec-ts/src/transform/transform.ts
@@ -46,6 +46,7 @@ export async function transformRLCModel(
 ): Promise<RLCModel> {
   const program = dpgContext.program;
   const options: RLCOptions = dpgContext.rlcOptions!;
+  const rlcSourceDir = dpgContext.generationPathDetail?.rlcSourcesDir;
   const srcPath = path.join(
     dpgContext.generationPathDetail?.rlcSourcesDir ?? "",
     options.batch && options.batch.length > 1
@@ -100,7 +101,8 @@ export async function transformRLCModel(
     importInfo: {
       internalImports: importSet,
       runtimeImports: buildRuntimeImports(options.flavor)
-    }
+    },
+    rlcSourceDir
   };
   model.sampleGroups = transformSampleGroups(
     model,