goscript 0.0.84 → 0.1.1

package/compiler/code-writer.go

@@ -1,115 +0,0 @@
-package compiler
-
-import (
-	"fmt"
-	"io"
-	"strings"
-)
-
-// TSCodeWriter writes TypeScript code.
-type TSCodeWriter struct {
-	w                  io.Writer
-	indentLevel        int
-	sectionWrittenFlag bool
-	lineWritten        bool
-}
-
-// NewTSCodeWriter builds a new TypeScript code writer.
-func NewTSCodeWriter(w io.Writer) *TSCodeWriter {
-	return &TSCodeWriter{w: w}
-}
-
-// WriteLinePreamble writes the indentation.
-func (w *TSCodeWriter) WriteLinePreamble() {
-	w.sectionWrittenFlag = true
-	w.lineWritten = false
-	for range w.indentLevel {
-		w.w.Write([]byte{byte('\t')}) //nolint:errcheck
-	}
-}
-
-// WriteLine writes a line of code to the output.
-func (w *TSCodeWriter) WriteLine(line string) {
-	if line != "" && w.lineWritten {
-		w.WriteLinePreamble()
-	}
-	w.w.Write([]byte(line))       //nolint:errcheck
-	w.w.Write([]byte{byte('\n')}) //nolint:errcheck
-	w.lineWritten = true
-}
-
-// WriteLinef writes a formatted line of code to the output.
-func (w *TSCodeWriter) WriteLinef(line string, args ...any) {
-	l := fmt.Sprintf(line, args...)
-	w.WriteLine(l)
-}
-
-// Indent changes the indentation level by a delta.
-func (w *TSCodeWriter) Indent(count int) {
-	w.indentLevel += count
-	if w.indentLevel < 0 {
-		w.indentLevel = 0
-	}
-}
-
-// WriteImport writes a TypeScript import.
-func (w *TSCodeWriter) WriteImport(symbolName, importPath string) {
-	w.WriteLinef("import * as %s from %q", symbolName, importPath)
-}
-
-// WriteCommentLine writes a comment as a // line.
-func (w *TSCodeWriter) WriteCommentLine(commentText string) {
-	lines := strings.SplitSeq(commentText, "\n")
-	for line := range lines {
-		w.WriteLinef("// %s", line)
-	}
-}
-
-// WriteCommentLinef writes a formatted comment as a // line.
-func (w *TSCodeWriter) WriteCommentLinef(format string, args ...any) {
-	commentText := fmt.Sprintf(format, args...)
-	lines := strings.SplitSeq(commentText, "\n")
-	for line := range lines {
-		w.WriteLinef("// %s", line)
-	}
-}
-
-// WriteCommentInline write a comment within /* */.
-func (w *TSCodeWriter) WriteCommentInline(commentText string) {
-	w.w.Write([]byte("/* "))       //nolint:errcheck
-	w.w.Write([]byte(commentText)) //nolint:errcheck
-	w.w.Write([]byte(" */"))       //nolint:errcheck
-}
-
-// WriteCommentInlinef writes a formatted comment within /* */.
-func (w *TSCodeWriter) WriteCommentInlinef(format string, args ...any) {
-	w.WriteCommentInline(fmt.Sprintf(format, args...))
-}
-
-// WriteLiterally writes something to the output without processing
-func (w *TSCodeWriter) WriteLiterally(literal string) {
-	w.sectionWrittenFlag = true
-	if w.lineWritten {
-		w.WriteLinePreamble()
-	}
-	w.w.Write([]byte(literal)) //nolint:errcheck
-}
-
-// WriteLiterallyf writes something to the output with formatting.
-func (w *TSCodeWriter) WriteLiterallyf(literal string, args ...any) {
-	w.sectionWrittenFlag = true
-	if w.lineWritten {
-		w.WriteLinePreamble()
-	}
-
-	l := fmt.Sprintf(literal, args...)
-	w.w.Write([]byte(l)) //nolint:errcheck
-}
-
-// WriteSectionTail writes the end of a section.
-func (w *TSCodeWriter) WriteSectionTail() {
-	if w.sectionWrittenFlag {
-		w.WriteLine("")
-		w.sectionWrittenFlag = false
-	}
-}

package/compiler/compiler_test.go

