Move other context types into context.go.

claat/types/context.go

@@ -5,6 +5,22 @@ import (
 	"time"
 )
 
+// Context is an export context.
+// It is defined in this package so that it can be used by both cli and a server.
+type Context struct {
+	Env     string       `json:"environment"`       // Current export environment
+	Format  string       `json:"format"`            // Output format, e.g. "html"
+	Prefix  string       `json:"prefix,omitempty"`  // Assets URL prefix for HTML-based formats
+	MainGA  string       `json:"mainga,omitempty"`  // Global Google Analytics ID
+	Updated *ContextTime `json:"updated,omitempty"` // Last update timestamp
+}
+
+// ContextMeta is a composition of export context and meta data.
+type ContextMeta struct {
+	Context
+	Meta
+}
+
 // ContextTime is a wrapper around time.Time so we can implement JSON marshalling.
 type ContextTime time.Time
 

claat/types/meta.go

@@ -41,22 +41,6 @@ type Meta struct {
 	URL string `json:"url"` // Legacy ID; TODO: remove
 }
 
-// Context is an export context.
-// It is defined in this package so that it can be used by both cli and a server.
-type Context struct {
-	Env     string       `json:"environment"`       // Current export environment
-	Format  string       `json:"format"`            // Output format, e.g. "html"
-	Prefix  string       `json:"prefix,omitempty"`  // Assets URL prefix for HTML-based formats
-	MainGA  string       `json:"mainga,omitempty"`  // Global Google Analytics ID
-	Updated *ContextTime `json:"updated,omitempty"` // Last update timestamp
-}
-
-// ContextMeta is a composition of export context and meta data.
-type ContextMeta struct {
-	Context
-	Meta
-}
-
 // Codelab is a top-level structure containing metadata and codelab steps.
 type Codelab struct {
 	Meta