@ugo-studio/jspp 0.2.8 → 0.3.0

package/src/prelude/values/helpers/function.hpp

@@ -1,109 +1,109 @@
-#pragma once
-
-#include <variant>
-#include <optional>
-
-#include "types.hpp"
-#include "values/function.hpp"
-#include "any_value.hpp"
-#include "values/prototypes/function.hpp"
-
-namespace jspp
-{
-    inline std::string JsFunction::to_std_string() const
-    {
-        std::string type_part = this->is_async ? "async function" : this->is_generator ? "function*"
-                                                                                       : "function";
-        std::string name_part = this->name.value_or("");
-        return type_part + " " + name_part + "() { [native code] }";
-    }
-
-    inline AnyValue JsFunction::call(const AnyValue &thisVal, std::span<const AnyValue> args)
-    {
-        if (std::function<AnyValue(const AnyValue &, std::span<const AnyValue>)> *func = std::get_if<0>(&callable))
-        {
-            return (*func)(thisVal, args);
-        }
-        else if (std::function<jspp::JsIterator<jspp::AnyValue>(const AnyValue &, std::span<const AnyValue>)> *func = std::get_if<1>(&callable))
-        {
-            return AnyValue::from_iterator((*func)(thisVal, args));
-        }
-        else if (std::function<jspp::JsPromise(const AnyValue &, std::span<const AnyValue>)> *func = std::get_if<2>(&callable))
-        {
-            return AnyValue::make_promise((*func)(thisVal, args));
-        }
-        else if (std::function<jspp::JsAsyncIterator<jspp::AnyValue>(const AnyValue &, std::span<const AnyValue>)> *func = std::get_if<3>(&callable))
-        {
-            return AnyValue::from_async_iterator((*func)(thisVal, args));
-        }
-        else
-        {
-            return Constants::UNDEFINED;
-        }
-    }
-
-    inline bool JsFunction::has_property(const std::string &key) const
-    {
-        if (props.find(key) != props.end())
-            return true;
-        if (!proto.is_null() && !proto.is_undefined())
-        {
-            if (proto.has_property(key))
-                return true;
-        }
-        if (FunctionPrototypes::get(key).has_value())
-            return true;
-        return false;
-    }
-
-    inline AnyValue JsFunction::get_property(const std::string &key, const AnyValue &thisVal)
-    {
-        auto it = props.find(key);
-        if (it == props.end())
-        {
-            if (!proto.is_null() && !proto.is_undefined())
-            {
-                if (proto.has_property(key))
-                {
-                    return proto.get_property_with_receiver(key, thisVal);
-                }
-            }
-
-            auto proto_it = FunctionPrototypes::get(key);
-            if (proto_it.has_value())
-            {
-                return AnyValue::resolve_property_for_read(proto_it.value(), thisVal, key);
-            }
-            return Constants::UNDEFINED;
-        }
-        return AnyValue::resolve_property_for_read(it->second, thisVal, key);
-    }
-
-    inline AnyValue JsFunction::set_property(const std::string &key, const AnyValue &value, const AnyValue &thisVal)
-    {
-        auto proto_it = FunctionPrototypes::get(key);
-        if (proto_it.has_value())
-        {
-            auto proto_value = proto_it.value();
-            if (proto_value.is_accessor_descriptor())
-            {
-                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
-            }
-            if (proto_value.is_data_descriptor() && !proto_value.as_data_descriptor()->writable)
-            {
-                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
-            }
-        }
-
-        auto it = props.find(key);
-        if (it != props.end())
-        {
-            return AnyValue::resolve_property_for_write(it->second, thisVal, value, key);
-        }
-        else
-        {
-            props[key] = value;
-            return value;
-        }
-    }
+#pragma once
+
+#include <variant>
+#include <optional>
+
+#include "types.hpp"
+#include "values/function.hpp"
+#include "any_value.hpp"
+#include "values/prototypes/function.hpp"
+
+namespace jspp
+{
+    inline std::string JsFunction::to_std_string() const
+    {
+        std::string type_part = this->is_async ? "async function" : this->is_generator ? "function*"
+                                                                                       : "function";
+        std::string name_part = this->name.value_or("");
+        return type_part + " " + name_part + "() { [native code] }";
+    }
+
+    inline AnyValue JsFunction::call(AnyValue thisVal, std::span<const AnyValue> args)
+    {
+        if (std::function<AnyValue(AnyValue, std::span<const AnyValue>)> *func = std::get_if<0>(&callable))
+        {
+            return (*func)(thisVal, args);
+        }
+        else if (std::function<jspp::JsIterator<jspp::AnyValue>(AnyValue, std::vector<AnyValue>)> *func = std::get_if<1>(&callable))
+        {
+            return AnyValue::from_iterator((*func)(thisVal, std::vector<AnyValue>(args.begin(), args.end())));
+        }
+        else if (std::function<jspp::JsPromise(AnyValue, std::vector<AnyValue>)> *func = std::get_if<2>(&callable))
+        {
+            return AnyValue::make_promise((*func)(thisVal, std::vector<AnyValue>(args.begin(), args.end())));
+        }
+        else if (std::function<jspp::JsAsyncIterator<jspp::AnyValue>(AnyValue, std::vector<AnyValue>)> *func = std::get_if<3>(&callable))
+        {
+            return AnyValue::from_async_iterator((*func)(thisVal, std::vector<AnyValue>(args.begin(), args.end())));
+        }
+        else
+        {
+            return Constants::UNDEFINED;
+        }
+    }
+
+    inline bool JsFunction::has_property(const std::string &key) const
+    {
+        if (props.find(key) != props.end())
+            return true;
+        if (!proto.is_null() && !proto.is_undefined())
+        {
+            if (proto.has_property(key))
+                return true;
+        }
+        if (FunctionPrototypes::get(key).has_value())
+            return true;
+        return false;
+    }
+
+    inline AnyValue JsFunction::get_property(const std::string &key, AnyValue thisVal)
+    {
+        auto it = props.find(key);
+        if (it == props.end())
+        {
+            if (!proto.is_null() && !proto.is_undefined())
+            {
+                if (proto.has_property(key))
+                {
+                    return proto.get_property_with_receiver(key, thisVal);
+                }
+            }
+
+            auto proto_it = FunctionPrototypes::get(key);
+            if (proto_it.has_value())
+            {
+                return AnyValue::resolve_property_for_read(proto_it.value(), thisVal, key);
+            }
+            return Constants::UNDEFINED;
+        }
+        return AnyValue::resolve_property_for_read(it->second, thisVal, key);
+    }
+
+    inline AnyValue JsFunction::set_property(const std::string &key, AnyValue value, AnyValue thisVal)
+    {
+        auto proto_it = FunctionPrototypes::get(key);
+        if (proto_it.has_value())
+        {
+            auto proto_value = proto_it.value();
+            if (proto_value.is_accessor_descriptor())
+            {
+                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
+            }
+            if (proto_value.is_data_descriptor() && !proto_value.as_data_descriptor()->writable)
+            {
+                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
+            }
+        }
+
+        auto it = props.find(key);
+        if (it != props.end())
+        {
+            return AnyValue::resolve_property_for_write(it->second, thisVal, value, key);
+        }
+        else
+        {
+            props[key] = value;
+            return value;
+        }
+    }
 }

package/src/prelude/values/helpers/iterator.hpp

@@ -1,108 +1,145 @@
-#pragma once
-
-#include "types.hpp"
-#include "values/iterator.hpp"
-#include "any_value.hpp"
-#include "values/prototypes/iterator.hpp"
-
-template <typename T>
-std::string jspp::JsIterator<T>::to_std_string() const
-{
-    return "[object Generator]";
-}
-
-template <typename T>
-typename jspp::JsIterator<T>::NextResult jspp::JsIterator<T>::next(const T &val)
-{
-    // If the generator is already finished or invalid, return {undefined, true}
-    if (!handle || handle.done())
-        return {std::nullopt, true};
-
-    handle.promise().input_value = val;
-
-    // Resume execution until next co_yield or co_return
-    handle.resume();
-
-    if (handle.promise().exception_)
-    {
-        std::rethrow_exception(handle.promise().exception_);
-    }
-
-    // If handle.done() is TRUE, we hit co_return (value: X, done: true)
-    // If handle.done() is FALSE, we hit co_yield (value: X, done: false)
-    bool is_done = handle.done();
-
-    return {handle.promise().current_value, is_done};
-}
-
-template <typename T>
-std::vector<T> jspp::JsIterator<T>::to_vector()
-{
-    std::vector<T> result;
-    while (true)
-    {
-        auto next_res = this->next();
-        if (next_res.done)
-        {
-            break;
-        }
-        result.push_back(next_res.value.value_or(Constants::UNDEFINED));
-    }
-    return result;
-}
-
-template <typename T>
-jspp::AnyValue jspp::JsIterator<T>::get_property(const std::string &key, const AnyValue &thisVal)
-{
-    auto it = props.find(key);
-    if (it == props.end())
-    {
-        // check prototype
-        if constexpr (std::is_same_v<T, AnyValue>)
-        {
-            auto proto_it = IteratorPrototypes::get(key);
-            if (proto_it.has_value())
-            {
-                return AnyValue::resolve_property_for_read(proto_it.value(), thisVal, key);
-            }
-        }
-        // prototype not found
-        return Constants::UNDEFINED;
-    }
-
-    return AnyValue::resolve_property_for_read(it->second, thisVal, key);
-}
-
-template <typename T>
-jspp::AnyValue jspp::JsIterator<T>::set_property(const std::string &key, const AnyValue &value, const AnyValue &thisVal)
-{
-    // set prototype property if accessor descriptor
-    if constexpr (std::is_same_v<T, AnyValue>)
-    {
-        auto proto_it = IteratorPrototypes::get(key);
-        if (proto_it.has_value())
-        {
-            auto proto_value = proto_it.value();
-            if (proto_value.is_accessor_descriptor())
-            {
-                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
-            }
-            if (proto_value.is_data_descriptor() && !proto_value.as_data_descriptor()->writable)
-            {
-                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
-            }
-        }
-    }
-
-    // set own property
-    auto it = props.find(key);
-    if (it != props.end())
-    {
-        return jspp::AnyValue::resolve_property_for_write(it->second, thisVal, value, key);
-    }
-    else
-    {
-        props[key] = value;
-        return value;
-    }
+#pragma once
+
+#include "types.hpp"
+#include "values/iterator.hpp"
+#include "any_value.hpp"
+#include "values/prototypes/iterator.hpp"
+
+template <typename T>
+std::string jspp::JsIterator<T>::to_std_string() const
+{
+    return "[object Generator]";
+}
+
+template <typename T>
+typename jspp::JsIterator<T>::NextResult jspp::JsIterator<T>::next(const T &val)
+{
+    // If the generator is already finished or invalid, return {undefined, true}
+    if (!handle || handle.done())
+        return {std::nullopt, true};
+
+    handle.promise().input_value = val;
+
+    // Resume execution until next co_yield or co_return
+    handle.resume();
+
+    if (handle.promise().exception_)
+    {
+        std::rethrow_exception(handle.promise().exception_);
+    }
+
+    // If handle.done() is TRUE, we hit co_return (value: X, done: true)
+    // If handle.done() is FALSE, we hit co_yield (value: X, done: false)
+    bool is_done = handle.done();
+
+    return {handle.promise().current_value, is_done};
+}
+
+template <typename T>
+typename jspp::JsIterator<T>::NextResult jspp::JsIterator<T>::return_(const T &val)
+{
+    if (!handle || handle.done())
+        return {val, true};
+
+    handle.promise().pending_return = true;
+    handle.promise().current_value = val;
+    handle.resume();
+
+    if (handle.promise().exception_)
+    {
+        std::rethrow_exception(handle.promise().exception_);
+    }
+
+    return {handle.promise().current_value, true};
+}
+
+template <typename T>
+typename jspp::JsIterator<T>::NextResult jspp::JsIterator<T>::throw_(const AnyValue &err)
+{
+    if (!handle || handle.done()) {
+        throw Exception(err);
+    }
+
+    handle.promise().pending_exception = std::make_exception_ptr(Exception(err));
+    handle.resume();
+
+    if (handle.promise().exception_)
+    {
+        std::rethrow_exception(handle.promise().exception_);
+    }
+
+    bool is_done = handle.done();
+    return {handle.promise().current_value, is_done};
+}
+
+template <typename T>
+std::vector<T> jspp::JsIterator<T>::to_vector()
+{
+    std::vector<T> result;
+    while (true)
+    {
+        auto next_res = this->next();
+        if (next_res.done)
+        {
+            break;
+        }
+        result.push_back(next_res.value.value_or(Constants::UNDEFINED));
+    }
+    return result;
+}
+
+template <typename T>
+jspp::AnyValue jspp::JsIterator<T>::get_property(const std::string &key, AnyValue thisVal)
+{
+    auto it = props.find(key);
+    if (it == props.end())
+    {
+        // check prototype
+        if constexpr (std::is_same_v<T, AnyValue>)
+        {
+            auto proto_it = IteratorPrototypes::get(key);
+            if (proto_it.has_value())
+            {
+                return AnyValue::resolve_property_for_read(proto_it.value(), thisVal, key);
+            }
+        }
+        // prototype not found
+        return Constants::UNDEFINED;
+    }
+
+    return AnyValue::resolve_property_for_read(it->second, thisVal, key);
+}
+
+template <typename T>
+jspp::AnyValue jspp::JsIterator<T>::set_property(const std::string &key, AnyValue value, AnyValue thisVal)
+{
+    // set prototype property if accessor descriptor
+    if constexpr (std::is_same_v<T, AnyValue>)
+    {
+        auto proto_it = IteratorPrototypes::get(key);
+        if (proto_it.has_value())
+        {
+            auto proto_value = proto_it.value();
+            if (proto_value.is_accessor_descriptor())
+            {
+                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
+            }
+            if (proto_value.is_data_descriptor() && !proto_value.as_data_descriptor()->writable)
+            {
+                return AnyValue::resolve_property_for_write(proto_value, thisVal, value, key);
+            }
+        }
+    }
+
+    // set own property
+    auto it = props.find(key);
+    if (it != props.end())
+    {
+        return jspp::AnyValue::resolve_property_for_write(it->second, thisVal, value, key);
+    }
+    else
+    {
+        props[key] = value;
+        return value;
+    }
 }