refactor: implement typed constants spec

YogendraShelke · YogendraShelke · commit 376769a52879 · 2026-06-22T14:22:01.000+05:30
diff --git a/android/src/main/java/com/mendix/mendixnative/react/MxConfiguration.kt b/android/src/main/java/com/mendix/mendixnative/react/MxConfiguration.kt
@@ -1,16 +1,14 @@
 package com.mendix.mendixnative.react
 
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.mendix.mendixnative.MendixApplication
 import com.mendix.mendixnative.config.AppUrl
 import com.mendix.mendixnative.react.ota.getNativeDependencies
 import com.mendix.mendixnative.react.ota.getOtaManifestFilepath
 
 class MxConfiguration(val reactContext: ReactApplicationContext) {
 
-  fun getConstants(): WritableMap? {
+  fun getConstants(): Map<String, Any> {
     val application = (reactContext.applicationContext as MendixApplication)
     if (runtimeUrl == null) {
       if (warningsFilter != WarningsFilter.none) {
@@ -22,31 +20,26 @@ class MxConfiguration(val reactContext: ReactApplicationContext) {
             Throwable("Without the runtime URL, the app cannot retrieve any data.\n\nPlease redeploy the app.")
           )
 
-        return WritableNativeMap()
+        return emptyMap()
       }
 
       throw IllegalStateException("Runtime URL not set in the MxConfiguration")
     }
 
-    val constants = WritableNativeMap()
-    constants.putString("RUNTIME_URL", AppUrl.forRuntime(runtimeUrl))
-    constants.putString("APP_NAME", defaultAppName)
-    constants.putString("DATABASE_NAME", defaultDatabaseName)
-    constants.putString(
-      "FILES_DIRECTORY_NAME",
-      defaultFilesDirectoryName
-    ) // Not to be removed as it is required for backwards compatibility.
-    constants.putString("WARNINGS_FILTER_LEVEL", warningsFilter.toString())
-    constants.putString("OTA_MANIFEST_PATH", getOtaManifestFilepath(reactContext))
-    constants.putBoolean("IS_DEVELOPER_APP", application.getUseDeveloperSupport())
-    constants.putInt("NATIVE_BINARY_VERSION", NATIVE_BINARY_VERSION)
-    constants.putString("APP_SESSION_ID", application.getAppSessionId())
-
-    val dependencies = WritableNativeMap()
-    getNativeDependencies(reactContext).forEach {
-      dependencies.putString(it.key, it.value)
+    val constants = mutableMapOf(
+      "RUNTIME_URL" to AppUrl.forRuntime(runtimeUrl),
+      "DATABASE_NAME" to defaultDatabaseName,
+      "FILES_DIRECTORY_NAME" to defaultFilesDirectoryName,
+      "WARNINGS_FILTER_LEVEL" to warningsFilter.toString(),
+      "OTA_MANIFEST_PATH" to getOtaManifestFilepath(reactContext),
+      "IS_DEVELOPER_APP" to application.getUseDeveloperSupport(),
+      "NATIVE_BINARY_VERSION" to NATIVE_BINARY_VERSION,
+      "APP_SESSION_ID" to application.getAppSessionId(),
+      "NATIVE_DEPENDENCIES" to getNativeDependencies(reactContext)
+    )
+    defaultAppName?.let {
+      constants.put("APP_NAME", it)
     }
-    constants.putMap("NATIVE_DEPENDENCIES", dependencies)
 
     return constants
   }
diff --git a/android/src/main/java/com/mendix/mendixnative/react/fs/NativeFsModule.kt b/android/src/main/java/com/mendix/mendixnative/react/fs/NativeFsModule.kt
@@ -230,12 +230,12 @@ class NativeFsModule(private val reactContext: ReactApplicationContext) {
     }
   }
 
-  fun getConstants(): WritableMap {
-    val constants = WritableNativeMap()
-    constants.putString("DocumentDirectoryPath", filesDir)
-    constants.putBoolean("SUPPORTS_DIRECTORY_MOVE", true) // Client uses this const to identify if functionality is supported
-    constants.putBoolean("SUPPORTS_ENCRYPTION", true)
-    return constants
+  fun getConstants(): Map<String, Any> {
+    return mapOf(
+      "DocumentDirectoryPath" to filesDir,
+      "SUPPORTS_DIRECTORY_MOVE" to true, // Client uses this const to identify if functionality is supported
+      "SUPPORTS_ENCRYPTION" to true
+    )
   }
 
   @Throws(IOException::class)
diff --git a/android/src/main/java/com/mendixnative/configuration/MxConfigurationModule.kt b/android/src/main/java/com/mendixnative/configuration/MxConfigurationModule.kt
@@ -1,7 +1,6 @@
 package com.mendixnative.configuration
 
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.mendix.mendixnative.react.MxConfiguration
 import com.mendixnative.NativeMxConfigurationSpec
@@ -14,7 +13,7 @@ class MxConfigurationModule(reactContext: ReactApplicationContext) :
 
   override fun getName(): String = NAME
 
-  override fun getConfig(): WritableMap? {
+  override fun getTypedExportedConstants(): Map<String, Any> {
     return configuration.getConstants()
   }
 
diff --git a/android/src/main/java/com/mendixnative/fs/MxFileSystemModule.kt b/android/src/main/java/com/mendixnative/fs/MxFileSystemModule.kt
@@ -3,7 +3,6 @@ package com.mendixnative.fs
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.mendix.mendixnative.react.fs.NativeFsModule
 import com.mendixnative.NativeMxFileSystemSpec
@@ -16,7 +15,7 @@ class MxFileSystemModule(reactContext: ReactApplicationContext) :
 
   override fun getName(): String = NAME
 
-  override fun constants(): WritableMap? {
+  override fun getTypedExportedConstants(): Map<String, Any> {
     return fsModule.getConstants()
   }
 
diff --git a/ios/Modules/MxConfiguration/MxConfigProxy.swift b/ios/Modules/MxConfiguration/MxConfigProxy.swift
@@ -0,0 +1,54 @@
+import Foundation
+
+@objcMembers
+public class MxConfigProxy: NSObject {
+    public var runtimeUrl: String
+    public var appName: String?
+    public var databaseName: String
+    public var filesDirectoryName: String
+    public var warningsFilter: String
+    public var otaManifestPath: String
+    public var isDeveloperApp: NSNumber
+    public var nativeDependencies: [String: Any]
+    public var nativeBinaryVersion: NSNumber
+    public var appSessionId: String?
+    
+    init(runtimeUrl: String, appName: String?, databaseName: String, filesDirectoryName: String, warningsFilter: String, otaManifestPath: String, isDeveloperApp: NSNumber, nativeDependencies: [String : Any], nativeBinaryVersion: NSNumber, appSessionId: String?) {
+        self.runtimeUrl = runtimeUrl
+        self.appName = appName
+        self.databaseName = databaseName
+        self.filesDirectoryName = filesDirectoryName
+        self.warningsFilter = warningsFilter
+        self.otaManifestPath = otaManifestPath
+        self.isDeveloperApp = isDeveloperApp
+        self.nativeDependencies = nativeDependencies
+        self.nativeBinaryVersion = nativeBinaryVersion
+        self.appSessionId = appSessionId
+    }
+    
+    
+    public static func prepare() -> MxConfigProxy? {
+        guard let runtimeUrl = MxConfiguration.runtimeUrl?.absoluteString else {
+            let exception = NSException(
+                name: NSExceptionName("RUNTIME_URL_MISSING"),
+                reason: "Runtime URL was not set prior to launch.",
+                userInfo: nil
+            )
+            exception.raise()
+            return nil
+        }
+        
+        return MxConfigProxy(
+            runtimeUrl: runtimeUrl,
+            appName: MxConfiguration.appName,
+            databaseName: MxConfiguration.databaseName,
+            filesDirectoryName: MxConfiguration.filesDirectoryName,
+            warningsFilter: MxConfiguration.warningsFilter.stringValue,
+            otaManifestPath: OtaHelpers.getOtaManifestFilepath(),
+            isDeveloperApp: NSNumber(booleanLiteral: MxConfiguration.isDeveloperApp),
+            nativeDependencies: OtaHelpers.getNativeDependencies(),
+            nativeBinaryVersion: NSNumber(integerLiteral: MxConfiguration.nativeBinaryVersion),
+            appSessionId: MxConfiguration.appSessionId
+        )
+    }
+}
diff --git a/ios/Modules/MxConfiguration/MxConfiguration.swift b/ios/Modules/MxConfiguration/MxConfiguration.swift
@@ -3,7 +3,7 @@ import Foundation
 @objcMembers
 public class MxConfiguration: NSObject {
     
-    private static let nativeBinaryVersion: Int = 32
+    static let nativeBinaryVersion: Int = 32
     private static let defaultDatabaseName = "default"
     private static let defaultFilesDirectoryName = "files/default"
     
diff --git a/ios/Modules/NativeFsModule/NativeFsModule.swift b/ios/Modules/NativeFsModule/NativeFsModule.swift
@@ -268,12 +268,6 @@ public class NativeFsModule: NSObject {
         }
     }
     
-    public let constants: NSDictionary = [
-        "DocumentDirectoryPath": NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first ?? "",
-        "SUPPORTS_DIRECTORY_MOVE": true,
-        "SUPPORTS_ENCRYPTION": true
-    ]
-    
     private func isWhiteListedPath(_ paths: String..., reject: RCTPromiseRejectBlock) -> Bool {
         do {
             try NativeFsModule.ensureWhiteListedPath(paths)
diff --git a/ios/TurboModules/MxConfiguration/MxConfigurationModule.mm b/ios/TurboModules/MxConfiguration/MxConfigurationModule.mm
@@ -13,8 +13,25 @@ @implementation MxConfigurationModule
     return std::make_shared<facebook::react::NativeMxConfigurationSpecJSI>(params);
 }
 
-- (nonnull NSDictionary *)getConfig {
-    return [[[MxConfiguration alloc] init] constants];
+- (nonnull facebook::react::ModuleConstants<JS::NativeMxConfiguration::Constants>)constantsToExport { 
+    return [self getConstants];
+}
+
+- (nonnull facebook::react::ModuleConstants<JS::NativeMxConfiguration::Constants>)getConstants {
+    MxConfigProxy *config = [MxConfigProxy prepare];
+    return facebook::react::typedConstants<JS::NativeMxConfiguration::Constants>({
+        .RUNTIME_URL = config.runtimeUrl,
+        .APP_NAME = config.appName,
+        .FILES_DIRECTORY_NAME = config.filesDirectoryName,
+        .DATABASE_NAME = config.databaseName,
+        .WARNINGS_FILTER_LEVEL = config.warningsFilter,
+        .OTA_MANIFEST_PATH = config.otaManifestPath,
+        .NATIVE_DEPENDENCIES = config.nativeDependencies,
+        .IS_DEVELOPER_APP = config.isDeveloperApp,
+        .CODE_PUSH_KEY= NULL,
+        .NATIVE_BINARY_VERSION = [config.nativeBinaryVersion doubleValue],
+        .APP_SESSION_ID = config.appSessionId
+    });
 }
 
 @end
diff --git a/ios/TurboModules/MxFileSystem/MxFileSystem.mm b/ios/TurboModules/MxFileSystem/MxFileSystem.mm
@@ -13,8 +13,17 @@ @implementation MxFileSystem
     return std::make_shared<facebook::react::NativeMxFileSystemSpecJSI>(params);
 }
 
-- (nonnull NSDictionary *)constants {
-    return [[[NativeFsModule alloc] init] constants];
+- (facebook::react::ModuleConstants<JS::NativeMxFileSystem::Constants>)constantsToExport {
+    return [self getConstants];
+}
+
+- (facebook::react::ModuleConstants<JS::NativeMxFileSystem::Constants>)getConstants {
+    NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+    return facebook::react::typedConstants<JS::NativeMxFileSystem::Constants>({
+        .DocumentDirectoryPath = path ?: @"",
+        .SUPPORTS_DIRECTORY_MOVE = true,
+        .SUPPORTS_ENCRYPTION = true
+    });
 }
 
 - (void)save:(nonnull NSDictionary *)blob
diff --git a/src/file-system/NativeMxFileSystem.ts b/src/file-system/NativeMxFileSystem.ts
@@ -20,7 +20,7 @@ type FsConstants = {
 };
 
 export interface Spec extends TurboModule {
-  constants(): FsConstants;
+  readonly getConstants: () => FsConstants;
   save(blob: CodegenTypes.UnsafeObject, filePath: string): Promise<void>;
   read(filePath: string): Promise<BlobData>;
   move(filePath: string, newPath: string): Promise<void>;
diff --git a/src/file-system/index.ts b/src/file-system/index.ts
@@ -5,7 +5,7 @@ const initFs = () => {
     DocumentDirectoryPath,
     SUPPORTS_DIRECTORY_MOVE,
     SUPPORTS_ENCRYPTION,
-  } = NativeMxFileSystem.constants();
+  } = NativeMxFileSystem.getConstants();
   const docDirPath = DocumentDirectoryPath as string;
   return {
     //Constants
diff --git a/src/mx-configuration/NativeMxConfiguration.ts b/src/mx-configuration/NativeMxConfiguration.ts
@@ -23,7 +23,7 @@ type Configuration = {
 };
 
 export interface Spec extends TurboModule {
-  getConfig(): Configuration;
+  readonly getConstants: () => Configuration;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('MxConfiguration');
diff --git a/src/mx-configuration/index.ts b/src/mx-configuration/index.ts
@@ -1,3 +1,3 @@
 import NativeMxConfiguration from './NativeMxConfiguration';
 
-export const MxConfiguration = NativeMxConfiguration.getConfig();
+export const MxConfiguration = NativeMxConfiguration.getConstants();

Original file line number	Diff line number	Diff line change
`@@ -230,12 +230,12 @@ class NativeFsModule(private val reactContext: ReactApplicationContext) {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`		`- fun getConstants(): WritableMap {`
`234`		`- val constants = WritableNativeMap()`
`235`		`- constants.putString("DocumentDirectoryPath", filesDir)`
`236`		`- constants.putBoolean("SUPPORTS_DIRECTORY_MOVE", true) // Client uses this const to identify if functionality is supported`
`237`		`- constants.putBoolean("SUPPORTS_ENCRYPTION", true)`
`238`		`- return constants`
	`233`	`+ fun getConstants(): Map<String, Any> {`
	`234`	`+ return mapOf(`
	`235`	`+ "DocumentDirectoryPath" to filesDir,`
	`236`	`+ "SUPPORTS_DIRECTORY_MOVE" to true, // Client uses this const to identify if functionality is supported`
	`237`	`+ "SUPPORTS_ENCRYPTION" to true`
	`238`	`+ )`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`@Throws(IOException::class)`
Original file line number	Diff line number	Diff line change
`@@ -268,12 +268,6 @@ public class NativeFsModule: NSObject {`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
`271`		`- public let constants: NSDictionary = [`
`272`		`- "DocumentDirectoryPath": NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first ?? "",`
`273`		`- "SUPPORTS_DIRECTORY_MOVE": true,`
`274`		`- "SUPPORTS_ENCRYPTION": true`
`275`		`- ]`
`276`		`-`
`277`	`271`	`private func isWhiteListedPath(_ paths: String..., reject: RCTPromiseRejectBlock) -> Bool {`
`278`	`272`	`do {`
`279`	`273`	`try NativeFsModule.ensureWhiteListedPath(paths)`