feat: add externalRoot

Author: Lslightly

cmd/codeql_qdriver/main.go

@@ -170,7 +170,7 @@ func queriesExec(cfg *config.Artifact, grp config.QueryGroup, queryRoot string,
 	// Create Query objects for all queries in the group
 	queries := make([]config.Query, len(grp.Queries))
 	for i, qScript := range grp.Queries {
-		queries[i] = config.CreateQuery(qScript, grp.Externals, grp.ExternalFiles, queryRoot)
+		queries[i] = config.CreateQuery(qScript, grp.Externals, grp.ExternalFiles, grp.ResolvedExternalRoot())
 	}
 
 	bar := progressbar.Default(int64(len(dbs)))
@@ -207,13 +207,12 @@ func decodeResults(cfg *config.Artifact, tgtFmt string) {
 	checkDecodeTargetFmt(tgtFmt)
 
 	for grpi, grp := range cfg.QueryGrps {
-		queryRoot := grp.ResolvedQueryRoot()
 		dbs := cfg.ConvStrSliceToDBSlice(grp.QueryDBs)
 		queries := grp.Queries
 
 		bar := progressbar.Default(int64(len(queries) * len(dbs)))
 		for _, qScript := range queries {
-			query := config.CreateQuery(qScript, grp.Externals, grp.ExternalFiles, queryRoot)
+			query := config.CreateQuery(qScript, grp.Externals, grp.ExternalFiles, grp.ResolvedExternalRoot())
 			for _, db := range dbs {
 				bqrsPath := filepath.Join(db.Path(), "results/lslightly/qlstat", query.PathNoExt()+".bqrs")
 				csvPath := filepath.Join(db.Path(), "results/lslightly/qlstat", query.PathNoExt()+"."+tgtFmt)
@@ -245,10 +244,9 @@ func decodeResults(cfg *config.Artifact, tgtFmt string) {
 
 func collectCSVs(cfg *config.Artifact) {
 	for grpi, grp := range cfg.QueryGrps {
-		queryRoot := grp.ResolvedQueryRoot()
 		bar := progressbar.Default(int64(len(grp.Queries)))
 		for _, qScript := range grp.Queries {
-			query := config.CreateQuery(qScript, grp.Externals, grp.ExternalFiles, queryRoot)
+			query := config.CreateQuery(qScript, grp.Externals, grp.ExternalFiles, grp.ResolvedExternalRoot())
 			bar.Describe(fmt.Sprintf("Grp %d: Collecting for "+query.PathNoExt(), grpi))
 			collectCSVsForQuery(cfg, query, grp)
 			bar.Add(1)

config/artifact.go

@@ -37,6 +37,7 @@ type BuildGroup struct {
 
 type QueryGroup struct {
 	QueryRoot     string   `yaml:"queryRoot"`
+	ExternalRoot  string   `yaml:"externalRoot"`
 	QueryDBs      []string `yaml:"queryDBs"`
 	Queries       []string `yaml:"queries"`
 	Externals     []string `yaml:"externals"`
@@ -53,6 +54,16 @@ func (g *QueryGroup) ResolvedQueryRoot() string {
 	return g.QueryRoot
 }
 
+// ResolvedExternalRoot returns the absolute path for external predicate files.
+// "std" or empty → <projectRoot>/qlsrc (same as built-in query root).
+// Other values are returned as-is (absolute path or CWD-relative).
+func (g *QueryGroup) ResolvedExternalRoot() string {
+	if g.ExternalRoot == "" || g.ExternalRoot == "std" {
+		return filepath.Join(utils.ProjectRoot(), "qlsrc")
+	}
+	return g.ExternalRoot
+}
+
 func UnmarshalArtifact(filename string) *Artifact {
 	data, err := os.ReadFile(filename)
 	if err != nil {

config/query.go

@@ -14,15 +14,15 @@ type Query struct {
 	cacheEntriesForFiles []string // cache external entries for externalFiles
 }
 
-func CreateQuery(path string, externals []string, externalFiles []string, queryRoot string) Query {
+func CreateQuery(path string, externals []string, externalFiles []string, externalRoot string) Query {
 	if filepath.Ext(path) != ".ql" {
 		log.Fatalf("Suffix of query source %s is not .ql.", path)
 	}
 	cache := make([]string, 0, len(externalFiles)*5)
 	for _, extfile := range externalFiles {
 		resolvedPath := extfile
 		if !filepath.IsAbs(extfile) {
-			resolvedPath = filepath.Join(queryRoot, extfile)
+			resolvedPath = filepath.Join(externalRoot, extfile)
 		}
 		exts, err := ReadExtsFromFile(resolvedPath)
 		if err != nil {