webpacker-routes 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ace4cd3e92b5e779788f42c032b8227f8352cc124f72d5725ac08280125097
-  data.tar.gz: ca63b493a4a7f3f3115ca19a87883628cfdf864e2862b00d35c9e807af795e63
+  metadata.gz: 055ecdf48cffd4ebd36c9b3564203c9c6a461555a4bac52094b7883150708f58
+  data.tar.gz: 9fbab7703efe9952af0ac6ac3747480cf9e6e92e7c5023e48d9e5c247f53ac28
 SHA512:
-  metadata.gz: b2dec026375850eda7b48f59c0ffa89e17ccb36fc7f4ea87311047416aabd7fdfbaac2f53ec47a552c0e8c39b551a0ad8859df8a7dba5f4106a2bd53f23781de
-  data.tar.gz: ccf44fcf0f9e8c02b1de95b392a9992e3ed6646bd08bf11301d36bda1317347b256bcab93a83a197fd094436c8b7f27da742f499304b879b1d5b6662fce4b67d
+  metadata.gz: 5e71f761d6fa2a2e5acee218f952827938a5c1c36f6ad7d7575d474a5d474f1cbbb18736371f01a0aebde3eae11b274c4a76ea5b1985c726bb8c4b9919e7969d
+  data.tar.gz: 8dce45f1f1e0b7c9dc9d8ecf816544f92a5810d80d7227f32a4616d8aa910b6dea142a86ea63b032776a195044027e1662d50b1a701fa6fed3655ba4e50de717

data/README.md

@@ -19,6 +19,7 @@ Import individual routes from any Webpacker-compiled file:
 
 ```javascript
 import { root_path, root_url } from 'routes'
+import { engine_path } from 'routes/engine_name'
 
 root_path()
 // /

data/lib/install/template.rb

@@ -1,5 +1,5 @@
 say "Creating JavaScript app source directory"
-file Webpacker.config.routes_path.join('.gitignore'), "/index.js\n"
+file Webpacker.config.routes_path.join('.gitignore'), "*\n!.gitignore\n"
 
 say "Installing all JavaScript dependencies"
 run "yarn add webpacker-routes@#{Webpacker::Routes::VERSION} --exact"

data/lib/webpacker/routes.rb

@@ -22,42 +22,71 @@ module Webpacker
         default_url_options.merge!(config.default_url_options)
         default_url_options.except!(*IGNORED_OPTIONS)
 
+        parent_spec_var = var_name.call('parent_spec')
         default_url_options_var = var_name.call('default_url_options')
 
-        js_file = Webpacker.config.routes_path.join('index.js')
+        route_sets = [[app.routes, nil, Webpacker.config.routes_path]]
+        visited_directories = []
 
-        catch(:identical) do
-          File.atomic_write(js_file) do |temp_file|
-            temp_file.write(<<-JAVASCRIPT.strip_heredoc)
-              import { urlFor, pathFor } from 'webpacker-routes'
-              const #{default_url_options_var} = #{js(default_url_options)}
-            JAVASCRIPT
+        while (route_set, parent, directory = route_sets.shift)
+          directory.mkpath
+          visited_directories << directory
+          js_file = directory.join('index.js')
 
-            app.routes.named_routes.sort_by(&:first).each do |name, route|
-              raise `Invalid route name for javascript: ${name}` unless JAVASCRIPT_VARIABLE_NAME_REGEX =~ name
-
-              spec = route.path.spec.to_s
-              segment_keys = route.segment_keys.uniq
-              options = route.defaults.except(*IGNORED_OPTIONS)
-
-              spec_var = var_name.call("#{name}_spec")
-              url_var = var_name.call("#{name}_url")
-              path_var = var_name.call("#{name}_path")
+          catch(:identical) do
+            File.atomic_write(js_file) do |temp_file|
+              parent_var_definition = if parent
+                "import { #{parent} as #{parent_spec_var} } from '../'"
+              else
+                "const #{parent_spec_var} = null"
+              end
 
               temp_file.write(<<-JAVASCRIPT.strip_heredoc)
-                const #{spec_var} = [#{js(spec)}, #{js(segment_keys)}, { ...#{default_url_options_var}, ...#{js(options)} }]
-                export const #{url_var} = (...args) => urlFor(#{spec_var}, ...args)
-                export const #{path_var} = (...args) => pathFor(#{spec_var}, ...args)
+                import { urlFor, pathFor } from 'webpacker-routes'
+                #{parent_var_definition}
+                const #{default_url_options_var} = #{js(default_url_options)}
               JAVASCRIPT
-            end
 
-            temp_file.close
-            if identical?(js_file.to_s, temp_file.path)
-              temp_file.unlink
-              throw :identical
+              route_set.named_routes.sort_by(&:first).each do |name, route|
+                raise `Invalid route name for javascript: ${name}` unless JAVASCRIPT_VARIABLE_NAME_REGEX =~ name
+
+                spec = route.path.spec.to_s
+                segment_keys = route.segment_keys.uniq
+                options = route.defaults.except(*IGNORED_OPTIONS)
+
+                spec_var = var_name.call("#{name}_spec")
+                url_var = var_name.call("#{name}_url")
+                path_var = var_name.call("#{name}_path")
+
+                temp_file.write(<<-JAVASCRIPT.strip_heredoc)
+                  export const #{spec_var} = [#{js(spec)}, #{js(segment_keys)}, { ...#{default_url_options_var}, ...#{js(options)} }, #{parent_spec_var}]
+                  export const #{url_var} = (...args) => urlFor(#{spec_var}, ...args)
+                  export const #{path_var} = (...args) => pathFor(#{spec_var}, ...args)
+                JAVASCRIPT
+
+                if engine?(route)
+                  engine = rack_app(route)
+                  engine_name = engine.railtie_name
+
+                  raise `Invalid engine name for javascript: ${engine_name}` unless JAVASCRIPT_VARIABLE_NAME_REGEX =~ engine_name
+
+                  engine_name_var = var_name.call(engine_name)
+
+                  route_sets << [engine.routes, spec_var, directory.join(engine_name_var)]
+                end
+              end
+
+              temp_file.close
+              if identical?(js_file.to_s, temp_file.path)
+                temp_file.unlink
+                throw :identical
+              end
             end
           end
         end
+
+        extra_directories = Webpacker.config.routes_path.glob('**/*').select(&:directory?) - visited_directories
+        extra_directories.sort_by { |directory| directory.to_s.size }.reverse_each(&:rmtree)
       end
 
     private
@@ -71,6 +100,15 @@ module Webpacker
       rescue Errno::ENOENT
         false
       end
+
+      def rack_app(route)
+        route.app.app
+      end
+
+      def engine?(route)
+        app = rack_app(route)
+        app.is_a?(Class) && app < Rails::Engine
+      end
     end
   end
 end

data/lib/webpacker/routes/version.rb

@@ -1,5 +1,5 @@
 module Webpacker
   module Routes
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpacker-routes
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,7 +84,8 @@ files:
 homepage: https://github.com/davishmcclurg/webpacker-routes
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/davishmcclurg/webpacker-routes
 post_install_message: 
 rdoc_options: []
 require_paths: