Fix wasm build (#37)

Co-authored-by: Tony Meehan <tonymeehan@users.noreply.github.com>

Author: tonymeehan

internal/pkg/cli/cli.go

@@ -76,7 +76,7 @@ func InitAndExecute(ctx context.Context) error {
 	var (
 		c          *config.Config
 		token      string
-		rulesPaths []rules.RulePathT
+		rulesPaths []utils.RulePathT
 		err        error
 	)
 

internal/pkg/engine/engine.go

@@ -14,7 +14,6 @@ import (
 	"github.com/Masterminds/semver"
 	"github.com/prequel-dev/preq/internal/pkg/matchz"
 	"github.com/prequel-dev/preq/internal/pkg/resolve"
-	"github.com/prequel-dev/preq/internal/pkg/rules"
 	"github.com/prequel-dev/preq/internal/pkg/utils"
 	"github.com/prequel-dev/preq/internal/pkg/ux"
 	"github.com/prequel-dev/prequel-compiler/pkg/compiler"
@@ -87,7 +86,7 @@ func compileRuleTree(cf compiler.RuntimeI, tree *parser.TreeT) (compiler.ObjsT,
 	return nodeObjs, nil
 }
 
-func compileRulePath(cf compiler.RuntimeI, rp rules.RulePathT) (compiler.ObjsT, *parser.RulesT, error) {
+func compileRulePath(cf compiler.RuntimeI, rp utils.RulePathT) (compiler.ObjsT, *parser.RulesT, error) {
 	var (
 		rs        *parser.RulesT
 		tree      *parser.TreeT
@@ -100,9 +99,9 @@ func compileRulePath(cf compiler.RuntimeI, rp rules.RulePathT) (compiler.ObjsT,
 	log.Info().Str("path", rp.Path).Msg("Parsing rules")
 
 	switch rp.Type {
-	case rules.RuleTypeCre:
+	case utils.RuleTypeCre:
 		rdrOpts = append(rdrOpts, utils.WithMultiDoc())
-	case rules.RuleTypeUser:
+	case utils.RuleTypeUser:
 		// Allow empty IDs in user generated content
 		rdrOpts = append(rdrOpts, utils.WithGenIds())
 		parseOpts = append(parseOpts, parser.WithGenIds())
@@ -196,7 +195,7 @@ func (r *RuntimeT) compileRules(cf compiler.RuntimeI, data []byte) (compiler.Obj
 
 }
 
-func (r *RuntimeT) compileRulesPaths(cf compiler.RuntimeI, paths []rules.RulePathT) (compiler.ObjsT, []*parser.RulesT, error) {
+func (r *RuntimeT) compileRulesPaths(cf compiler.RuntimeI, paths []utils.RulePathT) (compiler.ObjsT, []*parser.RulesT, error) {
 	var (
 		nodeObjs = make(compiler.ObjsT, 0)
 		allRules = make([]*parser.RulesT, 0)
@@ -488,7 +487,7 @@ func (r *RuntimeT) getRuntimeCb(report *ux.ReportT) *runtimeT {
 	return runtime
 }
 
-func (r *RuntimeT) CompileRulesPath(rulesPaths []rules.RulePathT, report *ux.ReportT) (*RuleMatchersT, error) {
+func (r *RuntimeT) CompileRulesPath(rulesPaths []utils.RulePathT, report *ux.ReportT) (*RuleMatchersT, error) {
 
 	var (
 		nodeObjs compiler.ObjsT
@@ -519,7 +518,7 @@ func (r *RuntimeT) CompileRulesPath(rulesPaths []rules.RulePathT, report *ux.Rep
 	return matchers, nil
 }
 
-func (r *RuntimeT) LoadRulesPaths(rep *ux.ReportT, rulesPaths []rules.RulePathT) (*RuleMatchersT, error) {
+func (r *RuntimeT) LoadRulesPaths(rep *ux.ReportT, rulesPaths []utils.RulePathT) (*RuleMatchersT, error) {
 
 	var (
 		ruleMatchers *RuleMatchersT

internal/pkg/rules/rules.go

@@ -94,22 +94,10 @@ const (
 	maxResp = 1500 // typical MTU size
 )
 
-type RuleTypeT string
-
-const (
-	RuleTypeCre  RuleTypeT = "cre"
-	RuleTypeUser RuleTypeT = "user"
-)
-
-type RulePathT struct {
-	Path string
-	Type RuleTypeT
-}
-
-func GetRules(ctx context.Context, conf *config.Config, configDir, cmdLineRules, token, ruleUpdateFile, baseAddr string, tlsPort, udpPort int) ([]RulePathT, error) {
+func GetRules(ctx context.Context, conf *config.Config, configDir, cmdLineRules, token, ruleUpdateFile, baseAddr string, tlsPort, udpPort int) ([]utils.RulePathT, error) {
 	var (
 		syncRulesPath string
-		rulePaths     = make([]RulePathT, 0)
+		rulePaths     = make([]utils.RulePathT, 0)
 		err           error
 	)
 
@@ -120,23 +108,23 @@ func GetRules(ctx context.Context, conf *config.Config, configDir, cmdLineRules,
 	}
 
 	if syncRulesPath != "" && !conf.Rules.Disabled {
-		rulePaths = append(rulePaths, RulePathT{
+		rulePaths = append(rulePaths, utils.RulePathT{
 			Path: syncRulesPath,
-			Type: RuleTypeCre,
+			Type: utils.RuleTypeCre,
 		})
 	}
 
 	if cmdLineRules != "" {
-		rulePaths = append(rulePaths, RulePathT{
+		rulePaths = append(rulePaths, utils.RulePathT{
 			Path: cmdLineRules,
-			Type: RuleTypeUser,
+			Type: utils.RuleTypeUser,
 		})
 	}
 
 	for _, path := range conf.Rules.Paths {
-		rulePaths = append(rulePaths, RulePathT{
+		rulePaths = append(rulePaths, utils.RulePathT{
 			Path: path,
-			Type: RuleTypeUser,
+			Type: utils.RuleTypeUser,
 		})
 	}
 

internal/pkg/utils/utils.go

@@ -31,6 +31,18 @@ var (
 	sectionRules = "rules"
 )
 
+type RuleTypeT string
+
+const (
+	RuleTypeCre  RuleTypeT = "cre"
+	RuleTypeUser RuleTypeT = "user"
+)
+
+type RulePathT struct {
+	Path string
+	Type RuleTypeT
+}
+
 func GetStopTime() (ts int64) {
 	return math.MaxInt64
 }