organize scripting extensions

Author: patinthehat

lib/app/ChecksumVerificationState.go

@@ -1,11 +1,8 @@
-//go:generate go-enum --marshal
 package app
 
 import (
 	"errors"
 	"fmt"
-
-	"github.com/stackup-app/stackup/lib/utils"
 )
 
 // ENUM(not verified, pending, verified, mismatch, error)
@@ -105,32 +102,44 @@ func ParseChecksumVerificationState(name string) (ChecksumVerificationState, err
 }
 
 func (x *ChecksumVerificationState) IsInFinalState() bool {
-	return utils.ArrayContains(AllFinalCHecksumVerificationStates, *x)
+	for _, finalState := range AllFinalCHecksumVerificationStates {
+		if *x == finalState {
+			return true
+		}
+	}
+
+	return false
 }
 
-func (x *ChecksumVerificationState) TransitionToNext(err error, matched bool) bool {
+func (x *ChecksumVerificationState) TransitionToNext(err error, matched bool) *ChecksumVerificationState {
 	possibleStates := _ChecksumVerificationStateTransitionMap[*x]
 
 	if len(possibleStates) == 0 {
-		return false
+		return x
 	}
 
 	if len(possibleStates) == 1 {
 		*x = possibleStates[0]
-		return true
+		return x
 	}
 
-	if err != nil && utils.ArrayContains(possibleStates, ChecksumVerificationStateError) {
-		*x = ChecksumVerificationStateError
-		return true
+	for _, state := range possibleStates {
+		if state == ChecksumVerificationStateError {
+			*x = ChecksumVerificationStateError
+			return x
+		}
 	}
 
-	if utils.ArrayContains(possibleStates, NonErrorFinalChecksumVerificationStates) {
-		x.SetVerified(matched)
-		return true
+	for _, state := range possibleStates {
+		for _, finalState := range AllFinalCHecksumVerificationStates {
+			if state == finalState {
+				x.SetVerified(matched)
+				return x
+			}
+		}
 	}
 
-	return false
+	return x
 }
 
 // MarshalText implements the text marshaller method.

lib/app/WorkflowInclude.go

@@ -143,8 +143,8 @@ func (wi *WorkflowInclude) ValidateChecksum() bool {
 		return true
 	}
 
-	wi.ValidationState.TransitionToNext(nil, false)
-	// wi.ValidationState = ChecksumVerificationStatePending
+	// wi.TransitionToNext(nil, false)
+	wi.ValidationState = ChecksumVerificationStatePending
 	found := false
 
 	for _, url := range GetChecksumUrls(wi.FullUrl()) {
@@ -161,14 +161,28 @@ func (wi *WorkflowInclude) ValidateChecksum() bool {
 		found = true
 		wi.ChecksumUrl = url
 		wi.UpdateChecksumFromChecksumsFile(url, urlText)
-		wi.ValidationState.TransitionToNext(wi.HashAlgorithm.UnsupportedError(), false)
+		// wi.TransitionToNext(wi.HashAlgorithm.UnsupportedError(), false)
 		// wi.ValidationState = ChecksumVerificationStateError
+		// test
+		//wi.ValidationState =
 
 		break
 	}
 
-	wi.ValidationState.TransitionToNext(nil, found && !wi.ValidationState.IsError() && checksums.HashesMatch(wi.Hash, wi.FoundChecksum))
-	// wi.ValidationState.SetVerified(found && !wi.ValidationState.IsError() && checksums.HashesMatch(wi.Hash, wi.FoundChecksum))
+	matched := found && !wi.ValidationState.IsError() && checksums.HashesMatch(wi.Hash, wi.FoundChecksum)
+
+	if !found {
+		wi.ValidationState = ChecksumVerificationStateError
+	}
+	if matched {
+		wi.ValidationState = ChecksumVerificationStateVerified
+	}
+
+	// wi.TransitionToNext(nil, matched)
+	//
+	wi.ValidationState.SetVerified(matched)
+
+	fmt.Printf("wi.ValidationState: %v\n", wi.ValidationState)
 
 	return wi.ValidationState.IsVerified()
 }
@@ -233,3 +247,32 @@ func (wi *WorkflowInclude) NewCacheEntry() *cache.CacheEntry {
 		cache.CreateCarbonNowPtr(),
 	)
 }
+
+func (wi *WorkflowInclude) TransitionToNext(err error, matched bool) {
+	possibleStates := _ChecksumVerificationStateTransitionMap[wi.ValidationState]
+
+	if len(possibleStates) == 0 {
+		return
+	}
+
+	if len(possibleStates) == 1 {
+		wi.ValidationState = possibleStates[0]
+		return
+	}
+
+	for _, state := range possibleStates {
+		if state == ChecksumVerificationStateError {
+			wi.ValidationState = ChecksumVerificationStateError
+			return
+		}
+	}
+
+	for _, state := range possibleStates {
+		for _, finalState := range AllFinalCHecksumVerificationStates {
+			if state == finalState {
+				wi.ValidationState.SetVerified(true)
+				return
+			}
+		}
+	}
+}

lib/app/WorkflowState.go

@@ -32,7 +32,7 @@ func (ws *WorkflowState) SetCurrent(task *Task) CleanupCallback {
 		ws.CurrentTask = nil
 
 		value, ok := ws.Stack.Pop()
-		if ok {
+		if ok && value != nil {
 			ws.CurrentTask = value.(*Task)
 		}
 	}

lib/app/app.go

@@ -357,8 +357,8 @@ func (a *Application) Run() {
 	a.runInitScript()
 	a.runPreconditions()
 	a.runStartupTasks()
-	a.runServerTasks()
-	a.createScheduledTasks()
+	// a.runServerTasks()
+	// a.createScheduledTasks()
 
 	a.runEventLoop()
 }

lib/scripting/ScriptRegistry.go

@@ -1,16 +1,29 @@
-package scripting
+package appextension
 
 import (
 	"github.com/stackup-app/stackup/lib/support"
-	"github.com/stackup-app/stackup/lib/version"
+	"github.com/stackup-app/stackup/lib/types"
+	appvers "github.com/stackup-app/stackup/lib/version"
 )
 
+const name = "app"
+
+// const version = "0.0.1"
+// const description = "Provides access to application methods."
+
 type ScriptApp struct {
 }
 
-func CreateScriptAppObject(e *JavaScriptEngine) {
-	obj := &ScriptApp{}
-	e.Vm.Set("app", obj)
+func Create() *ScriptApp {
+	return &ScriptApp{}
+}
+
+func (app *ScriptApp) GetName() string {
+	return name
+}
+
+func (ex *ScriptApp) OnInstall(engine types.JavaScriptEngineContract) {
+	engine.GetVm().Set(ex.GetName(), ex)
 }
 
 func (app *ScriptApp) StatusMessage(message string) {
@@ -34,5 +47,5 @@ func (app *ScriptApp) WarningMessage(message string) {
 }
 
 func (app *ScriptApp) Version() string {
-	return version.APP_VERSION
+	return appvers.APP_VERSION
 }

lib/scripting/scriptApp.go renamed to lib/scripting/extensions/app_extension/scriptApp.go

@@ -1,4 +1,4 @@
-package scripting
+package devextension
 
 import (
 	"encoding/json"

lib/scripting/scriptComposerJson.go renamed to lib/scripting/extensions/dev_extension/scriptComposerJson.go

@@ -0,0 +1,41 @@
+package devextension
+
+import (
+	"github.com/stackup-app/stackup/lib/types"
+)
+
+const name = "dev"
+
+// const version = "0.0.1"
+// const description = "Provides access to development tools."
+
+type ScriptDev struct {
+	types.ScriptExtensionContract
+}
+
+func Create() *ScriptDev {
+	return &ScriptDev{}
+}
+
+func (ex *ScriptDev) OnInstall(engine types.JavaScriptEngineContract) {
+	engine.GetVm().Set(ex.GetName(), ex)
+}
+
+func (dev *ScriptDev) GetName() string {
+	return name
+}
+
+func (dev *ScriptDev) ComposerJson(filename string) *Composer {
+	result, _ := LoadComposerJson(filename)
+	return result
+}
+
+func (dev *ScriptDev) PackageJson(filename string) *PackageJSON {
+	result, _ := LoadPackageJson(filename)
+	return result
+}
+
+func (dev *ScriptDev) RequirementsTxt(filename string) *RequirementsTxt {
+	result, _ := LoadRequirementsTxt(filename)
+	return result
+}

lib/scripting/extensions/dev_extension/scriptDev.go

@@ -1,4 +1,4 @@
-package scripting
+package devextension
 
 import (
 	"encoding/json"

lib/scripting/scriptPackageJson.go renamed to lib/scripting/extensions/dev_extension/scriptPackageJson.go

@@ -1,4 +1,4 @@
-package scripting
+package devextension
 
 import (
 	"bufio"