@ugo-studio/jspp 0.1.9 → 0.2.0

package/src/prelude/any_value_access.hpp

@@ -1,190 +1,170 @@
-#pragma once
-
-#include "types.hpp"
-#include "any_value.hpp"
-
-namespace jspp
-{
-    AnyValue AnyValue::get_own_property(const std::string &key) const
-    {
-        return get_property_with_receiver(key, *this);
-    }
-    bool AnyValue::has_property(const std::string &key) const
-    {
-        switch (get_type())
-        {
-        case JsType::Object:
-            return std::get<std::shared_ptr<JsObject>>(storage)->has_property(key);
-        case JsType::Array:
-            return std::get<std::shared_ptr<JsArray>>(storage)->has_property(key);
-        case JsType::Function:
-            return std::get<std::shared_ptr<JsFunction>>(storage)->has_property(key);
-        case JsType::Promise:
-            // Promises don't have their own props usually, but could.
-            return false;
-        case JsType::Iterator:
-            return false;
-        case JsType::AsyncIterator:
-            return false;
-        case JsType::Symbol:
-            return false;
-        case JsType::String:
-            if (key == "length")
-                return true;
-            if (JsArray::is_array_index(key))
-            {
-                uint32_t idx = static_cast<uint32_t>(std::stoull(key));
-                return idx < std::get<std::shared_ptr<JsString>>(storage)->value.length();
-            }
-            return false;
-        case JsType::Number:
-            return false;
-        case JsType::Uninitialized:
-            Exception::throw_uninitialized_reference("#<Object>");
-            return false;
-        default:
-            return false;
-        }
-    }
-    AnyValue AnyValue::get_own_property(uint32_t idx) const
-    {
-        switch (storage.index())
-        {
-        case 7: // Array
-            return std::get<std::shared_ptr<JsArray>>(storage)->get_property(idx);
-        case 5: // String
-            return std::get<std::shared_ptr<JsString>>(storage)->get_property(idx);
-        case 4: // Number
-            return get_own_property(std::to_string(idx));
-        default:
-            return get_own_property(std::to_string(idx));
-        }
-    }
-    AnyValue AnyValue::get_own_property(const AnyValue &key) const
-    {
-        if (key.is_number() && is_array())
-            return std::get<std::shared_ptr<JsArray>>(storage)->get_property(key.as_double());
-        if (key.is_number() && is_string())
-            return std::get<std::shared_ptr<JsString>>(storage)->get_property(key.as_double());
-
-        // If the key is a Symbol, use its internal key string
-        if (key.is_symbol())
-            return get_own_property(key.as_symbol()->key);
-
-        return get_own_property(key.to_std_string());
-    }
-
-    AnyValue AnyValue::get_property_with_receiver(const std::string &key, const AnyValue &receiver) const
-    {
-        switch (get_type())
-        {
-        case JsType::Object:
-            return std::get<std::shared_ptr<JsObject>>(storage)->get_property(key, receiver);
-        case JsType::Array:
-            return std::get<std::shared_ptr<JsArray>>(storage)->get_property(key, receiver);
-        case JsType::Function:
-            return std::get<std::shared_ptr<JsFunction>>(storage)->get_property(key, receiver);
-        case JsType::Promise:
-            return std::get<std::shared_ptr<JsPromise>>(storage)->get_property(key, receiver);
-        case JsType::Iterator:
-            return std::get<std::shared_ptr<JsIterator<AnyValue>>>(storage)->get_property(key, receiver);
-        case JsType::AsyncIterator:
-            return std::get<std::shared_ptr<JsAsyncIterator<AnyValue>>>(storage)->get_property(key, receiver);
-        case JsType::Symbol:
-            return std::get<std::shared_ptr<JsSymbol>>(storage)->get_property(key, receiver);
-        case JsType::String:
-            return std::get<std::shared_ptr<JsString>>(storage)->get_property(key, receiver);
-        case JsType::Number:
-        {
-            auto proto_it = NumberPrototypes::get(key, std::get<double>(storage));
-            if (proto_it.has_value())
-            {
-                return AnyValue::resolve_property_for_read(proto_it.value(), receiver, key);
-            }
-            return AnyValue::make_undefined();
-        }
-        case JsType::Undefined:
-            throw Exception::make_exception("Cannot read properties of undefined (reading '" + key + "')", "TypeError");
-        case JsType::Null:
-            throw Exception::make_exception("Cannot read properties of null (reading '" + key + "')", "TypeError");
-        case JsType::Uninitialized:
-            Exception::throw_uninitialized_reference("#<Object>");
-        default:
-            return AnyValue::make_undefined();
-        }
-    }
-
-    AnyValue AnyValue::set_own_property(const std::string &key, const AnyValue &value) const
-    {
-        switch (get_type())
-        {
-        case JsType::Object:
-            return std::get<std::shared_ptr<JsObject>>(storage)->set_property(key, value, *this);
-        case JsType::Array:
-            return std::get<std::shared_ptr<JsArray>>(storage)->set_property(key, value, *this);
-        case JsType::Function:
-            return std::get<std::shared_ptr<JsFunction>>(storage)->set_property(key, value, *this);
-        case JsType::Promise:
-            return std::get<std::shared_ptr<JsPromise>>(storage)->set_property(key, value, *this);
-        case JsType::Undefined:
-            throw Exception::make_exception("Cannot set properties of undefined (setting '" + key + "')", "TypeError");
-        case JsType::Null:
-            throw Exception::make_exception("Cannot set properties of null (setting '" + key + "')", "TypeError");
-        default:
-            return value;
-        }
-    }
-    AnyValue AnyValue::set_own_property(uint32_t idx, const AnyValue &value) const
-    {
-        if (is_array())
-        {
-            return std::get<std::shared_ptr<JsArray>>(storage)->set_property(idx, value);
-        }
-        return set_own_property(std::to_string(idx), value);
-    }
-    AnyValue AnyValue::set_own_property(const AnyValue &key, const AnyValue &value) const
-    {
-        if (key.is_number() && is_array())
-        {
-            return std::get<std::shared_ptr<JsArray>>(storage)->set_property(key.as_double(), value);
-        }
-
-        // If the key is a Symbol, use its internal key string
-        if (key.is_symbol())
-            return set_own_property(key.as_symbol()->key, value);
-
-        return set_own_property(key.to_std_string(), value);
-    }
-
-    AnyValue AnyValue::call_own_property(const std::string &key, std::span<const AnyValue> args) const
-    {
-        return get_own_property(key).call((*this), args, key);
-    }
-    AnyValue AnyValue::call_own_property(uint32_t idx, std::span<const AnyValue> args) const
-    {
-        switch (storage.index())
-        {
-        case 7: // Array
-            return std::get<std::shared_ptr<JsArray>>(storage)->get_property(idx).call((*this), args, "[" + std::to_string(idx) + "]");
-        case 5: // String
-            return std::get<std::shared_ptr<JsString>>(storage)->get_property(idx).call((*this), args, "[" + std::to_string(idx) + "]");
-        case 4: // Number
-            return call_own_property(std::to_string(idx), args);
-        default:
-            return call_own_property(std::to_string(idx), args);
-        }
-    }
-    AnyValue AnyValue::call_own_property(const AnyValue &key, std::span<const AnyValue> args) const
-    {
-        if (key.is_number() && is_array())
-            return std::get<std::shared_ptr<JsArray>>(storage)->get_property(key.as_double()).call((*this), args, "[" + key.to_std_string() + "]");
-        if (key.is_number() && is_string())
-            return std::get<std::shared_ptr<JsString>>(storage)->get_property(key.as_double()).call((*this), args, "[" + key.to_std_string() + "]");
-
-        // If the key is a Symbol, use its internal key string
-        if (key.is_symbol())
-            return call_own_property(key.as_symbol()->key, args);
-
-        return call_own_property(key.to_std_string(), args);
-    }
-}
+#pragma once
+
+#include "types.hpp"
+#include "any_value.hpp"
+
+namespace jspp
+{
+    inline AnyValue AnyValue::get_own_property(const std::string &key) const
+    {
+        return get_property_with_receiver(key, *this);
+    }
+    inline bool AnyValue::has_property(const std::string &key) const
+    {
+        switch (get_type())
+        {
+        case JsType::Object:
+            return as_object()->has_property(key);
+        case JsType::Array:
+            return as_array()->has_property(key);
+        case JsType::Function:
+            return as_function()->has_property(key);
+        case JsType::Promise:
+            return false;
+        case JsType::Iterator:
+            return false;
+        case JsType::AsyncIterator:
+            return false;
+        case JsType::Symbol:
+            return false;
+        case JsType::String:
+            if (key == "length")
+                return true;
+            if (JsArray::is_array_index(key))
+            {
+                uint32_t idx = static_cast<uint32_t>(std::stoull(key));
+                return idx < as_string()->value.length();
+            }
+            return false;
+        case JsType::Number:
+            return false;
+        case JsType::Uninitialized:
+            Exception::throw_uninitialized_reference("#<Object>");
+            return false;
+        default:
+            return false;
+        }
+    }
+    inline AnyValue AnyValue::get_own_property(uint32_t idx) const
+    {
+        if (is_array()) return as_array()->get_property(idx);
+        if (is_string()) return as_string()->get_property(idx);
+        return get_own_property(std::to_string(idx));
+    }
+    inline AnyValue AnyValue::get_own_property(const AnyValue &key) const
+    {
+        if (key.is_number() && is_array())
+            return as_array()->get_property(key.as_double());
+        if (key.is_number() && is_string())
+            return as_string()->get_property(key.as_double());
+
+        if (key.is_symbol())
+            return get_own_property(key.as_symbol()->key);
+
+        return get_own_property(key.to_std_string());
+    }
+
+    inline AnyValue AnyValue::get_property_with_receiver(const std::string &key, const AnyValue &receiver) const
+    {
+        switch (get_type())
+        {
+        case JsType::Object:
+            return as_object()->get_property(key, receiver);
+        case JsType::Array:
+            return as_array()->get_property(key, receiver);
+        case JsType::Function:
+            return as_function()->get_property(key, receiver);
+        case JsType::Promise:
+            return as_promise()->get_property(key, receiver);
+        case JsType::Iterator:
+            return static_cast<JsIterator<AnyValue>*>(get_ptr())->get_property(key, receiver);
+        case JsType::AsyncIterator:
+            return static_cast<JsAsyncIterator<AnyValue>*>(get_ptr())->get_property(key, receiver);
+        case JsType::Symbol:
+            return as_symbol()->get_property(key, receiver);
+        case JsType::String:
+            return as_string()->get_property(key, receiver);
+        case JsType::Number:
+        {
+            auto proto_it = NumberPrototypes::get(key, as_double());
+            if (proto_it.has_value())
+            {
+                return AnyValue::resolve_property_for_read(proto_it.value(), receiver, key);
+            }
+            return Constants::UNDEFINED;
+        }
+        case JsType::Undefined:
+            throw Exception::make_exception("Cannot read properties of undefined (reading '" + key + "')", "TypeError");
+        case JsType::Null:
+            throw Exception::make_exception("Cannot read properties of null (reading '" + key + "')", "TypeError");
+        case JsType::Uninitialized:
+            Exception::throw_uninitialized_reference("#<Object>");
+        default:
+            return Constants::UNDEFINED;
+        }
+    }
+
+    inline AnyValue AnyValue::set_own_property(const std::string &key, const AnyValue &value) const
+    {
+        switch (get_type())
+        {
+        case JsType::Object:
+            return as_object()->set_property(key, value, *this);
+        case JsType::Array:
+            return as_array()->set_property(key, value, *this);
+        case JsType::Function:
+            return as_function()->set_property(key, value, *this);
+        case JsType::Promise:
+            return as_promise()->set_property(key, value, *this);
+        case JsType::Undefined:
+            throw Exception::make_exception("Cannot set properties of undefined (setting '" + key + "')", "TypeError");
+        case JsType::Null:
+            throw Exception::make_exception("Cannot set properties of null (setting '" + key + "')", "TypeError");
+        default:
+            return value;
+        }
+    }
+    inline AnyValue AnyValue::set_own_property(uint32_t idx, const AnyValue &value) const
+    {
+        if (is_array())
+        {
+            return as_array()->set_property(idx, value);
+        }
+        return set_own_property(std::to_string(idx), value);
+    }
+    inline AnyValue AnyValue::set_own_property(const AnyValue &key, const AnyValue &value) const
+    {
+        if (key.is_number() && is_array())
+        {
+            return as_array()->set_property(key.as_double(), value);
+        }
+
+        if (key.is_symbol())
+            return set_own_property(key.as_symbol()->key, value);
+
+        return set_own_property(key.to_std_string(), value);
+    }
+
+    inline AnyValue AnyValue::call_own_property(const std::string &key, std::span<const AnyValue> args) const
+    {
+        return get_own_property(key).call((*this), args, key);
+    }
+    inline AnyValue AnyValue::call_own_property(uint32_t idx, std::span<const AnyValue> args) const
+    {
+        if (is_array()) return as_array()->get_property(idx).call((*this), args, "[" + std::to_string(idx) + "]");
+        if (is_string()) return as_string()->get_property(idx).call((*this), args, "[" + std::to_string(idx) + "]");
+        return call_own_property(std::to_string(idx), args);
+    }
+    inline AnyValue AnyValue::call_own_property(const AnyValue &key, std::span<const AnyValue> args) const
+    {
+        if (key.is_number() && is_array())
+            return as_array()->get_property(key.as_double()).call((*this), args, "[" + key.to_std_string() + "]");
+        if (key.is_number() && is_string())
+            return as_string()->get_property(key.as_double()).call((*this), args, "[" + key.to_std_string() + "]");
+
+        if (key.is_symbol())
+            return call_own_property(key.as_symbol()->key, args);
+
+        return call_own_property(key.to_std_string(), args);
+    }
+}

