src/element.cc

Commits

b966b2a517365074e5c381dbdea05b3221dc0198 e840f1eeb0ae26af69e1ae146ea9938e28e9f1af e4e05418a640eaed08cd1ec7cd8644eb1dbcca50 4e01ba8ad2c3361fa4be3d896288020948b58b5e aae562ac1350480e4889aabb35899f776c5b59e9 6c3ae0e31eb0893f20e3872117f92cc6b9a942af 350e7d88bb2feb9db00c6e032cc6623f215b7adf 95e6c70d23e99ffcf70e5bbe12503496e5d8f232 e188783659b9bc3b9993a647e93ed110e7f41db6 5e4c38ff3c212cdd9881427ef3f8c2706539a190 e50ea9e1356a74af18fdd171337ef9dc931e1f4e 8f2e83556d12aaebe8e8597ea6923804b0eb7a43 1627c585128af263181053ab2cf1a4cdcd14ee21 def3513f75b325464ad88a33c741c4ca80572b77 a21501590980a905fa9b902897d700a42a08b7f0 56074a6bfe4498d092f3a227297c8c20e2bb962c d9cf1485b7ae0614130494f0e73237921323b9a1 80f04b134ae32ad8a9d526007b33dd02f6600f05 23d6c65f9368d3c622a55a3068a6b2f1efa0c8d4 09c195df02536b6a796bd648fce9669397b96109 f2b5c8202fbc904e2ed78260e3fdbd55164799d2 4bfba076120f389994fc46a98e8b7a2622314400 e36ac5417e10ee9b9f94f340e1ccf28afc5705ea d00dc89a86dd7e2fcfd4618bc3a1c8cfba9e3c3d d9eef16adaf292f3748db5fb5aa98463de10d712 18ff2ec1bfc1cf9fcd17c1acb05c3b41f8f0ed83 9e7fd2980d723437ea621b78d395fa72ca3f4922

Diff

diff --git a/src/element.cc b/src/element.cc
index 5c7f76a..157533f 100755
--- a/src/element.cc
+++ b/src/element.cc
@@ -167,124 +166,0 @@ void Node::print(int indent) const {
-
-struct Style {
-	std::unordered_map<std::string, std::string> properties;
-	std::string selector;
-	// Index of when it was added (for cascading)
-	int index;
-}
-
-// struct BaseParts {
-// 	std::string tagName;
-// 	std::string id;
-// 	std::vector<std::string> classes;
-// 	std::unordered_map<std::string, std::string> attributes;
-// }
-
-class StyleHandler {
-	private:
-		// basemap: Maps baseparts to a index of the styles vector pointing to a Style object
-		// because processing a CSS selector isn't trivial we want to make a short list of 
-		// the styles that can possibly be a match so we aren't spending a lot of compute 
-		// on a selector that applys to the wrong element. Todo this we take the right most part
-		// of a selector (that is the part that targets the current element) and we do a few checks
-		// like is the tagname the same, does it have that class, and do the id's match. If so that 
-		// is a canidate and we run the full selector on it. That includes checking parents,children, 
-		// or what ever else the selector needs to match.
-		std::unordered_map<std::string, std::vector<size_t>> basemap;
-		std::vector<Style> styles;
-		int currentIndex = 0;
-
-
-		std::vector<std::string> parseSelectorParts(std::string selector) {
-			// we want to find the right most (right of a " " > ~ + ) selector
-			// account for * for commas split the selector then for each parse right
-			
-			std::vector<std::string> parts;
-			std::string word;
-
-			for (int s = 0; s < selector.length(); s++) {
-				// Start parsing if we see a comma or the end of the selector
-				if (selector[s] == ',' || s == selector.length()-1) {
-					// Break the tag and add the right most parts to parts
-					for (int i = word.length()-1; i > -1; i--) {
-						if (
-								word[i] == ' ' ||
-								word[i] == '>' ||
-								word[i] == '~' ||
-								word[i] == '+' 
-								) {
-							word = word.substr(i+1);
-							break;
-						}
-					}
-
-					// Now word contains the right most selection
-					// we will extract the quick to verify parts from it
-					// so we can build the basemap
-					std::string part;
-					for (auto w : word) {
-						// if the current letter is a : that is either a psuedo element
-						// or selector. We don't care about that part for this part
-						if (w != ':') {
-							// We don't care if the thing we are splitting is a id or class we just 
-							// need them split up so we can use them as map keys
-
-							if (w == '#') {
-								if (part != "") {
-									parts.push_back(part);
-									part = "";
-								}
-
-							} else if (w == '.') {
-								if (part != "") {
-									parts.push_back(part);
-									part = "";
-								}
-							} else if (w == '[' || w == ']') {
-								if (part != "") {
-									parts.push_back(part);
-									part = "";
-								}
-								continue;
-							}
-
-							part += w;
-						} else {
-							break;
-						}
-					}
-
-					if (part != "") {
-						parts.push_back(part);
-					}
-				} else {
-					word += selector[s];
-				}
-			}
-
-			std::vector<std::string> deduplicated;
-
-			for (int p1 = 0; p1 < parts.size(); p1++) {
-				bool matches = false;
-
-				for (int p2 = p1+1; p2 < parts.size(); p2++) {
-					if (parts[p1] == parts[p2]) {
-						matches = true;
-					}
-				}
-
-				if (!matches) {
-					deduplicated.push_back(parts[p1]);
-				}
-			}
-
-			return deduplicated;
-		}
-	public:
-		void add(Style style) {
-			styles.push_back(std::move(style));
-			basemap[styles.back().selector] = styles.size() - 1; // Store the index
-			// Give the properties a cascade index
-			styles.back().index = currentIndex++;
-		}
-
-}

#include "element.h"
#include <iostream>
#include <sstream>
#include <algorithm>
#include <stdexcept>
#include <cctype>

std::string ClassList::value() const {
    if (values.empty()) {
        return "";
    }
    std::string collection = values[0];
    for (size_t i = 1; i < values.size(); ++i) {
        collection += " " + values[i];
    }
    return collection;
}

void ClassList::add(std::string value) {
    values.push_back(value);
}

void ClassList::remove(std::string value) {
    auto it_prev = std::find(values.begin(), values.end(), value);
    if (it_prev != values.end()) {
        *it_prev = values.back();
        values.pop_back();
    }
}

// Constructor
Node::Node() : parent(nullptr) {}

std::string Node::getTagName() const { return TagName; }
void Node::setTagName(const std::string& name) { TagName = name; }

const std::unordered_map<std::string, std::string>& Node::getAttributes() const {
    return Attributes;
}

// Implement the getter/setter methods declared using the macro
#define IMPLEMENT_ATTRIBUTE_ACCESSORS(_Type, _FuncNameSuffix, _AttrKeyString) \
    _Type Node::get##_FuncNameSuffix() const { \
        return getAttribute<_Type>(_AttrKeyString); \
    } \
    void Node::set##_FuncNameSuffix(_Type value) { \
        setAttribute(_AttrKeyString, value); \
    }

IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Id, "id")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, InnerText, "innerText")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, ContentEditable, "contenteditable")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Href, "href")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Src, "src")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Title, "title")
IMPLEMENT_ATTRIBUTE_ACCESSORS(std::string, Value, "value")
IMPLEMENT_ATTRIBUTE_ACCESSORS(int, TabIndex, "tabindex")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, Disabled, "disabled")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, Required, "required")
IMPLEMENT_ATTRIBUTE_ACCESSORS(bool, Checked, "checked")

Node* Node::createElement(std::string name) {
    std::unique_ptr<Node> newNode = std::make_unique<Node>();
    newNode->setTagName(name);
    newNode->parent = this;
    children.push_back(std::move(newNode));
    return children.back().get();
}

template<typename T>
void Node::setAttribute(const std::string& name, const T& value) {
    if constexpr (std::is_same_v<T, bool>) {
        if (value) {
            Attributes[name] = "";
        } else {
            Attributes.erase(name);
        }
    } else if constexpr (std::is_arithmetic_v<T>) {
        Attributes[name] = std::to_string(value);
    } else {
        static_assert(std::is_convertible_v<T, std::string>,
            "setAttribute: Type cannot be converted to std::string automatically.");
        Attributes[name] = static_cast<std::string>(value);
    }
}

void Node::setAttribute(const std::string& name, const std::string& value) {
    Attributes[name] = value;
}

template<typename T>
T Node::getAttribute(const std::string& name) const {
    auto it = Attributes.find(name);
    if (it != Attributes.end()) {
        const std::string& s = it->second;

if constexpr (std::is_same_v<T, int>) {
            try {
                return std::stoi(s);
            } catch (const std::invalid_argument& e) {
                return 0;
            } catch (const std::out_of_range& e) {
                return 0;
            }
        } else if constexpr (std::is_same_v<T, bool>) {
            std::string lower_s = s;
            std::transform(lower_s.begin(), lower_s.end(), lower_s.begin(),
                [](unsigned char c){ return std::tolower(c); });
            return (!lower_s.empty() && lower_s != "false");
        } else if constexpr (std::is_same_v<T, double>) {
            try {
                return std::stod(s);
            } catch (const std::invalid_argument& e) {
                return 0.0;
            } catch (const std::out_of_range& e) {
                return 0.0;
            }
        } else {
            static_assert(std::is_convertible_v<std::string, T>,
                "getAttribute: Type conversion from std::string not implemented for this type.");
            return static_cast<T>(s);
        }
    }
    return T();
}

std::string Node::getAttribute(const std::string& name) const {
    auto it = Attributes.find(name);
    if (it != Attributes.end()) {
        return it->second;
    }
    return "";
}

void Node::print(int indent) const {
    for (int i = 0; i < indent; ++i) {
        std::cout << "  ";
    }

std::cout << "<" << getTagName();
    for (const auto& attr_pair : getAttributes()) {
        if (attr_pair.first == "innerText" || attr_pair.first == "tagName") {
            continue;
        }
        std::cout << " " << attr_pair.first;
        if (!attr_pair.second.empty()) {
            std::cout << "=\"" << attr_pair.second << "\"";
        }
    }
    std::cout << ">";

if (!getAttribute("innerText").empty()) {
        std::cout << "\n" << getAttribute("innerText");
    }

std::cout << std::endl;

for (const auto& child : children) {
        child->print(indent + 1);
    }

for (int i = 0; i < indent; ++i) {
        std::cout << "  ";
    }
    std::cout << "</" << getTagName() << ">" << std::endl;
}

struct Style {
	std::unordered_map<std::string, std::string> properties;
	std::string selector;
	// Index of when it was added (for cascading)
	int index;
}

// struct BaseParts {
// 	std::string tagName;
// 	std::string id;
// 	std::vector<std::string> classes;
// 	std::unordered_map<std::string, std::string> attributes;
// }

class StyleHandler {
	private:
		// basemap: Maps baseparts to a index of the styles vector pointing to a Style object
		// because processing a CSS selector isn't trivial we want to make a short list of 
		// the styles that can possibly be a match so we aren't spending a lot of compute 
		// on a selector that applys to the wrong element. Todo this we take the right most part
		// of a selector (that is the part that targets the current element) and we do a few checks
		// like is the tagname the same, does it have that class, and do the id's match. If so that 
		// is a canidate and we run the full selector on it. That includes checking parents,children, 
		// or what ever else the selector needs to match.
		std::unordered_map<std::string, std::vector<size_t>> basemap;
		std::vector<Style> styles;
		int currentIndex = 0;

std::vector<std::string> parseSelectorParts(std::string selector) {
			// we want to find the right most (right of a " " > ~ + ) selector
			// account for * for commas split the selector then for each parse right
			
			std::vector<std::string> parts;
			std::string word;

for (int s = 0; s < selector.length(); s++) {
				// Start parsing if we see a comma or the end of the selector
				if (selector[s] == ',' || s == selector.length()-1) {
					// Break the tag and add the right most parts to parts
					for (int i = word.length()-1; i > -1; i--) {
						if (
								word[i] == ' ' ||
								word[i] == '>' ||
								word[i] == '~' ||
								word[i] == '+' 
								) {
							word = word.substr(i+1);
							break;
						}
					}

// Now word contains the right most selection
					// we will extract the quick to verify parts from it
					// so we can build the basemap
					std::string part;
					for (auto w : word) {
						// if the current letter is a : that is either a psuedo element
						// or selector. We don't care about that part for this part
						if (w != ':') {
							// We don't care if the thing we are splitting is a id or class we just 
							// need them split up so we can use them as map keys

if (w == '#') {
								if (part != "") {
									parts.push_back(part);
									part = "";
								}

} else if (w == '.') {
								if (part != "") {
									parts.push_back(part);
									part = "";
								}
							} else if (w == '[' || w == ']') {
								if (part != "") {
									parts.push_back(part);
									part = "";
								}
								continue;
							}

part += w;
						} else {
							break;
						}
					}

if (part != "") {
						parts.push_back(part);
					}
				} else {
					word += selector[s];
				}
			}

std::vector<std::string> deduplicated;

for (int p1 = 0; p1 < parts.size(); p1++) {
				bool matches = false;

for (int p2 = p1+1; p2 < parts.size(); p2++) {
					if (parts[p1] == parts[p2]) {
						matches = true;
					}
				}

if (!matches) {
					deduplicated.push_back(parts[p1]);
				}
			}

return deduplicated;
		}
	public:
		void add(Style style) {
			styles.push_back(std::move(style));
			basemap[styles.back().selector] = styles.size() - 1; // Store the index
			// Give the properties a cascade index
			styles.back().index = currentIndex++;
		}

}