fix: add default excluded paths for problematic dirs

Author: jahvon

desktop/src-tauri/src/types/generated/workspace.rs

@@ -76,15 +76,15 @@ impl ::std::convert::From<::std::vec::Vec<::std::string::String>> for CommonTags
 #[doc = "  \"type\": \"object\","]
 #[doc = "  \"properties\": {"]
 #[doc = "    \"excluded\": {"]
-#[doc = "      \"description\": \"A list of directories to exclude from the executable search.\","]
+#[doc = "      \"description\": \"A list of directories or file patterns to exclude from the executable search.\\nSupports directory paths (e.g., \\\"node_modules/\\\", \\\"vendor/\\\") and glob patterns for filenames (e.g., \\\"*.js.flow\\\", \\\"*temp*\\\").\\nCommon exclusions like node_modules/, vendor/, third_party/, external/, and *.js.flow are excluded by default.\\n\","]
 #[doc = "      \"default\": [],"]
 #[doc = "      \"type\": \"array\","]
 #[doc = "      \"items\": {"]
 #[doc = "        \"type\": \"string\""]
 #[doc = "      }"]
 #[doc = "    },"]
 #[doc = "    \"included\": {"]
-#[doc = "      \"description\": \"A list of directories to include in the executable search.\","]
+#[doc = "      \"description\": \"A list of directories or file patterns to include in the executable search.\\nSupports directory paths (e.g., \\\"src/\\\", \\\"scripts/\\\") and glob patterns for filenames (e.g., \\\"*.test.flow\\\", \\\"example*\\\").\\n\","]
 #[doc = "      \"default\": [],"]
 #[doc = "      \"type\": \"array\","]
 #[doc = "      \"items\": {"]
@@ -97,10 +97,10 @@ impl ::std::convert::From<::std::vec::Vec<::std::string::String>> for CommonTags
 #[doc = r" </details>"]
 #[derive(:: serde :: Deserialize, :: serde :: Serialize, Clone, Debug)]
 pub struct ExecutableFilter {
-    #[doc = "A list of directories to exclude from the executable search."]
+    #[doc = "A list of directories or file patterns to exclude from the executable search.\nSupports directory paths (e.g., \"node_modules/\", \"vendor/\") and glob patterns for filenames (e.g., \"*.js.flow\", \"*temp*\").\nCommon exclusions like node_modules/, vendor/, third_party/, external/, and *.js.flow are excluded by default.\n"]
     #[serde(default, skip_serializing_if = "::std::vec::Vec::is_empty")]
     pub excluded: ::std::vec::Vec<::std::string::String>,
-    #[doc = "A list of directories to include in the executable search."]
+    #[doc = "A list of directories or file patterns to include in the executable search.\nSupports directory paths (e.g., \"src/\", \"scripts/\") and glob patterns for filenames (e.g., \"*.test.flow\", \"example*\").\n"]
     #[serde(default, skip_serializing_if = "::std::vec::Vec::is_empty")]
     pub included: ::std::vec::Vec<::std::string::String>,
 }

desktop/src/types/generated/workspace.ts

@@ -36,11 +36,16 @@ export interface Workspace {
 }
 export interface ExecutableFilter {
   /**
-   * A list of directories to exclude from the executable search.
+   * A list of directories or file patterns to exclude from the executable search.
+   * Supports directory paths (e.g., "node_modules/", "vendor/") and glob patterns for filenames (e.g., "*.js.flow", "*temp*").
+   * Common exclusions like node_modules/, vendor/, third_party/, external/, and *.js.flow are excluded by default.
+   *
    */
   excluded?: string[];
   /**
-   * A list of directories to include in the executable search.
+   * A list of directories or file patterns to include in the executable search.
+   * Supports directory paths (e.g., "src/", "scripts/") and glob patterns for filenames (e.g., "*.test.flow", "example*").
+   *
    */
   included?: string[];
   [k: string]: unknown;

docs/schemas/workspace_schema.json

@@ -16,15 +16,15 @@
       "type": "object",
       "properties": {
         "excluded": {
-          "description": "A list of directories to exclude from the executable search.",
+          "description": "A list of directories or file patterns to exclude from the executable search.\nSupports directory paths (e.g., \"node_modules/\", \"vendor/\") and glob patterns for filenames (e.g., \"*.js.flow\", \"*temp*\").\nCommon exclusions like node_modules/, vendor/, third_party/, external/, and *.js.flow are excluded by default.\n",
           "type": "array",
           "default": [],
           "items": {
             "type": "string"
           }
         },
         "included": {
-          "description": "A list of directories to include in the executable search.",
+          "description": "A list of directories or file patterns to include in the executable search.\nSupports directory paths (e.g., \"src/\", \"scripts/\") and glob patterns for filenames (e.g., \"*.test.flow\", \"example*\").\n",
           "type": "array",
           "default": [],
           "items": {

docs/types/workspace.md

@@ -47,8 +47,8 @@ Tags can be used with list commands to filter returned data.
 
 | Field | Description | Type | Default | Required |
 | ----- | ----------- | ---- | ------- | :--------: |
-| `excluded` | A list of directories to exclude from the executable search. | `array` (`string`) | [] |  |
-| `included` | A list of directories to include in the executable search. | `array` (`string`) | [] |  |
+| `excluded` | A list of directories or file patterns to exclude from the executable search. Supports directory paths (e.g., "node_modules/", "vendor/") and glob patterns for filenames (e.g., "*.js.flow", "*temp*"). Common exclusions like node_modules/, vendor/, third_party/, external/, and *.js.flow are excluded by default.  | `array` (`string`) | [] |  |
+| `included` | A list of directories or file patterns to include in the executable search. Supports directory paths (e.g., "src/", "scripts/") and glob patterns for filenames (e.g., "*.test.flow", "example*").  | `array` (`string`) | [] |  |
 
 ### VerbAliases
 

flow.yaml

@@ -5,6 +5,3 @@ description: |
    GitHub Repo: github.com/flowexec/flow
 descriptionFile: docs/development.md
 verbAliases: {}
-executables:
-  excluded:
-    - node_modules

internal/filesystem/executables.go

@@ -5,7 +5,6 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -88,6 +87,14 @@ func LoadWorkspaceFlowFiles(
 	return cfgs, nil
 }
 
+var defaultExcutablePaths = []string{
+	"vendor/",
+	"third_party/",
+	"external/",
+	"node_modules/",
+	"*.js.flow",
+}
+
 func findFlowFiles(workspaceCfg *workspace.Workspace) ([]string, error) {
 	var includePaths, excludedPaths []string
 	if workspaceCfg.Executables != nil {
@@ -100,6 +107,7 @@ func findFlowFiles(workspaceCfg *workspace.Workspace) ([]string, error) {
 	} else {
 		includePaths = []string{workspaceCfg.Location()}
 	}
+	excludedPaths = append(excludedPaths, defaultExcutablePaths...)
 
 	var cfgPaths []string
 	walkDirFunc := func(path string, entry fs.DirEntry, err error) error {
@@ -128,64 +136,52 @@ func findFlowFiles(workspaceCfg *workspace.Workspace) ([]string, error) {
 	return cfgPaths, nil
 }
 
-// IsPathIn returns true if the path is in any of the include paths.
-func isPathIncluded(path, basePath string, includePaths []string) bool {
-	if includePaths == nil {
-		return true
+func pathMatches(path, basePath string, patterns []string) bool {
+	if patterns == nil {
+		return false
+	}
+
+	relPath, err := filepath.Rel(basePath, path)
+	if err != nil {
+		// fallback to absolute if relative path cannot be determined
+		relPath = path
 	}
 
-	for _, p := range includePaths {
-		includePath := p
-		if strings.HasPrefix(includePath, "//") {
-			includePath = strings.Replace(includePath, "//", basePath+"/", 1)
+	for _, p := range patterns {
+		pattern := p
+		if strings.HasPrefix(pattern, "//") {
+			pattern = strings.Replace(pattern, "//", basePath+"/", 1)
 		}
 
-		if path == includePath || strings.HasPrefix(path, includePath) {
+		if path == pattern || strings.HasPrefix(path, pattern) {
+			return true
+		}
+		if relPath == pattern || strings.HasPrefix(relPath, pattern) {
 			return true
 		}
 
-		isMatch, err := regexp.MatchString(includePath, path)
-		if err != nil {
-			logger.Log().Errorx(
-				"unable to regex match path against include path",
-				"path", path,
-				"includePath", includePath,
-				"err", err,
-			)
-			continue
+		for _, checkPath := range []string{path, relPath} {
+			if strings.Contains(pattern, "*") ||
+				strings.Contains(pattern, "?") ||
+				strings.Contains(pattern, "[") {
+				fileName := filepath.Base(checkPath)
+				isMatch, err := filepath.Match(pattern, fileName)
+				if err == nil && isMatch {
+					return true
+				}
+			}
 		}
-		return isMatch
 	}
 	return false
 }
 
-// IsPathExcluded returns true if the path is in any of the excluded paths.
-func isPathExcluded(path, basePath string, excludedPaths []string) bool {
-	if excludedPaths == nil {
-		return false
+func isPathIncluded(path, basePath string, includePaths []string) bool {
+	if includePaths == nil {
+		return true
 	}
+	return pathMatches(path, basePath, includePaths)
+}
 
-	for _, p := range excludedPaths {
-		excludedPath := p
-		if strings.HasPrefix(excludedPath, "//") {
-			excludedPath = strings.Replace(excludedPath, "//", basePath+"/", 1)
-		}
-
-		if path == excludedPath || strings.HasPrefix(path, excludedPath) {
-			return true
-		}
-
-		isMatch, err := regexp.MatchString(excludedPath, path)
-		if err != nil {
-			logger.Log().Errorx(
-				"unable to regex match path against excluded path",
-				"path", path,
-				"excludedPath", excludedPath,
-				"err", err,
-			)
-			continue
-		}
-		return isMatch
-	}
-	return false
+func isPathExcluded(path, basePath string, excludedPaths []string) bool {
+	return pathMatches(path, basePath, excludedPaths)
 }

types/workspace/schema.yaml

@@ -15,13 +15,18 @@ definitions:
         type: array
         items:
           type: string
-        description: A list of directories to include in the executable search.
+        description: |
+          A list of directories or file patterns to include in the executable search.
+          Supports directory paths (e.g., "src/", "scripts/") and glob patterns for filenames (e.g., "*.test.flow", "example*").
         default: []
       excluded:
         type: array
         items:
           type: string
-        description: A list of directories to exclude from the executable search.
+        description: |
+          A list of directories or file patterns to exclude from the executable search.
+          Supports directory paths (e.g., "node_modules/", "vendor/") and glob patterns for filenames (e.g., "*.js.flow", "*temp*").
+          Common exclusions like node_modules/, vendor/, third_party/, external/, and *.js.flow are excluded by default.
         default: []
   VerbAliases:
     type: object