From f463a547a8854601379d36e2356852fc7cffb6e3 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Mon, 4 Oct 2021 18:01:15 +0000 Subject: [PATCH 1/2] fix(client-documentation-generator): read files from src folder --- .../src/sdk-client-rename-project.ts | 2 +- .../src/sdk-client-toc-plugin.ts | 4 +++- packages/client-documentation-generator/src/utils.ts | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/client-documentation-generator/src/sdk-client-rename-project.ts b/packages/client-documentation-generator/src/sdk-client-rename-project.ts index d366de605e0a6..2bcb3a329715d 100644 --- a/packages/client-documentation-generator/src/sdk-client-rename-project.ts +++ b/packages/client-documentation-generator/src/sdk-client-rename-project.ts @@ -23,7 +23,7 @@ export class SdkClientRenameProjectPlugin extends RendererComponent { sourceFile.fileName.endsWith("/package.json") )?.[0]?.fullFileName; const { name } = metadataDir || JSON.parse(readFileSync(metadataDir).toString()); - const serviceIdReflection = clientDirectory.files + const serviceIdReflection = clientDirectory.directories.src.files ?.filter((sourceFile) => sourceFile.fileName.endsWith("/runtimeConfig.shared.ts"))?.[0] .reflections.filter((reflection) => reflection.name === "serviceId")?.[0]; this.projectName = serviceIdReflection /* serviceIdReflection.defaultValue looks like '"S3"' */ diff --git a/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts b/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts index bf63ad9eb4f9c..4b0da07de85c3 100644 --- a/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts +++ b/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts @@ -167,6 +167,8 @@ export class SdkClientTocPlugin extends RendererComponent { projectModel = projectModel.parent as ProjectReflection; } const clientsDirectory = getCurrentClientDirectory({ project: projectModel as ProjectReflection }); - return dirname(clientsDirectory?.files.find((file) => file.name.endsWith("Client.ts")).fullFileName); + return dirname( + clientsDirectory?.directories.src.files.find((file) => file.name.endsWith("Client.ts")).fullFileName + ); } } diff --git a/packages/client-documentation-generator/src/utils.ts b/packages/client-documentation-generator/src/utils.ts index 0556a07a7aab7..a0564e40b31ed 100644 --- a/packages/client-documentation-generator/src/utils.ts +++ b/packages/client-documentation-generator/src/utils.ts @@ -2,7 +2,5 @@ import { ProjectReflection, SourceDirectory } from "typedoc/dist/lib/models"; export const getCurrentClientDirectory = (event: { project: ProjectReflection }): SourceDirectory => { const clientsDirectory = event.project.directory.directories["clients"].directories; - return Object.values(clientsDirectory).filter((directory) => - directory?.files.find((file) => file.name.endsWith("Client.ts")) - )[0]; + return Object.values(clientsDirectory).filter((directory) => directory?.directories?.src)[0]; }; From a6c42a8f1cef4449833f1d2141a9020d1fea7c11 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Mon, 4 Oct 2021 18:27:29 +0000 Subject: [PATCH 2/2] fix(client-documentation-generator): clientDir is parentDir of src --- .../client-documentation-generator/src/sdk-client-toc-plugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts b/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts index 4b0da07de85c3..8af81271703fb 100644 --- a/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts +++ b/packages/client-documentation-generator/src/sdk-client-toc-plugin.ts @@ -168,7 +168,7 @@ export class SdkClientTocPlugin extends RendererComponent { } const clientsDirectory = getCurrentClientDirectory({ project: projectModel as ProjectReflection }); return dirname( - clientsDirectory?.directories.src.files.find((file) => file.name.endsWith("Client.ts")).fullFileName + dirname(clientsDirectory?.directories.src.files.find((file) => file.name.endsWith("Client.ts")).fullFileName) ); } }