Working on augmentor

Author: grantnelson-wf

build/augmentor.go

@@ -65,6 +65,32 @@ type Augmentor struct {
 	packages map[string]*pkgOverrideInfo
 }
 
+func (aug *Augmentor) Augment(xctx XContext, pkg *PackageData, fileSet *token.FileSet, file *ast.File) error {
+	pkgAug := aug.getPackageOverrides(xctx, pkg, fileSet)
+
+	augmentOriginalImports(pkg.ImportPath, file)
+
+	if len(pkgAug.overrides) > 0 {
+		augmentOriginalFile(file, pkgAug.overrides)
+	}
+
+	if len(pkgAug.overlayFiles) > 0 {
+		// Append the overlay files to the first file of the package.
+		// This is to ensure that the package is augmented with all the
+		// additional methods and information from the natives.
+		err := astutil.ConcatenateFiles(file, pkgAug.overlayFiles...)
+		if err != nil {
+			panic(fmt.Errorf("failed to concatenate overlay files onto %q: %w", fileSet.Position(file.Package).Filename, err))
+		}
+		pkgAug.overlayFiles = nil
+	}
+
+	return nil
+}
+
+// getPackageOverrides looks up an already loaded package override
+// or loads the package's natives, parses the overlay files, and
+// stores the overrides for the package in the augmentor for next time.
 func (aug *Augmentor) getPackageOverrides(xctx XContext, pkg *PackageData, fileSet *token.FileSet) *pkgOverrideInfo {
 	importPath := pkg.ImportPath
 	if pkgAug, ok := aug.packages[importPath]; ok {
@@ -92,29 +118,6 @@ func (aug *Augmentor) getPackageOverrides(xctx XContext, pkg *PackageData, fileS
 	return pkgAug
 }
 
-func (aug *Augmentor) Augment(xctx XContext, pkg *PackageData, fileSet *token.FileSet, file *ast.File) error {
-	pkgAug := aug.getPackageOverrides(xctx, pkg, fileSet)
-
-	augmentOriginalImports(pkg.ImportPath, file)
-
-	if len(pkgAug.overrides) > 0 {
-		augmentOriginalFile(file, pkgAug.overrides)
-	}
-
-	if len(pkgAug.overlayFiles) > 0 {
-		// Append the overlay files to the first file of the package.
-		// This is to ensure that the package is augmented with all the
-		// additional methods and information from the natives.
-		err := astutil.ConcatenateFiles(file, pkgAug.overlayFiles...)
-		if err != nil {
-			panic(fmt.Errorf("failed to concatenate overlay files onto %q: %w", fileSet.Position(file.Package).Filename, err))
-		}
-		pkgAug.overlayFiles = nil
-	}
-
-	return nil
-}
-
 // parseOverlayFiles loads and parses overlay files
 // to augment the original files with.
 func parseOverlayFiles(xctx XContext, pkg *PackageData, fileSet *token.FileSet) ([]JSFile, []*ast.File) {