-
Notifications
You must be signed in to change notification settings - Fork 3
fix(napi): receive raw pointer out parameters #57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
GrapeBaBa
wants to merge
4
commits into
main
Choose a base branch
from
fix/napi-out-parameters-v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+132
−15
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f4a88cd
fix(napi): receive raw pointer out parameters
GrapeBaBa 66ed541
fix(napi): report unsupported typed array types
GrapeBaBa 8ad727a
test(napi): reuse existing typed array example
GrapeBaBa b65ac70
test(napi): cover view info out parameters
GrapeBaBa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| const std = @import("std"); | ||
| const c = @import("c.zig").c; | ||
| const status = @import("status.zig"); | ||
| const NapiError = @import("status.zig").NapiError; | ||
|
|
@@ -142,15 +143,40 @@ pub const TypedarrayInfo = struct { | |
| byte_offset: usize, | ||
| }; | ||
|
|
||
| pub const TypedarrayInfoError = NapiError || error{ | ||
| UnsupportedTypedarrayType, | ||
| }; | ||
|
|
||
| /// https://nodejs.org/api/n-api.html#napi_get_typedarray_info | ||
| pub fn getTypedarrayInfo(self: Value) NapiError!TypedarrayInfo { | ||
| var info: TypedarrayInfo = undefined; | ||
| pub fn getTypedarrayInfo(self: Value) TypedarrayInfoError!TypedarrayInfo { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just a note for reference. The error set change on a |
||
| var array_type_raw: c.napi_typedarray_type = undefined; | ||
| var length: usize = undefined; | ||
| var data: [*]u8 = undefined; | ||
| try status.check( | ||
| c.napi_get_typedarray_info(self.env, self.value, @ptrCast(&info.array_type), &info.length, @ptrCast(&data), @ptrCast(&info.arraybuffer), &info.byte_offset), | ||
| ); | ||
| info.data = data[0 .. info.length * info.array_type.elementSize()]; | ||
| return info; | ||
| var arraybuffer: c.napi_value = undefined; | ||
| var byte_offset: usize = undefined; | ||
| try status.check( | ||
| c.napi_get_typedarray_info( | ||
| self.env, | ||
| self.value, | ||
| &array_type_raw, | ||
| &length, | ||
| @ptrCast(&data), | ||
| &arraybuffer, | ||
| &byte_offset, | ||
| ), | ||
| ); | ||
| const array_type = std.enums.fromInt(TypedarrayType, array_type_raw) orelse | ||
| return error.UnsupportedTypedarrayType; | ||
| return .{ | ||
| .array_type = array_type, | ||
| .length = length, | ||
| .data = data[0 .. length * array_type.elementSize()], | ||
| .arraybuffer = .{ | ||
| .env = self.env, | ||
| .value = arraybuffer, | ||
| }, | ||
| .byte_offset = byte_offset, | ||
| }; | ||
| } | ||
|
|
||
| pub const DataViewInfo = struct { | ||
|
|
@@ -162,13 +188,29 @@ pub const DataViewInfo = struct { | |
|
|
||
| /// https://nodejs.org/api/n-api.html#napi_get_dataview_info | ||
| pub fn getDataviewInfo(self: Value) NapiError!DataViewInfo { | ||
| var info: DataViewInfo = undefined; | ||
| var byte_length: usize = undefined; | ||
| var data: [*]u8 = undefined; | ||
| try status.check( | ||
| c.napi_get_dataview_info(self.env, self.value, &info.byte_length, @ptrCast(&data), @ptrCast(&info.arraybuffer), &info.byte_offset), | ||
| var arraybuffer: c.napi_value = undefined; | ||
| var byte_offset: usize = undefined; | ||
| try status.check( | ||
| c.napi_get_dataview_info( | ||
| self.env, | ||
| self.value, | ||
| &byte_length, | ||
| @ptrCast(&data), | ||
| &arraybuffer, | ||
| &byte_offset, | ||
| ), | ||
| ); | ||
| info.data = data[0..info.byte_length]; | ||
| return info; | ||
| return .{ | ||
| .byte_length = byte_length, | ||
| .data = data[0..byte_length], | ||
| .arraybuffer = .{ | ||
| .env = self.env, | ||
| .value = arraybuffer, | ||
| }, | ||
| .byte_offset = byte_offset, | ||
| }; | ||
| } | ||
|
|
||
| /// https://nodejs.org/api/n-api.html#napi_get_date_value | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If that condition does not match, it will show the tests pass not skipped. We can use something like this to properly show the test skipped.