expo-modules-core 0.7.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/README.md +1 -1
- package/android/ExpoModulesCorePlugin.gradle +15 -0
- package/android/build.gradle +46 -32
- package/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java +5 -5
- package/android/src/main/java/expo/modules/adapters/react/services/UIManagerModuleWrapper.java +13 -0
- package/android/src/main/java/expo/modules/core/ViewManager.java +9 -0
- package/android/src/main/java/expo/modules/core/interfaces/JavaScriptContextProvider.java +4 -0
- package/android/src/main/java/expo/modules/core/interfaces/ReactActivityHandler.java +37 -1
- package/android/src/main/java/expo/modules/core/interfaces/ReactNativeHostHandler.java +19 -0
- package/android/src/main/java/expo/modules/core/interfaces/services/UIManager.java +2 -0
- package/android/src/main/java/expo/modules/kotlin/AppContext.kt +13 -5
- package/android/src/main/java/expo/modules/kotlin/KPromiseWrapper.kt +2 -13
- package/android/src/main/java/expo/modules/kotlin/KotlinInteropModuleRegistry.kt +11 -5
- package/android/src/main/java/expo/modules/kotlin/ModuleHolder.kt +5 -1
- package/android/src/main/java/expo/modules/kotlin/ModuleRegistry.kt +17 -0
- package/android/src/main/java/expo/modules/kotlin/callbacks/ViewCallback.kt +14 -3
- package/android/src/main/java/expo/modules/kotlin/events/EventEmitter.kt +13 -0
- package/android/src/main/java/expo/modules/kotlin/events/KModuleEventEmitterWrapper.kt +102 -0
- package/android/src/main/java/expo/modules/kotlin/exception/CodedException.kt +25 -1
- package/android/src/main/java/expo/modules/kotlin/{methods/AnyMethod.kt → functions/AnyFunction.kt} +6 -5
- package/android/src/main/java/expo/modules/kotlin/functions/AsyncFunction.kt +15 -0
- package/android/src/main/java/expo/modules/kotlin/functions/AsyncFunctionBuilder.kt +61 -0
- package/android/src/main/java/expo/modules/kotlin/functions/AsyncFunctionWithPromise.kt +15 -0
- package/android/src/main/java/expo/modules/kotlin/functions/AsyncSuspendFunction.kt +36 -0
- package/android/src/main/java/expo/modules/kotlin/modules/Module.kt +14 -0
- package/android/src/main/java/expo/modules/kotlin/modules/ModuleDefinitionBuilder.kt +176 -27
- package/android/src/main/java/expo/modules/kotlin/modules/ModuleDefinitionData.kt +2 -2
- package/android/src/main/java/expo/modules/kotlin/records/FieldValidator.kt +139 -0
- package/android/src/main/java/expo/modules/kotlin/records/Record.kt +0 -39
- package/android/src/main/java/expo/modules/kotlin/records/RecordTypeConverter.kt +59 -10
- package/android/src/main/java/expo/modules/kotlin/records/Required.kt +5 -0
- package/android/src/main/java/expo/modules/kotlin/records/ValidationBinder.kt +110 -0
- package/android/src/main/java/expo/modules/kotlin/records/Validators.kt +61 -0
- package/android/src/main/java/expo/modules/kotlin/types/JSTypeConverter.kt +35 -0
- package/android/src/main/java/expo/modules/kotlin/types/JSTypeConverterHelper.kt +148 -0
- package/android/src/main/java/expo/modules/kotlin/types/TypeConverterProvider.kt +9 -1
- package/android/src/main/java/expo/modules/kotlin/views/GroupViewManagerWrapper.kt +49 -0
- package/android/src/main/java/expo/modules/kotlin/views/ViewGroupDefinition.kt +18 -0
- package/android/src/main/java/expo/modules/kotlin/views/ViewGroupDefinitionBuilder.kt +64 -0
- package/android/src/main/java/expo/modules/kotlin/views/ViewManagerDefinition.kt +4 -1
- package/android/src/main/java/expo/modules/kotlin/views/ViewManagerDefinitionBuilder.kt +15 -2
- package/android/src/main/java/expo/modules/kotlin/views/ViewManagerWrapperDelegate.kt +3 -0
- package/build/NativeModulesProxy.native.d.ts +0 -4
- package/build/NativeModulesProxy.native.d.ts.map +1 -1
- package/build/NativeModulesProxy.native.js +1 -14
- package/build/NativeModulesProxy.native.js.map +1 -1
- package/build/NativeModulesProxy.types.d.ts +0 -3
- package/build/NativeModulesProxy.types.d.ts.map +1 -1
- package/build/NativeModulesProxy.types.js.map +1 -1
- package/build/NativeViewManagerAdapter.native.d.ts.map +1 -1
- package/build/NativeViewManagerAdapter.native.js +9 -33
- package/build/NativeViewManagerAdapter.native.js.map +1 -1
- package/build/sweet/NativeErrorManager.js +1 -1
- package/build/sweet/NativeErrorManager.js.map +1 -1
- package/ios/AppDelegates/EXAppDelegatesLoader.m +4 -8
- package/ios/AppDelegates/ExpoAppDelegate.swift +4 -10
- package/ios/EXAppDefines.h +1 -0
- package/ios/EXAppDefines.m +6 -0
- package/ios/EXUtilities.h +2 -0
- package/ios/EXUtilities.m +12 -0
- package/ios/ExpoModulesCore.h +4 -0
- package/ios/ExpoModulesCore.podspec +4 -2
- package/ios/Interfaces/FileSystem/EXFileSystemInterface.h +1 -1
- package/ios/Interfaces/TaskManager/EXTaskServiceInterface.h +1 -0
- package/ios/JSI/{JSIConversions.h → EXJSIConversions.h} +4 -1
- package/ios/JSI/{JSIConversions.mm → EXJSIConversions.mm} +16 -5
- package/ios/JSI/{JSIInstaller.h → EXJSIInstaller.h} +3 -3
- package/ios/JSI/EXJSIInstaller.mm +17 -0
- package/ios/JSI/{ExpoModulesProxySpec.h → EXJSIUtils.h} +0 -9
- package/ios/JSI/{ExpoModulesProxySpec.mm → EXJSIUtils.mm} +4 -48
- package/ios/JSI/EXJavaScriptObject.h +97 -0
- package/ios/JSI/EXJavaScriptObject.mm +121 -0
- package/ios/JSI/{JavaScriptRuntime.h → EXJavaScriptRuntime.h} +27 -8
- package/ios/JSI/EXJavaScriptRuntime.mm +153 -0
- package/ios/JSI/EXJavaScriptValue.h +57 -0
- package/ios/JSI/EXJavaScriptValue.mm +166 -0
- package/ios/JSI/ExpoModulesHostObject.mm +2 -1
- package/ios/JSI/JavaScriptRuntime.swift +32 -0
- package/ios/JSI/JavaScriptValue.swift +94 -0
- package/ios/ModuleRegistryAdapter/EXModuleRegistryAdapter.m +1 -11
- package/ios/NativeModulesProxy/EXNativeModulesProxy.h +2 -2
- package/ios/NativeModulesProxy/EXNativeModulesProxy.mm +24 -22
- package/ios/ReactDelegates/EXReactCompatibleHelpers.h +18 -0
- package/ios/ReactDelegates/EXReactCompatibleHelpers.m +19 -0
- package/ios/ReactDelegates/ExpoReactDelegate.swift +2 -2
- package/ios/ReactDelegates/ExpoReactDelegateHandler.swift +1 -1
- package/ios/Swift/AppContext.swift +27 -1
- package/ios/Swift/Functions/AsyncFunction.swift +17 -0
- package/ios/Swift/Functions/ConcreteFunction.swift +6 -1
- package/ios/Swift/JavaScriptUtils.swift +11 -0
- package/ios/Swift/ModuleHolder.swift +14 -3
- package/ios/Swift/ModulesProvider.swift +3 -10
- package/ios/Swift/Objects/ObjectDefinitionComponents.swift +176 -0
- package/ios/Swift/SwiftInteropBridge.swift +14 -5
- package/ios/Swift/Views/ComponentData.swift +2 -1
- package/ios/Swift/Views/ExpoView.swift +8 -0
- package/ios/Swift.h +5 -0
- package/ios/Tests/ArgumentTypeSpec.swift +2 -3
- package/ios/Tests/ConstantsSpec.swift +2 -3
- package/ios/Tests/ConvertiblesSpec.swift +2 -3
- package/ios/Tests/ExceptionsSpec.swift +2 -3
- package/ios/Tests/ExpoModulesSpec.swift +76 -0
- package/ios/Tests/FunctionSpec.swift +2 -3
- package/ios/Tests/FunctionWithConvertiblesSpec.swift +2 -3
- package/ios/Tests/JavaScriptObjectSpec.swift +97 -0
- package/ios/Tests/JavaScriptRuntimeSpec.swift +94 -0
- package/ios/Tests/ModuleEventListenersSpec.swift +2 -3
- package/ios/Tests/ModuleRegistrySpec.swift +2 -3
- package/ios/Tests/RecordSpec.swift +2 -3
- package/package.json +2 -2
- package/src/NativeModulesProxy.native.ts +2 -22
- package/src/NativeModulesProxy.types.ts +0 -8
- package/src/NativeViewManagerAdapter.native.tsx +12 -28
- package/src/sweet/NativeErrorManager.ts +1 -1
- package/android/src/main/java/expo/modules/kotlin/events/KEventEmitterWrapper.kt +0 -26
- package/android/src/main/java/expo/modules/kotlin/methods/Method.kt +0 -14
- package/android/src/main/java/expo/modules/kotlin/methods/PromiseMethod.kt +0 -15
- package/ios/JSI/JSIInstaller.mm +0 -34
- package/ios/JSI/JavaScriptObject.h +0 -60
- package/ios/JSI/JavaScriptObject.mm +0 -93
- package/ios/JSI/JavaScriptRuntime.mm +0 -102
- package/ios/NativeModulesProxy/EXComponentDataCompatibleWrapper.h +0 -16
- package/ios/NativeModulesProxy/EXComponentDataCompatibleWrapper.m +0 -28
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
// Copyright 2022-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
#import <ExpoModulesCore/EXJSIConversions.h>
|
|
4
|
+
#import <ExpoModulesCore/EXJavaScriptObject.h>
|
|
5
|
+
#import <ExpoModulesCore/EXJavaScriptRuntime.h>
|
|
6
|
+
|
|
7
|
+
@implementation EXJavaScriptObject {
|
|
8
|
+
/**
|
|
9
|
+
Pointer to the `EXJavaScriptRuntime` wrapper.
|
|
10
|
+
|
|
11
|
+
\note It must be weak because only then the original runtime can be safely deallocated
|
|
12
|
+
when the JS engine wants to without unsetting it on each created object.
|
|
13
|
+
*/
|
|
14
|
+
__weak EXJavaScriptRuntime *_runtime;
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
Shared pointer to the original JSI object that is being wrapped by `EXJavaScriptObject` class.
|
|
18
|
+
*/
|
|
19
|
+
std::shared_ptr<jsi::Object> _jsObjectPtr;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
- (nonnull instancetype)initWith:(std::shared_ptr<jsi::Object>)jsObjectPtr
|
|
23
|
+
runtime:(nonnull EXJavaScriptRuntime *)runtime
|
|
24
|
+
{
|
|
25
|
+
if (self = [super init]) {
|
|
26
|
+
_runtime = runtime;
|
|
27
|
+
_jsObjectPtr = jsObjectPtr;
|
|
28
|
+
}
|
|
29
|
+
return self;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
- (nonnull jsi::Object *)get
|
|
33
|
+
{
|
|
34
|
+
return _jsObjectPtr.get();
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
#pragma mark - Accessing object properties
|
|
38
|
+
|
|
39
|
+
- (BOOL)hasProperty:(nonnull NSString *)name
|
|
40
|
+
{
|
|
41
|
+
return _jsObjectPtr->hasProperty(*[_runtime get], [name UTF8String]);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
- (nonnull EXJavaScriptValue *)getProperty:(nonnull NSString *)name
|
|
45
|
+
{
|
|
46
|
+
std::shared_ptr<jsi::Value> value = std::make_shared<jsi::Value>(_jsObjectPtr->getProperty(*[_runtime get], [name UTF8String]));
|
|
47
|
+
return [[EXJavaScriptValue alloc] initWithRuntime:_runtime value:value];
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
- (nonnull NSArray<NSString *> *)getPropertyNames
|
|
51
|
+
{
|
|
52
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
53
|
+
jsi::Array propertyNamesArray = _jsObjectPtr->getPropertyNames(*[_runtime get]);
|
|
54
|
+
return expo::convertJSIArrayToNSArray(*runtime, propertyNamesArray, nullptr);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
#pragma mark - Modifying object properties
|
|
58
|
+
|
|
59
|
+
- (void)setProperty:(nonnull NSString *)name value:(nullable id)value
|
|
60
|
+
{
|
|
61
|
+
jsi::Value jsiValue = expo::convertObjCObjectToJSIValue(*[_runtime get], value);
|
|
62
|
+
_jsObjectPtr->setProperty(*[_runtime get], [name UTF8String], jsiValue);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
- (void)defineProperty:(nonnull NSString *)name value:(nullable id)value options:(EXJavaScriptObjectPropertyDescriptor)options
|
|
66
|
+
{
|
|
67
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
68
|
+
jsi::Object global = runtime->global();
|
|
69
|
+
jsi::Object objectClass = global.getPropertyAsObject(*runtime, "Object");
|
|
70
|
+
jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(*runtime, "defineProperty");
|
|
71
|
+
jsi::Object descriptor = [self preparePropertyDescriptorWithOptions:options];
|
|
72
|
+
|
|
73
|
+
descriptor.setProperty(*runtime, "value", expo::convertObjCObjectToJSIValue(*runtime, value));
|
|
74
|
+
|
|
75
|
+
// This call is basically the same as `Object.defineProperty(object, name, descriptor)` in JS
|
|
76
|
+
definePropertyFunction.callWithThis(*runtime, objectClass, {
|
|
77
|
+
jsi::Value(*runtime, *_jsObjectPtr.get()),
|
|
78
|
+
jsi::String::createFromUtf8(*runtime, [name UTF8String]),
|
|
79
|
+
std::move(descriptor),
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
#pragma mark - Functions
|
|
84
|
+
|
|
85
|
+
- (void)setAsyncFunction:(nonnull NSString *)name
|
|
86
|
+
argsCount:(NSInteger)argsCount
|
|
87
|
+
block:(nonnull JSAsyncFunctionBlock)block
|
|
88
|
+
{
|
|
89
|
+
if (!_runtime) {
|
|
90
|
+
NSLog(@"Cannot set '%@' async function when the EXJavaScript runtime is no longer available.", name);
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
jsi::Function function = [_runtime createAsyncFunction:name argsCount:argsCount block:block];
|
|
94
|
+
_jsObjectPtr->setProperty(*[_runtime get], [name UTF8String], function);
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
- (void)setSyncFunction:(nonnull NSString *)name
|
|
98
|
+
argsCount:(NSInteger)argsCount
|
|
99
|
+
block:(nonnull JSSyncFunctionBlock)block
|
|
100
|
+
{
|
|
101
|
+
if (!_runtime) {
|
|
102
|
+
NSLog(@"Cannot set '%@' sync function when the EXJavaScript runtime is no longer available.", name);
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
jsi::Function function = [_runtime createSyncFunction:name argsCount:argsCount block:block];
|
|
106
|
+
_jsObjectPtr->setProperty(*[_runtime get], [name UTF8String], function);
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
#pragma mark - Private helpers
|
|
110
|
+
|
|
111
|
+
- (jsi::Object)preparePropertyDescriptorWithOptions:(EXJavaScriptObjectPropertyDescriptor)options
|
|
112
|
+
{
|
|
113
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
114
|
+
jsi::Object descriptor(*runtime);
|
|
115
|
+
descriptor.setProperty(*runtime, "configurable", (bool)(options & EXJavaScriptObjectPropertyDescriptorConfigurable));
|
|
116
|
+
descriptor.setProperty(*runtime, "enumerable", (bool)(options & EXJavaScriptObjectPropertyDescriptorEnumerable));
|
|
117
|
+
descriptor.setProperty(*runtime, "writable", (bool)(options & EXJavaScriptObjectPropertyDescriptorWritable));
|
|
118
|
+
return descriptor;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
@end
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Copyright 2018-present 650 Industries. All rights reserved.
|
|
2
2
|
|
|
3
|
-
#import <ExpoModulesCore/
|
|
3
|
+
#import <ExpoModulesCore/EXJavaScriptValue.h>
|
|
4
|
+
#import <ExpoModulesCore/EXJavaScriptObject.h>
|
|
4
5
|
|
|
5
6
|
#ifdef __cplusplus
|
|
6
7
|
#import <ReactCommon/CallInvoker.h>
|
|
@@ -9,12 +10,23 @@ namespace jsi = facebook::jsi;
|
|
|
9
10
|
namespace react = facebook::react;
|
|
10
11
|
#endif // __cplusplus
|
|
11
12
|
|
|
12
|
-
@
|
|
13
|
+
@class EXJavaScriptValue;
|
|
14
|
+
@class EXJavaScriptObject;
|
|
13
15
|
|
|
14
16
|
#ifdef __cplusplus
|
|
15
|
-
typedef jsi::Value (^JSHostFunctionBlock)(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray * _Nonnull arguments);
|
|
17
|
+
typedef jsi::Value (^JSHostFunctionBlock)(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray<EXJavaScriptValue *> * _Nonnull arguments);
|
|
18
|
+
#endif // __cplusplus
|
|
19
|
+
|
|
20
|
+
NS_SWIFT_NAME(JavaScriptRuntime)
|
|
21
|
+
@interface EXJavaScriptRuntime : NSObject
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
Creates a new JavaScript runtime.
|
|
25
|
+
*/
|
|
26
|
+
- (nonnull instancetype)init;
|
|
16
27
|
|
|
17
|
-
|
|
28
|
+
#ifdef __cplusplus
|
|
29
|
+
- (nonnull instancetype)initWithRuntime:(nonnull jsi::Runtime *)runtime
|
|
18
30
|
callInvoker:(std::shared_ptr<react::CallInvoker>)callInvoker;
|
|
19
31
|
|
|
20
32
|
/**
|
|
@@ -28,9 +40,9 @@ typedef jsi::Value (^JSHostFunctionBlock)(jsi::Runtime &runtime, std::shared_ptr
|
|
|
28
40
|
- (std::shared_ptr<react::CallInvoker>)callInvoker;
|
|
29
41
|
|
|
30
42
|
/**
|
|
31
|
-
Wraps given host object to `
|
|
43
|
+
Wraps given host object to `EXJavaScriptObject`.
|
|
32
44
|
*/
|
|
33
|
-
- (nonnull
|
|
45
|
+
- (nonnull EXJavaScriptObject *)createHostObject:(std::shared_ptr<jsi::HostObject>)jsiHostObjectPtr;
|
|
34
46
|
|
|
35
47
|
- (jsi::Function)createSyncFunction:(nonnull NSString *)name
|
|
36
48
|
argsCount:(NSInteger)argsCount
|
|
@@ -44,11 +56,18 @@ typedef jsi::Value (^JSHostFunctionBlock)(jsi::Runtime &runtime, std::shared_ptr
|
|
|
44
56
|
/**
|
|
45
57
|
Returns the runtime global object for use in Swift.
|
|
46
58
|
*/
|
|
47
|
-
- (nonnull
|
|
59
|
+
- (nonnull EXJavaScriptObject *)global;
|
|
48
60
|
|
|
49
61
|
/**
|
|
50
62
|
Creates a new object for use in Swift.
|
|
51
63
|
*/
|
|
52
|
-
- (nonnull
|
|
64
|
+
- (nonnull EXJavaScriptObject *)createObject;
|
|
65
|
+
|
|
66
|
+
#pragma mark - Script evaluation
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
Evaluates given JavaScript source code.
|
|
70
|
+
*/
|
|
71
|
+
- (nonnull EXJavaScriptValue *)evaluateScript:(nonnull NSString *)scriptSource;
|
|
53
72
|
|
|
54
73
|
@end
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
// Copyright 2018-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
#import <jsi/jsi.h>
|
|
4
|
+
|
|
5
|
+
#if __has_include(<reacthermes/HermesExecutorFactory.h>)
|
|
6
|
+
#import <reacthermes/HermesExecutorFactory.h>
|
|
7
|
+
#elif __has_include(<hermes/hermes.h>)
|
|
8
|
+
#import <hermes/hermes.h>
|
|
9
|
+
#else
|
|
10
|
+
#import <jsi/JSCRuntime.h>
|
|
11
|
+
#endif
|
|
12
|
+
|
|
13
|
+
#import <ExpoModulesCore/EXJavaScriptRuntime.h>
|
|
14
|
+
#import <ExpoModulesCore/ExpoModulesHostObject.h>
|
|
15
|
+
#import <ExpoModulesCore/EXJSIUtils.h>
|
|
16
|
+
#import <ExpoModulesCore/EXJSIConversions.h>
|
|
17
|
+
#import <ExpoModulesCore/Swift.h>
|
|
18
|
+
|
|
19
|
+
using namespace facebook;
|
|
20
|
+
|
|
21
|
+
@implementation EXJavaScriptRuntime {
|
|
22
|
+
std::shared_ptr<jsi::Runtime> _runtime;
|
|
23
|
+
std::shared_ptr<react::CallInvoker> _jsCallInvoker;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
Initializes a runtime that is independent from React Native and its runtime initialization.
|
|
28
|
+
This flow is mostly intended for tests. The JS call invoker is unavailable thus calling async functions is not supported.
|
|
29
|
+
TODO: Implement the call invoker when it becomes necessary.
|
|
30
|
+
*/
|
|
31
|
+
- (nonnull instancetype)init
|
|
32
|
+
{
|
|
33
|
+
if (self = [super init]) {
|
|
34
|
+
#if __has_include(<reacthermes/HermesExecutorFactory.h>) || __has_include(<hermes/hermes.h>)
|
|
35
|
+
_runtime = hermes::makeHermesRuntime();
|
|
36
|
+
#else
|
|
37
|
+
_runtime = jsc::makeJSCRuntime();
|
|
38
|
+
#endif
|
|
39
|
+
_jsCallInvoker = nil;
|
|
40
|
+
}
|
|
41
|
+
return self;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
- (nonnull instancetype)initWithRuntime:(nonnull jsi::Runtime *)runtime
|
|
45
|
+
callInvoker:(std::shared_ptr<react::CallInvoker>)callInvoker
|
|
46
|
+
{
|
|
47
|
+
if (self = [super init]) {
|
|
48
|
+
// Creating a shared pointer that points to the runtime but doesn't own it, thus doesn't release it.
|
|
49
|
+
// In this code flow, the runtime should be owned by something else like the RCTBridge.
|
|
50
|
+
// See explanation for constructor (8): https://en.cppreference.com/w/cpp/memory/shared_ptr/shared_ptr
|
|
51
|
+
_runtime = std::shared_ptr<jsi::Runtime>(std::shared_ptr<jsi::Runtime>(), runtime);
|
|
52
|
+
_jsCallInvoker = callInvoker;
|
|
53
|
+
}
|
|
54
|
+
return self;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
- (nonnull jsi::Runtime *)get
|
|
58
|
+
{
|
|
59
|
+
return _runtime.get();
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
- (std::shared_ptr<react::CallInvoker>)callInvoker
|
|
63
|
+
{
|
|
64
|
+
return _jsCallInvoker;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
- (nonnull EXJavaScriptObject *)createObject
|
|
68
|
+
{
|
|
69
|
+
auto jsObjectPtr = std::make_shared<jsi::Object>(*_runtime);
|
|
70
|
+
return [[EXJavaScriptObject alloc] initWith:jsObjectPtr runtime:self];
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
- (nonnull EXJavaScriptObject *)createHostObject:(std::shared_ptr<jsi::HostObject>)jsiHostObjectPtr
|
|
74
|
+
{
|
|
75
|
+
auto jsObjectPtr = std::make_shared<jsi::Object>(jsi::Object::createFromHostObject(*_runtime, jsiHostObjectPtr));
|
|
76
|
+
return [[EXJavaScriptObject alloc] initWith:jsObjectPtr runtime:self];
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
- (nonnull EXJavaScriptObject *)global
|
|
80
|
+
{
|
|
81
|
+
auto jsGlobalPtr = std::make_shared<jsi::Object>(_runtime->global());
|
|
82
|
+
return [[EXJavaScriptObject alloc] initWith:jsGlobalPtr runtime:self];
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
- (jsi::Function)createSyncFunction:(nonnull NSString *)name
|
|
86
|
+
argsCount:(NSInteger)argsCount
|
|
87
|
+
block:(nonnull JSSyncFunctionBlock)block
|
|
88
|
+
{
|
|
89
|
+
return [self createHostFunction:name argsCount:argsCount block:^jsi::Value(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray * _Nonnull arguments) {
|
|
90
|
+
return expo::convertObjCObjectToJSIValue(runtime, block(arguments));
|
|
91
|
+
}];
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
- (jsi::Function)createAsyncFunction:(nonnull NSString *)name
|
|
95
|
+
argsCount:(NSInteger)argsCount
|
|
96
|
+
block:(nonnull JSAsyncFunctionBlock)block
|
|
97
|
+
{
|
|
98
|
+
return [self createHostFunction:name argsCount:argsCount block:^jsi::Value(jsi::Runtime &runtime, std::shared_ptr<react::CallInvoker> callInvoker, NSArray *arguments) {
|
|
99
|
+
if (!callInvoker) {
|
|
100
|
+
// In mocked environment the call invoker may be null so it's not supported to call async functions.
|
|
101
|
+
// Testing async functions is a bit more complicated anyway. See `init` description for more.
|
|
102
|
+
throw jsi::JSError(runtime, "Calling async functions is not supported when the call invoker is unavailable");
|
|
103
|
+
}
|
|
104
|
+
// The function that is invoked as a setup of the EXJavaScript `Promise`.
|
|
105
|
+
auto promiseSetup = [callInvoker, block, arguments](jsi::Runtime &runtime, std::shared_ptr<Promise> promise) {
|
|
106
|
+
expo::callPromiseSetupWithBlock(runtime, callInvoker, promise, ^(RCTPromiseResolveBlock resolver, RCTPromiseRejectBlock rejecter) {
|
|
107
|
+
block(arguments, resolver, rejecter);
|
|
108
|
+
});
|
|
109
|
+
};
|
|
110
|
+
return createPromiseAsJSIValue(runtime, promiseSetup);
|
|
111
|
+
}];
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
#pragma mark - Script evaluation
|
|
115
|
+
|
|
116
|
+
- (nonnull EXJavaScriptValue *)evaluateScript:(nonnull NSString *)scriptSource
|
|
117
|
+
{
|
|
118
|
+
std::shared_ptr<jsi::StringBuffer> scriptBuffer = std::make_shared<jsi::StringBuffer>([scriptSource UTF8String]);
|
|
119
|
+
std::shared_ptr<jsi::Value> result;
|
|
120
|
+
|
|
121
|
+
try {
|
|
122
|
+
result = std::make_shared<jsi::Value>(_runtime->evaluateJavaScript(scriptBuffer, "<<evaluated>>"));
|
|
123
|
+
} catch (jsi::JSError &error) {
|
|
124
|
+
NSString *reason = [NSString stringWithUTF8String:error.getMessage().c_str()];
|
|
125
|
+
NSString *stack = [NSString stringWithUTF8String:error.getStack().c_str()];
|
|
126
|
+
|
|
127
|
+
@throw [NSException exceptionWithName:@"ScriptEvaluationException" reason:reason userInfo:@{
|
|
128
|
+
@"message": reason,
|
|
129
|
+
@"stack": stack,
|
|
130
|
+
}];
|
|
131
|
+
}
|
|
132
|
+
return [[EXJavaScriptValue alloc] initWithRuntime:self value:result];
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
#pragma mark - Private
|
|
136
|
+
|
|
137
|
+
- (jsi::Function)createHostFunction:(nonnull NSString *)name
|
|
138
|
+
argsCount:(NSInteger)argsCount
|
|
139
|
+
block:(nonnull JSHostFunctionBlock)block
|
|
140
|
+
{
|
|
141
|
+
jsi::PropNameID propNameId = jsi::PropNameID::forAscii(*_runtime, [name UTF8String], [name length]);
|
|
142
|
+
std::weak_ptr<react::CallInvoker> weakCallInvoker = _jsCallInvoker;
|
|
143
|
+
jsi::HostFunctionType function = [weakCallInvoker, block, self](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *args, size_t count) -> jsi::Value {
|
|
144
|
+
// Theoretically should check here whether the call invoker isn't null, but in mocked environment
|
|
145
|
+
// there is no need to care about that for synchronous calls, so it's ensured in `createAsyncFunction` instead.
|
|
146
|
+
auto callInvoker = weakCallInvoker.lock();
|
|
147
|
+
NSArray<EXJavaScriptValue *> *arguments = expo::convertJSIValuesToNSArray(self, args, count);
|
|
148
|
+
return block(runtime, callInvoker, arguments);
|
|
149
|
+
};
|
|
150
|
+
return jsi::Function::createFromHostFunction(*_runtime, propNameId, (unsigned int)argsCount, function);
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
@end
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
// Copyright 2022-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
#import <Foundation/Foundation.h>
|
|
4
|
+
#import <ExpoModulesCore/EXJavaScriptObject.h>
|
|
5
|
+
|
|
6
|
+
#ifdef __cplusplus
|
|
7
|
+
#import <jsi/jsi.h>
|
|
8
|
+
namespace jsi = facebook::jsi;
|
|
9
|
+
#endif // __cplusplus
|
|
10
|
+
|
|
11
|
+
@class EXJavaScriptRuntime;
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
Represents any JavaScript value. Its purpose is to exposes `facebook::jsi::Value` API back to Swift.
|
|
15
|
+
*/
|
|
16
|
+
NS_SWIFT_NAME(JavaScriptValue)
|
|
17
|
+
@interface EXJavaScriptValue : NSObject
|
|
18
|
+
|
|
19
|
+
#ifdef __cplusplus
|
|
20
|
+
- (nonnull instancetype)initWithRuntime:(nonnull EXJavaScriptRuntime *)runtime
|
|
21
|
+
value:(std::shared_ptr<jsi::Value>)value;
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
\return the underlying `jsi::Value`.
|
|
25
|
+
*/
|
|
26
|
+
- (nonnull jsi::Value *)get;
|
|
27
|
+
#endif // __cplusplus
|
|
28
|
+
|
|
29
|
+
#pragma mark - Type checking
|
|
30
|
+
|
|
31
|
+
- (BOOL)isUndefined;
|
|
32
|
+
- (BOOL)isNull;
|
|
33
|
+
- (BOOL)isBool;
|
|
34
|
+
- (BOOL)isNumber;
|
|
35
|
+
- (BOOL)isString;
|
|
36
|
+
- (BOOL)isSymbol;
|
|
37
|
+
- (BOOL)isObject;
|
|
38
|
+
- (BOOL)isFunction;
|
|
39
|
+
|
|
40
|
+
+ (nonnull NSString *)kindOf:(nonnull EXJavaScriptValue *)value;
|
|
41
|
+
|
|
42
|
+
#pragma mark - Type casting
|
|
43
|
+
|
|
44
|
+
- (nullable id)getRaw;
|
|
45
|
+
- (BOOL)getBool;
|
|
46
|
+
- (NSInteger)getInt;
|
|
47
|
+
- (double)getDouble;
|
|
48
|
+
- (nonnull NSString *)getString;
|
|
49
|
+
- (nonnull NSArray<EXJavaScriptValue *> *)getArray;
|
|
50
|
+
- (nonnull NSDictionary<NSString *, id> *)getDictionary;
|
|
51
|
+
- (nonnull EXJavaScriptObject *)getObject;
|
|
52
|
+
|
|
53
|
+
#pragma mark - Helpers
|
|
54
|
+
|
|
55
|
+
- (nonnull NSString *)toString;
|
|
56
|
+
|
|
57
|
+
@end
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
// Copyright 2022-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
#import <ExpoModulesCore/EXJSIConversions.h>
|
|
4
|
+
#import <ExpoModulesCore/EXJavaScriptValue.h>
|
|
5
|
+
#import <ExpoModulesCore/EXJavaScriptRuntime.h>
|
|
6
|
+
|
|
7
|
+
@implementation EXJavaScriptValue {
|
|
8
|
+
__weak EXJavaScriptRuntime *_runtime;
|
|
9
|
+
std::shared_ptr<jsi::Value> _value;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
- (nonnull instancetype)initWithRuntime:(nonnull EXJavaScriptRuntime *)runtime
|
|
13
|
+
value:(std::shared_ptr<jsi::Value>)value
|
|
14
|
+
{
|
|
15
|
+
if (self = [super init]) {
|
|
16
|
+
_runtime = runtime;
|
|
17
|
+
_value = value;
|
|
18
|
+
}
|
|
19
|
+
return self;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
- (nonnull jsi::Value *)get
|
|
23
|
+
{
|
|
24
|
+
return _value.get();
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
#pragma mark - Type checking
|
|
28
|
+
|
|
29
|
+
- (BOOL)isUndefined
|
|
30
|
+
{
|
|
31
|
+
return _value->isUndefined();
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
- (BOOL)isNull
|
|
35
|
+
{
|
|
36
|
+
return _value->isNull();
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
- (BOOL)isBool
|
|
40
|
+
{
|
|
41
|
+
return _value->isBool();
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
- (BOOL)isNumber
|
|
45
|
+
{
|
|
46
|
+
return _value->isNumber();
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
- (BOOL)isString
|
|
50
|
+
{
|
|
51
|
+
return _value->isString();
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
- (BOOL)isSymbol
|
|
55
|
+
{
|
|
56
|
+
return _value->isSymbol();
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
- (BOOL)isObject
|
|
60
|
+
{
|
|
61
|
+
return _value->isObject();
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
- (BOOL)isFunction
|
|
65
|
+
{
|
|
66
|
+
if (_value->isObject()) {
|
|
67
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
68
|
+
return _value->getObject(*runtime).isFunction(*runtime);
|
|
69
|
+
}
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
+ (nonnull NSString *)kindOf:(nonnull EXJavaScriptValue *)value
|
|
74
|
+
{
|
|
75
|
+
if ([value isUndefined]) {
|
|
76
|
+
return @"undefined";
|
|
77
|
+
}
|
|
78
|
+
if ([value isNull]) {
|
|
79
|
+
return @"null";
|
|
80
|
+
}
|
|
81
|
+
if ([value isBool]) {
|
|
82
|
+
return @"boolean";
|
|
83
|
+
}
|
|
84
|
+
if ([value isNumber]) {
|
|
85
|
+
return @"number";
|
|
86
|
+
}
|
|
87
|
+
if ([value isString]) {
|
|
88
|
+
return @"string";
|
|
89
|
+
}
|
|
90
|
+
if ([value isFunction]) {
|
|
91
|
+
return @"function";
|
|
92
|
+
}
|
|
93
|
+
assert([value isObject] && "Expecting object.");
|
|
94
|
+
return @"object";
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
#pragma mark - Type casting
|
|
98
|
+
|
|
99
|
+
- (nullable id)getRaw
|
|
100
|
+
{
|
|
101
|
+
return expo::convertJSIValueToObjCObject(*[_runtime get], *_value, [_runtime callInvoker]);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
- (BOOL)getBool
|
|
105
|
+
{
|
|
106
|
+
return _value->getBool();
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
- (NSInteger)getInt
|
|
110
|
+
{
|
|
111
|
+
return _value->getNumber();
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
- (double)getDouble
|
|
115
|
+
{
|
|
116
|
+
return _value->getNumber();
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
- (nonnull NSString *)getString
|
|
120
|
+
{
|
|
121
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
122
|
+
return expo::convertJSIStringToNSString(*runtime, _value->getString(*runtime));
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
- (nonnull NSArray<EXJavaScriptValue *> *)getArray
|
|
126
|
+
{
|
|
127
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
128
|
+
jsi::Array jsiArray = _value->getObject(*runtime).getArray(*runtime);
|
|
129
|
+
size_t arraySize = jsiArray.size(*runtime);
|
|
130
|
+
NSMutableArray *result = [NSMutableArray arrayWithCapacity:arraySize];
|
|
131
|
+
|
|
132
|
+
for (size_t i = 0; i < arraySize; i++) {
|
|
133
|
+
jsi::Value item = jsiArray.getValueAtIndex(*runtime, i);
|
|
134
|
+
|
|
135
|
+
if (item.isUndefined() || item.isNull()) {
|
|
136
|
+
[result addObject:(id)kCFNull];
|
|
137
|
+
} else {
|
|
138
|
+
std::shared_ptr<jsi::Value> valuePtr = std::make_shared<jsi::Value>(*runtime, item);
|
|
139
|
+
[result addObject:[[EXJavaScriptValue alloc] initWithRuntime:_runtime value:valuePtr]];
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
return result;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
- (nonnull NSDictionary<NSString *, id> *)getDictionary
|
|
146
|
+
{
|
|
147
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
148
|
+
return expo::convertJSIObjectToNSDictionary(*runtime, _value->getObject(*runtime), [_runtime callInvoker]);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
- (nonnull EXJavaScriptObject *)getObject
|
|
152
|
+
{
|
|
153
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
154
|
+
std::shared_ptr<jsi::Object> objectPtr = std::make_shared<jsi::Object>(_value->asObject(*runtime));
|
|
155
|
+
return [[EXJavaScriptObject alloc] initWith:objectPtr runtime:_runtime];
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
#pragma mark - Helpers
|
|
159
|
+
|
|
160
|
+
- (nonnull NSString *)toString
|
|
161
|
+
{
|
|
162
|
+
jsi::Runtime *runtime = [_runtime get];
|
|
163
|
+
return expo::convertJSIStringToNSString(*runtime, _value->toString(*runtime));
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
@end
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// Copyright 2022-present 650 Industries. All rights reserved.
|
|
2
2
|
|
|
3
3
|
#import <ExpoModulesCore/ExpoModulesHostObject.h>
|
|
4
|
+
#import <ExpoModulesCore/EXJavaScriptObject.h>
|
|
4
5
|
#import <ExpoModulesCore/Swift.h>
|
|
5
6
|
|
|
6
7
|
namespace expo {
|
|
@@ -13,7 +14,7 @@ ExpoModulesHostObject::~ExpoModulesHostObject() {
|
|
|
13
14
|
|
|
14
15
|
jsi::Value ExpoModulesHostObject::get(jsi::Runtime &runtime, const jsi::PropNameID &name) {
|
|
15
16
|
NSString *moduleName = [NSString stringWithUTF8String:name.utf8(runtime).c_str()];
|
|
16
|
-
|
|
17
|
+
EXJavaScriptObject *nativeObject = [swiftInterop getNativeModuleObject:moduleName];
|
|
17
18
|
|
|
18
19
|
return nativeObject ? jsi::Value(runtime, *[nativeObject get]) : jsi::Value::undefined();
|
|
19
20
|
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// Copyright 2022-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
public extension JavaScriptRuntime {
|
|
4
|
+
/**
|
|
5
|
+
Evaluates JavaScript code represented as a string.
|
|
6
|
+
|
|
7
|
+
- Parameter source: A string representing a JavaScript expression, statement, or sequence of statements.
|
|
8
|
+
The expression can include variables and properties of existing objects.
|
|
9
|
+
- Returns: The completion value of evaluating the given code represented as `JavaScriptValue`.
|
|
10
|
+
If the completion value is empty, `undefined` is returned.
|
|
11
|
+
- Throws: `JavaScriptEvalException` when evaluated code has invalid syntax or throws an error.
|
|
12
|
+
- Note: It wraps the original `evaluateScript` to better handle and rethrow exceptions.
|
|
13
|
+
*/
|
|
14
|
+
func eval(_ source: String) throws -> JavaScriptValue {
|
|
15
|
+
do {
|
|
16
|
+
var result: JavaScriptValue?
|
|
17
|
+
try EXUtilities.catchException {
|
|
18
|
+
result = self.evaluateScript(source)
|
|
19
|
+
}
|
|
20
|
+
// There is no risk to force unwrapping as long as the `evaluateScript` returns nonnull value.
|
|
21
|
+
return result!
|
|
22
|
+
} catch {
|
|
23
|
+
throw JavaScriptEvalException(error as NSError)
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
internal final class JavaScriptEvalException: GenericException<NSError> {
|
|
29
|
+
override var reason: String {
|
|
30
|
+
return param.userInfo["message"] as? String ?? "unknown reason"
|
|
31
|
+
}
|
|
32
|
+
}
|