Generate streams package to multiple files

BenLubar-PR · Jun 13, 2018 · b1609bd · b1609bd
1 parent f155f0a
commit b1609bd
Show file tree

Hide file tree

Showing 59 changed files with 125,460 additions and 124,993 deletions.
diff --git a/streams/gen_accept.go b/streams/gen_accept.go
diff --git a/streams/gen_activity.go b/streams/gen_activity.go
diff --git a/streams/gen_add.go b/streams/gen_add.go
diff --git a/streams/gen_announce.go b/streams/gen_announce.go
diff --git a/streams/gen_application.go b/streams/gen_application.go
diff --git a/streams/gen_arrive.go b/streams/gen_arrive.go
diff --git a/streams/gen_article.go b/streams/gen_article.go
diff --git a/streams/gen_audio.go b/streams/gen_audio.go
diff --git a/streams/gen_block.go b/streams/gen_block.go
diff --git a/streams/gen_collection.go b/streams/gen_collection.go
diff --git a/streams/gen_collectionpage.go b/streams/gen_collectionpage.go
diff --git a/streams/gen_create.go b/streams/gen_create.go
diff --git a/streams/gen_delete.go b/streams/gen_delete.go
diff --git a/streams/gen_dislike.go b/streams/gen_dislike.go
diff --git a/streams/gen_document.go b/streams/gen_document.go
diff --git a/streams/gen_event.go b/streams/gen_event.go
diff --git a/streams/gen_flag.go b/streams/gen_flag.go
diff --git a/streams/gen_follow.go b/streams/gen_follow.go
diff --git a/streams/gen_group.go b/streams/gen_group.go
diff --git a/streams/gen_ignore.go b/streams/gen_ignore.go
diff --git a/streams/gen_image.go b/streams/gen_image.go
diff --git a/streams/gen_intransitiveactivity.go b/streams/gen_intransitiveactivity.go
diff --git a/streams/gen_invite.go b/streams/gen_invite.go
diff --git a/streams/gen_join.go b/streams/gen_join.go
diff --git a/streams/gen_leave.go b/streams/gen_leave.go
diff --git a/streams/gen_like.go b/streams/gen_like.go
diff --git a/streams/gen_link.go b/streams/gen_link.go
diff --git a/streams/gen_listen.go b/streams/gen_listen.go
diff --git a/streams/gen_mention.go b/streams/gen_mention.go
diff --git a/streams/gen_move.go b/streams/gen_move.go
diff --git a/streams/gen_note.go b/streams/gen_note.go
diff --git a/streams/gen_object.go b/streams/gen_object.go
diff --git a/streams/gen_offer.go b/streams/gen_offer.go
diff --git a/streams/gen_orderedcollection.go b/streams/gen_orderedcollection.go
diff --git a/streams/gen_orderedcollectionpage.go b/streams/gen_orderedcollectionpage.go
diff --git a/streams/gen_organization.go b/streams/gen_organization.go
diff --git a/streams/gen_page.go b/streams/gen_page.go
diff --git a/streams/gen_person.go b/streams/gen_person.go
diff --git a/streams/gen_place.go b/streams/gen_place.go
diff --git a/streams/gen_profile.go b/streams/gen_profile.go
diff --git a/streams/gen_question.go b/streams/gen_question.go
diff --git a/streams/gen_read.go b/streams/gen_read.go
diff --git a/streams/gen_reject.go b/streams/gen_reject.go
diff --git a/streams/gen_relationship.go b/streams/gen_relationship.go
diff --git a/streams/gen_remove.go b/streams/gen_remove.go
diff --git a/streams/gen_service.go b/streams/gen_service.go
diff --git a/streams/gen_streams.go b/streams/gen_streams.go
diff --git a/streams/gen_tentativeaccept.go b/streams/gen_tentativeaccept.go
diff --git a/streams/gen_tentativereject.go b/streams/gen_tentativereject.go
diff --git a/streams/gen_tombstone.go b/streams/gen_tombstone.go
diff --git a/streams/gen_travel.go b/streams/gen_travel.go
diff --git a/streams/gen_undo.go b/streams/gen_undo.go
diff --git a/streams/gen_update.go b/streams/gen_update.go
diff --git a/streams/gen_video.go b/streams/gen_video.go
diff --git a/streams/gen_view.go b/streams/gen_view.go
diff --git a/streams/streams.go b/streams/streams.go
diff --git a/tools/streams/gen/as.go b/tools/streams/gen/as.go
@@ -23,22 +23,51 @@ const (
 	UnknownLanguage = "und"
 )
 
-func GenerateConvenienceTypes(types []*defs.Type) ([]byte, error) {
+type File struct {
+	Name    string
+	Content []byte
+}
+
+func GenerateConvenienceTypes(types []*defs.Type) (f []*File, err error) {
 	p := generatePackageDefinition()
 	p.Defs = append(p.Defs, generateResolver(types))
+
+	var b []byte
+	b, err = format.Source([]byte(p.Generate()))
+	f = append(f, &File{
+		Name:    "gen_streams.go",
+		Content: b,
+	})
 	for _, t := range types {
-		funcs, defs := generateDefinitions(t)
+		p := &defs.PackageDef{
+			Name: "streams",
+		}
+		funcs, defs, imports := generateDefinitions(t)
+		imports["github.com/go-fed/activity/vocab"] = true
+		for i, _ := range imports {
+			p.Imports = append(p.Imports, i)
+		}
 		p.F = append(p.F, funcs...)
 		p.Defs = append(p.Defs, defs...)
+
+		var b []byte
+		b, err = format.Source([]byte(p.Generate()))
+		if err != nil {
+			return
+		}
+		f = append(f, &File{
+			Name:    fmt.Sprintf("gen_%s.go", strings.ToLower(t.Name)),
+			Content: b,
+		})
 	}
-	return format.Source([]byte(p.Generate()))
+	return
 }
 
 func generatePackageDefinition() *defs.PackageDef {
 	return &defs.PackageDef{
 		Name:    "streams",
 		Comment: "Package streams is a convenience wrapper around the raw ActivityStream vocabulary. This package is code-generated to permit more powerful expressions and manipulations of the ActivityStreams Vocabulary types. This package also does not permit use of 'unknown' properties, or those that are outside of the ActivityStream Vocabulary specification. However, it still correctly propagates them when repeatedly re-and-de-serialized. Custom extensions of the vocabulary are supported by modifying the data definitions in the generation tool and rerunning it. Do not modify this package directly.",
-		Imports: []string{"fmt", "github.com/go-fed/activity/vocab", "net/url", "time"},
+		Imports: []string{"fmt", "github.com/go-fed/activity/vocab"},
 		Raw: `type Resolution int
 
 const (
@@ -209,7 +238,8 @@ func generateResolver(types []*defs.Type) *defs.StructDef {
 	return this
 }
 
-func generateDefinitions(t *defs.Type) (fd []*defs.FunctionDef, sd []*defs.StructDef) {
+func generateDefinitions(t *defs.Type) (fd []*defs.FunctionDef, sd []*defs.StructDef, imports map[string]bool) {
+	imports = make(map[string]bool)
 	this := &defs.StructDef{
 		Typename: t.Name,
 		Comment:  t.Notes + convenienceComment,
@@ -242,6 +272,13 @@ func generateDefinitions(t *defs.Type) (fd []*defs.FunctionDef, sd []*defs.Struc
 	}...)
 	for _, p := range t.GetProperties() {
 		generatePropertyHelpers(p, this)
+		for _, r := range p.Range {
+			if r.V != nil {
+				for _, i := range r.V.Imports {
+					imports[i] = true
+				}
+			}
+		}
 	}
 	return
 }

diff --git a/tools/streams/main.go b/tools/streams/main.go
@@ -8,12 +8,14 @@ import (
 
 func main() {
 	allTypes := append(defs.AllCoreTypes, defs.AllExtendedTypes...)
-	b, err := gen.GenerateConvenienceTypes(allTypes)
+	files, err := gen.GenerateConvenienceTypes(allTypes)
 	if err != nil {
 		panic(err)
 	}
-	err = ioutil.WriteFile("streams.go", b, 0666)
-	if err != nil {
-		panic(err)
+	for _, f := range files {
+		err = ioutil.WriteFile(f.Name, f.Content, 0666)
+		if err != nil {
+			panic(err)
+		}
 	}
 }
diff --git a/tools/streams/streams b/tools/streams/streams