Merge pull request #19 from MinecraftMetascript/feat/rewrite-again

Feat/rewrite again

Author: ItsMeBrianD

.gitignore

@@ -7,3 +7,6 @@ gen
 extensions/vscode-extension/node_modules
 overworld.json
 surface_rules_wiki.txt
+repomix-output.xml
+spec.md
+mms_dist

.helix/config.toml

@@ -0,0 +1,9 @@
+[keys.normal]
+C-space = "completion"
+C-r = ":reload"
+[keys.normal.l]
+r = ":lsp-restart"
+f = ":reload"
+c = "completion"
+l = [ ":vsplit", ":log-open" ]
+o = [ ":sh echo \"\" > ~/.cache/helix/helix.log", ":reload" ]

.helix/languages.toml

@@ -7,5 +7,5 @@ name = "mms"
 scope = "source.mms"
 injection-regex = "mms"
 file-types = ["mms"]
-comment-tokens = "#"
-language-servers = [ "mms-lsp" ]
+comment-tokens = "//"
+language-servers = [ "mms-lsp" ]

.repomixignore

@@ -0,0 +1,11 @@
+# Add patterns to ignore here, one per line
+# Example:
+# *.log
+# tmp/
+lang/grammar
+result
+vendor
+.junie
+.helix
+.github
+wasm/mms.js

.windsurfrules

