solara 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58813f26f146e2116b645174ff1c07b4d55fd681c95aeac51d14816668b44211
-  data.tar.gz: 212aebb78263261836b669f60c78fcb3148c79c0aee218cd90477458865ecc96
+  metadata.gz: 77f9761ea65efa893a892df04d7d5fad6a24c9a5437dc4e2ace86b741feb5df3
+  data.tar.gz: edb89227453aa0d01ee0f43129c8196dbcd74dffa8abfe69f1bd2053ce63e92f
 SHA512:
-  metadata.gz: 4f31381757be0faeeb566131c45a9242b63a8b89fb610ccd6b6abd5bb7b99937890ee6f2e5420ac95022d3e534aeeb48e29dc427206f18217871768caaa84a58
-  data.tar.gz: aa9af4d947d47c5a5ae7d43f336e4ee1c4d16b8c4224778f19579061f8215e3508887143607688f831d89229ba7d2c89a5925f9c6f4b0487d73632fb7356f33c
+  metadata.gz: 561614f023227070c3a24577d8bad4b8a6bb37024a251e3145a1702df798bc1e203fb6772fcd5bf7eee8ffe1bcb91dfe15ac0bef21b29dadab4065cd09a2d595
+  data.tar.gz: b1be57455047e46a966211cbd612cd16179a3d5789affca52dc0e8f68308b7138d4a6ae6cc8c3e488b34453f9c2ee681da57fa7f62ab20343a4e55353a8e1ac4

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,26 +1,27 @@
 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)
+  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)}"
@@ -32,34 +33,69 @@ class SwiftCodeGenerator
         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)
+          generate_class(value.first, nested_class_name, value)
           type = "[#{nested_class_name}]"
-          list_values = value.map { |_| "#{nested_class_name}.shared" }
-          static_values << "private static let #{key}Value = [#{list_values.join(", ")}]"
+          static_values << "private static let #{key}Value = #{nested_class_name}.instances"
+          instance_values << "#{key}: #{nested_class_name}.instances"
         else
           static_values << "private static let #{key}Value = #{swift_value(value)}"
+          instance_values << "#{key}: #{key}Value"
         end
 
         properties << "let #{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}.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    ")}
-
-            private static var _shared: #{class_name}?
-
-            #{static_values.join("\n    ")}
+            #{properties.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!
-            }
+            #{static_instances}
         }
       SWIFT
 
@@ -105,4 +141,4 @@ class SwiftCodeGenerator
       return "nil" if value.nil?
       value.to_s
     end
-end
+  end

data/solara/lib/solara/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Malek Kamel