rubyjs-vite 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9849d181ab8eeb5a8dd4f15d860a3ae2fde08b23de946679212b82657aea889
-  data.tar.gz: 5483e31adbcf1a6533222c0a110fc3c5c31c3735e8b3713db8932a49a904e154
+  metadata.gz: e74e719ed6b734bda5a6a351f5dd2c6ae7c88b9b6b8454504e52ec3344162c08
+  data.tar.gz: 8c5b53516bd6d61ad97373e87148353c70c11cb68d2923baf9c671ad358acde6
 SHA512:
-  metadata.gz: b9ae171e632c80e2ec60058a4041631244ca95fab2cfacb111733aebb9d760b66e40d011e2f624dd4aa9a1e7c79e8af3c486d5c6a767880b2a8acc87ad70118f
-  data.tar.gz: 2e8e7c0cdc05ba2e5d6fe42cf661130f7477153857687cf969cacf95473357db4b30a6a900dcf2d5714bacfb40cfa1ba0c35d1366239b81a185a473e86629502
+  metadata.gz: d090f6c832663cb4f268eb866b9a4c1e4990f0abf96eb44e8d711da35e2c3ab16f21878e6947fa8e93fae45003040a8c691c8630c2c952b835d22f10c714a9b4
+  data.tar.gz: 927824b334eb77253a20cc58c34b2a21b9be5dc5082248efbe0a8bb02d1f74fe563d316717df902fe3a79a35834e854bfbe980882c16867f36f8e7be637aa54f

data/app/arguments.rb

@@ -2,9 +2,10 @@ require "option_parser"
 
 @options = {
   compile: false,
-  generate: false,
+  generate: nil,
   watch:   false,
   output:  Dir.pwd,
+  output_type: RubyJS::Constants::FILE_TYPE_O,
   source:  Dir.pwd,
   eslevel: Config::get_eslevel
 }
@@ -26,16 +27,24 @@ OptionParser.parse do |parser|
   parser.on( "-w", "--watch", "Watch scripts for changes and rerun commands." ) do
     @options[:watch] = true
   end
-  parser.on( "-c", "--compile", "Compile to JavaScript and save as .js files." ) do
+  parser.on( "-c", "--compile", "Compile to JavaScript and save as .#{@options[:output_type]} files." ) do
     @options[:compile] = true
   end
-  parser.on( "-g", "--generate", "Copies every rjs file into a single rjs file." ) do
-    @options[:generate] = true
+  parser.on( "-g PATH", "--generate PATH", "Copies every rjs file into a single rjs file." ) do |path|
+    if File.directory?(path)
+      @options[:generate] = path
+    else
+      @options[:generate] = ""
+    end
   end
   parser.on("-o DIR", "--output DIR", "Set the output path or path/filename\n" +
             "for compiled JavaScript." ) do |dir|
     @options[:output] = dir
   end
+  parser.on("-ot TYPE", "--output-type TYPE", "Set the output type.\n" +
+            "The default: #{@options[:output_type]}" ) do |type|
+    @options[:output_type] = type
+  end
   parser.on("-s DIR", "--source DIR", "Set the source path or path/filename\n" +
             "for RubyJS." ) do |dir|
     @options[:source] = dir

data/app/main.rb

@@ -7,7 +7,8 @@ def compile_fun path_f
   RubyJS.compile path_f, {
     eslevel: @options[:eslevel],
     path_s:  @options[:source],
-    path_o:  @options[:output]
+    path_o:  @options[:output],
+    type_o:  @options[:output_type],
   }
 end
 
@@ -22,8 +23,7 @@ end
 
 def generate
   if @options[:generate]
-    path_s = @options[:source]
-    code_j = RubyJS.generate_cj path_s
+    code_j = RubyJS.generate_cj @options[:source], @options[:generate]
     return code_j.get_ignore_r
   end
 

data/app/signals.rb

@@ -1,4 +1,4 @@
 Signal.trap("INT") do
-  puts "\nExiting"
+  puts "\n" + RubyJS::Helper.event_p("exiting")
   exit
 end

data/lib/option_parser.rb

@@ -1,7 +1,7 @@
 class OptionParser
 
 	LEFT = 2
-	MIDDLE = 28
+	MIDDLE = 30
 
     attr_reader :args
 

data/lib/ruby_js/code_join.rb

@@ -15,7 +15,7 @@ module RubyJS
 
       @json_cj = JsonParser.new File.join(path_s, FILE_HN)
       @json_cj.on :name, "project"
-      @json_cj.on :ignore, ["#{FILE_N}_.*.rjs", TEST_N]
+      @json_cj.on :ignore, ["#{FILE_N}_.*.rjs", TEST_N, "main.rjs"]
     end
 
     def add_file path_f
@@ -61,13 +61,13 @@ module RubyJS
           end
         end
       end
-      
+
       return files_c + files_nc
     end
 
     def extends_pos_class hash
-      fe_arr = []
-      fa_arr = []
+      fe_arr = []  # Extend class
+      fa_arr = []  # No extend class
       hash.each do |c, e|
         if e
           arr_c = [c, e]
@@ -91,8 +91,44 @@ module RubyJS
         end
       end
 
-      fe_arr_u = fe_arr.group_by{|x|x[1]}.values.map(&:last).reverse 
-      return fa_arr.clone.concat(fe_arr_u).to_s.gsub(/[\[\]\"]/, '').split(', ')
+      last_class = check_last_extend_class(fe_arr)
+
+      fe_arr_ue = []
+      fe_arr.each do |cs|
+        cs.each do |c|
+          fe_arr_ue << c
+        end
+      end
+      fe_arr_uniq = change_extend_class_position(last_class, fe_arr_ue.uniq)
+
+      return fa_arr.clone.concat(fe_arr_uniq)
+    end
+
+    def change_extend_class_position last_class, fe_arr_uniq
+      last_class.each do |c|
+        i_c = fe_arr_uniq.delete c
+        fe_arr_uniq.push c
+      end
+      return fe_arr_uniq
+    end
+
+    def check_last_extend_class fe_arr
+      last_class = []
+      fe_arr.each do |cs|
+        unless last_class.empty?
+          last_class.each do |c|
+            is_exist = cs.find_index(c)
+            if is_exist
+              last_class.delete(c)
+            end
+          end
+        end
+
+        if cs.length == 1
+          last_class << cs[0]
+        end
+      end
+      return last_class
     end
 
     def to_s

data/lib/ruby_js/constants.rb

@@ -1,6 +1,7 @@
 module RubyJS
   module Constants
     FILE_TYPE = 'rjs'
+    FILE_TYPE_O = 'js'
     APP_NAME  = 'rjsv'
   end
 end

data/lib/ruby_js/helper.rb

@@ -31,11 +31,11 @@ module RubyJS
       Dir.delete(path_dro) if Dir.empty? path_dro
     end
 
-    def self.event_p event, path_f
+    def self.event_p event, path_f = ""
       "#{Time.now.strftime("%l:%M:%S %p").lstrip} [#{Constants::APP_NAME}] #{event} #{path_f}"
     end
 
-    def self.absolute_path path_f, path_options, prefix = "js"
+    def self.absolute_path path_f, path_options, prefix
       path_ffr = path_f.sub("#{Dir.pwd}/", '').sub(path_options[:path_s], '').sub(Constants::FILE_TYPE, prefix)
       path_ffa = File.join(path_options[:path_o], path_ffr)
       path_ffa

data/lib/ruby_js/scaffold.rb

@@ -7,7 +7,7 @@ module RubyJS
       path_ao = File.join(Dir.pwd, project)
 
       puts "Scaffolding project in #{path_ao}..."
-      FileUtils.copy_entry path_as, path_ao
+      FileUtils.cp_r path_as, path_ao
 
       json_oc = JsonParser.new File.join(path_ao, "package.json")
       json_oc.parse :name, project.downcase

data/lib/ruby_js/version.rb

@@ -1,3 +1,3 @@
 module RubyJS
-  VERSION = "1.0.6"
+  VERSION = "1.0.8"
 end

data/lib/ruby_js.rb

@@ -19,7 +19,8 @@ module RubyJS
   end
 
   def self.compile path_f, options
-    path_o = Helper.absolute_path path_f, { path_s: options[:path_s], path_o: options[:path_o] }
+    path_o = Helper.absolute_path(path_f,
+      { path_s: options[:path_s], path_o: options[:path_o] }, options[:type_o])
 
     begin
       content_rb = Helper.open(path_f)
@@ -33,7 +34,7 @@ module RubyJS
     end
   end
 
-  def self.generate_cj path_s
+  def self.generate_cj path_s, path_g
     path_hfd = path_s
     unless File.exist?(File.join(path_s, CodeJoin::FILE_HN))
       path_hfd = Dir.pwd
@@ -50,7 +51,8 @@ module RubyJS
 
     name_f = "#{code_join.json_cj.parse(:name).downcase.gsub(' ', '_')}_" +
              "#{Time.now.strftime("%ya%m%d")}.#{Constants::FILE_TYPE}"
-    path_f = File.join(path_s, name_f)
+    path_w = path_g.empty? ? path_s : path_g
+    path_f = File.join(path_w, name_f)
     RubyJS::Helper.write(path_f, content_join)
     puts Helper.event_p("generated", path_f)
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyjs-vite
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Filip Vrba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2js