rubyjs-vite 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c39af5daef081c5bc9c342f12d60d2638d5ee4d4da919248b8141f4d597dc60c
-  data.tar.gz: 9976bce372c776e1017f2803a5668bd18884c267ad267b121a1560381a298c05
+  metadata.gz: d1ecaf5af46c82f3dc87b3581c2b1106a76d6c633c489e54df1c9ef2cd5c548e
+  data.tar.gz: de26dc30d23010a446198d9a19ac4dee7f9c2776ba91a2ff828b60d86806c07a
 SHA512:
-  metadata.gz: 8eea646c8f3a31ba4c855d5bbed5dbea5cf93f6bd37c63c814636faecf3757c776fbcff4b8f849fe1d814953ddba69b3458fee64d56a4fdb9df3fe6bf175dc8f
-  data.tar.gz: 4a0cb39723484ca3cbbf110f3d1722f647bbd4ed741b8f2b5c65bfbd63d34234c61ce07db82a67954c25020a757bd4afd9bafaeab5e818fb1906205ea7fffa12
+  metadata.gz: 5f12d19d2456635463aee1ec2cc23f07d122fa86f7512b3e4a146aff1d5ec202b0c6fd19f310917da745fc8d1bb8341b6083a4efea096cd74e893509136ef58d
+  data.tar.gz: 87803ac54cc51f22f5958b8ec7f2bdcb8fff7b3809fd68cf5f32db64b56281f8ae11dd00505aff15fc04507be197d47ef39a4ab87babd9f5b802ea31a01a28f1

data/app/arguments.rb

@@ -2,7 +2,7 @@ require "option_parser"
 
 @options = {
   compile: false,
-  generate: false,
+  generate: nil,
   watch:   false,
   output:  Dir.pwd,
   source:  Dir.pwd,
@@ -29,8 +29,12 @@ OptionParser.parse do |parser|
   parser.on( "-c", "--compile", "Compile to JavaScript and save as .js 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|

data/app/main.rb

@@ -22,8 +22,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/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/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.5"
+  VERSION = "1.0.7"
 end

data/lib/ruby_js.rb

@@ -33,10 +33,10 @@ 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 = ROOT
+      path_hfd = Dir.pwd
     end
 
     code_join = CodeJoin.new path_hfd
@@ -50,7 +50,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.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Filip Vrba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2js