loader, docs, test: named exports from commonjs modules

doc/api/esm.md

@@ -83,8 +83,9 @@ All CommonJS, JSON, and C++ modules can be used with `import`.
 Modules loaded this way will only be loaded once, even if their query
 or fragment string differs between `import` statements.
 
-When loaded via `import` these modules will provide a single `default` export
-representing the value of `module.exports` at the time they finished evaluating.
+When loaded via `import` these modules will provide a `default` export
+representing the value of `module.exports` at the time they finished evaluating,
+and named exports for each key of `module.exports`.
 
 ```js
 import fs from 'fs';
@@ -97,6 +98,11 @@ fs.readFile('./foo.txt', (err, body) => {
 });
 ```
 
+```js
+import { readFileSync } from 'fs';
+console.log(readFileSync('./foo.txt').toString());
+```
+
 ## Loader hooks
 
 <!-- type=misc -->

lib/internal/loader/ModuleRequest.js

@@ -36,31 +36,38 @@ loaders.set('esm', async (url) => {
 
 // Strategy for loading a node-style CommonJS module
 loaders.set('cjs', async (url) => {
-  return createDynamicModule(['default'], url, (reflect) => {
-    debug(`Loading CJSModule ${url}`);
-    const CJSModule = require('module');
-    const pathname = internalURLModule.getPathFromURL(new URL(url));
-    CJSModule._load(pathname);
+  debug(`Loading CJSModule ${url}`);
+  const CJSModule = require('module');
+  const pathname = internalURLModule.getPathFromURL(new URL(url));
+  const exports = CJSModule._load(pathname);
+  const keys = Object.keys(exports);
+  return createDynamicModule(['default', ...keys], url, (reflect) => {
+    reflect.exports.default.set(exports);
+    for (const key of keys) reflect.exports[key].set(exports[key]);
   });
 });
 
 // Strategy for loading a node builtin CommonJS module that isn't
 // through normal resolution
 loaders.set('builtin', async (url) => {
-  return createDynamicModule(['default'], url, (reflect) => {
-    debug(`Loading BuiltinModule ${url}`);
-    const exports = NativeModule.require(url.substr(5));
+  debug(`Loading BuiltinModule ${url}`);
+  const exports = NativeModule.require(url.substr(5));
+  const keys = Object.keys(exports);
+  return createDynamicModule(['default', ...keys], url, (reflect) => {
     reflect.exports.default.set(exports);
+    for (const key of keys) reflect.exports[key].set(exports[key]);
   });
 });
 
 loaders.set('addon', async (url) => {
-  const ctx = createDynamicModule(['default'], url, (reflect) => {
-    debug(`Loading NativeModule ${url}`);
-    const module = { exports: {} };
-    const pathname = internalURLModule.getPathFromURL(new URL(url));
-    process.dlopen(module, _makeLong(pathname));
+  debug(`Loading NativeModule ${url}`);
+  const module = { exports: {} };
+  const pathname = internalURLModule.getPathFromURL(new URL(url));
+  process.dlopen(module, _makeLong(pathname));
+  const keys = Object.keys(module.exports);
+  const ctx = createDynamicModule(['default', ...keys], url, (reflect) => {
     reflect.exports.default.set(module.exports);
+    for (const key of keys) reflect.exports[key].set(module.exports[key]);
   });
   return ctx;
 });

test/es-module/test-esm-namespace.mjs

@@ -1,7 +1,9 @@
 // Flags: --experimental-modules
 /* eslint-disable required-modules */
 
-import * as fs from 'fs';
 import assert from 'assert';
+import fs, { readFile } from 'fs';
 
-assert.deepStrictEqual(Object.keys(fs), ['default']);
+assert(fs);
+assert(fs.readFile);
+assert(readFile);

test/es-module/test-reserved-keywords.mjs

@@ -0,0 +1,8 @@
+// Flags: --experimental-modules
+/* eslint-disable required-modules */
+
+import assert from 'assert';
+import { delete as d } from
+  '../fixtures/es-module-loaders/reserved-keywords.js';
+
+assert(d);

test/fixtures/es-module-loaders/reserved-keywords.js

@@ -0,0 +1,5 @@
+module.exports = {
+  enum: 'enum',
+  class: 'class',
+  delete: 'delete',
+};