gwtools 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815b48333cc7b62c19b09a7b974d11f4da0a06af2223242df93d41e1f94a45dd
-  data.tar.gz: d05b35e6e038c5ed00a44b167936550fede33a58bdc14d4fe9d75b080e62ad33
+  metadata.gz: 2d38d7819049120197657aaada9c96d48c0aec7519c35939e5fa5626a1835159
+  data.tar.gz: bc0c358a7491f712175631dd210aca21cc55fb3385428df4e6064d22297b74ba
 SHA512:
-  metadata.gz: d4c9a8f1ba05cf7a3003f4c6c00d599a978f761953350423baab24b364b0e5c82ab9902fe37297b1a65a0f7983267d6195702b3413917e176758d22c47d4a823
-  data.tar.gz: b519de2f870e800d5a33444e0579bc2a40bfe29536fcdc4bee4b68b41c5c9a86d61e568e6743dcb169ff675d576ba5f581057adbc621bf5f3d0c061ea97e38cf
+  metadata.gz: be161ff8c7e2f6e7912fd128894b238f396fe89e405889bb043bf316bc4831be2d99d5caa367f875d23bef8f2a31413a3e94ed3e1895a71f003bc65a655045ac
+  data.tar.gz: '069e6744aff50f322c59396abeacb7425938f7e2d80dfdf1bdc339c52570bc83f6b5d23381dd59052d57e7e072201dc7300e4daf84d3ce04917db1a6b3efe04e'

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,27 +62,8 @@ module Gwtools
                                        @body,
                                        @responseJson
                                        )
-      # end
     end
 
-    # def createSwiftFile(dir_path)
-    #   File.open("#{dir_path}.swift", "w") do |file|
-    #     # write swift file content
-    #     if index == 0
-    #       file.write("extension AppAPI { \n")
-    #     else
-    #       file.write("extension AppAPI.#{dirs[0..index-1].join('.')} { \n")
-    #     end
-    #     file.write("    public struct #{dir} { } \n")
-    #     file.write("}")
-    #   end
-    #
-    #
-    #   # File.open("#{dir_path}.swift", "w") do |file|
-    #   #
-    #   # end
-    # end
-
     def getURL
       match = /^URL = (.*)$/.match(@data_str)
       if match

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")
@@ -96,7 +114,7 @@ module Gwtools
 
     def self.extract_enum_name(content)
       # return content.scan(/^\w+\s+extension\s+(\w+)\s+\{/).flatten + content.scan(/^\w+\s+enum\s+(\w+)\s+\{/).flatten
-      return (content.scan(/enum\s+(\w+)\s+\{/).flatten + content.scan(/extension\s+(\w+)\s+\{/).flatten).first
+      return (content.scan(/enum\s+([\w.]+)\s+\{/).flatten + content.scan(/extension\s+([\w.]+)\s+\{/).flatten).first
     end
 
     # 根据括号匹配enums内容
@@ -127,6 +145,7 @@ module Gwtools
     end
 
     def self.extract_enum(content, parent_enum = nil)
+      content.gsub!('`','')
       level = parent_enum.nil? ? 0 : parent_enum.level
       pre_name = parent_enum.nil? ? '' : "#{parent_enum.path}."
       enum_codes = extract_enums_content(content)
@@ -200,7 +219,7 @@ module Gwtools
         content_str += value.to_swift()
       end
       content_str += "}\n"
-      return 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

@@ -64,6 +64,8 @@ public extension <%="#{@api_name}"%> {
 <% end %>
         }
 }
+
+
           ERB
           ERB.new(template, nil, '>').result(binding)
         end
@@ -81,8 +83,17 @@ public extension <%="#{@api_name}"%> {
           @readme = readme
           puts "write to ==> #{file_path}"
           File.open(file_path, 'w+') do |f|
+            # 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
 
@@ -100,7 +111,7 @@ public extension <%="#{@api_name}"%> {
       end
 
       def self.getModulePath(dir_path, prefixPath)
-        modulePaths = %w[content community]
+        modulePaths = %w[content community complaintsComments technician]
         dir_path = dir_path.gsub(/\A#{prefixPath}/, "").gsub(/^\/|\/$/, "")
 
         modulePaths.each do |modulePath|
@@ -204,6 +215,8 @@ extension <##SomeViewModel##> {
             .catchErrorJustReturn([])
     }
 }
+
+public extension app_api.api.v1_0.complaintsComments.protocol.getProtocols {}
 """
 
         ModelReqGenerateConfig.new(
@@ -218,11 +231,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.16"
+  VERSION = "0.0.18"
 end

metadata

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