Skip to content
This repository was archived by the owner on Apr 16, 2020. It is now read-only.

Commit 69840ed

Browse files
MylesBorinsMylesBorins
committed
fixup: s/type/entry-type impl
1 parent a444aa0 commit 69840ed

14 files changed

+53
-55
lines changed

‎doc/node.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ Enable FIPS-compliant crypto at startup.
119119
Requires Node.js to be built with
120120
.Sy ./configure --openssl-fips .
121121
.
122+
.It Fl -entry-type Ns = Ns Ar type
123+
Set the top-level module resolution type.
124+
.
122125
.It Fl -experimental-modules
123126
Enable experimental ES module support and caching modules.
124127
.
@@ -280,9 +283,6 @@ Print stack traces for process warnings (including deprecations).
280283
.It Fl -track-heap-objects
281284
Track heap object allocations for heap snapshots.
282285
.
283-
.It Fl -type Ns = Ns Ar type
284-
Set the top-level module resolution type.
285-
.
286286
.It Fl -use-bundled-ca , Fl -use-openssl-ca
287287
Use bundled Mozilla CA store as supplied by current Node.js version or use OpenSSL's default CA store.
288288
The default store is selectable at build-time.

‎lib/internal/errors.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ E('ERR_INVALID_PROTOCOL',
874874
E('ERR_INVALID_REPL_EVAL_CONFIG',
875875
'Cannot specify both "breakEvalOnSigint" and "eval" for REPL', TypeError);
876876
E('ERR_INVALID_REPL_TYPE',
877-
'Cannot specify --type for REPL', TypeError);
877+
'Cannot specify --entry-type for REPL', TypeError);
878878
E('ERR_INVALID_RETURN_PROPERTY', (input, name, prop, value) => {
879879
return `Expected a valid ${input} to be returned for the "${prop}" from the` +
880880
` "${name}" function but got ${value}.`;
@@ -905,9 +905,6 @@ E('ERR_INVALID_SYNC_FORK_INPUT',
905905
TypeError);
906906
E('ERR_INVALID_THIS', 'Value of "this" must be of type %s', TypeError);
907907
E('ERR_INVALID_TUPLE', '%s must be an iterable %s tuple', TypeError);
908-
E('ERR_INVALID_TYPE_FLAG',
909-
'Type flag must be one of "module", "commonjs". Received --type=%s',
910-
TypeError);
911908
E('ERR_INVALID_URI', 'URI malformed', URIError);
912909
E('ERR_INVALID_URL', function(input) {
913910
this.input = input;
@@ -1055,12 +1052,12 @@ E('ERR_TRANSFORM_WITH_LENGTH_0',
10551052
E('ERR_TTY_INIT_FAILED', 'TTY initialization failed', SystemError);
10561053
E('ERR_TYPE_MISMATCH', (filename, ext, typeFlag, conflict) => {
10571054
const typeString =
1058-
typeFlag === 'module' ? '--type=module' : '--type=commonjs';
1059-
// --type mismatches file extension
1055+
typeFlag === 'module' ? '--entry-type=module' : '--entry-type=commonjs';
1056+
// --entry-type mismatches file extension
10601057
if (conflict === 'extension')
10611058
return `Extension ${ext} is not supported for ` +
10621059
`${typeString} loading ${filename}`;
1063-
// --type mismatches package.json "type"
1060+
// --entry-type mismatches package.json "type"
10641061
else if (conflict === 'scope')
10651062
return `Cannot use ${typeString} because nearest parent package.json ` +
10661063
((typeFlag === 'module') ?

‎lib/internal/main/check_syntax.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ function checkSyntax(source, filename) {
5656
// Remove Shebang.
5757
source = stripShebang(source);
5858

59-
const experimentalModules =
60-
require('internal/options').getOptionValue('--experimental-modules');
59+
const { getOptionValue } = require('internal/options');
60+
const experimentalModules = getOptionValue('--experimental-modules');
6161
if (experimentalModules) {
6262
let isModule = false;
6363
if (filename === '[stdin]' || filename === '[eval]') {
64-
isModule = require('internal/process/esm_loader').typeFlag === 'module';
64+
isModule = getOptionValue('--entry-type') === 'module';
6565
} else {
6666
const resolve = require('internal/modules/esm/default_resolve');
6767
const { format } = resolve(pathToFileURL(filename).toString());

‎lib/internal/main/eval_stdin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ markBootstrapComplete();
1717

1818
readStdin((code) => {
1919
process._eval = code;
20-
if (require('internal/process/esm_loader').typeFlag === 'module')
20+
if (require('internal/options').getOptionValue('--entry-type') === 'module')
2121
evalModule(process._eval);
2222
else
2323
evalScript('[stdin]', process._eval, process._breakFirstLine);

‎lib/internal/main/eval_string.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ const {
99
const { evalModule, evalScript } = require('internal/process/execution');
1010
const { addBuiltinLibsToObject } = require('internal/modules/cjs/helpers');
1111

12-
const source = require('internal/options').getOptionValue('--eval');
12+
const { getOptionValue } = require('internal/options');
13+
const source = getOptionValue('--eval');
1314
prepareMainThreadExecution();
1415
addBuiltinLibsToObject(global);
1516
markBootstrapComplete();
16-
if (require('internal/process/esm_loader').typeFlag === 'module')
17+
if (getOptionValue('--entry-type') === 'module')
1718
evalModule(source);
1819
else
1920
evalScript('[eval]', source, process._breakFirstLine);

‎lib/internal/main/repl.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ const { ERR_INVALID_REPL_TYPE } = require('internal/errors').codes;
1515

1616
prepareMainThreadExecution();
1717

18-
// --type flag not supported in REPL
19-
if (require('internal/process/esm_loader').typeFlag) {
20-
throw ERR_INVALID_REPL_TYPE();
18+
// --entry-type flag not supported in REPL
19+
if (require('internal/options').getOptionValue('--entry-type')) {
20+
throw new ERR_INVALID_REPL_TYPE();
2121
}
2222

2323
const cliRepl = require('internal/repl');

‎lib/internal/modules/esm/default_resolve.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ const { getOptionValue } = require('internal/options');
99
const preserveSymlinks = getOptionValue('--preserve-symlinks');
1010
const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
1111
const experimentalJsonModules = getOptionValue('--experimental-json-modules');
12+
const typeFlag = getOptionValue('--entry-type');
1213

1314
const { resolve: moduleWrapResolve,
1415
getPackageType } = internalBinding('module_wrap');
1516
const { pathToFileURL, fileURLToPath } = require('internal/url');
16-
const asyncESM = require('internal/process/esm_loader');
1717
const { ERR_TYPE_MISMATCH,
1818
ERR_UNKNOWN_FILE_EXTENSION } = require('internal/errors').codes;
1919

@@ -80,26 +80,26 @@ function resolve(specifier, parentURL) {
8080
type !== TYPE_MODULE ? legacyExtensionFormatMap : extensionFormatMap;
8181
let format = extMap[ext];
8282

83-
if (isMain && asyncESM.typeFlag) {
84-
// Conflict between explicit extension (.mjs, .cjs) and --type
85-
if (ext === '.cjs' && asyncESM.typeFlag === 'module' ||
86-
ext === '.mjs' && asyncESM.typeFlag === 'commonjs') {
83+
if (isMain && typeFlag) {
84+
// Conflict between explicit extension (.mjs, .cjs) and --entry-type
85+
if (ext === '.cjs' && typeFlag === 'module' ||
86+
ext === '.mjs' && typeFlag === 'commonjs') {
8787
throw new ERR_TYPE_MISMATCH(
88-
fileURLToPath(url), ext, asyncESM.typeFlag, 'extension');
88+
fileURLToPath(url), ext, typeFlag, 'extension');
8989
}
9090

91-
// Conflict between package scope type and --type
91+
// Conflict between package scope type and --entry-type
9292
if (ext === '.js') {
93-
if (type === TYPE_MODULE && asyncESM.typeFlag === 'commonjs' ||
94-
type === TYPE_COMMONJS && asyncESM.typeFlag === 'module') {
93+
if (type === TYPE_MODULE && typeFlag === 'commonjs' ||
94+
type === TYPE_COMMONJS && typeFlag === 'module') {
9595
throw new ERR_TYPE_MISMATCH(
96-
fileURLToPath(url), ext, asyncESM.typeFlag, 'scope');
96+
fileURLToPath(url), ext, typeFlag, 'scope');
9797
}
9898
}
9999
}
100100
if (!format) {
101-
if (isMain && asyncESM.typeFlag)
102-
format = asyncESM.typeFlag;
101+
if (isMain && typeFlag)
102+
format = typeFlag;
103103
else if (isMain)
104104
format = type === TYPE_MODULE ? 'module' : 'commonjs';
105105
else

‎lib/internal/process/esm_loader.js

-6
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@ const {
44
callbackMap,
55
} = internalBinding('module_wrap');
66
const {
7-
ERR_INVALID_TYPE_FLAG,
87
ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING,
98
} = require('internal/errors').codes;
109

11-
const type = require('internal/options').getOptionValue('--type');
12-
if (type && type !== 'commonjs' && type !== 'module')
13-
throw new ERR_INVALID_TYPE_FLAG(type);
14-
exports.typeFlag = type;
15-
1610
const { Loader } = require('internal/modules/esm/loader');
1711
const { pathToFileURL } = require('internal/url');
1812
const {

‎src/node_options.cc

+10-4
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,14 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
107107
errors->push_back("--loader requires --experimental-modules be enabled");
108108
}
109109

110-
if (!module_type.empty() && !experimental_modules) {
111-
errors->push_back("--type requires --experimental-modules be enabled");
110+
if (!module_type.empty()) {
111+
if (!experimental_modules) {
112+
errors->push_back("--entry-type requires "
113+
"--experimental-modules to be enabled");
114+
}
115+
if (module_type != "commonjs" && module_type != "module") {
116+
errors->push_back("--entry-type must \"module\" or \"commonjs\"");
117+
}
112118
}
113119

114120
if (experimental_json_modules && !experimental_modules) {
@@ -332,8 +338,8 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
332338
"show stack traces on process warnings",
333339
&EnvironmentOptions::trace_warnings,
334340
kAllowedInEnvironment);
335-
AddOption("--type",
336-
"top-level module type name",
341+
AddOption("--entry-type",
342+
"set module type name of the entry point",
337343
&EnvironmentOptions::module_type,
338344
kAllowedInEnvironment);
339345

‎test/es-module/test-esm-no-extension.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const entry = fixtures.path('/es-modules/noext-esm');
1212

1313
const child = spawn(process.execPath, [
1414
'--experimental-modules',
15-
'--type=module',
15+
'--entry-type=module',
1616
entry
1717
]);
1818

‎test/es-module/test-esm-type-flag-errors.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ expect('', packageTypeModuleMain, 'package-type-module');
1919
expect('', packageTypeCommonJsMain, 'package-type-commonjs');
2020
expect('', packageWithoutTypeMain, 'package-without-type');
2121

22-
// Check that running with --type and no package.json "type" works
23-
expect('--type=commonjs', packageWithoutTypeMain, 'package-without-type');
24-
expect('--type=module', packageWithoutTypeMain, 'package-without-type');
22+
// Check that running with --entry-type and no package.json "type" works
23+
expect('--entry-type=commonjs', packageWithoutTypeMain, 'package-without-type');
24+
expect('--entry-type=module', packageWithoutTypeMain, 'package-without-type');
2525

26-
// Check that running with conflicting --type flags throws errors
27-
expect('--type=commonjs', mjsFile, 'ERR_TYPE_MISMATCH', true);
28-
expect('--type=module', cjsFile, 'ERR_TYPE_MISMATCH', true);
29-
expect('--type=commonjs', packageTypeModuleMain,
26+
// Check that running with conflicting --entry-type flags throws errors
27+
expect('--entry-type=commonjs', mjsFile, 'ERR_TYPE_MISMATCH', true);
28+
expect('--entry-type=module', cjsFile, 'ERR_TYPE_MISMATCH', true);
29+
expect('--entry-type=commonjs', packageTypeModuleMain,
3030
'ERR_TYPE_MISMATCH', true);
31-
expect('--type=module', packageTypeCommonJsMain,
31+
expect('--entry-type=module', packageTypeCommonJsMain,
3232
'ERR_TYPE_MISMATCH', true);
3333

3434
function expect(opt = '', inputFile, want, wantsError = false) {

‎test/es-module/test-esm-type-flag.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-modules --type=module
1+
// Flags: --experimental-modules --entry-type=module
22
/* eslint-disable node-core/required-modules */
33
import cjs from '../fixtures/baz.js';
44
import '../common/index.mjs';

‎test/parallel/test-cli-syntax-piped-bad.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ syntaxArgs.forEach(function(arg) {
3434
assert.strictEqual(c.status, 1);
3535
});
3636

37-
// Check --type=module
37+
// Check --entry-type=module
3838
syntaxArgs.forEach(function(arg) {
3939
const stdin = 'export var p = 5; var foo bar;';
4040
const c = spawnSync(
4141
node,
42-
['--experimental-modules', '--type=module', '--no-warnings', arg],
42+
['--experimental-modules', '--entry-type=module', '--no-warnings', arg],
4343
{ encoding: 'utf8', input: stdin }
4444
);
4545

‎test/parallel/test-cli-syntax-piped-good.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ syntaxArgs.forEach(function(arg) {
2525
assert.strictEqual(c.status, 0);
2626
});
2727

28-
// Check --type=module
28+
// Check --entry-type=module
2929
syntaxArgs.forEach(function(arg) {
3030
const stdin = 'export var p = 5; throw new Error("should not get run");';
3131
const c = spawnSync(
3232
node,
33-
['--experimental-modules', '--no-warnings', '--type=module', arg],
33+
['--experimental-modules', '--no-warnings', '--entry-type=module', arg],
3434
{ encoding: 'utf8', input: stdin }
3535
);
3636

0 commit comments

Comments
 (0)