package/src/prelude/any_value_defines.hpp

@@ -11,7 +11,7 @@ namespace jspp
     {
         if (is_object())
         {
-            auto obj = std::get<std::shared_ptr<JsObject>>(storage);
+            auto obj = as_object();
             auto offset = obj->shape->get_offset(key);
             if (offset.has_value())
             {
@@ -25,7 +25,7 @@ namespace jspp
         }
         else if (is_function())
         {
-            std::get<std::shared_ptr<JsFunction>>(storage)->props[key] = value;
+            as_function()->props[key] = value;
         }
     }
 
@@ -46,7 +46,7 @@ namespace jspp
     {
         if (is_object())
         {
-            auto obj = std::get<std::shared_ptr<JsObject>>(storage);
+            auto obj = as_object();
             auto offset = obj->shape->get_offset(key);
 
             if (offset.has_value())
@@ -81,7 +81,7 @@ namespace jspp
         }
         else if (is_function())
         {
-            auto &props = std::get<std::shared_ptr<JsFunction>>(storage)->props;
+            auto &props = as_function()->props;
             auto it = props.find(key);
             if (it != props.end() && it->second.is_accessor_descriptor())
             {
@@ -114,7 +114,7 @@ namespace jspp
     {
         if (is_object())
         {
-            auto obj = std::get<std::shared_ptr<JsObject>>(storage);
+            auto obj = as_object();
             auto offset = obj->shape->get_offset(key);
 
             if (offset.has_value())
@@ -126,7 +126,7 @@ namespace jspp
                     desc->set = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                     {
                         if (args.empty())
-                            return AnyValue::make_undefined();
+                            return Constants::UNDEFINED;
                         return setter.call(thisVal, args);
                     };
                 }
@@ -135,7 +135,7 @@ namespace jspp
                     auto setFunc = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                     {
                         if (args.empty())
-                            return AnyValue::make_undefined();
+                            return Constants::UNDEFINED;
                         return setter.call(thisVal, args);
                     };
                     obj->storage[offset.value()] = AnyValue::make_accessor_descriptor(std::nullopt, setFunc, true, true);
@@ -146,7 +146,7 @@ namespace jspp
                 auto setFunc = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
                     if (args.empty())
-                        return AnyValue::make_undefined();
+                        return Constants::UNDEFINED;
                     return setter.call(thisVal, args);
                 };
                 obj->shape = obj->shape->transition(key);
@@ -155,7 +155,7 @@ namespace jspp
         }
         else if (is_function())
         {
-            auto &props = std::get<std::shared_ptr<JsFunction>>(storage)->props;
+            auto &props = as_function()->props;
             auto it = props.find(key);
             if (it != props.end() && it->second.is_accessor_descriptor())
             {
@@ -163,7 +163,7 @@ namespace jspp
                 desc->set = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
                     if (args.empty())
-                        return AnyValue::make_undefined();
+                        return Constants::UNDEFINED;
                     return setter.call(thisVal, args);
                 };
             }
@@ -172,7 +172,7 @@ namespace jspp
                 auto setFunc = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
                     if (args.empty())
-                        return AnyValue::make_undefined();
+                        return Constants::UNDEFINED;
                     return setter.call(thisVal, args);
                 };
                 props[key] = AnyValue::make_accessor_descriptor(std::nullopt, setFunc, true, true);
@@ -187,4 +187,4 @@ namespace jspp
         else
             define_setter(key.to_std_string(), setter);
     }
-}
+}