
This is a huge patch, I know. In hindsight this perhaps could've been done slightly more incremental, but I started and then fixed everything until it worked, and here we are. I tried splitting of some completely unrelated changes into separate commits, however. Anyway. This is a rewrite of most of Object, and by extension large parts of Array, Proxy, Reflect, String, TypedArray, and some other things. What we already had worked fine for about 90% of things, but getting the last 10% right proved to be increasingly difficult with the current code that sort of grew organically and is only very loosely based on the spec - this became especially obvious when we started fixing a large number of test262 failures. Key changes include: - 1:1 matching function names and parameters of all object-related functions, to avoid ambiguity. Previously we had things like put(), which the spec doesn't have - as a result it wasn't always clear which need to be used. - Better separation between object abstract operations and internal methods - the former are always the same, the latter can be overridden (and are therefore virtual). The internal methods (i.e. [[Foo]] in the spec) are now prefixed with 'internal_' for clarity - again, it was previously not always clear which AO a certain method represents, get() could've been both Get and [[Get]] (I don't know which one it was closer to right now). Note that some of the old names have been kept until all code relying on them is updated, but they are now simple wrappers around the closest matching standard abstract operation. - Simplifications of the storage layer: functions that write values to storage are now prefixed with 'storage_' to make their purpose clear, and as they are not part of the spec they should not contain any steps specified by it. Much functionality is now covered by the layers above it and was removed (e.g. handling of accessors, attribute checks). - PropertyAttributes has been greatly simplified, and is being replaced by PropertyDescriptor - a concept similar to the current implementation, but more aligned with the actual spec. See the commit message of the previous commit where it was introduced for details. - As a bonus, and since I had to look at the spec a whole lot anyway, I introduced more inline comments with the exact steps from the spec - this makes it super easy to verify correctness. - East-const all the things. As a result of all of this, things are much more correct but a bit slower now. Retaining speed wasn't a consideration at all, I have done no profiling of the new code - there might be low hanging fruits, which we can then harvest separately. Special thanks to Idan for helping me with this by tracking down bugs, updating everything outside of LibJS to work with these changes (LibWeb, Spreadsheet, HackStudio), as well as providing countless patches to fix regressions I introduced - there still are very few (we got it down to 5), but we also get many new passing test262 tests in return. :^) Co-authored-by: Idan Horowitz <idan.horowitz@gmail.com>
442 lines
15 KiB
C++
442 lines
15 KiB
C++
/*
|
|
* Copyright (c) 2020, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "JSIntegration.h"
|
|
#include "Spreadsheet.h"
|
|
#include "Workbook.h"
|
|
#include <LibJS/Lexer.h>
|
|
#include <LibJS/Runtime/Error.h>
|
|
#include <LibJS/Runtime/GlobalObject.h>
|
|
#include <LibJS/Runtime/Object.h>
|
|
#include <LibJS/Runtime/Value.h>
|
|
|
|
namespace Spreadsheet {
|
|
|
|
Optional<FunctionAndArgumentIndex> get_function_and_argument_index(StringView source)
|
|
{
|
|
JS::Lexer lexer { source };
|
|
// Track <identifier> <OpenParen>'s, and how many complete expressions are inside the parenthesised expression.
|
|
Vector<size_t> state;
|
|
StringView last_name;
|
|
Vector<StringView> names;
|
|
size_t open_parens_since_last_commit = 0;
|
|
size_t open_curlies_and_brackets_since_last_commit = 0;
|
|
bool previous_was_identifier = false;
|
|
auto token = lexer.next();
|
|
while (token.type() != JS::TokenType::Eof) {
|
|
switch (token.type()) {
|
|
case JS::TokenType::Identifier:
|
|
previous_was_identifier = true;
|
|
last_name = token.value();
|
|
break;
|
|
case JS::TokenType::ParenOpen:
|
|
if (!previous_was_identifier) {
|
|
open_parens_since_last_commit++;
|
|
break;
|
|
}
|
|
previous_was_identifier = false;
|
|
state.append(0);
|
|
names.append(last_name);
|
|
break;
|
|
case JS::TokenType::ParenClose:
|
|
previous_was_identifier = false;
|
|
if (open_parens_since_last_commit == 0) {
|
|
if (state.is_empty() || names.is_empty()) {
|
|
// JS Syntax error.
|
|
break;
|
|
}
|
|
state.take_last();
|
|
names.take_last();
|
|
break;
|
|
}
|
|
--open_parens_since_last_commit;
|
|
break;
|
|
case JS::TokenType::Comma:
|
|
previous_was_identifier = false;
|
|
if (open_parens_since_last_commit == 0 && open_curlies_and_brackets_since_last_commit == 0) {
|
|
if (!state.is_empty())
|
|
state.last()++;
|
|
break;
|
|
}
|
|
break;
|
|
case JS::TokenType::BracketOpen:
|
|
previous_was_identifier = false;
|
|
open_curlies_and_brackets_since_last_commit++;
|
|
break;
|
|
case JS::TokenType::BracketClose:
|
|
previous_was_identifier = false;
|
|
if (open_curlies_and_brackets_since_last_commit > 0)
|
|
open_curlies_and_brackets_since_last_commit--;
|
|
break;
|
|
case JS::TokenType::CurlyOpen:
|
|
previous_was_identifier = false;
|
|
open_curlies_and_brackets_since_last_commit++;
|
|
break;
|
|
case JS::TokenType::CurlyClose:
|
|
previous_was_identifier = false;
|
|
if (open_curlies_and_brackets_since_last_commit > 0)
|
|
open_curlies_and_brackets_since_last_commit--;
|
|
break;
|
|
default:
|
|
previous_was_identifier = false;
|
|
break;
|
|
}
|
|
|
|
token = lexer.next();
|
|
}
|
|
if (!names.is_empty() && !state.is_empty())
|
|
return FunctionAndArgumentIndex { names.last(), state.last() };
|
|
return {};
|
|
}
|
|
|
|
SheetGlobalObject::SheetGlobalObject(Sheet& sheet)
|
|
: m_sheet(sheet)
|
|
{
|
|
}
|
|
|
|
SheetGlobalObject::~SheetGlobalObject()
|
|
{
|
|
}
|
|
|
|
JS::Value SheetGlobalObject::internal_get(const JS::PropertyName& property_name, JS::Value receiver) const
|
|
{
|
|
if (property_name.is_string()) {
|
|
if (property_name.as_string() == "value") {
|
|
if (auto cell = m_sheet.current_evaluated_cell())
|
|
return cell->js_data();
|
|
|
|
return JS::js_undefined();
|
|
}
|
|
if (auto pos = m_sheet.parse_cell_name(property_name.as_string()); pos.has_value()) {
|
|
auto& cell = m_sheet.ensure(pos.value());
|
|
cell.reference_from(m_sheet.current_evaluated_cell());
|
|
return cell.typed_js_data();
|
|
}
|
|
}
|
|
|
|
return Base::internal_get(property_name, receiver);
|
|
}
|
|
|
|
bool SheetGlobalObject::internal_set(const JS::PropertyName& property_name, JS::Value value, JS::Value receiver)
|
|
{
|
|
if (property_name.is_string()) {
|
|
if (auto pos = m_sheet.parse_cell_name(property_name.as_string()); pos.has_value()) {
|
|
auto& cell = m_sheet.ensure(pos.value());
|
|
if (auto current = m_sheet.current_evaluated_cell())
|
|
current->reference_from(&cell);
|
|
|
|
cell.set_data(value); // FIXME: This produces un-savable state!
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return Base::internal_set(property_name, value, receiver);
|
|
}
|
|
|
|
void SheetGlobalObject::initialize_global_object()
|
|
{
|
|
Base::initialize_global_object();
|
|
define_native_function("get_real_cell_contents", get_real_cell_contents, 1);
|
|
define_native_function("set_real_cell_contents", set_real_cell_contents, 2);
|
|
define_native_function("parse_cell_name", parse_cell_name, 1);
|
|
define_native_function("current_cell_position", current_cell_position, 0);
|
|
define_native_function("column_arithmetic", column_arithmetic, 2);
|
|
define_native_function("column_index", column_index, 1);
|
|
}
|
|
|
|
void SheetGlobalObject::visit_edges(Visitor& visitor)
|
|
{
|
|
GlobalObject::visit_edges(visitor);
|
|
for (auto& it : m_sheet.cells()) {
|
|
if (it.value->exception())
|
|
visitor.visit(it.value->exception());
|
|
visitor.visit(it.value->evaluated_data());
|
|
}
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(SheetGlobalObject::get_real_cell_contents)
|
|
{
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return JS::js_null();
|
|
|
|
if (!is<SheetGlobalObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "SheetGlobalObject");
|
|
return {};
|
|
}
|
|
|
|
auto sheet_object = static_cast<SheetGlobalObject*>(this_object);
|
|
|
|
if (vm.argument_count() != 1) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected exactly one argument to get_real_cell_contents()");
|
|
return {};
|
|
}
|
|
|
|
auto name_value = vm.argument(0);
|
|
if (!name_value.is_string()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected a String argument to get_real_cell_contents()");
|
|
return {};
|
|
}
|
|
auto position = sheet_object->m_sheet.parse_cell_name(name_value.as_string().string());
|
|
if (!position.has_value()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Invalid cell name");
|
|
return {};
|
|
}
|
|
|
|
const auto* cell = sheet_object->m_sheet.at(position.value());
|
|
if (!cell)
|
|
return JS::js_undefined();
|
|
|
|
if (cell->kind() == Spreadsheet::Cell::Kind::Formula)
|
|
return JS::js_string(vm.heap(), String::formatted("={}", cell->data()));
|
|
|
|
return JS::js_string(vm.heap(), cell->data());
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(SheetGlobalObject::set_real_cell_contents)
|
|
{
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return JS::js_null();
|
|
|
|
if (!is<SheetGlobalObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "SheetGlobalObject");
|
|
return {};
|
|
}
|
|
|
|
auto sheet_object = static_cast<SheetGlobalObject*>(this_object);
|
|
|
|
if (vm.argument_count() != 2) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected exactly two arguments to set_real_cell_contents()");
|
|
return {};
|
|
}
|
|
|
|
auto name_value = vm.argument(0);
|
|
if (!name_value.is_string()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected the first argument of set_real_cell_contents() to be a String");
|
|
return {};
|
|
}
|
|
auto position = sheet_object->m_sheet.parse_cell_name(name_value.as_string().string());
|
|
if (!position.has_value()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Invalid cell name");
|
|
return {};
|
|
}
|
|
|
|
auto new_contents_value = vm.argument(1);
|
|
if (!new_contents_value.is_string()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected the second argument of set_real_cell_contents() to be a String");
|
|
return {};
|
|
}
|
|
|
|
auto& cell = sheet_object->m_sheet.ensure(position.value());
|
|
auto& new_contents = new_contents_value.as_string().string();
|
|
cell.set_data(new_contents);
|
|
return JS::js_null();
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(SheetGlobalObject::parse_cell_name)
|
|
{
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return JS::js_null();
|
|
|
|
if (!is<SheetGlobalObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "SheetGlobalObject");
|
|
return {};
|
|
}
|
|
|
|
auto sheet_object = static_cast<SheetGlobalObject*>(this_object);
|
|
|
|
if (vm.argument_count() != 1) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected exactly one argument to parse_cell_name()");
|
|
return {};
|
|
}
|
|
auto name_value = vm.argument(0);
|
|
if (!name_value.is_string()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected a String argument to parse_cell_name()");
|
|
return {};
|
|
}
|
|
auto position = sheet_object->m_sheet.parse_cell_name(name_value.as_string().string());
|
|
if (!position.has_value())
|
|
return JS::js_undefined();
|
|
|
|
auto object = JS::Object::create(global_object, global_object.object_prototype());
|
|
object->put("column", JS::js_string(vm, sheet_object->m_sheet.column(position.value().column)));
|
|
object->put("row", JS::Value((unsigned)position.value().row));
|
|
|
|
return object;
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(SheetGlobalObject::current_cell_position)
|
|
{
|
|
if (vm.argument_count() != 0) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected no arguments to current_cell_position()");
|
|
return {};
|
|
}
|
|
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return JS::js_null();
|
|
|
|
if (!is<SheetGlobalObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "SheetGlobalObject");
|
|
return {};
|
|
}
|
|
|
|
auto sheet_object = static_cast<SheetGlobalObject*>(this_object);
|
|
auto* current_cell = sheet_object->m_sheet.current_evaluated_cell();
|
|
if (!current_cell)
|
|
return JS::js_null();
|
|
|
|
auto position = current_cell->position();
|
|
|
|
auto object = JS::Object::create(global_object, global_object.object_prototype());
|
|
object->put("column", JS::js_string(vm, sheet_object->m_sheet.column(position.column)));
|
|
object->put("row", JS::Value((unsigned)position.row));
|
|
|
|
return object;
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(SheetGlobalObject::column_index)
|
|
{
|
|
if (vm.argument_count() != 1) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected exactly one argument to column_index()");
|
|
return {};
|
|
}
|
|
|
|
auto column_name = vm.argument(0);
|
|
if (!column_name.is_string()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "String");
|
|
return {};
|
|
}
|
|
|
|
auto& column_name_str = column_name.as_string().string();
|
|
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return JS::js_null();
|
|
|
|
if (!is<SheetGlobalObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "SheetGlobalObject");
|
|
return {};
|
|
}
|
|
|
|
auto sheet_object = static_cast<SheetGlobalObject*>(this_object);
|
|
auto& sheet = sheet_object->m_sheet;
|
|
auto column_index = sheet.column_index(column_name_str);
|
|
if (!column_index.has_value()) {
|
|
vm.throw_exception(global_object, JS::TypeError::create(global_object, String::formatted("'{}' is not a valid column", column_name_str)));
|
|
return {};
|
|
}
|
|
|
|
return JS::Value((i32)column_index.value());
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(SheetGlobalObject::column_arithmetic)
|
|
{
|
|
if (vm.argument_count() != 2) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected exactly two arguments to column_arithmetic()");
|
|
return {};
|
|
}
|
|
|
|
auto column_name = vm.argument(0);
|
|
if (!column_name.is_string()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "String");
|
|
return {};
|
|
}
|
|
|
|
auto& column_name_str = column_name.as_string().string();
|
|
|
|
auto offset = vm.argument(1).to_number(global_object);
|
|
if (!offset.is_number())
|
|
return {};
|
|
|
|
auto offset_number = offset.as_i32();
|
|
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return JS::js_null();
|
|
|
|
if (!is<SheetGlobalObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "SheetGlobalObject");
|
|
return {};
|
|
}
|
|
|
|
auto sheet_object = static_cast<SheetGlobalObject*>(this_object);
|
|
auto& sheet = sheet_object->m_sheet;
|
|
auto new_column = sheet.column_arithmetic(column_name_str, offset_number);
|
|
if (!new_column.has_value()) {
|
|
vm.throw_exception(global_object, JS::TypeError::create(global_object, String::formatted("'{}' is not a valid column", column_name_str)));
|
|
return {};
|
|
}
|
|
|
|
return JS::js_string(vm, new_column.release_value());
|
|
}
|
|
|
|
WorkbookObject::WorkbookObject(Workbook& workbook)
|
|
: JS::Object(*JS::Object::create(workbook.global_object(), workbook.global_object().object_prototype()))
|
|
, m_workbook(workbook)
|
|
{
|
|
}
|
|
|
|
WorkbookObject::~WorkbookObject()
|
|
{
|
|
}
|
|
|
|
void WorkbookObject::initialize(JS::GlobalObject& global_object)
|
|
{
|
|
Object::initialize(global_object);
|
|
define_native_function("sheet", sheet, 1);
|
|
}
|
|
|
|
void WorkbookObject::visit_edges(Visitor& visitor)
|
|
{
|
|
Base::visit_edges(visitor);
|
|
for (auto& sheet : m_workbook.sheets())
|
|
visitor.visit(&sheet.global_object());
|
|
}
|
|
|
|
JS_DEFINE_NATIVE_FUNCTION(WorkbookObject::sheet)
|
|
{
|
|
if (vm.argument_count() != 1) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected exactly one argument to sheet()");
|
|
return {};
|
|
}
|
|
auto name_value = vm.argument(0);
|
|
if (!name_value.is_string() && !name_value.is_number()) {
|
|
vm.throw_exception<JS::TypeError>(global_object, "Expected a String or Number argument to sheet()");
|
|
return {};
|
|
}
|
|
|
|
auto* this_object = vm.this_value(global_object).to_object(global_object);
|
|
if (!this_object)
|
|
return {};
|
|
|
|
if (!is<WorkbookObject>(this_object)) {
|
|
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WorkbookObject");
|
|
return {};
|
|
}
|
|
|
|
auto& workbook = static_cast<WorkbookObject*>(this_object)->m_workbook;
|
|
|
|
if (name_value.is_string()) {
|
|
auto& name = name_value.as_string().string();
|
|
for (auto& sheet : workbook.sheets()) {
|
|
if (sheet.name() == name)
|
|
return JS::Value(&sheet.global_object());
|
|
}
|
|
} else {
|
|
auto index = name_value.to_length(global_object);
|
|
if (vm.exception())
|
|
return {};
|
|
if (index < workbook.sheets().size())
|
|
return JS::Value(&workbook.sheets()[index].global_object());
|
|
}
|
|
|
|
return JS::js_undefined();
|
|
}
|
|
|
|
}
|