Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ function(add_node_api_cts_addon ADDON_NAME)
endfunction()

function(add_node_api_cts_experimental_addon ADDON_NAME)
cmake_parse_arguments(PARSE_ARGV 1 ARG "" "" "SOURCES")
add_node_api_cts_addon(${ADDON_NAME} ${ARG_SOURCES})
add_node_api_cts_addon(${ADDON_NAME} ${ARGN})
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PARSE_ARGV usage isn't picking the sources correctly. We can just do what we do in the add_node_cts_addon.

target_compile_definitions(${ADDON_NAME} PRIVATE NAPI_EXPERIMENTAL)
if(MSVC)
target_link_libraries(${ADDON_NAME} PRIVATE ${NODE_API_EXPERIMENTAL_LIB})
Expand Down
2 changes: 1 addition & 1 deletion PORTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Tests covering the engine-specific part of Node-API, defined in `js_native_api.h
| `test_cannot_run_js` | Not ported | Medium |
| `test_constructor` | Not ported | Medium |
| `test_conversions` | Not ported | Medium |
| `test_dataview` | Not ported | Medium |
| `test_dataview` | Ported ✅ | Medium |
| `test_date` | Ported ✅ | Easy |
| `test_error` | Not ported | Medium |
| `test_exception` | Not ported | Medium |
Expand Down
1 change: 1 addition & 0 deletions tests/js-native-api/test_dataview/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add_node_api_cts_experimental_addon(test_dataview test_dataview.c)
48 changes: 48 additions & 0 deletions tests/js-native-api/test_dataview/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
"use strict";

if (experimentalFeatures.sharedArrayBuffer) {
// Testing api calls for arrays
const test_dataview = loadAddon("test_dataview");

// Test for creating dataview with ArrayBuffer
{
const buffer = new ArrayBuffer(128);
const template = Reflect.construct(DataView, [buffer]);

const theDataview = test_dataview.CreateDataViewFromJSDataView(template);
assert.ok(
theDataview instanceof DataView,
`Expect ${theDataview} to be a DataView`,
);
}

// Test for creating dataview with SharedArrayBuffer
{
const buffer = new SharedArrayBuffer(128);
const template = new DataView(buffer);

const theDataview = test_dataview.CreateDataViewFromJSDataView(template);
assert.ok(
theDataview instanceof DataView,
`Expect ${theDataview} to be a DataView`,
);

assert.strictEqual(template.buffer, theDataview.buffer);
}

// Test for creating dataview with ArrayBuffer and invalid range
{
const buffer = new ArrayBuffer(128);
assert.throws(() => {
test_dataview.CreateDataView(buffer, 10, 200);
}, RangeError);
}

// Test for creating dataview with SharedArrayBuffer and invalid range
{
const buffer = new SharedArrayBuffer(128);
assert.throws(() => {
test_dataview.CreateDataView(buffer, 10, 200);
}, RangeError);
}
}
111 changes: 111 additions & 0 deletions tests/js-native-api/test_dataview/test_dataview.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
#include <js_native_api.h>
#include <string.h>
#include "../common.h"
#include "../entry_point.h"

static napi_value CreateDataView(napi_env env, napi_callback_info info) {
size_t argc = 3;
napi_value args [3];
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));

NODE_API_ASSERT(env, argc == 3, "Wrong number of arguments");

napi_valuetype valuetype0;
napi_value arraybuffer = args[0];

NODE_API_CALL(env, napi_typeof(env, arraybuffer, &valuetype0));
NODE_API_ASSERT(env, valuetype0 == napi_object,
"Wrong type of arguments. Expects a ArrayBuffer as the first "
"argument.");

bool is_arraybuffer;
NODE_API_CALL(env, napi_is_arraybuffer(env, arraybuffer, &is_arraybuffer));

if (!is_arraybuffer) {
bool is_sharedarraybuffer;
NODE_API_CALL(
env,
node_api_is_sharedarraybuffer(env, arraybuffer, &is_sharedarraybuffer));
NODE_API_ASSERT(env,
is_sharedarraybuffer,
"Wrong type of arguments. Expects a SharedArrayBuffer or "
"ArrayBuffer as the first "
"argument.");
}

napi_valuetype valuetype1;
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));

NODE_API_ASSERT(env, valuetype1 == napi_number,
"Wrong type of arguments. Expects a number as second argument.");

size_t byte_offset = 0;
NODE_API_CALL(env, napi_get_value_uint32(env, args[1], (uint32_t*)(&byte_offset)));

napi_valuetype valuetype2;
NODE_API_CALL(env, napi_typeof(env, args[2], &valuetype2));

NODE_API_ASSERT(env, valuetype2 == napi_number,
"Wrong type of arguments. Expects a number as third argument.");

size_t length = 0;
NODE_API_CALL(env, napi_get_value_uint32(env, args[2], (uint32_t*)(&length)));

napi_value output_dataview;
NODE_API_CALL(env,
napi_create_dataview(env, length, arraybuffer,
byte_offset, &output_dataview));

return output_dataview;
}

static napi_value CreateDataViewFromJSDataView(napi_env env, napi_callback_info info) {
size_t argc = 1;
napi_value args [1];
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));

NODE_API_ASSERT(env, argc == 1, "Wrong number of arguments");

napi_valuetype valuetype;
napi_value input_dataview = args[0];

NODE_API_CALL(env, napi_typeof(env, input_dataview, &valuetype));
NODE_API_ASSERT(env, valuetype == napi_object,
"Wrong type of arguments. Expects a DataView as the first "
"argument.");

bool is_dataview;
NODE_API_CALL(env, napi_is_dataview(env, input_dataview, &is_dataview));
NODE_API_ASSERT(env, is_dataview,
"Wrong type of arguments. Expects a DataView as the first "
"argument.");
size_t byte_offset = 0;
size_t length = 0;
napi_value buffer;
NODE_API_CALL(env,
napi_get_dataview_info(env, input_dataview, &length, NULL,
&buffer, &byte_offset));

napi_value output_dataview;
NODE_API_CALL(env,
napi_create_dataview(env, length, buffer,
byte_offset, &output_dataview));


return output_dataview;
}

EXTERN_C_START
napi_value Init(napi_env env, napi_value exports) {
napi_property_descriptor descriptors[] = {
DECLARE_NODE_API_PROPERTY("CreateDataView", CreateDataView),
DECLARE_NODE_API_PROPERTY("CreateDataViewFromJSDataView",
CreateDataViewFromJSDataView)
};

NODE_API_CALL(env, napi_define_properties(
env, exports, sizeof(descriptors) / sizeof(*descriptors), descriptors));

return exports;
}
EXTERN_C_END