@ugo-studio/jspp 0.1.8 → 0.2.0

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

@@ -1,107 +1,108 @@
-#pragma once
-
-#include "types.hpp"
-#include "values/iterator.hpp"
-#include "any_value.hpp"
-
-template <typename T>
-std::string jspp::JsIterator<T>::to_std_string() const
-{
-    return "[object Generator]";
-}
-
-template <typename T>
-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 = this->next();
-        if (next.done)
-        {
-            break;
-        }
-        result.push_back(next.value.value_or(AnyValue::make_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, this);
-            if (proto_it.has_value())
-            {
-                return AnyValue::resolve_property_for_read(proto_it.value(), thisVal, key);
-            }
-        }
-        // prototype not found
-        return jspp::AnyValue::make_undefined();
-    }
-
-    return jspp::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, this);
-        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>
+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, this);
+            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, this);
+        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;
+    }
+}

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

@@ -1,109 +1,104 @@
-#pragma once
-
-#include "types.hpp"
-#include "values/object.hpp"
-#include "any_value.hpp"
-
-namespace jspp {
-    JsObject::JsObject() : shape(Shape::empty_shape()), proto(nullptr) {}
-
-    JsObject::JsObject(std::initializer_list<std::pair<std::string, AnyValue>> p, std::shared_ptr<AnyValue> pr) : proto(pr) {
-        shape = Shape::empty_shape();
-        storage.reserve(p.size());
-        for (const auto& pair : p) {
-            shape = shape->transition(pair.first);
-            storage.push_back(pair.second);
-        }
-    }
-
-    JsObject::JsObject(const std::map<std::string, AnyValue> &p, std::shared_ptr<AnyValue> pr) : proto(pr) {
-        shape = Shape::empty_shape();
-        storage.reserve(p.size());
-        for (const auto& pair : p) {
-            shape = shape->transition(pair.first);
-            storage.push_back(pair.second);
-        }
-    }
-}
-
-std::string jspp::JsObject::to_std_string() const
-{
-    return "[Object Object]";
-}
-
-bool jspp::JsObject::has_property(const std::string &key) const
-{
-    if (deleted_keys.count(key)) return false;
-
-    if (shape->get_offset(key).has_value())
-        return true;
-    if (proto && !(*proto).is_null() && !(*proto).is_undefined())
-    {
-        if ((*proto).has_property(key))
-            return true;
-    }
-    if (ObjectPrototypes::get(key, const_cast<JsObject *>(this)).has_value())
-        return true;
-    return false;
-}
-
-jspp::AnyValue jspp::JsObject::get_property(const std::string &key, const AnyValue &thisVal)
-{
-    if (deleted_keys.count(key)) return AnyValue::make_undefined();
-
-    auto offset = shape->get_offset(key);
-    if (!offset.has_value())
-    {
-        // check prototype chain
-        if (proto && !(*proto).is_null() && !(*proto).is_undefined())
-        {
-            if ((*proto).has_property(key))
-            {
-                return (*proto).get_property_with_receiver(key, thisVal);
-            }
-        }
-
-        // check built-in prototype methods (Object.prototype)
-        auto proto_it = ObjectPrototypes::get(key, this);
-        if (proto_it.has_value())
-        {
-            return AnyValue::resolve_property_for_read(proto_it.value(), thisVal, key);
-        }
-        // not found
-        return AnyValue::make_undefined();
-    }
-    return AnyValue::resolve_property_for_read(storage[offset.value()], thisVal, key);
-}
-
-jspp::AnyValue jspp::JsObject::set_property(const std::string &key, const AnyValue &value, const AnyValue &thisVal)
-{
-    // set prototype property if accessor descriptor
-    auto proto_it = ObjectPrototypes::get(key, this);
-    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
-    if (deleted_keys.count(key)) deleted_keys.erase(key);
-
-    auto offset = shape->get_offset(key);
-    if (offset.has_value())
-    {
-        return AnyValue::resolve_property_for_write(storage[offset.value()], thisVal, value, key);
-    }
-    else
-    {
-        shape = shape->transition(key);
-        storage.push_back(value);
-        return value;
-    }
-}
+#pragma once
+
+#include "types.hpp"
+#include "values/object.hpp"
+#include "any_value.hpp"
+
+namespace jspp {
+    inline JsObject::JsObject() : shape(Shape::empty_shape()), proto(Constants::Null) {}
+
+    inline JsObject::JsObject(std::initializer_list<std::pair<std::string, AnyValue>> p, AnyValue pr) : proto(pr) {
+        shape = Shape::empty_shape();
+        storage.reserve(p.size());
+        for (const auto& pair : p) {
+            shape = shape->transition(pair.first);
+            storage.push_back(pair.second);
+        }
+    }
+
+    inline JsObject::JsObject(const std::map<std::string, AnyValue> &p, AnyValue pr) : proto(pr) {
+        shape = Shape::empty_shape();
+        storage.reserve(p.size());
+        for (const auto& pair : p) {
+            shape = shape->transition(pair.first);
+            storage.push_back(pair.second);
+        }
+    }
+}
+
+inline std::string jspp::JsObject::to_std_string() const
+{
+    return "[Object Object]";
+}
+
+inline bool jspp::JsObject::has_property(const std::string &key) const
+{
+    if (deleted_keys.count(key)) return false;
+
+    if (shape->get_offset(key).has_value())
+        return true;
+    if (!proto.is_null() && !proto.is_undefined())
+    {
+        if (proto.has_property(key))
+            return true;
+    }
+    if (ObjectPrototypes::get(key, const_cast<JsObject *>(this)).has_value())
+        return true;
+    return false;
+}
+
+inline jspp::AnyValue jspp::JsObject::get_property(const std::string &key, const AnyValue &thisVal)
+{
+    if (deleted_keys.count(key)) return Constants::UNDEFINED;
+
+    auto offset = shape->get_offset(key);
+    if (!offset.has_value())
+    {
+        if (!proto.is_null() && !proto.is_undefined())
+        {
+            if (proto.has_property(key))
+            {
+                return proto.get_property_with_receiver(key, thisVal);
+            }
+        }
+
+        auto proto_it = ObjectPrototypes::get(key, this);
+        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(storage[offset.value()], thisVal, key);
+}
+
+inline jspp::AnyValue jspp::JsObject::set_property(const std::string &key, const AnyValue &value, const AnyValue &thisVal)
+{
+    auto proto_it = ObjectPrototypes::get(key, this);
+    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);
+        }
+    }
+
+    if (deleted_keys.count(key)) deleted_keys.erase(key);
+
+    auto offset = shape->get_offset(key);
+    if (offset.has_value())
+    {
+        return AnyValue::resolve_property_for_write(storage[offset.value()], thisVal, value, key);
+    }
+    else
+    {
+        shape = shape->transition(key);
+        storage.push_back(value);
+        return value;
+    }
+}