@@ -825,6 +825,58 @@ void Reference::WeakCallback(const v8::WeakCallbackInfo<Reference>& data) {
825
825
reference->env_ ->InvokeFinalizerFromGC (reference);
826
826
}
827
827
828
+ /* *
829
+ * A wrapper for `v8::External` to support type-tagging. `v8::External` doesn't
830
+ * support defining any properties and private properties on it, even though it
831
+ * is an object. This wrapper is used to store the type tag and the data of the
832
+ * external value.
833
+ */
834
+ class ExternalWrapper {
835
+ private:
836
+ explicit ExternalWrapper (void * data) : data_(data) {}
837
+
838
+ static void WeakCallback (const v8::WeakCallbackInfo<ExternalWrapper>& data) {
839
+ ExternalWrapper* wrapper = data.GetParameter ();
840
+ delete wrapper;
841
+ }
842
+
843
+ public:
844
+ static v8::Local<v8::External> New (napi_env env, void * data) {
845
+ ExternalWrapper* wrapper = new ExternalWrapper (data);
846
+ v8::Local<v8::External> external = v8::External::New (env->isolate , wrapper);
847
+ wrapper->persistent_ .Reset (env->isolate , external);
848
+ wrapper->persistent_ .SetWeak (
849
+ wrapper, WeakCallback, v8::WeakCallbackType::kParameter );
850
+
851
+ return external;
852
+ }
853
+
854
+ static ExternalWrapper* From (v8::Local<v8::External> external) {
855
+ return static_cast <ExternalWrapper*>(external->Value ());
856
+ }
857
+
858
+ void * Data () { return data_; }
859
+
860
+ bool TypeTag (const napi_type_tag* type_tag) {
861
+ if (type_tag_ != nullptr ) {
862
+ return false ;
863
+ }
864
+ type_tag_ = type_tag;
865
+ return true ;
866
+ }
867
+
868
+ bool CheckTypeTag (const napi_type_tag* type_tag) {
869
+ return type_tag == type_tag_ ||
870
+ (type_tag_ && type_tag->lower == type_tag_->lower &&
871
+ type_tag->upper == type_tag_->upper );
872
+ }
873
+
874
+ private:
875
+ v8impl::Persistent<v8::Value> persistent_;
876
+ void * data_;
877
+ const napi_type_tag* type_tag_ = nullptr ;
878
+ };
879
+
828
880
} // end of namespace v8impl
829
881
830
882
// Warning: Keep in-sync with napi_status enum
@@ -2525,9 +2577,8 @@ napi_create_external(napi_env env,
2525
2577
NAPI_PREAMBLE (env);
2526
2578
CHECK_ARG (env, result);
2527
2579
2528
- v8::Isolate* isolate = env->isolate ;
2529
-
2530
- v8::Local<v8::Value> external_value = v8::External::New (isolate, data);
2580
+ v8::Local<v8::External> external_value =
2581
+ v8impl::ExternalWrapper::New (env, data);
2531
2582
2532
2583
if (finalize_cb) {
2533
2584
// The Reference object will delete itself after invoking the finalizer
@@ -2547,12 +2598,24 @@ napi_create_external(napi_env env,
2547
2598
}
2548
2599
2549
2600
napi_status NAPI_CDECL napi_type_tag_object (napi_env env,
2550
- napi_value object ,
2601
+ napi_value object_or_external ,
2551
2602
const napi_type_tag* type_tag) {
2552
2603
NAPI_PREAMBLE (env);
2553
2604
v8::Local<v8::Context> context = env->context ();
2605
+
2606
+ CHECK_ARG (env, object_or_external);
2607
+ v8::Local<v8::Value> val =
2608
+ v8impl::V8LocalValueFromJsValue (object_or_external);
2609
+ if (val->IsExternal ()) {
2610
+ v8impl::ExternalWrapper* wrapper =
2611
+ v8impl::ExternalWrapper::From (val.As <v8::External>());
2612
+ RETURN_STATUS_IF_FALSE_WITH_PREAMBLE (
2613
+ env, wrapper->TypeTag (type_tag), napi_invalid_arg);
2614
+ return GET_RETURN_STATUS (env);
2615
+ }
2616
+
2554
2617
v8::Local<v8::Object> obj;
2555
- CHECK_TO_OBJECT_WITH_PREAMBLE (env, context, obj, object );
2618
+ CHECK_TO_OBJECT_WITH_PREAMBLE (env, context, obj, object_or_external );
2556
2619
CHECK_ARG_WITH_PREAMBLE (env, type_tag);
2557
2620
2558
2621
auto key = NAPI_PRIVATE_KEY (context, type_tag);
@@ -2574,13 +2637,24 @@ napi_status NAPI_CDECL napi_type_tag_object(napi_env env,
2574
2637
}
2575
2638
2576
2639
napi_status NAPI_CDECL napi_check_object_type_tag (napi_env env,
2577
- napi_value object ,
2640
+ napi_value object_or_external ,
2578
2641
const napi_type_tag* type_tag,
2579
2642
bool * result) {
2580
2643
NAPI_PREAMBLE (env);
2581
2644
v8::Local<v8::Context> context = env->context ();
2645
+
2646
+ CHECK_ARG (env, object_or_external);
2647
+ v8::Local<v8::Value> obj_val =
2648
+ v8impl::V8LocalValueFromJsValue (object_or_external);
2649
+ if (obj_val->IsExternal ()) {
2650
+ v8impl::ExternalWrapper* wrapper =
2651
+ v8impl::ExternalWrapper::From (obj_val.As <v8::External>());
2652
+ *result = wrapper->CheckTypeTag (type_tag);
2653
+ return GET_RETURN_STATUS (env);
2654
+ }
2655
+
2582
2656
v8::Local<v8::Object> obj;
2583
- CHECK_TO_OBJECT_WITH_PREAMBLE (env, context, obj, object );
2657
+ CHECK_TO_OBJECT_WITH_PREAMBLE (env, context, obj, object_or_external );
2584
2658
CHECK_ARG_WITH_PREAMBLE (env, type_tag);
2585
2659
CHECK_ARG_WITH_PREAMBLE (env, result);
2586
2660
@@ -2625,7 +2699,7 @@ napi_status NAPI_CDECL napi_get_value_external(napi_env env,
2625
2699
RETURN_STATUS_IF_FALSE (env, val->IsExternal (), napi_invalid_arg);
2626
2700
2627
2701
v8::Local<v8::External> external_value = val.As <v8::External>();
2628
- *result = external_value-> Value ();
2702
+ *result = v8impl::ExternalWrapper::From ( external_value)-> Data ();
2629
2703
2630
2704
return napi_clear_last_error (env);
2631
2705
}
0 commit comments