solara 0.5.0 → 0.7.0

data/solara/lib/core/doctor/schema/brand_configurations.json

@@ -25,7 +25,7 @@
             "items": {
                 "type": "object",
                 "properties": {
-                    "key": {
+                    "filename": {
                         "type": "string"
                     },
                     "name": {
@@ -37,7 +37,7 @@
                     }
                 },
                 "required": [
-                    "key",
+                    "filename",
                     "name",
                     "content"
                 ]

data/solara/lib/core/doctor/schema/platform/json_manifest.json

@@ -10,48 +10,30 @@
                         "type": "string"
                     },
                     "generate": {
-                        "type": "object",
-                        "properties": {
-                            "enabled": {
-                                "type": "boolean"
-                            },
-                            "className": {
-                                "type": "string"
-                            },
-                            "customClassNames": {
-                                "type": "array",
-                                "items": {
-                                    "type": "object",
-                                    "properties": {
-                                        "generatedName": {
-                                            "type": "string"
-                                        },
-                                        "customName": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "required": [
-                                        "generatedName",
-                                        "customName"
-                                    ]
+                        "type": "boolean"
+                    },
+                    "parentClassName": {
+                        "type": "string"
+                    },
+                    "customClassNames": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "originalName": {
+                                    "type": "string"
+                                },
+                                "customName": {
+                                    "type": "string"
                                 }
-                            }
-                        },
-                        "required": [
-                            "enabled",
-                            "className",
-                            "customClassNames"
-                        ]
+                            },
+                            "required": ["originalName", "customName"]
+                        }
                     }
                 },
-                "required": [
-                    "fileName",
-                    "generate"
-                ]
+                "required": ["fileName", "generate", "parentClassName", "customClassNames"]
             }
         }
     },
-    "required": [
-        "files"
-    ]
+    "required": ["files"]
 }

data/solara/lib/core/doctor/validator/template/android_template_validation_config.yml

@@ -28,7 +28,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    android_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json
@@ -63,7 +63,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    ios_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json
@@ -94,7 +94,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    global_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json

data/solara/lib/core/doctor/validator/template/flutter_template_validation_config.yml

@@ -5,7 +5,7 @@ structure:
                json:
                     type: directory
                     contents:
-                        json_manifest.json:
+                        flutter_json_manifest.json:
                             type: file
                             validations:
                                 - type: valid_json
@@ -89,7 +89,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    global_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json

data/solara/lib/core/doctor/validator/template/ios_template_validation_config.yml

@@ -28,7 +28,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    android_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json
@@ -63,7 +63,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    ios_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json
@@ -94,7 +94,7 @@ structure:
             json:
                 type: directory
                 contents:
-                    json_manifest.json:
+                    global_json_manifest.json:
                         type: file
                         validations:
                             - type: valid_json

data/solara/lib/core/scripts/brand_config_updater.rb

@@ -0,0 +1,29 @@
+class BrandConfigUpdater
+
+    def update(filename, data, brand_key)
+        template = BrandConfigurationsManager.new(brand_key).template_with_filename(filename)
+        if template.nil?
+            Solara.logger.debug("Can't find tempate for filename: #{filename}, with brand key: #{brand_key}")
+            return
+        end
+
+        path = template[:path]
+        json = JSON.pretty_generate(data)
+
+        begin
+            # Check if the file exists
+            if File.exist?(path)
+                # If it exists, update the file
+                File.write(path, json)
+                Solara.logger.debug("Updated Config for #{path}: #{data}")
+            else
+                # If it doesn't exist, create the file with the data
+                File.write(path, json)
+                Solara.logger.debug("Created Config for #{path}: #{data}")
+            end
+        rescue StandardError => e
+            Solara.logger.failure("Error updating #{brand_key} config file #{path}: #{e.message}")
+            raise
+        end
+    end
+end

data/solara/lib/core/scripts/brand_configurations_manager.rb

@@ -4,19 +4,12 @@ class BrandConfigurationsManager
         @brand_key = brand_key
     end
 
-    def template_with_key(key)
-        templates.select { |section| section[:key] === key }.first
+    def template_with_filename(filename)
+        templates.select { |template| template[:filename] === filename }.first
     end
 
     def templates
-        configurations = JSON.parse(File.read(FilePath.brand_configurations))['configurations']
-        configurations.map do |config|
-            {
-                key: config['key'],
-                name: config['name'],
-                path: "#{FilePath.brand(@brand_key)}/#{config['filePath']}"
-            }
-        end
+        TemplateManager.new(@brand_key).templates
     end
 
     def create
@@ -24,18 +17,87 @@ class BrandConfigurationsManager
 
         config_templates.map do |template|
             create_config_item(
-                template[:key],
+                template[:filename],
                 template[:name],
                 template[:path]
             )
         end
     end
 
-    def create_config_item(key, name, path)
+    def create_config_item(filename, name, path)
         {
-            key: key,
+            filename: filename,
             name: name,
             content: JSON.parse(File.read(path)),
         }
     end
-end
+end
+
+class TemplateManager
+
+    def initialize(brand_key)
+        @brand_key = brand_key
+    end
+
+    def templates
+      result = parse_configurations
+      collect_json_templates.each do |template|
+        result << template unless result.any? { |r| r['filename'] == template['filename'] }
+      end
+      result.compact
+    rescue StandardError => e
+      Solara.logger.error("Failed to generate templates: #{e.message}")
+      []
+    end
+
+    private
+
+    def parse_configurations
+      configurations = JSON.parse(File.read(FilePath.brand_configurations))['configurations']
+      configurations.map do |config|
+        path = build_path(config['filePath'])
+        next unless File.exist?(path)
+
+        filename_without_extension = File.basename(config['filename'], '.json')
+
+        {
+          filename: File.basename(config['filename']),
+          name: StringCase.snake_to_capitalized_spaced(filename_without_extension, exclude: "ios"),
+          path: path
+        }
+      end
+    rescue StandardError => e
+      Solara.logger.error("Failed to parse configurations: #{e.message}")
+      []
+    end
+
+    def collect_json_templates
+      directories = [
+        FilePath.brand_global_json_dir,
+        FilePath.brand_json_dir(@brand_key)
+      ]
+
+      directories.flat_map do |dir|
+        get_json_files(dir).map do |file|
+          filename_without_extension = File.basename(file, '.json')
+
+          {
+            filename: File.basename(file),
+            name: StringCase.snake_to_capitalized_spaced(filename_without_extension, exclude: "ios"),
+            path: file
+          }
+        end
+      end
+    end
+
+    def get_json_files(dir)
+      Dir.glob(File.join(dir, '**', '*.json'))
+    rescue StandardError => e
+      Solara.logger.error("Error reading directory #{dir}: #{e.message}")
+      []
+    end
+
+    def build_path(file_path)
+      "#{FilePath.brand(@brand_key)}/#{file_path}"
+    end
+  end

data/solara/lib/core/scripts/brand_importer.rb

@@ -26,8 +26,8 @@ class BrandImporter
         validate_json(configurations_path)
         validate_json_schema(configurations_path)
 
-        configurations_json = JSON.parse(File.read(configurations_path))
-        brand = configurations_json['brand']
+        configurations = JSON.parse(File.read(configurations_path))
+        brand = configurations['brand']
         brand_key = brand['key'] # Ensure to use 'key' instead of 'brand_key'
 
         exists = BrandsManager.instance.exists(brand_key)
@@ -35,32 +35,21 @@ class BrandImporter
             SolaraManager.new.onboard(brand_key, brand['name'], open_dashboard: false)
         end
 
-        update_brand(brand_key, configurations_json)
+        SolaraManager.new.sync_brand_with_template(brand_key) if exists
+        update_brand(brand_key, configurations)
 
         message_suffix = exists ? "The existing brand '#{brand_key}' has been updated." : "A new brand with the key '#{brand_key}' has been onboarded."
         Solara.logger.success("Successfully imported (#{configurations_path}). #{message_suffix}")
     end
 
-    def update_brand(brand_key, configurations_json)
-        brand_path = FilePath.brand(brand_key)
-
-        configurations_json['configurations'].each do |configuration|
-            file_name = configuration['key']
-            file_path = find_file_in_subdirectories(brand_path, file_name)
-
-            # Create or replace the contents of the configuration file
-            if file_path
-                File.write(file_path, JSON.pretty_generate(configuration['content']))
-            else
-                Solara.logger.failure("File #{file_name} not found in #{brand_path}, ignoring importing it!")
-            end
+    def update_brand(brand_key, configurations)
+        configurations['configurations'].each do |configuration|
+            filename = configuration['filename']
+            data = configuration['content']
+            BrandConfigUpdater.new.update(filename, data, brand_key)
         end
     end
 
-    def find_file_in_subdirectories(base_path, file_name)
-        Dir.glob(File.join(base_path, '**', file_name)).first
-    end
-
     def validate_json(configurations_path)
         begin
             JsonFileValidator.new([configurations_path]).validate

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

@@ -212,7 +212,7 @@ class BaseCodeGenerator
   end
 
   def capitalize(string)
-    "#{string[0].upcase}#{string[1..-1]}"
+    StringCase.capitalize(string)
   end
 end
 

data/solara/lib/core/scripts/file_manager.rb

@@ -5,23 +5,19 @@ class FileManager
         source_path = Pathname.new(source_dir).expand_path
         destination_path = Pathname.new(destination_dir).expand_path
 
-        if Dir.exist?(source_path)
-          Dir.glob(source_path.join('*')).each do |item|
-            relative_path = Pathname.new(item).relative_path_from(source_path).to_s
-            destination_item_path = destination_path.join(relative_path)
-
-            if File.directory?(item)
-              FileUtils.mkdir_p(destination_item_path)
-              FileUtils.cp_r(item + '/.', destination_item_path) # Ensure to copy contents
-            else
-              FileUtils.mkdir_p(destination_item_path.dirname) # Create parent directory
-              FileUtils.cp(item, destination_item_path)
-            end
+        Dir.glob(source_path.join('*')).each do |item|
+        relative_path = Pathname.new(item).relative_path_from(source_path).to_s
+        destination_item_path = destination_path.join(relative_path)
 
-            Solara.logger.debug("🚗 Copied #{relative_path} \n\t↑ From: #{source_path} \n\t↓ To:   #{destination_path}")
-          end
+        if File.directory?(item)
+            FileUtils.mkdir_p(destination_item_path)
+            FileUtils.cp_r(item + '/.', destination_item_path) # Ensure to copy contents
         else
-          Solara.logger.failure("#{source_path} not found!")
+            FileUtils.mkdir_p(destination_item_path.dirname) # Create parent directory
+            FileUtils.cp(item, destination_item_path)
+        end
+
+        Solara.logger.debug("🚗 Copied #{relative_path} \n\t↑ From: #{source_path} \n\t↓ To:   #{destination_path}")
         end
       end
 

data/solara/lib/core/scripts/gitignore_manager.rb

@@ -18,9 +18,7 @@ class GitignoreManager
          ]
 
         if Platform.is_flutter || Platform.is_ios
-            items << FileManager.get_relative_path_to_root(FilePath.project_infoplist_string_catalog)
-            # The excluded InfoPlist.xcstrings maybe at the root. In this case we have to avoid ignoring the brands files.
-            items << '!solara/brand/brands/**/InfoPlist.xcstrings'
+            items << "/#{FileManager.get_relative_path_to_root(FilePath.project_infoplist_string_catalog)}"
         end
 
         GitignoreManager.new(FilePath.project_root).add_items(items)
@@ -29,11 +27,12 @@ class GitignoreManager
         
     def add_items(items)
         items.each do |item|
-            add_item(FileManager.get_relative_path_to_root(item))
+            add_item(item.start_with?('/') ? item : FileManager.get_relative_path_to_root(item))
         end
     end
 
     def add_item(item)
+        puts item
         existing_items = read_gitignore
 
         if existing_items.include?(item)

data/solara/lib/core/scripts/json_manifest_processor.rb

@@ -1,53 +1,116 @@
 require 'json'
 
 class JsonManifestProcessor
-
   def initialize(json_path, language, output_path)
     @json_path = json_path
     @language = language
     @output_path = output_path
+    @manifest = read_manifest
   end
 
   def process
-    manifest = read_json
-    process_files(manifest)
+    # First process files specified in manifest
+    process_manifest_files if @manifest && @manifest['files']
+
+    # Then process remaining JSON files
+    process_remaining_files
   end
 
   private
 
-  def process_files(manifest)
-    manifest['files'].each do |file|
-      generate_code(file)
+  def read_manifest
+    manifest_path = File.join(@json_path, "#{SolaraSettingsManager.instance.platform}_json_manifest.json")
+    JSON.parse(File.read(manifest_path))
+  rescue JSON::ParserError => e
+    Solara.logger.debug("Error parsing manifest JSON: #{e.message}")
+    nil
+  rescue Errno::ENOENT => e
+    Solara.logger.debug("Manifest file not found: #{e.message}")
+    nil
+  rescue StandardError => e
+    Solara.logger.debug("Unexpected error reading manifest: #{e.message}")
+    nil
+  end
+
+  def process_manifest_files
+    @manifest['files'].each do |file|
+      process_manifest_file(file)
     end
   end
 
-  def generate_code(file)
-      return unless file['generate']['enabled']
+  def process_manifest_file(file)
+    return unless file['generate']
+
+    file_name = file['fileName']
+    class_name = file['parentClassName']
+
+    return if file_name.empty? || class_name.empty?
+
+    custom_class_names = convert_to_map(file['customClassNames'])
+    process_json_file(
+      File.join(@json_path, file_name),
+      class_name,
+      custom_class_names,
+      true
+    )
+  end
+
+  def process_remaining_files
+    manifest_files = @manifest&.dig('files')&.map { |f| f['fileName'] } || []
 
-      file_name = file['fileName']
-      class_name = file['generate']['className']
+    json_files = get_json_files
+    json_files.each do |file_path|
+      file_name = File.basename(file_path)
+      # Skip files that were already processed via manifest
+      next if manifest_files.include?(file_name)
+      next if file_name == 'json_manifest.json'
 
-      puts "generate_code: file_name = #{file_name}, class_name = #{class_name}"
-      return if file_name.empty? || class_name.empty?
-      puts "generate_code: file_name = #{file_name}, class_name = #{class_name}"
+      class_name = derive_class_name(file_name)
+      process_json_file(file_path, class_name, {}, false)
+    end
+  end
 
-      custom_class_names = convert_to_map(file['generate']['customClassNames'])
+  def get_json_files
+    Dir.glob(File.join(@json_path, '**', '*.json'))
+  rescue StandardError => e
+    Solara.logger.debug("Error reading directory #{@json_path}: #{e.message}")
+    []
+  end
 
-      file_path = File.join(@json_path, file_name)
+  def process_json_file(file_path, class_name, custom_types, is_manifest_file)
+    begin
+      json_content = JSON.parse(File.read(file_path))
       code_generator = CodeGenerator.new(
-        json: JSON.parse(File.read(file_path)),
-        language: @language ,
+        json: json_content,
+        language: @language,
         parent_class_name: class_name,
-        custom_types: custom_class_names
+        custom_types: custom_types
       )
 
       generated_code = code_generator.generate
-
-      output_path = File.join(@output_path, gnerated_filename(class_name))
+      output_path = File.join(@output_path, generated_filename(class_name))
       write_to_file(output_path, generated_code)
+    rescue JSON::ParserError => e
+      Solara.logger.debug("Error parsing JSON file #{File.basename(file_path)}: #{e.message}")
+    rescue StandardError => e
+      Solara.logger.debug("Error processing file #{File.basename(file_path)}: #{e.message}")
+    end
   end
 
-  def gnerated_filename(class_name)
+  def derive_class_name(file_name)
+    # Remove .json extension and convert to PascalCase
+    base_name = File.basename(file_name, '.json')
+    base_name.split('_').map(&:capitalize).join
+  end
+
+  def convert_to_map(custom_class_names)
+    return {} unless custom_class_names
+    custom_class_names.each_with_object({}) do |item, result|
+      result[item['originalName']] = item['customName']
+    end
+  end
+
+  def generated_filename(class_name)
     case SolaraSettingsManager.instance.platform
     when Platform::Flutter
       "#{to_snake_case(class_name)}.dart"
@@ -65,31 +128,9 @@ class JsonManifestProcessor
   end
 
   def write_to_file(output, content)
-    puts "generate_code: output = #{output}, content = #{content}"
     File.write(output, content)
-    Solara.logger.debug("Genrated #{output}")
-  rescue StandardError => e
-    Solara.logger.debug("Error writing to file #{file_name}: #{e.message}")
-  end
-
-  def convert_to_map(custom_class_names)
-    custom_class_names.each_with_object({}) do |item, result|
-      result[item['generatedName']] = item['customName']
-    end
-  end
-
-  def read_json
-    mainfest_path = File.join(@json_path, 'json_manifest.json')
-    JSON.parse(File.read(mainfest_path))
-  rescue JSON::ParserError => e
-    Solara.logger.debug("Error parsing JSON: #{e.message}")
-    {}
-  rescue Errno::ENOENT => e
-    Solara.logger.debug("Error reading file: #{e.message}")
-    {}
+    Solara.logger.debug("Generated #{output}")
   rescue StandardError => e
-    Solara.logger.debug("Unexpected error: #{e.message}")
-    {}
+    Solara.logger.debug("Error writing to file #{output}: #{e.message}")
   end
-
 end

data/solara/lib/core/scripts/resource_manifest_processor.rb

@@ -2,8 +2,9 @@ require 'json'
 require 'fileutils'
 
 class ResourceManifestProcessor
-  def initialize(brand_key)
+  def initialize(brand_key, ignore_health_check:)
     @brand_key = brand_key
+    @ignore_health_check = ignore_health_check
     @manifest_file = FilePath.resources_manifest
     @config = load_manifest_file
   end
@@ -33,7 +34,7 @@ class ResourceManifestProcessor
 
     return skip_empty_paths(item) if empty_paths?(item)
 
-    check_mandatory_file(item, src, dst)
+    check_mandatory_file(item, src)
 
     if File.exist?(src)
       copy_file(src, dst)
@@ -88,7 +89,8 @@ class ResourceManifestProcessor
 
   def git_ignore(files)
     files.each do |file|
-      GitignoreManager.new(FilePath.project_root).add_items([file])
+      path = FileManager.get_relative_path_to_root(file)
+      GitignoreManager.new(FilePath.project_root).add_items(["/#{path}"])
     end
   end
 
@@ -104,10 +106,11 @@ class ResourceManifestProcessor
     Solara.logger.debug("Skipped (empty source or destination) for #{@brand_key}: #{item['source']} -> #{item['destination']}")
   end
 
-  def check_mandatory_file(item, src, dst)
+  def check_mandatory_file(item, src)
+    return if @ignore_health_check
+
     if item['mandatory'] && !File.exist?(src)
-      Solara.logger.fatal("Mandatory resource file/folder not found for #{@brand_key}: #{src}. Please add the resource or mark it as not mandatory in #{FilePath.resources_manifest}.")
-      exit 1
+      raise "Mandatory resource file/folder not found for #{@brand_key}: #{src}. Please add the resource or mark it as not mandatory in #{FilePath.resources_manifest}."
     end
 
   end
@@ -134,8 +137,7 @@ class ResourceManifestProcessor
 
   def validate_manifest_file_existence
     unless File.exist?(@manifest_file)
-      Solara.logger.fatal("Brand switch copy manifest not found for #{@brand_key}: #{@manifest_file}")
-      exit 1
+      raise "Resources manifest not found for #{@brand_key}: #{@manifest_file}"
     end
   end
 
@@ -143,8 +145,7 @@ class ResourceManifestProcessor
     begin
       JSON.parse(File.read(@manifest_file))
     rescue JSON::ParserError => e
-      Solara.logger.fatal("Invalid brand switch copy manifest for #{@brand_key}: #{e.message}")
-      exit 1
+      raise "Invalid resources manifest for #{@brand_key}: #{e.message}"
     end
   end