Omit weak files from single-module manifests.

PiperOrigin-RevId: 325462075

Author: tjgq

src/com/google/javascript/jscomp/AbstractCommandLineRunner.java

@@ -1231,7 +1231,6 @@ protected int doRun() throws IOException {
       compiler.printConfig(System.err);
     }
 
-
     String saveAfterChecksFilename = config.getSaveAfterChecksFileName();
     String continueSavedCompilationFilename = config.getContinueSavedCompilationFileName();
     if (config.skipNormalOutputs) {
@@ -2040,27 +2039,32 @@ private void outputManifestOrBundle(List<String> outputFiles, boolean isManifest
       }
 
       if (shouldGenerateOutputPerModule(output)) {
-        // Generate per-module manifests or bundles
+        // Generate per-module manifests or bundles.
         Iterable<JSModule> modules = compiler.getModuleGraph().getAllModules();
         for (JSModule module : modules) {
           try (Writer out = fileNameToOutputWriter2(expandCommandLinePath(output, module))) {
             if (isManifest) {
-              printManifestTo(module.getInputs(), out);
+              printManifestTo(module, out);
             } else {
-              printBundleTo(module.getInputs(), out);
+              printBundleTo(module, out);
             }
           }
         }
       } else {
         // Generate a single file manifest or bundle.
         try (Writer out = fileNameToOutputWriter2(expandCommandLinePath(output, null))) {
           if (config.module.isEmpty()) {
+            // For a single-module compilation, generate a single headerless manifest or bundle
+            // containing only the strong files.
+            JSModule module =
+                compiler.getModuleGraph().getModuleByName(JSModule.STRONG_MODULE_NAME);
             if (isManifest) {
-              printManifestTo(compiler.getInputsInOrder(), out);
+              printManifestTo(module, out);
             } else {
-              printBundleTo(compiler.getInputsInOrder(), out);
+              printBundleTo(module, out);
             }
           } else {
+            // For a multi-module compilation, generate a single manifest file with module headers.
             printModuleGraphManifestOrBundleTo(compiler.getModuleGraph(), out, isManifest);
           }
         }
@@ -2094,6 +2098,11 @@ void printModuleGraphManifestOrBundleTo(JSModuleGraph graph, Appendable out, boo
     Joiner commas = Joiner.on(",");
     boolean requiresNewline = false;
     for (JSModule module : graph.getAllModules()) {
+      if (!isManifest && module.isWeak()) {
+        // Skip the weak module on a multi-module bundle, but not a multi-module manifest.
+        continue;
+      }
+
       if (requiresNewline) {
         out.append("\n");
       }
@@ -2106,9 +2115,9 @@ void printModuleGraphManifestOrBundleTo(JSModuleGraph graph, Appendable out, boo
             String.format("{%s%s}\n",
                 module.getName(),
                 dependencies.isEmpty() ? "" : ":" + dependencies));
-        printManifestTo(module.getInputs(), out);
+        printManifestTo(module, out);
       } else {
-        printBundleTo(module.getInputs(), out);
+        printBundleTo(module, out);
       }
       requiresNewline = true;
     }
@@ -2120,12 +2129,10 @@ void printModuleGraphManifestOrBundleTo(JSModuleGraph graph, Appendable out, boo
    */
   @VisibleForTesting
   @GwtIncompatible("Unnecessary")
-  void printManifestTo(Iterable<CompilerInput> inputs, Appendable out) throws IOException {
-    for (CompilerInput input : inputs) {
+  void printManifestTo(JSModule module, Appendable out) throws IOException {
+    for (CompilerInput input : module.getInputs()) {
       String rootRelativePath = rootRelativePathsMap.get(input.getName());
-      String displayName = rootRelativePath != null
-          ? rootRelativePath
-          : input.getName();
+      String displayName = rootRelativePath != null ? rootRelativePath : input.getName();
       out.append(displayName);
       out.append("\n");
     }
@@ -2137,7 +2144,8 @@ void printManifestTo(Iterable<CompilerInput> inputs, Appendable out) throws IOEx
    */
   @VisibleForTesting
   @GwtIncompatible("Unnecessary")
-  void printBundleTo(Iterable<CompilerInput> inputs, Appendable out) throws IOException {
+  void printBundleTo(JSModule module, Appendable out) throws IOException {
+    Iterable<CompilerInput> inputs = module.getInputs();
     // Prebuild ASTs before they're needed in getLoadFlags, for performance and because
     // StackOverflowErrors can be hit if not prebuilt.
     if (compiler.getOptions().numParallelThreads > 1) {
@@ -2158,11 +2166,6 @@ void printBundleTo(Iterable<CompilerInput> inputs, Appendable out) throws IOExce
       String name = input.getName();
       String code = input.getSourceFile().getCode();
 
-      // Ignore weak files.
-      if (input.getSourceFile().isWeak()) {
-        continue;
-      }
-
       // Ignore empty fill files created by the compiler to facilitate cross-module code motion.
       // Note that non-empty fill files (ones whose code has actually been moved into) are still
       // emitted. In particular, this ensures that if there are no (real) inputs the bundle will be