gwtools 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd2b37aeec182ef52a494b197f0eb4abfe9405e440efa2e2ab3b79b9c810e044
-  data.tar.gz: 3734ca2671df99c5a879ec5a5a5a336fab43f6e96028900f9ecf68baaffa9081
+  metadata.gz: 670dd9b4a0d32ab1e294c84b78c12ee087ccaf95968656746aeb14083ed2d714
+  data.tar.gz: 05e0d47a0d97bcf2c5d61b238bc84997082fb1c843b363931da452a24be91afa
 SHA512:
-  metadata.gz: 259ec36cc9e7cb1ea91f86ac6c646a69375103ccd005e5c9d86629a91ac442cd642804b0c04807c81d5ac0878a541b7eedbafd70417ee2a68910ae0aa914aeab
-  data.tar.gz: ed034226ac174115a66b2e16173b33afb0057c1797453c292010759fa190e4804b55d6f174c1743d35b069a9adcb4cdac303dbaba3091e0f3b6964c22e442b23
+  metadata.gz: 2c158030a8039e03495ad4629e2ab14702fbcd65b392325c73a961af601addea3300f3527c61edae47158a506d3df49472c2405e42fff42d1ae9c4e9d2c0734f
+  data.tar.gz: 6051e050e2b3baf2802f23f1a78b3a3877da7e99def5747299998ddda908d82801de0c108d36ef6b8e1eacc67716634144a31e0abf262ae7d7400f4a439e9afd

data/lib/gwtools/analysis/file_handler.rb

@@ -45,29 +45,33 @@ module Gwtools
       # split path by '/' and create directories
       dirs = path.split('/').map { |part| part.gsub(/[.-]/, "_") } + [file_name]
 
-      # 先判断路径下是否存在restful.swift
-      puts "文件已存在: #{@target_path + '/' + dirs.join('/') + '.swift'}" unless !File.exist?(@target_path + '/' + dirs.join('/') + '.swift')
+      # puts @target_path
+      # puts Parser.enum_from_url(url).to_json
 
+      # # 先判断路径下是否存在restful.swift
+      # puts "文件已存在: #{@target_path + '/' + dirs.join('/') + '.swift'}" unless !File.exist?(@target_path + '/' + dirs.join('/') + '.swift')
+      #
       FileUtils.mkdir_p(@target_path) unless File.directory?(@target_path)
-      dirs.each_with_index do |dir, index|
-        # construct directory path
-        dir_path = @target_path + '/' + dirs[0..index].join('/')
-
-        # create directory if it doesn't exist, with out file_name
-        if dir != file_name
-          FileUtils.mkdir_p(dir_path) unless File.directory?(dir_path)
-        end
-        # create file
-        Generate::Swift.createPathFile(dir_path, dir, dirs, index,
-                                       path,
-                                       @url,
-                                       @header,
-                                       @httpMethod,
-                                       @parameters,
-                                       @body,
-                                       @responseJson
-                                       )
-      end
+      Generate::Swift.createFile(@target_path, path)
+      # dirs.each_with_index do |dir, index|
+      #   # construct directory path
+      #   dir_path = @target_path + '/' + dirs[0..index].join('/')
+      #
+      #   # create directory if it doesn't exist, with out file_name
+      #   if dir != file_name
+      #     FileUtils.mkdir_p(dir_path) unless File.directory?(dir_path)
+      #   end
+      #   # create file
+      #   Generate::Swift.createPathFile(dir_path, dir, dirs, index,
+      #                                  path,
+      #                                  @url,
+      #                                  @header,
+      #                                  @httpMethod,
+      #                                  @parameters,
+      #                                  @body,
+      #                                  @responseJson
+      #                                  )
+      # end
     end
 
     # def createSwiftFile(dir_path)

data/lib/gwtools/analysis/swift_parser.rb

@@ -0,0 +1,221 @@
+#!/usr/bin/ruby
+
+require 'uri'
+require 'fileutils'
+require 'json'
+
+# 解析指定路径 swift 文件
+# module SwiftParser
+#   # 解析的所有 enum 类型
+#   ENUMS = {}
+#
+# end
+
+module Gwtools
+  class Parser
+    # 解析的所有 enum 类型
+    @@ENUMS = {}
+
+    # def initialize(enums = {})
+    #   @ENUMS = enums
+    # end
+
+    def self.read_file(file_path)
+      swift_file = File.open(file_path, "r")
+      file_content = swift_file.read.force_encoding("UTF-8")
+      swift_file.close
+
+      return file_content
+    end
+
+    def self.enum_from_url(url)
+      uri = URI(url)
+      path = uri.path
+      file_name = 'restful'
+
+      path = path[1..-1] if path.start_with? '/'
+
+      dirs = path.split('/').map { |part| part.gsub(/[.-]/, "_") }# + [file_name]
+      parent_enum = nil
+      sub_enum = nil
+      dirs.each_with_index do |dir, index|
+        a_enum = Enum.new('', index+1)
+        a_enum.enum_name = dir
+        a_enum.path = dirs[0..index].join('.')
+        a_enum.sub_enums = {}
+        if !sub_enum.nil?
+          sub_enum.sub_enums.merge!(a_enum.enum_name.to_sym => a_enum)
+        end
+        parent_enum = a_enum unless index != 0
+        sub_enum = a_enum
+      end
+
+      return parent_enum
+    end
+
+    def self.merge_hashes(hash1, hash2)
+      hash1.each do |key, value|
+        if hash2.has_key?(key)
+          if value.is_a?(Hash) && hash2[key].is_a?(Hash)
+            merge_hashes(value, hash2[key])
+          else
+            hash2[key] = value
+          end
+        else
+          hash2[key] = value
+        end
+      end
+      hash2
+    end
+
+    def self.add_to_enums(enum)
+      return if enum.nil?
+      return if enum.path.nil? || enum.path.empty?
+      # return if enum.path.split('.').length > 1
+
+      # 找是否有 name 对应的 Enum 对象
+      if @@ENUMS.key?(enum.path.to_sym)
+        # 合并 sub_enums
+        @@ENUMS[enum.path.to_sym].sub_enums.merge!(enum.sub_enums)
+      else
+        @@ENUMS[enum.path.to_sym] = enum
+      end
+
+      # 强制去除一下顶层name包含.的enum
+      # SwiftParser::ENUMS.delete_if { |key, value| key.to_s.split('.').length > 1 }
+    end
+
+    def self.get_clear_enums
+      return @@ENUMS.delete_if { |key, value| key.to_s.split('.').length > 1 }
+    end
+
+    def self.extract_from(file_path)
+      Parser.extract_enum(Parser.read_file(file_path))
+      return get_clear_enums
+    end
+
+    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
+    end
+
+    # 根据括号匹配enums内容
+    def self.extract_enums_content(content, stack=[], enums=[], start=0)
+      return [] if content.nil?
+      while start < content.length
+        i = content.index("{", start)
+        j = content.index("}", start)
+
+        if i && (!j || i < j)
+          stack.push("{")
+          start = i + 1
+        elsif j
+          stack.pop
+          if stack.empty?
+            enums << content[0...j+1]
+            content = content[j+1..-1]
+            start = 0
+          else
+            start = j + 1
+          end
+        else
+          break
+        end
+      end
+
+      enums
+    end
+
+    def self.extract_enum(content, parent_enum = nil)
+      level = parent_enum.nil? ? 0 : parent_enum.level
+      pre_name = parent_enum.nil? ? '' : "#{parent_enum.path}."
+      enum_codes = extract_enums_content(content)
+      # puts enum_codes
+      if enum_codes.length == 1 && !enum_codes.first.empty?
+        code_lines = enum_codes.first.strip.split("\n")
+        this_enum_name = extract_enum_name(code_lines.first)
+
+        a_enum = Enum.new(code_lines[1..-2].join("\n"), level+1)
+        a_enum.enum_name = this_enum_name
+        a_enum.path = "#{pre_name}#{this_enum_name}"
+        a_enum.sub_enums = {}
+
+        if !parent_enum.nil?
+          parent_enum.sub_enums.merge!(this_enum_name.to_sym => a_enum)
+        end
+
+        add_to_enums(a_enum)
+        extract_enum(code_lines[1..-2].join("\n"), @@ENUMS[a_enum.path.to_sym])
+      else
+        if content.empty?
+
+        else
+          enum_codes.each do |enum_code|
+            extract_enum(enum_code, parent_enum)
+          end
+        end
+      end
+    end
+  end
+
+
+
+  class Enum
+    attr_accessor :content, :level, :path
+    attr_accessor :access_level, :enum_name, :sub_enums
+    # :enum_cases, :enum_cases_with_value, :enum_cases_without_value
+
+    def initialize(content = '', level = 0)
+      @content = content.strip
+      @level = level
+      @sub_enums = []
+      # puts @content
+
+    end
+
+    def self.from_json(json)
+      json = JSON.parse(json)
+      from_hash(json)
+    end
+
+    def self.from_hash(hash)
+      enum = Enum.new
+      enum.level = hash['level']
+      enum.path = hash['path']
+      enum.enum_name = hash['enum_name']
+
+      if hash['sub_enums']
+        enum.sub_enums = {}
+        hash['sub_enums'].each do |k, v|
+          enum.sub_enums[k] = from_hash(v)
+        end
+      end
+
+      enum
+    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 content_str
+    end
+
+    def write_to_file(file_path)
+      File.open(file_path, "w") do |file|
+        file.write(to_swift)
+      end
+    end
+
+    def to_json(*a)
+      {
+        :level => self.level,
+        :path => self.path,
+        :enum_name => self.enum_name,
+        :sub_enums => self.sub_enums
+      }.to_json(*a)
+    end
+  end
+end

data/lib/gwtools/generate/swift.rb

@@ -116,7 +116,8 @@ public extension <%="#{@api_name}"%> {
       end
 
       def self.getPrefixPath(dir_path)
-        prefixPaths = %w[app-api/api/v1.0 app-api/api/v2.0 community-app-api/app-api/api/v1.0]
+        prefixPaths = %w[app-api/api/v1.0 app-api/api/v2.0 community-app-api/app-api/api/v1.0 app-api/api/haval/v2.0
+                          bt-cpsp-api/cpsp-api/v1]
 
         prefixPaths.each do |prefix_path|
           return prefix_path.gsub(/^\/|\/$/, "") if dir_path.start_with?(prefix_path)
@@ -146,6 +147,31 @@ public extension <%="#{@api_name}"%> {
                  .gsub(/^\/|\/$/, "")
       end
 
+
+      def self.createFile(target_path, url)
+        pre_name = 'pre_path'
+        target_swift_file = "#{target_path + "/#{pre_name}"}/#{url.split('/').first}.swift"
+        FileUtils.mkdir_p(target_path + "/#{pre_name}") unless File.directory?(target_path + "/#{pre_name}")
+
+        # 从 .swift 文件读取 enum
+        Parser.extract_from(target_swift_file)
+        json1Hash = JSON.parse(Parser.get_clear_enums.to_json)
+
+        # 从 url 解析 enum
+        url_enum = Parser.enum_from_url(url)
+        json2Hash = {url_enum.enum_name.to_sym => url_enum}
+
+        # puts json1Hash.to_json
+        # puts json2Hash.to_json
+        puts "-"*50
+        puts url
+        merged_json = Parser.merge_hashes(JSON.parse(json1Hash.to_json), JSON.parse(json2Hash.to_json))
+        enum = Enum.from_hash(merged_json[url_enum.enum_name])
+        enum.write_to_file(target_swift_file)
+
+        `swiftformat --swiftversion 5.0 #{target_swift_file}`
+      end
+
       def self.createPathFile(dir_path, dir, dirs, index,
                               url_path,
                               url,

data/lib/gwtools/version.rb

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

data/lib/gwtools.rb

@@ -9,4 +9,5 @@ module Gwtools
   autoload :Command, 'gwtools/command'
   autoload :FileHandler, 'gwtools/analysis/file_handler'
   autoload :Generate, 'gwtools/generate/swift'
+  autoload :Parser, 'gwtools/analysis/swift_parser'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gwtools
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - chenglq
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email:
@@ -24,6 +24,7 @@ files:
 - bin/gwtools
 - lib/gwtools.rb
 - lib/gwtools/analysis/file_handler.rb
+- lib/gwtools/analysis/swift_parser.rb
 - lib/gwtools/command.rb
 - lib/gwtools/command/generate.rb
 - lib/gwtools/command/generate/req_info.rb