Skip to content

feat: add control command, fix lint errors, and update dependencies #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wizzomafizzo merged 1 commit into from
Mar 13, 2026
Merged

feat: add control command, fix lint errors, and update dependencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/ZaparooProject/go-zapscript

go 1.25.5
go 1.26.1

require (
github.com/expr-lang/expr v1.17.7
github.com/expr-lang/expr v1.17.8
github.com/google/go-cmp v0.7.0
github.com/stretchr/testify v1.11.1
pgregory.net/rapid v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/expr-lang/expr v1.17.7 h1:Q0xY/e/2aCIp8g9s/LGvMDCC5PxYlvHgDZRQ4y16JX8=
github.com/expr-lang/expr v1.17.7/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/expr-lang/expr v1.17.8 h1:W1loDTT+0PQf5YteHSTpju2qfUfNoBt4yw9+wOEU9VM=
github.com/expr-lang/expr v1.17.8/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
1 change: 1 addition & 0 deletions models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const (
ZapScriptCmdEvaluate = "evaluate"
ZapScriptCmdStop = "stop"
ZapScriptCmdEcho = "echo"
ZapScriptCmdControl = "control"

ZapScriptCmdMisterINI = "mister.ini"
ZapScriptCmdMisterCore = "mister.core"
Expand Down
82 changes: 41 additions & 41 deletions traits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
traits: make(map[string]any),
}
var fallbackBuf strings.Builder
fallbackBuf.WriteRune(SymTraitsStart)
_, _ = fallbackBuf.WriteRune(SymTraitsStart)

for {
ch, readErr := sr.read()
Expand All @@ -47,7 +47,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
break
}

fallbackBuf.WriteRune(ch)
_, _ = fallbackBuf.WriteRune(ch)

// First char of key must be a letter
if !isAdvArgNameStart(ch) {
Expand All @@ -56,7 +56,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
if consumeErr != nil {
return nil, consumeErr
}
fallbackBuf.WriteString(rest)
_, _ = fallbackBuf.WriteString(rest)
result.fallback = fallbackBuf.String()
result.invalidKey = true
result.invalidKeyName = fallbackBuf.String()
Expand All @@ -78,8 +78,8 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
if readErr != nil {
return nil, readErr
}
fallbackBuf.WriteRune(ch)
keySb.WriteString(strings.ToLower(string(ch)))
_, _ = fallbackBuf.WriteRune(ch)
_, _ = keySb.WriteString(strings.ToLower(string(ch)))
}
key += keySb.String()

Expand All @@ -98,14 +98,14 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
if readErr != nil {
return nil, readErr
}
fallbackBuf.WriteRune(ch)
_, _ = fallbackBuf.WriteRune(ch)

// Parse the value
parsedValue, valueStr, parseErr := sr.parseTraitValue()
if parseErr != nil {
return nil, parseErr
}
fallbackBuf.WriteString(valueStr)
_, _ = fallbackBuf.WriteString(valueStr)
value = parsedValue
case next == eof || next == SymCmdSep || next == SymTraitsStart || isWhitespace(next):
// Valid end of boolean shorthand trait
Expand All @@ -115,7 +115,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
if consumeErr != nil {
return nil, consumeErr
}
fallbackBuf.WriteString(rest)
_, _ = fallbackBuf.WriteString(rest)
result.fallback = fallbackBuf.String()
result.invalidKey = true
result.invalidKeyName = key
Expand Down Expand Up @@ -149,7 +149,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
return result, nil
}
// Single | is not end of command, continue
fallbackBuf.WriteRune(ch)
_, _ = fallbackBuf.WriteRune(ch)
continue
}

Expand All @@ -158,7 +158,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
if readErr != nil {
return nil, readErr
}
fallbackBuf.WriteRune(ch)
_, _ = fallbackBuf.WriteRune(ch)
continue
}

Expand All @@ -168,7 +168,7 @@ func (sr *ScriptReader) parseTraitsSyntax() (*traitsParseResult, error) {
if readErr != nil {
return nil, readErr
}
fallbackBuf.WriteRune(ch)
_, _ = fallbackBuf.WriteRune(ch)
break
}

Expand Down Expand Up @@ -200,7 +200,7 @@ func (sr *ScriptReader) parseTraitValue() (parsedValue any, rawStr string, err e
if readErr != nil {
return "", "", readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
quoted = true
quoteChar = ch

Expand All @@ -213,7 +213,7 @@ func (sr *ScriptReader) parseTraitValue() (parsedValue any, rawStr string, err e
if ch == eof {
return "", rawBuf.String(), ErrUnmatchedQuote
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)

if ch == SymEscapeSeq {
// Peek next char for raw tracking before parseEscapeSeq consumes it
Expand All @@ -228,11 +228,11 @@ func (sr *ScriptReader) parseTraitValue() (parsedValue any, rawStr string, err e
}
if escaped == "" {
// EOF after escape
valueBuf.WriteRune(SymEscapeSeq)
_, _ = valueBuf.WriteRune(SymEscapeSeq)
continue
}
rawBuf.WriteRune(nextRaw)
valueBuf.WriteString(escaped)
_, _ = rawBuf.WriteRune(nextRaw)
_, _ = valueBuf.WriteString(escaped)
continue
}

Expand All @@ -241,7 +241,7 @@ func (sr *ScriptReader) parseTraitValue() (parsedValue any, rawStr string, err e
return valueBuf.String(), rawBuf.String(), nil
}

valueBuf.WriteRune(ch)
_, _ = valueBuf.WriteRune(ch)
}
}

Expand All @@ -265,7 +265,7 @@ func (sr *ScriptReader) parseTraitValue() (parsedValue any, rawStr string, err e
if readErr != nil {
return "", rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)

// Handle escape sequences
if ch == SymEscapeSeq {
Expand All @@ -280,15 +280,15 @@ func (sr *ScriptReader) parseTraitValue() (parsedValue any, rawStr string, err e
return "", rawBuf.String(), escapeErr
}
if escaped == "" {
valueBuf.WriteRune(SymEscapeSeq)
_, _ = valueBuf.WriteRune(SymEscapeSeq)
continue
}
rawBuf.WriteRune(nextRaw)
valueBuf.WriteString(escaped)
_, _ = rawBuf.WriteRune(nextRaw)
_, _ = valueBuf.WriteString(escaped)
continue
}

valueBuf.WriteRune(ch)
_, _ = valueBuf.WriteRune(ch)
}

return inferType(valueBuf.String(), quoted), rawBuf.String(), nil
Expand All @@ -314,7 +314,7 @@ func (sr *ScriptReader) consumeToEndOfCmd() (string, error) {
break
}

buf.WriteRune(ch)
_, _ = buf.WriteRune(ch)
}
return buf.String(), nil
}
Expand All @@ -330,7 +330,7 @@ func (sr *ScriptReader) parseTraitArray() (parsedValue any, rawStr string, err e
if readErr != nil {
return nil, "", readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)

// Parse array elements
for {
Expand All @@ -347,7 +347,7 @@ func (sr *ScriptReader) parseTraitArray() (parsedValue any, rawStr string, err e
if readErr != nil {
return nil, rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
}

// Check for end of array or empty array
Expand All @@ -363,7 +363,7 @@ func (sr *ScriptReader) parseTraitArray() (parsedValue any, rawStr string, err e
if readErr != nil {
return nil, rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
return elements, rawBuf.String(), nil
}

Expand All @@ -372,7 +372,7 @@ func (sr *ScriptReader) parseTraitArray() (parsedValue any, rawStr string, err e
if parseErr != nil {
return nil, rawBuf.String() + elemRaw, parseErr
}
rawBuf.WriteString(elemRaw)
_, _ = rawBuf.WriteString(elemRaw)
elements = append(elements, elemValue)

// Skip whitespace after element
Expand All @@ -388,7 +388,7 @@ func (sr *ScriptReader) parseTraitArray() (parsedValue any, rawStr string, err e
if readErr != nil {
return nil, rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
}

// Check for separator or end
Expand All @@ -405,15 +405,15 @@ func (sr *ScriptReader) parseTraitArray() (parsedValue any, rawStr string, err e
if readErr != nil {
return nil, rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
return elements, rawBuf.String(), nil
}
if next == SymArraySep {
ch, readErr = sr.read()
if readErr != nil {
return nil, rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
continue
}

Expand All @@ -438,7 +438,7 @@ func (sr *ScriptReader) parseArrayElement() (parsedValue any, rawStr string, err
if readErr != nil {
return "", "", readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)
quoteChar := ch

// Parse quoted value
Expand All @@ -450,7 +450,7 @@ func (sr *ScriptReader) parseArrayElement() (parsedValue any, rawStr string, err
if ch == eof {
return "", rawBuf.String(), ErrUnmatchedQuote
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)

if ch == SymEscapeSeq {
nextRaw, peekErr := sr.peek()
Expand All @@ -463,19 +463,19 @@ func (sr *ScriptReader) parseArrayElement() (parsedValue any, rawStr string, err
return "", rawBuf.String(), escapeErr
}
if escaped == "" {
valueBuf.WriteRune(SymEscapeSeq)
_, _ = valueBuf.WriteRune(SymEscapeSeq)
continue
}
rawBuf.WriteRune(nextRaw)
valueBuf.WriteString(escaped)
_, _ = rawBuf.WriteRune(nextRaw)
_, _ = valueBuf.WriteString(escaped)
continue
}

if ch == quoteChar {
return valueBuf.String(), rawBuf.String(), nil
}

valueBuf.WriteRune(ch)
_, _ = valueBuf.WriteRune(ch)
}
}

Expand All @@ -494,7 +494,7 @@ func (sr *ScriptReader) parseArrayElement() (parsedValue any, rawStr string, err
if readErr != nil {
return "", rawBuf.String(), readErr
}
rawBuf.WriteRune(ch)
_, _ = rawBuf.WriteRune(ch)

if ch == SymEscapeSeq {
nextRaw, peekErr := sr.peek()
Expand All @@ -507,15 +507,15 @@ func (sr *ScriptReader) parseArrayElement() (parsedValue any, rawStr string, err
return "", rawBuf.String(), escapeErr
}
if escaped == "" {
valueBuf.WriteRune(SymEscapeSeq)
_, _ = valueBuf.WriteRune(SymEscapeSeq)
continue
}
rawBuf.WriteRune(nextRaw)
valueBuf.WriteString(escaped)
_, _ = rawBuf.WriteRune(nextRaw)
_, _ = valueBuf.WriteString(escaped)
continue
}

valueBuf.WriteRune(ch)
_, _ = valueBuf.WriteRune(ch)
}

return inferType(strings.TrimSpace(valueBuf.String()), false), rawBuf.String(), nil
Expand Down
Loading