Skip to content
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

remove file type inference in favour of ‘coffee’ flag #152

Merged
merged 1 commit into from
Jan 17, 2022
Merged

remove file type inference in favour of ‘coffee’ flag #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 2 additions & 9 deletions lib/doctest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/// .....................x.......xx.x.................................

import fs from 'fs';
import {extname, resolve} from 'path';
import {resolve} from 'path';

import * as acorn from 'acorn';
import CoffeeScript from 'coffeescript';
Expand Down Expand Up @@ -531,13 +531,7 @@ export default options => async path => {
if (!([undefined, 'amd', 'commonjs', 'esm'].includes (options.module))) {
throw new Error (`Invalid module ${show (options.module)}`);
}
if (!([undefined, 'coffee', 'js'].includes (options.type))) {
throw new Error (`Invalid type ${show (options.type)}`);
}
if (options.module === 'esm') {
if (options.type != null) {
throw new Error ('Cannot use file type when module is "esm"');
}
return test (options)
(path)
(compose (compose (wrapModule))
Expand All @@ -546,8 +540,7 @@ export default options => async path => {
} else {
return test (options)
(path)
((options.type === 'coffee' ||
options.type == null && extname (path) === '.coffee') ?
(options.coffee ?
rewriteCoffee :
compose (compose (toModule (options.module)))
(rewriteJs ('script')))
Expand Down
4 changes: 2 additions & 2 deletions lib/program.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ program
.usage ('[options] path/to/js/or/coffee/module')
.option ('-m, --module <type>',
'specify module system ("amd", "commonjs", or "esm")')
.option (' --coffee',
'parse CoffeeScript files')
.option (' --nodejs <options>',
'pass options directly to the "node" binary')
.option (' --prefix <prefix>',
Expand All @@ -22,8 +24,6 @@ program
'output the rewritten source without running tests')
.option ('-s, --silent',
'suppress output')
.option ('-t, --type <type>',
'specify file type for non-esm module systems ("coffee" or "js")')
.parse (process.argv);

export default program;
61 changes: 7 additions & 54 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ const testCommand = (command, expected) => {
};

testModule (resultsShared, 'test/shared/index.js', {silent: true});
testModule (resultsShared, 'test/shared/index.coffee', {silent: true});
testModule (resultsShared, 'test/shared/index.coffee', {silent: true, coffee: true});
testModule (resultsLineEndings, 'test/line-endings/CR.js', {silent: true});
testModule (resultsLineEndings, 'test/line-endings/CR.coffee', {silent: true});
testModule (resultsLineEndings, 'test/line-endings/CR.coffee', {silent: true, coffee: true});
testModule (resultsLineEndings, 'test/line-endings/CR+LF.js', {silent: true});
testModule (resultsLineEndings, 'test/line-endings/CR+LF.coffee', {silent: true});
testModule (resultsLineEndings, 'test/line-endings/CR+LF.coffee', {silent: true, coffee: true});
testModule (resultsLineEndings, 'test/line-endings/LF.js', {silent: true});
testModule (resultsLineEndings, 'test/line-endings/LF.coffee', {silent: true});
testModule (resultsLineEndings, 'test/line-endings/LF.coffee', {silent: true, coffee: true});
testModule (resultsExceptions, 'test/exceptions/index.js', {silent: true});
testModule (resultsStatements, 'test/statements/index.js', {silent: true});
testModule (resultsFantasyLand, 'test/fantasy-land/index.js', {silent: true});
testModule (resultsTranscribe, 'test/transcribe/index.js', {prefix: '.', openingDelimiter: '```javascript', closingDelimiter: '```', silent: true});
testModule (resultsTranscribe, 'test/transcribe/index.coffee', {prefix: '.', openingDelimiter: '```coffee', closingDelimiter: '```', silent: true});
testModule (resultsTranscribe, 'test/transcribe/index.coffee', {prefix: '.', openingDelimiter: '```coffee', closingDelimiter: '```', silent: true, coffee: true});
testModule (resultsAmd, 'test/amd/index.js', {module: 'amd', silent: true});
testModule (resultsCommonJsRequire, 'test/commonjs/require/index.js', {module: 'commonjs', silent: true});
testModule (resultsCommonJsExports, 'test/commonjs/exports/index.js', {module: 'commonjs', silent: true});
Expand All @@ -86,7 +86,7 @@ testModule (resultsCommonJsStrict, 'test/commonjs/strict/index.js', {module: 'co
testModule (resultsCommonJsDirname, 'test/commonjs/__dirname/index.js', {module: 'commonjs', silent: true});
testModule (resultsCommonJsFilename, 'test/commonjs/__filename/index.js', {module: 'commonjs', silent: true});
testModule (resultsCommonJsDoctestRequire, 'test/commonjs/__doctest.require/index.js', {module: 'commonjs', silent: true});
testModule (resultsBin, 'test/bin/executable', {type: 'js', silent: true});
testModule (resultsBin, 'test/bin/executable', {silent: true});
testModule (resultsEs2015, 'test/es2015/index.js', {silent: true});
testModule (resultsEs2018, 'test/es2018/index.js', {silent: true});
if (Number ((process.versions.node.split ('.'))[0]) >= 14) {
Expand All @@ -106,20 +106,6 @@ testCommand ('bin/doctest --xxx', {
`,
});

testCommand ('bin/doctest file.js --type', {
status: 1,
stdout: '',
stderr: `error: option \`-t, --type <type>' argument missing
`,
});

testCommand ('bin/doctest file.js --type xxx', {
status: 1,
stdout: '',
stderr: `Error: Invalid type "xxx"
`,
});

testCommand ('bin/doctest test/shared/index.js', {
status: 1,
stdout: `running doctests in test/shared/index.js...
Expand All @@ -132,7 +118,7 @@ FAIL: expected "on automatic semicolon insertion" on line 155 (got "the rewriter
stderr: '',
});

testCommand ('bin/doctest test/shared/index.coffee', {
testCommand ('bin/doctest --coffee test/shared/index.coffee', {
status: 1,
stdout: `running doctests in test/shared/index.coffee...
......x.x...........x........x
Expand All @@ -144,24 +130,6 @@ FAIL: expected "on automatic semicolon insertion" on line 155 (got "the rewriter
stderr: '',
});

testCommand ('bin/doctest test/shared/index.js test/shared/index.coffee', {
status: 1,
stdout: `running doctests in test/shared/index.js...
......x.x...........x........x
FAIL: expected 5 on line 31 (got 4)
FAIL: expected ! TypeError on line 38 (got 0)
FAIL: expected 9.5 on line 97 (got 5)
FAIL: expected "on automatic semicolon insertion" on line 155 (got "the rewriter should not rely")
running doctests in test/shared/index.coffee...
......x.x...........x........x
FAIL: expected 5 on line 31 (got 4)
FAIL: expected ! TypeError on line 38 (got 0)
FAIL: expected 9.5 on line 97 (got 5)
FAIL: expected "on automatic semicolon insertion" on line 155 (got "the rewriter should not rely")
`,
stderr: '',
});

testCommand ('bin/doctest --silent test/shared/index.js', {
status: 1,
stdout: '',
Expand All @@ -176,28 +144,13 @@ testCommand ('bin/doctest test/bin/executable', {
stderr: '',
});

testCommand ('bin/doctest --type js test/bin/executable', {
status: 0,
stdout: `running doctests in test/bin/executable...
.
`,
stderr: '',
});

testCommand ('bin/doctest --module xxx file.js', {
status: 1,
stdout: '',
stderr: `Error: Invalid module "xxx"
`,
});

testCommand ('bin/doctest --module esm --type js file.js', {
status: 1,
stdout: '',
stderr: `Error: Cannot use file type when module is "esm"
`,
});

testCommand ('bin/doctest --module esm lib/doctest.js', {
status: 0,
stdout: `running doctests in lib/doctest.js...
Expand Down