svelte-on-rails 17.2.0 → 17.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7867513236366b778e446d0e305acb37a243b3e2a0ea63f333d0736d9909a7f
-  data.tar.gz: 5dfe1bf3789597b2b33d56fc102ccce99c0fe905776b8e7531a78a0f0a6a13c5
+  metadata.gz: 70e08415bf5e97d6c2e699732dfbf7eed1786ea048bcd1d1dfc270c9efb0ca66
+  data.tar.gz: 046e91b485de6bdef1f8b40c15d4d3aea40f4f4ba31f6766e73b9da91b71fd39
 SHA512:
-  metadata.gz: d2f4b058bf0c061780eb8f6c6ef6e5a3464931586e2f886b29bdcdbc078e34e7f3aa3fea8ccdd363a9f4749d1db2aa2d9fdc6aea14fe61190294ce953dfbcc73
-  data.tar.gz: f4d1796be38b2bd89bd6184bffce10f0103a0afd74aef9cf1f9a0ba0639b56a4575e6db5ff43bec1222004e057436a98628b1a5a0b0546a24bbd2db3009599ef
+  metadata.gz: 64a9ec0fe3b58cc8e428f442e43a215c878e2b02202e0d76ee163c3c90a8022bc618a0866a692b66c9574911ec3c2e6a13c53767e0a84311bc3b0a3a02a68fca
+  data.tar.gz: 1b9201b4eb287cf2b3f7f22204b61b1d50584912854a80da0a869a7681b698644d684b90f1a1fec71330c843b13858491b5b924c62dbb0ad893c6e1cd14b78ef

data/lib/generators/svelte_on_rails/install/install_generator.rb

@@ -5,7 +5,7 @@ module SvelteOnRails
     class InstallGenerator < Rails::Generators::Base
 
       class_option :force, type: :boolean, default: false, desc: "Do not ask for overwriting files"
-      # class_option :svelte_ssr_server, type: :boolean, default: false, desc: "Do not ask for overwriting files"
+      class_option :package_set, type: :string, default: '', desc: "Force installation of specific package"
 
       require 'svelte_on_rails/installer/utils'
       require 'svelte_on_rails/installer/haml'
@@ -23,15 +23,16 @@ module SvelteOnRails
         @sandboxes_dir = Rails.root.join('tmp', 'svelte-on-rails-installer-sandbox-tests')
         FileUtils.rm_rf(@sandboxes_dir) if @sandboxes_dir.exist?
 
-        if @gem_utils.vite_rails_in_gemfile?
+        nvi = [
+          'config/svelte_on_rails.yml',
+          'config/vite.json',
+          'vite.config.ts',
+          'vite-ssr.config.ts',
+        ].find { |f| Rails.root.join(f).exist? }
+        if nvi
+          @non_virgin_indicator = "#{nvi} found"
+        elsif @gem_utils.vite_rails_in_gemfile?
           @non_virgin_indicator = 'vite_rails found in Gemfile'
-        else
-          nvi = [
-            'config/vite.json',
-            'vite.config.ts',
-            'vite-ssr.config.ts',
-          ].find { |f| Rails.root.join(f).exist? }
-          @non_virgin_indicator = "#{nvi} found" if nvi
         end
 
         @installation_type = if options[:force]
@@ -43,7 +44,7 @@ module SvelteOnRails
                              end
       end
 
-      def installer_note
+      def print_header
         puts
         puts '=' * 80
         puts ' ▶︎▶︎▶︎ INSTALLING SVELTE-ON-RAILS'
@@ -54,6 +55,9 @@ module SvelteOnRails
         elsif @installation_type == :careful
           puts "  • Careful installation (#{@non_virgin_indicator})"
         end
+        if @package_set
+          puts "  • Package set: #{@package_set}"
+        end
         puts '=' * 80
       end
 
@@ -89,60 +93,78 @@ module SvelteOnRails
         vite = @npm_utils.inspect_package('vite')
         vite_plugin_svelte = @npm_utils.inspect_package('@sveltejs/vite-plugin-svelte')
 
-        if svelte && vite && vite_plugin_svelte
-          say "✓ required npm packages are already installed", :green
-          return
+        if svelte && vite && vite_plugin_svelte && !@installation_type == :force
+          if @package_set
+            say "Packages are already installed but force to #{@package_set}", :yellow
+          else
+            say "✓ required npm packages are already installed", :green
+            return
+          end
         end
 
