cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: set parserOpts.sourceFilename from root sourceFileName (#13532)

Browse Source 
* Partial #13518

* Update tests
This commit is contained in:
Federico Ciardi 2021-08-19 21:54:53 +02:00 committed by GitHub
parent 614b486780
commit 51a0caa8a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 640 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-core/src/transformation/normalize-opts.ts
View File

@ -30,7 +30,7 @@ export default function normalizeOptions(config: ResolvedConfig): {} {
sourceType: sourceType:
path.extname(filenameRelative) === ".mjs" ? "module" : sourceType, path.extname(filenameRelative) === ".mjs" ? "module" : sourceType,
sourceFileName: filename, ...(sourceFileName !== "unknown" && { sourceFilename: sourceFileName }),
plugins: [], plugins: [],
...opts.parserOpts, ...opts.parserOpts,
}, },

0
packages/babel-core/test/fixtures/parse/.babelignore → packages/babel-core/test/fixtures/parse/filename-provided/.babelignore vendored
View File

0
packages/babel-core/test/fixtures/parse/.babelrc → packages/babel-core/test/fixtures/parse/filename-provided/.babelrc vendored
View File

0
packages/babel-core/test/fixtures/parse/input.js → packages/babel-core/test/fixtures/parse/filename-provided/input.js vendored
View File

298
packages/babel-core/test/fixtures/parse/filename-provided/output.json vendored Normal file
View File

@ -0,0 +1,298 @@
{
"type": "File",
"start": 0,
"end": 91,
"errors": [],
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 0
}
},
"program": {
"type": "Program",
"start": 0,
"end": 91,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 0
}
},
"interpreter": null,
"sourceType": "module",
"body": [{
"type": "ClassDeclaration",
"start": 0,
"end": 29,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 17
}
},
"decorators": [{
"type": "Decorator",
"start": 0,
"end": 11,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"expression": {
"type": "Identifier",
"start": 1,
"end": 11,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 1
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "annotation"
},
"name": "annotation"
}
}],
"id": {
"type": "Identifier",
"start": 18,
"end": 25,
"loc": {
"filename": "input.js",
"start": {
"line": 2,
"column": 6
},
"end": {
"line": 2,
"column": 13
},
"identifierName": "MyClass"
},
"name": "MyClass"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start": 26,
"end": 29,
"loc": {
"filename": "input.js",
"start": {
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 17
}
},
"body": []
}
},
{
"type": "FunctionDeclaration",
"start": 31,
"end": 90,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 0
},
"end": {
"line": 6,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 40,
"end": 50,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 9
},
"end": {
"line": 4,
"column": 19
},
"identifierName": "annotation"
},
"name": "annotation"
},
"generator": false,
"async": false,
"params": [{
"type": "Identifier",
"start": 51,
"end": 57,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 20
},
"end": {
"line": 4,
"column": 26
},
"identifierName": "target"
},
"name": "target"
}],
"body": {
"type": "BlockStatement",
"start": 59,
"end": 90,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 28
},
"end": {
"line": 6,
"column": 1
}
},
"body": [{
"type": "ExpressionStatement",
"start": 64,
"end": 88,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 27
}
},
"expression": {
"type": "AssignmentExpression",
"start": 64,
"end": 87,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 26
}
},
"operator": "=",
"left": {
"type": "MemberExpression",
"start": 64,
"end": 80,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 19
}
},
"object": {
"type": "Identifier",
"start": 64,
"end": 70,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 9
},
"identifierName": "target"
},
"name": "target"
},
"property": {
"type": "Identifier",
"start": 71,
"end": 80,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 10
},
"end": {
"line": 5,
"column": 19
},
"identifierName": "annotated"
},
"name": "annotated"
},
"computed": false
},
"right": {
"type": "BooleanLiteral",
"start": 83,
"end": 87,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 22
},
"end": {
"line": 5,
"column": 26
}
},
"value": true
}
}
}],
"directives": []
}
}
],
"directives": []
},
"comments": []
}

6
packages/babel-core/test/fixtures/parse/passed-in-configuration/input.js vendored Normal file
View File

@ -0,0 +1,6 @@
@annotation
class MyClass { }
function annotation(target) {
target.annotated = true;
}

0
packages/babel-core/test/fixtures/parse/output.json → packages/babel-core/test/fixtures/parse/passed-in-configuration/output.json vendored
View File

0
packages/babel-core/test/fixtures/parse/sourceFileName-provided/.babelignore vendored Normal file
View File

5
packages/babel-core/test/fixtures/parse/sourceFileName-provided/.babelrc vendored Normal file
View File

@ -0,0 +1,5 @@
{
"parserOpts": {
"plugins": ["decorators-legacy"]
}
}

6
packages/babel-core/test/fixtures/parse/sourceFileName-provided/input.js vendored Normal file
View File

@ -0,0 +1,6 @@
@annotation
class MyClass { }
function annotation(target) {
target.annotated = true;
}

298
packages/babel-core/test/fixtures/parse/sourceFileName-provided/output.json vendored Normal file
View File

@ -0,0 +1,298 @@
{
"type": "File",
"start": 0,
"end": 91,
"errors": [],
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 0
}
},
"program": {
"type": "Program",
"start": 0,
"end": 91,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 0
}
},
"interpreter": null,
"sourceType": "module",
"body": [{
"type": "ClassDeclaration",
"start": 0,
"end": 29,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 17
}
},
"decorators": [{
"type": "Decorator",
"start": 0,
"end": 11,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 11
}
},
"expression": {
"type": "Identifier",
"start": 1,
"end": 11,
"loc": {
"filename": "input.js",
"start": {
"line": 1,
"column": 1
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "annotation"
},
"name": "annotation"
}
}],
"id": {
"type": "Identifier",
"start": 18,
"end": 25,
"loc": {
"filename": "input.js",
"start": {
"line": 2,
"column": 6
},
"end": {
"line": 2,
"column": 13
},
"identifierName": "MyClass"
},
"name": "MyClass"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start": 26,
"end": 29,
"loc": {
"filename": "input.js",
"start": {
"line": 2,
"column": 14
},
"end": {
"line": 2,
"column": 17
}
},
"body": []
}
},
{
"type": "FunctionDeclaration",
"start": 31,
"end": 90,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 0
},
"end": {
"line": 6,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 40,
"end": 50,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 9
},
"end": {
"line": 4,
"column": 19
},
"identifierName": "annotation"
},
"name": "annotation"
},
"generator": false,
"async": false,
"params": [{
"type": "Identifier",
"start": 51,
"end": 57,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 20
},
"end": {
"line": 4,
"column": 26
},
"identifierName": "target"
},
"name": "target"
}],
"body": {
"type": "BlockStatement",
"start": 59,
"end": 90,
"loc": {
"filename": "input.js",
"start": {
"line": 4,
"column": 28
},
"end": {
"line": 6,
"column": 1
}
},
"body": [{
"type": "ExpressionStatement",
"start": 64,
"end": 88,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 27
}
},
"expression": {
"type": "AssignmentExpression",
"start": 64,
"end": 87,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 26
}
},
"operator": "=",
"left": {
"type": "MemberExpression",
"start": 64,
"end": 80,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 19
}
},
"object": {
"type": "Identifier",
"start": 64,
"end": 70,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 9
},
"identifierName": "target"
},
"name": "target"
},
"property": {
"type": "Identifier",
"start": 71,
"end": 80,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 10
},
"end": {
"line": 5,
"column": 19
},
"identifierName": "annotated"
},
"name": "annotated"
},
"computed": false
},
"right": {
"type": "BooleanLiteral",
"start": 83,
"end": 87,
"loc": {
"filename": "input.js",
"start": {
"line": 5,
"column": 22
},
"end": {
"line": 5,
"column": 26
}
},
"value": true
}
}
}],
"directives": []
}
}
],
"directives": []
},
"comments": []
}

31
packages/babel-core/test/parse.js
View File

@ -17,19 +17,40 @@ function fixture(...args) {
describe("parse", function () { describe("parse", function () {
it("should parse using configuration from .babelrc when a filename is provided", function () { it("should parse using configuration from .babelrc when a filename is provided", function () {
const input = fs.readFileSync(fixture("input.js"), "utf8"); const input = fs.readFileSync(
const output = require(fixture("output")); fixture("filename-provided", "input.js"),
"utf8",
);
const output = require(fixture("filename-provided", "output.json"));
const result = parse(input, { const result = parse(input, {
filename: fixture("input.js"), filename: fixture("filename-provided", "input.js"),
cwd: fixture(),
});
expect(JSON.parse(JSON.stringify(result))).toEqual(output);
});
it("should parse using the specified sourceFileName", function () {
const input = fs.readFileSync(
fixture("sourceFileName-provided", "input.js"),
"utf8",
);
const output = require(fixture("sourceFileName-provided", "output.json"));
const result = parse(input, {
filename: fixture("sourceFileName-provided", "input.js"),
sourceFileName: "input.js",
cwd: fixture(), cwd: fixture(),
}); });
expect(JSON.parse(JSON.stringify(result))).toEqual(output); expect(JSON.parse(JSON.stringify(result))).toEqual(output);
}); });
it("should parse using passed in configuration", function () { it("should parse using passed in configuration", function () {
const input = fs.readFileSync(fixture("input.js"), "utf8"); const input = fs.readFileSync(
const output = require(fixture("output.json")); fixture("passed-in-configuration", "input.js"),
"utf8",
);
const output = require(fixture("passed-in-configuration", "output.json"));
const result = parse(input, { const result = parse(input, {
parserOpts: { parserOpts: {