Skip to content

esm: Implement esm mode flag #18392

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.

Sign up for GitHub

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

Closed
wants to merge 5 commits into from
Closed

esm: Implement esm mode flag #18392

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c53a958
module: esm mode flag
guybedford Feb 4, 2018
89bfdfa
PR feedback
guybedford Feb 18, 2018
19d9295
further PR corrections
guybedford Feb 18, 2018
a92792d
linting fixes
guybedford Mar 9, 2018
9b1de85
fixup rebase
guybedford Aug 28, 2018
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
Prev Previous commit
Next Next commit
further PR corrections
  • Loading branch information
@guybedford
guybedford committed Oct 2, 2018
commit 19d92956ed10b61e48f781aa3456c8e5ff2f00fb
39 changes: 18 additions & 21 deletions src/module_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,9 @@ const PackageConfig& GetPackageConfig(Environment* env,

Local<Value> pkg_mode_v;
PackageMode::Mode pkg_mode = PackageMode::CJS;
if (pkg_json->Get(env->context(), env->mode_string()).ToLocal(&pkg_mode_v)) {
if (pkg_json->Get(env->context(), env->mode_string()).ToLocal(&pkg_mode_v) &&
pkg_mode_v->StrictEquals(env->esm_string())) {
pkg_mode = PackageMode::ESM;
}
if (pkg_json->Get(env->context(), env->mode_string()).ToLocal(&pkg_mode_v) &&
pkg_mode_v->StrictEquals(env->esm_string())) {
pkg_mode = PackageMode::ESM;
}
Copy link
Member

@bnoordhuis bnoordhuis Feb 17, 2018

Choose a reason for hiding this comment

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

Simpler:

if (pkg_json->Get(env->context(), env->mode_string()).ToLocal(&pkg_mode_v)) &&
    pkg_mode_v->StrictEquals(env->esm_string())) {
  pkg_mode = ESM;
}


auto entry = env->package_json_cache.emplace(path,
Expand Down Expand Up @@ -578,11 +576,11 @@ PackageMode::Mode GetPackageMode(Environment* env, const URL& search) {

void SetPackageMode(Environment* env, const URL& search,
PackageMode::Mode pkg_mode) {
std::string pjsonPathStr = URL("package.json", &search).ToFilePath();
const PackageConfig& pkg_json = GetPackageConfig(env, pjsonPathStr);
std::string pjson_path_str = URL("package.json", &search).ToFilePath();
const PackageConfig& pkg_json = GetPackageConfig(env, pjson_path_str);
if (pkg_json.mode != pkg_mode) {
env->package_json_cache.erase(env->package_json_cache.find(pjsonPathStr));
env->package_json_cache.emplace(pjsonPathStr,
env->package_json_cache.erase(env->package_json_cache.find(pjson_path_str));
env->package_json_cache.emplace(pjson_path_str,
PackageConfig { pkg_json.exists, pkg_json.is_valid,
pkg_json.has_main, pkg_json.main, pkg_mode });
}
Expand All @@ -596,8 +594,8 @@ enum ResolveExtensionsOptions {
template <ResolveExtensionsOptions options>
Maybe<URL> ResolveExtensions(const URL& search) {
if (options == TRY_EXACT_NAME) {
std::string filePath = search.ToFilePath();
Maybe<uv_file> check = CheckFile(filePath);
std::string file_path = search.ToFilePath();
Maybe<uv_file> check = CheckFile(file_path);
if (!check.IsNothing()) {
return Just(search);
}
Expand Down Expand Up @@ -737,21 +735,20 @@ void ModuleWrap::Resolve(const FunctionCallbackInfo<Value>& args) {
return node::THROW_ERR_MISSING_MODULE(env, msg.c_str());
}

bool esmPackage = false;
bool esm_package = false;
bool set_package_esm_mode = args[2]->IsTrue();
if (set_package_esm_mode) {
esmPackage = true;
esm_package = true;
SetPackageMode(env, result.FromJust(), PackageMode::ESM);
} else {
std::string filePath = result.FromJust().ToFilePath();
// Check the package esm mode for ambiguous extensions.
if (filePath.length() < 5 ||
(filePath.substr(filePath.length() - 4, 4) != ".mjs" &&
(filePath.length() < 6 ||
(filePath.substr(filePath.length() - 5, 5) != ".json" &&
filePath.substr(filePath.length() - 5, 5) != ".node")))) {
std::string file_path = result.FromJust().ToFilePath();
std::string ext;
const size_t pos = file_path.rfind('.');
if (pos != 0 && pos != std::string::npos) ext = file_path.substr(pos);
if (ext != ".mjs" && ext != ".json" && ext != ".node") {
if (GetPackageMode(env, result.FromJust()) == PackageMode::ESM) {
esmPackage = true;
esm_package = true;
}
}
}
Expand All @@ -761,7 +758,7 @@ void ModuleWrap::Resolve(const FunctionCallbackInfo<Value>& args) {
resolved->DefineOwnProperty(
env->context(),
env->esm_string(),
v8::Boolean::New(env->isolate(), esmPackage),
v8::Boolean::New(env->isolate(), esm_package),
v8::ReadOnly).FromJust();

resolved->DefineOwnProperty(
Expand Down