rasti 3.0.0 → 4.0.0-alpha.0

package/es/Component.js

@@ -1,35 +1,56 @@
+import './Emitter.js';
+import Model from './Model.js';
 import View from './View.js';
+import SafeHTML from './core/SafeHTML.js';
+import Partial from './core/Partial.js';
+import InterpolationWrapper from './core/InterpolationWrapper.js';
+import EventsManager from './core/EventsManager.js';
+import PathManager from './core/PathManager.js';
+import Element from './core/Element.js';
+import Interpolation from './core/Interpolation.js';
+import validateListener from './utils/validateListener.js';
 import getResult from './utils/getResult.js';
 import deepFlat from './utils/deepFlat.js';
-import './Emitter.js';
+import parseHTML from './utils/parseHTML.js';
+import findComment from './utils/findComment.js';
+import getAttributesHTML from './utils/getAttributesHTML.js';
+import './utils/getAttributesDiff.js';
+import './utils/syncNode.js';
 
-/*
- * Wrapper class for HTML strings marked as safe.
- */
-class SafeHTML {
-    constructor(value) {
-        this.value = value;
-    }
-
-    toString() {
-        return this.value;
-    }
-}
-
-/*
+/**
  * Same as getResult, but pass context as argument to the expression.
  * Used to evaluate expressions in the context of a component.
  * @param {any} expression The expression to be evaluated.
  * @param {any} context The context to call the expression with.
  * @return {any} The result of the evaluated expression.
+ * @private
  */
 const getExpressionResult = (expression, context) => getResult(expression, context, context);
 
-/*
+/**
+ * Check if an element is a component root element.
+ * Component root elements have the data attribute ending with '-1'.
+ * @param {Element} el The element to check.
+ * @return {boolean} True if the element is a component root element.
+ * @private
+ */
+const isComponent = (el) => el.hasAttribute(Component.ATTRIBUTE_ELEMENT) && el.getAttribute(Component.ATTRIBUTE_ELEMENT).endsWith('-1');
+
+/**
+ * Check if an element has the Rasti data attribute.
+ * This includes both component root elements and regular tracked elements.
+ * @param {Element} el The element to check.
+ * @return {boolean} True if the element has the data attribute.
+ * @private
+ */
+const isElement = (el) => el.hasAttribute(Component.ATTRIBUTE_ELEMENT);
+
+/**
  * Generate string with placeholders for interpolated expressions.
- * @param strings {array} Array of strings.
- * @param expressions {array} Array of expressions.
+ * @param {Array<string>} strings Array of strings.
+ * @param {Array<any>} expressions Array of expressions.
  * @return {string} String with placeholders.
+ * @private
  */
 const addPlaceholders = (strings, expressions) => 
     strings.reduce((out, string, i) => {
@@ -37,19 +58,20 @@ const addPlaceholders = (strings, expressions) =>
         out.push(string);
         // Add expression placeholders.
         if (typeof expressions[i] !== 'undefined') {
-            out.push(Component.PLACEHOLDER_EXPRESSION(i));
+            out.push(Component.PLACEHOLDER(i));
         }
         return out;
     }, []).join('');
 
-/*
+/**
  * Generate one dimensional array with strings and expressions.
  * @param main {string} The main template containing placeholders.
- * @param expressions {array} Array of expressions to replace placeholders.
+ * @param {Array<any>} expressions Array of expressions to replace placeholders.
  * @return {array} Array containing strings and expressions.
+ * @private
  */
 const splitPlaceholders = (main, expressions) => {
-    const PH = Component.PLACEHOLDER_EXPRESSION('(\\d+)');
+    const PH = Component.PLACEHOLDER('(\\d+)');
     const regExp = new RegExp(`${PH}`, 'g');
     const out = [];
     let lastIndex = 0;
@@ -66,363 +88,539 @@ const splitPlaceholders = (main, expressions) => {
     return out;
 };
 
-/*
+/**
  * Expand attributes.
- * @param attributes {array} Array of attributes as key, value pairs.
- * @param getExpressionResult {function} Function to render expressions.
+ * @param {Array<Array<any>>} attributes Array of attributes as key, value pairs.
+ * @param {Function} getExpressionResult Function to render expressions.
  * @return {object}
  * @property {object} all All attributes.
  * @property {object} events Event listeners.
  * @property {object} attributes Attributes.
+ * @private
  */
-const expandAttributes = (attributes, getExpressionResult) => {
-    const out = attributes.reduce((out, pair) => {
-        const attribute = getExpressionResult(pair[0]);
-        // Attribute without value. 
-        if (pair.length === 1) {
-            if (typeof attribute === 'object') {
-                // Expand objects as attributes.
-                out.all = Object.assign(out.all, attribute);
-            } else if (typeof attribute === 'string') {
-                // Treat as boolean.
-                out.all[attribute] = true;
-            }
-        } else {
-            // Attribute with value.
-            const value = getExpressionResult(pair[1]);
-            out.all[attribute] = value;
+const expandAttributes = (attributes, getExpressionResult) => attributes.reduce((out, pair) => {
+    const attribute = getExpressionResult(pair[0]);
+    // Attribute without value. 
+    if (pair.length === 1) {
+        if (typeof attribute === 'object') {
+            // Expand objects as attributes.
+            out = Object.assign(out, attribute);
+        } else if (typeof attribute === 'string') {
+            // Treat as boolean.
+            out[attribute] = true;
         }
+    } else {
+        // Attribute with value.
+        const value = pair[2] ? getExpressionResult(pair[1]) : pair[1];
+        out[attribute] = value;
+    }
 
-        return out;
-    }, { all : {}, events : {}, attributes : {} });
+    return out;
+}, {});
 
-    Object.keys(out.all).forEach(key => {
+/**
+ * Expand events.
+ * @param {object} attributes Attributes object.
+ * @param {EventsManager} eventsManager Events manager.
+ * @return {object} Attributes object.
+ * @private
+ */
+const expandEvents = (attributes, eventsManager) => {
+    const out = {};
+    Object.keys(attributes).forEach(key => {
         // Check if key is an event listener.
         const match = key.match(/on(([A-Z]{1}[a-z]+)+)/);
+
         if (match && match[1]) {
-            // Add event listener.
-            out.events[match[1].toLowerCase()] = out.all[key];
+            const type = match[1].toLowerCase();
+            const listener = attributes[key];
+            if (listener) {
+                const index = eventsManager.addListener(listener, type);
+                // Add event listener index.
+                out[Component.ATTRIBUTE_EVENT(type)] = index;
+            }
         } else {
             // Add attribute.
-            out.attributes[key] = out.all[key];
+            out[key] = attributes[key];
         }
     });
-
     return out;
 };
 
-/*
+/**
  * Replace component tags with expressions.
  * `<${Component} />` or `<${Component}></${Component}>` will be replaced 
  * by a function that mounts the component.
  * Returns the template with component tags replaced by expressions placeholders 
  * modifies the expressions array adding the mount functions.
  * @param main {string} The main template.
+ * @param {Array<any>} expressions Array of expressions.
  * @return {string} The template with components tags replaced by expressions
  * placeholders.
+ * @private
  */
 const expandComponents = (main, expressions) => {
-    const PH = Component.PLACEHOLDER_EXPRESSION('(\\d+)');
+    const PH = Component.PLACEHOLDER('(\\d+)');
     // Match component tags.
     return main.replace(
         new RegExp(`<(${PH})([^>]*)>([\\s\\S]*?)</(${PH})>|<(${PH})([^>]*)/>`,'g'),
-        function() {
-            const { tag, attributes, inner, close, raw } = parseMatch(arguments, expressions);
+        (match, openTag, openIdx, nonVoidAttrs, inner, closeTag, closeIdx, selfClosingTag, selfClosingIdx, selfClosingAttrs) => {
+            let tag, close, attributesStr;
+
+            if (openTag) {
+                tag = typeof openIdx !== 'undefined' ? expressions[openIdx] : openTag;
+                close = typeof closeIdx !== 'undefined' ? expressions[closeIdx] : closeTag;
+                attributesStr = nonVoidAttrs;
+            } else {
+                tag = typeof selfClosingIdx !== 'undefined' ? expressions[selfClosingIdx] : selfClosingTag;
+                attributesStr = selfClosingAttrs;
+            }
             // No component found.
-            if (!(tag.prototype instanceof Component)) return raw;
+            if (!(tag.prototype instanceof Component)) return match;
 
-            let renderChildren;
+            let innerList;
             // Non void component.
             if (close) {
                 // Close component tag must match open component tag.
-                if (tag !== close) return raw;
+                if (tag !== close) return match;
+                // Process inner content same way as partial().
                 // Recursively expand inner components.
-                const list = splitPlaceholders(expandComponents(inner, expressions), expressions);
-                // Create renderChildren function.
-                renderChildren = function() {
-                    return deepFlat(list.map(item => getExpressionResult(item, this)));
-                };
+                const innerTemplate = expandComponents(inner, expressions);
+                // Parse partial elements to handle dynamic attributes and events.
+                const parsedInner = parsePartialElements(innerTemplate, expressions);
+                // Split into items.
+                innerList = splitPlaceholders(parsedInner, expressions);
             }
+            // Parse attributes.
+            const attributes = parseAttributes(attributesStr, expressions);
             // Create mount function.
             const mount = function() {
-                const options = expandAttributes(attributes, value => getExpressionResult(value, this)).all;
-                // Add renderChildren function to options.
-                if (renderChildren) options.renderChildren = renderChildren.bind(this);
+                const options = expandAttributes(attributes, value => getExpressionResult(value, this));
+                // Add `renderChildren` function to options.
+                if (innerList) {
+                    // Evaluate items in parent context and create Partial.
+                    options.renderChildren = () => new Partial(innerList.map(item => getExpressionResult(item, this)));
+                }
                 // Mount component.
                 return tag.mount(options);
             };
             // Add mount function to expression.
             expressions.push(mount);
             // Replace whole string with expression placeholder.
-            return Component.PLACEHOLDER_EXPRESSION(expressions.length - 1);
+            return Component.PLACEHOLDER(expressions.length - 1);
         }
     );
 };
 
-/*
- * Parse match data to get tag, attributes, inner html and close tag.
- * @param match {array}
- * @return {object}
- * @property {string} tag The tag.
- * @property {string} inner The inner html.
- * @property {string} close The closing tag.
- * @property {array} attributes Array of attributes as key, value pairs.
- * @property {string} raw The whole match.
+/**
+ * Replace elements in template.
+ * @param {string} template Template string.
+ * @param {Function} replacer Replacer function.
+ * @return {string} Template string with replaced elements.
+ * @private
  */
-const parseMatch = (match, expressions) => {
-    const PH = Component.PLACEHOLDER_EXPRESSION('(\\d+)');
+const replaceElements = (template, replacer) => {
+    const PH = Component.PLACEHOLDER('(?:\\d+)');
+    return template.replace(
+        new RegExp(`<(${PH}|[a-z]+[1-6]?)(?:\\s*)((?:"[^"]*"|'[^']*'|[^>])*)(/?>)`, 'gi'),
+        replacer
+    );
+};
 
-    const [all, openTag, openIdx, nonVoidAttrs, inner, closeTag, closeIdx,
-        selfClosingTag, selfClosingIdx, selfClosingAttrs] = match;
+/**
+ * Parse all HTML elements in template and extract their attributes.
+ * @param {string} template Template string with placeholders.
+ * @param {Array} expressions Array of expressions.
+ * @param {Array} elements Array to store element references.
+ * @return {string} Template with parsed attributes.
+ * @throws {SyntaxError} If the template does not have a single root element or is a container component.
+ * @private
+ */
+const parseElements = (template, expressions, elements) => {
+    const PH = Component.PLACEHOLDER('(?:\\d+)');
+    // Check if template is a container (single placeholder, no tag).
+    const containerMatch = template.match(new RegExp(`^\\s*${PH}\\s*$`));
+    if (containerMatch) return template;
+    // Validate that template has a root element.
+    const rootElementMatch = template.match(new RegExp(`^\\s*<([a-z]+[1-6]?|${PH})([^>]*)>([\\s\\S]*?)</(\\1|${PH})>\\s*$|^\\s*<([a-z]+[1-6]?|${PH})([^>]*)/>\\s*$`));
+    if (!rootElementMatch) throw new SyntaxError(`Template must have a single root element or be a container component: "${template.trim()}"`);
+
+    let elementUid = 0;
+    // Match all HTML elements including placeholders and self-closed elements.
+    return replaceElements(template, (match, tag, attributesStr, ending) => {
+        const isRoot = elementUid === 0;
+        const currentElementUid = ++elementUid;
+        // If there are no dynamic attributes, return original match.
+        if (!isRoot && !attributesStr.match(new RegExp(PH))) {
+            return match;
+        }
+        // Parse attributes.
+        const parsedAttributes = parseAttributes(attributesStr, expressions);
+        // Create element reference.
+        const generateElementUid = componentUid => `${componentUid}-${currentElementUid}`;
+        // Create function that returns attributes object.
+        const getAttributes = function() {
+            // Expand attributes and events.
+            const attributes = expandEvents(
+                expandAttributes(parsedAttributes, value => getExpressionResult(value, this)),
+                this.eventsManager
+            );
+            // Extend template attributes with `options.attributes`.
+            if (isRoot && this.attributes) {
+                Object.assign(attributes, getResult(this.attributes, this));
+            }
+            // Add data attribute for element identification.
+            // First element gets the component uid, others get element uid.
+            attributes[Component.ATTRIBUTE_ELEMENT] = generateElementUid(this.uid);
+
+            return attributes;
+        };
+
+        const getSelector = function() {
+            return `[${Component.ATTRIBUTE_ELEMENT}="${generateElementUid(this.uid)}"]`;
+        };
+        // Add element reference to elements array.
+        elements.push({
+            getSelector,
+            getAttributes,
+        });
+        // Add new expression to expressions array.
+        expressions.push(function() {
+            const attributes = getAttributes.call(this);
+            return Component.markAsSafeHTML(getAttributesHTML(attributes));
+        });
+        // Replace attributes with placeholder.
+        const placeholder = Component.PLACEHOLDER(expressions.length - 1);
+        // Preserve original tag ending (> or />)
+        return `<${tag} ${placeholder}${ending}`;
+    });
+};
 
-    const data = { raw : all, attributes : [] };
+/**
+ * Parse elements in partial template.
+ * @param {string} template Template string with placeholders.
+ * @param {Array} expressions Array of expressions.
+ * @return {string} Template with parsed attributes.
+ * @private
+ */
+const parsePartialElements = (template, expressions) => {
+    const PH = Component.PLACEHOLDER('(?:\\d+)');
+    // Match all HTML elements including placeholders and self-closed elements.
+    return replaceElements(template, (match, tag, attributesStr, ending) => {
+        // If there are no dynamic attributes, return original match.
+        if (!attributesStr.match(new RegExp(PH))) {
+            return match;
+        }
+        // Parse attributes.
+        const parsedAttributes = parseAttributes(attributesStr, expressions);
+        // Create function that returns attributes object.
+        const getAttributes = function() {
+            const attributes = expandEvents(
+                expandAttributes(parsedAttributes, value => getExpressionResult(value, this)),
+                this.eventsManager
+            );
+
+            return attributes;
+        };
+        // Add new expression to expressions array.
+        expressions.push(function() {
+            const attributes = getAttributes.call(this);
+            return Component.markAsSafeHTML(getAttributesHTML(attributes));
+        });
+        // Replace attributes with placeholder.
+        const placeholder = Component.PLACEHOLDER(expressions.length - 1);
+        // Preserve original tag ending (> or />)
+        return `<${tag} ${placeholder}${ending}`;
+    });
+};
 
-    let attributesStr;
-    if (openTag) {
-        // Non void element.
-        data.tag = typeof openIdx !== 'undefined' ? expressions[openIdx] : openTag;
-        data.inner = inner;
-        data.close = typeof closeIdx !== 'undefined' ? expressions[closeIdx] : closeTag;
-        attributesStr = nonVoidAttrs;
-    } else {
-        // Self closing element.
-        data.tag = typeof selfClosingIdx !== 'undefined' ? expressions[selfClosingIdx] : selfClosingTag;
-        attributesStr = selfClosingAttrs;
-    }
-    // Parse attributes.
+/**
+ * Parse all interpolations in template text content.
+ * @param {string} template Template string with placeholders.
+ * @param {Array} expressions Array of expressions.
+ * @param {Array} interpolations Array to store interpolation references.
+ * @return {string} Template with interpolation markers.
+ * @private
+ */
+const parseInterpolations = (template, expressions, interpolations) => {
+    const PH = Component.PLACEHOLDER('(\\d+)');
+    let interpolationUid = 0;
+    // Match all expression placeholders.
+    return template.replace(
+        new RegExp(PH, 'g'),
+        function(match, expressionIndex, offset) {
+            // Check if this placeholder is inside an element tag (attribute).
+            // `offset` is the index of the match in the original string.
+            const beforeMatch = template.substring(0, offset);
+            const lastOpenTag = beforeMatch.lastIndexOf('<');
+            const lastCloseTag = beforeMatch.lastIndexOf('>');
+            // If we're inside an element tag, don't process as interpolation.
+            if (lastOpenTag > lastCloseTag) {
+                return match;
+            }
+
+            const currentInterpolationUid = ++interpolationUid;
+
+            function getStart() {
+                return Component.MARKER_START(`${this.uid}-${currentInterpolationUid}`);
+            }
+            function getEnd() {
+                return Component.MARKER_END(`${this.uid}-${currentInterpolationUid}`);
+            }
+            // Add interpolation reference to interpolations array.
+            interpolations.push({
+                getStart,
+                getEnd,
+                expression : expressions[expressionIndex]
+            });
+            // Add new expression to expressions array.
+            expressions.push(function() {
+                const result = getExpressionResult(expressions[expressionIndex], this);
+                const uid = `${this.uid}-${currentInterpolationUid}`;
+                return new InterpolationWrapper(uid, result);
+            });
+            // Replace with new placeholder.
+            return Component.PLACEHOLDER(expressions.length - 1);
+        }
+    );
+};
+
+/**
+ * Parse attributes string to extract dynamic attributes.
+ * @param {string} attributesStr Attributes string from HTML element.
+ * @param {Array} expressions Array of expressions.
+ * @return {Array} Array of attribute pairs [key, value] or [key, value, hasQuotes].
+ * @private
+ */
+const parseAttributes = (attributesStr, expressions) => {
+    const PH = Component.PLACEHOLDER('(\\d+)');
+    const attributes = [];
+    // Parse attributes string with support for placeholders in both names and values.
     const regExp = new RegExp(`(${PH}|[\\w-]+)(?:=(["']?)(?:${PH}|((?:.?(?!["']?\\s+(?:\\S+)=|\\s*/?[>"']))+.))\\3)?`, 'g');
 
     let attributeMatch;
     while ((attributeMatch = regExp.exec(attributesStr)) !== null) {
-        const [, attribute, attributeIdx,, valueIdx, value] = attributeMatch;
+        const [, attribute, attributeIdx, quotes, valueIdx, value] = attributeMatch;
 
-        const attr = typeof attributeIdx !== 'undefined' ? expressions[attributeIdx] : attribute;
-        const val = typeof valueIdx !== 'undefined' ? expressions[valueIdx] : value;
+        const attr = typeof attributeIdx !== 'undefined' ? expressions[parseInt(attributeIdx, 10)] : attribute;
+        const val = typeof valueIdx !== 'undefined' ? expressions[parseInt(valueIdx, 10)] : value;
 
         if (typeof val !== 'undefined') {
-            data.attributes.push([attr, val]);
+            attributes.push([attr, val, !!quotes]);
         } else {
-            data.attributes.push([attr]);
+            attributes.push([attr]);
         }
     }
 
-    return data;
-};
-
-/*
- * HTML tags that are self closing.
- */
-const selfClosingTags = {
-    area : true, base : true, br : true, col : true, embed : true, hr : true, 
-    img : true, input : true, link : true, meta : true, source : true, track : true, wbr : true
+    return attributes;
 };
 
 /*
  * These option keys will be extended on the component instance.
  */
-const componentOptions = {
-    key : true,
-    state : true,
-    onCreate : true,
-    onChange : true,
-    onRender : true
-};
+const componentOptions = ['key', 'state', 'onCreate', 'onChange', 'onHydrate', 'onRecycle', 'onUpdate'];
 
 /**
- * Components are a special kind of `View` that is designed to be easily composable, 
- * making it simple to add child views and build complex user interfaces.  
- * Unlike views, which are render-agnostic, components have a specific set of rendering 
- * guidelines that allow for a more declarative development style.  
- * Components are defined with the {@link #module_component_create Component.create} static method, which takes a tagged template string or a function that returns another component.
- * @module
- * @extends Rasti.View
- * @param {object} options Object containing options. The following keys will be merged to `this`: model, state, key, onDestroy, onRender, onCreate, onChange.
- * @property {string} key A unique key to identify the component. Used to recycle child components.
- * @property {object} model A `Rasti.Model` or any emitter object containing data and business logic. The component will listen to `change` events and call `onChange` lifecycle method.
- * @property {object} state A `Rasti.Model` or any emitter object containing data and business logic, to be used as internal state. The component will listen to `change` events and call `onChange` lifecycle method.
- * @see {@link #module_component_create Component.create}
- * @example
- * import { Component, Model } from 'rasti';
- * // Create Timer component.
- * const Timer = Component.create`
- *     <div>
- *         Seconds: <span>${({ model }) => model.seconds}</span>
- *     </div>
- * `;
- * // Create model to store seconds.
- * const model = new Model({ seconds: 0 });
- * // Mount timer on body.
- * Timer.mount({ model }, document.body);
- * // Increment `model.seconds` every second.
- * setInterval(() => model.seconds++, 1000);
+ * @lends module:Component
  */
 class Component extends View {
     constructor(options = {}) {
         super(...arguments);
-        // Extend "this" with options, mapping componentOptions keys.
+        this.componentOptions = [];
+        // Extend "this" with options.
+        componentOptions.forEach(key => {
+            if (key in options) {
+                this[key] = options[key];
+                this.componentOptions.push(key);
+            }
+        });
+        // Extract props from options that aren't component or view options.
+        const props = {};
         Object.keys(options).forEach(key => {
-            if (componentOptions[key]) this[key] = options[key];
+            if (!this.viewOptions.includes(key) && !this.componentOptions.includes(key)) {
+                props[key] = options[key];
+            }
         });
+        // Store props as Model for reactive updates.
+        this.props = new Model(props);
         // Store options by default.
         this.options = options;
         // Bind `partial` method to `this`.
         this.partial = this.partial.bind(this);
+        // Bind `onChange` method to `this`.
+        this.onChange = this.onChange.bind(this);
         // Call lifecycle method.
         this.onCreate.apply(this, arguments);
     }
 
     /**
-     * Listen to `change` event on a model or emitter object and call `onChange` lifecycle method.
-     * The listener will be removed when the component is destroyed.
-     * By default the component will be subscribed to `this.model` and `this.state`.
-     * @param {Rasti.Model} model A model or emitter object to listen to changes.
-     * @return {Rasti.Component} The component instance.
+     * Get events object for automatic event delegation, based on data attributes.
+     * @return {object} The events object.
+     * @private
      */
-    subscribe(model) {
-        // Check if model has `on` method.
-        if (!model.on) return;
-        // Store bound onChange method.
-        const onChange = this.onChange.bind(this);
-        // Listen to model changes and store unbind function.
-        const off = model.on('change', onChange);
-        // Add unbind function to destroy queue.
-        // So the component stops listening to model changes when destroyed.
-        this.destroyQueue.push(
-            // Rasti `on` method returns an unbind function.
-            // But other libraries may return the object itself.
-            typeof off === 'function' ? off : () => model.off('change', onChange)
-        );
+    events() {
+        const events = {};
+        // Create events object.
+        this.eventsManager.types.forEach(type => {
+            const dataAttribute = Component.ATTRIBUTE_EVENT(type);
+            // Create a listener function that gets the listener index from the data attribute and calls the listener.
+            const listener = function(event, component, matched) {
+                // Get the listener index from the data attribute.
+                const index = matched.getAttribute(dataAttribute);
+                // Root element listener may not have a data attribute.
+                if (index) {
+                    let currentListener = this.eventsManager.listeners[parseInt(index, 10)];
+                    if (typeof currentListener === 'string') currentListener = this[currentListener];
+                    validateListener(currentListener);
+                    // Call the listener.
+                    currentListener.call(this, event, component, matched);
+                }
+            };
+            // Add an event listener to the events object for each event type, using the data attribute
+            // as both a CSS selector and to store the listener's index.
+            events[`${type} [${dataAttribute}]`] = listener;
+            // Add an event listener to the events object for each event type that matches the root element.
+            events[type] = listener;
+        });
+
+        return events;
+    }
 
+    /**
+     * Subscribes to a `change` event on a model or emitter object and invokes the `onChange` lifecycle method.
+     * The subscription is automatically cleaned up when the component is destroyed.
+     * By default, the component subscribes to changes on `this.model`, `this.state`, and `this.props`.
+     * 
+     * @param {Object} model - The model or emitter object to listen to.
+     * @param {string} [type='change'] - The event type to listen for.
+     * @param {Function} [listener=this.onChange] - The callback to invoke when the event is emitted.
+     * @returns {Component} The current component instance for chaining.
+     */
+    subscribe(model, type = 'change', listener = this.onChange) {
+        // Check if model has `on` method.
+        if (model.on) this.listenTo(model, type, listener);
         return this;
     }
 
-    /*
-     * Tell if component is a container.
+    /**
+     * Tell if `Component` is a container.
      * In which case, it will not have an element by itself.
      * It will render a single expression which is expected to return a single component as child.
      * `this.el` will be a reference to that child component's element.
      * @return {boolean}
+     * @private
      */
     isContainer() {
-        return !!(!this.tag && this.template);
+        return this.template.elements.length === 0 && this.template.interpolations.length === 1;
     }
 
-    /*
-     * Override. We don't want to ensure an element on instantiation.
+    /**
+     * Override super method. We don't want to ensure an element on instantiation.
      * We will provide it later.
+     * @private
      */
     ensureElement() {
+        // Store data event listeners.
+        this.eventsManager = new EventsManager();
+        // Store position tracking for recycling.
+        this.pathManager = new PathManager();
+        // Call template function.
+        this.template = getResult(this.template, this);
         // If el is provided, delegate events.
         if (this.el) {
             // If "this.el" is a function, call it to get the element.
             this.el = getResult(this.el, this);
-            this.delegateEvents();
+            // Render the component as a string to generate children components.
+            this.toString();
+            // Hydrate the component.
+            this.hydrate(this.el.parentNode);
         }
     }
 
-    /*
-     * Find view's element on parent node, using its data attribute.
-     * @param parent {node} The parent node.
-     * @return {node} The component's element.
-     */
-    findElement(parent) {
-        return (parent || document).querySelector(`[${Component.DATA_ATTRIBUTE_UID}="${this.uid}"]`);
-    }
-
-    /*
-     * Eval attributes expressions.
-     * @return {object} Object containing add, remove and html properties.
-     */
-    getAttributes() {
-        const add = {};
-        const remove = {};
-        const html = [];
-
-        const attributes = { [Component.DATA_ATTRIBUTE_UID] : this.uid };
-
-        if (this.attributes) Object.assign(attributes, getResult(this.attributes, this));
-        // Store previous attributes.
-        const previousAttributes = this.previousAttributes || {};
-        this.previousAttributes = attributes;
-
-        Object.keys(attributes).forEach(key => {
-            let value = attributes[key];
-            // Transform bool attribute values
-            if (value === false) {
-                remove[key] = true;
-            } else if (value === true) {
-                add[key] = '';
-                html.push(key);
-            } else {
-                if (value === null || typeof value === 'undefined') value = '';
-
-                add[key] = value;
-                html.push(`${Component.sanitize(key)}="${Component.sanitize(value)}"`);
-            }
-        });
-        // Remove attributes that were in previousAttributes but not in current attributes.
-        Object.keys(previousAttributes).forEach(key => {
-            if (!(key in attributes)) {
-                remove[key] = true;
-            }
-        });
-
-        return { add, remove, html : html.join(' ') };
-    }
-
-    /*
+    /**
      * Used internally on the render process.
-     * Attach the view to the dom element.
+     * Attach the `Component` to the dom element providing `this.el`, delegate events, 
+     * subscribe to model changes and call `onHydrate` lifecycle method.
      * @param parent {node} The parent node.
-     * @return {Rasti.Component} The component instance.
+     * @return {Component} The component instance.
+     * @private
      */
     hydrate(parent) {
-        // Listen to model changes and call onChange.
-        if (this.model) this.subscribe(this.model);
-        // Listen to state changes and call onChange.
-        if (this.state) this.subscribe(this.state);
+        ['model', 'state', 'props'].forEach(key => {
+            if (this[key]) this.subscribe(this[key]);
+        });
 
-        if (!this.isContainer()) {
-            this.el = this.findElement(parent);
-            this.delegateEvents();
-            this.children.forEach(child => child.hydrate(this.el));
-        } else {
+        if (this.isContainer()) {
+            // Get references for interpolation marker comments
+            this.template.interpolations[0].hydrate(parent);
+            // Call hydrate on children.
             this.children[0].hydrate(parent);
+            // Set the first element as the component's element.
             this.el = this.children[0].el;
+        } else {
+            // Search for every element in template using getSelector
+            this.template.elements.forEach((element, index) => { 
+                if (index === 0) {
+                    element.hydrate(parent);
+                    if (this.el) element.ref = this.el;
+                    else this.el = element.ref;
+                }
+                else {
+                    element.hydrate(this.el);
+                }
+            });
+            // Delegate events.
+            this.delegateEvents();
+            // Get references for interpolation marker comments
+            this.template.interpolations.forEach(interpolation => interpolation.hydrate(this.el));
+            this.children.forEach(child => child.hydrate(this.el));
         }
-        // Call `onRender` lifecycle method.
-        this.onRender.call(this, Component.RENDER_TYPE_HYDRATE);
+        // Call `onHydrate` lifecycle method.
+        this.onHydrate.call(this);
         // Return `this` for chaining.
         return this;
     }
 
-    /*
-     * Used internally in the render process.
-     * Reuse a view that has `key` when its parent is rendered.
-     * @param parent {node} The parent node.
-     * @return {Rasti.Component} The component instance.
+    /**
+     * Get a `comment` marker with same data attribute as this component.
+     * Used to replace the component when it is recycled.
+     * @return {string} The recycle placeholder.
+     * @private
      */
-    recycle(parent) {
-        // If component is a container, call recycle on its child.
-        if (this.isContainer()) return this.children[0].recycle(parent);
-        // Find placeholder element to be replaced. It has same data attribute as this component.
-        const toBeReplaced = this.findElement(parent);
-        // Replace it with this.el.
-        toBeReplaced.replaceWith(this.el);
-        // Call `onRender` lifecycle method.
-        this.onRender.call(this, Component.RENDER_TYPE_RECYCLE);
-        // Return `this` for chaining.
-        return this;
+    getRecycledMarker() {
+        return `<!--${Component.MARKER_RECYCLED(this.uid)}-->`;
+    }
+
+    /**
+     * Get the component nodes to be inserted into the DOM.
+     * Used internally during the render process, you usually don't need to call it if you use
+     * `mount()`.
+     * For components that render HTML elements you can safely rely on `this.el`.
+     * For container components that render another component you need the wrapper nodes to insert
+     * them into the DOM; use `getNodes()` for that.
+     * @return {Node[]} The component nodes.
+     */
+    getNodes() {
+        return this.isContainer() ?
+            [this.template.interpolations[0].ref[0], ...this.children[0].getNodes(), this.template.interpolations[0].ref[1]] :
+            [this.el];
     }
 
-    /*
-     * Override. Add some custom logic to super `destroy` method.
-     * @param {object} options Options object or any arguments passed to `destroy` method will be passed to `onDestroy` method.
+    /**
+     * Used internally on the render process.
+     * Reuse a `Component` by replacing the placeholder comment with the real nodes.
+     * Call `onRecycle` lifecycle method.
+     * @param parent {node} The parent node.
+     * @return {Component} The component instance.
+     * @private
      */
-    destroy() {
-        super.destroy.apply(this, arguments);
-        // Set destroyed flag to prevent a last render after destroyed.
-        this.destroyed = true;
+    recycle(parent) {
+        // Locate the placeholder comment and replace it with the real nodes
+        const toBeReplaced = findComment(parent, Component.MARKER_RECYCLED(this.uid), isComponent);
+        // Replace it with this.el.
+        toBeReplaced.replaceWith(...this.getNodes());
+        // Call `onRecycle` lifecycle method.
+        this.onRecycle.call(this);
         // Return `this` for chaining.
         return this;
     }
@@ -448,13 +646,22 @@ class Component extends View {
     }
 
     /**
-     * Lifecycle method. Called when the view is rendered.
-     * @param type {string} The render type. Can be `render`, `hydrate` or `recycle`.
+     * Lifecycle method. Called when the component is rendered for the first time and hydrated.
+     */
+    onHydrate() {}
+
+    /**
+     * Lifecycle method. Called when the component is recycled (reused with the same key) and added to the DOM again.
+     */
+    onRecycle() {}
+
+    /**
+     * Lifecycle method. Called when the component is updated or re-rendered.
      */
-    onRender() {}
+    onUpdate() {}
 
     /**
-     * Lifecycle method. Called when the view is destroyed.
+     * Lifecycle method. Called when the component is destroyed.
      * @param {object} options Options object or any arguments passed to `destroy` method.
      */
     onDestroy() {}
@@ -462,18 +669,18 @@ class Component extends View {
     /**
      * Tagged template helper method.
      * Used to create a partial template.  
-     * It will return a one-dimensional array with strings and expressions.  
+     * It will return a Partial object that preserves structure for position-based recycling.
      * Components will be added as children by the parent component. Template strings literals 
      * will be marked as safe HTML to be rendered.
      * This method is bound to the component instance by default.
      * @param {TemplateStringsArray} strings - Template strings.
      * @param  {...any} expressions - Template expressions.
-     * @return {Array} Array containing strings and expressions.
+     * @return {Partial} Partial object containing strings and expressions.
      * @example
      * import { Component } from 'rasti';
      * // Create a Title component.
      * const Title = Component.create`
-     *     <h1>${self => self.renderChildren()}</h1>
+     *     <h1>${({ props }) => props.children}</h1>
      * `;
      * // Create Main component.
      * const Main = Component.create`
@@ -493,156 +700,204 @@ class Component extends View {
      * });
      */
     partial(strings, ...expressions) {
-        return deepFlat(
-            splitPlaceholders(
-                expandComponents(addPlaceholders(strings, expressions), expressions), expressions
-            ).map(item => getExpressionResult(item, this))
-        );
+        const items = splitPlaceholders(
+            parsePartialElements(
+                expandComponents(
+                    addPlaceholders(strings, expressions),
+                    expressions
+                ),
+                expressions
+            ),
+            expressions
+        ).map(item => getExpressionResult(item, this));
+
+        return new Partial(items);
     }
 
-    getRecyclePlaceholder() {
-        if (this.isContainer()) return this.children[0].getRecyclePlaceholder();
-        
-        const tag = getResult(this.tag, this) || 'div';
-        const attributes = `${Component.DATA_ATTRIBUTE_UID}="${this.uid}"`;
+    /**
+     * Render a template part.
+     * @param {any} part - The template part.
+     * @param {function} addChild - The addChild function.
+     * @return {string} The rendered template part.
+     * @private
+     */
+    renderTemplatePart(part, addChild) {
+        const result = getExpressionResult(part, this);
+
+        const parse = item => {
+            if (typeof item !== 'undefined' && item !== null && item !== false && item !== true) {
+                if (item instanceof SafeHTML) return item;
+                if (item instanceof Component) return addChild(item);
+
+                if (item instanceof Partial) {
+                    this.pathManager.push();
+                    const out = item.items.map(subItem => { this.pathManager.increment(); return parse(subItem); }).join('');
+                    this.pathManager.pop();
+                    return out;
+                }
+                // Handle arrays (user loops) - disable tracking.
+                if (Array.isArray(item)) {
+                    this.pathManager.pause();
+                    const out = deepFlat(item).map(parse).join('');
+                    this.pathManager.resume();
+                    return out;
+                }
+                // InterpolationWrapper: add markers and process maintaining tracking.
+                if (item instanceof InterpolationWrapper) {
+                    this.pathManager.increment();
+                    const startMarker = `<!--${Component.MARKER_START(item.interpolationUid)}-->`;
+                    const endMarker = `<!--${Component.MARKER_END(item.interpolationUid)}-->`;
+                    return `${startMarker}${parse(item.result)}${endMarker}`;
+                }
+
+                return Component.sanitize(item);
+            }
+            // Return empty string if item is undefined, null, false, or true.
+            return '';
+        };
 
-        return this.template || !selfClosingTags[tag] ?
-            `<${tag} ${attributes}></${tag}>` :
-            `<${tag} ${attributes} />`;
+        return `${parse(result)}`;
     }
 
-    /*
-     * Treat the whole view as a HTML string.
+    /**
+     * Render the component as a string.
+     * Used internally on the render process.
+     * Use it for server-side rendering or static site generation.
+     * @return {string} The rendered component.
      */
     toString() {
         // Normally there won't be any children, but if there are, destroy them.
         this.destroyChildren();
-        // Container.
-        if (this.isContainer()) return this.template.call(this, this.addChild.bind(this));
-        // Get tag name.
-        const tag = getResult(this.tag, this) || 'div';
-        // Get attributes.
-        const attributes = this.getAttributes().html;
-        // Replace expressions of inner template.
-        const inner = this.template ? this.template.call(this, this.addChild.bind(this)) : '';
-        // Generate outer template.
-        return this.template || !selfClosingTags[tag] ?
-            `<${tag} ${attributes}>${inner}</${tag}>` :
-            `<${tag} ${attributes} />`;
+        // Normally there won't be any data event listeners, but if there are, clear them.
+        this.eventsManager.reset();
+        // Reset position tracking.
+        this.pathManager.reset();
+        // Bind addChild method.
+        const addChild = component => {
+            this.pathManager.track(component);
+            return this.addChild(component);
+        };
+        // Render the template parts.
+        return this.template.parts
+            .map(part => this.renderTemplatePart(part, addChild))
+            .join('');
     }
 
-    /*
-     * View render method.
+    /**
+     * Render the `Component`.  
+     * - If `this.el` is not present, the `Component` will be rendered as a string inside a `DocumentFragment` and hydrated, making `this.el` available. The `onHydrate` lifecycle method will be called.  
+     * - If `this.el` is present, the method will update the attributes and inner HTML of the element, or recreate its child component in the case of a container. The `onUpdate` lifecycle method will be called.  
+     * - When rendering child components, recycling happens in two ways:
+     *   - Components with a `key` are recycled if a previous child with the same key exists.
+     *   - Unkeyed components are recycled if they have the same type and position in the template or partial.
+     *   A recycled `Component` will call the `onRecycle` lifecycle method.  
+     * - If the active element is inside the component, it will retain focus after the render.  
+     * @return {Component} The component instance.
      */
     render() {
         // Prevent a last re render if view is already destroyed.
         if (this.destroyed) return this;
-
-        if (!this.isContainer()) {
-            // If `this.el` is not present, render the view as a string and hydrate it.
-            if (!this.el) {
-                const fragment = this.createElement('template');
-                fragment.innerHTML = this;
-                this.hydrate(fragment.content);
-                return this;
-            }
-            // Set `this.el` attributes.
-            const attributes = this.getAttributes();
-            // Remove attributes.
-            Object.keys(attributes.remove).forEach(key => {
-                this.el.removeAttribute(key);
-            });
-            // Add attributes.
-            Object.keys(attributes.add).forEach(key => {
-                this.el.setAttribute(key, attributes.add[key]);
-            });
+        // If `this.el` is not present, render the view as a string and hydrate it.
+        if (!this.el) {
+            const fragment = parseHTML(this);
+            this.hydrate(fragment);
+            return this;
         }
-        // Check for `template` to see if view has innerHTML.
-        if (this.template) {
-            // Store active element.
-            const activeElement = document.activeElement;
-
+        // Clear event listeners.
+        this.eventsManager.reset();
+        // Reset position tracking.
+        this.pathManager.reset();
+        // Store active element.
+        const activeElement = this.isContainer() ? null : document.activeElement;
+        // Update elements.
+        this.template.elements.forEach(element => element.update());
+        // Store previous children.
+        const previousChildren = this.children;
+        // Clear current children.
+        this.children = [];
+        // Update interpolations.
+        this.template.interpolations.forEach(interpolation => {
             const nextChildren = [];
             const recycledChildren = [];
 
-            const previousChildren = this.children;
-            this.children = [];
-            // Replace expressions. Set html inside of `this.el`.
-            const inner = this.template.call(this, component => {
+            this.pathManager.increment();
+
+            const addChild = component => {
                 let out = component;
-                // Check if child already exists.
-                const found = component.key && previousChildren.find(
-                    previousChild => previousChild.key === component.key
-                );
+                let found = null;
+                // Check if child already exists by key.
+                if (component.key) {
+                    found = previousChildren.find(prev => prev.key === component.key);
+                } else {
+                    // Find by position and type.
+                    found = this.pathManager.findRecyclable(component.constructor);
+                }
 
                 if (found) {
                     // If child already exists, replace it html by its root element.
-                    out = found.getRecyclePlaceholder();
+                    out = found.getRecycledMarker();
                     // Add child to recycled children.
-                    recycledChildren.push(found);
-                    // Destroy new child component. Use recycled one instead.
-                    component.destroy();
+                    recycledChildren.push([found, component]);
+                    // Track the component.
+                    if (!found.key) this.pathManager.track(found);
                 } else {
-                    // Not found. Add new child component.
+                    // Add new component.
                     nextChildren.push(component);
+                    // Track the component.
+                    this.pathManager.track(component);
                 }
-                // Component html.
+                // Return the component or placeholder.
                 return out;
-            });
+            };
 
-            if (this.isContainer()) {
-                if (nextChildren[0]) {
-                    const fragment = this.createElement('template');
-                    fragment.innerHTML = inner;
-                    // Add new child to dom fragment and hydrate it.
-                    this.addChild(nextChildren[0]).hydrate(fragment.content);
-                    // Get next child element.
-                    const nextEl = fragment.content.children[0];
-                    // If `this.el` is present, replace it with nextEl.
-                    if (this.el) this.el.replaceWith(nextEl);
-                    // Set `this.el` to nextEl.
-                    this.el = nextEl;
-                } else if (recycledChildren[0]) {
-                    this.addChild(recycledChildren[0]);
-                } else {
-                    throw new Error('Container component must have a child component');
-                }
-            } else {
-                this.el.innerHTML = inner;
-                // Add new children. Hydrate them.
-                nextChildren.forEach(nextChild => {
-                    this.addChild(nextChild).hydrate(this.el);
-                });
-                // Replace children root elements with recycled components.
-                recycledChildren.forEach(recycledChild => {
-                    this.addChild(recycledChild).recycle(this.el);
-                });
-            }
-            // Destroy unused children.
-            previousChildren.forEach(previousChild => {
-                const found = recycledChildren.indexOf(previousChild) > -1;
-                if (!found) previousChild.destroy();
+            const fragment = parseHTML(this.renderTemplatePart(interpolation.expression, addChild));
+            // Replace children root elements with recycled components.
+            recycledChildren.forEach(([recycled, discarded]) => {
+                this.addChild(recycled).recycle(fragment);
+                // Update props.
+                recycled.props.set(discarded.props.toJSON());
+                // Destroy discarded component.
+                discarded.destroy();
             });
-            // Restore focus.
-            if (this.el.contains(activeElement)) {
-                activeElement.focus();
+            // Add new children. Hydrate them.
+            nextChildren.forEach(child => {
+                this.addChild(child).hydrate(fragment);
+            });
+
+            interpolation.update(fragment);
+        });
+        // Destroy unused children.
+        previousChildren.forEach(prev => {
+            if (this.children.indexOf(prev) < 0) prev.destroy();
+        });
+        // If container, set el to the child element.
+        if (this.isContainer()) {
+            this.el = this.children[0].el;
+        } else {
+            // If there are pending event types, delegate events again.
+            if (this.eventsManager.hasPendingTypes()) {
+                this.delegateEvents();
             }
         }
-        // Call onRender lifecycle method.
-        this.onRender.call(this, Component.RENDER_TYPE_RENDER);
+        // Restore focus.
+        if (activeElement && this.el.contains(activeElement)) {
+            activeElement.focus();
+        }
+        // Call onUpdate lifecycle method.
+        this.onUpdate.call(this);
         // Return this for chaining.
         return this;
     }
 
     /**
-     * Mark a string as safe HTML to be rendered.
-     * Normally you don't need to use this method, as Rasti will automatically mark strings 
-     * as safe HTML when the component is @link{#module_component_create created} and when 
-     * using the @link{#module_component__partial Component.partial} method.
+     * Mark a string as safe HTML to be rendered.  
+     * Normally you don't need to use this method, as Rasti will automatically mark string literals 
+     * as safe HTML when the component is {@link #module_component_create created} and when 
+     * using the {@link #module_component__partial Component.partial} method.  
      * Be sure that the string is safe to be rendered, as it will be inserted into the DOM without any sanitization.
      * @static
      * @param {string} value 
-     * @return {Rasti.SafeHTML} A safe HTML object.
+     * @return {SafeHTML} A safe HTML object.
      */
     static markAsSafeHTML(value) {
         return new SafeHTML(value);
@@ -651,7 +906,7 @@ class Component extends View {
     /**
      * Helper method used to extend a `Component`, creating a subclass.
      * @static
-     * @param {object} object Object containing methods to be added to the new `Component` subclass. Also can be a function that receives the parent prototype and returns an object.
+     * @param {object|Function} object Object containing methods to be added to the new `Component` subclass. Also can be a function that receives the parent prototype and returns an object.
      */
     static extend(object) {
         const Current = this;
@@ -672,27 +927,28 @@ class Component extends View {
      * appends its element into the DOM (if `el` is provided).
      * And returns the view instance.
      * @static
-     * @param {object} options The view options.
-     * @param {node} el Dom element to append the view element.
-     * @param {boolean} hydrate If true, the view will hydrate existing DOM.
-     * @return {Rasti.Component}
+     * @param {object} [options] The view options.
+     * @param {node} [el] Dom element to append the view element.
+     * @param {boolean} [hydrate] If true, the view will hydrate existing DOM.
+     * @return {Component} The component instance.
      */
     static mount(options, el, hydrate) {
-        // Instantiate view.
-        const view = new this(options);
+        // Instantiate component.
+        const component = new this(options);
         // If `el` is passed, mount component.
         if (el) {
             if (hydrate) {
+                // Generate subcomponents.
+                component.toString();
                 // Hydrate existing DOM.
-                view.toString();
-                view.hydrate(el);
+                component.hydrate(el);
             } else {
                 // Append element to the DOM.
-                el.appendChild(view.render().el);
+                el.append(...component.render().getNodes());
             }
         }
-        // Return view instance.
-        return view;
+        // Return component instance.
+        return component;
     }
 
     /**
@@ -705,16 +961,45 @@ class Component extends View {
      * - Template interpolations that are functions will be evaluated during the render process, receiving the view instance as an argument and being bound to it. If the function returns `null`, `undefined`, `false`, or an empty string, the interpolation won't render any content.
      *   ```javascript
      *   const Button = Component.create`
-     *       <button class="${({ options }) => options.className}">
-     *           ${({ options }) => options.renderChildren()}
+     *       <button class="${({ props }) => props.className}">
+     *           ${({ props }) => props.children}
+     *       </button>
+     *   `;
+     *   ```
+     * - Attach DOM event handlers per element using camel-cased attributes.
+     *   Event handlers are automatically bound to the component instance (`this`).
+     *   Internally, Rasti uses event delegation to the component's root element for performance.
+     *   
+     *   **Attribute Quoting:**
+     *   - **Quoted attributes** (`onClick="${handler}"`) evaluate the expression first, useful for dynamic values
+     *   - **Unquoted attributes** (`onClick=${handler}`) pass the function reference directly
+     *   
+     *   **Listener Signature:** `(event, component, matched)`
+     *   - `event`: The native DOM event object
+     *   - `component`: The component instance (same as `this`)
+     *   - `matched`: The element that matched the event (useful for delegation)
+     *   
+     *   ```javascript
+     *   const Button = Component.create`
+     *       <button 
+     *           onClick=${function(event, component, matched) {
+     *               // this === component
+     *               console.log('Button clicked:', matched);
+     *           }}
+     *           onMouseOver="${({ model }) => () => model.isHovered = true}"
+     *           onMouseOut="${({ model }) => () => model.isHovered = false}"
+     *       >
+     *           Click me
      *       </button>
      *   `;
      *   ```
-     * - Event handlers should be passed, at the root element as camelized attributes, in the format `onEventName=${{'selector' : listener }}`. They will be transformed to an event object and delegated to the root element. See {@link #module_view__delegateevents View.delegateEvents}. 
+     *   
+     *   If you need custom delegation (e.g., `{'click .selector': 'handler'}`), 
+     *   you may override the `events` property as described in {@link #module_view__delegateevents View.delegateEvents}.
      * - Boolean attributes should be passed in the format `attribute="${() => true}"`. `false` attributes won't be rendered. `true` attributes will be rendered without a value.
      *   ```javascript
      *   const Input = Component.create`
-     *       <input type="text" disabled=${({ options }) => options.disabled} />
+     *       <input type="text" disabled=${({ props }) => props.disabled} />
      *   `;
      *   ```
      * - If the interpolated function returns a component instance, it will be added as a child component.
@@ -723,21 +1008,21 @@ class Component extends View {
      *   // Create a button component.
      *   const Button = Component.create`
      *       <button class="button">
-     *           ${({ options }) => options.renderChildren()}
+     *           ${({ props }) => props.children}
      *       </button>
      *   `;
      *   // Create a navigation component. Add buttons as children. Iterate over items.
      *   const Navigation = Component.create`
      *       <nav>
-     *           ${({ options }) => options.items.map(
-     *               item => Button.mount({ renderChildren: () => item.label })
+     *           ${({ props }) => props.items.map(
+     *               item => Button.mount({ children : item.label })
      *           )}
      *       </nav>
      *   `;
      *   // Create a header component. Add navigation as a child.
      *   const Header = Component.create`
      *       <header>
-     *           ${({ options }) => Navigation.mount({ items : options.items})}
+     *           ${({ props }) => Navigation.mount({ items : props.items})}
      *       </header>
      *   `;
      *   ```
@@ -746,21 +1031,21 @@ class Component extends View {
      *   // Create a button component.
      *   const Button = Component.create`
      *       <button class="button">
-     *            ${({ options }) => options.renderChildren()}
+     *            ${({ props }) => props.children}
      *       </button>
      *   `;
      *   // Create a navigation component. Add buttons as children. Iterate over items.
      *   const Navigation = Component.create`
      *       <nav>
-     *           ${self => self.options.items.map(
-     *               item => self.partial`<${Button}>${item.label}</${Button}>`
+     *           ${({ props, partial }) => props.items.map(
+     *               item => partial`<${Button}>${item.label}</${Button}>`
      *           )}
      *       </nav>
      *   `;
      *   // Create a header component. Add navigation as a child.
      *   const Header = Component.create`
      *       <header>
-     *           <${Navigation} items="${({ options }) => options.items}" />
+     *           <${Navigation} items="${({ props }) => props.items}" />
      *       </header>
      *   `;
      *   ```
@@ -768,114 +1053,120 @@ class Component extends View {
      *   ```javascript
      *   // Create a button component.
      *   const Button = Component.create`
-     *       <button class="${({ options }) => options.className}">
-     *           ${self => self.renderChildren()}
+     *       <button class="${({ props }) => props.className}">
+     *           ${({ props }) => props.children}
      *       </button>
      *   `;
-     *   // Create a container using the button component
+     *   // Create a container that renders a Button component.
      *   const ButtonOk = Component.create`
      *       <${Button} className="ok">Ok</${Button}>
      *   `;
-     *   // Create a button component using a function
+     *   // Create a container that renders a Button component, using a function.
      *   const ButtonCancel = Component.create(() => Button.mount({
-     *       className: 'cancel',
-     *       renderChildren: () => 'Cancel'
+     *       className : 'cancel',
+     *       children : 'Cancel'
      *   }));
      *   ```
      * @static
-     * @param {string|function} strings - HTML template for the component or a function that mounts a sub component.
+     * @param {string|Function} strings - HTML template for the component or a function that mounts a sub component.
      * @param {...*} expressions - The expressions to be interpolated within the template.
-     * @return {Rasti.Component} The newly created component class.
+     * @return {Component} The newly created component class.
      */
     static create(strings, ...expressions) {
-        const PH = Component.PLACEHOLDER_EXPRESSION('(\\d+)');
         // Containers can be created using create as a functions instead of a tagged template.
         if (typeof strings === 'function') {
             expressions = [strings];
             strings = ['', ''];
         }
-
-        let tag, attributes, events, template;
-        // Create output string for main template. Add placeholders for new lines.
-        const main = expandComponents(addPlaceholders(strings, expressions), expressions);
-
-        let match = main.match(
-            new RegExp(`^\\s*<([a-z]+[1-6]?|${PH})([^>]*)>([\\s\\S]*?)</(\\1|${PH})>\\s*$|^\\s*<([a-z]+[1-6]?|${PH})([^>]*)/>\\s*$`)
+        // Create elements, interpolations and parts arrays.
+        const elements = [], interpolations = [];
+        const parts = splitPlaceholders(
+            parseInterpolations(
+                parseElements(
+                    expandComponents(
+                        addPlaceholders(
+                            strings,
+                            expressions
+                        ).trim(),
+                        expressions
+                    ),
+                    expressions,
+                    elements
+                ),
+                expressions,
+                interpolations
+            ),
+            expressions
         );
-
-        if (match) {
-            // It's a component with tag.
-            const { tag : tagExpression, attributes : attributesAndEvents, inner, close } = parseMatch(match, expressions);
-            // Get tag, attributes.
-            tag = function() {
-                return Component.sanitize(getExpressionResult(tagExpression, this));
-            };
-            // Get attributes.
-            attributes = function() {
-                return expandAttributes(attributesAndEvents, value => getExpressionResult(value, this)).attributes;
-            };
-            // Get events.
-            events = function() {
-                const onlyEvents = expandAttributes(attributesAndEvents, value => getExpressionResult(value, this)).events;
-
-                return Object.keys(onlyEvents).reduce((out, key) => {
-                    const typeListeners = getExpressionResult(onlyEvents[key], this);
-
-                    Object.keys(typeListeners).forEach(selector => {
-                        out[`${key}${selector === '&' ? '' : ` ${selector}`}`] = typeListeners[selector];
-                    });
-
-                    return out;
-                }, {});
-            };
-            // If there is a closing tag, get template.
-            if (close) {
-                const list = inner ? splitPlaceholders(inner, expressions) : [];
-                template = function(addChild) {
-                    return deepFlat(list.map(item => getExpressionResult(item, this))).map(item => {
-                        if (typeof item !== 'undefined' && item !== null && item !== false &&  item !== true) {
-                            if (item instanceof SafeHTML) return item;
-                            if (item instanceof Component) return addChild(item);
-                            return Component.sanitize(item);
-                        }
-                        return '';
-                    }).join('');
-                };
-            }
-        } else {
-            // It's a container.
-            match = main.match(new RegExp(`^\\s*${PH}\\s*$`));
-
-            if (match) {
-                // If there is only one expression and no tag, is a container.
-                template = function(addChild) {
-                    // Replace expressions.
-                    return addChild(getExpressionResult(expressions[match[1]], this)).toString();
+        // Create subclass for this component.
+        return this.extend({
+            template() {
+                return {
+                    elements : elements.map(element => new Element({
+                        getSelector : element.getSelector.bind(this),
+                        getAttributes : element.getAttributes.bind(this)
+                    })),
+                    interpolations : interpolations.map(interpolation => new Interpolation({
+                        getStart : interpolation.getStart.bind(this),
+                        getEnd : interpolation.getEnd.bind(this),
+                        expression : interpolation.expression,
+                        isComponent,
+                        isElement
+                    })),
+                    parts,
                 };
-            } else {
-                throw new SyntaxError('Invalid component');
             }
-        }
-
-        const Current = this;
-        // Create subclass for this component.
-        return Current.extend({
-            // Set root element tag.
-            tag,
-            // Set attributes.
-            attributes,
-            // Set events.
-            events,
-            // Set template.
-            template
         });
     }
 }
 
-Component.PLACEHOLDER_EXPRESSION = (idx) => `__RASTI_{${idx}}__`;
-Component.DATA_ATTRIBUTE_UID = 'data-rasti-uid';
-Component.RENDER_TYPE_HYDRATE = 'hydrate';
-Component.RENDER_TYPE_RECYCLE = 'recycle';
-Component.RENDER_TYPE_RENDER = 'render';
+/*
+ * Attributes used to identify elements and events.
+ */
+Component.ATTRIBUTE_ELEMENT = 'data-rasti-el';
+Component.ATTRIBUTE_EVENT = (type) => `data-rasti-on-${type}`;
+
+/*
+ * Placeholders used to temporarily replace expressions in the template.
+ */
+Component.PLACEHOLDER = (idx) => `__RASTI-${idx}__`;
+
+/*
+ * Markers used to identify interpolation and recycled components.
+ */
+Component.MARKER_RECYCLED = (uid) => `rasti-recycled-${uid}`;
+Component.MARKER_START = (uid) => `rasti-start-${uid}`;
+Component.MARKER_END = (uid) => `rasti-end-${uid}`;
+
+/**
+ * Components are a special kind of `View` that is designed to be easily composable, 
+ * making it simple to add child views and build complex user interfaces.  
+ * Unlike views, which are render-agnostic, components have a specific set of rendering 
+ * guidelines that allow for a more declarative development style.  
+ * Components are defined with the {@link #module_component_create Component.create} static method, which takes a tagged template string or a function that returns another component.
+ * @module
+ * @extends View
+ * @param {object} options Object containing options. The following keys will be merged to `this`: model, state, key, onDestroy, onHydrate, onRecycle, onUpdate, onCreate, onChange. Any additional options not in the component or view options list will be automatically extracted as props and stored as `this.props`.
+ * @property {string} [key] A unique key to identify the component. Components with keys are recycled when the same key is found in the previous render. Unkeyed components are recycled based on type and position.
+ * @property {Rasti.Model} [model] A `Rasti.Model` or any emitter object containing data and business logic. The component will listen to `change` events and call `onChange` lifecycle method.
+ * @property {Rasti.Model} [state] A `Rasti.Model` or any emitter object containing data and business logic, to be used as internal state. The component will listen to `change` events and call `onChange` lifecycle method.
+ * @property {Rasti.Model} [props] Automatically created from any options not merged to the component instance. Contains props passed from parent component as a `Rasti.Model`. The component will listen to `change` events on props and call `onChange` lifecycle method. When a component with a `key` is recycled during parent re-render, new props are automatically updated and any changes trigger a re-render.
+ * @see {@link #module_component_create Component.create}
+ * @example
+ * import { Component, Model } from 'rasti';
+ * // Create Timer component.
+ * const Timer = Component.create`
+ *     <div>
+ *         Seconds: <span>${({ model }) => model.seconds}</span>
+ *     </div>
+ * `;
+ * // Create model to store seconds.
+ * const model = new Model({ seconds: 0 });
+ * // Mount timer on body.
+ * Timer.mount({ model }, document.body);
+ * // Increment `model.seconds` every second.
+ * setInterval(() => model.seconds++, 1000);
+ */
+var Component$1 = Component.create`<div></div>`;
 
-export { Component as default };
+export { Component$1 as default };