fix: Fix lazy init

mrousavy · Mar 27, 2024 · c2e610d · c2e610d
1 parent 1350529
commit c2e610d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/cpp/MMKVManagedBuffer.h b/cpp/MMKVManagedBuffer.h
@@ -8,12 +8,7 @@
 #pragma once
 
 #include <jsi/jsi.h>
-
-#if __has_include("MMKVManagedBuffer.h")
 #include "MMKVManagedBuffer.h"
-#else
-#include <MMKVCore/MMKVManagedBuffer.h>
-#endif
 
 using namespace facebook;
 

diff --git a/cpp/MmkvHostObject.h b/cpp/MmkvHostObject.h
@@ -10,12 +10,7 @@
 
 #include "NativeMmkvModule.h"
 #include <jsi/jsi.h>
-
-#if __has_include("MMKV.h")
 #include "MMKV.h"
-#else
-#include <MMKVCore/MMKV.h>
-#endif
 
 using namespace facebook;
 using namespace mmkv;

diff --git a/src/NativeMmkv.ts b/src/NativeMmkv.ts
@@ -87,7 +87,7 @@ export interface Spec extends TurboModule {
 
 let basePath: string | null = null;
 
-export const MMKVTurboModule = getLazyTurboModule(() => {
+function getNativeModule(): Spec | null {
   if (basePath == null) {
     // use default base path from the Platform (iOS/Android)
     basePath = PlatformContext.getBaseDirectory();
@@ -101,4 +101,5 @@ export const MMKVTurboModule = getLazyTurboModule(() => {
   }
 
   return module;
-});
+}
+export const MMKVTurboModule = getLazyTurboModule(getNativeModule);
diff --git a/src/NativeMmkvPlatformContext.ts b/src/NativeMmkvPlatformContext.ts
@@ -8,6 +8,7 @@ export interface Spec extends TurboModule {
   getBaseDirectory(): string;
 }
 
-export const PlatformContext = getLazyTurboModule(() =>
-  TurboModuleRegistry.get<Spec>('MmkvPlatformContext')
-);
+function getModule(): Spec | null {
+  return TurboModuleRegistry.get<Spec>('MmkvPlatformContext');
+}
+export const PlatformContext = getLazyTurboModule(getModule);
diff --git a/src/index.tsx → src/index.ts b/src/index.tsx → src/index.ts