lap 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d48053cc0e3fe1a6f28c32b764c69497c2a3416e7c21ee7eeedd36b7768e33
-  data.tar.gz: 86b2d87a47f3e77964f14f6b876553a1365207a0bb1522df8f48cae43cbefd21
+  metadata.gz: 2175fa843ad4fa64403068441af0c6ca2be15b930746aa3af383dab7ed670822
+  data.tar.gz: d28106befda1f37218423c1ba046934cc31e73025fdd60a1c96e45db646913f1
 SHA512:
-  metadata.gz: 1dfe0739b7d757c9d67474b02c2f4c832f217b8a49129c97e068fa048d661dc066883e162462feb5a5b3fd7b8bd60b4f965f4921898a79c374a0db38f299fad4
-  data.tar.gz: 8b3f3a348b71222475155bfe7271757dbaf6ab505c0e6166e3c31140794f9a3cc25ba9a06d3ac6886af8f2098130cb8a2b503a148c015933afc143e0c43be939
+  metadata.gz: 355d4a32d74d86d51cfa2dd9a263c6f72301486a53012fa1873c66e6054d8a90080d1c7b75a6fb9ad1818767f00c72972f880a62979f8c8e14f9e1d26f515b61
+  data.tar.gz: 1f63b97bc3a9c19ca9d5f45d159a6166c842ad19bb2f95f04f6b217165a3d9fdc428fa2ea05aa761a2e46100e13b9aaae28a7067b37accab85d849390959f436

data/.lap.yml

@@ -1 +1,2 @@
 indent: 2
+frozen_string_literals: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lap (0.1)
+    lap (0.2)
       rbs
 
 GEM

data/Rakefile

@@ -4,3 +4,16 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+desc "Build ruby files from rbs files"
+task :make do
+  require "find"
+  Find.find(File.join(File.expand_path(File.dirname(__FILE__)), "sig")).each do |fname|
+    next unless fname.end_with? ".rbs" # TODO: better way to exclude dirs?
+
+    fname_relative_to_project = fname[%r{sig/.*\.rbs}]
+    output_fname = fname_relative_to_project.sub(/sig/, "lib")
+                                            .chomp("s") # turn rbs to rb
+    sh "./exe/lap #{fname_relative_to_project} > #{output_fname}"
+  end
+end

data/lib/lap.rb

@@ -2,19 +2,23 @@
 
 require "rbs"
 require "pathname"
+require "yaml"
 require "lap/version"
 require "lap/helpers"
 require "lap/class"
 require "lap/method"
 require "lap/module"
-require "pry-byebug"
+require "lap/constant"
 require "core_ext/string"
 
 module Lap
   CONFIG_FILENAME = ".lap.yml"
   DEFAULT_CONFIG = {
-    indent: 2
+    indent: 2,
+    frozen_string_literals: true,
+    preferred_line_length: 100
   }
+  FROZEN_STRING_COMMENT = "# frozen_string_literal: true\n\n"
   fp = File.join(File.dirname(__FILE__), "..", CONFIG_FILENAME)
   yml_config = Pathname(fp).exist? ? YAML.safe_load(File.read(fp)) : {}
   Config = DEFAULT_CONFIG.merge(yml_config.transform_keys(&:to_sym))
@@ -34,10 +38,12 @@ module Lap
         when RBS::AST::Declarations::Module
           Lap::Module.new(decl).render
         else
-          "TODO: #{decl}"
+          warn "TODO: #{decl} not implemented yet"
+          nil
         end
       end
 
+      puts FROZEN_STRING_COMMENT if Lap::Config[:frozen_string_literals]
       puts output.join("\n")
     end
   end

data/lib/lap/class.rb

@@ -45,6 +45,8 @@ module Lap
               with_comment(m, "include #{m.name}").indent(member_indent)
             when RBS::AST::Members::Extend
               with_comment(m, "extend #{m.name}").indent(member_indent)
+            when RBS::AST::Declarations::Constant
+              Lap::Constant.new(m, @indent_level + 1).render
             when RBS::AST::Declarations::Alias
               # no-op: not present in ruby
             else

