kylefang/esbuild
1
0
Fork 0
mirror of https://github.com/zhigang1992/esbuild.git synced 2026-04-30 10:22:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

move import equals parsing to method

Browse Source
This commit is contained in:
Evan Wallace
2020-11-09 21:01:19 -08:00
parent 8d3195e8a2
commit 70678b9aba
2 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
internal/js_parser/js_parser.go
View File

@@ -5231,36 +5231,7 @@ func (p *parser) parseStmt(opts parseStmtOpts) js_ast.Stmt {
// Parse TypeScript import assignment statements
if p.lexer.Token == js_lexer.TEquals || opts.isExport || opts.isNamespaceScope {
p.lexer.Expect(js_lexer.TEquals)
value := p.parseExpr(js_ast.LComma)
p.lexer.ExpectOrInsertSemicolon()
ref := p.declareSymbol(js_ast.SymbolOther, stmt.DefaultName.Loc, defaultName)
decls := []js_ast.Decl{{
Binding: js_ast.Binding{Loc: stmt.DefaultName.Loc, Data: &js_ast.BIdentifier{Ref: ref}},
Value: &value,
}}
if opts.isExport {
p.recordExport(stmt.DefaultName.Loc, defaultName, ref)
}
// The kind of statement depends on the expression
if _, ok := value.Data.(*js_ast.ECall); ok {
// "import ns = require('x')"
return js_ast.Stmt{Loc: loc, Data: &js_ast.SLocal{
Kind: js_ast.LocalConst,
Decls: decls,
IsExport: opts.isExport,
WasTSImportEqualsInNamespace: opts.isNamespaceScope,
}}
} else {
// "import Foo = Bar"
return js_ast.Stmt{Loc: loc, Data: &js_ast.SLocal{
Kind: js_ast.LocalVar,
Decls: decls,
IsExport: opts.isExport,
WasTSImportEqualsInNamespace: opts.isNamespaceScope,
}}
}
return p.parseTypeScriptImportEqualsStmt(loc, opts, stmt.DefaultName.Loc, defaultName)
}
}

34
internal/js_parser/ts_parser.go
View File

@@ -825,6 +825,40 @@ func (p *parser) parseTypeScriptEnumStmt(loc logger.Loc, opts parseStmtOpts) js_
}}
}
// This assumes the caller has already parsed the "import" token
func (p *parser) parseTypeScriptImportEqualsStmt(loc logger.Loc, opts parseStmtOpts, defaultNameLoc logger.Loc, defaultName string) js_ast.Stmt {
p.lexer.Expect(js_lexer.TEquals)
value := p.parseExpr(js_ast.LComma)
p.lexer.ExpectOrInsertSemicolon()
ref := p.declareSymbol(js_ast.SymbolOther, defaultNameLoc, defaultName)
decls := []js_ast.Decl{{
Binding: js_ast.Binding{Loc: defaultNameLoc, Data: &js_ast.BIdentifier{Ref: ref}},
Value: &value,
}}
if opts.isExport {
p.recordExport(defaultNameLoc, defaultName, ref)
}
// The kind of statement depends on the expression
if _, ok := value.Data.(*js_ast.ECall); ok {
// "import ns = require('x')"
return js_ast.Stmt{Loc: loc, Data: &js_ast.SLocal{
Kind: js_ast.LocalConst,
Decls: decls,
IsExport: opts.isExport,
WasTSImportEqualsInNamespace: opts.isNamespaceScope,
}}
} else {
// "import Foo = Bar"
return js_ast.Stmt{Loc: loc, Data: &js_ast.SLocal{
Kind: js_ast.LocalVar,
Decls: decls,
IsExport: opts.isExport,
WasTSImportEqualsInNamespace: opts.isNamespaceScope,
}}
}
}
func (p *parser) parseTypeScriptNamespaceStmt(loc logger.Loc, opts parseStmtOpts) js_ast.Stmt {
// "namespace Foo {}"
nameLoc := p.lexer.Loc()