refactor: move 'parse' back to internal root

app.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/Workiva/go-datastructures/queue"
 	internal "github.com/Xevion/go-ha/internal"
-	"github.com/Xevion/go-ha/internal/parse"
 	ws "github.com/Xevion/go-ha/internal/websocket"
 	"github.com/Xevion/go-ha/types"
 )
@@ -215,7 +214,7 @@ func (a *App) RegisterIntervals(intervals ...Interval) {
 			panic(ErrInvalidArgs)
 		}
 
-		i.nextRunTime = parse.ParseTime(string(i.startTime)).Carbon2Time()
+		i.nextRunTime = internal.ParseTime(string(i.startTime)).Carbon2Time()
 		now := time.Now()
 		for i.nextRunTime.Before(now) {
 			i.nextRunTime = i.nextRunTime.Add(i.frequency)

checkers.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/Xevion/go-ha/internal"
-	"github.com/Xevion/go-ha/internal/parse"
 	"github.com/Xevion/go-ha/types"
 	"github.com/golang-module/carbon"
 )
@@ -18,8 +17,8 @@ func CheckWithinTimeRange(startTime, endTime string) ConditionCheck {
 	// if betweenStart and betweenEnd both set, first account for midnight
 	// overlap, then check if between those times.
 	if startTime != "" && endTime != "" {
-		parsedStart := parse.ParseTime(startTime)
+		parsedStart := internal.ParseTime(startTime)
-		parsedEnd := parse.ParseTime(endTime)
+		parsedEnd := internal.ParseTime(endTime)
 
 		// check for midnight overlap
 		if parsedEnd.Lt(parsedStart) { // example turn on night lights when motion from 23:00 to 07:00
@@ -36,9 +35,9 @@ func CheckWithinTimeRange(startTime, endTime string) ConditionCheck {
 		}
 
 		// otherwise just check individual before/after
-	} else if startTime != "" && parse.ParseTime(startTime).IsFuture() {
+	} else if startTime != "" && internal.ParseTime(startTime).IsFuture() {
 		cc.fail = true
-	} else if endTime != "" && parse.ParseTime(endTime).IsPast() {
+	} else if endTime != "" && internal.ParseTime(endTime).IsPast() {
 		cc.fail = true
 	}
 	return cc
@@ -170,7 +169,7 @@ func CheckStartEndTime(s types.TimeString, isStart bool) ConditionCheck {
 	}
 
 	now := time.Now()
-	parsedTime := parse.ParseTime(string(s)).Carbon2Time()
+	parsedTime := internal.ParseTime(string(s)).Carbon2Time()
 	if isStart {
 		if parsedTime.After(now) {
 			cc.fail = true

entity_listener.go

@@ -8,7 +8,6 @@ import (
 	"github.com/golang-module/carbon"
 
 	"github.com/Xevion/go-ha/internal"
-	"github.com/Xevion/go-ha/internal/parse"
 	"github.com/Xevion/go-ha/types"
 )
 
@@ -129,13 +128,13 @@ func (b elBuilder3) ToState(s string) elBuilder3 {
 }
 
 func (b elBuilder3) Duration(s types.DurationString) elBuilder3 {
-	d := parse.ParseDuration(string(s))
+	d := internal.ParseDuration(string(s))
 	b.entityListener.delay = d
 	return b
 }
 
 func (b elBuilder3) Throttle(s types.DurationString) elBuilder3 {
-	d := parse.ParseDuration(string(s))
+	d := internal.ParseDuration(string(s))
 	b.entityListener.throttle = d
 	return b
 }

event_listener.go

@@ -8,7 +8,6 @@ import (
 	"github.com/golang-module/carbon"
 
 	"github.com/Xevion/go-ha/internal"
-	"github.com/Xevion/go-ha/internal/parse"
 	ws "github.com/Xevion/go-ha/internal/websocket"
 	"github.com/Xevion/go-ha/types"
 )
@@ -82,7 +81,7 @@ func (b eventListenerBuilder3) OnlyBefore(end string) eventListenerBuilder3 {
 }
 
 func (b eventListenerBuilder3) Throttle(s types.DurationString) eventListenerBuilder3 {
-	d := parse.ParseDuration(string(s))
+	d := internal.ParseDuration(string(s))
 	b.eventListener.throttle = d
 	return b
 }

internal/parse.go

@@ -1,4 +1,4 @@
-package parse
+package internal
 
 import (
 	"fmt"

interval.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/Xevion/go-ha/internal"
-	"github.com/Xevion/go-ha/internal/parse"
 	"github.com/Xevion/go-ha/types"
 )
 
@@ -82,7 +81,7 @@ func (ib intervalBuilder) Call(callback IntervalCallback) intervalBuilderCall {
 
 // Takes a DurationString ("2h", "5m", etc) to set the frequency of the interval.
 func (ib intervalBuilderCall) Every(s types.DurationString) intervalBuilderEnd {
-	d := parse.ParseDuration(string(s))
+	d := internal.ParseDuration(string(s))
 	ib.interval.frequency = d
 	return intervalBuilderEnd(ib)
 }

schedule.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/Xevion/go-ha/internal"
-	"github.com/Xevion/go-ha/internal/parse"
 	"github.com/Xevion/go-ha/types"
 	"github.com/golang-module/carbon"
 )
@@ -77,7 +76,7 @@ func (sb scheduleBuilder) Call(callback ScheduleCallback) scheduleBuilderCall {
 
 // At takes a string in 24hr format time like "15:30".
 func (sb scheduleBuilderCall) At(s string) scheduleBuilderEnd {
-	t := parse.ParseTime(s)
+	t := internal.ParseTime(s)
 	sb.schedule.hour = t.Hour()
 	sb.schedule.minute = t.Minute()
 	return scheduleBuilderEnd(sb)