-        always_required_packages = [
-          '@csedl/svelte-on-rails@latest',
-          'typescript@latest',
-          '@types/node@latest'
-        ]
-
         candidate_sets = [
-          [
-            ('svelte@latest' unless svelte),
-            ('vite@latest' unless vite),
-            ('@sveltejs/vite-plugin-svelte@latest' unless vite_plugin_svelte)
-          ].compact + always_required_packages,
-          [
-            'svelte@latest',
-            'vite@latest',
-            '@sveltejs/vite-plugin-svelte@latest'
-          ] + always_required_packages,
-          [
-            'svelte@~5.55.4',
-            'vite@~8.0.8',
-            '@sveltejs/vite-plugin-svelte@~7.0.0',
-            '@csedl/svelte-on-rails@latest',
-            'typescript@~6.0.2',
-            '@types/node@~25.6.0'
-          ]
+          {
+            key: :minimal,
+            title: 'Install missing packages only',
+            set: [
+              ('svelte@latest' unless svelte),
+              ('vite@latest' unless vite),
+              ('@sveltejs/vite-plugin-svelte@latest' unless vite_plugin_svelte),
+              '@csedl/svelte-on-rails@latest',
+              'typescript@latest',
+              '@types/node@latest'
+            ].compact
+          },
+          {
+            key: :latest,
+            title: 'Force latest package versions',
+            set: [
+              'svelte@latest',
+              'vite@latest',
+              '@sveltejs/vite-plugin-svelte@latest',
+              '@csedl/svelte-on-rails@latest',
+              'typescript@latest',
+              '@types/node@latest'
+            ]
+          },
+          {
+            key: :pinned,
+            title: 'Use pinned compatible versions',
+            set: [
+              'svelte@~5.55.4',
+              'vite@~8.0.8',
+              '@sveltejs/vite-plugin-svelte@~7.0.0',
+              '@csedl/svelte-on-rails@latest',
+              'typescript@~6.0.2',
+              '@types/node@~25.6.0'
+            ]
+          }
         ]
 
         # test install
 
         failed_packages = []
-        i = 0
-        passing_set = candidate_sets.find do |packages_to_try|
-          i += 1
-          tit = if i == 1
-                  "Checking npm dependencies in isolated sandbox"
-                else
-                  "FALLBACK #{i}"
-                end
+        puts "[Sandbox test] Running dependency checks in a isolated Sandbox within App-root/tmp"
+        set_keys = candidate_sets.map { |s| s[:key] }
+        if @package_set && !set_keys.include?(@package_set)
+          raise Thor::Error, "Invalid value for --package-set option: #{@package_set}, valid options are: #{set_keys.join(', ')}"
+        end
+        index = 0
+        passing_set = candidate_sets.find do |set_to_try|
+          title_suffix = (index == 0) ? ' (default)' : " (FALLBACK)"
+          index += 1
+          next if @package_set && set_to_try[:key] != @package_set
           r = SvelteOnRails::Installer::NpmSandbox.dry_run(
-            packages_to_try,
+            set_to_try[:set],
             project_root: Rails.root.to_s,
             sandboxes_root: @sandboxes_dir,
-            title: tit
+            title: set_to_try[:title] + title_suffix
           )
           @tmpdirs.push(r[:tmpdir])
-          if r[:success]
+          if r[:success] || @package_set && set_to_try[:key] == @package_set
             true
           else
-            failed_packages.push(packages_to_try)
+            failed_packages.push(set_to_try)
             false
           end
         end
@@ -154,7 +176,7 @@ module SvelteOnRails
           say "ERROR: Unable to fix dependency issues", :red
           say "Tried to test-installation within a TempDir, outside the project.", :red
           say "Theese attemtpts failed to install required packages:", :red
-          say " • #{failed_packages.map { |p| p.join(' + ') }.join("\n • ")}", :red
+          say " • #{failed_packages[:set].map { |p| p.join(' + ') }.join("\n • ")}", :red
           say "Installer cannot continue.", :red
           say "You must install theese packages and resolve dependency issues manually.", :red
           say "After resolved it, you can run this command again.", :red
@@ -166,16 +188,20 @@ module SvelteOnRails
 
         if passing_set.any?
           say "Ready to install:", :yellow unless svelte
-          say " • " + passing_set.join("\n • "), :yellow if passing_set.any?
+          say " • " + passing_set[:set].join("\n • "), :yellow if passing_set.any?
           loop do
-            break if @installation_type == :virgin
-            say "Continue? (Y/n)", :yellow unless svelte
-            input = STDIN.gets
-            answer = input.strip.downcase
-            if answer == "n" || answer == "no"
-              say "Installation aborted.", :red
-              exit(0)
-            elsif answer == "y" || answer == "yes"
+            break if @installation_type == :force
+            if !svelte || @package_set
+              say "Continue? (Y/n)", :yellow
+              input = STDIN.gets
+              answer = input.strip.downcase
+              if answer == "n" || answer == "no"
+                say "Installation aborted.", :red
+                exit(0)
+              elsif answer == "y" || answer == "yes"
+                break
+              end
+            else
               break
             end
           end
@@ -183,7 +209,7 @@ module SvelteOnRails
 
         # install packages
 
-        passing_set.each do |package|
+        passing_set[:set].each do |package|
 
           stdout, stderr, status = Open3.capture3("npm install #{package}", chdir: Rails.root)
 
@@ -197,11 +223,11 @@ module SvelteOnRails
             say "#{package} ✓", :green
           else
             puts "#{package} ✗"
-            puts '-'*80
+            puts '-' * 80
             puts stdout
-            puts '-'*80
+            puts '-' * 80
             warn stderr unless stderr.to_s.strip.empty?
-            puts '-'*80
+            puts '-' * 80
           end
         end
 
@@ -230,7 +256,7 @@ module SvelteOnRails
       def initial_questions
 
         @vite_source_code_dir = SvelteOnRails::Lib::Utils.vite_source_code_dir
-        if @vite_source_code_dir != 'app/frontend'
+        if @vite_source_code_dir != 'app/frontend' && @installation_type == :careful
           say "WARNING: The Vite source code directory is «#{@vite_source_code_dir}», instead of the usual «app/frontend», in config/vite.json.", :yellow
           q = "         Do you want to continue with «#{@vite_source_code_dir}»?"
           exit(0) unless @utils.ask_yn(q)
@@ -291,15 +317,24 @@ module SvelteOnRails
       # end
 
       def validate_raw_options!(args)
-        # Get option names from class_options, excluding inherited Thor/Rails options
-        valid_options = self.class.class_options.keys.map { |opt| "--#{opt.to_s.tr('_', '-')}" }
-        rails_internal_options = %w[--skip-namespace --skip-collision-check --pretend --quiet --force]
-        options_array = args.find { |arg| arg.is_a?(Array) && arg.any? { |a| a.start_with?('--') } } || []
-        passed_options = options_array.select { |arg| arg.start_with?('--') }
-        unknown_options = passed_options - valid_options - rails_internal_options
-        unless unknown_options.empty?
-          valid_display = valid_options.map { |opt| opt.gsub(/^--/, '') }.join(', ')
-          raise Thor::Error, "Unknown options: #{unknown_options.join(', ')}. Valid options are: #{valid_display}\nNothing done."
+        args.each do |arg|
+          if arg.present? && arg.is_a?(Array)
+            arg.each do |opt|
+
+              if opt.start_with?('--package-set=')
+                val = opt.split('=')[1]
+                if val.present? && val.is_a?(String)
+                  @package_set = val.to_sym
+                else
+                  raise Thor::Error, "Invalid value for --package-set option: #{val}"
+                end
+
+              elsif ['--force'].include?(opt)
+              else
+                raise Thor::Error, "Unknown option: #{opt}, valid options are: --force, --package-set=*"
+              end
+            end
+          end
         end
 
       end

data/lib/svelte_on_rails/installer/npm_sandbox.rb

@@ -37,7 +37,7 @@ module SvelteOnRails
         @tmpdir.mkpath
         @utils = Utils
 
-        puts "[Sandbox test] #{title}: #{@tmpdir} (#{packages.length} packages)"
+        puts "[Sandbox test] #{title}: #{@tmpdir.to_s[(Rails.root.to_s.length+1)..-1]} (#{packages.length} packages)"
         copy_package_files
       end
 
@@ -97,7 +97,7 @@ module SvelteOnRails
       end
 
       def test_package(pkg)
-        cmd = ["npm", "install", "--dry-run", "--ignore-scripts", pkg]
+        cmd = ["npm", "install", pkg]
         stdout, stderr, status = Open3.capture3(*cmd, chdir: @tmpdir)
 
         [status.success?, (stderr.to_s.strip.empty? ? stdout.to_s : stderr.to_s).strip]
@@ -110,11 +110,6 @@ module SvelteOnRails
 
         @utils.edit_vite_config_ts(File.join(@tmpdir, "vite.config.ts"))
 
-        @packages.each do |pkg|
-          cmd = ["npm", "install", pkg]
-          stdout, stderr, status = Open3.capture3(*cmd, chdir: @tmpdir)
-        end
-
         config_dir = File.join(@tmpdir, "config")
         FileUtils.mkdir_p(config_dir)
         File.write(
@@ -147,7 +142,6 @@ module SvelteOnRails
           JS
         )
 
-        Open3.capture3("npm", "install", "--ignore-scripts", "--no-audit", "--no-fund", chdir: @tmpdir)
         _stdout, stderr, status = Open3.capture3("npx", "vite", "build", chdir: @tmpdir)
 
         status.success? ? { success: true } : { success: false, error: stderr.to_s.strip }

data/lib/svelte_on_rails/installer/utils.rb

@@ -195,7 +195,7 @@ module SvelteOnRails
         to_create = paths.dup.reject { |p| File.exist?(p[2]) }
         continue = nil
 
-        if existing.present? && !dry_run
+        if existing.present? && !dry_run && ask_for_overwrite
           index = 0
           begin
             if index == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 17.2.0
+  version: 17.2.2
 platform: ruby
 authors:
 - Christian Sedlmair