@@ -1,149 +0,0 @@
-package compiler_test
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"slices"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-
-	"github.com/aperturerobotics/goscript/tests"
-)
-
-// NOTE: this is here instead of tests/tests_test.go so coverage ends up in this package.
-
-func TestCompliance(t *testing.T) {
-	// Get workspace directory (project root)
-	workspaceDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("failed to get working directory: %v", err)
-	}
-	workspaceDir = filepath.Join(workspaceDir, "..")
-
-	// First collect all test paths
-	testsDir := filepath.Join(workspaceDir, "tests/tests")
-	dirs, err := os.ReadDir(testsDir)
-	if err != nil {
-		t.Fatalf("failed to read tests dir: %v", err)
-	}
-
-	var testPaths []string
-	for _, dir := range dirs {
-		if !dir.IsDir() {
-			continue
-		}
-		testPath := filepath.Join(testsDir, dir.Name())
-		goFiles, err := filepath.Glob(filepath.Join(testPath, "*.go"))
-		if err != nil || len(goFiles) == 0 {
-			// t.Errorf("no .go files found in %s", testPath)
-			continue
-		}
-		testPaths = append(testPaths, testPath)
-	}
-
-	// sort testPaths
-	slices.Sort(testPaths)
-
-	// limit concurrency
-	simulLimit := make(chan struct{}, runtime.GOMAXPROCS(-1))
-	for range cap(simulLimit) {
-		simulLimit <- struct{}{}
-	}
-
-	// Now run tests in parallel with goroutines
-	var wg sync.WaitGroup
-	var ranTests atomic.Int32
-	for _, testPath := range testPaths {
-		wg.Add(1)
-		go func(path string) {
-			defer wg.Done() // runs even if t.Run is skipped
-			t.Run(filepath.Base(path), func(t *testing.T) {
-				t.Helper()
-
-				ranTests.Add(1)
-				// limit how many tests can run simultaneously
-				<-simulLimit
-				defer func() {
-					simulLimit <- struct{}{}
-				}()
-				tests.RunGoScriptTestDir(t, workspaceDir, path) // Pass workspaceDir
-
-				// Remove dir if everything passed
-				if !t.Failed() {
-					os.RemoveAll(filepath.Join(path, "run"))
-				}
-			})
-		}(testPath)
-	}
-
-	// Wait for all tests to complete
-	wg.Wait()
-
-	// Typecheck
-	failed := t.Failed()
-	t.Run("typecheck", func(t *testing.T) {
-		t.Helper()
-		if failed {
-			t.Log("at least one tests test failed: skipping typecheck")
-			t.SkipNow()
-		}
-
-		// NOTE: typecheck does not yet pass, so we skip for now.
-		if ranTests.Load() != 0 {
-			t.Log("at least one tests test ran: skipping typecheck")
-			t.SkipNow()
-		}
-
-		// Get parent module path for the global typecheck
-		parentModPath, err := getParentGoModulePath()
-		if err != nil {
-			t.Fatalf("Failed to determine parent Go module path: %v", err)
-		}
-
-		// Create global typecheck tsconfig
-		tsconfigPath := tests.WriteGlobalTypeCheckConfig(t, parentModPath, workspaceDir)
-
-		// Run TypeScript type checking
-		typecheckDir := filepath.Dir(tsconfigPath)
-		cmd := exec.Command("tsc", "--project", filepath.Base(tsconfigPath))
-		cmd.Dir = typecheckDir
-
-		// Set up PATH to include node_modules/.bin
-		nodeBinDir := filepath.Join(workspaceDir, "node_modules", ".bin")
-		currentPath := os.Getenv("PATH")
-		newPath := nodeBinDir + string(os.PathListSeparator) + currentPath
-		cmd.Env = append(os.Environ(), "PATH="+newPath)
-
-		output, err := cmd.CombinedOutput()
-		if err != nil {
-			t.Errorf("Global TypeScript type checking failed: %v\noutput:\n%s", err, string(output))
-		} else {
-			t.Logf("Global TypeScript type checking passed")
-		}
-	})
-}
-
-// getParentGoModulePath is a helper function to get the parent Go module path
-// This is similar to the one in tests.go but simplified for use in tests
-func getParentGoModulePath() (string, error) {
-	cmd := exec.Command("go", "list", "-m")
-	output, err := cmd.Output()
-	if err != nil {
-		return "", err
-	}
-	// note: in a go work configuration, go list -m can report multiple modules
-	// only one of which is the goscript case, so we need to filter:
-	pf := strings.Fields(strings.TrimSpace(string(output)))
-	pf = slices.DeleteFunc(pf, func(n string) bool {
-		return !strings.HasSuffix(n, "goscript")
-	})
-	if len(pf) != 1 {
-		return "", fmt.Errorf("'go list -m' did not have exactly 1 goscript package -- run in root of goscript package")
-	}
-	return pf[0], nil
-}