@@ -0,0 +1,92 @@
+# Minecraft Metascript (MMS) — Workspace AI Rules
+
+These are project-specific rules and context the AI must follow when working in this repository.
+
+## Project Context
+- Language: Go (go 1.23)
+- Module path: `github.com/minecraftmetascript/mms`
+- Vendoring: `vendor/` is present; builds typically use vendored deps
+- Parsing: ANTLR4 grammars in `grammar/*.g4` generate Go code into `lang/grammar/`
+- CLI: Cobra-based entrypoint
+- WASM: Browser-targeted build via [main_wasm.go](cci:7://file:///Users/brian/code/minecraftmetascript/mms/main_wasm.go:0:0-0:0) and `wasm/`
+- Nix: Optional flake provides reproducible builds and ANTLR generation
+
+## Repository Layout (high-signal paths)
+- `lang/`: Core API (Project, File, traversal, constructs, generated grammar package)
+  - `lang/grammar/`: GENERATED by ANTLR. Do not edit manually.
+  - `lang/constructs/...`: Construct registry and implementations (e.g., worldgen/surface_rules)
+  - `lang/traversal/...`: Parser traversal, construct registry, scopes
+- `grammar/`: Handwritten ANTLR grammars
+- `cmd/`: Cobra root command ([mms](cci:7://file:///Users/brian/code/minecraftmetascript/mms/test.mms:0:0-0:0))
+- `wasm/`: JS glue (`mms.js`), package.json, and wasm artifacts
+- `examples/`: MMS examples (e.g., surface rules) for manual parsing checks
+
+## Absolute Rules (Do/Don’t)
+- DO keep all imports at the top of files; never insert imports mid-file.
+- DO run `gofmt`/`goimports` and `go vet` before committing or proposing changes.
+- DO regenerate grammar output rather than editing anything under `lang/grammar/`.
+- DO keep vendoring consistent. After editing [go.mod](cci:7://file:///Users/brian/code/minecraftmetascript/mms/go.mod:0:0-0:0)/[go.sum](cci:7://file:///Users/brian/code/minecraftmetascript/mms/go.sum:0:0-0:0): `go mod tidy` then `go mod vendor`.
+- DO cite files/paths with backticks like `path/to/file.go` in explanations and PR notes.
+- DON’T modify generated files under `lang/grammar/` directly.
+- DON’T break build tags:
+  - [main.go](cci:7://file:///Users/brian/code/minecraftmetascript/mms/main.go:0:0-0:0): `//go:build !js && !wasm`
+  - [main_wasm.go](cci:7://file:///Users/brian/code/minecraftmetascript/mms/main_wasm.go:0:0-0:0): `//go:build js && wasm`
+
+## Builds & Tasks (Preferred Flows)
+- Nix (recommended):
+  - Native CLI: `nix build` → produces `./result/bin/mms` (runs ANTLR generation first)
+  - WASM: `nix build ".#wasm"` → produces `./result/js/` with `dist/main.wasm` and assets
+  - Dev shell: `nix develop` (provides `antlr-build`)
+  - Regenerate grammar (Nix): `antlr-build`
+- Non-Nix ANTLR regeneration (if `antlr4` is in PATH):
+  - Lexer: `antlr4 -Dlanguage=Go grammar/Main_Lexer.g4 -o lang -package grammar`
+  - Parser: `antlr4 -Dlanguage=Go grammar/Main_Parser.g4 -lib lang/grammar -o lang -package grammar`
+- Vendoring:
+  - After dependency changes: `go mod tidy && go mod vendor`
+
+## WASM Notes
+- [main_wasm.go](cci:7://file:///Users/brian/code/minecraftmetascript/mms/main_wasm.go:0:0-0:0) exports (js/wasm build tags):
+  - `updateFile(filename: string, content: string, cb: (serializedProject: string) => void)`
+  - `getFileDiag(filename: string, cb: (json: string) => void)`
+- `wasm/package.json` exposes `./mms.js` and `./dist/main.wasm` for NPM packaging.
+
+## Testing Guidance
+- Important API change: `Project.Diagnostics` is a METHOD now, not a field.
+  - Replace: `len(p.Diagnostics)` → `len(p.Diagnostics())`
+  - Replace: `for d := range p.Diagnostics { ... }` → range over `p.Diagnostics()`
+- Running tests:
+  - Full (may fail due to legacy `test/` pkg): `go test ./...`
+  - Preferred during migration: `go test ./lang`
+  - Specific test: `go test ./lang -run TestName -v`
+- Pattern for new tests:
+  - Create a `Project`, add a `File`, call `Parse()`
+  - Assert on `File.Diagnostics`, `Project.Diagnostics()`
+  - For exports, use `Project.BuildFsLike(root)`
+
+## Construct & Export Model
+- New constructs register via `traversal.ConstructRegistry.Register(...)`
+- `Project.BuildFsLike(root)` walks `GlobalScope` and calls `ExportSymbol` on constructs to build a directory-like export structure (used by WASM packaging)
+
+## Coding Style & Quality
+- Follow idiomatic Go. Keep functions cohesive and small.
+- Keep generated code in `lang/grammar/` untouched; regenerate via ANTLR on grammar changes.
+- Prefer package-local tests near code under test.
+- Keep explanations concise and always reference changed files and symbols with backticks.
+
+## Quick Commands Reference
+- Native build: `nix build`
+- WASM build: `nix build ".#wasm"`
+- Dev shell (Nix): `nix develop`
+- Regenerate grammar (Nix): `antlr-build`
+- Regenerate grammar (manual):
+  - `antlr4 -Dlanguage=Go grammar/Main_Lexer.g4 -o lang -package grammar`
+  - `antlr4 -Dlanguage=Go grammar/Main_Parser.g4 -lib lang/grammar -o lang -package grammar`
+- Core package tests: `go test ./lang -v`
+
+## AI Execution Preferences
+- When asked to modify code:
+  - Respect vendoring and ANTLR regeneration steps.
+  - Never place imports mid-file—add at the top and adjust separately if needed.
+  - Avoid large monolithic diffs; break up edits logically.
+- When suggesting commands, prefer Nix flows where available.
+- If a change would touch `lang/grammar`, instruct to regenerate via ANTLR instead of manual edits.

cmd/build.go

@@ -6,9 +6,11 @@ import (
 	"io/fs"
 	"log"
 	"os"
+	"path"
+	"strings"
 
-	"github.com/minecraftmetascript/mms/lang"
-
+	"github.com/minecraftmetascript/mms/lib"
+	_project "github.com/minecraftmetascript/mms/project"
 	"github.com/spf13/cobra"
 )
 
@@ -19,6 +21,7 @@ var buildCmd = &cobra.Command{
 	Long:      ``,
 	ValidArgs: []cobra.Completion{"Input", "Output"},
 	Run: func(cmd *cobra.Command, args []string) {
+		log.SetFlags(log.LstdFlags | log.Lshortfile)
 		if len(args) < 1 {
 			log.Println("Please provide an input file or directory")
 			return
@@ -39,10 +42,9 @@ var buildCmd = &cobra.Command{
 			log.Println(
 				fmt.Sprintf("Building your project from %s to %s", inFile, outFile),
 			)
-
 		}
 
-		project := lang.NewProject()
+		project := _project.NewProject()
 
 		stat, err := fs.Stat(os.DirFS("."), inFile)
 
@@ -57,29 +59,85 @@ var buildCmd = &cobra.Command{
 			if content, err := os.ReadFile(inFile); err != nil {
 				log.Println("Error reading project:", err)
 			} else {
-				f := project.AddFile(inFile, string(content))
-				err = f.Parse()
+				_, err := project.AddFile(inFile, string(content))
+
 				if err != nil {
 					log.Println("Error parsing project:", err)
 				}
 			}
 		}
-		r, err := json.MarshalIndent(project.BuildFsLike(outFile), "", "  ")
+		fsLike := project.BuildFsLike(outFile)
+		if err != nil {
+			log.Println("Error exporting project:", err)
+			return
+		}
+
+		_, err = fs.Stat(os.DirFS("."), outFile)
+		if err != nil {
+			if strings.HasSuffix(err.Error(), "no such file or directory") {
+				err = os.MkdirAll(outFile, 0755)
+				if err != nil {
+					log.Println("Error creating output directory:", err)
+					return
+				}
+			} else {
+				log.Println("Error building project", err)
+			}
+			return
+		}
+
+		flushProject(fsLike, outFile)
 
 		if debugMode {
+			r, err := json.MarshalIndent(project.Symbols(), "", "  ")
 			log.Println(
 				string(r),
 				err,
 			)
+		} else {
+			// induce serialization for logging
+			_, e := json.MarshalIndent(project.Symbols(), "", "  ")
+			if e != nil {
+				log.Println("Error serializing project:", e)
+			}
 		}
+	},
+}
 
-		if len(project.Diagnostics()) > 0 {
-			for _, diag := range project.Diagnostics() {
-				log.Println(diag)
+func flushProject(root *lib.FileTreeLike, rootPath string) {
+	log.Println(root.Name)
+	for _, file := range root.Children {
+		targetPath := path.Join(rootPath, file.Name)
+		if file.IsDir {
+			err := mkdirIfNotExists(targetPath)
+			if err != nil {
+				log.Println("Error creating directory:", err)
+			}
+			flushProject(file, targetPath)
+		} else {
+			err := os.WriteFile(targetPath, []byte(file.Content), 0644)
+			if err != nil {
+				log.Println("Error writing file:", err)
 			}
+
 		}
 
-	},
+	}
+}
+
+func mkdirIfNotExists(dirPath string) error {
+	_, err := fs.Stat(os.DirFS("."), dirPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			err = os.MkdirAll(dirPath, 0755)
+			if err != nil {
+				return err
+			}
+		} else {
+			return err
+		}
+	}
+	return nil
 }
 
 func init() {

cmd/lint.go

@@ -1,15 +1,6 @@
-/*
-Copyright © 2025 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (
-	"io/fs"
-	"log"
-	"os"
-	"strings"
-
-	"github.com/minecraftmetascript/mms/lang"
 	"github.com/spf13/cobra"
 )
 
@@ -20,41 +11,41 @@ var lintCmd = &cobra.Command{
 	Long:      ``,
 	ValidArgs: []cobra.Completion{"Input"},
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) < 1 {
-			log.Println("Please provide an input file or directory")
-			return
-		}
-		inFile := args[0]
-		if strings.HasSuffix(inFile, "/") {
-			inFile = strings.TrimSuffix(inFile, "/")
-		}
-
-		project := lang.NewProject()
-
-		stat, err := fs.Stat(os.DirFS("."), inFile)
-
-		if err != nil {
-			log.Println("Error building project.", err)
-			return
-		}
-		if stat.IsDir() {
-			log.Println("Project is a directory")
-		} else {
-			if content, err := os.ReadFile(inFile); err != nil {
-				log.Println("Error building project:")
-			} else {
-				f := project.AddFile(inFile, string(content))
-				f.Parse()
-			}
-		}
-
-		if len(project.Diagnostics()) > 0 {
-			for _, diag := range project.Diagnostics() {
-				log.Println(diag)
-			}
-		} else {
-			log.Println("Project has no errors or warnings")
-		}
+		//if len(args) < 1 {
+		//	log.Println("Please provide an input file or directory")
+		//	return
+		//}
+		//inFile := args[0]
+		//if strings.HasSuffix(inFile, "/") {
+		//	inFile = strings.TrimSuffix(inFile, "/")
+		//}
+		//
+		//project := lang.NewProject()
+		//
+		//stat, err := fs.Stat(os.DirFS("."), inFile)
+		//
+		//if err != nil {
+		//	log.Println("Error building project.", err)
+		//	return
+		//}
+		//if stat.IsDir() {
+		//	log.Println("Project is a directory")
+		//} else {
+		//	if content, err := os.ReadFile(inFile); err != nil {
+		//		log.Println("Error building project:")
+		//	} else {
+		//		f := project.AddFile(inFile, string(content))
+		//		f.Parse()
+		//	}
+		//}
+		//
+		//if len(project.Diagnostics()) > 0 {
+		//	for _, diag := range project.Diagnostics() {
+		//		log.Println(diag)
+		//	}
+		//} else {
+		//	log.Println("Project has no errors or warnings")
+		//}
 
 	},
 }

cmd/lsp.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
-	"fmt"
+	"log"
 
 	"github.com/minecraftmetascript/mms/lsp"
+
 	"github.com/spf13/cobra"
 )
 
@@ -12,10 +13,9 @@ var lspCmd = &cobra.Command{
 	Use: "lsp",
 
 	Run: func(cmd *cobra.Command, args []string) {
-		if lsp.Start() != nil {
-			panic("Failed to start LSP server")
-		} else {
-			fmt.Println("LSP Started")
+
+		if err := lsp.Start(); err != nil {
+			log.Fatalf("Failed to start LSP server: %v\n", err)
 		}
 	},
 }