goa_model_gen 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7688fbd0deceb1a0e7c2bcf7db894bae0a8fcb02c391e00c34dda9760f525601
-  data.tar.gz: 646ff959fe0cce1b7256d7bf7de046aebed82a4e030168429a005b8e32c48658
+  metadata.gz: 128844e0701ac2c0ccbb8931770e8778ce28527c7c4dca2948d3fb647b33073d
+  data.tar.gz: 6b03045e22675b21b93762927c3551e0c43e5711ce9aa9f48e64a92bcbffa145
 SHA512:
-  metadata.gz: 47eafcee348fa1a47b3aada4540f49bdcca3f6a8e6ccd45ecee2613dceeddb676981dbebf31b8656da30a08592962df53514d726258d02e898e19af10fa72d55
-  data.tar.gz: 99ebfd800233dadca64e4d292efd15a6947c6a6bbf59f2a379ea01ad51df59da77d37dce3f0d24bf5d0cc1395338face2ca987fc893ab7619662135447872302
+  metadata.gz: d1a948144492a1ea82cae9bd2afb709a89c29b8cf2ed7286385eeef43e4e7dd5259ed3b153656d14f39429ea7cb53552b0fe4477a26c2731aaf5ed007a549acd
+  data.tar.gz: 5044445888128712fd8419cb4487308d86d6d1e4abfe77d1cdc342c9048877fa20d2160dd4cb71041ea2965b3786a1927fcb8218546d4f577204fe142cf0cc56

data/lib/goa_model_gen/cli.rb

@@ -1,11 +1,16 @@
+# coding: utf-8
 require "goa_model_gen"
 
+require 'json'
+
+require "active_support/core_ext/string"
 require "thor"
 
 require "goa_model_gen/logger"
 require "goa_model_gen/config"
 require "goa_model_gen/loader"
 require "goa_model_gen/generator"
+require "goa_model_gen/go_struct"
 
 module GoaModelGen
   class Cli < Thor
@@ -61,17 +66,32 @@ module GoaModelGen
       end
     end
 
-    desc "converter FILE1...", "Generate converter files from definition files and swagger.yaml"
-    def converter(*paths)
+    desc "structs_gen", "Generate go source files to generate structs.json"
+    def structs_gen
+      setup
+      new_generator.process({
+        "templates/structs_base.go.erb" => File.join(cfg.structs_gen_dir, "structs.go"),
+        "templates/structs_main.go.erb" => File.join(cfg.structs_gen_dir, "main.go"),
+      })
+    end
+
+    desc "converter FILE", "Generate converter files from definition file structs.json"
+    def converter(path)
       setup
       new_generator.process({
         "templates/converter_base.go.erb" => File.join(cfg.converter_dir, "base.go"),
       })
-      load_types_for(paths) do |source_file|
-        next if source_file.types.all?{|t| !t.payload && !t.media_type}
-        new_generator.tap{|g| g.source_file = source_file }.process({
-          'templates/converter.go.erb' => File.join(cfg.converter_dir, source_file.basename, "conv.go"),
-        })
+      structs = JSON.parse(File.read(path))
+      (structs['model'] || []).each do |mt|
+        m = GoStruct.new(mt)
+        pt = (structs['payload'] || []).detect{|t| t["Name"] == "#{m.name}Payload" }
+        rt = (structs['result'] || []).detect{|t| t["Name"] == m.name }
+        variables = {
+          model: m,
+          payload: pt ? GoStruct.new(pt) : nil,
+          result: rt ? GoStruct.new(rt) : nil
+        }
+        new_generator.run('templates/converter.go.erb', File.join(cfg.converter_dir, m.name.underscore, "conv.go"), variables)
       end
     end
 

data/lib/goa_model_gen/config.rb

@@ -16,6 +16,7 @@ module GoaModelGen
       model_dir
       store_dir
       converter_dir
+      structs_gen_dir
       validator_path
       generator_version_comment
     ].freeze
@@ -29,6 +30,7 @@ module GoaModelGen
       @model_dir      ||= "./model"
       @store_dir      ||= "./stores"
       @converter_dir  ||= "./converters"
