Skip to content

Commit 62cd556

Browse files
author
Gabriel Schulhof
committed
simplify addon init
1 parent 293ee15 commit 62cd556

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

test/addon_data.cc

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,36 @@ class Addon {
4141
}
4242
};
4343

44+
static Napi::Value Getter(const Napi::CallbackInfo& info) {
45+
return info.Env().GetInstanceData<Addon>()->VerboseIndicator.New({});
46+
}
47+
48+
static void Setter(const Napi::CallbackInfo& info) {
49+
info.Env().GetInstanceData<Addon>()->verbose = info[0].As<Napi::Boolean>();
50+
}
51+
4452
Addon(Napi::Env env): VerboseIndicator(VerboseIndicator::Init(env)) {}
45-
bool verbose = false;
46-
Napi::FunctionReference VerboseIndicator;
4753
~Addon() {
4854
if (verbose) {
4955
fprintf(stderr, "addon_data: Addon::~Addon\n");
5056
}
5157
}
52-
};
53-
54-
static Napi::Value Getter(const Napi::CallbackInfo& info) {
55-
return info.Env().GetInstanceData<Addon>()->VerboseIndicator.New({});
56-
}
5758

58-
static void Setter(const Napi::CallbackInfo& info) {
59-
info.Env().GetInstanceData<Addon>()->verbose = info[0].As<Napi::Boolean>();
60-
}
59+
static Napi::Object Init(Napi::Env env) {
60+
env.SetInstanceData(new Addon(env));
61+
Napi::Object result = Napi::Object::New(env);
62+
result.DefineProperties({
63+
Napi::PropertyDescriptor::Accessor<Getter, Setter>("verbose"),
64+
});
6165

62-
Napi::Object InitAddonData(Napi::Env env) {
63-
env.SetInstanceData(new Addon(env));
64-
Napi::Object result = Napi::Object::New(env);
66+
return result;
67+
}
6568

66-
result.DefineProperties({
67-
Napi::PropertyDescriptor::Accessor<Getter, Setter>("verbose"),
68-
});
69+
private:
70+
bool verbose = false;
71+
Napi::FunctionReference VerboseIndicator;
72+
};
6973

70-
return result;
74+
Napi::Object InitAddonData(Napi::Env env) {
75+
return Addon::Init(env);
7176
}

0 commit comments

Comments
 (0)