data/lib/lap/constant.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Lap
+  class Constant
+    def initialize(node, indent_level)
+      @node = node
+      @indent_level = indent_level
+    end
+
+    def render
+      "#{name} = #{value}\n".indent(Lap::Config[:indent] * @indent_level)
+    end
+
+    private
+
+    def name
+      @node.name.name
+    end
+
+    def value
+      case @node.type
+      when RBS::Types::Record
+        fields = @node.type.fields
+        content = if fields.empty?
+                    nil
+                  else
+                    " #{record_contents(fields)} "
+                  end
+        "{#{content}}"
+      when RBS::Types::Literal
+        @node.type.literal
+      else
+        warn "TODO: #{@node.type} not supported yet"
+        ""
+      end
+    end
+
+    def record_contents(hsh)
+      inner_length = 0
+      contents = hsh.map do |k, v|
+        val = case v
+              when RBS::Types::Literal
+                v.literal
+              else
+                "nil"
+              end
+        pair = k.is_a?(Symbol) ? "#{k}: #{val}" : "#{k} => #{val}"
+        inner_length += pair.length
+        pair
+      end
+
+      if inner_length > Lap::Config[:preferred_line_length]
+        "\n#{contents.join(",\n")}\n"
+      else
+        contents.join(", ")
+      end
+    end
+  end
+end

data/lib/lap/helpers.rb

@@ -10,7 +10,7 @@ module Lap
       if [rp, rkw, op, okw].any? { |arg| arg.length.positive? }
         contents = [
           rp.map { |pos| pos.name || pos.type.name.name.downcase },
-          op.map { |pos| "#{pos.name || pos.type.name.name.downcase} = #{CLASS_TO_LITERAL[pos.type.name.name]}" },
+          op.map { |pos| "#{pos.name || pos.type.name.name.downcase} = #{CLASS_TO_LITERAL[pos.type.name.name] || "nil"}" },
           rkw.map { |name, _| "#{name}:" },
           okw.map { |name, t| "#{name}: #{CLASS_TO_LITERAL[t.type.name.name]}" },
         ].reject(&:empty?).flatten.join(", ")

data/lib/lap/module.rb

@@ -29,6 +29,8 @@ module Lap
               Lap::Class.new(m, @indent_level + 1).render
             when RBS::AST::Declarations::Module
               self.class.new(m, @indent_level + 1).render
+            when RBS::AST::Declarations::Constant
+              Lap::Constant.new(m, @indent_level + 1).render
             when RBS::AST::Declarations::Alias
               # no-op: not present in ruby
             else

data/lib/lap/version.rb

@@ -1,3 +1,3 @@
 module Lap
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/sig/core_ext/string.rbs

@@ -0,0 +1,6 @@
+class String
+  # @!begin
+  #  gsub(/^/, " " * amount)
+  # @!end
+  def indent: (Integer amount) -> String
+end

data/sig/lap.rbs

@@ -0,0 +1,52 @@
+require "rbs"
+require "pathname"
+require "yaml"
+require "lap/version"
+require "lap/helpers"
+require "lap/class"
+require "lap/method"
+require "lap/module"
+require "lap/constant"
+require "core_ext/string"
+
+module Lap
+  CONFIG_FILENAME = ".lap.yml"
+  DEFAULT_CONFIG = {
+    indent: 2,
+    frozen_string_literals: true,
+    preferred_line_length: 100
+  }
+  FROZEN_STRING_COMMENT = "# frozen_string_literal: true\n\n"
+  Config = DEFAULT_CONFIG
+
+  class Output
+    # @!begin
+    #   loader = RBS::EnvironmentLoader.new(core_root: nil) # don't pollute the env with ruby stdlib
+    #   loader.add(path: Pathname(pathname))
+    #   @env = RBS::Environment.from_loader(loader).resolve_type_names
+    #
+    #   fp = File.join(File.dirname(__FILE__), "..", CONFIG_FILENAME)
+    #   yml_config = Pathname(fp).exist? ? YAML.safe_load(File.read(fp)) : {}
+    #   Lap::Config.merge!(yml_config.transform_keys(&:to_sym))
+    # @!end
+    def initialize: (String pathname) -> void
+
+    # @!begin
+    #   output = @env.declarations.map do |decl|
+    #     case decl
+    #     when RBS::AST::Declarations::Class
+    #       Lap::Class.new(decl).render
+    #     when RBS::AST::Declarations::Module
+    #       Lap::Module.new(decl).render
+    #     else
+    #       warn "TODO: #{decl} not implemented yet"
+    #       nil
+    #     end
+    #   end
+    #
+    #   puts FROZEN_STRING_COMMENT if Lap::Config[:frozen_string_literals]
+    #   puts output.join("\n")
+    # @!end
+    def render: () -> String
+  end
+end

data/sig/lap/class.rbs

