lhj-tools 0.1.77 → 0.1.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d672d1cf1227b28c98ba5103e9ee855726948df87cd020304dcfd6e8a6ceee63
-  data.tar.gz: 2be43594360da9049569d7c5e1d2f60e68b4a837dce9d4c743f5d326dc2d0a15
+  metadata.gz: 1ec339600a7bccdf6e71366bf4c0d153544ddeae42cdf867d197d4320129492c
+  data.tar.gz: 2914782da786e0dcd1e6ecb71e0088669b15e8d7e64bb5deb9a478faa563785d
 SHA512:
-  metadata.gz: '039225bc897b4c4173d42291bd5a008ba0e4d7804d1fe3607357d28d9b10f030cbf9fdbbb60f12734b09c1ead843ed00481fb3e3e3dc3f52d64d7031e7f91cb1'
-  data.tar.gz: e39146285cceb19741b7bafead5d63dd422d05f0371838aef011ecf4417c12aee3041d6cd42f1317223b2a2c28ed42ac6232559c70662014c1bd59e71c7ad2aa
+  metadata.gz: 846675816476a4f97aeb78818d5ccb6ec1173e8654fea452f31af652b17ddcdb87650cd3192b732908a4e2993a760959e077973ce38fdb8c3b0ded745b5d29c9
+  data.tar.gz: e745f2ce809027cf10f461a385089de93f60e8245cb1f960eb8b519245e42a73e72103c99037bcb0a09255135b0c4eda804173d221ac26b4283ede005a31c527

data/lib/lhj/command/yapi.rb

@@ -64,13 +64,15 @@ module Lhj
         project_id = res_body['data']['project_id']
         project_info = get_project_info(project_id)
         # 1.print request result
-        print_res_body_model(res_body)
+        res_models = print_res_body_model(res_body)
         # 2.print request json body
-        print_req_body_model(res_body) if res_body['data']['req_body_is_json_schema']
+        req_models = print_req_body_model(res_body) if res_body['data']['req_body_is_json_schema']
         # 3.print request param
         print_req_query(res_body['data']) unless res_body['data']['req_body_is_json_schema']
         # 4.print request method
         service_code = print_http_method(res_body['data'], project_info)
+        # print request mock data
+        print_mock_request_data(req_models) unless req_models.empty?
         # 5.save to file
         file_map = save_to_file(service_code) if @save
         # 6.push to git
@@ -176,6 +178,7 @@ module Lhj
         @config_model_name = config['model_name']
         @config_robot_url = config['dingtalk']
         @type_trans = config['type_trans']
+        @config_property_mapper = config['property_mapper']
       end
 
       def api_id
@@ -202,6 +205,10 @@ module Lhj
         @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
       end
 
+      def property_mapper
+        @config_property_mapper || { 'id' => 'gid' }
+      end
+
       def get_interface_api_model
         uri = URI.parse(interface_url_str)
         req = Net::HTTP::Get.new(uri)
@@ -232,7 +239,7 @@ module Lhj
 
         puts "\n<===============打印返回数据模型-Begin=====================>\n".green
         models = []
-        handle_model(res_body) do |model|
+        handle_model(res_body, :res) do |model|
           models << model
         end
         case @language
@@ -243,6 +250,7 @@ module Lhj
           print_models_for_java(models)
         end
         puts "\n<===============打印返回数据模型-End=====================>\n".green
+        models
       end
 
       def print_req_body_model(res_json)
@@ -251,7 +259,7 @@ module Lhj
 
         puts "\n<===============打印请求模型-Begin=====================>\n".green
         models = []
-        handle_model(req_body) do |model|
+        handle_model(req_body, :req) do |model|
           models << model
         end
         case @language
@@ -262,6 +270,7 @@ module Lhj
           print_models_for_java(models)
         end
         puts "\n<===============打印请求模型-End=====================>\n".green
+        models
       end
 
       def fetch_res_boy(res_json)
@@ -299,7 +308,7 @@ module Lhj
         end
       end
 
-      def handle_model(model, &block)
+      def handle_model(model, type, &block)
         p_type = model['type']
         p_name = model['name']
         p_properties = model['properties']
@@ -313,12 +322,12 @@ module Lhj
             c_model = { key: k, type: c_type, description: v['description'], default: '' }
             if v['type'].eql?('object') || v['type'].eql?('array')
               o = v['items'] || v
-              o['name'] = gen_model_name(k)
+              o['name'] = gen_model_name(k, type)
               if v['type'].eql?('array') && v['items']['type'].eql?('string')
                 c_model[:type_name] = 'NSString'
               else
                 c_model[:type_name] = o['name']
-                handle_model(o, &block)
+                handle_model(o, type, &block)
               end
             end
             properties << c_model
@@ -328,7 +337,7 @@ module Lhj
         when 'array'
           t = model['items']
           t['name'] = p_name
-          handle_model(t, &block)
+          handle_model(t, type, &block)
         end
       end
 
@@ -365,6 +374,15 @@ module Lhj
             puts_m "  return @{#{str}};"
             puts_m '}'
           end
+          properties = model[:properties].filter { |p| property_mapper.keys.include?(p[:key]) }.map do |p|
+            "@\"#{property_mapper[p[:key]]}\": @\"#{p[:key]}\""
+          end
+          property_mapper_str = properties.join(', ') if properties.count.positive?
+          if property_mapper_str&.length&.positive?
+            puts_m '+ (NSDictionary<NSString *, id> *)modelCustomPropertyMapper {'
+            puts_m "  return @{#{property_mapper_str}};"
+            puts_m '}'
+          end
           puts_m "@end\n"
           puts "\n\n"
         end
@@ -372,6 +390,7 @@ module Lhj
 
       def print_model(m)
         key = m[:key]
+        key = property_mapper[key] if property_mapper.keys.include?(key)
         type_name = m[:type_name]
         type = m[:type]
         des = m[:description] || ''
@@ -491,6 +510,37 @@ module Lhj
         end
 
       end
+
+      def print_mock_request_data(req_models)
+        puts "\n<===============打印Mock Data-Begin=====================>\n".green
+        req_models.each do |model|
+          model_name = model[:name] || ''
+          model_properties = model[:properties]
+          puts "#{model_name} *mock = [[#{model_name} alloc] init];"
+          model_properties.each do |m|
+            puts "/// #{m[:description]}"
+            type = m[:type]
+            case type
+            when 'integer'
+              puts "mock.#{m[:key]} = 0;"
+            when 'number'
+              puts "mock.#{m[:key]} = 0;"
+            when 'float'
+              puts "mock.#{m[:key]} = 0;"
+            when 'double'
+              puts "mock.#{m[:key]} = 0;"
+            when 'object'
+              puts "mock.#{m[:key]} = @{};"
+            when 'array'
+              puts "mock.#{m[:key]} = @[];"
+            else
+              puts "mock.#{m[:key]} = @\"\";"
+            end
+          end
+          puts "\n\n"
+        end
+        puts "\n<===============打印Mock Data-End=====================>\n".green
+      end
     end
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.77"
+    VERSION = "0.1.80"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.77
+  version: 0.1.80
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj