k2hash 1.1.34 → 2.0.0

package/src/k2hash.cc

@@ -18,25 +18,39 @@
  * REVISION:
  */
 
+#include <napi.h>
 #include "k2h_shm.h"
 
-using namespace v8 ;
-
 //---------------------------------------------------------
 // k2hash node object
 //---------------------------------------------------------
-NAN_METHOD(CreateObject)
+// [NOTE]
+// The logic for receiving arguments when switching to N-API has been removed.
+// This is because the arguments were not used in the first place and did not
+// need to be defined.
+//
+Napi::Value CreateObject(const Napi::CallbackInfo& info)
 {
-	K2hNode::NewInstance(info);
+	Napi::Env env = info.Env();
+	return K2hNode::NewInstance(env);	// always no arguments.
 }
 
-void InitAll(Local<Object> exports, Local<Object> module)
+Napi::Object InitAll(Napi::Env env, Napi::Object exports)
 {
-	K2hNode::Init();
-	Nan::Set(module, Nan::New("exports").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(CreateObject)).ToLocalChecked());
+	// Class registration (creating a constructor)
+	K2hNode::Init(env, exports); // この中で constructor を作って Persistent に保存している想定
+
+	// Create a factory function that returns module.exports
+	Napi::Function createFn = Napi::Function::New(env, CreateObject, "k2hash");
+
+	// Allow to use "require('k2hash').K2hNode"
+	createFn.Set("K2hNode", K2hNode::constructor.Value());
+
+	// Replace module.exports with this function (does not break existing "require('k2hash')()".)
+	return createFn;
 }
 
-NODE_MODULE(k2hash , InitAll)
+NODE_API_MODULE(k2hash, InitAll)
 
 /*
  * Local variables:

package/src/k2hkeyqueue.cc

@@ -20,23 +20,36 @@
 
 #include "k2h_keyqueue.h"
 
-using namespace v8 ;
-
 //---------------------------------------------------------
 // k2hkeyqueue node object
 //---------------------------------------------------------
-NAN_METHOD(CreateObject)
+Napi::Value CreateObject(const Napi::CallbackInfo& info)
 {
-	K2hKeyQueue::NewInstance(info);
+	Napi::Env env = info.Env();
+
+	if(0 < info.Length()){
+		return K2hKeyQueue::NewInstance(env, info[0]);
+	}else{
+		return K2hKeyQueue::NewInstance(env);
+	}
 }
 
-void InitAll(Local<Object> exports, Local<Object> module)
+Napi::Object InitAll(Napi::Env env, Napi::Object exports)
 {
-	K2hKeyQueue::Init() ;
-	Nan::Set(module, Nan::New("exports").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(CreateObject)).ToLocalChecked());
+	// Register class / create constructor (store in K2hKeyQueue::constructor)
+	K2hKeyQueue::Init(env, exports);
+
+	// Create factory function to be assigned to module.exports
+	Napi::Function createFn = Napi::Function::New(env, CreateObject, "k2hkeyqueue");
+
+	// Attach constructor for compatibility (require('k2hkeyqueue').K2hKeyQueue)
+	createFn.Set("K2hKeyQueue", K2hKeyQueue::constructor.Value());
+
+	// Return factory function as module.exports
+	return createFn;
 }
 
-NODE_MODULE(k2hkeyqueue, InitAll)
+NODE_API_MODULE(k2hkeyqueue, InitAll)
 
 /*
  * Local variables:

package/src/k2hqueue.cc

@@ -20,23 +20,36 @@
 
 #include "k2h_queue.h"
 
-using namespace v8 ;
-
 //---------------------------------------------------------
 // k2hqueue node object
 //---------------------------------------------------------
-NAN_METHOD(CreateObject)
+Napi::Value CreateObject(const Napi::CallbackInfo& info)
 {
-	K2hQueue::NewInstance(info);
+	Napi::Env env = info.Env();
+
+	if(0 < info.Length()){
+		return K2hQueue::NewInstance(env, info[0]);
+	}else{
+		return K2hQueue::NewInstance(env);
+	}
 }
 
-void InitAll(Local<Object> exports, Local<Object> module)
+Napi::Object InitAll(Napi::Env env, Napi::Object exports)
 {
-	K2hQueue::Init() ;
-	Nan::Set(module, Nan::New("exports").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(CreateObject)).ToLocalChecked());
+	// Register class / create constructor (store in K2hQueue::constructor)
+	K2hQueue::Init(env, exports);
+
+	// Create factory function to be assigned to module.exports
+	Napi::Function createFn = Napi::Function::New(env, CreateObject, "k2hqueue");
+
+	// Attach constructor for compatibility (require('k2hqueue').K2hQueue)
+	createFn.Set("K2hQueue", K2hQueue::constructor.Value());
+
+	// Return factory function as module.exports
+	return createFn;
 }
 
-NODE_MODULE(k2hqueue, InitAll)
+NODE_API_MODULE(k2hqueue, InitAll)
 
 /*
  * Local variables: