@auto_js/napi 0.0.7 → 0.0.9

package/value/primitive.cc

@@ -1,27 +1,24 @@
 module napi_js;
-import :api;
-import :bound_value;
-import :value_handle;
 import std;
 
 namespace js::napi {
 
 // boolean
-bound_value_for_boolean::operator bool() const {
+value_for_boolean::operator bool() const {
 	return napi::invoke(napi_get_value_bool, env(), napi_value{*this});
 }
 
 // number
-bound_value_for_number::operator double() const {
+value_for_number::operator double() const {
 	return napi::invoke(napi_get_value_double, env(), napi_value{*this});
 }
 
-bound_value_for_number::operator std::int32_t() const {
+value_for_number::operator std::int32_t() const {
 	return napi::invoke(napi_get_value_int32, env(), napi_value{*this});
 }
 
 // bigint
-bound_value_for_bigint::operator bigint() const {
+value_for_bigint::operator bigint() const {
 	js::bigint value;
 	auto one_word = std::uint64_t{};
 	auto length = std::size_t{1};
@@ -38,7 +35,7 @@ bound_value_for_bigint::operator bigint() const {
 	return value;
 }
 
-bound_value_for_bigint::operator std::int64_t() const {
+value_for_bigint::operator std::int64_t() const {
 	// NOLINTNEXTLINE(cppcoreguidelines-init-variables)
 	std::int64_t value;
 	// nb: `lossless` error not checked for consistency with `napi_get_value_int32`,
@@ -48,7 +45,7 @@ bound_value_for_bigint::operator std::int64_t() const {
 }
 
 // string
-bound_value_for_string::operator std::string() const {
+value_for_string::operator std::string() const {
 	std::string string;
 	auto length = napi::invoke(napi_get_value_string_latin1, env(), napi_value{*this}, nullptr, 0);
 	if (length > 0) {
@@ -60,7 +57,7 @@ bound_value_for_string::operator std::string() const {
 	return string;
 }
 
-bound_value_for_string::operator std::u16string() const {
+value_for_string::operator std::u16string() const {
 	// nb: napi requires that the returned string is null-terminated for some reason.
 	std::u16string string;
 	auto length = napi::invoke(napi_get_value_string_utf16, env(), napi_value{*this}, nullptr, 0);

package/value/primitive.h.cc

@@ -1,38 +1,51 @@
 export module napi_js:primitive;
 import :api;
-import :bound_value;
-import :environment_fwd;
-import :value_handle;
+import :environment;
+import :handle.local_of;
+import :handle.value_of;
 import std;
 
 namespace js::napi {
 
 // boolean
-class bound_value_for_boolean : public bound_value_next<boolean_tag> {
+class value_for_boolean : public value_next<boolean_tag> {
 	public:
-		using bound_value_next<boolean_tag>::bound_value_next;
+		using value_next<boolean_tag>::value_next;
 		[[nodiscard]] explicit operator bool() const;
 };
+
+class value_for_false : public value_next<false_tag> {
+	public:
+		using value_next<false_tag>::value_next;
+		[[nodiscard]] constexpr explicit operator bool() const { return false; }
+};
+
+class value_for_true : public value_next<true_tag> {
+	public:
+		using value_next<true_tag>::value_next;
+		[[nodiscard]] constexpr explicit operator bool() const { return true; }
+};
+
 // number
-class bound_value_for_number : public bound_value_next<number_tag> {
+class value_for_number : public value_next<number_tag> {
 	public:
-		using bound_value_next<number_tag>::bound_value_next;
+		using value_next<number_tag>::value_next;
 		[[nodiscard]] explicit operator double() const;
 		[[nodiscard]] explicit operator std::int32_t() const;
 };
 
 // bigint
-class bound_value_for_bigint : public bound_value_next<bigint_tag> {
+class value_for_bigint : public value_next<bigint_tag> {
 	public:
-		using bound_value_next<bigint_tag>::bound_value_next;
+		using value_next<bigint_tag>::value_next;
 		[[nodiscard]] explicit operator bigint() const;
 		[[nodiscard]] explicit operator std::int64_t() const;
 };
 
 // string
-class bound_value_for_string : public bound_value_next<string_tag> {
+class value_for_string : public value_next<string_tag> {
 	public:
-		using bound_value_next<string_tag>::bound_value_next;
+		using value_next<string_tag>::value_next;
 		[[nodiscard]] explicit operator std::string() const;
 		[[nodiscard]] explicit operator std::u16string() const;
 };

package/value/record.cc

@@ -1,19 +1,17 @@
 module napi_js;
-import :api;
-import :array;
 import std;
 
 namespace js::napi {
 
-auto bound_value_for_record::into_range() const -> range_type {
+auto value_for_record::into_range() const -> range_type {
 	return keys() | std::views::transform(iterator_transform{*this});
 }
 
-auto bound_value_for_record::size() const -> std::size_t {
+auto value_for_record::size() const -> std::size_t {
 	return keys().size();
 }
 
-auto bound_value_for_record::keys() const -> const keys_type& {
+auto value_for_record::keys() const -> const keys_type& {
 	if (napi_value{keys_} == nullptr) {
 		auto* property_names = napi::invoke(
 			napi_get_all_property_names,
@@ -23,15 +21,15 @@ auto bound_value_for_record::keys() const -> const keys_type& {
 			static_cast<napi_key_filter>(napi_key_enumerable | napi_key_skip_symbols),
 			napi_key_keep_numbers
 		);
-		keys_ = keys_type{env(), js::napi::value_of<vector_tag>::from(property_names)};
+		keys_ = keys_type{env(), js::napi::local_of<vector_tag>::from(property_names)};
 	}
 	return keys_;
 }
 
-bound_value_for_record::iterator_transform::iterator_transform(const bound_value_for_record& subject) :
+value_for_record::iterator_transform::iterator_transform(const value_for_record& subject) :
 		subject_{&subject} {}
 
-auto bound_value_for_record::iterator_transform::operator()(value_of<value_tag> key) const -> value_type {
+auto value_for_record::iterator_transform::operator()(local_of<value_tag> key) const -> value_type {
 	return std::pair{key_type::from(key), subject_->get(key)};
 }
 

package/value/record.h.cc

@@ -5,22 +5,22 @@ import std;
 
 namespace js::napi {
 
-class bound_value_for_record : public bound_value_next<record_tag> {
+class value_for_record : public value_next<record_tag> {
 	public:
-		using bound_value_next<record_tag>::bound_value_next;
-		using keys_type = bound_value<vector_tag>;
-		using key_type = value_of<primitive_tag>;
-		using mapped_type = value_of<value_tag>;
+		using value_next<record_tag>::value_next;
+		using keys_type = value_of<vector_tag>;
+		using key_type = local_of<primitive_tag>;
+		using mapped_type = local_of<value_tag>;
 		using value_type = std::pair<key_type, mapped_type>;
 
 	private:
 		class iterator_transform {
 			public:
-				explicit iterator_transform(const bound_value_for_record& subject_);
-				auto operator()(value_of<value_tag> key) const -> value_type;
+				explicit iterator_transform(const value_for_record& subject_);
+				auto operator()(local_of<value_tag> key) const -> value_type;
 
 			private:
-				const bound_value_for_record* subject_;
+				const value_for_record* subject_;
 		};
 
 	public:

package/value/value.cc

@@ -4,7 +4,9 @@ export import :array;
 export import :class_;
 export import :external;
 export import :function;
+export import :handle.local_of;
+export import :handle.types;
+export import :handle.value_of;
 export import :object;
 export import :primitive;
 export import :record;
-export import :value_handle;

package/handle/bound_value.cc

@@ -1,47 +0,0 @@
-export module napi_js:bound_value;
-import :handle.types;
-import nodejs;
-
-namespace js::napi {
-
-// Details applied to each level of the `bound_value<T>` hierarchy.
-template <class Tag>
-class bound_value_next : public bound_value<typename Tag::tag_type> {
-	public:
-		using tag_type = Tag;
-		using bound_value<typename Tag::tag_type>::bound_value;
-		bound_value_next() = default;
-		bound_value_next(napi_env env, value_of<Tag> value) :
-				bound_value<typename Tag::tag_type>{env, napi_value{value}} {}
-
-		// NOLINTNEXTLINE(google-explicit-constructor)
-		operator value_of<Tag>() const { return value_of<Tag>::from(napi_value{*this}); }
-};
-
-// Member & method implementation for stateful objects. Used internally in visitors. I think it
-// might make sense to have the environment specified by a template parameter. Then you would use
-// `bound_value<T>` or something instead of passing the environment to each `value_of<T>` method.
-template <class Tag>
-class bound_value : public value_specialization<Tag>::bound_type {
-	public:
-		using value_specialization<Tag>::bound_type::bound_type;
-};
-
-template <class Tag>
-bound_value(auto, value_of<Tag>) -> bound_value<Tag>;
-
-template <>
-class bound_value<void> : public value_handle {
-	protected:
-		bound_value() = default;
-		bound_value(napi_env env, napi_value value) :
-				value_handle{value},
-				env_{env} {}
-
-		[[nodiscard]] auto env() const -> napi_env { return env_; }
-
-	private:
-		napi_env env_{};
-};
-
-} // namespace js::napi

package/support/host_shim.cc

@@ -1,42 +0,0 @@
-import std;
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#if _WIN64
-// I couldn't get this to work.
-// https://stackoverflow.com/questions/2290587/gcc-style-weak-linking-in-visual-studio
-#define SHIM(NAME)
-#else
-#define SHIM(NAME) \
-	__attribute__((weak)) __attribute__((visibility("default"))) auto NAME = nullptr;
-#endif
-// NOLINTEND(bugprone-macro-parentheses)
-
-extern "C" {
-const void* shim_nullptr = nullptr;
-// NOLINTBEGIN(bugprone-reserved-identifier)
-SHIM(_ZN2v810Int16Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v810Int32Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v810Uint8Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v811Uint16Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v811Uint32Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v812BackingStoreD1Ev)
-SHIM(_ZN2v812Float16Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v812Float32Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v812Float64Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v813BigInt64Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v814BigUint64Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v817SharedArrayBuffer15GetBackingStoreEv)
-SHIM(_ZN2v817SharedArrayBuffer15NewBackingStoreEPvmPFvS1_mS1_ES1_)
-SHIM(_ZN2v817SharedArrayBuffer3NewEPNS_7IsolateENSt3__110shared_ptrINS_12BackingStoreEEE)
-SHIM(_ZN2v817Uint8ClampedArray3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v87Isolate10GetCurrentEv)
-SHIM(_ZN2v88DataView3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZN2v89Int8Array3NewENS_5LocalINS_17SharedArrayBufferEEEmm)
-SHIM(_ZNK2v812BackingStore4DataEv)
-SHIM(_ZNK2v817SharedArrayBuffer10ByteLengthEv)
-SHIM(_ZNK2v85Value7IsInt32Ev)
-SHIM(_ZNK2v85Value8IsNumberEv)
-SHIM(_ZNK2v86String9IsOneByteEv)
-SHIM(node_api_is_sharedarraybuffer)
-// NOLINTEND(bugprone-reserved-identifier)
-}