@ugo-studio/jspp 0.1.4 → 0.1.5

package/src/prelude/any_value_access.hpp

@@ -7,54 +7,102 @@ jspp::AnyValue jspp::AnyValue::get_own_property(const std::string &key) const
 {
     return get_property_with_receiver(key, *this);
 }
-jspp::AnyValue jspp::AnyValue::get_own_property(uint32_t idx) const noexcept
+bool jspp::AnyValue::has_property(const std::string &key) const
 {
-    switch (storage.type)
+    switch (get_type())
     {
+    case JsType::Object:
+        return std::get<std::shared_ptr<JsObject>>(storage)->has_property(key);
     case JsType::Array:
-        return storage.array->get_property(idx);
+        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::Symbol:
+        return false;
     case JsType::String:
-        return storage.str->get_property(idx);
+        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;
+    }
+}
+jspp::AnyValue jspp::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));
     }
 }
-jspp::AnyValue jspp::AnyValue::get_own_property(const AnyValue &key) const noexcept
+jspp::AnyValue jspp::AnyValue::get_own_property(const AnyValue &key) const
 {
-    if (key.storage.type == JsType::Number && storage.type == JsType::Array)
-        return storage.array->get_property(key.storage.number);
-    if (key.storage.type == JsType::Number && storage.type == JsType::String)
-        return storage.str->get_property(key.storage.number);
+    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.storage.type == JsType::Symbol)
-        return get_own_property(key.storage.symbol->key);
+    if (key.is_symbol())
+        return get_own_property(key.as_symbol()->key);
 
     return get_own_property(key.to_std_string());
 }
 
 jspp::AnyValue jspp::AnyValue::get_property_with_receiver(const std::string &key, const AnyValue &receiver) const
 {
-    switch (storage.type)
+    switch (get_type())
     {
     case JsType::Object:
-        return storage.object->get_property(key, receiver);
+        return std::get<std::shared_ptr<JsObject>>(storage)->get_property(key, receiver);
     case JsType::Array:
-        return storage.array->get_property(key, receiver);
+        return std::get<std::shared_ptr<JsArray>>(storage)->get_property(key, receiver);
     case JsType::Function:
-        return storage.function->get_property(key, receiver);
+        return std::get<std::shared_ptr<JsFunction>>(storage)->get_property(key, receiver);
     case JsType::Promise:
-        return storage.promise->get_property(key, receiver);
+        return std::get<std::shared_ptr<JsPromise>>(storage)->get_property(key, receiver);
     case JsType::Iterator:
-        return storage.iterator->get_property(key, receiver);
+        return std::get<std::shared_ptr<JsIterator<AnyValue>>>(storage)->get_property(key, receiver);
     case JsType::Symbol:
-        return storage.symbol->get_property(key, receiver);
+        return std::get<std::shared_ptr<JsSymbol>>(storage)->get_property(key, receiver);
     case JsType::String:
-        return storage.str->get_property(key, receiver);
+        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();
     }
@@ -62,16 +110,16 @@ jspp::AnyValue jspp::AnyValue::get_property_with_receiver(const std::string &key
 
 jspp::AnyValue jspp::AnyValue::set_own_property(const std::string &key, const AnyValue &value) const
 {
-    switch (storage.type)
+    switch (get_type())
     {
     case JsType::Object:
-        return storage.object->set_property(key, value, *this);
+        return std::get<std::shared_ptr<JsObject>>(storage)->set_property(key, value, *this);
     case JsType::Array:
-        return storage.array->set_property(key, value, *this);
+        return std::get<std::shared_ptr<JsArray>>(storage)->set_property(key, value, *this);
     case JsType::Function:
-        return storage.function->set_property(key, value, *this);
+        return std::get<std::shared_ptr<JsFunction>>(storage)->set_property(key, value, *this);
     case JsType::Promise:
-        return storage.promise->set_property(key, value, *this);
+        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:
@@ -82,22 +130,22 @@ jspp::AnyValue jspp::AnyValue::set_own_property(const std::string &key, const An
 }
 jspp::AnyValue jspp::AnyValue::set_own_property(uint32_t idx, const AnyValue &value) const
 {
-    if (storage.type == JsType::Array)
+    if (is_array())
     {
-        return storage.array->set_property(idx, value);
+        return std::get<std::shared_ptr<JsArray>>(storage)->set_property(idx, value);
     }
     return set_own_property(std::to_string(idx), value);
 }
 jspp::AnyValue jspp::AnyValue::set_own_property(const AnyValue &key, const AnyValue &value) const
 {
-    if (key.storage.type == JsType::Number && storage.type == JsType::Array)
+    if (key.is_number() && is_array())
     {
-        return storage.array->set_property(key.storage.number, value);
+        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.storage.type == JsType::Symbol)
-        return set_own_property(key.storage.symbol->key, value);
+    if (key.is_symbol())
+        return set_own_property(key.as_symbol()->key, value);
 
     return set_own_property(key.to_std_string(), value);
 }

package/src/prelude/any_value_defines.hpp

@@ -7,16 +7,25 @@
 
 namespace jspp
 {
-
     inline void AnyValue::define_data_property(const std::string &key, const AnyValue &value)
     {
         if (is_object())
         {
-            storage.object->props[key] = value;
+            auto obj = std::get<std::shared_ptr<JsObject>>(storage);
+            auto offset = obj->shape->get_offset(key);
+            if (offset.has_value())
+            {
+                obj->storage[offset.value()] = value;
+            }
+            else
+            {
+                obj->shape = obj->shape->transition(key);
+                obj->storage.push_back(value);
+            }
         }
         else if (is_function())
         {
-            storage.function->props[key] = value;
+            std::get<std::shared_ptr<JsFunction>>(storage)->props[key] = value;
         }
     }
 
@@ -37,42 +46,56 @@ namespace jspp
     {
         if (is_object())
         {
-            auto &props = storage.object->props;
-            auto it = props.find(key);
-            if (it != props.end() && it->second.is_accessor_descriptor())
+            auto obj = std::get<std::shared_ptr<JsObject>>(storage);
+            auto offset = obj->shape->get_offset(key);
+
+            if (offset.has_value())
             {
-                auto desc = it->second.as_accessor_descriptor();
-                desc->get = [getter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                auto &val = obj->storage[offset.value()];
+                if (val.is_accessor_descriptor())
                 {
-                    return getter.as_function()->call(thisVal, args);
-                };
+                    auto desc = val.as_accessor_descriptor();
+                    desc->get = [getter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
+                    {
+                        return getter.call(thisVal, args);
+                    };
+                }
+                else
+                {
+                    auto getFunc = [getter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
+                    {
+                        return getter.call(thisVal, args);
+                    };
+                    obj->storage[offset.value()] = AnyValue::make_accessor_descriptor(getFunc, std::nullopt, true, true);
+                }
             }
             else
             {
-                auto getFunc = [getter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                auto getFunc = [getter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
-                    return getter.as_function()->call(thisVal, args);
+                    return getter.call(thisVal, args);
                 };
-                props[key] = AnyValue::make_accessor_descriptor(getFunc, std::nullopt, true, true);
+                obj->shape = obj->shape->transition(key);
+                obj->storage.push_back(AnyValue::make_accessor_descriptor(getFunc, std::nullopt, true, true));
             }
         }
         else if (is_function())
         {
-            auto &props = storage.function->props;
+            auto &props = std::get<std::shared_ptr<JsFunction>>(storage)->props;
             auto it = props.find(key);
             if (it != props.end() && it->second.is_accessor_descriptor())
             {
                 auto desc = it->second.as_accessor_descriptor();
-                desc->get = [getter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                desc->get = [getter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
-                    return getter.as_function()->call(thisVal, args);
+                    return getter.call(thisVal, args);
                 };
             }
             else
             {
-                auto getFunc = [getter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                auto getFunc = [getter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
-                    return getter.as_function()->call(thisVal, args);
+                    return getter.call(thisVal, args);
                 };
                 props[key] = AnyValue::make_accessor_descriptor(getFunc, std::nullopt, true, true);
             }
@@ -91,50 +114,66 @@ namespace jspp
     {
         if (is_object())
         {
-            auto &props = storage.object->props;
-            auto it = props.find(key);
-            if (it != props.end() && it->second.is_accessor_descriptor())
+            auto obj = std::get<std::shared_ptr<JsObject>>(storage);
+            auto offset = obj->shape->get_offset(key);
+
+            if (offset.has_value())
             {
-                auto desc = it->second.as_accessor_descriptor();
-                desc->set = [setter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                auto &val = obj->storage[offset.value()];
+                if (val.is_accessor_descriptor())
                 {
-                    if (args.empty())
-                        return AnyValue::make_undefined();
-                    return setter.as_function()->call(thisVal, args);
-                };
+                    auto desc = val.as_accessor_descriptor();
+                    desc->set = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
+                    {
+                        if (args.empty())
+                            return AnyValue::make_undefined();
+                        return setter.call(thisVal, args);
+                    };
+                }
+                else
+                {
+                    auto setFunc = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
+                    {
+                        if (args.empty())
+                            return AnyValue::make_undefined();
+                        return setter.call(thisVal, args);
+                    };
+                    obj->storage[offset.value()] = AnyValue::make_accessor_descriptor(std::nullopt, setFunc, true, true);
+                }
             }
             else
             {
-                auto setFunc = [setter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                auto setFunc = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
                     if (args.empty())
                         return AnyValue::make_undefined();
-                    return setter.as_function()->call(thisVal, args);
+                    return setter.call(thisVal, args);
                 };
-                props[key] = AnyValue::make_accessor_descriptor(std::nullopt, setFunc, true, true);
+                obj->shape = obj->shape->transition(key);
+                obj->storage.push_back(AnyValue::make_accessor_descriptor(std::nullopt, setFunc, true, true));
             }
         }
         else if (is_function())
         {
-            auto &props = storage.function->props;
+            auto &props = std::get<std::shared_ptr<JsFunction>>(storage)->props;
             auto it = props.find(key);
             if (it != props.end() && it->second.is_accessor_descriptor())
             {
                 auto desc = it->second.as_accessor_descriptor();
-                desc->set = [setter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                desc->set = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
                     if (args.empty())
                         return AnyValue::make_undefined();
-                    return setter.as_function()->call(thisVal, args);
+                    return setter.call(thisVal, args);
                 };
             }
             else
             {
-                auto setFunc = [setter](const AnyValue &thisVal, const std::vector<AnyValue> &args) -> AnyValue
+                auto setFunc = [setter](const AnyValue &thisVal, std::span<const AnyValue> args) -> AnyValue
                 {
                     if (args.empty())
                         return AnyValue::make_undefined();
-                    return setter.as_function()->call(thisVal, args);
+                    return setter.call(thisVal, args);
                 };
                 props[key] = AnyValue::make_accessor_descriptor(std::nullopt, setFunc, true, true);
             }

package/src/prelude/any_value_helpers.hpp

@@ -3,217 +3,60 @@
 #include "types.hpp"
 #include "any_value.hpp"
 #include "values/string.hpp"
+#include "exception.hpp"
 
 namespace jspp
 {
-    const bool AnyValue::is_truthy() const noexcept
+    std::string AnyValue::to_std_string() const
     {
-        switch (storage.type)
-        {
-        case JsType::Boolean:
-            return storage.boolean;
-        case JsType::Number:
-            return storage.number != 0.0;
-        case JsType::String:
-            return !storage.str->value.empty();
-        case JsType::Undefined:
-            return false;
-        case JsType::Null:
-            return false;
-        case JsType::Uninitialized:
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    const bool AnyValue::is_strictly_equal_to_primitive(const AnyValue &other) const noexcept
-    {
-        if (storage.type == other.storage.type)
-        {
-            switch (storage.type)
-            {
-            case JsType::Boolean:
-                return storage.boolean == other.storage.boolean;
-            case JsType::Number:
-                return storage.number == other.storage.number;
-            case JsType::String:
-                return (storage.str->value == other.storage.str->value);
-            case JsType::Array:
-                return (storage.array == other.storage.array);
-            case JsType::Object:
-                return (storage.object == other.storage.object);
-            case JsType::Function:
-                return (storage.function == other.storage.function);
-            case JsType::Iterator:
-                return (storage.iterator == other.storage.iterator);
-            case JsType::Promise:
-                return (storage.promise == other.storage.promise);
-            case JsType::Symbol:
-                // Symbols are unique by reference/pointer identity
-                return (storage.symbol == other.storage.symbol);
-            case JsType::DataDescriptor:
-                return storage.data_desc == other.storage.data_desc;
-            case JsType::AccessorDescriptor:
-                return storage.accessor_desc == other.storage.accessor_desc;
-            default:
-                return true;
-            }
-        }
-        return false;
-    }
-    const bool AnyValue::is_equal_to_primitive(const AnyValue &other) const noexcept
-    {
-        // Implements JavaScript's Abstract Equality Comparison Algorithm (==)
-        // Step 1: If types are the same, use strict equality (===)
-        if (storage.type == other.storage.type)
-        {
-            return is_strictly_equal_to_primitive(other);
-        }
-        // Steps 2 & 3: null == undefined
-        if ((is_null() && other.is_undefined()) || (is_undefined() && other.is_null()))
-        {
-            return true;
-        }
-        // Step 4 & 5: number == string
-        if (is_number() && other.is_string())
-        {
-            double num_this = this->as_double();
-            double num_other;
-            try
-            {
-                const std::string &s = other.as_string()->value;
-                // JS considers empty string or whitespace-only string to be 0
-                if (s.empty() || std::all_of(s.begin(), s.end(), [](unsigned char c)
-                                             { return std::isspace(c); }))
-                {
-                    num_other = 0.0;
-                }
-                else
-                {
-                    size_t pos;
-                    num_other = std::stod(s, &pos);
-                    // Check if the entire string was consumed, allowing for trailing whitespace
-                    while (pos < s.length() && std::isspace(static_cast<unsigned char>(s[pos])))
-                    {
-                        pos++;
-                    }
-                    if (pos != s.length())
-                    {
-                        num_other = std::numeric_limits<double>::quiet_NaN();
-                    }
-                }
-            }
-            catch (...)
-            {
-                num_other = std::numeric_limits<double>::quiet_NaN();
-            }
-            return num_this == num_other;
-        }
-        if (is_string() && other.is_number())
-        {
-            // Delegate to the other operand to avoid code duplication
-            return other.is_equal_to_primitive(*this);
-        }
-        // Step 6 & 7: boolean == any
-        if (is_boolean())
-        {
-            // Convert boolean to number and re-compare
-            return AnyValue::make_number(as_boolean() ? 1.0 : 0.0).is_equal_to_primitive(other);
-        }
-        if (other.is_boolean())
-        {
-            // Convert boolean to number and re-compare
-            return is_equal_to_primitive(AnyValue::make_number(other.as_boolean() ? 1.0 : 0.0));
-        }
-        // Step 8 & 9: object == (string or number or symbol)
-        // Simplified: Objects convert to primitives.
-        if ((is_object() || is_array() || is_function() || is_promise() || is_iterator()) && (other.is_string() || other.is_number() || other.is_symbol()))
-        {
-            // Convert object to primitive (string) and re-compare.
-            // This is a simplification of JS's ToPrimitive.
-            return AnyValue::make_string(to_std_string()).is_equal_to_primitive(other);
-        }
-        if ((other.is_object() || other.is_array() || other.is_function() || other.is_promise() || other.is_iterator()) && (is_string() || is_number() || is_symbol()))
-        {
-            return other.is_equal_to_primitive(*this);
-        }
-        // Step 10: Datacriptor or accessor descriptor
-        if (is_data_descriptor() || is_accessor_descriptor())
-        {
-            return (*this).is_strictly_equal_to_primitive(other);
-        }
-        // Step 11: All other cases (e.g., object == null) are false.
-        return false;
-    }
-
-    const AnyValue AnyValue::is_strictly_equal_to(const AnyValue &other) const noexcept
-    {
-        return AnyValue::make_boolean(is_strictly_equal_to_primitive(other));
-    }
-    const AnyValue AnyValue::is_equal_to(const AnyValue &other) const noexcept
-    {
-        return AnyValue::make_boolean(is_equal_to_primitive(other));
-    }
-
-    const AnyValue AnyValue::not_strictly_equal_to(const AnyValue &other) const noexcept
-    {
-        return AnyValue::make_boolean(!is_strictly_equal_to_primitive(other));
-    }
-    const AnyValue AnyValue::not_equal_to(const AnyValue &other) const noexcept
-    {
-        return AnyValue::make_boolean(!is_equal_to_primitive(other));
-    }
-
-    const std::string AnyValue::to_std_string() const noexcept
-    {
-        switch (storage.type)
+        switch (get_type())
         {
         case JsType::Undefined:
             return "undefined";
         case JsType::Null:
             return "null";
         case JsType::Boolean:
-            return storage.boolean ? "true" : "false";
+            return std::get<bool>(storage) ? "true" : "false";
         case JsType::String:
-            return storage.str->to_std_string();
+            return std::get<std::shared_ptr<JsString>>(storage)->to_std_string();
         case JsType::Object:
-            return storage.object->to_std_string();
+            return std::get<std::shared_ptr<JsObject>>(storage)->to_std_string();
         case JsType::Array:
-            return storage.array->to_std_string();
+            return std::get<std::shared_ptr<JsArray>>(storage)->to_std_string();
         case JsType::Function:
-            return storage.function->to_std_string();
+            return std::get<std::shared_ptr<JsFunction>>(storage)->to_std_string();
         case JsType::Iterator:
-            return storage.iterator->to_std_string();
+            return std::get<std::shared_ptr<JsIterator<AnyValue>>>(storage)->to_std_string();
         case JsType::Promise:
-            return storage.promise->to_std_string();
+            return std::get<std::shared_ptr<JsPromise>>(storage)->to_std_string();
         case JsType::Symbol:
-            return storage.symbol->to_std_string();
+            return std::get<std::shared_ptr<JsSymbol>>(storage)->to_std_string();
         case JsType::DataDescriptor:
-            return storage.data_desc->value->to_std_string();
+            return std::get<std::shared_ptr<DataDescriptor>>(storage)->value->to_std_string();
         case JsType::AccessorDescriptor:
         {
-            if (storage.accessor_desc->get.has_value())
-                return storage.accessor_desc->get.value()(*this, {}).to_std_string();
+            if (std::get<std::shared_ptr<AccessorDescriptor>>(storage)->get.has_value())
+                return std::get<std::shared_ptr<AccessorDescriptor>>(storage)->get.value()(*this, {}).to_std_string();
             else
                 return "undefined";
         }
         case JsType::Number:
         {
-            if (std::isnan(storage.number))
+            double num = std::get<double>(storage);
+            if (std::isnan(num))
             {
                 return "NaN";
             }
-            if (std::abs(storage.number) >= 1e21 || (std::abs(storage.number) > 0 && std::abs(storage.number) < 1e-6))
+            if (std::abs(num) >= 1e21 || (std::abs(num) > 0 && std::abs(num) < 1e-6))
             {
                 std::ostringstream oss;
-                oss << std::scientific << std::setprecision(4) << storage.number;
+                oss << std::scientific << std::setprecision(4) << num;
                 return oss.str();
             }
             else
             {
                 std::ostringstream oss;
-                oss << std::setprecision(6) << std::fixed << storage.number;
+                oss << std::setprecision(6) << std::fixed << num;
                 std::string s = oss.str();
                 s.erase(s.find_last_not_of('0') + 1, std::string::npos);
                 if (!s.empty() && s.back() == '.')
@@ -223,9 +66,8 @@ namespace jspp
                 return s;
             }
         }
-        // Uninitialized and default should not be reached under normal circumstances
         case JsType::Uninitialized:
-            return "<uninitialized>";
+            Exception::throw_uninitialized_reference("#<Object>");
         default:
             return "";
         }
@@ -235,12 +77,63 @@ namespace jspp
     {
         if (is_object())
         {
-            storage.object->proto = std::make_shared<AnyValue>(proto);
+            std::get<std::shared_ptr<JsObject>>(storage)->proto = std::make_shared<AnyValue>(proto);
+        }
+        else if (is_array())
+        {
+            std::get<std::shared_ptr<JsArray>>(storage)->proto = std::make_shared<AnyValue>(proto);
         }
         else if (is_function())
         {
-            storage.function->proto = std::make_shared<AnyValue>(proto);
+            std::get<std::shared_ptr<JsFunction>>(storage)->proto = std::make_shared<AnyValue>(proto);
+        }
+        else if (is_uninitialized())
+        {
+            Exception::throw_uninitialized_reference("#<Object>");
+        }
+    }
+
+    // AnyValue::call implementation
+    const AnyValue AnyValue::call(const AnyValue &thisVal, std::span<const AnyValue> args, const std::optional<std::string> &expr = std::nullopt) const
+    {
+        if (!is_function())
+        {
+            throw Exception::make_exception(expr.value_or(to_std_string()) + " is not a function", "TypeError");
+        }
+        return as_function()->call(thisVal, args); // Convert to function before calling, to avoid an infinite loop
+    }
+
+    // AnyValue::construct implementation
+    const AnyValue AnyValue::construct(std::span<const AnyValue> args, const std::optional<std::string> &name) const
+    {
+        if (!is_function() || !as_function()->is_constructor)
+        {
+            // std::cerr << "Construct fail: " << name.value_or(to_std_string()) << " is_function=" << is_function() << " is_constructor=" << (is_function() ? as_function()->is_constructor : false) << std::endl;
+            throw Exception::make_exception(name.value_or(to_std_string()) + " is not a constructor", "TypeError");
+        }
+
+        // 1. Get prototype
+        AnyValue proto = get_own_property("prototype");
+        // If prototype is not an object, default to a plain object (which ideally inherits from Object.prototype)
+        // Here we just make a plain object.
+        if (!proto.is_object())
+        {
+            proto = AnyValue::make_object({});
+        }
+
+        // 2. Create instance
+        AnyValue instance = AnyValue::make_object_with_proto({}, proto);
+
+        // 3. Call function
+        // We pass 'instance' as 'this'
+        AnyValue result = call(instance, args);
+
+        // 4. Return result if object, else instance
+        if (result.is_object() || result.is_function() || result.is_array() || result.is_promise())
+        {
+            return result;
         }
+        return instance;
     }
 
 }