luciano/htmgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some fixes

Browse source
This commit is contained in:
maddalax 2024-09-26 09:23:22 -05:00
parent 96db966de7
commit 8efeaf1c4c
4 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/htmgo/tasks/process/process.go
View file

@ -54,11 +54,11 @@ func shouldSkipKilling(flags []RunFlag, skipFlag []RunFlag) bool {
func KillAll(skipFlag ...RunFlag) { func KillAll(skipFlag ...RunFlag) {
tries := 0 tries := 0
updatedCommands := make([]CmdWithFlags, len(commands)) updatedCommands := make([]CmdWithFlags, 0)
for { for {
tries++ tries++
allFinished := true allFinished := true
for i, cmd := range commands { for _, cmd := range commands {
if cmd.cmd.Process == nil { if cmd.cmd.Process == nil {
allFinished = false allFinished = false
@ -72,7 +72,7 @@ func KillAll(skipFlag ...RunFlag) {
continue continue
} }
} else { } else {
updatedCommands[i] = cmd updatedCommands = append(updatedCommands, cmd)
} }
} }
if allFinished { if allFinished {
@ -152,7 +152,13 @@ func RunMany(commands []string, flags ...RunFlag) error {
func Run(command string, flags ...RunFlag) error { func Run(command string, flags ...RunFlag) error {
parts := strings.Fields(command) parts := strings.Fields(command)
cmd := exec.Command(parts[0], parts[1:]...)
args := make([]string, 0)
if len(parts) > 1 {
args = parts[1:]
}
cmd := exec.Command(parts[0], args...)
PrepareCommand(cmd) PrepareCommand(cmd)

5
framework/h/lifecycle.go
View file

@ -181,6 +181,11 @@ func Alert(text string) SimpleJsCommand {
return SimpleJsCommand{Command: fmt.Sprintf("alert('%s')", text)} return SimpleJsCommand{Command: fmt.Sprintf("alert('%s')", text)}
} }
func Remove() SimpleJsCommand {
// language=JavaScript
return SimpleJsCommand{Command: "this.remove()"}
}
func EvalJs(js string) ComplexJsCommand { func EvalJs(js string) ComplexJsCommand {
return NewComplexJsCommand(js) return NewComplexJsCommand(js)
} }

43
framework/h/tag.go
View file

@ -20,6 +20,11 @@ func (node *Element) AppendChild(child Ren) *Element {
return node return node
} }
func (node *Element) AppendChildren(children ...Ren) *Element {
node.children = append(node.children, children...)
return node
}
func TextF(format string, args ...interface{}) *TextContent { func TextF(format string, args ...interface{}) *TextContent {
return Text(fmt.Sprintf(format, args...)) return Text(fmt.Sprintf(format, args...))
} }
@ -28,7 +33,7 @@ func Text(text string) *TextContent {
return NewTextContent(text) return NewTextContent(text)
} }
func Pf(format string, args ...interface{}) Ren { func Pf(format string, args ...interface{}) *Element {
return TagF("p", format, args...) return TagF("p", format, args...)
} }
@ -52,7 +57,7 @@ func Body(children ...Ren) *Element {
return Tag("body", children...) return Tag("body", children...)
} }
func Meta(name string, content string) Ren { func Meta(name string, content string) *Element {
return &Element{ return &Element{
tag: "meta", tag: "meta",
attributes: map[string]string{ attributes: map[string]string{
@ -63,7 +68,7 @@ func Meta(name string, content string) Ren {
} }
} }
func LinkWithVersion(href string, rel string, version string) Ren { func LinkWithVersion(href string, rel string, version string) *Element {
attributeMap := AttributeMap{ attributeMap := AttributeMap{
"href": href + "?v=" + version, "href": href + "?v=" + version,
"rel": rel, "rel": rel,
@ -75,7 +80,7 @@ func LinkWithVersion(href string, rel string, version string) Ren {
} }
} }
func Link(href string, rel string) Ren { func Link(href string, rel string) *Element {
attributeMap := AttributeMap{ attributeMap := AttributeMap{
"href": href, "href": href,
"rel": rel, "rel": rel,
@ -87,7 +92,7 @@ func Link(href string, rel string) Ren {
} }
} }
func ScriptWithVersion(url string, version string) Ren { func ScriptWithVersion(url string, version string) *Element {
attributeMap := AttributeMap{ attributeMap := AttributeMap{
"src": url + "?v=" + version, "src": url + "?v=" + version,
} }
@ -98,7 +103,7 @@ func ScriptWithVersion(url string, version string) Ren {
} }
} }
func Script(url string) Ren { func Script(url string) *Element {
attributeMap := AttributeMap{ attributeMap := AttributeMap{
"src": url, "src": url,
} }
@ -113,7 +118,7 @@ func Raw(text string) *RawContent {
return NewRawContent(text) return NewRawContent(text)
} }
func Style(text string) Ren { func Style(text string) *Element {
return Tag("style", Text(text)) return Tag("style", Text(text))
} }
@ -141,11 +146,11 @@ func Article(children ...Ren) *Element {
return Tag("article", children...) return Tag("article", children...)
} }
func Checkbox(children ...Ren) Ren { func Checkbox(children ...Ren) *Element {
return Input("checkbox", children...) return Input("checkbox", children...)
} }
func Value(value any) Ren { func Value(value any) *AttributeMap {
switch v := value.(type) { switch v := value.(type) {
case string: case string:
return Attribute("value", v) return Attribute("value", v)
@ -156,7 +161,7 @@ func Value(value any) Ren {
} }
} }
func Input(inputType string, children ...Ren) Ren { func Input(inputType string, children ...Ren) *Element {
attributeMap := AttributeMap{ attributeMap := AttributeMap{
"type": inputType, "type": inputType,
} }
@ -167,19 +172,19 @@ func Input(inputType string, children ...Ren) Ren {
} }
} }
func TextInput(children ...Ren) Ren { func TextInput(children ...Ren) *Element {
return Input("text", children...) return Input("text", children...)
} }
func NumberInput(children ...Ren) Ren { func NumberInput(children ...Ren) *Element {
return Input("number", children...) return Input("number", children...)
} }
func FileInput(children ...Ren) Ren { func FileInput(children ...Ren) *Element {
return Input("file", children...) return Input("file", children...)
} }
func Radio(children ...Ren) Ren { func Radio(children ...Ren) *Element {
return Input("radio", children...) return Input("radio", children...)
} }
@ -207,15 +212,17 @@ func List[T any](items []T, mapper func(item T, index int) *Element) *Element {
return node return node
} }
func Fragment(children ...Ren) *ChildList { func Fragment(children ...Ren) *Element {
return Children(children...) e := Empty()
e.children = children
return e
} }
func Template(children ...Ren) *Element { func Template(children ...Ren) *Element {
return Tag("template", children...) return Tag("template", children...)
} }
func AppendChildren(node *Element, children ...Ren) Ren { func AppendChildren(node *Element, children ...Ren) *Element {
node.children = append(node.children, children...) node.children = append(node.children, children...)
return node return node
@ -315,7 +322,7 @@ func Img(children ...Ren) *Element {
return Tag("img", children...) return Tag("img", children...)
} }
func Src(src string) Ren { func Src(src string) *AttributeMap {
return Attribute("src", src) return Attribute("src", src)
} }

1
framework/js/commands.go
View file

@ -12,6 +12,7 @@ var SetOuterHtml = h.SetOuterHtml
var SetDisabled = h.SetDisabled var SetDisabled = h.SetDisabled
var RemoveClass = h.RemoveClass var RemoveClass = h.RemoveClass
var Alert = h.Alert var Alert = h.Alert
var Remove = h.Remove
var EvalJs = h.EvalJs var EvalJs = h.EvalJs
var InjectScript = h.InjectScript var InjectScript = h.InjectScript
var InjectScriptIfNotExist = h.InjectScriptIfNotExist var InjectScriptIfNotExist = h.InjectScriptIfNotExist