+      @structs_gen_dir ||= "./cmd/structs"
       @validator_path ||= "gopkg.in/go-playground/validator.v9"
       @generator_version_comment ||= false
       self

data/lib/goa_model_gen/generator.rb

@@ -65,13 +65,18 @@ module GoaModelGen
       "datastore" => "google.golang.org/appengine/datastore",
     }
 
-    def generate(template_path)
+    def generate(template_path, variables = {})
       clear_dependencies
       user_editable(value: false)
 
       abs_path = File.expand_path('../' + template_path, __FILE__)
       erb = ERB.new(File.read(abs_path), nil, "-")
       erb.filename = abs_path
+
+      variables.each do |key, val|
+        define_singleton_method(key){ val }
+      end
+
       body = erb.result(binding).strip
 
       raise "No package given in #{abs_path}" if package.blank?
@@ -97,10 +102,10 @@ module GoaModelGen
       clear: "\e[0m",
     }
 
-    def run(template_path, output_path)
-      content = generate(template_path)
+    def run(template_path, output_path, variables = {}, &block)
+      content = generate(template_path, variables, &block)
 
-      if user_editable? && keep_editable
+      if user_editable? && keep_editable && File.exist?(output_path)
         $stderr.puts("%sKEEP%s %s" % [COLORS[:blue], COLORS[:clear], output_path])
         return
       end

data/lib/goa_model_gen/go_struct.rb

@@ -0,0 +1,68 @@
+# coding: utf-8
+require 'goa_model_gen'
+
+require "active_support/core_ext/string"
+
+module GoaModelGen
+  class GoStruct
+    attr_reader :name, :pkg_path, :size, :fields
+    def initialize(d)
+      @name = d['Name']
+      @pkg_path = d['PkgPath']
+      @size = d['Size']
+      @fields = (d['Fields'] || []).map do |f|
+        GoStructField.new(f)
+      end
+    end
+  end
+
+  class GoStructField
+    attr_reader :name, :type, :anonymous, :tags
+    def initialize(d)
+      @name = d['Name']
+      @anonymous = d['Anonymous']
+      @type = GoStructFieldType.new(d['Type'])
+      @tags = d['Tag'] || {}
+    end
+  end
+
+  class GoStructFieldType
+    attr_reader :name, :kinds, :pkg_path, :representation
+    def initialize(d)
+      @name = d['Name']
+      @kinds = d['Kinds']
+      @pkg_path = d['PkgPath']
+      @representation = d['Representation']
+    end
+
+    def ==(other)
+      (pkg_path == other.pkg_path) &&
+        (name == other.name) &&
+        (kinds == other.kinds) &&
+        (representation == other.representation)
+    end
+    alias_method :assignable_with?, :==
+
+    def pointer_of?(other)
+      (pkg_path == other.pkg_path) &&
+        (name == other.name) &&
+        (kinds == (other.kinds + ['ptr']))
+    end
+    def pointee_of?(other)
+      other.pointer_of?(self)
+    end
+
+    def needs_error_to_convert_to?(other)
+      return false if other.name == 'string'
+      return true if name == 'string'
+      return false
+    end
+
+    def method_part_name
+      parts =
+        kinds.first == 'struct' ?
+          [name] + kinds[1..-1] : kinds
+      parts.map(&:camelize).join
+    end
+  end
+end

data/lib/goa_model_gen/templates/converter.go.erb

@@ -7,96 +7,110 @@ def method_calling_exp(m, argument)
   end
 end
 -%>
-<%- package source_file.basename -%>
+<%- package model.name.underscore -%>
 
-<%- source_file.types.select(&:gen_converter?).each do |type| -%>
-<%-   if type.payload -%>
+<%- if payload-%>
 <%-
-        import "#{config.go_package}/converters"
-        import :gen, "#{config.go_package}/gen/#{type.name.underscore}"
-        import "#{config.go_package}/model"
+    	import "#{config.go_package}/converters"
+			import :gen, "#{config.go_package}/gen/#{model.name.underscore}"
+			import "#{config.go_package}/model"
 -%>
