chore(geneate-clients): copy client with diff name to folder

Author: AllanZhengYP

scripts/generate-clients/copy-to-clients.js

@@ -3,8 +3,11 @@ const { normalize, join } = require("path");
 const { copySync, removeSync } = require("fs-extra");
 const { readdirSync, lstatSync, readFileSync, existsSync, writeFileSync } = require("fs");
 
-const getOverwritablePredicate = (packageName) => (pathName) => {
-  const overwritablePathnames = [
+const getOverwritableDirectories = (subDirectories, packageName) => {
+  const additionalGeneratedFiles = {
+    "@aws-sdk/client-sts": ["defaultRoleAssumers.ts", "defaultStsRoleAssumers.ts", "defaultRoleAssumers.spec.ts"],
+  };
+  const overwritableDirectories = [
     "commands",
     "models",
     "protocols",
@@ -20,18 +23,17 @@ const getOverwritablePredicate = (packageName) => (pathName) => {
     "endpoints.ts",
     "README.md",
   ];
-  const additionalGeneratedFiles = {
-    "@aws-sdk/client-sts": ["defaultRoleAssumers.ts", "defaultStsRoleAssumers.ts", "defaultRoleAssumers.spec.ts"],
-  };
-  return (
-    pathName
-      .toLowerCase()
-      .startsWith(
-        packageName.toLowerCase().replace("@aws-sdk/client-", "").replace("@aws-sdk/aws-", "").replace(/-/g, "")
-      ) ||
-    overwritablePathnames.indexOf(pathName) >= 0 ||
-    additionalGeneratedFiles[packageName.toLowerCase()]?.indexOf(pathName) >= 0
-  );
+  return subDirectories.filter((subDirectory) => {
+    const isBareBoneClient =
+      subDirectory.endsWith("Client.ts") && subDirectories.includes(subDirectory.replace("Client.ts", ".ts"));
+    const isAggregateClient = subDirectories.includes(subDirectory.replace(".ts", "Client.ts"));
+    return (
+      isBareBoneClient ||
+      isAggregateClient ||
+      overwritableDirectories.indexOf(subDirectory) >= 0 ||
+      additionalGeneratedFiles[packageName].includes(subDirectory)
+    );
+  });
 };
 
 /**
@@ -109,7 +111,6 @@ const copyToClients = async (sourceDir, destinationDir) => {
 
     console.log(`copying ${packageName} from ${artifactPath} to ${destinationDir}`);
     const destPath = join(destinationDir, clientName);
-    const overwritablePredicate = getOverwritablePredicate(packageName);
 
     // Code to move files/folders prefixed with `doc-client-` to `lib/lib-dynamodb`
     if (clientName === "client-dynamodb") {
@@ -124,7 +125,9 @@ const copyToClients = async (sourceDir, destinationDir) => {
       }
     }
 
-    for (const packageSub of readdirSync(artifactPath)) {
+    const packageSubs = readdirSync(artifactPath);
+    const overWritableSubs = getOverwritableDirectories(packageSubs, packageName);
+    for (const packageSub of packageSubs) {
       const packageSubPath = join(artifactPath, packageSub);
       const destSubPath = join(destPath, packageSub);
 
@@ -141,7 +144,7 @@ const copyToClients = async (sourceDir, destinationDir) => {
           },
         };
         writeFileSync(destSubPath, JSON.stringify(mergedManifest, null, 2).concat(`\n`));
-      } else if (overwritablePredicate(packageSub) || !existsSync(destSubPath)) {
+      } else if (overWritableSubs.includes(packageSub) || !existsSync(destSubPath)) {
         if (lstatSync(packageSubPath).isDirectory()) removeSync(destSubPath);
         copySync(packageSubPath, destSubPath, {
           overwrite: true,
@@ -168,9 +171,10 @@ const copyServerTests = async (sourceDir, destinationDir) => {
 
     console.log(`copying ${packageName} from ${artifactPath} to ${destinationDir}`);
     const destPath = join(destinationDir, testName);
-    const overwritablePredicate = getOverwritablePredicate(packageName);
 
-    for (const packageSub of readdirSync(artifactPath)) {
+    const packageSubs = readdirSync(artifactPath);
+    const overWritableSubs = getOverwritableDirectories(packageSubs, packageName);
+    for (const packageSub of packageSubs) {
       const packageSubPath = join(artifactPath, packageSub);
       const destSubPath = join(destPath, packageSub);
 
@@ -187,7 +191,7 @@ const copyServerTests = async (sourceDir, destinationDir) => {
           },
         };
         writeFileSync(destSubPath, JSON.stringify(mergedManifest, null, 2).concat(`\n`));
-      } else if (overwritablePredicate(packageSub) || !existsSync(destSubPath)) {
+      } else if (overWritableSubs.includes(packageSub) || !existsSync(destSubPath)) {
         if (lstatSync(packageSubPath).isDirectory()) removeSync(destSubPath);
         copySync(packageSubPath, destSubPath, {
           overwrite: true,

scripts/generate-clients/index.js

@@ -48,7 +48,7 @@ const {
       await prettifyCode(CODE_GEN_PROTOCOL_TESTS_OUTPUT_DIR);
       await copyServerTests(CODE_GEN_PROTOCOL_TESTS_OUTPUT_DIR, PROTOCOL_TESTS_CLIENTS_DIR);
 
-      emptyDirSync(CODE_GEN_PROTOCOL_TESTS_OUTPUT_DIR);
+      // emptyDirSync(CODE_GEN_PROTOCOL_TESTS_OUTPUT_DIR);
       emptyDirSync(TEMP_CODE_GEN_INPUT_DIR);
 
       rmdirSync(TEMP_CODE_GEN_INPUT_DIR);