solara 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58813f26f146e2116b645174ff1c07b4d55fd681c95aeac51d14816668b44211
-  data.tar.gz: 212aebb78263261836b669f60c78fcb3148c79c0aee218cd90477458865ecc96
+  metadata.gz: fab777e1d69e66685057160bd2e985538210106df8a397be359fd0185f802614
+  data.tar.gz: 26d2c512ddf0a43810b2c4bf5ab53d804aa37be2a82eb46a6eab40f2aaf0517a
 SHA512:
-  metadata.gz: 4f31381757be0faeeb566131c45a9242b63a8b89fb610ccd6b6abd5bb7b99937890ee6f2e5420ac95022d3e534aeeb48e29dc427206f18217871768caaa84a58
-  data.tar.gz: aa9af4d947d47c5a5ae7d43f336e4ee1c4d16b8c4224778f19579061f8215e3508887143607688f831d89229ba7d2c89a5925f9c6f4b0487d73632fb7356f33c
+  metadata.gz: 204e786990bda9915a0d30c27a02b62d3c1f381be578d051a58bc1230075e68aea5ca0a95783c305f12cebd20e1f393393e893158f88c4af2554e0b17591f8ed
+  data.tar.gz: cd30fcc67754e010bea2c10dc9d3bd86ee7b62c4ad12f8bf4fa74f0bef853b5c0542ec8f12277ce7115111d6783eebf8405e576880dfc14f54260f5d0c3c7e6d

data/solara/lib/core/scripts/code_generator/dart_code_generator.rb

@@ -14,7 +14,7 @@ class DartCodeGenerator
 
   private
 
-  def generate_class(json_obj, class_name)
+  def generate_class(json_obj, class_name, list_items = nil)
     @registry.register(class_name, class_name)
     class_name = @registry.get_class_name(class_name, class_name)
     return if @generated_classes.any? { |c| c.include?("class #{class_name}") }
@@ -34,36 +34,70 @@ class DartCodeGenerator
       if value.is_a?(Hash)
         generate_class(value, nested_class_name)
         companion_values << "static final #{key}Value = #{nested_class_name}.instance;"
+        instance_values << "#{key}: #{nested_class_name}.instance"
       elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
-        generate_class(value.first, nested_class_name)
+        generate_class(value.first, nested_class_name, value)
         type = "List<#{nested_class_name}>"
-        list_values = value.map { |_| "#{nested_class_name}.instance" }
-        companion_values << "static final #{key}Value = <#{nested_class_name}>[#{list_values.join(", ")}];"
+        companion_values << "static final #{key}Value = #{nested_class_name}.instances;"
+        instance_values << "#{key}: #{nested_class_name}.instances"
       else
         companion_values << "static final #{key}Value = #{dart_value(value)};"
+        instance_values << "#{key}: #{key}Value"
       end
 
       properties << "final #{type} #{key};"
       constructor_params << "required this.#{key}"
-      instance_values << "#{key}: #{key}Value"
     end
 
-    class_code = <<~DART
-      class #{class_name} {
-        #{properties.join("\n  ")}
-
-        const #{class_name}({#{constructor_params.join(", ")}});
-
+    static_instances = if list_items
+      items_code = list_items.map.with_index do |item, index|
+        values = item.map do |key, value|
+          if value.is_a?(Hash)
+            nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+            @registry.register(nested_class_name, nested_class_name)
+            nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+            "#{key}: #{nested_class_name}.instance"
+          elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
+            nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+            @registry.register(nested_class_name, nested_class_name)
+            nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+            "#{key}: #{nested_class_name}.instances"
+          else
+            "#{key}: #{dart_value(value)}"
+          end
+        end.join(",\n              ")
+        "    static final instance#{index + 1} = #{class_name}(\n              #{values}\n            );"
+      end.join("\n")
+
+      instances_list = (1..list_items.length).map { |i| "instance#{i}" }.join(", ")
+
+      <<~DART
+        #{items_code}
+
+        static final instances = <#{class_name}>[#{instances_list}];
+      DART
+    else
+      <<~DART
         static #{class_name}? _instance;
 
-        #{companion_values.join("\n    ")}
-
         static #{class_name} get instance {
           _instance ??= #{class_name}(
             #{instance_values.join(",\n            ")}
           );
           return _instance!;
         }
