gwtools 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d38d7819049120197657aaada9c96d48c0aec7519c35939e5fa5626a1835159
-  data.tar.gz: bc0c358a7491f712175631dd210aca21cc55fb3385428df4e6064d22297b74ba
+  metadata.gz: 997fe8dfcd44d2f5e5d482cf11f4d7cb5f7b511ee35ef2396a201d3e58ba028b
+  data.tar.gz: abf89e7685eb973506e64db6953b6b33949e8370bdd50a98c0f4665394a9a036
 SHA512:
-  metadata.gz: be161ff8c7e2f6e7912fd128894b238f396fe89e405889bb043bf316bc4831be2d99d5caa367f875d23bef8f2a31413a3e94ed3e1895a71f003bc65a655045ac
-  data.tar.gz: '069e6744aff50f322c59396abeacb7425938f7e2d80dfdf1bdc339c52570bc83f6b5d23381dd59052d57e7e072201dc7300e4daf84d3ce04917db1a6b3efe04e'
+  metadata.gz: 2a9b6ab6b5cec1bd342f20fdff887debc3815ea8e71836b83d0c5bcea717adc9e6b8c502b181b9d945f847a608d0d84525e8829d3e5c812ed03c25a52dc472cf
+  data.tar.gz: e1a71c329b49ddb179aa400efe9511b02edab29913ddfcb69a47cc680a5277e5c6b9ef6ea72418a2f83be3190ec944fb67f09c12fb2cc723da767b15d2fb1bbf

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}"%>",
@@ -174,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}
@@ -189,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
@@ -208,15 +206,13 @@ 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)
             .catchErrorJustReturn([])
     }
 }
-
-public extension app_api.api.v1_0.complaintsComments.protocol.getProtocols {}
 """
 
         ModelReqGenerateConfig.new(
@@ -249,47 +245,47 @@ public extension app_api.api.v1_0.complaintsComments.protocol.getProtocols {}
         swift_model = ''
         case json_data
         when String
-          return "var #{name}: [String] = []\n"
+          return "public var #{name}: [String] = []\n"
         when Float
-          return "var #{name}: [Float] = []\n"
+          return "public var #{name}: [Float] = []\n"
         when Integer
-          return "var #{name}: [Int] = []\n"
+          return "public var #{name}: [Int] = []\n"
         when Array
           return ''
         when Hash
-          swift_model += "struct #{name}: HandyJSON {\n"
+          swift_model += "public struct #{name}: HandyJSON {\n"
           # generate_model(name, json_data)
           json_data.each do |key, value|
             case value
             when NilClass # nil 对象默认给个Stirng?类型
-              swift_model += "  var #{key}: String?\n"
+              swift_model += "  public var #{key}: String?\n"
             when FalseClass
-              swift_model += "  var #{key}: Bool = false\n"
+              swift_model += "  public var #{key}: Bool = false\n"
             when TrueClass
-              swift_model += "  var #{key}: Bool = false\n"
+              swift_model += "  public var #{key}: Bool = false\n"
             when Float
-              swift_model += "  var #{key}: Float = 0.0\n"
+              swift_model += "  public var #{key}: Float = 0.0\n"
             when Integer
-              swift_model += "  var #{key}: Int = 0\n"
+              swift_model += "  public var #{key}: Int = 0\n"
             when String
-              swift_model += "  var #{key}: String?\n"
+              swift_model += "  public var #{key}: String?\n"
             when Array
               if value.count > 0
                 if value.all? { |element| element.is_a?(Hash) }
                   merged_hash = value.inject(:merge)
-                  swift_model += "var #{key}: [#{capitalize_first_letter(key)}Model]?\n"
+                  swift_model += "public var #{key}: [#{capitalize_first_letter(key)}Model]?\n"
                   swift_model += generate_model("#{capitalize_first_letter(key)}Model", merged_hash)
                 else
                   swift_model += generate_model(key, value[0])
                 end
               else
-                swift_model += "var #{key}: [Any]?\n"
+                swift_model += "public var #{key}: [Any]?\n"
               end
             when Hash
-              swift_model += "var #{key}: #{capitalize_first_letter(key)}Model?\n"
+              swift_model += "public var #{key}: #{capitalize_first_letter(key)}Model?\n"
               swift_model += generate_model("#{capitalize_first_letter(key)}Model", value)
             else
-              swift_model += "var #{key}: #{value.class}?\n"
+              swift_model += "public var #{key}: #{value.class}?\n"
             end
           end
           swift_model + "public init() {}\n}\n"

data/lib/gwtools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gwtools
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - chenglq
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email: