lhj-tools 0.2.33 → 0.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6929383a9eb5b439ba528f359328c1794dea01bbe1716ba5a5561c30d70f22
-  data.tar.gz: f6be4caa44459d4fc44bd0d2b11eef4601ef53df196250f6b20b59dd240be3bb
+  metadata.gz: a969e4949684e7386beedaad3e9c82d4a7d9d57b1994a13e91e8a3a4c2ad63f0
+  data.tar.gz: b68482b147e53a378146c617e9be6f22ea72ac04172580c3466806744e5ee554
 SHA512:
-  metadata.gz: b27ba2d5508724e1b6c3325492cff864cf1243dea0a13d2abf325a0cd77fa8b9fbbdf690b8f1765625fe5ae8e708f62bc1e14e4df8b6e682d25cfc5c68b3df25
-  data.tar.gz: ab0e21f4c76d6bdc9c1c1bcdf1699b4b098044631259a943dd18b963a9210df26518fc767b93e9cd62a2682111ff72b902a72586cd220ac94d4b50e456f299f5
+  metadata.gz: 8490b672bc5fac962928c92fd70985bba2495383196e51f204a10722e9d28d5070f7ff987714e947849b6e3709ced32e6e8da8dc67078fb759c6e2f2425b4f78
+  data.tar.gz: 45cd089ea7a9e85c081971c8d14953ad59b81835834a963ab6c66ec9b3947f08361b7698c19c2e3a39ea1e574ac9f17e723cb8d9b5875ff189ab4da0abbdf8d7

data/lib/lhj/command/oss/del.rb

@@ -20,7 +20,7 @@ module Lhj
 
         def handle
           objects = Lhj::OSS::Helper.instance.list
-          obj_keys = objects.map(&:key)
+          obj_keys = objects.map(&:key).sort { |a, b| a <=> b }
           obj_keys.each_with_index { |k, i| puts "#{i}.#{k}".yellow }
           idx = @cli.ask('请选择删除的key: '.green)
           idx_arr = idx.split(',').map(&:strip).filter { |v| v.length.positive? }

data/lib/lhj/command/oss/download.rb

@@ -63,7 +63,7 @@ module Lhj
 
         def request_oss_keys
           objects = Lhj::OSS::Helper.instance.list
-          obj_keys = objects.map(&:key)
+          obj_keys = objects.map(&:key).sort { |a, b| a <=> b }
           obj_keys.each_with_index { |k, i| puts "#{i}.#{k}".yellow }
         end
 

data/lib/lhj/command/oss/list.rb

@@ -46,7 +46,7 @@ module Lhj
           list_opts[:marker] = @marker if @marker
           list_opts[:delimiter] = '/' if @all_folder
           objects = Lhj::OSS::Helper.instance.list(list_opts)
-          obj_keys = objects.map(&:key) unless @all_folder
+          obj_keys = objects.map(&:key).sort { |a, b| a <=> b } unless @all_folder
           obj_keys = objects.filter { |o| o.is_a?(String) } if @all_folder
           save(obj_keys) if @save
           print(obj_keys) unless @clear

data/lib/lhj/command/oss/upload.rb

@@ -39,7 +39,7 @@ module Lhj
 
         def handle
           file_list = []
-          Dir.glob("#{@current_path}/*").each_with_index do |f, i|
+          Dir.glob("#{@current_path}/*").sort { |a, b| File.basename(a) <=> File.basename(b) }.each_with_index do |f, i|
             file_list << f
             puts "#{i}.#{File.basename(f)}".yellow
           end

data/lib/lhj/helper/pgyer_helper.rb

@@ -60,7 +60,7 @@ module Lhj
         response = http_client.post API_HOST, params
         @result = response.body
         puts @result
-        Actions.sh('git restore ./', log: false)
+        Actions.sh('git restore ./', log: false) if File.exist?(File.expand_path('./.git'))
         puts 'upload success'
         # if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
         #   str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])

