@azure-tools/typespec-ts 0.55.0-dev.5 → 0.55.0-dev.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.55.0-dev.5",
+  "version": "0.55.0-dev.7",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",

package/src/framework/hooks/binder.ts

@@ -23,7 +23,7 @@ export interface BinderOptions {
   staticHelpers?: Map<string, StaticHelperMetadata>;
   dependencies?: Record<string, ReferenceableSymbol>;
   /** When true, use #platform/ subpath imports for static helpers with platform variants.
-   *  Should be true for warp (azureSdkForJs) packages; false for tshy packages. */
+   *  Should be true for warp packages; false for tshy packages. */
   useSubpathImports?: boolean;
 }
 

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

@@ -99,16 +99,14 @@ export async function loadStaticHelpers(
         // so that browser/react-native variants are resolved via subpath imports.
         // Only rewrite imports to the default variant (not -browser/-react-native variants
         // which are already platform-specific direct imports).
-        if (options.options?.azureSdkForJs) {
-          const specifier = i.getModuleSpecifierValue();
-          if (
-            specifier.startsWith(".") &&
-            specifier.includes("platform-types") &&
-            !specifier.includes("-browser") &&
-            !specifier.includes("-react-native")
-          ) {
-            i.setModuleSpecifier("#platform/static-helpers/platform-types");
-          }
+        const specifier = i.getModuleSpecifierValue();
+        if (
+          specifier.startsWith(".") &&
+          specifier.includes("platform-types") &&
+          !specifier.includes("-browser") &&
+          !specifier.includes("-react-native")
+        ) {
+          i.setModuleSpecifier("#platform/static-helpers/platform-types");
         }
       });
 

package/src/index.ts

@@ -50,7 +50,6 @@ import {
   buildReadmeFile,
   buildRecordedClientFile,
   buildResponseTypes,
-  buildRollupConfig,
   buildSampleEnvFile,
   buildSampleTest,
   buildSamples,
@@ -187,7 +186,7 @@ export async function $onEmit(context: EmitContext) {
     dependencies: {
       ...extraDependencies,
     },
-    useSubpathImports: rlcOptions.azureSdkForJs === true,
+    useSubpathImports: true,
   });
   provideSdkTypes(dpgContext);
 
@@ -236,8 +235,7 @@ export async function $onEmit(context: EmitContext) {
     );
     options.generateTest =
       options.generateTest === true ||
-      (options.generateTest === undefined &&
-        (!hasTestFolder || (options.azureSdkForJs && options.azureArm)));
+      (options.generateTest === undefined && (!hasTestFolder || options.azureArm));
     dpgContext.rlcOptions = options;
   }
 