-func <%= type.name %>PayloadToModel(payload *gen.<%= type.payload_name %>) (*model.<%= type.name %>, error) {
-	model := &model.<%= type.name %>{}
-	if err := CopyFrom<%= type.name %>PayloadToModel(payload, model); err != nil {
+func <%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>) (*model.<%= model.name %>, error) {
+	m := &model.<%= model.name %>{}
+	if err := CopyFrom<%= model.name %>PayloadToModel(payload, m); err != nil {
 		return nil, err
 	}
-	return model, nil
+	return m, nil
 }
 
-func CopyFrom<%= type.name %>PayloadToModel(payload *gen.<%= type.payload_name %>, model *model.<%= type.name %>) error {
+func CopyFrom<%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>, m *model.<%= model.name %>) error {
   if payload == nil {
     return converters.NoPayloadGiven
   }
-  if model == nil {
+  if m == nil {
     return converters.NoModelGiven
   }
 
 <%-
-      type.fields_including_id.each do |f|
-      pf = type.payload.fields.detect{|pf| pf.name == f.swagger_name }
-      if pf.nil?
+      assigned_field_names = []
+      model.fields.each do |mf|
+        pf_name = (mf.tags['payload'] || mf.name).downcase
+        pf = payload.fields.detect{|pf| pf.name.downcase == pf_name }
+        assigned_field_names.push(pf.name) if pf
+        if pf.nil?
 -%>
-  // <%= f.name %> not found in payload fields
-<%-
-      else
-        simple, with_error, method_name = f.payload_assignment_options(pf)
--%>
-<%-     if simple -%>
-  model.<%= f.name %> = payload.<%= f.goa_name %>
-<%-     elsif !with_error -%>
-  model.<%= f.name %> = converters.<%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>
+  // <%= mf.name %> not found in <%= payload.name %> fields
+<%-     elsif mf.type.assignable_with?(pf.type) -%>
+  m.<%= mf.name %> = payload.<%= pf.name %>
+<%-     elsif mf.type.pointee_of?(pf.type) -%>
+  m.<%= mf.name %> = *payload.<%= pf.name %>
+<%-     elsif !pf.type.needs_error_to_convert_to?(mf.type) -%>
+  m.<%= mf.name %> = converters.<%= pf.type.method_part_name %>To<%= mf.type.method_part_name %>(payload.<%= pf.name %>)
 <%-     else -%>
-  if v, err := converters.<%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>; err != nil {
+  if v, err := converters.<%= pf.type.method_part_name %>To<%= mf.type.method_part_name %>(payload.<%= pf.name %>); err != nil {
     return err
   } else {
-    model.<%= f.name %> = v
+    m.<%= mf.name %> = v
   }
 <%-     end -%>
 <%-   end -%>
-<%- end -%>
-<%- type.payload.field_diffs(type.fields_including_id.map{|f| f.swagger_name}).each do |pf| -%>
-  // No model field for payload field "<%= pf.name %>"
-<%- end -%>
+<%-
+      payload.fields.each do |pf|
+        unless assigned_field_names.include?(pf.name)
+-%>
+  // No model field in <%= model.name %> for payload field "<%= pf.name %>"
+<%-
+        end
+      end
+-%>
   return nil
 }
+<%- end -%>
 
-<%-   end -%>
-<%-   if type.media_type -%>
-func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*gen.<%= type.media_type_name_for_go %>, error) {
-  if model == nil {
+<%- if result -%>
+<%-
+    	import "#{config.go_package}/converters"
+			import :gen, "#{config.go_package}/gen/#{model.name.underscore}"
+			import "#{config.go_package}/model"
+-%>
+func <%= model.name %>ModelToResult(m *model.<%= model.name %>) (*gen.<%= result.name %>, error) {
+  if m == nil {
     return nil, converters.NoModelGiven
   }
-  r := &gen.<%= type.media_type_name_for_go %>{}
+  r := &gen.<%= result.name %>{}
 
 <%-
-      type.fields_including_id.each do |f|
-        mf = type.media_type.fields.detect{|mf| f.swagger_name == mf.name }
-        if mf.nil?
+      assigned_field_names = []
+      model.fields.each do |mf|
+        rf_name = (mf.tags['result'] || mf.name).downcase
+        rf = result.fields.detect{|rf| rf.name.downcase == rf_name }
+        assigned_field_names.push(rf.name) if rf
+        if rf.nil?
 -%>
-  // <%= f.name %> not found for media type field
-<%-
-        else
-          simple, with_error, method_name = f.media_type_assignment_options(mf)
--%>
-<%-       if simple -%>
-  r.<%= f.goa_name %> = model.<%= f.name %>
-<%-       elsif !with_error -%>
-  r.<%= f.goa_name %> = converters.<%= method_calling_exp(method_name, "model.#{f.name}") %>
-<%-       else -%>
-  if val, err := converters.<%= method_calling_exp(method_name, "model.#{f.name}") %>; err != nil {
-     return nil, err
+  // <%= mf.name %> not found in <%= result.name %> fields
+<%-     elsif rf.type.assignable_with?(mf.type) -%>
+  r.<%= rf.name %> = m.<%= mf.name %>
+<%-     elsif rf.type.pointer_of?(mf.type) -%>
+  r.<%= rf.name %> = &m.<%= mf.name %>
+<%-     elsif !mf.type.needs_error_to_convert_to?(rf.type) -%>
+  r.<%= rf.name %> = converters.<%= mf.type.method_part_name %>To<%= rf.type.method_part_name %>(m.<%= mf.name %>)
+<%-     else -%>
+  if v, err := converters.<%= mf.type.method_part_name %>To<%= rf.type.method_part_name %>(m.<%= mf.name %>); err != nil {
+    return err
   } else {
-    r.<%= f.goa_name %> = val
+    r.<%= rf.name %> = v
   }
-<%-       end
-        end -%>
-<%-   end -%>
-<%-   type.media_type.field_diffs(type.fields_including_id.map{|f| f.swagger_name}).each do |mf| -%>
-    // No model field for media type field "<%= mf.name %>"
+<%-     end -%>
 <%-   end -%>
+<%-
+      result.fields.each do |rf|
+        unless assigned_field_names.include?(rf.name)
+-%>
+    // No model field in <%= model.name %> for result field "<%= rf.name %>"
+<%-
+        end
+      end
+-%>
   return r, nil
 }
-
-<%-   end -%>
 <%- end -%>

data/lib/goa_model_gen/templates/structs_base.go.erb

@@ -0,0 +1,165 @@
+<%- package 'main' -%>
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"reflect"
+	"regexp"
+)
+
+func process(objectMap map[string][]interface{}, ptn *regexp.Regexp) {
+	res := map[string][]*DataType{}
+
+	for key, objects := range objectMap {
+		types := []reflect.Type{}
+		for _, obj := range objects {
+			types = append(types, reflect.TypeOf(obj))
+		}
+
+		types = digTypes(types)
+
+		dataTypes := []*DataType{}
+		for _, t := range types {
+			dt := newDataType(t)
+			if ptn.MatchString(dt.PkgPath) {
+				dataTypes = append(dataTypes, dt)
+			}
+		}
+
+		res[key] = dataTypes
+	}
+
+	b, err := json.MarshalIndent(res, "", "  ")
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to json.MarshalIndent because of %v\n", err)
+		return
+	}
+	_, err = os.Stdout.Write(b)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to write because of %v\n", err)
+		return
+	}
+}
+
+type DataFieldType struct {
+	PkgPath        string   `json:"PkgPath,omitempty"`
+	Name           string   `json:"Name,omitempty"`
+	Kinds          []string `json:"Kinds,omitempty"`
+	Representation string
+}
+
+type DataField struct {
+	Name      string
+	Type      *DataFieldType
+	RawTag    string            `json:"RawTag,omitempty"`
+	Tag       map[string]string `json:"Tag,omitempty"`
+	Anonymous bool
+}
+
+type DataType struct {
+	Name    string
+	PkgPath string
+	Size    uintptr
+	Fields  []*DataField
+}
+
+func digTypes(types []reflect.Type) []reflect.Type {
+	m := map[string]reflect.Type{}
+	for _, t := range types {
+		key := t.PkgPath() + "." + t.Name()
+		m[key] = t
+	}
+
+	for _, t := range types {
+		digType(m, t)
+	}
+
+	r := []reflect.Type{}
+	for _, t := range m {
+		r = append(r, t)
+	}
+	return r
+}
+
+func digType(m map[string]reflect.Type, t reflect.Type) {
+	switch t.Kind() {
+	case reflect.Struct:
+		digStruct(m, t)
+	case reflect.Array, reflect.Chan, reflect.Map, reflect.Ptr, reflect.Slice:
+		digType(m, t.Elem())
+	}
+}
+
+func digStruct(m map[string]reflect.Type, t reflect.Type) {
+	numField := t.NumField()
+	for i := 0; i < numField; i++ {
+		f := t.Field(i)
+		ft := f.Type
+		if ft.PkgPath() != "" {
+			key := ft.PkgPath() + "." + ft.Name()
+			_, ok := m[key]
+			if !ok {
+				m[key] = ft
+				switch ft.Kind() {
+				case reflect.Struct:
+					digType(m, ft)
+				}
+			}
+		}
+	}
+}
+
+func newDataType(t reflect.Type) *DataType {
+	r := &DataType{
+		Name:    t.Name(),
+		PkgPath: t.PkgPath(),
+		Size:    t.Size(),
+	}
+	if t.Kind() != reflect.Struct {
+		return r
+	}
+
+	fields := []*DataField{}
+	numField := t.NumField()
+	for i := 0; i < numField; i++ {
+		f := t.Field(i)
+		ft := f.Type
+		fields = append(fields, &DataField{
+			Name:      f.Name,
+			Anonymous: f.Anonymous,
+			Type:      DataFieldTypeFromType(ft),
+			Tag:       parseTag(string(f.Tag)),
+			RawTag:    string(f.Tag),
+		})
+	}
+	r.Fields = fields
+	return r
+}
+
+func DataFieldTypeFromType(t reflect.Type) *DataFieldType {
+	switch t.Kind() {
+	case reflect.Array, reflect.Chan, reflect.Map, reflect.Ptr, reflect.Slice:
+		r := DataFieldTypeFromType(t.Elem())
+		r.Kinds = append(r.Kinds, t.Kind().String())
+		return r
+	default:
+		return &DataFieldType{
+			PkgPath:        t.PkgPath(),
+			Name:           t.Name(),
+			Kinds:          []string{t.Kind().String()},
+			Representation: t.String(),
+		}
+	}
+}
+
+var TagParserRE = regexp.MustCompile(`\s*([^:\s]+?):"(.+?)"`)
+
+func parseTag(src string) map[string]string {
+	parsed := TagParserRE.FindAllStringSubmatch(src, -1)
+	r := map[string]string{}
+	for _, parts := range parsed {
+		r[parts[1]] = parts[2]
+	}
+	return r
+}

data/lib/goa_model_gen/templates/structs_main.go.erb

@@ -0,0 +1,28 @@
+<%-
+package 'main'
+
+user_editable
+
+import "regexp"
+-%>
+
+// Usage
+// $ go run <%= config.structs_gen_dir %>/*.go
+
+func main() {
+	ptn := regexp.MustCompile(`\A<%= config.go_package  %>`)
+
+	objectMap := map[string][]interface{}{
+		"model": []interface{}{
+			// model.User{},
+		},
+		"payload": []interface{}{
+			// user.UserPayload{},
+		},
+		"result": []interface{}{
+			// user.User{},
+		},
+	}
+
+	process(objectMap, ptn)
+}

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -147,6 +147,7 @@ files:
 - lib/goa_model_gen/config.rb
 - lib/goa_model_gen/field.rb
 - lib/goa_model_gen/generator.rb
+- lib/goa_model_gen/go_struct.rb
 - lib/goa_model_gen/goa.rb
 - lib/goa_model_gen/golang_helper.rb
 - lib/goa_model_gen/loader.rb
@@ -160,6 +161,8 @@ files:
 - lib/goa_model_gen/templates/model_validation.go.erb
 - lib/goa_model_gen/templates/store.go.erb
 - lib/goa_model_gen/templates/store_validation.go.erb
+- lib/goa_model_gen/templates/structs_base.go.erb
+- lib/goa_model_gen/templates/structs_main.go.erb
 - lib/goa_model_gen/templates/validator.go.erb
 - lib/goa_model_gen/type.rb
 - lib/goa_model_gen/version.rb