+      DART
+    end
+
+    class_code = <<~DART
+      class #{class_name} {
+        #{properties.join("\n  ")}
+
+        const #{class_name}({#{constructor_params.join(", ")}});
+
+        #{companion_values.join("\n    ")}
+
+        #{static_instances}
       }
     DART
 

data/solara/lib/core/scripts/code_generator/kotlin_code_generator.rb

@@ -14,13 +14,14 @@ class KotlinCodeGenerator
 
   private
 
-  def generate_class(json_obj, class_name)
+  def generate_class(json_obj, class_name, list_items = nil)
     @registry.register(class_name, class_name)
     class_name = @registry.get_class_name(class_name, class_name)
     return if @generated_classes.any? { |c| c.include?("data class #{class_name}") }
 
     properties = []
     companion_values = []
+    instance_values = []
 
     json_obj.each do |key, value|
       nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
@@ -32,37 +33,74 @@ class KotlinCodeGenerator
       if value.is_a?(Hash)
         generate_class(value, nested_class_name)
         companion_values << "private val #{key}Value = #{nested_class_name}.instance"
+        instance_values << "#{key} = #{nested_class_name}.instance"
       elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
-        generate_class(value.first, nested_class_name)
+        generate_class(value.first, nested_class_name, value)
         type = "List<#{nested_class_name}>"
-        list_values = value.map { |_| "#{nested_class_name}.instance" }
-        companion_values << "private val #{key}Value = listOf(#{list_values.join(", ")})"
+        companion_values << "private val #{key}Value = #{nested_class_name}.instances"
+        instance_values << "#{key} = #{nested_class_name}.instances"
       else
         companion_values << "private val #{key}Value = #{kotlin_value(value)}"
+        instance_values << "#{key} = #{key}Value"
       end
 
       properties << "val #{key}: #{type}"
     end
 
+    static_instances = if list_items
+      items_code = list_items.map.with_index do |item, index|
+        values = item.map do |key, value|
+          if value.is_a?(Hash)
+            nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+            @registry.register(nested_class_name, nested_class_name)
+            nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+            "#{key} = #{nested_class_name}.instance"
+          elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
+            nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+            @registry.register(nested_class_name, nested_class_name)
+            nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+            "#{key} = #{nested_class_name}.instances"
+          else
+            "#{key} = #{kotlin_value(value)}"
+          end
+        end.join(",\n                  ")
+        "        private val instance#{index + 1} = #{class_name}(\n                  #{values}\n                )"
+      end.join("\n")
+
+      instances_list = (1..list_items.length).map { |i| "instance#{i}" }.join(", ")
+
+      <<~KOTLIN
+        companion object {
+            #{items_code}
+
+            val instances = listOf(#{instances_list})
+        }
+      KOTLIN
+    else
+      <<~KOTLIN
+        companion object {
+            private var _instance: #{class_name}? = null
+
+            #{companion_values.join("\n            ")}
+
+            val instance: #{class_name}
+                get() {
+                    if (_instance == null) {
+                        _instance = #{class_name}(
+                            #{instance_values.join(",\n                            ")}
+                        )
+                    }
+                    return _instance!!
+                }
+        }
+      KOTLIN
+    end
+
     class_code = <<~KOTLIN
       data class #{class_name}(
           #{properties.join(",\n          ")}
       ) {
-          companion object {
-              private var _instance: #{class_name}? = null
-
-              #{companion_values.join("\n          ")}
-
-              val instance: #{class_name}
-                  get() {
-                      if (_instance == null) {
-                          _instance = #{class_name}(
-                              #{json_obj.keys.map { |key| "#{key} = #{key}Value" }.join(",\n                              ")}
-                          )
-                      }
-                      return _instance!!
-                  }
-          }
+          #{static_instances}
       }
     KOTLIN
 

data/solara/lib/core/scripts/code_generator/swift_code_generator.rb

@@ -1,108 +1,144 @@
 class SwiftCodeGenerator
-    def initialize(json, parent_class_name, registry = nil)
-      @json = json
-      @parent_class_name = parent_class_name
-      @registry = registry || ClassNameRegistry.new
-      @generated_classes = []
-    end
-
-    def generate
-      imports = "import UIKit\n\n"
-      generate_class(@json, @parent_class_name)
-      imports + @generated_classes.reverse.join("\n\n")
-    end
-
-    private
-
-    def generate_class(json_obj, class_name)
-      @registry.register(class_name, class_name)
-      class_name = @registry.get_class_name(class_name, class_name)
-      return if @generated_classes.any? { |c| c.include?("struct #{class_name}") }
-
-      properties = []
-      static_values = []
-
-      json_obj.each do |key, value|
-        nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
-        @registry.register(nested_class_name, nested_class_name)
-        nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
-
-        type = determine_type(value, nested_class_name, "#{class_name}.#{key}")
-
-        if value.is_a?(Hash)
-          generate_class(value, nested_class_name)
-          static_values << "private static let #{key}Value = #{nested_class_name}.shared"
-        elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
-          generate_class(value.first, nested_class_name)
-          type = "[#{nested_class_name}]"
-          list_values = value.map { |_| "#{nested_class_name}.shared" }
-          static_values << "private static let #{key}Value = [#{list_values.join(", ")}]"
-        else
-          static_values << "private static let #{key}Value = #{swift_value(value)}"
-        end
-
-        properties << "let #{key}: #{type}"
-      end
-
-      class_code = <<~SWIFT
-        struct #{class_name} {
-            #{properties.join("\n    ")}
-
-            private static var _shared: #{class_name}?
-
-            #{static_values.join("\n    ")}
-
-            static var shared: #{class_name} {
-                if _shared == nil {
-                    _shared = #{class_name}(
-                        #{json_obj.keys.map { |key| "#{key}: #{key}Value" }.join(",\n                      ")}
-                    )
-                }
-                return _shared!
-            }
-        }
-      SWIFT
-
-      @generated_classes << class_code
-    end
-
-    def determine_type(value, class_name, registry_key)
-      base_type = if value.is_a?(String) && ColorDetector.new(value).color?
-        "UIColor"
-      elsif value.is_a?(String)
-        "String"
-      elsif value.is_a?(Integer)
-        "Int"
-      elsif value.is_a?(Float)
-        "Double"
-      elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
-        "Bool"
-      elsif value.is_a?(Array)
-        item_type = value.empty? ? "Any" : determine_type(value.first, class_name, "#{registry_key}[]")
-        "[#{item_type}]"
-      elsif value.is_a?(Hash)
-        class_name
+  def initialize(json, parent_class_name, registry = nil)
+    @json = json
+    @parent_class_name = parent_class_name
+    @registry = registry || ClassNameRegistry.new
+    @generated_classes = []
+  end
+
+  def generate
+    imports = "import UIKit\n\n"
+    generate_class(@json, @parent_class_name)
+    imports + @generated_classes.reverse.join("\n\n")
+  end
+
+  private
+
+  def generate_class(json_obj, class_name, list_items = nil)
+    @registry.register(class_name, class_name)
+    class_name = @registry.get_class_name(class_name, class_name)
+    return if @generated_classes.any? { |c| c.include?("struct #{class_name}") }
+
+    properties = []
+    static_values = []
+    instance_values = []
+
+    json_obj.each do |key, value|
+      nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+      @registry.register(nested_class_name, nested_class_name)
+      nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+
+      type = determine_type(value, nested_class_name, "#{class_name}.#{key}")
+
+      if value.is_a?(Hash)
+        generate_class(value, nested_class_name)
+        static_values << "private static let #{key}Value = #{nested_class_name}.shared"
+        instance_values << "#{key}: #{nested_class_name}.shared"
+      elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
+        generate_class(value.first, nested_class_name, value)
+        type = "[#{nested_class_name}]"
+        static_values << "private static let #{key}Value = #{nested_class_name}.instances"
+        instance_values << "#{key}: #{nested_class_name}.instances"
       else
-        "Any"
+        static_values << "private static let #{key}Value = #{swift_value(value)}"
+        instance_values << "#{key}: #{key}Value"
       end
 
-      @registry.get_type(value, base_type)
+      properties << "let #{key}: #{type}"
     end
 
-    def swift_value(value)
-      if value.is_a?(String) && ColorDetector.new(value).color?
-        hex = value.gsub('#', '')
-        r = "Double(0x#{hex[0,2]}) / 255.0"
-        g = "Double(0x#{hex[2,2]}) / 255.0"
-        b = "Double(0x#{hex[4,2]}) / 255.0"
-        a = hex.length == 8 ? "Double(0x#{hex[6,2]}) / 255.0" : "1.0"
-        return "UIColor(red: #{r}, green: #{g}, blue: #{b}, alpha: #{a})"
-      end
-      return "\"#{value}\"" if value.is_a?(String)
-      return value.to_s if value.is_a?(Integer) || value.is_a?(Float)
-      return value.to_s.downcase if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-      return "[#{value.map { |v| swift_value(v) }.join(", ")}]" if value.is_a?(Array)
-      return "nil" if value.nil?
-      value.to_s
+    static_instances = if list_items
+                         items_code = list_items.map.with_index do |item, index|
+                           values = item.map do |key, value|
+                             if value.is_a?(Hash)
+                               nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+                               @registry.register(nested_class_name, nested_class_name)
+                               nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+                               "#{key}: #{nested_class_name}.shared"
+                             elsif value.is_a?(Array) && !value.empty? && value.first.is_a?(Hash)
+                               nested_class_name = "#{class_name}#{StringCase.capitalize(key)}"
+                               @registry.register(nested_class_name, nested_class_name)
+                               nested_class_name = @registry.get_class_name(nested_class_name, nested_class_name)
+                               "#{key}: #{nested_class_name}.instances"
+                             else
+                               "#{key}: #{swift_value(value)}"
+                             end
+                           end.join(",\n                ")
+                           "    private static let instance#{index + 1} = #{class_name}(\n                #{values}\n            )"
+                         end.join("\n")
+
+                         instances_list = (1..list_items.length).map { |i| "instance#{i}" }.join(", ")
+
+                         <<~SWIFT
+                           #{items_code}
+
+                           static let instances: [#{class_name}] = [#{instances_list}]
+                         SWIFT
+                       else
+                         <<~SWIFT
+                           private static var _shared: #{class_name}?
+
+                           #{static_values.join("\n    ")}
+
+                           static var shared: #{class_name} {
+                               if _shared == nil {
+                                   _shared = #{class_name}(
+                                       #{instance_values.join(",\n                    ")}
+                                   )
+                               }
+                               return _shared!
+                           }
+                         SWIFT
+                       end
+
+    class_code = <<~SWIFT
+      struct #{class_name} {
+          #{properties.join("\n      ")}
+
+          #{static_instances}
+      }
+    SWIFT
+
+    @generated_classes << class_code
+  end
+
+  def determine_type(value, class_name, registry_key)
+    base_type = if value.is_a?(String) && ColorDetector.new(value).color?
+                  "UIColor"
+                elsif value.is_a?(String)
+                  "String"
+                elsif value.is_a?(Integer)
+                  "Int"
+                elsif value.is_a?(Float)
+                  "Double"
+                elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
+                  "Bool"
+                elsif value.is_a?(Array)
+                  item_type = value.empty? ? "Any" : determine_type(value.first, class_name, "#{registry_key}[]")
+                  "[#{item_type}]"
+                elsif value.is_a?(Hash)
+                  class_name
+                else
+                  "Any"
+                end
+
+    @registry.get_type(value, base_type)
+  end
+
+  def swift_value(value)
+    if value.is_a?(String) && ColorDetector.new(value).color?
+      hex = value.gsub('#', '')
+      r = "Double(0x#{hex[0, 2]}) / 255.0"
+      g = "Double(0x#{hex[2, 2]}) / 255.0"
+      b = "Double(0x#{hex[4, 2]}) / 255.0"
+      a = hex.length == 8 ? "Double(0x#{hex[6, 2]}) / 255.0" : "1.0"
+      return "UIColor(red: #{r}, green: #{g}, blue: #{b}, alpha: #{a})"
     end
+    return "\"#{value}\"" if value.is_a?(String)
+    return value.to_s if value.is_a?(Integer) || value.is_a?(Float)
+    return value.to_s.downcase if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+    return "[#{value.map { |v| swift_value(v) }.join(", ")}]" if value.is_a?(Array)
+    return "nil" if value.nil?
+    value.to_s
+  end
 end

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Malek Kamel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: cgi
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +357,6 @@ homepage: https://github.com/yourusername/solara
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - solara/lib
@@ -373,8 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Solara is a Ruby library that simplifies the management of white label apps
   for Flutter, iOS, Android, and Web.