rubyjs-vite 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8be56a5cd62d9c0cc4751a44ea778fbee3dabead90381f28e3d8664c2266f3
-  data.tar.gz: d4af48e85e48a5deef17f59620e9a558930b463fc5b33338daeb04cdde15d5ee
+  metadata.gz: a31e0e75faaeba2ed338cacc961aa931983d8c5d0b05952dcc11da4db3845ffb
+  data.tar.gz: a78a09246f00a73615405922aca8b6bdcecb6b51e72485fe87fef8e2c15c3a71
 SHA512:
-  metadata.gz: ad86cf0733735f3cd6290881c9dff9b247459035801e46b82f8d1660f6bdb59c13a8b83b1027c6f14ee0358b8b9825dca646ee93cfe24c333100ab8f2a3f1de0
-  data.tar.gz: 63c92ff729d76d0ea5d55df1712e4731f06c944ecedd58e9723e71f1f26b7cccc00289932a87b2e8a1b0cd50fd16b67a45b0d1be3cc17e47784b4674d13afa48
+  metadata.gz: 4283995ad07250069d1641ea613206df45d7b5ded6a4cfb1e5847abf3d5aff2bc48194edf7f4c00f1cddacb584da47de0e21158403e15ca776b8db0be03c24dd
+  data.tar.gz: 7490c439c8e2626708ea9ad8808787ca31b1e88c760fce91609b35e34fc14ba50a178e496bb4f7780d5790a46a29f19a817ce00efce21d900a1aad0b7dd0bad5

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/json_parser.rb

@@ -11,7 +11,7 @@ class JsonParser
   end
 
   def on symbol, value
-    if exist?
+    unless @db.include?(symbol.to_s)
       parse symbol, value
     end
   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/helper.rb

@@ -23,8 +23,12 @@ module RubyJS
       file.close
     end
 
-    def self.free path_o
-      File.delete(path_o) if File.exists? path_o
+    def self.free path_fro
+      # File
+      File.delete(path_fro) if File.exists? path_fro
+      # Dir
+      path_dro = File.dirname(path_fro)
+      Dir.delete(path_dro) if Dir.empty? path_dro
     end
 
     def self.event_p event, path_f

data/lib/ruby_js/scaffold.rb

@@ -12,6 +12,9 @@ module RubyJS
       json_oc = JsonParser.new File.join(path_ao, "package.json")
       json_oc.parse :name, project.downcase
 
+      json_cj = JsonParser.new File.join(path_ao, ".codejoin")
+      json_cj.parse :name, project.downcase
+
       change_watch_f(path_ao)
       install_vite(project, path_ao)
     end

data/lib/ruby_js/version.rb

@@ -1,3 +1,3 @@
 module RubyJS
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyjs-vite
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Filip Vrba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2js
@@ -38,12 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-description: |-
-  Web applications may be made with the help of RubyJS Vite. The programmer can avoid using JS syntax, which is helpful. Everything is done automatically; all you have to do is start the server and build a project using scaffolding.
-
-  Write your code using the JS api and Ruby syntax, and the server will automatically translate it. It then stores it in a file with the extension ".js". You will then be able to publish the project to [Vercel](https://vercel.com/) or directly to the [NPM package](https://www.npmjs.com/), and you will have a website that is written in the native JS language.
-
-  See GitHub for further information. |> https://github.com/filipvrba/ruby-js
+description: Using this translation tool, you can run Vite server and write code in
+  Ruby syntax using JS API. See GitHub for further information. |> https://github.com/filipvrba/ruby-js
 email: filipvrbaxi@gmail.com
 executables:
 - rjsv
@@ -59,6 +55,7 @@ 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
@@ -90,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Converts the syntax of ruby into javascript.