brick-module 0.1.9 → 0.1.11

package/android/brick_modules.gradle

@@ -4,7 +4,7 @@
  * 
  * Usage: Add to settings.gradle only:
  * apply from: file("../node_modules/brick-module/android/brick_modules.gradle")
- * applyBrickModules(settings)
+ * applyBrickModules(settings, [projectRoot: "../", appProject: "app"])
  */
 
 import groovy.json.JsonSlurper
@@ -107,19 +107,26 @@ ext.runBrickCodegen = { workingDir ->
 // Main Configuration
 // =============================================================================
 
-ext.applyBrickModules = { settings, args = [:] ->
-    def appPath = (args instanceof Map) ? args.appPath : args
-    if (!appPath) {
-        throw new GradleException("Brick: appPath is required. Call applyBrickModules(settings, [appPath: '/absolute/path/to/app'])")
+ext.applyBrickModules = { settings, args ->
+    def projectRootPath = args.projectRoot
+    def appProjectName = args.appProject
+    
+    if (!projectRootPath) {
+        throw new GradleException("Brick: projectRoot is required. Call applyBrickModules(settings, [projectRoot: '../', appProject: 'app'])")
+    }
+    
+    if (!appProjectName) {
+        throw new GradleException("Brick: appProject is required. Call applyBrickModules(settings, [projectRoot: '../', appProject: 'app'])")
     }
-    // Support relative appPath (relative to settings.rootDir)
-    def appPathFile = new File(appPath.toString())
-    def projectRoot = (appPathFile.isAbsolute() ? appPathFile : new File(settings.rootDir, appPathFile.path)).canonicalFile
+    
+    // Support relative projectRoot (relative to settings.rootDir)
+    def projectRootFile = new File(projectRootPath.toString())
+    def projectRoot = (projectRootFile.isAbsolute() ? projectRootFile : new File(settings.rootDir, projectRootFile.path)).canonicalFile
 
-    // Validate package.json exists in appPath
+    // Validate package.json exists in projectRoot
     def packageJsonFile = new File(projectRoot, 'package.json')
     if (!packageJsonFile.exists()) {
-        throw new GradleException("Brick: package.json not found at ${projectRoot}. Please pass a valid appPath.")
+        throw new GradleException("Brick: package.json not found at ${projectRoot}. Please pass a valid projectRoot.")
     }
 
     def foundModules = []
@@ -208,14 +215,16 @@ ext.applyBrickModules = { settings, args = [:] ->
         gradle.rootProject.ext.brickModulesData = brickModulesData
         gradle.rootProject.ext.brickModulesList = foundModules
         gradle.rootProject.ext.brickProjectRoot = projectRoot
+        gradle.rootProject.ext.brickAppProjectName = appProjectName
         configureAppProject(gradle)
     }
 }
 
 // Configure the app project
 def configureAppProject(gradle) {
+    def appProjectName = gradle.rootProject.ext.brickAppProjectName
     gradle.rootProject.subprojects { project ->
-        if (project.name == 'app') {
+        if (project.name == appProjectName) {
             project.afterEvaluate {
                 configureBrickModules(project)
             }

package/dist/BrickModule.js

@@ -31,10 +31,9 @@ function get(moduleName) {
 	const nativeModuleInstance = getNativeModule();
 	const moduleProxy = new Proxy({}, {
 		get: (_target, property) => {
-			if (typeof property !== "string") return void 0;
+			if (typeof property !== "string") return;
 			if (property === "addEventListener") return (eventName, listener) => {
-				const emitter = getEventEmitter();
-				const subscription = emitter.addListener(`${moduleName}_${eventName}`, listener);
+				const subscription = getEventEmitter().addListener(`${moduleName}_${eventName}`, listener);
 				return () => {
 					subscription.remove();
 				};
@@ -63,8 +62,7 @@ function get(moduleName) {
 * @returns Promise resolving to array of module names
 */
 function getRegisteredModules() {
-	const nativeModuleInstance = getNativeModule();
-	return nativeModuleInstance?.getRegisteredModules() ?? [];
+	return getNativeModule()?.getRegisteredModules() ?? [];
 }
 /**
 * Clears the module cache (useful for testing or hot reloading)

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { BrickModule, BrickModuleInterface, BrickModuleSpec } from "./BrickModule.js";
+import { AnyObject } from "./types.js";
 
 //#region src/index.d.ts
 
@@ -28,4 +29,4 @@ interface BrickCodegenConfig {
   dev?: boolean;
 }
 //#endregion
-export { BrickCodegenConfig, BrickModule, BrickModuleError, type BrickModuleInterface, type BrickModuleSpec };
+export { AnyObject, BrickCodegenConfig, BrickModule, BrickModuleError, type BrickModuleInterface, type BrickModuleSpec };

package/dist/types.d.ts

@@ -0,0 +1,4 @@
+//#region src/types.d.ts
+type AnyObject = Record<string, any>;
+//#endregion
+export { AnyObject };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brick-module",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Better React Native native module development",
   "type": "module",
   "main": "dist/index.js",
@@ -62,7 +62,7 @@
     "brick-codegen": "./bin/brick-codegen.js"
   },
   "dependencies": {
-    "brick-codegen": "0.1.9"
+    "brick-codegen": "0.1.11"
   },
   "peerDependencies": {
     "react": ">=18.2.0",

package/podfile_helper.rb

@@ -20,35 +20,33 @@ def use_brick_modules!(app_path: nil)
   end
   
   begin
+    # Determine output path first
+    ios_brick_path = get_brick_ios_path(brick_root)
+    brick_codegen_pod_path = if Pathname.new(ios_brick_path).absolute?
+      ios_brick_path
+    else
+      File.expand_path(File.join(brick_root, ios_brick_path))
+    end
+    brick_codegen_podspec_path = File.join(brick_codegen_pod_path, 'BrickCodegen.podspec')
+
     # Run brick-codegen with real-time output and colors (iOS only)
     exit_status = system("cd #{brick_root} && FORCE_COLOR=1 npx brick-codegen --platform ios --projectRoot \"#{brick_root}\"")
-    
-    if exit_status
-      # Get iOS output path from brick.json if it exists
-      ios_brick_path = get_brick_ios_path(brick_root)
-      
-      # Handle relative vs absolute paths
-      if Pathname.new(ios_brick_path).absolute?
-        brick_codegen_pod_path = ios_brick_path
-      else
-        brick_codegen_pod_path = File.expand_path(File.join(brick_root, ios_brick_path))
-      end
-      
-      # Add generated BrickCodegen pod if it exists
-      brick_codegen_podspec_path = File.join(brick_codegen_pod_path, "BrickCodegen.podspec")
-      
-      if File.exist?(brick_codegen_podspec_path)
-        begin
-          pod 'BrickCodegen', :path => brick_codegen_pod_path
-        rescue => pod_error
-          Pod::UI.warn "[Brick] Failed to add BrickCodegen pod: #{pod_error.message}"
-        end
-      end
-    else
-      Pod::UI.warn "[Brick] brick-codegen failed to run. Please make sure it's installed: npm install brick-codegen"
+
+    unless exit_status
+      raise "[Brick] brick-codegen failed. Aborting pod install. Try: (cd #{brick_root} && npx brick-codegen --platform ios --debug)"
+    end
+
+    # Require podspec to exist after successful codegen
+    unless File.exist?(brick_codegen_podspec_path)
+      raise "[Brick] BrickCodegen.podspec not found at #{brick_codegen_pod_path} after codegen"
     end
+
+    # Link generated BrickCodegen pod
+    pod 'BrickCodegen', :path => brick_codegen_pod_path
+    Pod::UI.puts "[Brick] Linked BrickCodegen from #{brick_codegen_pod_path}"
   rescue => e
-    Pod::UI.warn "[Brick] Error running brick-codegen: #{e.message}"
+    # Re-raise so CocoaPods fails the install
+    raise e
   end
 end
 
@@ -75,4 +73,4 @@ def get_brick_ios_path(project_root)
   end
   
   return File.expand_path(File.join(project_root, 'ios/.brick'))
-end
+end

package/src/index.ts

@@ -35,3 +35,4 @@ export interface BrickCodegenConfig {
   oldArchOnly?: boolean;
   dev?: boolean;
 }
+export * from "./types";

package/src/types.ts

@@ -0,0 +1 @@
+export type AnyObject = Record<string, any>;