solara 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714797cd507e354e49c4a1981a516f6ad3e659797ba40b6040c7e7a6f30f11aa
-  data.tar.gz: 3b3d4ed6c116abea9dd15c2db4b5df308320649be4381623e3c7a3c863ef0385
+  metadata.gz: acd7dd411828a00b018a7ead20fc5f21853c45682a7b21f419377385b7e5cbb4
+  data.tar.gz: 187461f358743a466bcd31971622a32091fc4368264f51f73c7ef73b048ae6c3
 SHA512:
-  metadata.gz: b4c46c3f893d95eddbde530e7d83fe340ce36698974880073b3517779bb8e39b31813863c13f7743e821936b814e6d7f5d42337c10b3ef37a4cd6767732f5a20
-  data.tar.gz: 750e7851fa9584bb85b00b5f01e48ea246892914f1bbfafeb7a2b18db8e138d0da5f8fd2a2253434bed1dd6b6d9b0c6911dcaec908714e96ff69c894653490b8
+  metadata.gz: f3e85254b364be2888f9e9a760967bf64e4672df8ae4dde907b6f8a8928afa7266ad9a26f1ff35867ae8b7fb2fc362aa0be6f6a70c7aafb3b29e83fa2c456e72
+  data.tar.gz: ee5abac576555d1415bcaa33cec324bf21dcf0519b28eefc1687b6b129b6a74c1f160eb5f2b30f3037facda8ca163e0867c4a7acd8ecdfe2ef2ab88fcf84e330

data/solara/lib/core/brands/brand_onboarder.rb

@@ -12,7 +12,7 @@ class BrandOnboarder
     end
 
     def onboard
-        if @clone_brand_key.nil? || @clone_brand_key.empty?
+        if @clone_brand_key.nil? || @clone_brand_key.strip.empty?
             generate_brand_template
         else
             clone_brand

data/solara/lib/core/brands/brand_switcher.rb

@@ -30,7 +30,7 @@ class BrandSwitcher
   def switch
     BrandFontSwitcher.new(@brand_key).switch
     
-    ResourceManifestSwitcher.new(@brand_key).switch
+    ResourceManifestSwitcher.new(@brand_key, ignore_health_check: @ignore_health_check).switch
     JsonManifestSwitcher.new(@brand_key).switch
 
     case @platform
@@ -51,13 +51,14 @@ class BrandSwitcher
 end
 
 class ResourceManifestSwitcher
-  def initialize(brand_key)
+  def initialize(brand_key, ignore_health_check:)
     @brand_key = brand_key
+    @ignore_health_check = ignore_health_check
   end
 
   def switch
     Solara.logger.start_step("Process resource manifest: #{FilePath.resources_manifest}")
-    brand_resource_copier = ResourceManifestProcessor.new(@brand_key)
+    brand_resource_copier = ResourceManifestProcessor.new(@brand_key, ignore_health_check: @ignore_health_check)
     brand_resource_copier.copy
     Solara.logger.debug("#{@brand_key} resources copied successfully according to the manifest: #{FilePath.resources_manifest}.")
     Solara.logger.end_step("Process resource manifest: #{FilePath.resources_manifest}")
@@ -66,39 +67,72 @@ class ResourceManifestSwitcher
 end
 
 class JsonManifestSwitcher
+  PLATFORM_CONFIGS = {
+    Platform::Flutter => {
+      language: Language::Dart,
+      output_path: :flutter_lib_artifacts
+    },
+    Platform::IOS => {
+      language: Language::Swift,
+      output_path: :ios_project_root_artifacts
+    },
+    Platform::Android => {
+      language: Language::Kotlin,
+      output_path: :android_project_java_artifacts
+    }
+  }.freeze
+
   def initialize(brand_key)
     @brand_key = brand_key
-    @manifest_path = FilePath.brand_json_dir(brand_key)
+    @brand_manifest_path = FilePath.brand_json_dir(brand_key)
+    @platform = SolaraSettingsManager.instance.platform
+    validate_inputs
   end
 
   def switch
-    Solara.logger.start_step("Process JSON manifest: #{@manifest_path}")
+    with_logging do
+      process_manifests
+    end
+  end
 
+  private
 
-    case SolaraSettingsManager.instance.platform
-    when Platform::Flutter
-      process_maifest(Language::Dart, FilePath.flutter_lib_artifacts)
-      process_maifest(Language::Dart, FilePath.brand_global_json_dir)
-    when Platform::IOS
-      process_maifest(Language::Swift, FilePath.ios_project_root_artifacts)
-      process_maifest(Language::Swift, FilePath.brand_global_json_dir)
-    when Platform::Android
-      process_maifest(Language::Kotlin, FilePath.android_project_java_artifacts )
-      process_maifest(Language::Kotlin, FilePath.brand_global_json_dir)
-    else
-      raise ArgumentError, "Invalid platform: #{@platform}"
-    end
+  def validate_inputs
+    raise ArgumentError, "Brand key cannot be nil" if @brand_key.nil?
+    raise ArgumentError, "Invalid platform: #{@platform}" unless PLATFORM_CONFIGS.key?(@platform)
+    raise ArgumentError, "Manifest path not found: #{@brand_manifest_path}" unless File.exist?(@brand_manifest_path)
+  end
 
-    Solara.logger.end_step("Process JSON manifest: #{@manifest_path}")
+  def with_logging
+    log_message = "Process JSON manifest: #{@brand_manifest_path}"
+    Solara.logger.start_step(log_message)
+    yield
+    Solara.logger.end_step(log_message)
+  rescue StandardError => e
+    Solara.logger.error("Failed to process manifest: #{e.message}")
+    raise
+  end
+
+  def process_manifests
+    config = PLATFORM_CONFIGS[@platform]
+    output_path = FilePath.send(config[:output_path])
+
+    [
+      @brand_manifest_path,
+      FilePath.brand_global_json_dir
+    ].each do |manifest_path|
+      process_manifest(config[:language], manifest_path, output_path)
+    end
   end
 
-  def process_maifest(language, output_path)
-    processor = JsonManifestProcessor.new(
-      @manifest_path,
+  def process_manifest(language, manifest_path, output_path)
+    JsonManifestProcessor.new(
+      manifest_path,
       language,
       output_path
-    )
-    processor.process
+    ).process
+  rescue StandardError => e
+    raise StandardError, "Failed to process #{manifest_path}: #{e.message}"
   end
 end
 

data/solara/lib/core/dashboard/brand/BrandDetailController.js

@@ -91,6 +91,7 @@ class BrandDetailController {
             const response = await this.model.fetchBrandDetails();
             await this.onLoadSections(response.result);
             const {isCurrentBrand, contentChanged} = await this.model.fetchCurrentBrand();
+            this.model.isCurrentBrand = isCurrentBrand
 
             if (isCurrentBrand) {
                 this.view.setupSyncBrandButton(contentChanged ? '#ff4136' : '#4A90E2');
@@ -109,7 +110,7 @@ class BrandDetailController {
         try {
             this.view.addBrandOverlay.style.display = 'none'
             this.view.header.style.display = 'flex';
-            this.view.updateAppNameTitle(`${configuraationsResult.brand.key} (${configuraationsResult.brand.name})`);
+            this.view.updateAppNameTitle(`${configuraationsResult.brand.name} - ${configuraationsResult.brand.key}`);
             await this.showSections(configuraationsResult);
             this.view.showIndex();
         } catch (error) {
@@ -159,7 +160,9 @@ class BrandDetailController {
         try {
             await this.model.saveSection(container.dataset.key, section.content);
             await this.checkBrandHealth();
-            await this.switchToBrand(true)
+            if (this.model.isCurrentBrand) {
+                await this.switchToBrand(true)
+            }
         } catch (error) {
             console.error('Error saving section:', error);
             alert(error.message);

data/solara/lib/core/dashboard/brand/BrandDetailModel.js

@@ -10,6 +10,7 @@ class BrandDetailModel {
     constructor() {
         this.localSource = new BrandLocalSource();
         this.remoteSource = new BrandRemoteSource();
+        this.isCurrentBrand = false;
 
         this.brandKey = this.getQueryFromUrl('brand_key');
 

data/solara/lib/core/dashboard/brand/SectionsFormManager.js

@@ -1,7 +1,6 @@
 import '../component/EditJsonSheet.js';
 
 class SectionsFormManager {
-
     constructor() {
         this.sections = [];
         this.sectionsContainer = document.getElementById('sections');
@@ -49,7 +48,6 @@ class SectionsFormManager {
         })
         return Array.from(data);
     }
-
 }
 
 class SectionItemManager {
@@ -113,7 +111,7 @@ class SectionItemManager {
 
         const isArray = Array.isArray(obj)
 
-        for (const [k, v] of Object.entries(obj)) {
+       for (const [k, v] of Object.entries(obj)) {
             const item = document.createElement('div');
 
             const cardValueContainer = document.createElement('div');
@@ -135,18 +133,62 @@ class SectionItemManager {
                 item.className = 'card-item';
                 itemKey.textContent = k.replace(/_/g, ' ')
 
-                if (this.isColorValue(v)) {
+                if (typeof v === 'boolean') {
+                    // Create a container for the entire boolean input
+                    const booleanContainer = document.createElement('div');
+                    booleanContainer.className = 'boolean-container';
+
+                    const checkboxContainer = document.createElement('div');
+                    checkboxContainer.className = 'card-value checkbox-container';
+
+                    const itemValue = document.createElement('input');
+                    itemValue.type = 'checkbox';
+                    itemValue.className = 'card-value checkbox';
+                    itemValue.checked = v;
+
+                    const valueLabel = document.createElement('span');
+                    valueLabel.className = 'checkbox-value';
+                    valueLabel.textContent = v.toString();
+
+                    const updateValue = () => {
+                        const newValue = !itemValue.checked;
+                        itemValue.checked = newValue;
+                        valueLabel.textContent = newValue.toString();
+                        this.updateValue(obj, k, newValue, typeof v);
+                    };
+
+                    // Add click handlers to both container and checkbox
+                    booleanContainer.onclick = (e) => {
+                        if (e.target !== itemValue) { // Prevent double-toggle when clicking checkbox
+                            updateValue();
+                        }
+                    };
+
+                    itemValue.onchange = () => {
+                        valueLabel.textContent = itemValue.checked.toString();
+                        this.updateValue(obj, k, itemValue.checked, typeof v);
+                    };
+
+                    checkboxContainer.appendChild(itemValue);
+                    checkboxContainer.appendChild(valueLabel);
+
+                    // Move the key inside the boolean container
+                    booleanContainer.appendChild(itemKey);
+                    booleanContainer.appendChild(checkboxContainer);
+
+                    cardValueContainer.appendChild(booleanContainer);
+                } else if (this.isColorValue(v)) {
                     const itemValue = document.createElement('input');
                     itemValue.type = 'color';
                     itemValue.className = 'card-value';
                     itemValue.value = v;
-                    itemValue.onchange = () => this.updateValue(obj, k, itemValue.value);
+                    itemValue.onchange = () => this.updateValue(obj, k, itemValue.value, typeof v);
                     cardValueContainer.appendChild(itemValue);
                 } else {
                     const itemValue = document.createElement('textarea');
                     itemValue.className = 'card-value';
                     itemValue.value = v;
-                    itemValue.onchange = () => this.updateValue(obj, k, itemValue.value);
+                    itemValue.onchange = () => this.updateValue(obj, k, itemValue.value, typeof v);
                     cardValueContainer.appendChild(itemValue);
                 }
 
@@ -165,8 +207,7 @@ class SectionItemManager {
     }
 
     isColorValue(value) {
-        // Check if the value is a valid color (hex with opacity, RGBA, or RGB)
-        const hexPattern = /^#([0-9A-F]{3}){1,2}([0-9A-F]{2})?$/i; // 3, 6, or 8 hex digits
+        const hexPattern = /^#([0-9A-F]{3}){1,2}([0-9A-F]{2})?$/i;
         const rgbaPattern = /^rgba?\(\s*(\d{1,3}\s*,\s*){2}\d{1,3}\s*,?\s*(0|1|0?\.\d+|1?\.\d+)\s*\)$/;
 
         return hexPattern.test(value) || rgbaPattern.test(value);
@@ -182,14 +223,35 @@ class SectionItemManager {
         this.notifyChange()
     }
 
-    updateValue(obj, key, value) {
+    updateValue(obj, key, value, originalType) {
         try {
-            obj[key] = JSON.parse(value);
+            // Handle different types based on the original value's type
+            switch (originalType) {
+                case 'string':
+                    obj[key] = String(value);
+                    break;
+                case 'number':
+                    // If the original was a number, keep it number
+                    if (!isNaN(value) || value === '') {
+                        obj[key] = Number(value);
+                    }
+                    break;
+                case 'boolean':
+                    obj[key] = value.toLowerCase() === 'true';
+                    break;
+                default:
+                    // Try to parse as JSON, fallback to string if it fails
+                    try {
+                        obj[key] = JSON.parse(value);
+                    } catch {
+                        obj[key] = value;
+                    }
+            }
         } catch {
             obj[key] = value;
         }
         this.displayJSONCards();
-        this.notifyChange()
+        this.notifyChange();
     }
 
     confirmDeleteProperty(obj, key) {
@@ -228,5 +290,4 @@ class SectionItemManager {
     }
 }
 
-
 export default SectionsFormManager;

data/solara/lib/core/dashboard/brand/brand.html

@@ -515,6 +515,45 @@
                 background-color: var(--background-color);
                 color: var(--text-color);
             }
+            .boolean-container {
+                flex-direction: row;
+                display: flex;
+                align-items: center;
+
+                cursor: pointer;
+                padding: 0px;
+                flex: 1;
+            }
+
+            .boolean-container:hover {
+                background-color: var(--background-color));
+            }
+
+            .card-value.checkbox-container {
+                flex-direction: row;
+                display: flex;
+                align-items: start;
+                gap: 0px;
+                padding-bottom: 10px;
+                margin-left: 10px;
+            }
+
+            .card-value.checkbox {
+                width: auto;
+                height: auto;
+                margin: 0;
+                flex: 0;
+                cursor: pointer;
+            }
+
+            .checkbox-value {
+                font-size: 1.2em;
+                color: var(--text-color);
+                user-select: none;
+                flex: 0;
+                margin-left: 10px;
+            }
+
             .card-actions {
                 display: flex;
                 align-items: center;
@@ -556,7 +595,7 @@
             <img class="loading-overlay-logo" src="../solara.png" alt="Loading Logo">
         </div>
 
-        <div id="toast" style=" display: none; position: fixed; top: 10%; left: 50%; transform: translate(-50%, 10%); background-color: #4CAF50; color: white; padding: 16px; border-radius: 5px; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);">
+        <div id="toast" style="    display: none; position: fixed; top: 10%; left: 50%; transform: translate(-50%, 10%); background-color: #4CAF50; color: white; padding: 16px; border-radius: 5px; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);">
             <!-- Message will be set dynamically -->
         </div>
 
@@ -591,11 +630,11 @@
                         <img src="../solara.png" alt="Solara Logo">
                         <h2>Solara simplifies the management of your brand configurations, allowing you to access and update them anytime, anywhere.</h2>
                         <div class="button-message">You can select a JSON file containing brand configurations that were exported using Solara.</div>
-                        <button id="uploadJsonBtn" style=" animation-delay: 0.5s;">Upload JSON</button>
-                        <div class="button-message" style=" animation-delay: 0.7s;">Alternatively, upload from a folder that includes the brand's JSON files.</div>
-                        <button id="uploadBrandBtn" style=" animation-delay: 0.9s;">Upload Folder</button>
-                        <div class="button-message" style=" animation-delay: 1.1s;">You also have the option to create new brand configurations.</div>
-                        <button id="newBrandBtn" style=" animation-delay: 1.3s;">New Brand</button>
+                        <button id="uploadJsonBtn" style="    animation-delay: 0.5s;">Upload JSON</button>
+                        <div class="button-message" style="    animation-delay: 0.7s;">Alternatively, upload from a folder that includes the brand's JSON files.</div>
+                        <button id="uploadBrandBtn" style="    animation-delay: 0.9s;">Upload Folder</button>
+                        <div class="button-message" style="    animation-delay: 1.1s;">You also have the option to create new brand configurations.</div>
+                        <button id="newBrandBtn" style="    animation-delay: 1.3s;">New Brand</button>
                     </div>
 
                 </div>

data/solara/lib/core/dashboard/component/OnboardBrandBottomSheet.js

@@ -72,6 +72,10 @@ class OnboardBrandBottomSheet extends HTMLElement {
             border-radius: 3.5px;
             font-size: 11.2px;
             background-color: var(--background-color);
+<<<<<<< HEAD
+=======
+            color: var(--text-color);
+>>>>>>> develop
         }
         .tooltip {
             position: relative;

data/solara/lib/core/dashboard/handler/onboard_brand_handler.rb

@@ -26,18 +26,6 @@ class OnboardBrandHandler < BaseHandler
             end
             res.content_type = 'application/json'
         end
-
-        def onboard_brand(brand_name, brand_key, clone_brand_key = nil)
-            if BrandsManager.instance.exists(brand_key)
-                return { success: false, message: "Brand with key (#{brand_key}) already added!" }
-            end
-            SolaraManager.new.onboard(brand_key, brand_name, clone_brand_key: clone_brand_key, open_dashboard: false)
-            { success: true, message: "Brand added successfully" }
-        rescue StandardError => e
-            Solara.logger.failure("Error adding brand: #{e.message}")
-            raise
-        end
-
     end
 
     def onboard_brand(brand_name, brand_key, clone_brand_key = nil)
@@ -46,8 +34,5 @@ class OnboardBrandHandler < BaseHandler
         end
         SolaraManager.new.onboard(brand_key, brand_name, clone_brand_key: clone_brand_key, open_dashboard: false)
         { success: true, message: "Brand added successfully" }
-    rescue StandardError => e
-        Solara.logger.failure("Error adding brand: #{e.message}")
-        raise
     end
 end

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/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)

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, '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,7 @@ class ResourceManifestProcessor
 
   def git_ignore(files)
     files.each do |file|
-      GitignoreManager.new(FilePath.project_root).add_items([file])
+      GitignoreManager.new(FilePath.project_root).add_items(["/#{file}"])
     end
   end
 
@@ -104,10 +105,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 +136,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 +144,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
 

data/solara/lib/core/template/brands/json/Json-Manifest.md

@@ -21,16 +21,14 @@ Each directory contains a `json_manifest.json` file with the following structure
     "files": [
         {
             "fileName": "",
-            "generate": {
-                "enabled": true,
-                "className": "",
-                "customClassNames": [
-                    {
-                        "generatedName": "",
-                        "customName": ""
-                    }
-                ]
-            }
+            "generate": true,
+            "parentClassName": "",
+            "customClassNames": [
+                {
+                    "originalName": "",
+                    "customName": ""
+                }
+            ]
         }
     ]
 }

data/solara/lib/core/template/brands/json/json_manifest.json

@@ -3,16 +3,14 @@
     "files": [
         {
             "fileName": "",
-            "generate": {
-                "enabled": true,
-                "className": "",
-                "customClassNames": [
-                    {
-                        "generatedName": "",
-                        "customName": ""
-                    }
-                ]
-            }
+            "generate": true,
+            "parentClassName": "",
+            "customClassNames": [
+                {
+                    "originalName": "",
+                    "customName": ""
+                }
+            ]
         }
     ]
 }

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/solara/lib/solara_manager.rb

@@ -32,24 +32,32 @@ class SolaraManager
     end
 
     def onboard(brand_key, brand_name, init: false, clone_brand_key: nil, open_dashboard: true, success_message: nil)
-        Solara.logger.header("Onboarding #{brand_key}")
+        begin
+            Solara.logger.header("Onboarding #{brand_key}")
 
-        if !init && BrandsManager.instance.exists(brand_key)
-            Solara.logger.fatal("Brand with key (#{brand_key}) already added to brands!")
-            return
-        end
+            if !init && BrandsManager.instance.exists(brand_key)
+                Solara.logger.fatal("Brand with key (#{brand_key}) already added to brands!")
+                return
+            end
+
+            BrandOnboarder.new(brand_key, brand_name, clone_brand_key: clone_brand_key).onboard
 
-        BrandOnboarder.new(brand_key, brand_name, clone_brand_key: clone_brand_key).onboard
+            switch(brand_key, ignore_health_check: true)
 
-        switch(brand_key, ignore_health_check: true)
 
-        clone_message = clone_brand_key.nil? || clone_brand_key.empty? ? '.' : ", cloned from #{clone_brand_key}."
-        message = success_message || "Onboarded #{brand_key} successfully#{clone_message}"
-        Solara.logger.success(message)
+            clone_message = clone_brand_key.nil? || clone_brand_key.empty? ? '.' : ", cloned from #{clone_brand_key}."
+            message = success_message || "Onboarded #{brand_key} successfully#{clone_message}"
+            Solara.logger.success(message)
 
-        if open_dashboard
-            Solara.logger.success("Openning the dashboard for #{brand_key} to complete its details.")
-            dashboard(brand_key)
+            if open_dashboard
+                Solara.logger.success("Openning the dashboard for #{brand_key} to complete its details.")
+                dashboard(brand_key)
+            end
+        rescue => e
+            # Rollback this brand
+            offboard(brand_key, confirm: false)
+            Solara.logger.debug("Performed rollback for (#{brand_key}).")
+            raise e
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Malek Kamel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor