Upgraded Ferret to 2.0.0-alpha.54

cmd/internal/build/build.go

@@ -1,6 +1,7 @@
 package build
 
 import (
+	"context"
 	"fmt"
 	"os"
 
@@ -29,7 +30,7 @@ func New(store *config.Store) *cobra.Command {
 				return err
 			}
 
-			return runBuild(args, output)
+			return runBuild(cmd.Context(), args, output)
 		},
 	}
 
@@ -38,7 +39,7 @@ func New(store *config.Store) *cobra.Command {
 	return cmd
 }
 
-func runBuild(args []string, output string) error {
+func runBuild(ctx context.Context, args []string, output string) error {
 	plan, err := clibuild.PlanOutputs(args, output)
 
 	if err != nil {
@@ -65,7 +66,7 @@ func runBuild(args []string, output string) error {
 	failed := 0
 
 	for i, src := range sources {
-		if err := clibuild.WriteArtifact(c, src, plan.Targets[i].OutputPath); err != nil {
+		if err := clibuild.WriteArtifact(ctx, c, src, plan.Targets[i].OutputPath); err != nil {
 			diagnostics.PrintError(err)
 			failed++
 		}

cmd/internal/build/build_test.go

@@ -1,13 +1,47 @@
 package build
 
 import (
+	"context"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
 	"github.com/MontFerret/cli/v2/cmd/internal/testutil"
 )
 
+func TestBuildCommandCanceledContext(t *testing.T) {
+	dir := t.TempDir()
+	inputs := []string{filepath.Join(dir, "first.fql"), filepath.Join(dir, "second.fql")}
+
+	for _, input := range inputs {
+		testutil.WriteQuery(t, input, "RETURN 1")
+	}
+
+	ctx, cancel := context.WithCancel(t.Context())
+	cancel()
+
+	command := New(nil)
+	command.SetContext(ctx)
+
+	stderr, err := testutil.CaptureStderr(t, func() error {
+		return command.RunE(command, inputs)
+	})
+	if err == nil || err.Error() != "2 of 2 scripts failed to build" {
+		t.Fatalf("expected aggregated compilation failures, got %v", err)
+	}
+
+	if strings.Count(stderr, context.Canceled.Error()) != len(inputs) {
+		t.Fatalf("expected cancellation diagnostics for both scripts, got %q", stderr)
+	}
+
+	for _, name := range []string{"first.fqlc", "second.fqlc"} {
+		if _, err := os.Stat(filepath.Join(dir, name)); !os.IsNotExist(err) {
+			t.Fatalf("expected %s to be absent, got %v", name, err)
+		}
+	}
+}
+
 func TestRunBuild_MixedMultiFileBuildContinues(t *testing.T) {
 	dir := t.TempDir()
 	valid := filepath.Join(dir, "valid.fql")
@@ -18,7 +52,7 @@ func TestRunBuild_MixedMultiFileBuildContinues(t *testing.T) {
 	testutil.WriteQuery(t, invalid, "FOR item IN")
 
 	_, err := testutil.CaptureStderr(t, func() error {
-		return runBuild([]string{valid, invalid}, outputDir)
+		return runBuild(t.Context(), []string{valid, invalid}, outputDir)
 	})
 
 	if err == nil {
@@ -41,7 +75,7 @@ func TestRunBuild_PlanErrorReturned(t *testing.T) {
 	testutil.WriteQuery(t, output, "not a directory")
 
 	_, err := testutil.CaptureStderr(t, func() error {
-		return runBuild([]string{inputA, inputB}, output)
+		return runBuild(t.Context(), []string{inputA, inputB}, output)
 	})
 
 	if err == nil {

cmd/internal/check/check.go

@@ -39,8 +39,7 @@ func New(store *config.Store) *cobra.Command {
 			failed := 0
 
 			for _, src := range sources {
-				_, err := c.Compile(src)
-
+				_, err := c.Compile(cmd.Context(), src)
 				if err != nil {
 					diagnostics.PrintError(err)
 					failed++

cmd/internal/check/check_test.go

@@ -0,0 +1,32 @@
+package check
+
+import (
+	"context"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/MontFerret/cli/v2/cmd/internal/testutil"
+)
+
+func TestCheckCommandCanceledContext(t *testing.T) {
+	input := filepath.Join(t.TempDir(), "query.fql")
+	testutil.WriteQuery(t, input, "RETURN 1")
+
+	ctx, cancel := context.WithCancel(t.Context())
+	cancel()
+
+	command := New(nil)
+	command.SetContext(ctx)
+
+	stderr, err := testutil.CaptureStderr(t, func() error {
+		return command.RunE(command, []string{input})
+	})
+	if err == nil || err.Error() != "1 of 1 scripts have errors" {
+		t.Fatalf("expected compilation failure, got %v", err)
+	}
+
+	if !strings.Contains(stderr, context.Canceled.Error()) {
+		t.Fatalf("expected cancellation diagnostic, got %q", stderr)
+	}
+}

cmd/internal/debug/debug_test.go

@@ -54,7 +54,7 @@ func TestExecuteDebugRejectsArtifact(t *testing.T) {
 	sourcePath := filepath.Join(dir, "query.fql")
 	artifactPath := filepath.Join(dir, "query.fqlc")
 	testutil.WriteQuery(t, sourcePath, "RETURN 1")
-	if err := build.WriteArtifact(testutil.NewCompiler(t), source.New(sourcePath, "RETURN 1"), artifactPath); err != nil {
+	if err := build.WriteArtifact(t.Context(), testutil.NewCompiler(t), source.New(sourcePath, "RETURN 1"), artifactPath); err != nil {
 		t.Fatal(err)
 	}
 

cmd/internal/inspect/inspect.go

@@ -48,8 +48,7 @@ func New(store *config.Store) *cobra.Command {
 				return fmt.Errorf("initialize compiler: %w", err)
 			}
 
-			program, err := c.Compile(sources[0])
-
+			program, err := c.Compile(cmd.Context(), sources[0])
 			if err != nil {
 				diagnostics.PrintError(err)
 				return fmt.Errorf("compilation failed")

cmd/internal/inspect/inspect_test.go

@@ -0,0 +1,43 @@
+package inspect
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/MontFerret/cli/v2/cmd/internal/testutil"
+)
+
+func TestInspectCommandCanceledContext(t *testing.T) {
+	ctx, cancel := context.WithCancel(t.Context())
+	cancel()
+
+	command := New(nil)
+	command.SetContext(ctx)
+
+	if err := command.Flags().Set("eval", "RETURN 1"); err != nil {
+		t.Fatal(err)
+	}
+
+	var stdout string
+
+	stderr, err := testutil.CaptureStderr(t, func() error {
+		var runErr error
+		stdout, runErr = testutil.CaptureStdout(t, func() error {
+			return command.RunE(command, nil)
+		})
+
+		return runErr
+	})
+	if err == nil || err.Error() != "compilation failed" {
+		t.Fatalf("expected compilation failure, got %v", err)
+	}
+
+	if !strings.Contains(stderr, context.Canceled.Error()) {
+		t.Fatalf("expected cancellation diagnostic, got %q", stderr)
+	}
+
+	if stdout != "" {
+		t.Fatalf("canceled inspection emitted disassembly: %q", stdout)
+	}
+}

cmd/internal/run/run_test.go

@@ -27,7 +27,7 @@ func TestExecuteRun_ArtifactRemoteRuntimeRejected(t *testing.T) {
 
 	testutil.WriteQuery(t, input, "RETURN 42")
 
-	if err := build.WriteArtifact(testutil.NewCompiler(t), source.New(input, "RETURN 42"), artifactPath); err != nil {
+	if err := build.WriteArtifact(t.Context(), testutil.NewCompiler(t), source.New(input, "RETURN 42"), artifactPath); err != nil {
 		t.Fatalf("build artifact: %v", err)
 	}
 
@@ -58,7 +58,7 @@ func TestExecuteRun_ArtifactStdinRemoteRuntimeRejected(t *testing.T) {
 
 	testutil.WriteQuery(t, input, "RETURN 42")
 
-	if err := build.WriteArtifact(testutil.NewCompiler(t), source.New(input, "RETURN 42"), artifactPath); err != nil {
+	if err := build.WriteArtifact(t.Context(), testutil.NewCompiler(t), source.New(input, "RETURN 42"), artifactPath); err != nil {
 		t.Fatalf("build artifact: %v", err)
 	}
 

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.16
 	github.com/MontFerret/contrib/modules/xml v1.0.0-rc.16
 	github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.16
-	github.com/MontFerret/ferret/v2 v2.0.0-alpha.53
+	github.com/MontFerret/ferret/v2 v2.0.0-alpha.54
 	github.com/MontFerret/specs v1.12.0
 	github.com/antlr4-go/antlr/v4 v4.13.1
 	github.com/chzyer/readline v1.5.1
@@ -38,14 +38,15 @@ require (
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
 	github.com/spf13/viper v1.21.0
-	golang.org/x/mod v0.40.0
-	golang.org/x/sync v0.22.0
+	golang.org/x/mod v0.41.0
+	golang.org/x/sync v0.23.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/JohannesKaufmann/dom v0.3.1 // indirect
 	github.com/JohannesKaufmann/html-to-markdown/v2 v2.5.2 // indirect
+	github.com/MontFerret/api v1.0.0-alpha.16 // indirect
 	github.com/MontFerret/contrib/pkg/common v0.2.0 // indirect
 	github.com/MontFerret/cssx v0.2.0 // indirect
 	github.com/PuerkitoBio/goquery v1.13.0 // indirect
@@ -69,14 +70,14 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.10.0 // indirect
+	github.com/jackc/pgx/v5 v5.11.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/ledongthuc/pdf v0.0.0-20260903153007-b3c860c23753 // indirect
+	github.com/ledongthuc/pdf v0.0.0-20260907135840-6c8c28e0e8a0 // indirect
 	github.com/mafredri/cdp v0.35.0 // indirect
 	github.com/mattn/go-colorable v0.1.15 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
-	github.com/openai/openai-go/v3 v3.56.0 // indirect
+	github.com/openai/openai-go/v3 v3.61.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.4.3 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/richardlehane/mscfb v1.0.8 // indirect
@@ -98,19 +99,19 @@ require (
 	github.com/xuri/excelize/v2 v2.11.0 // indirect
 	github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect
 	github.com/yuin/goldmark v1.8.5 // indirect
-	github.com/ziflex/dbx v1.10.0 // indirect
-	github.com/ziflex/go-options v1.5.0 // indirect
+	github.com/ziflex/dbx v1.11.0 // indirect
+	github.com/ziflex/go-options v1.6.1 // indirect
 	go.yaml.in/yaml/v3 v3.0.5 // indirect
-	golang.org/x/crypto v0.56.0 // indirect
-	golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa // indirect
-	golang.org/x/net v0.58.0 // indirect
-	golang.org/x/sys v0.47.0 // indirect
-	golang.org/x/text v0.41.0 // indirect
-	golang.org/x/tools v0.49.0 // indirect
+	golang.org/x/crypto v0.57.0 // indirect
+	golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba // indirect
+	golang.org/x/net v0.59.0 // indirect
+	golang.org/x/sys v0.48.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
+	golang.org/x/tools v0.50.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.2.8 // indirect
 	modernc.org/libc v1.75.7 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.12.1 // indirect
-	modernc.org/sqlite v1.58.0 // indirect
+	modernc.org/sqlite v1.59.0 // indirect
 )