Skip to content

Commit

Permalink
(- re) Clarify name of Js_packages_state to Js_current_package_info
Browse files Browse the repository at this point in the history
  • Loading branch information
ELLIOTTCABLE committed Apr 13, 2020
1 parent 056adf9 commit 0a33ff1
Show file tree
Hide file tree
Showing 12 changed files with 382 additions and 382 deletions.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion jscomp/core/js_name_of_module_id.ml
Expand Up @@ -84,7 +84,7 @@ let get_runtime_module_path (dep_module_id : Lam_module_ident.t)
let string_of_module_id (dep_module_id : Lam_module_ident.t)
~(output_dir : string) (module_system : Js_package_info.module_system) :
string =
let current_package_info = Js_packages_state.get_packages_info () in
let current_package_info = Js_current_package_info.get_packages_info () in
fix_path_for_windows
( match dep_module_id.kind with
| External name -> name (* the literal string for external package *)
Expand Down
2 changes: 1 addition & 1 deletion jscomp/core/lam_compile_main.ml
Expand Up @@ -263,7 +263,7 @@ let lambda_as_module (lambda_output : J.deps_program) (output_prefix : string) :
( if !Js_config.bs_suffix then Literals.suffix_bs_js
else Literals.suffix_js )
in
let package_info = Js_packages_state.get_packages_info () in
let package_info = Js_current_package_info.get_packages_info () in
if Js_package_info.is_empty package_info && !Js_config.js_stdout then
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
else
Expand Down
2 changes: 1 addition & 1 deletion jscomp/core/lam_stats_export.ml
Expand Up @@ -112,5 +112,5 @@ let export_to_cmj (meta : Lam_stats.t) effect export_map cmj_case :
(* FIXME: make sure [-o] would not change its case *)
(* FIXME: add test for ns/non-ns *)
Js_cmj_format.mk ~values ~effect
~npm_package_path:(Js_packages_state.get_packages_info ())
~npm_package_path:(Js_current_package_info.get_packages_info ())
~cmj_case
6 changes: 3 additions & 3 deletions jscomp/main/js_main.ml
Expand Up @@ -203,17 +203,17 @@ let buckle_script_flags : (string * Arg.spec * string) list =
Arg.Clear Js_config.sort_imports,
" No sort (see -bs-sort-imports)" )
:: ( "-bs-package-name",
Arg.String Js_packages_state.set_package_name,
Arg.String Js_current_package_info.set_package_name,
" set package name, useful when you want to produce npm packages" )
:: ( "-bs-ns",
Arg.String Js_packages_state.set_package_map,
Arg.String Js_current_package_info.set_package_map,
" set package map, not only set package name but also use it as a \
namespace" )
:: ( "-bs-no-version-header",
Arg.Set Js_config.no_version_header,
" Don't print version header" )
:: ( "-bs-package-output",
Arg.String Js_packages_state.append_location_descriptor_of_string,
Arg.String Js_current_package_info.append_location_descriptor_of_string,
" set npm-output-path: [opt_module]:path, for example: 'lib/cjs', \
'amdjs:lib/amdjs', 'es6:lib/es6' " )
:: ( "-bs-no-warn-unimplemented-external",
Expand Down
12 changes: 6 additions & 6 deletions lib/4.06.1/unstable/js_compiler.ml
Expand Up @@ -103664,8 +103664,8 @@ let find_package_json_dir cwd =
let package_dir = lazy (find_package_json_dir (Lazy.force cwd))

end
module Js_packages_state : sig
#1 "js_packages_state.mli"
module Js_current_package_info : sig
#1 "js_current_package_info.mli"
(* Copyright (C) 2017 Authors of BuckleScript
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -103699,7 +103699,7 @@ val get_packages_info : unit -> Js_package_info.t
val append_location_descriptor_of_string : string -> unit

end = struct
#1 "js_packages_state.ml"
#1 "js_current_package_info.ml"
(* Copyright (C) 2017 Authors of BuckleScript
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -109528,7 +109528,7 @@ let get_runtime_module_path (dep_module_id : Lam_module_ident.t)
let string_of_module_id (dep_module_id : Lam_module_ident.t)
~(output_dir : string) (module_system : Js_package_info.module_system) :
string =
let current_package_info = Js_packages_state.get_packages_info () in
let current_package_info = Js_current_package_info.get_packages_info () in
fix_path_for_windows
( match dep_module_id.kind with
| External name -> name (* the literal string for external package *)
Expand Down Expand Up @@ -128455,7 +128455,7 @@ let export_to_cmj (meta : Lam_stats.t) effect export_map cmj_case :
(* FIXME: make sure [-o] would not change its case *)
(* FIXME: add test for ns/non-ns *)
Js_cmj_format.mk ~values ~effect
~npm_package_path:(Js_packages_state.get_packages_info ())
~npm_package_path:(Js_current_package_info.get_packages_info ())
~cmj_case

end
Expand Down Expand Up @@ -128729,7 +128729,7 @@ let lambda_as_module (lambda_output : J.deps_program) (output_prefix : string) :
( if !Js_config.bs_suffix then Literals.suffix_bs_js
else Literals.suffix_js )
in
let package_info = Js_packages_state.get_packages_info () in
let package_info = Js_current_package_info.get_packages_info () in
if Js_package_info.is_empty package_info && !Js_config.js_stdout then
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
else
Expand Down
2 changes: 1 addition & 1 deletion lib/4.06.1/unstable/js_compiler.ml.d

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions lib/4.06.1/unstable/js_refmt_compiler.ml
Expand Up @@ -103664,8 +103664,8 @@ let find_package_json_dir cwd =
let package_dir = lazy (find_package_json_dir (Lazy.force cwd))

end
module Js_packages_state : sig
#1 "js_packages_state.mli"
module Js_current_package_info : sig
#1 "js_current_package_info.mli"
(* Copyright (C) 2017 Authors of BuckleScript
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -103699,7 +103699,7 @@ val get_packages_info : unit -> Js_package_info.t
val append_location_descriptor_of_string : string -> unit

end = struct
#1 "js_packages_state.ml"
#1 "js_current_package_info.ml"
(* Copyright (C) 2017 Authors of BuckleScript
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -109528,7 +109528,7 @@ let get_runtime_module_path (dep_module_id : Lam_module_ident.t)
let string_of_module_id (dep_module_id : Lam_module_ident.t)
~(output_dir : string) (module_system : Js_package_info.module_system) :
string =
let current_package_info = Js_packages_state.get_packages_info () in
let current_package_info = Js_current_package_info.get_packages_info () in
fix_path_for_windows
( match dep_module_id.kind with
| External name -> name (* the literal string for external package *)
Expand Down Expand Up @@ -128455,7 +128455,7 @@ let export_to_cmj (meta : Lam_stats.t) effect export_map cmj_case :
(* FIXME: make sure [-o] would not change its case *)
(* FIXME: add test for ns/non-ns *)
Js_cmj_format.mk ~values ~effect
~npm_package_path:(Js_packages_state.get_packages_info ())
~npm_package_path:(Js_current_package_info.get_packages_info ())
~cmj_case

end
Expand Down Expand Up @@ -128729,7 +128729,7 @@ let lambda_as_module (lambda_output : J.deps_program) (output_prefix : string) :
( if !Js_config.bs_suffix then Literals.suffix_bs_js
else Literals.suffix_js )
in
let package_info = Js_packages_state.get_packages_info () in
let package_info = Js_current_package_info.get_packages_info () in
if Js_package_info.is_empty package_info && !Js_config.js_stdout then
Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout
else
Expand Down

0 comments on commit 0a33ff1

Please sign in to comment.