@@ -0,0 +1,62 @@
+module Lap
+  class Class
+    include Helpers
+
+    # @!begin
+    #   @node = node
+    #   @indent_level = indent_level || 0
+    #   @has_contents = !@node.members.empty?
+    # @!end
+    def initialize: (RBS::AST::Declarations::Class node, ?Integer indent_level) -> void
+
+    # @!begin
+    #   superclass = @node.super_class ? " < #{@node.super_class.name.name}" : ""
+    #   self_indent = " " * (Lap::Config[:indent] * @indent_level)
+    #   comment = get_comment(@node)
+    #   "#{comment}#{self_indent}class #{@node.name.name}#{superclass}#{contents}#{self_indent if @has_contents}end\n"
+    # @!end
+    def render: () -> String
+
+    private
+
+    # @!begin
+    #   @contents ||= begin
+    #     if @has_contents
+    #       member_indent = Lap::Config[:indent] * (@indent_level + 1)
+    #       members = @node.members.map do |m|
+    #         case m
+    #         when RBS::AST::Members::MethodDefinition
+    #           Lap::Method.new(m, @indent_level + 1).render
+    #         when RBS::AST::Declarations::Class
+    #           self.class.new(m, @indent_level + 1).render
+    #         when RBS::AST::Declarations::Module
+    #           Lap::Module.new(m, @indent_level + 1).render
+    #         when RBS::AST::Members::AttrReader
+    #           with_comment(m, "attr_reader :#{m.name}").indent(member_indent)
+    #         when RBS::AST::Members::AttrWriter
+    #           with_comment(m, "attr_writer :#{m.name}").indent(member_indent)
+    #         when RBS::AST::Members::AttrAccessor
+    #           with_comment(m, "attr_accessor :#{m.name}").indent(member_indent)
+    #         when RBS::AST::Members::Public
+    #           "public\n".indent(member_indent)
+    #         when RBS::AST::Members::Private
+    #           "private\n".indent(member_indent)
+    #         when RBS::AST::Members::Include
+    #           with_comment(m, "include #{m.name}").indent(member_indent)
+    #         when RBS::AST::Members::Extend
+    #           with_comment(m, "extend #{m.name}").indent(member_indent)
+    #         when RBS::AST::Declarations::Alias
+    #           # no-op: not present in ruby
+    #         else
+    #           warn "Unsupported member for classes: #{m}"
+    #         end
+    #       end
+    #       "\n#{members.compact.join("\n")}"
+    #     else
+    #       "; "
+    #     end
+    #   end
+    # @!end
+    def contents: () -> String
+  end
+end

data/sig/lap/helpers.rbs

@@ -0,0 +1,53 @@
+module Lap
+  module Helpers
+    CLASS_TO_LITERAL: {
+      String: '""',
+      Array: '[]',
+      Hash: "{}"
+    }
+
+    # @!begin
+    #   if [rp, rkw, op, okw].any? { |arg| arg.length.positive? }
+    #     contents = [
+    #       rp.map { |pos| pos.name || pos.type.name.name.downcase },
+    #       op.map { |pos| "#{pos.name || pos.type.name.name.downcase} = #{CLASS_TO_LITERAL[pos.type.name.name]}" },
+    #       rkw.map { |name, _| "#{name}:" },
+    #       okw.map { |name, t| "#{name}: #{CLASS_TO_LITERAL[t.type.name.name]}" },
+    #     ].reject(&:empty?).flatten.join(", ")
+    #     "(#{contents})"
+    #   end
+    # @!end
+    def args: (
+      Array[RBS::Types::Function::Param] rp,
+      Hash[Symbol, RBS::Types::Function::Param] rkw,
+      Array[RBS::Types::Function::Param] op,
+      Hash[Symbol, RBS::Types::Function::Param] okw
+    ) -> String
+
+    # @!begin
+    #   if (comment = node.comment&.string)
+    #     "#{comment.lines.map { |l| "# #{l}" }.join}#{output}"
+    #   else
+    #     output
+    #   end
+    # @!end
+    def with_comment: (RBS::AST node, String output) -> String
+
+    # @!begin
+    #   return nil unless node.comment
+    #
+    #   lines = node.comment
+    #               .string
+    #               .lines
+    #   comment = []
+    #   lines.each do |l|
+    #     break if l.start_with? "@!begin"
+    #
+    #     comment << "# #{l}"
+    #   end
+    #
+    #   comment.join
+    # @!end
+    def get_comment: (RBS::AST node) -> String
+  end
+end

data/sig/lap/method.rbs

@@ -0,0 +1,91 @@
+module Lap
+  class Method
+    include Helpers
+
+    # @!begin
+    #   @node = node
+    #   @indent_level = indent_level
+    # @!end
+    def initialize: (RBS::AST::Members::MethodDefinition node, ?Integer indent_level) -> void
+
+    #@!begin
+    #  comment = get_comment(@node)
+    #  result = <<~METHOD
+    #    #{comment}def #{"self." unless @node.kind == :instance}#{@node.name}#{arguments}
+    #      #{body}
+    #    end
+    #  METHOD
+    #  result.indent(Lap::Config[:indent] * @indent_level)
+    #@!end
+    def render: () -> String
+
+    private
+
+    # @!begin
+    #   case t
+    #   when RBS::Types::Literal
+    #     t.inspect
+    #   when ->(t) { t.class.to_s.start_with? "RBS::Types::Bases" }
+    #     "# returns #{t}"
+    #   else
+    #     "# TODO: return #{t.name.name}"
+    #   end
+    # @!end
+    def return_type: (RBS::Types type) -> String
+
+    # @!begin
+    #   @arguments ||= begin
+    #     type = @node.types.first.type
+    #     rp = type.required_positionals
+    #     rkw = type.required_keywords
+    #     op = type.optional_positionals
+    #     okw = type.optional_keywords
+    #     args(rp, rkw, op, okw)
+    #   end
+    # @!end
+    def arguments: () -> String
+
+    # @!begin
+    #   @body ||= begin
+    #     comment = @node.comment
+    #     logic = ""
+    #     if comment
+    #       real_comment = []
+    #       logic = []
+    #       has_logic = false
+    #       comment.string.lines.each do |line|
+    #         if has_logic
+    #           break if line.lstrip.start_with? "@!end"
+
+    #           logic << line
+    #         elsif line.lstrip.start_with? "@!begin"
+    #           has_logic = true
+    #         else
+    #           real_comment << line
+    #         end
+    #       end
+    #       logic = logic.join
+    #       comment = real_comment.join
+    #     end
+    #     if logic.length.positive?
+    #       logic
+    #     else
+    #       block = @node.types.first.block
+    #       return_type = return_type(@node.types.first.type.return_type)
+    #       yld = if block
+    #               bt = block.type
+    #               a = args(
+    #                 bt.required_positionals,
+    #                 bt.required_keywords,
+    #                 bt.optional_positionals,
+    #                 bt.optional_keywords
+    #               )
+    #               "yield#{a}\n"
+    #             end
+    #       "#{yld}#{return_type}"
+    #     end
+    #   end
+    # @!end
+    def body: () -> String
+  end
+end

data/sig/lap/module.rbs

@@ -0,0 +1,46 @@
+module Lap
+  class Module
+    include Helpers
+
+    # @!begin
+    #   @node = node
+    #   @indent_level = indent_level
+    #   @has_contents = !@node.members.empty?
+    # @!end
+    def initialize: (RBS::AST::Declarations::Module node, ?Integer indent_level) -> void
+
+    # @!begin
+    #   self_indent = " " * (Lap::Config[:indent] * @indent_level)
+    #   comment = get_comment(@node)
+    #   "#{comment}#{self_indent}module #{@node.name.name}#{contents}#{self_indent if @has_contents}end\n"
+    # @!end
+    def render: () -> String
+
+    private
+
+    # @!begin
+    #   @contents ||= begin
+    #     if @has_contents
+    #       members = @node.members.map do |m|
+    #         case m
+    #         when RBS::AST::Members::MethodDefinition
+    #           Lap::Method.new(m, @indent_level + 1).render
+    #         when RBS::AST::Declarations::Class
+    #           Lap::Class.new(m, @indent_level + 1).render
+    #         when RBS::AST::Declarations::Module
+    #           self.class.new(m, @indent_level + 1).render
+    #         when RBS::AST::Declarations::Alias
+    #           # no-op: not present in ruby
+    #         else
+    #           warn "Unsupported member for modules: #{m}"
+    #         end
+    #       end
+    #       "\n#{members.join("\n")}"
+    #     else
+    #       "; "
+    #     end
+    #   end
+    # @!end
+    def contents: () -> String
+  end
+end

data/sig/lap/version.rbs

@@ -0,0 +1,3 @@
+module Lap
+  VERSION: "0.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lap
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Joseph Johansen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -63,12 +63,20 @@ files:
 - lib/core_ext/string.rb
 - lib/lap.rb
 - lib/lap/class.rb
+- lib/lap/constant.rb
 - lib/lap/helpers.rb
 - lib/lap/method.rb
 - lib/lap/module.rb
 - lib/lap/version.rb
 - sample/a.rbs
 - sample/bank.rbs
+- sig/core_ext/string.rbs
+- sig/lap.rbs
+- sig/lap/class.rbs
+- sig/lap/helpers.rbs
+- sig/lap/method.rbs
+- sig/lap/module.rbs
+- sig/lap/version.rbs
 homepage: https://github.com/johansenja/lap
 licenses:
 - MIT