@@ -505,7 +503,6 @@ export async function $onEmit(context: EmitContext) {
 
     if (shouldGenerateMetadata) {
       const commonBuilders = [
-        buildRollupConfig,
         buildApiExtractorConfig,
         buildReadmeFile,
         buildLicenseFile,
@@ -523,7 +520,6 @@ export async function $onEmit(context: EmitContext) {
       }
       if (
         emitterOptions["generate-test"] === true &&
-        option.azureSdkForJs === true &&
         emitterOptions["generate-metadata"] === true
       ) {
         await emitTests(dpgContext, host);
@@ -548,29 +544,23 @@ export async function $onEmit(context: EmitContext) {
       }
       commonBuilders.push((model) => buildPackageFile(model, modularPackageInfo));
       // Generate warp.config.yml for Azure monorepo ESM packages
-      if (option.azureSdkForJs) {
-        commonBuilders.push((model) => buildWarpConfig(model, modularPackageInfo));
-      }
+      commonBuilders.push((model) => buildWarpConfig(model, modularPackageInfo));
       commonBuilders.push(buildTsConfig);
-      if (option.azureSdkForJs) {
-        commonBuilders.push(buildTsSrcEsmConfig);
-        commonBuilders.push(buildTsSrcBrowserConfig);
-        if (option.generateReactNativeTarget) {
-          commonBuilders.push(buildTsSrcReactNativeConfig);
-        }
-        commonBuilders.push(buildTsSrcCjsConfig);
-        if (option.generateSample) {
-          commonBuilders.push(buildTsSampleConfig);
-        }
-        commonBuilders.push(buildTsLintConfig);
+      commonBuilders.push(buildTsSrcEsmConfig);
+      commonBuilders.push(buildTsSrcBrowserConfig);
+      if (option.generateReactNativeTarget) {
+        commonBuilders.push(buildTsSrcReactNativeConfig);
+      }
+      commonBuilders.push(buildTsSrcCjsConfig);
+      if (option.generateSample) {
+        commonBuilders.push(buildTsSampleConfig);
       }
+      commonBuilders.push(buildTsLintConfig);
 
       // TODO: need support snippets generation for multi-client cases. https://github.com/Azure/autorest.typescript/issues/3048
       if (option.generateTest) {
         for (const subClient of dpgContext.sdkPackage.clients) {
-          commonBuilders.push((model) =>
-            buildSnippets(model, subClient.name, option.azureSdkForJs),
-          );
+          commonBuilders.push((model) => buildSnippets(model, subClient.name));
         }
         commonBuilders.push(buildTsSnippetsConfig);
       }
@@ -613,9 +603,9 @@ export async function $onEmit(context: EmitContext) {
         };
       }
 
-      // Always update package.json for monorepo packages (adds #platform/* imports)
-      // and for modular packages (adds exports, clientContextPaths, LRO deps)
-      if (option.isModularLibrary || option.azureSdkForJs) {
+      // Always update package.json (adds #platform/* imports) and, for modular
+      // packages, exports, clientContextPaths and LRO deps.
+      {
         // Read package.json content via host and pass parsed object
         const pkgSourceFile = await host.readFile(existingPackageFilePath);
         let packageInfo: Record<string, any>;
@@ -630,9 +620,7 @@ export async function $onEmit(context: EmitContext) {
       }
 
       // Update warp.config.yml for Azure monorepo packages
-      if (option.azureSdkForJs) {
-        updateBuilders.push((model: RLCModel) => buildWarpConfig(model, modularPackageInfo));
-      }
+      updateBuilders.push((model: RLCModel) => buildWarpConfig(model, modularPackageInfo));
 
       // If the client name changed, regenerate the README and snippets completely;
       // otherwise update only the API reference link in-place.
@@ -647,10 +635,10 @@ export async function $onEmit(context: EmitContext) {
         );
 
         // Regenerate snippets.spec.ts only when the client name changed
-        if (clientNameChanged && option.azureSdkForJs) {
+        if (clientNameChanged) {
           for (const subClient of dpgContext.sdkPackage.clients) {
             updateBuilders.push((model: RLCModel) =>
-              buildSnippets(model, getClassicalClientName(subClient), option.azureSdkForJs),
+              buildSnippets(model, getClassicalClientName(subClient)),
             );
           }
         }

package/src/lib.ts

@@ -42,7 +42,6 @@ export interface EmitterOptions {
    */
   "generate-test"?: boolean;
   "generate-sample"?: boolean;
-  "azure-sdk-for-js"?: boolean;
   "azure-output-directory"?: string;
   "is-typespec-test"?: boolean;
   title?: string;
@@ -50,9 +49,7 @@ export interface EmitterOptions {
   "product-doc-link"?: string;
   "service-info"?: ServiceInfo;
   "azure-arm"?: boolean;
-  "source-from"?: "TypeSpec" | "Swagger";
   "is-modular-library"?: boolean;
-  "module-kind"?: "esm";
   "enable-operation-group"?: boolean;
   "enable-model-namespace"?: boolean;
   "hierarchy-client"?: boolean;
@@ -91,7 +88,6 @@ export interface EmitterOptions {
   /**
    * When set to true, generates React Native build targets (tsconfig, warp target,
    * package.json exports). Defaults to `false`.
-   * Only applicable when `azure-sdk-for-js` is `true`.
    */
   "generate-react-native-target"?: boolean;
 }
@@ -193,9 +189,8 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       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`.",
+        "- If there's a test folder under package-dir. Defaults to `false`.",
+        "- If there's not a test folder under package-dir. Defaults to `true`.",
       ].join("\n"),
     },
     "generate-sample": {
@@ -204,12 +199,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "Whether to generate sample files, for basic samples of your generated sdks. Defaults to `undefined`. Management packages' default to `true`.",
     },
-    "azure-sdk-for-js": {
-      type: "boolean",
-      nullable: true,
-      description:
-        "This is used to indicate your project is generated in [azure-sdk-for-js](https://github.com/Azure/azure-sdk-for-js) repo or not. If your package is located in that repo we'll leverage `dev-tool` to accelerate our building and testing, however if not we'll remove the dependency for that tool. Defaults to `undefined`. ",
-    },
     "azure-output-directory": {
       type: "string",
       nullable: true,
@@ -256,11 +245,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       nullable: true,
       description: "Whether the package is an arm package.",
     },
-    "source-from": {
-      type: "string",
-      nullable: true,
-      description: "Internal option, the value is default for TypeSpec generation",
-    },
     "is-modular-library": {
       type: "boolean",
       nullable: true,
@@ -286,13 +270,6 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "An option to organize the client in a hierarchical way as defined by `@clientInitialization`. This is true by default.",
     },
-    "module-kind": {
-      type: "string",
-      nullable: true,
-      enum: ["esm"],
-      default: "esm",
-      description: "Internal option for test.",
-    },
     "compatibility-mode": {
       type: "boolean",
       nullable: true,
@@ -390,7 +367,7 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
       type: "boolean",
       nullable: true,
       description:
-        "When set to true, generates React Native build targets (tsconfig, warp target, package.json exports). Only applicable when azure-sdk-for-js is true. Defaults to `false`.",
+        "When set to true, generates React Native build targets (tsconfig, warp target, package.json exports). Defaults to `false`.",
     },
   },
   required: [],

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

@@ -14,7 +14,7 @@ import {
 
 import { REST_CLIENT_RESERVED } from "./build-method-shortcuts.js";
 import { getImportSpecifier } from "./helpers/imports-util.js";
-import { getClientName, getImportModuleName } from "./helpers/name-constructors.js";
+import { getClientName } from "./helpers/name-constructors.js";
 import { CasingConvention, NameType, normalizeName, pascalCase } from "./helpers/name-utils.js";
 import {
   buildMethodDefinitions,
@@ -83,10 +83,7 @@ export function buildClientDefinitions(model: RLCModel) {
     clientDefinitionsFile.addImportDeclaration({
       isTypeOnly: true,
       namedImports: [...options.importedParameters],
-      moduleSpecifier: getImportModuleName(
-        { cjsName: "./parameters", esModulesName: "./parameters.js" },
-        model,
-      ),
+      moduleSpecifier: "./parameters.js",
     });
   }
 
@@ -94,10 +91,7 @@ export function buildClientDefinitions(model: RLCModel) {
     clientDefinitionsFile.addImportDeclaration({
       isTypeOnly: true,
       namedImports: [...options.importedResponses],
-      moduleSpecifier: getImportModuleName(
-        { cjsName: "./responses", esModulesName: "./responses.js" },
-        model,
-      ),
+      moduleSpecifier: "./responses.js",
     });
   }
 
@@ -105,10 +99,7 @@ export function buildClientDefinitions(model: RLCModel) {
     clientDefinitionsFile.addImportDeclaration({
       isTypeOnly: true,
       namedImports: Array.from(model.importInfo.internalImports.rlcClientDefinition.importsSet!),
-      moduleSpecifier: getImportModuleName(
-        { cjsName: "./models", esModulesName: "./models.js" },
-        model,
-      ),
+      moduleSpecifier: "./models.js",
     });
   }
 

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

@@ -14,7 +14,7 @@ import {
 } from "ts-morph";
 import { buildMethodShortcutImplementation } from "./build-method-shortcuts.js";
 import { getImportSpecifier } from "./helpers/imports-util.js";
-import { getClientName, getImportModuleName } from "./helpers/name-constructors.js";
+import { getClientName } from "./helpers/name-constructors.js";
 import { NameType, normalizeName } from "./helpers/name-utils.js";
 import { File, PathParameter, RLCModel } from "./interfaces.js";
 
@@ -194,13 +194,7 @@ export function buildClient(model: RLCModel): File | undefined {
   clientFile.addImportDeclarations([
     {
       namedImports: ["logger"],
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: loggerPath,
-          esModulesName: `${loggerPath}.js`,
-        },
-        model,
-      ),
+      moduleSpecifier: `${loggerPath}.js`,
     },
   ]);
 
@@ -233,13 +227,7 @@ export function buildClient(model: RLCModel): File | undefined {
     {
       isTypeOnly: true,
       namedImports: [`${clientInterfaceName}`],
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./clientDefinitions",
-          esModulesName: "./clientDefinitions.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./clientDefinitions.js",
     },
   ]);
   if ((model.importInfo.internalImports?.rlcClientFactory?.importsSet?.size ?? 0) > 0) {
@@ -247,13 +235,7 @@ export function buildClient(model: RLCModel): File | undefined {
       {
         isTypeOnly: true,
         namedImports: Array.from(model.importInfo.internalImports.rlcClientFactory.importsSet!),
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./models`,
-            esModulesName: `./models.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./models.js`,
       },
     ]);
   }

package/src/rlc-common/build-index-file.ts

@@ -3,7 +3,6 @@
 
 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";
 import {
   hasCsvCollection,
@@ -49,42 +48,24 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
 
   file.addImportDeclaration({
     namespaceImport: "Parameters",
-    moduleSpecifier: getImportModuleName(
-      { cjsName: "./parameters", esModulesName: "./parameters.js" },
-      model,
-    ),
+    moduleSpecifier: "./parameters.js",
   });
 
   file.addImportDeclaration({
     namespaceImport: "Responses",
-    moduleSpecifier: getImportModuleName(
-      { cjsName: "./responses", esModulesName: "./responses.js" },
-      model,
-    ),
+    moduleSpecifier: "./responses.js",
   });
 
   file.addImportDeclaration({
     namespaceImport: "Client",
-    moduleSpecifier: getImportModuleName(
-      {
-        cjsName: "./clientDefinitions",
-        esModulesName: "./clientDefinitions.js",
-      },
-      model,
-    ),
+    moduleSpecifier: "./clientDefinitions.js",
   });
 
   const exports = ["Parameters", "Responses", "Client"];
   if (hasInputModels(model)) {
     file.addImportDeclaration({
       namespaceImport: "Models",
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./models",
-          esModulesName: "./models.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./models.js",
     });
     exports.push("Models");
   }
@@ -92,13 +73,7 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
   if (hasOutputModels(model)) {
     file.addImportDeclaration({
       namespaceImport: "OutputModels",
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./outputModels",
-          esModulesName: "./outputModels.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./outputModels.js",
     });
     exports.push("OutputModels");
   }
@@ -106,13 +81,7 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
   if (hasPagingOperations(model)) {
     file.addImportDeclaration({
       namespaceImport: "PaginateHelper",
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./paginateHelper",
-          esModulesName: "./paginateHelper.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./paginateHelper.js",
     });
     exports.push("PaginateHelper");
   }
@@ -120,13 +89,7 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
   if (hasUnexpectedHelper(model)) {
     file.addImportDeclaration({
       namespaceImport: "UnexpectedHelper",
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./isUnexpected",
-          esModulesName: "./isUnexpected.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./isUnexpected.js",
     });
     exports.push("UnexpectedHelper");
   }
@@ -134,13 +97,7 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
   if (hasPollingOperations(model)) {
     file.addImportDeclaration({
       namespaceImport: "PollingHelper",
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./pollingHelper",
-          esModulesName: "./pollingHelper.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./pollingHelper.js",
     });
     exports.push("PollingHelper");
   }
@@ -154,26 +111,14 @@ function generateRLCIndexForMultiClient(file: SourceFile, model: RLCModel) {
   ) {
     file.addImportDeclaration({
       namespaceImport: "SerializeHelper",
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: "./serializeHelper",
-          esModulesName: "./serializeHelper.js",
-        },
-        model,
-      ),
+      moduleSpecifier: "./serializeHelper.js",
     });
     exports.push("SerializeHelper");
   }
 
   file.addExportDeclarations([
     {
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: `./${moduleName}`,
-          esModulesName: `./${moduleName}.js`,
-        },
-        model,
-      ),
+      moduleSpecifier: `./${moduleName}.js`,
       namedExports: [`${createClientFuncName}`, `${clientName}ClientOptions`],
     },
     {
@@ -188,65 +133,29 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
   const moduleName = normalizeName(clientName, NameType.File);
 
   file.addImportDeclaration({
-    moduleSpecifier: getImportModuleName(
-      {
-        cjsName: `./${moduleName}`,
-        esModulesName: `./${moduleName}.js`,
-      },
-      model,
-    ),
+    moduleSpecifier: `./${moduleName}.js`,
     defaultImport: createClientFuncName,
   });
 
   file.addExportDeclarations([
     {
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: `./${moduleName}`,
-          esModulesName: `./${moduleName}.js`,
-        },
-        model,
-      ),
+      moduleSpecifier: `./${moduleName}.js`,
     },
     {
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: `./parameters`,
-          esModulesName: `./parameters.js`,
-        },
-        model,
-      ),
+      moduleSpecifier: `./parameters.js`,
     },
     {
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: `./responses`,
-          esModulesName: `./responses.js`,
-        },
-        model,
-      ),
+      moduleSpecifier: `./responses.js`,
     },
     {
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: `./clientDefinitions`,
-          esModulesName: `./clientDefinitions.js`,
-        },
-        model,
-      ),
+      moduleSpecifier: `./clientDefinitions.js`,
     },
   ]);
 
   if (hasUnexpectedHelper(model)) {
     file.addExportDeclarations([
       {
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./isUnexpected`,
-            esModulesName: `./isUnexpected.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./isUnexpected.js`,
       },
     ]);
   }
@@ -254,13 +163,7 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
   if (hasInputModels(model)) {
     file.addExportDeclarations([
       {
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./models`,
-            esModulesName: `./models.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./models.js`,
       },
     ]);
   }
@@ -268,13 +171,7 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
   if (hasOutputModels(model)) {
     file.addExportDeclarations([
       {
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./outputModels`,
-            esModulesName: `./outputModels.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./outputModels.js`,
       },
     ]);
   }
@@ -282,13 +179,7 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
   if (hasPagingOperations(model)) {
     file.addExportDeclarations([
       {
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./paginateHelper`,
-            esModulesName: `./paginateHelper.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./paginateHelper.js`,
       },
     ]);
   }
@@ -296,13 +187,7 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
   if (hasPollingOperations(model)) {
     file.addExportDeclarations([
       {
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./pollingHelper`,
-            esModulesName: `./pollingHelper.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./pollingHelper.js`,
       },
     ]);
   }
@@ -316,13 +201,7 @@ function generateRLCIndex(file: SourceFile, model: RLCModel) {
   ) {
     file.addExportDeclarations([
       {
-        moduleSpecifier: getImportModuleName(
-          {
-            cjsName: `./serializeHelper`,
-            esModulesName: `./serializeHelper.js`,
-          },
-          model,
-        ),
+        moduleSpecifier: `./serializeHelper.js`,
       },
     ]);
   }

package/src/rlc-common/build-is-unexpected-helper.ts

@@ -8,7 +8,6 @@ import {
   Project,
   VariableDeclarationKind,
 } from "ts-morph";
-import { getImportModuleName } from "./helpers/name-constructors.js";
 import { hasUnexpectedHelper } from "./helpers/operation-helpers.js";
 import { RLCModel } from "./interfaces.js";
 export function buildIsUnexpectedHelper(model: RLCModel) {
@@ -94,13 +93,7 @@ export function buildIsUnexpectedHelper(model: RLCModel) {
   isErrorHelper.addImportDeclaration({
     isTypeOnly: true,
     namedImports: [...allResponseTypes],
-    moduleSpecifier: getImportModuleName(
-      {
-        cjsName: `./responses`,
-        esModulesName: `./responses.js`,
-      },
-      model,
-    ),
+    moduleSpecifier: `./responses.js`,
   });
 
   isErrorHelper.addVariableStatement({

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

@@ -10,19 +10,9 @@ export function buildLogger(model: RLCModel) {
     return undefined;
   }
   const project = new Project({ useInMemoryFileSystem: true });
-  const { srcPath, rlcSourceDir } = model;
+  const { rlcSourceDir } = model;
   const { packageDetails } = model.options;
-  const filePath = joinPaths(
-    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 filePath = joinPaths(rlcSourceDir!, `logger.ts`);
   const loggerFile = project.createSourceFile("logger.ts", undefined, {
     overwrite: true,
   });