gloss 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9239f0e7898094d7957a2e1eae3b980ff57f94be27eea836f00561262eb8f8d4
-  data.tar.gz: 0ffa974e3146f699a9280878a412f589005cc4723f262c377a215aacd5cae146
+  metadata.gz: 0f65447f0ea2606334c6c17956f4c8ec7c8be413918fa4d2d423f973407a451b
+  data.tar.gz: bf09ca8cfc5f0b6d4f7f6c77d8e1cb93da94d1359452218fc514160cf54c571a
 SHA512:
-  metadata.gz: 97ef28c0abd86a51f35224661765950f9aab162cb119f7a0d2b05e3d985464f25c58546b0c191cd69fc537a1b921c22ebd8d7c2d4bd446257d17e9b6a454c346
-  data.tar.gz: a9c9b94fbe5ec96b3be1a5c67d5149219d0e138ef7081190c133676c784865fb90d3c1b86b250b0eb207d890c67120a86f27763c5de105baadf550bc158a464f
+  metadata.gz: 2d788c4b489e5e16e66e304d64f9c0830922d9ef861de818ac170e3c54d64b99e0d45cf6752beca1a392e88f15dc1d3627f02f66f79eb2437659807d1b5551d2
+  data.tar.gz: 9b285072b81d675ac0ca5485a732e7c46e83aca2b6bf09d288b58b7a6b9503e976711f0a2cb51d3d04edbf2c573d8625a0c8f9f35e4d158b11145a2d5919c3bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gloss (0.1.6)
+    gloss (0.1.7)
       fast_blank
       listen
       rbs (= 1.0.4)
@@ -25,10 +25,10 @@ GEM
     diff-lcs (1.4.4)
     fast_blank (1.0.0)
     ffi (1.15.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.2)
-    listen (3.5.0)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)

data/lib/gloss/cli.rb

@@ -27,7 +27,8 @@ case command
             puts(Gloss::VERSION)
           when "watch", "build"
             Gloss.load_config
-            type_checker = ProgLoader.new
+            type_checker = TypeChecker.new(Config.src_dir)
+            type_checker = ProgLoader.new(type_checker)
 .run
             (if command.==("watch")
               files = files.map() { |f|

data/lib/gloss/prog_loader.rb

@@ -7,7 +7,8 @@ module Gloss
   OUTPUT_BY_PATH = Hash.new
   class ProgLoader
     attr_reader(:"type_checker")
-    def initialize(entrypoint_path = nil, entrypoint_contents = nil)
+    def initialize(type_checker, entrypoint_path = nil, entrypoint_contents = nil)
+      @type_checker = type_checker
       entrypoint_path ||= Config.entrypoint
       (if entrypoint_path.==(nil) || entrypoint_path.==("")
         throw(:"error", "Entrypoint is not yet set in .gloss.yml")
@@ -25,7 +26,6 @@ module Gloss
       core_types = Utils.abs_path_with_contents(File.join(__dir__ || "", "..", "..", "sig", "core.rbs"))
       @files_to_process = [entrypoint, core_types]
       @processed_files = Set.new
-      @type_checker = TypeChecker.new
     end
     def run()
       @files_to_process.each() { |__arg0|

data/lib/gloss/runtime.rb

@@ -7,11 +7,15 @@ module Gloss
   class Runtime
     NON_EXISTENT_FILEPATH = "__string__"
     def self.process_string(str, options = Config.default_config)
+      (if str.empty?
+        return ["", nil].freeze
+      end)
       out_io = StringIO.new
       error_msg = catch(:"error") { ||
         tree = Parser.new(str)
 .run
-        tc = ProgLoader.new(NON_EXISTENT_FILEPATH, str)
+        tc = TypeChecker.new(".")
+        tc = ProgLoader.new(tc, NON_EXISTENT_FILEPATH, str)
 .run
         rb_output = Visitor.new(tree, tc)
 .run

data/lib/gloss/type_checker.rb

@@ -11,7 +11,7 @@ module Gloss
       Lenient = "lenient"
       Default = "default"
     end
-    def initialize()
+    def initialize(src_dir)
       options = Steep::Project::Options.new
 case Config.type_checking_strictness
         when Strictness::Strict
@@ -26,7 +26,7 @@ case Config.type_checking_strictness
       @rbs_gem_dir = Utils.gem_path_for("rbs")
       env_loader = RBS::EnvironmentLoader.new
       @env = RBS::Environment.from_loader(env_loader)
-      project = Steep::Project.new(steepfile_path:       Pathname.new(Config.src_dir)
+      project = Steep::Project.new(steepfile_path:       Pathname.new(src_dir)
 .realpath)
       project.targets
 .<<(@steep_target)

data/lib/gloss/version.rb

@@ -3,5 +3,5 @@
   ##### See / to make changes
 
 module Gloss
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/src/lib/gloss/cli.gl

@@ -22,7 +22,8 @@ module Gloss
           puts Gloss::VERSION
         when "watch", "build"
           Gloss.load_config
-          type_checker = ProgLoader.new.run
+          type_checker = TypeChecker.new(Config.src_dir)
+          type_checker = ProgLoader.new(type_checker).run
           if command == "watch"
             files = files.map do |f|
               path = Pathname.new(f).absolute? ? f : File.join(Dir.pwd, f)

data/src/lib/gloss/prog_loader.gl

@@ -6,7 +6,7 @@ module Gloss
   class ProgLoader
     attr_reader :type_checker
 
-    def initialize(entrypoint_path = nil, entrypoint_contents = nil)
+    def initialize(@type_checker : TypeChecker, entrypoint_path = nil, entrypoint_contents = nil)
       entrypoint_path ||= Config.entrypoint
       if entrypoint_path == nil || entrypoint_path == ""
         throw :error, "Entrypoint is not yet set in .gloss.yml"
@@ -21,7 +21,6 @@ module Gloss
       core_types = Utils.abs_path_with_contents(File.join((__dir__||""), "..", "..", "sig", "core.rbs"))
       @files_to_process = [entrypoint, core_types]
       @processed_files = Set.new
-      @type_checker = TypeChecker.new
     end
 
     def run

data/src/lib/gloss/runtime.gl

@@ -5,10 +5,13 @@ module Gloss
     NON_EXISTENT_FILEPATH = "__string__"
 
     def self.process_string(str : String, options = Config.default_config)
+      return "", nil if str.empty?
+
       out_io = StringIO.new
       error_msg = catch :error do
         tree = Parser.new(str).run
-        tc = ProgLoader.new(NON_EXISTENT_FILEPATH, str).run
+        tc = TypeChecker.new(".")
+        tc = ProgLoader.new(tc, NON_EXISTENT_FILEPATH, str).run
         rb_output = Visitor.new(tree, tc).run
         tc.run(NON_EXISTENT_FILEPATH, rb_output)
         Writer.new(rb_output, NON_EXISTENT_FILEPATH, out_io).run

data/src/lib/gloss/type_checker.gl

@@ -10,7 +10,7 @@ module Gloss
       Default = "default"
     end
 
-    def initialize
+    def initialize(src_dir : String)
       options = Steep::Project::Options.new
       case Config.type_checking_strictness
       when Strictness::Strict
@@ -31,7 +31,7 @@ module Gloss
       @rbs_gem_dir = Utils.gem_path_for("rbs")
       env_loader = RBS::EnvironmentLoader.new
       @env = RBS::Environment.from_loader(env_loader)
-      project = Steep::Project.new(steepfile_path: Pathname.new(Config.src_dir).realpath)
+      project = Steep::Project.new(steepfile_path: Pathname.new(src_dir).realpath)
       project.targets << @steep_target
       loader = Steep::Project::FileLoader.new(project: project)
       #loader.load_signatures

data/src/lib/gloss/version.gl

@@ -1,3 +1,3 @@
 module Gloss
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank