goa_model_gen 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207c463abc5bf1e3b04bed480d759deb7bde42e54a8470d673ed90f3c48d3989
-  data.tar.gz: 90bfe7129e9b8bf5bf1dd0f902d091885d1e9adb09b49a4070533d459f5bd476
+  metadata.gz: 35b0d93af5777f1460e792e2b1aafb7553d0bd054558a411668687d825de5e9d
+  data.tar.gz: 8b1ec15e0b26806474ca3005f9951529434f680e0e22b243c04d9d8467215d9f
 SHA512:
-  metadata.gz: 47235bac3a32610001c1f2cb8c1389f5e5c66471d0cb5f6f6993ab6a7658580bfdc9d288f65ad8f6c0c159925fcd53ed65f01b56b19962f10c50a74d6d76601c
-  data.tar.gz: 41d81eb3469f45625b1bdd60dbc963f1f7b26534dc3f6dcd83ec3f5e746104508f003b7d71a9a2e8544c5217e59a5ee92a36bab93f3a43331ca91d896acfafd6
+  metadata.gz: b68b7d2d1488af468dc14a78ab150d22becfcacd852aa8ec87fbf6b40b107bcaa40688154205ff3a727a6d87a7536cb3f39ca492b612188782c7ac6debd780d6
+  data.tar.gz: bb0dcd08ac16663d0cb3f54dfee59ed5e52d3a0a4e75872fdf2f9665e573a774d2d70ffb2de6fabd117ac337bc1eb40e73735764ca3701aa5edce74c6540bff2

data/lib/goa_model_gen/cli.rb

@@ -88,9 +88,12 @@ module GoaModelGen
         pt = (structs['payload'] || []).detect{|t| t["Name"] == "#{m.name}Payload" }
         rt = (structs['result'] || []).detect{|t| t["Name"] == m.name }
         variables = {
+          models: (structs['model'] || []),
+          payloads: (structs['payload'] || []),
+          results: (structs['result'] || []),
           model: m,
           payload: pt ? GoStruct.new(pt) : nil,
-          result: rt ? GoStruct.new(rt) : 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

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

@@ -6,13 +6,16 @@ def method_calling_exp(m, argument)
     "#{m}(#{argument})"
   end
 end
+
+gen_package = "#{config.go_package}/gen/#{model.name.underscore}"
+
 -%>
 <%- package model.name.underscore -%>
 
 <%- if payload-%>
 <%-
     	import "#{config.go_package}/converters"
-			import :gen, "#{config.go_package}/gen/#{model.name.underscore}"
+			import :gen, gen_package
 			import "#{config.go_package}/model"
 -%>
 func <%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>) (*model.<%= model.name %>, error) {
@@ -80,9 +83,36 @@ func CopyFrom<%= model.name %>PayloadToModel(payload *gen.<%= payload.name %>, m
 <%- if result -%>
 <%-
     	import "#{config.go_package}/converters"
-			import :gen, "#{config.go_package}/gen/#{model.name.underscore}"
+			import :gen, gen_package
 			import "#{config.go_package}/model"
+
+      indirect_types =
+        result.fields.map{|rf| rf.type.pkg_path == gen_package ? rf.type : nil }.
+        compact.uniq{|rft| "#{rft.pkg_path}.#{rft.name}" }
+      indirect_type_names = indirect_types.map(&:name)
+
+      indirect_types.each do |rft|
+        mt_hash = models.detect{|t| t['Name'] == rft.name} || raise("model not found for #{rft.name}")
+        rt_hash = results.detect{|rt| (rt['PkgPath'] == gen_package) && (rt['Name'] == rft.name)} || raise("#{gen_package}.#{rft.name} not found in structs")
+        mt = GoStruct.new(mt_hash)
+        rt = GoStruct.new(rt_hash)
 -%>
+func <%= rt.name %>ModelToResult(m *model.<%= rt.name %>) *gen.<%= rt.name %> {
+  return &gen.<%= rt.name %> {
+<%-
+        rt.fields.each do |rf|
+          mf = mt.fields.detect{|f| f.name == rf.name}
+          if mf && mf.type.assignable_with?(rf.type)
+-%>
+            <%= rf.name %>: m.<%= mf.name %>,
+<%-
+          end
+        end
+-%>
+  }
+}
+
+<%-   end -%>
 func <%= model.name %>ModelToResult(m *model.<%= model.name %>) (*gen.<%= result.name %>, error) {
   if m == nil {
     return nil, converters.NoModelGiven
@@ -103,6 +133,8 @@ func <%= model.name %>ModelToResult(m *model.<%= model.name %>) (*gen.<%= result
   r.<%= rf.name %> = m.<%= mf.name %>
 <%-     elsif rf.type.pointer_of?(mf.type) -%>
   r.<%= rf.name %> = &m.<%= mf.name %>
+<%-     elsif indirect_type_names.include?(rf.type.name) -%>
+  r.<%= rf.name %> = <%= rf.type.name %>ModelToResult(&m.<%= mf.name %>)
 <%-     elsif !mf.type.needs_error_to_convert_to?(rf.type) -%>
   r.<%= rf.name %> = <%= conv_pkg %>.<%= mf.type.method_part_name %>To<%= rf.type.method_part_name %>(m.<%= mf.name %>)
 <%-     else -%>

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor