brick-module 0.1.4 → 0.1.6

package/dist/index.js

@@ -1,4 +1,4 @@
-import BrickModule_default from "./BrickModule.js";
+import BrickModule from "./BrickModule.js";
 
 //#region src/index.ts
 /**
@@ -15,4 +15,4 @@ var BrickModuleError = class extends Error {
 };
 
 //#endregion
-export { BrickModule_default as BrickModule, BrickModuleError };
+export { BrickModule, BrickModuleError };

package/ios/BrickModule/Internal/BrickCoreModule.swift

@@ -1,5 +1,8 @@
 import Foundation
 
+@objc public protocol BrickModuleRegistableViewControllerType {
+    @objc var moduleRegistry: BrickModuleRegistry? { get }
+}
 /**
  * Minimal protocol that all Brick modules must implement
  * Contains only essential properties for module identification
@@ -7,6 +10,9 @@ import Foundation
 public protocol BrickModuleBase {
     /// The name of the module (required for registration)
     var moduleName: String { get }
+    var controller: BrickModuleRegistableViewControllerType { get set }
+    
+    init (controller: BrickModuleRegistableViewControllerType)
 }
 
 /**
@@ -49,3 +55,11 @@ public enum BrickModuleError: Error, LocalizedError {
         }
     }
 }
+
+
+public protocol BrickModuleAddableViewControllerType: UIViewController {
+    func addBrickModule(_ module: BrickModuleBase)
+}
+
+
+  

package/ios/BrickModule/Internal/BrickModuleRegistry.swift

@@ -6,13 +6,12 @@ import React
  * Manages module lifecycle and provides simple module storage
  */
 @objc public class BrickModuleRegistry: NSObject {
-    @objc public static let shared = BrickModuleRegistry()
     
     private var modules: [String: Any] = [:]
     private var isRegistered: Bool = false
-    private weak var eventEmitter: RCTEventEmitter?
+    public weak var eventEmitter: RCTEventEmitter?
     
-    private override init() {
+    public override init() {
         super.init()
     }
     
@@ -35,7 +34,7 @@ import React
         
         isRegistered = true
         print("✅ BrickModuleRegistry: Successfully registered \(self.modules.count) modules")
-        
+
         if ProcessInfo.processInfo.environment["GRANITE_DEBUG"] == "1" {
             debugPrintRegisteredModules()
         }
@@ -136,3 +135,7 @@ import React
         print("🧹 BrickModuleRegistry: Registry cleared")
     }
 }
+
+public class ModuleRegistry {
+    
+}

package/ios/BrickModule/Public/BrickModule-Swift.h

@@ -304,12 +304,14 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 @class NSArray;
 @class NSString;
 @class RCTEventEmitter;
+@class RCTBridge;
 
 /// Central registry for all Brick modules
 /// Manages module lifecycle and provides simple module storage
 SWIFT_CLASS("_TtC11BrickModule19BrickModuleRegistry")
 @interface BrickModuleRegistry : NSObject
-SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) BrickModuleRegistry * _Nonnull shared;)
+@property (nonatomic, weak) RCTBridge * _Nullable bridge;
+//SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) BrickModuleRegistry * _Nonnull shared;)
 + (BrickModuleRegistry * _Nonnull)shared SWIFT_WARN_UNUSED_RESULT;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brick-module",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Better React Native native module development",
   "type": "module",
   "main": "dist/index.js",
@@ -51,7 +51,7 @@
     "brick-codegen": "./bin/brick-codegen.js"
   },
   "dependencies": {
-    "brick-codegen": "0.1.4"
+    "brick-codegen": "0.1.6"
   },
   "peerDependencies": {
     "react": ">=18.2.0",
@@ -60,8 +60,8 @@
   "devDependencies": {
     "@types/react": "^18.2.0",
     "@types/react-native": "^0.72.0",
-    "tsdown": "^0.12.8",
-    "typescript": "^5.1.0"
+    "tsdown": "^0.14.0",
+    "typescript": "^5.9.2"
   },
   "codegenConfig": {
     "name": "BrickModuleSpec",

package/podfile_helper.rb

@@ -6,8 +6,79 @@
 require 'json'
 require 'pathname'
 
+def find_brick_json(start_dir)
+  # Walk up the directory tree looking for brick.json
+  current = File.expand_path(start_dir)
+  root = File.expand_path('/')
+  
+  while current != root
+    brick_json_path = File.join(current, 'brick.json')
+    if File.exist?(brick_json_path)
+      return brick_json_path
+    end
+    parent = File.dirname(current)
+    break if parent == current  # Reached filesystem root
+    current = parent
+  end
+  
+  return nil
+end
+
+def find_project_root
+  ios_root = Pod::Config.instance.installation_root
+  
+  # 1. Walk up directory tree to find brick.json
+  brick_json_path = find_brick_json(ios_root)
+  if brick_json_path
+    Pod::UI.puts "[Brick] Found brick.json at: #{brick_json_path}"
+    begin
+      config = JSON.parse(File.read(brick_json_path))
+      if config['projectRoot']
+        project_root = resolve_project_root(config['projectRoot'], File.dirname(brick_json_path))
+        if project_root
+          Pod::UI.puts "[Brick] Using projectRoot from brick.json: #{project_root}"
+          return project_root
+        end
+      end
+      # If brick.json exists but has no projectRoot, use its directory as project root
+      return File.dirname(brick_json_path)
+    rescue => e
+      Pod::UI.warn "[Brick] Failed to parse brick.json: #{e.message}"
+    end
+  end
+  
+  # 2. Walk up to find package.json with node_modules
+  current = ios_root
+  while current != '/'
+    if File.exist?(File.join(current, 'package.json')) && File.exist?(File.join(current, 'node_modules'))
+      Pod::UI.puts "[Brick] Found project root via package.json: #{current}"
+      return current
+    end
+    parent = File.dirname(current)
+    break if parent == current
+    current = parent
+  end
+  
+  # If no project root found, use default fallback
+  default_root = File.expand_path(File.join(ios_root, '..'))
+  Pod::UI.warn "[Brick] Warning: Failed to find project root via brick.json or package.json. Using default: #{default_root}"
+  return default_root
+end
+
+def resolve_project_root(project_root_path, config_dir)
+  # Handle both absolute and relative paths
+  if Pathname.new(project_root_path).absolute?
+    return project_root_path if File.exist?(project_root_path)
+  else
+    # Relative to brick.json location
+    resolved_path = File.expand_path(File.join(config_dir, project_root_path))
+    return resolved_path if File.exist?(resolved_path)
+  end
+  return nil
+end
+
 def use_brick_modules!
-  brick_root = "#{Pod::Config.instance.installation_root}/.."
+  brick_root = find_project_root
   discovered_modules = []
   
   begin
@@ -21,9 +92,12 @@ def use_brick_modules!
       # Generate BrickModuleProvider.swift for auto-registration
       generate_brick_module_provider(brick_root, discovered_modules)
       
+      # Get iOS output path from brick.json if it exists
+      ios_brick_path = get_brick_ios_path(brick_root)
+      
       # Add generated BrickCodegen pod if it exists
-      brick_codegen_podspec_path = "#{brick_root}/ios/.brick/BrickCodegen.podspec"
-      brick_codegen_pod_path = "#{brick_root}/ios/.brick"
+      brick_codegen_podspec_path = "#{brick_root}/#{ios_brick_path}/BrickCodegen.podspec"
+      brick_codegen_pod_path = "#{brick_root}/#{ios_brick_path}"
       
       if File.exist?(brick_codegen_podspec_path)
         begin
@@ -68,17 +142,24 @@ def discover_brick_modules(project_root)
           brick_config = dep_package_json['brickModule']
           ios_config = brick_config['ios'] || {}
           
-          # Extract the iOS module name and class name
-          module_name = ios_config['moduleName']
-          class_name = ios_config['className']
-          
-          modules << {
-            'name' => dep_name,
-            'moduleName' => module_name,
-            'className' => class_name,
-          }
+          # Check if autoRegister is enabled (default: true)
+          auto_register = brick_config['autoRegister'] != false
           
-          Pod::UI.puts "[Brick] Found module: #{dep_name} (#{module_name})"
+          if auto_register
+            # Extract the iOS module name and class name
+            module_name = ios_config['moduleName']
+            class_name = ios_config['className']
+            
+            modules << {
+              'name' => dep_name,
+              'moduleName' => module_name,
+              'className' => class_name,
+            }
+            
+            Pod::UI.puts "[Brick] Found module: #{dep_name} (#{module_name})"
+          else
+            Pod::UI.puts "[Brick] Skipping module (autoRegister=false): #{dep_name}"
+          end
         end
       rescue => e
         Pod::UI.warn "[Brick] Failed to parse #{dep_package_json_path}: #{e.message}"
@@ -91,11 +172,49 @@ def discover_brick_modules(project_root)
   modules
 end
 
+def get_brick_ios_path(project_root)
+  # Walk up from project_root to find brick.json
+  brick_config_path = find_brick_json(project_root)
+  
+  if brick_config_path && File.exist?(brick_config_path)
+    begin
+      config = JSON.parse(File.read(brick_config_path))
+      
+      # Get the effective project root
+      effective_root = project_root
+      if config['projectRoot']
+        resolved_root = resolve_project_root(config['projectRoot'], File.dirname(brick_config_path))
+        effective_root = resolved_root if resolved_root
+      end
+      
+      ios_path = config.dig('output', 'ios')
+      if ios_path && !ios_path.empty?
+        # Handle absolute paths (though not recommended)
+        if Pathname.new(ios_path).absolute?
+          Pod::UI.warn "[Brick] Using absolute path for iOS output is not recommended: #{ios_path}"
+          return ios_path
+        else
+          # Relative to effective project root
+          return File.join(effective_root, ios_path)
+        end
+      end
+    rescue => e
+      Pod::UI.warn "[Brick] Failed to parse brick.json: #{e.message}"
+    end
+  end
+  
+  # Return default path relative to project root
+  return File.join(project_root, 'ios/.brick')
+end
+
 def generate_brick_module_provider(project_root, modules)
   return if modules.empty?
   
-  # Create the .brick directory if it doesn't exist
-  brick_dir = File.join(project_root, 'ios', '.brick')
+  # Get iOS output path from brick.json
+  ios_brick_path = get_brick_ios_path(project_root)
+  
+  # Create the brick directory if it doesn't exist
+  brick_dir = File.join(project_root, ios_brick_path)
   FileUtils.mkdir_p(brick_dir) unless File.exist?(brick_dir)
   
   # Generate imports and module instances