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

remove another case of manual bookkeeping

Browse Source
This commit is contained in:
Evan Wallace
2021-04-11 05:10:39 -07:00
parent a121af227a
commit 0ccf2ee43f
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
internal/bundler/linker.go
View File

@@ -1476,8 +1476,7 @@ func (c *linkerContext) generateCodeForLazyExport(sourceIndex uint32) {
}}, }},
lazy.Value, lazy.Value,
)} )}
part.SymbolUses[repr.AST.ModuleRef] = js_ast.SymbolUse{CountEstimate: 1} c.graph.GenerateSymbolImportAndUse(sourceIndex, 0, repr.AST.ModuleRef, 1, sourceIndex)
repr.AST.UsesModuleRef = true
return return
} }
@@ -1490,12 +1489,9 @@ func (c *linkerContext) generateCodeForLazyExport(sourceIndex uint32) {
partIndex uint32 partIndex uint32
} }
generateExport := func(name string, alias string, value js_ast.Expr, prevExports []prevExport) prevExport { generateExport := func(name string, alias string, value js_ast.Expr) prevExport {
// Generate a new symbol // Generate a new symbol
inner := &c.graph.Symbols.SymbolsForSource[sourceIndex] ref := c.graph.GenerateNewSymbol(sourceIndex, js_ast.SymbolOther, name)
ref := js_ast.Ref{SourceIndex: sourceIndex, InnerIndex: uint32(len(*inner))}
*inner = append(*inner, js_ast.Symbol{Kind: js_ast.SymbolOther, OriginalName: name, Link: js_ast.InvalidRef})
repr.AST.ModuleScope.Generated = append(repr.AST.ModuleScope.Generated, ref)
// Generate an ES6 export // Generate an ES6 export
var stmt js_ast.Stmt var stmt js_ast.Stmt
@@ -1517,24 +1513,16 @@ func (c *linkerContext) generateCodeForLazyExport(sourceIndex uint32) {
// Link the export into the graph for tree shaking // Link the export into the graph for tree shaking
partIndex := c.graph.AddPartToFile(sourceIndex, js_ast.Part{ partIndex := c.graph.AddPartToFile(sourceIndex, js_ast.Part{
Stmts: []js_ast.Stmt{stmt}, Stmts: []js_ast.Stmt{stmt},
SymbolUses: map[js_ast.Ref]js_ast.SymbolUse{repr.AST.ModuleRef: {CountEstimate: 1}},
DeclaredSymbols: []js_ast.DeclaredSymbol{{Ref: ref, IsTopLevel: true}}, DeclaredSymbols: []js_ast.DeclaredSymbol{{Ref: ref, IsTopLevel: true}},
CanBeRemovedIfUnused: true, CanBeRemovedIfUnused: true,
}) })
c.graph.GenerateSymbolImportAndUse(sourceIndex, partIndex, repr.AST.ModuleRef, 1, sourceIndex)
repr.Meta.ResolvedExports[alias] = graph.ExportData{Ref: ref, SourceIndex: sourceIndex} repr.Meta.ResolvedExports[alias] = graph.ExportData{Ref: ref, SourceIndex: sourceIndex}
part := &repr.AST.Parts[partIndex]
for _, export := range prevExports {
part.SymbolUses[export.ref] = js_ast.SymbolUse{CountEstimate: 1}
part.Dependencies = append(part.Dependencies, js_ast.Dependency{
SourceIndex: sourceIndex,
PartIndex: export.partIndex,
})
}
return prevExport{ref: ref, partIndex: partIndex} return prevExport{ref: ref, partIndex: partIndex}
} }
// Unwrap JSON objects into separate top-level variables // Unwrap JSON objects into separate top-level variables
var prevExports []prevExport var prevExports []js_ast.Ref
jsonValue := lazy.Value jsonValue := lazy.Value
if object, ok := jsonValue.Data.(*js_ast.EObject); ok { if object, ok := jsonValue.Data.(*js_ast.EObject); ok {
clone := *object clone := *object
@@ -1542,16 +1530,21 @@ func (c *linkerContext) generateCodeForLazyExport(sourceIndex uint32) {
for i, property := range clone.Properties { for i, property := range clone.Properties {
if str, ok := property.Key.Data.(*js_ast.EString); ok && (!file.IsEntryPoint() || js_lexer.IsIdentifierUTF16(str.Value)) { if str, ok := property.Key.Data.(*js_ast.EString); ok && (!file.IsEntryPoint() || js_lexer.IsIdentifierUTF16(str.Value)) {
name := js_lexer.UTF16ToString(str.Value) name := js_lexer.UTF16ToString(str.Value)
export := generateExport(name, name, *property.Value, nil) exportRef := generateExport(name, name, *property.Value).ref
prevExports = append(prevExports, export) prevExports = append(prevExports, exportRef)
clone.Properties[i].Value = &js_ast.Expr{Loc: property.Key.Loc, Data: &js_ast.EIdentifier{Ref: export.ref}} clone.Properties[i].Value = &js_ast.Expr{Loc: property.Key.Loc, Data: &js_ast.EIdentifier{Ref: exportRef}}
} }
} }
jsonValue.Data = &clone jsonValue.Data = &clone
} }
// Generate the default export // Generate the default export
generateExport(file.InputFile.Source.IdentifierName+"_default", "default", jsonValue, prevExports) finalExportPartIndex := generateExport(file.InputFile.Source.IdentifierName+"_default", "default", jsonValue).partIndex
// The default export depends on all of the previous exports
for _, exportRef := range prevExports {
c.graph.GenerateSymbolImportAndUse(sourceIndex, finalExportPartIndex, exportRef, 1, sourceIndex)
}
} }
func (c *linkerContext) createExportsForFile(sourceIndex uint32) { func (c *linkerContext) createExportsForFile(sourceIndex uint32) {