data/lib/lhj/helper/yapi/yapi_helper.rb

@@ -118,6 +118,8 @@ module Lhj
         @req_mock_array ||= []
         @req_mock_array << str
       when :java
+      when :swift
+      when :dart
       end
     end
 
@@ -176,6 +178,10 @@ module Lhj
         print_models_impl(models)
       when :java
         print_models_for_java(models)
+      when :swift
+        print_models_for_swift(models)
+      when :dart
+        print_models_for_dart(models)
       end
       puts "\n<===============打印返回数据模型-End=====================>\n".green
       models
@@ -196,6 +202,10 @@ module Lhj
         print_models_impl(models)
       when :java
         print_models_for_java(models)
+      when :swift
+        print_models_for_swift(models)
+      when :dart
+        print_models_for_dart(models)
       end
       puts "\n<===============打印请求模型-End=====================>\n".green
       models
@@ -252,7 +262,7 @@ module Lhj
             o = v['items'] || v
             o['name'] = gen_model_name(k, type)
             if v['type'].eql?('array') && v['items']['type'].eql?('string')
-              c_model[:type_name] = 'NSString'
+              c_model[:type_name] = 'String'
             else
               c_model[:type_name] = o['name']
               handle_model(o, type, &block)
@@ -293,10 +303,109 @@ module Lhj
       end
     end
 
+    def print_models_for_swift(models)
+      models.each do |model|
+        model_name = model[:name] || ''
+        model_properties = model[:properties]
+        puts_h "class #{model_name}: NSObject {"
+        model_properties.each do |m|
+          print_model_for_swift(m)
+        end
+        puts_h "}\n\n\n"
+      end
+    end
+
+    def print_models_for_dart(models)
+      models.each do |model|
+        model_name = model[:name] || ''
+        model_properties = model[:properties]
+        puts_h "class #{model_name} {"
+        model_properties.each do |m|
+          print_model_for_dart(m)
+        end
+        # init method
+        puts_h "\n"
+        i_content = model_properties.map { |p| "this.#{p[:key]}" }.join(', ')
+        puts_h "    #{model_name}({#{i_content}});"
+        puts_h "\n"
+        # json to model
+        puts_h "    #{model_name}.fromJson(Map<String, dynamic> json) {"
+        puts_h json_to_model_dart(model_properties)
+        puts_h '    }'
+        # model to json
+        puts_h "\n"
+        puts_h '    Map<String, dynamic> toJson() {'
+        puts_h '        final Map<String, dynamic> data = <String, dynamic>{};'
+        puts_h model_to_json_dart(model_properties)
+        puts_h '        return data;'
+        puts_h '    }'
+        puts_h "}\n\n\n"
+      end
+    end
+
+    def json_to_model_dart(properties)
+      p_s = properties.map do |p|
+        case p[:type]
+        when 'object'
+          "        #{p[:key]} = json['#{p[:key]}'] != null ? #{p[:type_name]}.fromJson(json['#{p[:key]}']) : null;"
+        when 'array'
+          if p[:type_name].eql?('String')
+            "        #{p[:key]} = json['#{p[:key]}'].cast<String>();"
+          else
+            json_to_model_array_dart(p)
+          end
+        else
+          "        #{p[:key]} = json['#{p[:key]}'];"
+        end
+      end
+      p_s.join("\n")
+    end
+
+    def json_to_model_array_dart(p)
+      array = []
+      array << "        if (json['#{p[:key]}'] != null) {"
+      array << "            #{p[:key]} = <#{p[:type_name]}>[];"
+      array << "            json['#{p[:key]}'].forEach((v) {"
+      array << "                #{p[:key]}!.add(#{p[:type_name]}.fromJson(v));"
+      array << '            });'
+      array << '        }'
+      array.join("\n")
+    end
+
+    def model_to_json_dart(properties)
+      p_s = properties.map do |p|
+        case p[:type]
+        when 'object'
+          model_to_model_obj_dart(p)
+        when 'array'
+          model_to_model_array_dart(p)
+        else
+          "        data['#{p[:key]}'] = #{p[:key]};"
+        end
+      end
+      p_s.join("\n")
+    end
+
+    def model_to_model_obj_dart(p)
+      array = []
+      array << "        if (#{p[:key]} != null) {"
+      array << "            data['#{p[:key]}'] = #{p[:key]}!.toJson();"
+      array << '        }'
+      array.join("\n")
+    end
+
+    def model_to_model_array_dart(p)
+      array = []
+      array << "        if (#{p[:key]} != null) {"
+      array << "            data['#{p[:key]}'] = #{p[:key]}!.map((v) => v.toJson()).toList();"
+      array << '        }'
+      array.join("\n")
+    end
+
     def print_models_impl(models)
       models.each do |model|
         puts_m "@implementation #{model[:name]}"
-        str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
+        str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('String') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
         if str&.length&.positive?
           puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
           puts_m "  return @{#{str}};"
@@ -376,6 +485,65 @@ module Lhj
       end
     end
 
+    def print_model_for_swift(m)
+      key = m[:key]
+      type_name = m[:type_name]
+      type = m[:type]
+      des = m[:description] || ''
+      des.gsub!(/\n/, '  ')
+      default = m[:default]
+      case type
+      when 'integer'
+        puts_h "    @objc var #{key}: Int?//#{des} #{default}"
+      when 'string'
+        puts_h "    @objc var #{key}: String?//#{des} #{default}"
+      when 'number'
+        puts_h "    @objc var #{key}: Float?//#{des} #{default}"
+      when 'float'
+        puts_h "    @objc var #{key}: Float?//#{des} #{default}"
+      when 'double'
+        puts_h "    @objc var #{key}: Double?//#{des} #{default}"
+      when 'boolean'
+        puts_h "    @objc var #{key}: Bool?//#{des} #{default}"
+      when 'object'
+        puts_h "    @objc var #{key}: #{type_name}?//#{des} #{default}"
+      when 'array'
+        puts_h "    @objc var #{key}: Array<#{type_name}>?//#{des} #{default}"
+      else
+        puts_h "    @objc var #{key}: String?//#{des} #{default}"
+      end
+    end
+
+    def print_model_for_dart(m)
+      key = m[:key]
+      type_name = m[:type_name]
+      type = m[:type]
+      des = m[:description] || ''
+      des.gsub!(/\n/, '  ')
+      default = m[:default]
+      puts_h "    //#{des} #{default}"
+      case type
+      when 'integer'
+        puts_h "    int? #{key};"
+      when 'string'
+        puts_h "    String? #{key};"
+      when 'number'
+        puts_h "    int? #{key};"
+      when 'float'
+        puts_h "    float? #{key};"
+      when 'double'
+        puts_h "    double? #{key};"
+      when 'boolean'
+        puts_h "    bool? #{key};"
+      when 'object'
+        puts_h "    #{type_name}? #{key};"
+      when 'array'
+        puts_h "    List<#{type_name}>? #{key};"
+      else
+        puts_h "    String? #{key};"
+      end
+    end
+
     # @param [Object] data
     def print_req_query(data)
       return unless data && data['req_query']
@@ -394,6 +562,10 @@ module Lhj
         print_models_impl(models)
       when :java
         print_models_for_java(models)
+      when :swift
+        print_models_for_swift(models)
+      when :dart
+        print_models_for_dart(models)
       end
       models
     end
@@ -437,6 +609,8 @@ module Lhj
         yapi_temp_result = Lhj::ErbTemplateHelper.render(yapi_temp, yapi_vars, '-')
         puts_s(yapi_temp_result)
       when :java
+      when :swift
+      when :dart
       end
 
     end

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.33'
+  VERSION = '0.2.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.35
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj