rubyjs-vite 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e29f893a32c27dccaecfb2e4a1ca9f58b4dbf2a293bf083e2d18f91856de5f
-  data.tar.gz: b34cd11ca9673abb54cf10b24e555dcfa6003787fb6634f968793fae7e631291
+  metadata.gz: c39af5daef081c5bc9c342f12d60d2638d5ee4d4da919248b8141f4d597dc60c
+  data.tar.gz: 9976bce372c776e1017f2803a5668bd18884c267ad267b121a1560381a298c05
 SHA512:
-  metadata.gz: b0d3b0c745905aa0bb5ff214bbcc35586e9423e33805f8e3bdce47ad9c1481880db2d4cbebafeb2d9d949f8e65a35f40520380347d637ff5f3a4c8fbad91ed67
-  data.tar.gz: 52f8b3751a57ecd83a4137dcafa157ac875ae57f48a8f5b40f214789af41fd331ffd55cbe2edb274e8d0d33cad2bfc16e7fa3ea05c53ee67b1f1c696a80a4099
+  metadata.gz: 8eea646c8f3a31ba4c855d5bbed5dbea5cf93f6bd37c63c814636faecf3757c776fbcff4b8f849fe1d814953ddba69b3458fee64d56a4fdb9df3fe6bf175dc8f
+  data.tar.gz: 4a0cb39723484ca3cbbf110f3d1722f647bbd4ed741b8f2b5c65bfbd63d34234c61ce07db82a67954c25020a757bd4afd9bafaeab5e818fb1906205ea7fffa12

data/app/arguments.rb

@@ -2,6 +2,7 @@ require "option_parser"
 
 @options = {
   compile: false,
+  generate: false,
   watch:   false,
   output:  Dir.pwd,
   source:  Dir.pwd,
@@ -22,11 +23,14 @@ OptionParser.parse do |parser|
     puts "Version is #{RubyJS::VERSION}"
     exit
   end
+  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
     @options[:compile] = true
   end
-  parser.on( "-w", "--watch", "Watch scripts for changes and rerun commands." ) do
-    @options[:watch] = true
+  parser.on( "-g", "--generate", "Copies every rjs file into a single rjs file." ) do
+    @options[:generate] = true
   end
   parser.on("-o DIR", "--output DIR", "Set the output path or path/filename\n" +
             "for compiled JavaScript." ) do |dir|

data/app/main.rb

@@ -15,10 +15,22 @@ def compile path_f
   if @options[:compile]
     compile_fun(path_f)
   else
-    puts "This '#{path_f}' file was edited, but it wasn't made into a js file."
+    puts RubyJS::Helper.event_p("warning", "This '#{path_f}' file was edited, " +
+                                "but it wasn't made into a js file.")
   end
 end
 
+def generate
+  if @options[:generate]
+    path_s = @options[:source]
+    code_j = RubyJS.generate_cj path_s
+    return code_j.get_ignore_r
+  end
+
+  return RubyJS::CodeJoin::TEST_N
+end
+ignore_cjfs = generate()
+
 if @options[:compile]
   RubyJS.get_files(@options[:source]).each do |path_f|
     compile_fun(path_f)
@@ -26,11 +38,13 @@ if @options[:compile]
 end
 
 if @options[:watch]
-  puts "There is now a watch for edited files."
+  puts RubyJS::Helper.event_p("message", "There is now a watch for edited files.")
   path_s = @options[:source]
   
   RubyJS::Helper.create_dir(path_s)
-  RubyJS.watch path_s do |modified, added, removed|
+  RubyJS.watch path_s, ignore_cjfs do |modified, added, removed|
+    generate()
+
     unless added.empty?
       compile(added.last)
     end

data/lib/ruby_js/code_join.rb

@@ -0,0 +1,117 @@
+require "json_parser"
+
+module RubyJS
+  FileS = Struct.new :path, :content, :class_rid
+
+  class CodeJoin
+    FILE_N = "FILE_N"
+    TEST_N = "test.rjs"
+    FILE_HN = ".codejoin"
+
+    attr_reader :json_cj
+
+    def initialize path_s
+      @files = []
+
+      @json_cj = JsonParser.new File.join(path_s, FILE_HN)
+      @json_cj.on :name, "project"
+      @json_cj.on :ignore, ["#{FILE_N}_.*.rjs", TEST_N]
+    end
+
+    def add_file path_f
+      content = File.open(path_f).read
+      i_c = content.index /class/
+      i_n = content.index(/\n/, i_c) if i_c
+      @files << FileS.new(path_f, content, [i_c, i_n])
+    end
+
+    def get_ignore_r
+      result = ""
+      @json_cj.parse(:ignore).each do |i|
+          result << i.sub(/#{FILE_N}/, @json_cj.parse(:name).downcase.gsub(' ', '_')).concat("$|")
+      end
+      return result.sub(/\|$/, '')
+    end
+
+    def get_pos_class
+      files_ch = {}
+      files_nc = []
+      @files.each do |f|
+        if f.class_rid[0]
+          r_class = f.content[f.class_rid[0], f.class_rid[1] - f.class_rid[0]]
+          r_class_s = r_class.split(' ')
+          _class = r_class_s[1]
+          _super = r_class_s[3]
+
+          files_ch[_class] = _super
+        else
+          files_nc << f
+        end
+      end
+
+      files_c = []
+      extends_pos_class(files_ch).each do |c|
+        @files.each do |f|
+          if f.class_rid[0]
+            r_class = f.content[f.class_rid[0], f.class_rid[1] - f.class_rid[0]]
+            if r_class.index("class #{c}")
+              files_c << f
+              break
+            end
+          end
+        end
+      end
+      
+      return files_c + files_nc
+    end
+
+    def extends_pos_class hash
+      fe_arr = []
+      fa_arr = []
+      hash.each do |c, e|
+        if e
+          arr_c = [c, e]
+          def e_loop hash, key
+            k = hash.dig(key)
+            if k
+              yield k
+              e_loop(hash, k) do |kk|
+                yield kk
+              end
+            end
+          end
+          e_loop(hash, e) do |k|
+            arr_c << k
+          end
+
+          arr_c.pop
+          fe_arr << arr_c.reverse
+        else
+          fa_arr << c
+        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(', ')
+    end
+
+    def to_s
+      result = ""
+      # " * Module Description" +
+      # " *" +
+      # " * @version #{}" +
+      # " * @date #{}" +
+      # " * @author #{}" +
+      # " * @remarks #{}" +
+      # " * @github #{}" +
+      # " */"
+
+      get_pos_class.each do |f_s|
+        content_e = f_s.content.gsub(/import.*\n/, '').gsub('export ', '').gsub('default ', '')
+        content_en = content_e[content_e.length - 1] == "\n" ? content_e : content_e.concat("\n")
+        result << content_en
+      end
+      return result
+    end
+  end
+end

data/lib/ruby_js/scaffold.rb

@@ -12,15 +12,20 @@ module RubyJS
       json_oc = JsonParser.new File.join(path_ao, "package.json")
       json_oc.parse :name, project.downcase
 
-      change_watch_f(path_ao)
+      json_cj = JsonParser.new File.join(path_ao, ".codejoin")
+      json_cj.parse :name, project.downcase
+
+      change_name_f(path_ao)
       install_vite(project, path_ao)
     end
 
-    def self.change_watch_f path_ao
-      path_bin_ao = "#{path_ao}/bin/watch"
-      content = Helper.open(path_bin_ao)
-      content_ch = content.sub("APP_NAME", Constants::APP_NAME)
-      Helper.write(path_bin_ao, content_ch)
+    def self.change_name_f path_ao
+      paths_bin_ao = ["#{path_ao}/bin/watch", "#{path_ao}/bin/generate"]
+      paths_bin_ao.each do |p|
+        content = Helper.open(p)
+        content_ch = content.sub("APP_NAME", Constants::APP_NAME)
+        Helper.write(p, content_ch)
+      end
     end
 
     def self.install_vite project, path_ao

data/lib/ruby_js/version.rb

@@ -1,3 +1,3 @@
 module RubyJS
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

data/lib/ruby_js.rb

@@ -8,9 +8,10 @@ module RubyJS
   require "ruby_js/helper"
   require "ruby_js/constants"
   require "ruby_js/scaffold"
+  require "ruby_js/code_join"
 
-  def self.watch path
-    listener = Listen.to(path, only: /\.#{Constants::FILE_TYPE}$/) do |modified, added, removed|
+  def self.watch path, ignore = ""
+    listener = Listen.to(path, only: /\.#{Constants::FILE_TYPE}$/, ignore: /#{ignore}/) do |modified, added, removed|
       yield modified, added, removed
     end
     listener.start
@@ -32,6 +33,30 @@ module RubyJS
     end
   end
 
+  def self.generate_cj path_s
+    path_hfd = path_s
+    unless File.exist?(File.join(path_s, CodeJoin::FILE_HN))
+      path_hfd = ROOT
+    end
+
+    code_join = CodeJoin.new path_hfd
+    get_files(path_s).each do |path_f|
+      unless path_f.index(/#{code_join.get_ignore_r}/)
+        code_join.add_file(path_f)
+      end
+    end
+
+    content_join = code_join.to_s
+
+    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)
+    RubyJS::Helper.write(path_f, content_join)
+    puts Helper.event_p("generated", path_f)
+    
+    return code_join
+  end
+
   def self.free path_f, options
     path_o = Helper.absolute_path path_f, options
     Helper.free path_o

data/share/template/bin/generate

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+APP_NAME -g -s src/rjs -o src/.js

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyjs-vite
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Filip Vrba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2js
@@ -55,10 +55,12 @@ files:
 - lib/json_parser.rb
 - lib/option_parser.rb
 - lib/ruby_js.rb
+- lib/ruby_js/code_join.rb
 - lib/ruby_js/constants.rb
 - lib/ruby_js/helper.rb
 - lib/ruby_js/scaffold.rb
 - lib/ruby_js/version.rb
+- share/template/bin/generate
 - share/template/bin/server
 - share/template/bin/watch
 - share/template/index.html