brick-module 0.1.4 → 0.1.6

package/BrickModule.podspec

@@ -44,6 +44,7 @@ Pod::Spec.new do |s|
           "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
       })
+      s.dependency 'React' 
       s.dependency "React-Codegen"
       s.dependency "RCT-Folly"
       s.dependency "RCTRequired"

package/android/brick_modules.gradle

@@ -43,6 +43,88 @@ ext.readPackageJson = { File packageJsonFile ->
     }
 }
 
+ext.findBrickJson = { startDir ->
+    // Walk up the directory tree looking for brick.json
+    if (!startDir) {
+        return null
+    }
+    
+    try {
+        def current = new File(startDir).canonicalFile
+        def root = new File('/').canonicalFile
+        
+        while (current != root && current != null) {
+            def brickJsonFile = new File(current, 'brick.json')
+            if (brickJsonFile.exists()) {
+                return brickJsonFile
+            }
+            def parent = current.parentFile
+            if (parent == current || parent == null) break  // Reached filesystem root
+            current = parent
+        }
+    } catch (Exception e) {
+        // Failed to process directory, return null
+    }
+    
+    return null
+}
+
+ext.resolveProjectRoot = { projectRootPath, configDir ->
+    // Handle both absolute and relative paths
+    if (!projectRootPath || !configDir) {
+        return null
+    }
+    
+    try {
+        def projectRootFile = new File(projectRootPath)
+        if (projectRootFile.isAbsolute()) {
+            return projectRootFile.exists() ? projectRootFile : null
+        } else {
+            // Relative to brick.json location
+            def resolvedFile = new File(configDir, projectRootPath).canonicalFile
+            return resolvedFile.exists() ? resolvedFile : null
+        }
+    } catch (Exception e) {
+        return null
+    }
+}
+
+ext.getBrickAndroidPath = { searchRoot ->
+    // Walk up directory tree to find brick.json
+    def brickConfigFile = findBrickJson(searchRoot)
+    
+    if (brickConfigFile && brickConfigFile.exists()) {
+        try {
+            def config = new JsonSlurper().parse(brickConfigFile)
+            
+            // Get the effective project root
+            def effectiveRoot = brickConfigFile.parentFile
+            if (config.projectRoot) {
+                def resolvedRoot = resolveProjectRoot(config.projectRoot, brickConfigFile.parentFile)
+                if (resolvedRoot) {
+                    effectiveRoot = resolvedRoot
+                }
+            }
+            
+            def androidPath = config?.output?.android
+            if (androidPath && !androidPath.isEmpty()) {
+                // Handle absolute paths (though not recommended)
+                if (new File(androidPath).isAbsolute()) {
+                    println("[Brick] Warning: Using absolute path for Android output is not recommended: ${androidPath}")
+                    return androidPath
+                }
+                // Otherwise, treat as relative to effective project root
+                return new File(effectiveRoot, androidPath).canonicalPath
+            }
+        } catch (Exception e) {
+            println("[Brick] Warning: Failed to parse brick.json: ${e.message}")
+        }
+    }
+    
+    // Default: .brick directory in the Android project root
+    return new File(searchRoot, '.brick').canonicalPath
+}
+
 ext.getAllDependencies = { packageJson ->
     def deps = []
     deps.addAll(packageJson.dependencies?.keySet() ?: [])
@@ -54,6 +136,44 @@ ext.isBrickModule = { packageJson ->
     return packageJson?.brickModule != null
 }
 
+ext.findProjectRoot = { androidDir ->
+    // 1. Walk up directory tree to find brick.json
+    def brickConfigFile = findBrickJson(androidDir)
+    if (brickConfigFile) {
+        brickLog("Found brick.json at: ${brickConfigFile.canonicalPath}")
+        try {
+            def config = new JsonSlurper().parse(brickConfigFile)
+            if (config.projectRoot) {
+                def projectRoot = resolveProjectRoot(config.projectRoot, brickConfigFile.parentFile)
+                if (projectRoot) {
+                    brickLog("Using projectRoot from brick.json: ${projectRoot.canonicalPath}")
+                    return projectRoot
+                }
+            }
+            // If brick.json exists but has no projectRoot, use its directory as project root
+            return brickConfigFile.parentFile
+        } catch (Exception e) {
+            println("[Brick] Warning: Failed to parse brick.json: ${e.message}")
+        }
+    }
+    
+    // 2. Walk up to find package.json with node_modules
+    def current = androidDir
+    while (current != null && current != new File('/')) {
+        if (new File(current, 'package.json').exists() && new File(current, 'node_modules').exists()) {
+            brickLog("Found project root via package.json: ${current.canonicalPath}")
+            return current
+        }
+        def parent = current.parentFile
+        if (parent == current) break
+        current = parent
+    }
+    
+    // If no project root found, use default fallback
+    brickLog("Warning: Failed to find project root via brick.json or package.json. Using default: ${androidDir.parentFile.canonicalPath}")
+    return androidDir.parentFile
+}
+
 ext.runBrickCodegen = { workingDir ->
     def brickModuleDir = resolveModule(workingDir, "brick-module")
     if (brickModuleDir == null) {
@@ -82,7 +202,7 @@ ext.runBrickCodegen = { workingDir ->
 // =============================================================================
 
 ext.applyBrickModules = { settings ->
-    def projectRoot = settings.rootDir.parentFile
+    def projectRoot = findProjectRoot(settings.rootDir)
     def foundModules = []
     def brickModulesData = [:]
     
@@ -119,34 +239,44 @@ ext.applyBrickModules = { settings ->
         def packageJson = readPackageJson(new File(moduleDir, "package.json"))
         if (!isBrickModule(packageJson)) return
         
+        // Check if autoRegister is enabled (default: true)
+        def autoRegister = packageJson.brickModule.autoRegister != false
+        if (!autoRegister) return
+        
         def androidDir = new File(moduleDir, "android")
         if (androidDir.exists()) {
-            settings.include(":${depName}")
-            settings.project(":${depName}").projectDir = androidDir
+            // Convert npm package name to valid Gradle project name
+            // Replace @ with empty and / with _
+            def gradleProjectName = depName.replaceAll("^@", "").replaceAll("/", "_")
+            
+            settings.include(":${gradleProjectName}")
+            settings.project(":${gradleProjectName}").projectDir = androidDir
             foundModules.add(depName)
             
             // Store module data for project configuration
             if (packageJson.brickModule.android?.package) {
                 brickModulesData[depName] = [
                     moduleName: packageJson.brickModule.android.moduleName ?: depName,
-                    packageName: packageJson.brickModule.android.package
+                    packageName: packageJson.brickModule.android.package,
+                    gradleProjectName: gradleProjectName
                 ]
             }
         }
     }
     
-    // Check if codegen is needed
-    def brickDir = new File(settings.rootDir, ".brick")
+    // Check if codegen is needed (use configured path)
+    def androidBrickPath = getBrickAndroidPath(settings.rootDir)
+    def brickDir = new File(androidBrickPath)
     def needsCodegen = !brickDir.exists() || !new File(brickDir, "src/main/kotlin/BrickModule.kt").exists()
     
     if (needsCodegen) {
         runBrickCodegen(projectRoot)
     }
     
-    // Include generated module
+    // Include generated module (use configured path)
     if (brickDir.exists()) {
-        settings.include(":brick-generated")
-        settings.project(":brick-generated").projectDir = brickDir
+        settings.include(":brick-codegen")
+        settings.project(":brick-codegen").projectDir = brickDir
     }
     
     if (!foundModules.isEmpty()) {
@@ -184,8 +314,8 @@ def configureBrickModules(project) {
     project.android.sourceSets.main.java.srcDir "${project.buildDir}/generated/source/brick-provider"
     
     // Create provider generation task
-    project.tasks.create('generateBrickModuleProvider') {
-        description = 'Generates BrickModuleProvider class for automatic module registration'
+    project.tasks.create('generateBrickModulesList') {
+        description = 'Generates BrickModulesList class for module injection in MainActivity'
         group = 'brick-module'
         
         doLast {
@@ -194,7 +324,7 @@ def configureBrickModules(project) {
     }
     
     // Hook into build process
-    project.preBuild.dependsOn('generateBrickModuleProvider')
+    project.preBuild.dependsOn('generateBrickModulesList')
     project.preBuild.doFirst {
         def workingDir = projectRoot
         
@@ -223,8 +353,39 @@ def configureBrickModules(project) {
     // Add dependencies
     project.dependencies {
         // Add brick module dependencies
+        brickLog("🔍 Processing subprojects for dependencies...")
+        brickLog("📋 Available brick modules: ${brickModulesData.keySet()}")
+        
+        brickLog("🔍 Available subprojects: ${rootProject.subprojects.collect { it.name }}")
+        
         rootProject.subprojects.each { subproject ->
-            if (subproject.name.startsWith('brick-') || brickModulesData.containsKey(subproject.name)) {
+            // Try to find matching brick module by normalizing names
+            def foundModule = null
+            def normalizedSubprojectName = subproject.name.replaceAll('[-_]', '')  // Remove both - and _
+            
+            brickModulesData.each { moduleKey, moduleData ->
+                def normalizedModuleKey = moduleKey.replaceAll('[@/-]', '')
+                
+                if (normalizedSubprojectName == normalizedModuleKey) {
+                    foundModule = moduleKey
+                    return
+                }
+            }
+            
+            if (foundModule) {
+                brickLog("✅ Adding brick module dependency: ${foundModule} (matched with ${subproject.name})")
+                add('implementation', subproject)
+            } else if (brickModulesData.containsKey(subproject.name)) {
+                brickLog("✅ Adding brick module dependency: ${subproject.name}")
+                add('implementation', subproject)
+            }
+
+            if (subproject.name == 'brick-module') { 
+                brickLog("✅ Adding brick-module dependency")
+                add('implementation', subproject)
+            } 
+            if (subproject.name == 'brick-codegen') { 
+                brickLog("✅ Adding brick-codegen dependency")
                 add('implementation', subproject)
             }
         }
@@ -236,12 +397,11 @@ def configureBrickModules(project) {
     }
 }
 
-// Generate BrickModuleProvider.kt
+// Generate BrickModulesList.kt
 def generateProvider(project, brickModulesData) {
     def modules = brickModulesData.collect { name, data ->
         [
-            name: data.moduleName,
-            className: data.moduleName + "Module",
+            moduleName: data.moduleName,
             packageName: data.packageName
         ]
     }
@@ -249,31 +409,62 @@ def generateProvider(project, brickModulesData) {
     def outputDir = project.file("${project.buildDir}/generated/source/brick-provider/com/brickmodule")
     outputDir.mkdirs()
     
-    def imports = modules.collect { "import ${it.packageName}.${it.className}" }.join("\n")
-    def moduleInstances = modules.collect { "            ${it.name}Module()" }.join(",\n")
-    def moduleNames = modules.collect { "            \"${it.name}\"" }.join(",\n")
+    def imports = modules.collect { "import ${it.packageName}.${it.moduleName}" }.join("\n")
+    def moduleInstances = modules.collect { "            ${it.moduleName}(context)" }.join(",\n")
+    def moduleNames = modules.collect { "            \"${it.moduleName}\"" }.join(",\n")
     
-    new File(outputDir, "BrickModuleProvider.kt").text = """// Auto-generated by brick_modules.gradle
+    new File(outputDir, "BrickModulesList.kt").text = """// Auto-generated by brick_modules.gradle
 package com.brickmodule
 
-import com.brickmodule.BrickModuleRegistry
+import com.facebook.react.bridge.ReactContext
 ${imports}
 
-object BrickModuleProvider {
-    fun registerAll() {
-        val modules = listOf<Any>(
+/**
+ * Auto-generated helper for brick modules
+ * Use this class to get auto-linked modules in your MainActivity
+ * 
+ * Example usage:
+ * ```kotlin
+ * override fun getBrickModules(context: ReactContext): List<BrickModuleBase> {
+ *     return BrickModulesList(context).modules
+ * }
+ * ```
+ */
+class BrickModulesList(private val context: ReactContext) {
+    /**
+     * Get all auto-linked brick modules
+     * 
+     * @return List of auto-linked module instances
+     */
+    val modules: List<BrickModuleBase> by lazy {
+        listOf<BrickModuleBase>(
 ${moduleInstances}
         )
-        
-        if (modules.isNotEmpty()) {
-            BrickModuleRegistry.register(modules)
-            println("🧱 BrickModuleProvider: Registered \${modules.size} modules")
-        }
     }
     
-    fun getAvailableModules(): List<String> = listOf(
+    /**
+     * Get available module names (for debugging)
+     * 
+     * @return List of module names
+     */
+    val availableModules: List<String> = listOf(
 ${moduleNames}
     )
+    
+    companion object {
+        /**
+         * Legacy static method for backward compatibility
+         * @deprecated Use BrickModulesList(context).modules instead
+         */
+        @Deprecated(
+            message = "Use BrickModulesList(context).modules instead",
+            replaceWith = ReplaceWith("BrickModulesList(context).modules")
+        )
+        @JvmStatic
+        fun getAutolinkedModules(context: ReactContext): MutableList<Any> {
+            return BrickModulesList(context).modules.toMutableList() as MutableList<Any>
+        }
+    }
 }
 """
 }

package/android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["HotUpdater_kotlinVersion"]
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["BrickModule_kotlinVersion"]
 
   repositories {
     google()
@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.2.0"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
@@ -103,10 +103,10 @@ dependencies {
   //noinspection GradleDynamicVersion
   if (project.ext.shouldConsumeReactNativeFromMavenCentral()) {
     // noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-android:+'
+    api 'com.facebook.react:react-android:+'
   } else {
     // noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-native:+'
+    api 'com.facebook.react:react-native:+'
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/android/gradlew

@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"