svelte-on-rails 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9c8ec95be856becb268359d375e01f376f5b3024d9221db30cedae9ac9a72a
-  data.tar.gz: faf4829d8d7578c179671c1da34c03052cf9cbb4ffecc5ae0594919a44cee197
+  metadata.gz: 343a3e6cdeed188bf622f4152032d851ab1db1b36cb36be7b4948df673d2cb13
+  data.tar.gz: cd28b8497abeff07f802e0ab71ac543ccb61e1504587ff79bcbbea5c1aeb2fec
 SHA512:
-  metadata.gz: 160ebff8d660ff911ae53a8a6ffec3d279e1d628acd7c8d3ab8260aa4084af3b71a1d9f3ac062ae1a8db186279e5bcab713ef68b2f9b1d47c2446860f6f1d871
-  data.tar.gz: c03ca0029d17f5a6a2507d696fe050d58e57c3f2dd06d916fd94bc93265a3f0b788fe72b0eeba7fa584b66dc80a0cd1fdefd0dad774ab2d043eeeb65bfaf4ad5
+  metadata.gz: 84a171bc560f4fe9e4ffe2ec5017f92a2e046f0e146f979f5282344ca20c195215730e6b43f2b798c810e6bc1d7840f1f095fd3a6af6b30f0b84e0589d4792cb
+  data.tar.gz: 8f091933d50d584686825c5c4a5dcd75f740194af2d81765ccc6b060aafd25c017a6e0f0a4b3b84c21c6e1d47a470b95b6c1761e0b20778df56aa0c0df07f2c5

data/lib/svelte-on-rails.rb

@@ -1,6 +1,9 @@
 require "svelte_on_rails/configuration"
 require "svelte_on_rails/view_helpers"
-require "svelte_on_rails/render_server_side"
+require "svelte_on_rails/renderer/renderer"
+require "svelte_on_rails/compiler/compiler"
+require "svelte_on_rails/lib/utils"
+require "svelte_on_rails/lib/initializable"
 require "svelte_on_rails/railtie" if defined?(Rails)
 
 # installer

data/lib/svelte_on_rails/{compile.js → compiler/compile.js}

@@ -2,24 +2,25 @@
 
 import path from 'path';
 import fs from 'fs/promises';
+import {rawResolver, stringPlugin, ssrExternals} from "./customPlugins.js";
 
-// Argumente: inputFile, outputDir, gemPath
+// Arguments: inputFile, outputDir, gemPath
 const args = process.argv.slice(2);
 const inputFile = args[0];
 const outputDir = args[1];
 const gemPath = args[2];
 
 if (!inputFile || !outputDir || !gemPath) {
-    console.error('Fehler: inputFile, outputDir und gemPath müssen angegeben werden.');
-    console.error('Verwendung: node script.js <inputFile> <outputDir> <gemPath>');
+    console.error('Error: inputFile, outputDir, and gemPath must be specified.');
+    console.error('Usage: node script.js <inputFile> <outputDir> <gemPath>');
     process.exit(1);
 }
 
-// Sicherstellen, dass gemPath existiert
+// Ensure that gemPath exists
 try {
     await fs.access(gemPath);
 } catch (error) {
-    console.error(`Fehler: Der gemPath "${gemPath}" existiert nicht.`);
+    console.error(`Error: The gemPath "${gemPath}" does not exist.`);
     process.exit(1);
 }
 
@@ -27,10 +28,10 @@ const fileName = path.basename(inputFile, '.svelte');
 const outputFile = path.join(outputDir, `${fileName}.js`);
 const outputCss = path.join(outputDir, `${fileName}.css`);
 
-// Pfad zu node_modules im Gem
+// Path to node_modules in the gem
 const gemNodeModules = path.join(gemPath, 'node_modules');
 
-// Dynamische Importe der Build-Tools aus dem Gem
+// Dynamic imports of build tools from the gem
 const { rollup } = await import(path.join(gemNodeModules, 'rollup', 'dist', 'rollup.js'));
 const svelte = await import(path.join(gemNodeModules, 'rollup-plugin-svelte', 'index.js')).then(m => m.default);
 const resolve = await import(path.join(gemNodeModules, '@rollup', 'plugin-node-resolve', 'dist', 'es', 'index.js')).then(m => m.default);
@@ -39,64 +40,6 @@ const url = await import(path.join(gemNodeModules, '@rollup', 'plugin-url', 'dis
 const css = await import(path.join(gemNodeModules, 'rollup-plugin-css-only', 'dist', 'index.mjs')).then(m => m.default);
 const { sveltePreprocess } = await import(path.join(gemNodeModules, 'svelte-preprocess', 'dist', 'index.js'));
 
-// Plugin für Raw-Importe
-function rawResolver() {
-    return {
-        name: 'raw-resolver',
-        resolveId(source, importer) {
-            console.log(`Raw-Resolver: source=${source}, importer=${importer}`);
-            if (source.endsWith('?raw')) {
-                const actualSource = source.replace('?raw', '');
-                const resolved = path.resolve(path.dirname(importer), actualSource);
-                console.log(`Raw-Resolver: Auflösen von ${source} zu ${resolved}?raw`);
-                return `${resolved}?raw`;
-            }
-            return null;
-        },
-    };
-}
-
-function stringPlugin() {
-    return {
-        name: 'string',
-        async load(id) {
-            if (id.endsWith('?raw')) {
-                console.log(`String-Plugin: Lade ${id}`);
-                const actualId = id.replace('?raw', '');
-                try {
-                    const content = await fs.readFile(actualId, 'utf-8');
-                    console.log(`String-Plugin: Inhalt von ${actualId} geladen (Auszug): ${content.substring(0, 50)}...`);
-                    return `export default ${JSON.stringify(content)};`;
-                } catch (error) {
-                    console.error(`String-Plugin: Fehler beim Laden von ${actualId}:`, error);
-                    throw error;
-                }
-            }
-            return null;
-        },
-    };
-}
-
-// Plugin, um browser-spezifische Module im SSR zu ignorieren
-function ssrExternals() {
-    return {
-        name: 'ssr-externals',
-        resolveId(source) {
-            // Ignoriere Module wie axios während SSR
-            if (source === 'axios' || source.includes('form-data')) {
-                return { id: 'void 0', external: true };
-            }
-            return null;
-        },
-        load(id) {
-            if (id === 'void 0') {
-                return 'export default null;';
-            }
-            return null;
-        }
-    };
-}
-
 const rollupConfig = {
     input: inputFile,
     output: {
@@ -104,17 +47,17 @@ const rollupConfig = {
         format: 'esm',
     },
     external: [
-        // Node.js-Built-ins, die nicht gebundelt werden sollen
+        // Node.js built-ins that should not be bundled
         'fs', 'path', 'url', 'module', 'http', 'https', 'zlib', 'stream', 'buffer',
-        // Browser-spezifische Module, die im SSR ignoriert werden
+        // Browser-specific modules ignored during SSR
         'axios', 'form-data'
     ],
     onwarn(warning, warn) {
-        // Ignoriere bestimmte Warnungen, z. B. Circular Dependencies
+        // Ignore certain warnings, e.g., Circular Dependencies
         if (warning.code === 'CIRCULAR_DEPENDENCY') {
             return;
         }
-        // Ignoriere Warnungen für leere Chunks oder unbenutzte externe Module
+        // Ignore warnings for empty chunks or unused external modules
         if (warning.code === 'EMPTY_BUNDLE' || warning.code === 'UNUSED_EXTERNAL_IMPORT') {
             return;
         }
@@ -129,7 +72,7 @@ const rollupConfig = {
                 generate: 'ssr',
                 hydratable: false
             },
-            // Ignoriere browser-spezifische Module während SSR
+            // Ignore browser-specific modules during SSR
             onwarn(warning, handler) {
                 if (warning.code === 'MISSING_EXPORT' && warning.exporter.includes('axios')) {
                     return;
@@ -152,32 +95,32 @@ const rollupConfig = {
             exportConditions: ['svelte', 'server'],
             modulePaths: [gemNodeModules],
             extensions: ['.mjs', '.js', '.cjs', '.ts'],
-            // Bevorzuge Node-spezifische Module
+            // Prefer Node-specific modules
             mainFields: ['main', 'module']
         }),
         commonjs({
-            // Behandle CommonJS-Module explizit
+            // Explicitly handle CommonJS modules
             include: [/node_modules/],
-            // Transformiere gemischte ES/CommonJS-Module
+            // Transform mixed ES/CommonJS modules
             transformMixedEsModules: true
         }),
-        ssrExternals() // Neues Plugin zum Ignorieren von axios und form-data
+        ssrExternals() // New plugin to ignore axios and form-data
     ],
 };
 
-// Rollup-Build
+// Rollup build
 async function compile() {
     try {
         const startTime = performance.now();
         const bundle = await rollup(rollupConfig);
         await bundle.write(rollupConfig.output);
         await bundle.close();
-        console.log(`Build erfolgreich: ${outputFile} und ${outputCss}`);
+        console.log(`Build successful: ${outputFile} and ${outputCss}`);
         const endTime = performance.now();
         const duration = (endTime - startTime).toFixed(2);
-        console.log(`Ausführungszeit: ${duration} ms`);
+        console.log(`Execution time: ${duration} ms`);
     } catch (error) {
-        console.error('Build fehlgeschlagen:', error);
+        console.error('Build failed:', error);
         process.exit(1);
     }
 }

data/lib/svelte_on_rails/compiler/compiler.rb

@@ -0,0 +1,115 @@
+module SvelteOnRails
+
+  class Compiler
+
+      require 'open3'
+      def initialize(filename, base_path: SvelteOnRails::Configuration.instance.components_folder_full)
+
+        utils = SvelteOnRails::Lib::Utils
+        @files = utils.component_files(filename, base_path: base_path)
+
+      end
+
+      # compiler
+      def compile_if_changes
+
+        # letzte Änderung innerhalb des ordners ermitteln
+
+        watch_changes = SvelteOnRails::Configuration.instance.watch_changes?
+        ts_file = SvelteOnRails::Configuration.instance.dist_folder.join('reset_timestamp')
+
+        have_changes = if watch_changes && File.exist?(ts_file)
+
+                         # compare last modification timestamp
+                         last_modification = 100.years.ago.to_time
+                         Dir.glob("#{SvelteOnRails::Configuration.instance.components_folder}**/*").each do |path|
+                           if File.file?(path)
+                             mtime = File.mtime(path)
+                             if mtime > last_modification
+                               last_modification = mtime
+                             end
+                           end
+                         end
+                         File.mtime(ts_file) < last_modification
+
+                       elsif watch_changes
+                         true
+                       elsif !File.exist?(ts_file)
+                         true
+                       else
+                         false
+                       end
+
+        if have_changes || !File.exist?(compiled_js_file) || !File.exist?(compiled_css_file)
+          if have_changes || (!File.exist?(ts_file) && watch_changes)
+            self.class.reset_dist
+          end
+          compile
+        end
+      end
+
+      def compiled_js_file
+        @files[:compiled_file] + '.js'
+      end
+
+      def compiled_css_file
+        @files[:compiled_file] + '.css'
+      end
+
+      def compiled_file
+        @files[:compiled_file]
+      end
+
+      def compile
+
+        start_time = Time.now
+
+        cnf = SvelteOnRails::Configuration.instance
+        subs = @files[:svelte_filename].split('/')[0..-2].join('/')
+        dist = cnf.dist_folder + cnf.components_folder + subs
+        utils = SvelteOnRails::Lib::Utils
+
+        cmd = [
+          'node',
+          utils.gem_app_dir + 'compiler/compile.js',
+          @files[:svelte_file],
+          dist,
+          utils.gem_app_dir
+        ].join(' ')
+
+        stdout, stderr, status = Open3.capture3(cmd, chdir: SvelteOnRails::Configuration.instance.rails_root)
+
+        unless status.to_s.match(/^pid [0-9]+ exit 0$/)
+          raise "Compiling «#{@files[:svelte_filename]}» Server-side, script compile.js, executed within Rails.root:\n\n#{cmd}\n\n++++++\n\n#{stderr}\n\n++++++\n\n"
+        end
+
+        time = Time.now - start_time
+        Rails.logger.info "  Compiled #{@files[:svelte_filename]}.js: #{time.round(3)}ms" rescue nil
+      end
+
+      def self.reset_dist
+        unless Dir.exist?(SvelteOnRails::Configuration.instance.dist_folder)
+          FileUtils.mkdir_p(SvelteOnRails::Configuration.instance.dist_folder)
+        end
+        FileUtils.rm_rf Dir.glob("#{SvelteOnRails::Configuration.instance.dist_folder}/*")
+        FileUtils.touch SvelteOnRails::Configuration.instance.dist_folder.join('reset_timestamp')
+      end
+
+      def self.reset_and_compile_all
+        SvelteOnRails::RenderServerSide.reset_dist
+        cnf = SvelteOnRails::Configuration.instance
+        frontend_folder = cnf.frontend_folder_full
+        sveltes = Dir.glob(cnf.frontend_folder_full.join('**/*.svelte'))
+        sveltes.each_with_index do |file, ind|
+          comp_name = file.to_s[(cnf.frontend_folder_full.to_s.length + 1)..-1]
+
+          n = SvelteOnRails::RenderServerSide.new(comp_name, base_path: frontend_folder)
+          n.compile
+
+          puts "compiled #{ind + 1}/#{sveltes.length}: #{comp_name}"
+
+        end
+      end
+
+    end
+end

data/lib/svelte_on_rails/compiler/customPlugins.js

@@ -0,0 +1,60 @@
+import path from 'path';
+import fs from 'fs/promises';
+
+// Plugin for raw imports
+export function rawResolver() {
+    return {
+        name: 'raw-resolver',
+        resolveId(source, importer) {
+            console.log(`Raw-Resolver: source=${source}, importer=${importer}`);
+            if (source.endsWith('?raw')) {
+                const actualSource = source.replace('?raw', '');
+                const resolved = path.resolve(path.dirname(importer), actualSource);
+                console.log(`Raw-Resolver: Resolving ${source} to ${resolved}?raw`);
+                return `${resolved}?raw`;
+            }
+            return null;
+        },
+    };
+}
+
+export function stringPlugin() {
+    return {
+        name: 'string',
+        async load(id) {
+            if (id.endsWith('?raw')) {
+                console.log(`String-Plugin: Loading ${id}`);
+                const actualId = id.replace('?raw', '');
+                try {
+                    const content = await fs.readFile(actualId, 'utf-8');
+                    console.log(`String-Plugin: Content of ${actualId} loaded (excerpt): ${content.substring(0, 50)}...`);
+                    return `export default ${JSON.stringify(content)};`;
+                } catch (error) {
+                    console.error(`String-Plugin: Error loading ${actualId}:`, error);
+                    throw error;
+                }
+            }
+            return null;
+        },
+    };
+}
+
+// Plugin to ignore browser-specific modules during SSR
+export function ssrExternals() {
+    return {
+        name: 'ssr-externals',
+        resolveId(source) {
+            // Ignore modules like axios during SSR
+            if (source === 'axios' || source.includes('form-data')) {
+                return { id: 'void 0', external: true };
+            }
+            return null;
+        },
+        load(id) {
+            if (id === 'void 0') {
+                return 'export default null;';
+            }
+            return null;
+        }
+    };
+}

data/lib/svelte_on_rails/configuration.rb

@@ -59,8 +59,13 @@ module SvelteOnRails
     end
 
     def dist_folder
-      rails_root.join('public', 'svelte-dist')
+      rails_root.join('public', 'svelteDist')
     end
+
+    def system_type
+      :vite_rails
+    end
+
     private
 
     def load_yaml_config

data/lib/svelte_on_rails/installer/rails_template/app/frontend/javascript/components/SvelteOnRailsHelloWorld.svelte

@@ -1,6 +1,6 @@
 <script>
     import svgRaw from '../../images/svg.svg?raw'
-    import svg from '../../images/svg.svg'
+    //import svg from '../../images/svg.svg'
     import png from '../../images/check-circle-green.png'
     import Nested from './sub/NestedComponent.svelte'
     import {nestedJavascriptFunction} from '../nestedJavascript.js'
@@ -27,9 +27,8 @@
     </ul>
 
     <hr/>
-    <p>Images on various ways</p>
     <span class="wrap-svg">{@html svgRaw}</span>
-    <img alt="svg ERROR" src={svg} />
+    <!--    <img alt="svg ERROR" src={svg} />-->
     <img alt="png ERROR" src={png} />
 
     <hr/>

data/lib/svelte_on_rails/lib/initializable.rb

@@ -0,0 +1,17 @@
+module SvelteOnRails
+
+  module Lib
+    module Initializable
+      def initialize(filename, base_path: SvelteOnRails::Configuration.instance.components_folder_full)
+
+        fn = (filename.match(/\.svelte$/) ? filename[0..-8] : filename)
+        @svelte_file = base_path + filename
+        @svelte_filename = filename
+        cnf = SvelteOnRails::Configuration.instance
+        cf = cnf.dist_folder + cnf.components_folder + fn
+        @compiled_file = cf.to_s
+
+      end
+    end
+  end
+end

data/lib/svelte_on_rails/lib/utils.rb

@@ -0,0 +1,35 @@
+module SvelteOnRails
+  module Lib
+    class Utils
+
+      def self.gem_app_dir
+        File.expand_path('../../svelte_on_rails', __dir__) + '/'
+      end
+
+      def self.file_exist_case_sensitive?(containing_dir, filename)
+        # Combine the directory path and filename
+        full_path = File.join(containing_dir, filename)
+
+        # Check if the file exists and the path matches case-sensitively
+        File.exist?(full_path) && Dir[File.join(containing_dir, "**/*")].any? do |f|
+          f == full_path
+        end
+      end
+
+      def self.component_files(filename, base_path: SvelteOnRails::Configuration.instance.components_folder_full)
+        fn = (filename.match(/\.svelte$/) ? filename[0..-8] : filename)
+        svelte_file = (base_path + fn).to_s + '.svelte'
+        svelte_filename = fn + '.svelte'
+        cnf = SvelteOnRails::Configuration.instance
+        cf = cnf.dist_folder + cnf.components_folder + fn
+
+        {
+          svelte_file: svelte_file,
+          svelte_filename: svelte_filename,
+          compiled_file: cf.to_s
+        }
+      end
+
+    end
+  end
+end

data/lib/svelte_on_rails/renderer/render.js

@@ -0,0 +1,19 @@
+import {loadComponentModule, readPropsFromStdin} from './utils.js';
+
+(async () => {
+
+    const MyComponent = await loadComponentModule(process.argv[2]);
+    const props = await readPropsFromStdin();
+    const payload = {out: ''};
+
+    try {
+        MyComponent(payload, props); // Writes directly to payload.out
+    } catch (error) {
+        console.error('Error rendering component:', error);
+        process.exit(1);
+    }
+
+    const res = {status: 'SUCCESS', html: payload.out};
+    console.log(JSON.stringify(res));
+})();
+

data/lib/svelte_on_rails/renderer/renderer.rb

@@ -0,0 +1,52 @@
+module SvelteOnRails
+  class Renderer
+
+    require 'open3'
+
+    def initialize(compiled_file: nil, component_name: nil, base_path: SvelteOnRails::Configuration.instance.components_folder_full)
+
+      @compiled_file = if compiled_file
+                         compiled_file
+                       elsif component_name
+                         utils = SvelteOnRails::Lib::Utils
+                         cf = utils.component_files(component_name, base_path: base_path)
+                         cf[:compiled_file]
+                       else
+                         raise "Either compiled_file or component_name must be given"
+                       end
+    end
+
+    # render
+
+    def render(props = {})
+      require 'base64'
+      require 'json'
+      utils = SvelteOnRails::Lib::Utils
+
+      cmd = [
+        'node',
+        '/Users/christian/projects-gmbh/gems/svelte-on-rails/svelte-on-rails-gem/lib/svelte_on_rails/renderer/render.js',
+        @compiled_file + '.js',
+        SvelteOnRails::Configuration.instance.rails_root
+      ].join(' ')
+
+      stdout, stderr, status = Open3.capture3(cmd, stdin_data: props.to_json, chdir: utils.gem_app_dir)
+
+      unless status.to_s.match(/^pid [0-9]+ exit 0$/)
+        raise "Render Svelte Server-side =>\n#{cmd}\n\nError output from render.js (stderr) =>\n+++\n" + stderr + "+++\n\n"
+      end
+
+      begin
+        res = JSON.parse(stdout)
+        css_file = @compiled_file + '.css'
+        if File.exist?(css_file)
+          res['css'] = File.read(css_file)
+        end
+        return res
+      rescue JSON::ParserError => e
+        raise "Render Svelte Server-side: Expected JSON, got: «#{stdout}»"
+      end
+    end
+
+  end
+end

data/lib/svelte_on_rails/renderer/utils.js

@@ -0,0 +1,39 @@
+import {fileURLToPath} from 'node:url';
+import {dirname, resolve} from 'node:path';
+
+export async function loadComponentModule(compiledFile) {
+    // Get the directory of the current script
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = dirname(__filename);
+
+    try {
+        // Convert relative path to absolute path
+        const absolutePath = resolve(__dirname, compiledFile);
+
+        // Convert absolute path to a file URL
+        const modulePath = `file://${absolutePath}`;
+
+        // Import the module
+        const module = await import(modulePath);
+        return module.default;
+    } catch (error) {
+        console.error(`Error loading component from ${compiledFile}:`, error);
+        process.exit(1);
+    }
+}
+
+export function readPropsFromStdin() {
+    return new Promise((resolve, reject) => {
+        let input = '';
+        process.stdin.setEncoding('utf8');
+        process.stdin.on('data', (chunk) => (input += chunk));
+        process.stdin.on('end', () => {
+            try {
+                resolve(JSON.parse(input));
+            } catch (error) {
+                reject(new Error(`Error parsing JSON from STDIN: ${error.message}\nInput: «${input}»`));
+            }
+        });
+        process.stdin.on('error', (error) => reject(new Error(`Error reading STDIN: ${error.message}`)));
+    });
+}

data/lib/svelte_on_rails/view_helpers.rb

@@ -9,7 +9,7 @@ module SvelteOnRails
       file_path = cff + "#{filename}.svelte"
       if !File.exist?(file_path)
         raise file_not_found_messsage(filename)
-      elsif conf.watch_changes? && !SvelteOnRails::RenderServerSide.file_exist_case_sensitive?(cff, filename + '.svelte')
+      elsif conf.watch_changes? && !SvelteOnRails::Lib::Utils.file_exist_case_sensitive?(cff, filename + '.svelte')
         # on development environments we check case sensitivity too
         msg = "File found but Upper and lower case letters are incorrect\n" +
           "(This check is only on development environments when watch_changes is true):\n."
@@ -56,9 +56,10 @@ module SvelteOnRails
         # render server side
 
         start_time = Time.now
-        sv = SvelteOnRails::RenderServerSide.new(filename + '.svelte')
-        sv.compile_if_changes
-        res = sv.render_compiled_file(props)
+        comp = SvelteOnRails::Compiler.new(filename)
+        comp.compile_if_changes
+        rend = SvelteOnRails::Renderer.new(compiled_file: comp.compiled_file)
+        res = rend.render(props)
         time = Time.now - start_time
         Rails.logger.info "  Rendered #{filename}.svelte server-side: #{time.round(3)}ms"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - Christian Sedlmair
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2025-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -32,7 +32,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/svelte-on-rails.rb
-- lib/svelte_on_rails/compile.js
+- lib/svelte_on_rails/compiler/compile.js
+- lib/svelte_on_rails/compiler/compiler.rb
+- lib/svelte_on_rails/compiler/customPlugins.js
 - lib/svelte_on_rails/configuration.rb
 - lib/svelte_on_rails/installer/gem_utils.rb
 - lib/svelte_on_rails/installer/haml.rb
@@ -53,6 +55,8 @@ files:
 - lib/svelte_on_rails/installer/svelte.rb
 - lib/svelte_on_rails/installer/utils.rb
 - lib/svelte_on_rails/installer/vite.rb
+- lib/svelte_on_rails/lib/initializable.rb
+- lib/svelte_on_rails/lib/utils.rb
 - lib/svelte_on_rails/node_modules/@ampproject/remapping/LICENSE
 - lib/svelte_on_rails/node_modules/@ampproject/remapping/README.md
 - lib/svelte_on_rails/node_modules/@ampproject/remapping/dist/remapping.mjs
@@ -1404,8 +1408,9 @@ files:
 - lib/svelte_on_rails/package-lock.json
 - lib/svelte_on_rails/package.json
 - lib/svelte_on_rails/railtie.rb
-- lib/svelte_on_rails/render.js
-- lib/svelte_on_rails/render_server_side.rb
+- lib/svelte_on_rails/renderer/render.js
+- lib/svelte_on_rails/renderer/renderer.rb
+- lib/svelte_on_rails/renderer/utils.js
 - lib/svelte_on_rails/view_helpers.rb
 - lib/tasks/svelte_on_rails_tasks.rake
 homepage: https://gitlab.com/sedl/svelte-on-rails

data/lib/svelte_on_rails/render.js

@@ -1,65 +0,0 @@
-import { existsSync } from 'node:fs';
-import { join, dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-// Get the directory of the current script
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// Command line arguments
-const compiledFile = process.argv[2]; // Path to the compiled JavaScript file
-let args;
-
-try {
-    const base64Input = process.argv[3];
-    if (!base64Input) {
-        throw new Error('No Base64-encoded argument received in process.argv[3]');
-    }
-
-    let decodedString;
-    try {
-        decodedString = atob(base64Input);
-    } catch (decodeError) {
-        throw new Error(`Error decoding Base64 string: ${decodeError.message}\nInput (process.argv[3]): «${base64Input}»`);
-    }
-
-    try {
-        args = JSON.parse(decodedString);
-    } catch (parseError) {
-        throw new Error(`Error parsing JSON: ${parseError.message}\nInput (process.argv[3]): «${base64Input}»\nDecoded string: «${decodedString}»`);
-    }
-} catch (error) {
-    console.error('Error processing command line arguments:', error.message);
-    process.exit(1);
-}
-
-let MyComponent;
-(async () => {
-    try {
-        // Convert relative path to absolute path
-        const absolutePath = resolve(__dirname, compiledFile);
-
-        // Convert absolute path to a file URL
-        const modulePath = `file://${absolutePath}`;
-
-        // Import the module
-        const module = await import(modulePath);
-        MyComponent = module.default;
-    } catch (error) {
-        console.error(`Error loading component from ${compiledFile}:`, error);
-        process.exit(1);
-    }
-
-    const props = args;
-    const payload = { out: '' };
-
-    try {
-        MyComponent(payload, props); // Writes directly to payload.out
-    } catch (error) {
-        console.error('Error rendering component:', error);
-        process.exit(1);
-    }
-
-    const res = { status: 'SUCCESS', html: payload.out };
-    console.log(JSON.stringify(res));
-})();

data/lib/svelte_on_rails/render_server_side.rb

@@ -1,156 +0,0 @@
-module SvelteOnRails
-  class RenderServerSide
-
-    require 'open3'
-
-    def initialize(filename, base_path: SvelteOnRails::Configuration.instance.components_folder_full)
-
-      fn = (filename.match(/\.svelte$/) ? filename[0..-8] : filename)
-      @svelte_file = base_path + filename
-      @svelte_filename = filename
-      cnf = SvelteOnRails::Configuration.instance
-      cf = cnf.dist_folder + cnf.components_folder + fn
-      @compiled_file = cf.to_s
-
-    end
-
-    def compile_if_changes
-
-      # letzte Änderung innerhalb des ordners ermitteln
-
-      watch_changes = SvelteOnRails::Configuration.instance.watch_changes?
-      ts_file = SvelteOnRails::Configuration.instance.dist_folder.join('reset_timestamp')
-
-      have_changes = if watch_changes && File.exist?(ts_file)
-
-                       # compare last modification timestamp
-                       last_modification = 100.years.ago.to_time
-                       Dir.glob("#{SvelteOnRails::Configuration.instance.components_folder}**/*").each do |path|
-                         if File.file?(path)
-                           mtime = File.mtime(path)
-                           if mtime > last_modification
-                             last_modification = mtime
-                           end
-                         end
-                       end
-                       File.mtime(ts_file) < last_modification
-
-                     elsif watch_changes
-                       true
-                     elsif !File.exist?(ts_file)
-                       true
-                     else
-                       false
-                     end
-
-      if have_changes || !File.exist?(compiled_js_file) || !File.exist?(compiled_css_file)
-        if have_changes || (!File.exist?(ts_file) && watch_changes)
-          self.class.reset_dist
-        end
-        compile
-      end
-    end
-
-    def render_compiled_file(props = {})
-      require 'base64'
-      require 'json'
-      props_enc = Base64.strict_encode64(props.to_json).strip
-      cmd = [
-        'node',
-        '/Users/christian/projects-gmbh/gems/svelte-on-rails/svelte-on-rails-gem/lib/svelte_on_rails/render.js',
-        compiled_js_file,
-        props_enc,
-        SvelteOnRails::Configuration.instance.rails_root
-      ].join(' ')
-
-      stdout, stderr, status = Open3.capture3(cmd, chdir: self.class.gem_app_dir)
-      unless status.to_s.match(/^pid [0-9]+ exit 0$/)
-        raise "Render Svelte Server-side =>\n#{cmd}\n\nError output from render.js (stderr) =>\n+++\n" + stderr + "+++\n\n"
-      end
-
-      begin
-        res = JSON.parse(stdout)
-        if File.exist?(compiled_css_file)
-          res['css'] = File.read(compiled_css_file)
-        end
-        return res
-      rescue JSON::ParserError => e
-        raise "Render Svelte Server-side: Expected JSON, got: «#{stdout}»"
-      end
-    end
-
-    def compiled_js_file
-      @compiled_file + '.js'
-    end
-
-    def compiled_css_file
-      @compiled_file + '.css'
-    end
-
-    def compile
-
-      start_time = Time.now
-
-      cnf = SvelteOnRails::Configuration.instance
-      subs = @svelte_filename.split('/')[0..-2].join('/')
-      dist = cnf.dist_folder + cnf.components_folder + subs
-
-      cmd = [
-        'node',
-        self.class.gem_app_dir + 'compile.js',
-        @svelte_file,
-        dist,
-        self.class.gem_app_dir
-      ].join(' ')
-
-      stdout, stderr, status = Open3.capture3(cmd, chdir: SvelteOnRails::Configuration.instance.rails_root)
-
-      unless status.to_s.match(/^pid [0-9]+ exit 0$/)
-        raise "Compiling «#{@svelte_filename}» Server-side, script compile.js, executed within Rails.root:\n\n#{cmd}\n\n++++++\n\n#{stderr}\n\n++++++\n\n"
-      end
-
-      time = Time.now - start_time
-      Rails.logger.info "  Compiled #{@svelte_filename}.js: #{time.round(3)}ms" rescue nil
-    end
-
-    def self.gem_app_dir
-      File.expand_path('../svelte_on_rails', __dir__) + '/'
-    end
-
-    def self.file_exist_case_sensitive?(containing_dir, filename)
-      # Combine the directory path and filename
-      full_path = File.join(containing_dir, filename)
-
-      # Check if the file exists and the path matches case-sensitively
-      File.exist?(full_path) && Dir[File.join(containing_dir, "**/*")].any? do |f|
-        f == full_path
-      end
-    end
-
-    # assets:precompile
-    def self.reset_dist
-      unless Dir.exist?(SvelteOnRails::Configuration.instance.dist_folder)
-        FileUtils.mkdir_p(SvelteOnRails::Configuration.instance.dist_folder)
-      end
-      FileUtils.rm_rf Dir.glob("#{SvelteOnRails::Configuration.instance.dist_folder}/*")
-      FileUtils.touch SvelteOnRails::Configuration.instance.dist_folder.join('reset_timestamp')
-    end
-
-    def self.reset_and_compile_all
-      SvelteOnRails::RenderServerSide.reset_dist
-      cnf = SvelteOnRails::Configuration.instance
-      frontend_folder = cnf.frontend_folder_full
-      sveltes = Dir.glob(cnf.frontend_folder_full.join('**/*.svelte'))
-      sveltes.each_with_index do |file, ind|
-        comp_name = file.to_s[(cnf.frontend_folder_full.to_s.length + 1)..-1]
-
-        n = SvelteOnRails::RenderServerSide.new(comp_name, base_path: frontend_folder)
-        n.compile
-
-        puts "compiled #{ind + 1}/#{sveltes.length}: #{comp_name}"
-
-      end
-    end
-
-  end
-end