fix: can remove the key from the codegen

Author: AllanZhengYP

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

@@ -32,25 +32,29 @@ const getOverwritablePredicate = packageName => pathName => {
   );
 };
 
+/**
+ * Copy the keys from newly-generated package.json to
+ * existing package.json. For each keys in new package.json
+ * we prefer the new key. Whereas for the values, we prefer
+ * the values in the existing package.json.
+ *
+ * This behavior enables as remove dependencies/scripts
+ * from codegen, but maintain the newer dependency versions
+ * in existing package.json
+ */
 const mergeManifest = (fromContent, toContent) => {
   const merged = {};
-  const toNames = Object.keys(toContent);
-  for (const name of toNames) {
-    if (!fromContent[name]) {
-      merged[name] = toContent[name];
-      continue;
-    }
+  const fromNames = Object.keys(fromConfig);
+  for (const name of fromNames) {
+    merged[name] = fromConfig[name];
     if (typeof toContent[name] === "object") {
       merged[name] = mergeManifest(fromContent[name], toContent[name]);
     } else {
+      // If key (say dependency) is present in both codegen and
+      // package.json, we prefer latter
       merged[name] = toContent[name] || fromContent[name];
     }
   }
-  for (const name of Object.keys(fromContent)) {
-    if (toNames.indexOf(name) < 0) {
-      merged[name] = fromContent[name];
-    }
-  }
   return merged;
 };
 
@@ -78,19 +82,23 @@ async function copyToClients(clientsDir) {
     for (const packageSub of readdirSync(artifactPath)) {
       const packageSubPath = join(artifactPath, packageSub);
       const destSubPath = join(destPath, packageSub);
-      if (overwritablePredicate(packageSub) || !existsSync(destSubPath)) {
+      if (packageSub === "package.json") {
+        //copy manifest file
+        const destManifest = existsSync(destSubPath)
+          ? JSON.parse(readFileSync(destSubPath).toString())
+          : {};
+        const mergedManifest = mergeManifest(packageManifest, destManifest);
+        writeFileSync(destSubPath, JSON.stringify(mergedManifest, null, 2));
+      } else if (
+        overwritablePredicate(packageSub) ||
+        !existsSync(destSubPath)
+      ) {
         //Overwrite the directories and files that are overwritable, or not yet exists
         if (lstatSync(packageSubPath).isDirectory()) ensureDirSync(destSubPath);
         copySync(packageSubPath, destSubPath, {
           overwrite: true
         });
       }
-      if (packageSub === "package.json") {
-        //copy manifest file
-        const destManifest = JSON.parse(readFileSync(destSubPath).toString());
-        const mergedManifest = mergeManifest(packageManifest, destManifest);
-        writeFileSync(destSubPath, JSON.stringify(mergedManifest, null, 2));
-      }
     }
   }
 }