Skip to content

Fix tests of duplicated packages in Dynamic import #6191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 28 additions & 29 deletions jscomp/build_tests/duplicated_symlinked_packages/input.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
// https://github.com/rescript-lang/rescript-compiler/pull/5703#issuecomment-1518507161
// const fs = require('fs')
// const path = require('path')
// const child_process = require('child_process')
// const rescript_exe = require("../../../scripts/bin_path").rescript_exe
const fs = require('fs')
const path = require('path')
const child_process = require('child_process')
const rescript_exe = require("../../../scripts/bin_path").rescript_exe

// const expectedFilePath = path.join(__dirname, 'out.expected')
const expectedFilePath = path.join(__dirname, 'out.expected')

// const updateTests = process.argv[2] === 'update'
const updateTests = process.argv[2] === 'update'

// function postProcessErrorOutput (output) {
// output = output.trimRight()
// output = output.replace(new RegExp(__dirname, 'gi'), '.')
// return output
// }
// child_process.execSync(`${rescript_exe} clean -with-deps`,{cwd:__dirname})
// child_process.exec(rescript_exe, {cwd: __dirname}, (err, stdout, stderr) => {
// const actualErrorOutput = postProcessErrorOutput(stderr.toString())
// if (updateTests) {
// fs.writeFileSync(expectedFilePath, actualErrorOutput)
// } else {
// const expectedErrorOutput = postProcessErrorOutput(fs.readFileSync(expectedFilePath, {encoding: 'utf-8'}))
// if (expectedErrorOutput !== actualErrorOutput) {
// console.error(`The old and new error output aren't the same`)
// console.error('\n=== Old:')
// console.error(expectedErrorOutput)
// console.error('\n=== New:')
// console.error(actualErrorOutput)
// process.exit(1)
// }
// }
// })
function postProcessErrorOutput (output) {
output = output.trimRight()
output = output.replace(new RegExp(__dirname, 'gi'), '.')
return output
}
child_process.execSync(`${rescript_exe} clean -with-deps`,{cwd:__dirname})
child_process.exec(rescript_exe, {cwd: __dirname}, (err, stdout, stderr) => {
const actualErrorOutput = postProcessErrorOutput(stderr.toString())
if (updateTests) {
fs.writeFileSync(expectedFilePath, actualErrorOutput)
} else {
const expectedErrorOutput = postProcessErrorOutput(fs.readFileSync(expectedFilePath, {encoding: 'utf-8'}))
if (expectedErrorOutput !== actualErrorOutput) {
console.error(`The old and new error output aren't the same`)
console.error('\n=== Old:')
console.error(expectedErrorOutput)
console.error('\n=== New:')
console.error(actualErrorOutput)
process.exit(1)
}
}
})


15 changes: 7 additions & 8 deletions jscomp/build_tests/transitive_pinned_dependency1/input.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// https://github.com/rescript-lang/rescript-compiler/pull/5703#issuecomment-1518507161
// //@ts-check
// var child_process = require("child_process");
// var assert = require("assert");
// var fs = require("fs")
// var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
//@ts-check
var child_process = require("child_process");
var assert = require("assert");
var fs = require("fs")
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;

// console.log(child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" }));
console.log(child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" }));

// assert(fs.existsSync("./node_modules/c/lib/js/tests/test.mjs"), "dev files of module 'c' were not built by 'a' even though 'c' is a transitive pinned dependency of 'a' through 'b'")
assert(fs.existsSync("./node_modules/c/lib/js/tests/test.mjs"), "dev files of module 'c' were not built by 'a' even though 'c' is a transitive pinned dependency of 'a' through 'b'")
15 changes: 7 additions & 8 deletions jscomp/build_tests/transitive_pinned_dependency2/input.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// https://github.com/rescript-lang/rescript-compiler/pull/5703#issuecomment-1518507161
// //@ts-check
// var child_process = require("child_process");
// var assert = require("assert");
// var fs = require("fs")
// var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
//@ts-check
var child_process = require("child_process");
var assert = require("assert");
var fs = require("fs")
var rescript_exe = require("../../../scripts/bin_path").rescript_exe;

// console.log(child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" }));
console.log(child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" }));

// assert(!fs.existsSync("./node_modules/c/lib/js/tests/test.mjs"), "dev files of module 'c' were built by 'a' even though 'c' is not a pinned dependency of 'a'")
assert(!fs.existsSync("./node_modules/c/lib/js/tests/test.mjs"), "dev files of module 'c' were built by 'a' even though 'c' is not a pinned dependency of 'a'")
4 changes: 2 additions & 2 deletions jscomp/core/js_implementation.ml
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ let after_parsing_impl ppf outputprefix (ast : Parsetree.structure) =
let lambda, exports =
Translmod.transl_implementation modulename typedtree_coercion
in
let js_program ~module_system =
let js_program =
print_if_pipe ppf Clflags.dump_rawlambda Printlambda.lambda lambda
|> Lam_compile_main.compile outputprefix module_system exports
|> Lam_compile_main.compile outputprefix NodeJS exports
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Temporarily I removed the argument module_system to do eager evaluation here and pass NodeJS instead, then tests are passed.
This is not the cure for the root cause, Lam_compile.compile needs to know the module_system info.

in
if not !Js_config.cmj_only then
Lam_compile_main.lambda_as_module js_program outputprefix);
Expand Down
6 changes: 3 additions & 3 deletions jscomp/core/lam_compile_main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -288,18 +288,18 @@ js
let (//) = Filename.concat

let lambda_as_module
(lambda_output : module_system: Js_packages_info.module_system -> J.deps_program)
(lambda_output : J.deps_program)
(output_prefix : string)
: unit =
let package_info = Js_packages_state.get_packages_info () in
if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin
Js_dump_program.dump_deps_program ~output_prefix NodeJS (lambda_output ~module_system: NodeJS) stdout
Js_dump_program.dump_deps_program ~output_prefix NodeJS (lambda_output) stdout
end else
Js_packages_info.iter package_info (fun {module_system; path; suffix} ->
let output_chan chan =
Js_dump_program.dump_deps_program ~output_prefix
module_system
(lambda_output ~module_system)
(lambda_output)
chan in
let basename =
Ext_namespace.change_ext_ns_suffix
Expand Down
2 changes: 1 addition & 1 deletion jscomp/core/lam_compile_main.mli
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ val compile : string -> Js_packages_info.module_system -> Ident.t list -> Lambda
{!Env.get_unit_name ()}
*)

val lambda_as_module : (module_system: Js_packages_info.module_system -> J.deps_program) -> string -> unit
val lambda_as_module : J.deps_program -> string -> unit
1 change: 1 addition & 0 deletions jscomp/test/Import.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.