Merge pull request #183 from thedadams/load-builtins

thedadams · web-flow · commit eb5e26469173 · 2024-03-25T14:50:49.000-04:00
fix: detect built-in tools when loading from assemble output
diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go
@@ -87,7 +87,12 @@ func loadProgram(data []byte, into *types.Program, targetToolName string) (types
 		return types.Tool{}, err
 	}
 
+	into.ToolSet = make(map[string]types.Tool, len(ext.ToolSet))
 	for k, v := range ext.ToolSet {
+		if builtinTool, ok := builtin.Builtin(k); ok {
+			v = builtinTool
+		}
+
 		for tk, tv := range v.ToolMapping {
 			v.ToolMapping[tk] = tv + id
 		}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,12 @@ func loadProgram(data []byte, into *types.Program, targetToolName string) (types`
`87`	`87`	`return types.Tool{}, err`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ into.ToolSet = make(map[string]types.Tool, len(ext.ToolSet))`
`90`	`91`	`for k, v := range ext.ToolSet {`
	`92`	`+ if builtinTool, ok := builtin.Builtin(k); ok {`
	`93`	`+ v = builtinTool`
	`94`	`+ }`
	`95`	`+`
`91`	`96`	`for tk, tv := range v.ToolMapping {`
`92`	`97`	`v.ToolMapping[tk] = tv + id`
`93`	`98`	`}`