gwtools 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d808a737fd03e736ac1f86a7af6b840662f983598f6fa3055ef5e02413afb3
-  data.tar.gz: 38a8c1a3c3a3620fbd91e2067114bdb511c23e3ad813ea51d5aeabce3d21a799
+  metadata.gz: de144674a5f0d90f4e7748588a2dbcf7e23e72612c93b9e8d43a14747116ec5c
+  data.tar.gz: 7bb208e297924ae193e7ab0adb6e3a246f3bf5435e5d61157bfa84291a0a3114
 SHA512:
-  metadata.gz: '08f5e834d9273fd23a5a62f86ce383c5e72a0f5f99c445272d33b64625e79015a743f152e6dd98e50e863485e7380630714de7eb12b0031ce43ae14a9d47d6cb'
-  data.tar.gz: 383d8c48e3a9964354d0e015827010f01e44bff50485e8d7551512a8e5186d4844ddc9e9f806005e109a755a3f0e91b6faf77151c60f6f93cefef4d080fbf987
+  metadata.gz: ecd6321bc3a60f7189a69efd3e936e7c67e11042f20c6d9ce71535901657caa5468b6585604c4f6726a431961af220385e5765fcbc760772e026cdc9cb37e502
+  data.tar.gz: 11fa148bf79fbd0a0978385f9e7799d5d8d4f04fdfcbbff8c7de1c40ee553f47418dfe48ed3f93c4e19762897f83d00398d47ea8fea3a6ddb161197d1e249942

data/lib/gwtools/analysis/file_handler.rb

@@ -9,7 +9,6 @@ module Gwtools
     def initialize(file_path, target_path = '')
       @file_path = file_path || raise(ArgumentError, 'Missing required argument `file_path`')
       @target_path = target_path
-
       analyDataStr
     end
 
@@ -63,7 +62,6 @@ module Gwtools
                                        @body,
                                        @responseJson
                                        )
-      # end
     end
 
     def getURL

data/lib/gwtools/analysis/swift_parser.rb

@@ -20,6 +20,24 @@ module Gwtools
     #   @ENUMS = enums
     # end
 
+    def self.add_quotes(array1, array2)
+      array1.map do |element|
+        if array2.include?(element)
+          "`#{element}`"
+        else
+          element
+        end
+      end
+    end
+
+    def self.output_content(config_file)
+      # 处理特殊字符
+      this_name = Parser.extract_enum_name(config_file)
+      array1 = this_name.split(".")
+      array2 = %w[enum struct class protocol extension self]
+      return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
+    end
+
     def self.read_file(file_path)
       swift_file = File.open(file_path, "r")
       file_content = swift_file.read.force_encoding("UTF-8")
@@ -195,31 +213,13 @@ module Gwtools
       enum
     end
 
-    def add_quotes(array1, array2)
-      array1.map do |element|
-        if array2.include?(element)
-          "#{element}_"
-        else
-          element
-        end
-      end
-    end
-
-    def output_content(config_file)
-      # 处理特殊字符
-      this_name = Parser.extract_enum_name(config_file)
-      array1 = this_name.split(".")
-      array2 = %w[enum struct class protocol extension self]
-      return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
-    end
-
     def to_swift()
       content_str = "public enum #{@enum_name} {\n"
       @sub_enums.each do |key, value|
         content_str += value.to_swift()
       end
       content_str += "}\n"
-      return output_content(content_str)
+      return Parser.output_content(content_str)
     end
 
     def write_to_file(file_path)

data/lib/gwtools/command/generate/req_info.rb

@@ -21,7 +21,11 @@ module Gwtools
         end
 
         def run
-          FileHandler.new(@file_path, @target_path)
+          fh = FileHandler.new(@file_path, @target_path)
+
+          # File.rename("#{target_path + '/' + app_name}.swift_", "#{target_path + '/' + app_name}.swift")
+          # `swiftformat --swiftversion 5.0 "#{target_path + '/' + app_name}.swift",`
+
         end
 
       end

data/lib/gwtools/generate/swift.rb

@@ -16,7 +16,7 @@ module Gwtools
         def config_file
           # ERB.new(File.read('restful_url.swift.erb'), nil, '>').result(binding)
           template = <<-ERB
-/// 此文件由代码生成，不要修改任何路径相关参数，仅可对 headerParms 和 parms 做处理
+/// 此文件由代码生成，不要修改任何内容
 
 import RxSwift
 import GWNetWork
@@ -33,7 +33,9 @@ public extension <%="#{@api_name}"%> {
 }
 
 public extension <%="#{@api_name}"%> {
-  static func <%="#{@httpmethod}"%>(/*custom_params,*/
+  static func <%="#{@httpmethod}"%>(
+    headerParms: [String: String] = [:],
+    parms: [String: Any] = [:],
     isCache: Bool = false,
     isLoading: Bool = false,
     module: String? = nil,
@@ -42,11 +44,6 @@ public extension <%="#{@api_name}"%> {
     <% else %>
       des: String? = nil) -> Observable<Self.<%="#{@model_name}"%>> {
     <% end %>
-      // ================= 逻辑处理 =================
-      let headerParms: [String : String] = [:]
-      let parms: [String : Any] = [:]
-      // ================= 逻辑处理 =================
-
       return GWNetworkManager.request(requestType: .<%="#{@httpmethod}"%>,
         prefixPath: "<%="#{@prefixPath}"%>",
         modulePath: "<%="#{@modulePath}"%>",
@@ -64,26 +61,10 @@ public extension <%="#{@api_name}"%> {
 <% end %>
         }
 }
-          ERB
-          ERB.new(template, nil, '>').result(binding)
-        end
 
-        def add_quotes(array1, array2)
-          array1.map do |element|
-            if array2.include?(element)
-              "#{element}_"
-            else
-              element
-            end
-          end
-        end
 
-        def output_content(config_file)
-          # 处理特殊字符
-          this_name = Parser.extract_enum_name(config_file)
-          array1 = this_name.split(".")
-          array2 = %w[enum struct class protocol extension self]
-          return config_file.gsub(this_name, add_quotes(array1, array2).join("."))
+          ERB
+          ERB.new(template, nil, '>').result(binding)
         end
 
         def initialize(file_path, api_name, httpmethod, prefixPath, modulePath, detailPath,
@@ -99,8 +80,16 @@ public extension <%="#{@api_name}"%> {
           @readme = readme
           puts "write to ==> #{file_path}"
           File.open(file_path, 'w+') do |f|
-            puts output_content(config_file)
-            f.puts(output_content(config_file))
+            # f.puts(Parser.output_content(config_file))
+            f.puts(config_file)
+          end
+
+          # 格式化
+          `swiftformat --swiftversion 5.0 #{file_path}`
+          # 替换内容，重新写入
+          replaced_content = File.read(file_path)
+          File.open(file_path, "w") do |new_file|
+            new_file.puts(Parser.output_content(replaced_content))
           end
         end
       end
@@ -182,8 +171,9 @@ public extension <%="#{@api_name}"%> {
 
         modulePath = getModulePath(path, prefixPath)
         detailPath = getDetailPath(path, prefixPath, modulePath)
-
+        json_data_is_arr = responseJson[root_path].is_a?(Array)
         readme = """
+
 请求参数
 URL = #{path.chomp}
 HTTPMETHOD = #{httpMethod.chomp}
@@ -197,12 +187,12 @@ class <##SomeViewModel##> {
   }
 
   public struct Output {
-      let data: BehaviorRelay<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}>
+      let data: BehaviorRelay<#{json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{json_data_is_arr ? "]" : ""}>
   }
 
   public func transform(input: Input) -> Output {
-      let outDatas = BehaviorRelay<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}>(value: [])
-      input.<##AnyObservable##>.flatMapLatest({ [weak self] () -> Observable<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}> in
+      let outDatas = BehaviorRelay<#{json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{json_data_is_arr ? "]" : ""}>(value: [])
+      input.<##AnyObservable##>.flatMapLatest({ [weak self] () -> Observable<#{json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{json_data_is_arr ? "]" : ""}> in
           guard let self = self else { return Observable.just([]) }
           return self.reqData()
       }).subscribe(onNext: { (items) in
@@ -216,7 +206,7 @@ class <##SomeViewModel##> {
 }
 
 extension <##SomeViewModel##> {
-    func reqData() -> Observable<#{@json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{@json_data_is_arr ? "]" : ""}> {
+    func reqData() -> Observable<#{json_data_is_arr ? "[" : ""}#{app_name}.#{httpMethod.capitalize.chomp}Model#{json_data_is_arr ? "]" : ""}> {
         #{app_name}.#{httpMethod.capitalize.chomp}()
             .compactMap { $0 } // 解析出需要的类型
             .observeOn(MainScheduler.instance)
@@ -237,11 +227,6 @@ extension <##SomeViewModel##> {
           responseJson[root_path].is_a?(Array),
           readme
         )
-
-        `swiftformat --swiftversion 5.0 "#{target_path + '/' + app_name}.swift",`
-
-        # puts target_swift_file = "#{target_path}/#{app_name}.swift"
-
       end
 
       def self.capitalize_first_letter(str)

data/lib/gwtools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gwtools
-  VERSION = "0.0.17"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gwtools
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - chenglq