output copyright header properly

Author: bobzhang

jscomp/core/js_dump_program.ml

@@ -48,6 +48,21 @@ let deps_program_is_empty (x : J.deps_program) =
     } -> program_is_empty program
   | _ -> false 
 
+let rec extract_block_comments acc (x : J.block) = 
+  match x with 
+  | {statement_desc = Exp {expression_desc = Raw_js_code {code ; code_info = Stmt (Js_stmt_comment)}} } :: rest
+      -> extract_block_comments (code :: acc) rest 
+  | _ -> (acc ,x)
+
+
+let extract_file_comments  (x : J.deps_program) = 
+  let comments, new_block = extract_block_comments [] x.program.block in 
+  comments , {x with program = {x.program with block = new_block}}
+    
+
+
+
+
 let program f cxt   ( x : J.program ) = 
   P.force_newline f;
   let cxt =  Js_dump.statement_list true cxt f x.block  in
@@ -107,7 +122,7 @@ let es6_program  ~output_dir fmt f (  x : J.deps_program) =
 *)
 
 let pp_deps_program
-    ~output_prefix
+    ~(output_prefix : string)
     (kind : Js_packages_info.module_system )
     (program  : J.deps_program) (f : Ext_pp.t) = 
   if not !Js_config.no_version_header then 
@@ -119,6 +134,8 @@ let pp_deps_program
     P.string f empty_explanation 
     (* This is empty module, it won't be referred anywhere *)
   else 
+    let comments, program = extract_file_comments program  in 
+    Ext_list.rev_iter comments (fun comment -> P.string f comment; P.newline f) ;
     let output_dir = Filename.dirname output_prefix in   
     begin 
       ignore (match kind with 

jscomp/test/raw_pure_test.js

@@ -1,10 +1,9 @@
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
 /**
  * copyright 
 */
+'use strict';
+
+var List = require("../../lib/js/list.js");
 
 var x0 = null;
 

lib/4.06.1/unstable/js_compiler.ml

@@ -109638,6 +109638,21 @@ let deps_program_is_empty (x : J.deps_program) =
     } -> program_is_empty program
   | _ -> false 
 
+let rec extract_block_comments acc (x : J.block) = 
+  match x with 
+  | {statement_desc = Exp {expression_desc = Raw_js_code {code ; code_info = Stmt (Js_stmt_comment)}} } :: rest
+      -> extract_block_comments (code :: acc) rest 
+  | _ -> (acc ,x)
+
+
+let extract_file_comments  (x : J.deps_program) = 
+  let comments, new_block = extract_block_comments [] x.program.block in 
+  comments , {x with program = {x.program with block = new_block}}
+    
+
+
+
+
 let program f cxt   ( x : J.program ) = 
   P.force_newline f;
   let cxt =  Js_dump.statement_list true cxt f x.block  in
@@ -109697,7 +109712,7 @@ let es6_program  ~output_dir fmt f (  x : J.deps_program) =
 *)
 
 let pp_deps_program
-    ~output_prefix
+    ~(output_prefix : string)
     (kind : Js_packages_info.module_system )
     (program  : J.deps_program) (f : Ext_pp.t) = 
   if not !Js_config.no_version_header then 
@@ -109709,6 +109724,8 @@ let pp_deps_program
     P.string f empty_explanation 
     (* This is empty module, it won't be referred anywhere *)
   else 
+    let comments, program = extract_file_comments program  in 
+    Ext_list.rev_iter comments (fun comment -> P.string f comment; P.newline f) ;
     let output_dir = Filename.dirname output_prefix in   
     begin 
       ignore (match kind with 

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -388744,6 +388744,21 @@ let deps_program_is_empty (x : J.deps_program) =
     } -> program_is_empty program
   | _ -> false 
 
+let rec extract_block_comments acc (x : J.block) = 
+  match x with 
+  | {statement_desc = Exp {expression_desc = Raw_js_code {code ; code_info = Stmt (Js_stmt_comment)}} } :: rest
+      -> extract_block_comments (code :: acc) rest 
+  | _ -> (acc ,x)
+
+
+let extract_file_comments  (x : J.deps_program) = 
+  let comments, new_block = extract_block_comments [] x.program.block in 
+  comments , {x with program = {x.program with block = new_block}}
+    
+
+
+
+
 let program f cxt   ( x : J.program ) = 
   P.force_newline f;
   let cxt =  Js_dump.statement_list true cxt f x.block  in
@@ -388803,7 +388818,7 @@ let es6_program  ~output_dir fmt f (  x : J.deps_program) =
 *)
 
 let pp_deps_program
-    ~output_prefix
+    ~(output_prefix : string)
     (kind : Js_packages_info.module_system )
     (program  : J.deps_program) (f : Ext_pp.t) = 
   if not !Js_config.no_version_header then 
@@ -388815,6 +388830,8 @@ let pp_deps_program
     P.string f empty_explanation 
     (* This is empty module, it won't be referred anywhere *)
   else 
+    let comments, program = extract_file_comments program  in 
+    Ext_list.rev_iter comments (fun comment -> P.string f comment; P.newline f) ;
     let output_dir = Filename.dirname output_prefix in   
     begin 
       ignore (match kind with 

lib/4.06.1/whole_compiler.ml

@@ -101607,6 +101607,21 @@ let deps_program_is_empty (x : J.deps_program) =
     } -> program_is_empty program
   | _ -> false 
 
+let rec extract_block_comments acc (x : J.block) = 
+  match x with 
+  | {statement_desc = Exp {expression_desc = Raw_js_code {code ; code_info = Stmt (Js_stmt_comment)}} } :: rest
+      -> extract_block_comments (code :: acc) rest 
+  | _ -> (acc ,x)
+
+
+let extract_file_comments  (x : J.deps_program) = 
+  let comments, new_block = extract_block_comments [] x.program.block in 
+  comments , {x with program = {x.program with block = new_block}}
+    
+
+
+
+
 let program f cxt   ( x : J.program ) = 
   P.force_newline f;
   let cxt =  Js_dump.statement_list true cxt f x.block  in
@@ -101666,7 +101681,7 @@ let es6_program  ~output_dir fmt f (  x : J.deps_program) =
 *)
 
 let pp_deps_program
-    ~output_prefix
+    ~(output_prefix : string)
     (kind : Js_packages_info.module_system )
     (program  : J.deps_program) (f : Ext_pp.t) = 
   if not !Js_config.no_version_header then 
@@ -101678,6 +101693,8 @@ let pp_deps_program
     P.string f empty_explanation 
     (* This is empty module, it won't be referred anywhere *)
   else 
+    let comments, program = extract_file_comments program  in 
+    Ext_list.rev_iter comments (fun comment -> P.string f comment; P.newline f) ;
     let output_dir = Filename.dirname output_prefix in   
     begin 
       ignore (match kind with