fusee-framework 2.7.2 → 2.7.3

package/framework/core/compiler.js

@@ -1,311 +1,323 @@
-import { effect, batch } from './signal.js'
-import { processDirectives } from './directives.js'
-import { parseSlots } from './component-core.js'
-import { resolveElementProperty } from './element-props.js'
-import {
-    evaluateExpression,
-    parseInterpolation,
-    sanitizeAttr,
-    MUSTACHE_RE
-} from './evaluator.js'
-
-export function mountTemplate(template, container, context, components) {
-    const effects = []
-
-    // Lower component tags before the browser parses the template as HTML.
-    let processed = transformComponentTags(template, components)
-
-    for (const name of Object.keys(components)) {
-        const escapedName = escapeRegExp(name)
-        const reWithSlot = new RegExp(
-            `\\{\\{\\s*${escapedName}(\\s[^}]*?|\\s*)\\}\\}([\\s\\S]*?)\\{\\{\\s*\\/${escapedName}\\s*\\}\\}`,
-            'g'
-        )
-        const reNoSlot = new RegExp(`\\{\\{\\s*${escapedName}(\\s+.*?|\\s*)\\}\\}`, 'g')
-
-        processed = processed.replace(reWithSlot, (match, propsStr, slotContent) => {
-            const attrs = parseComponentAttrs(propsStr || '')
-            const encodedSlot = encodeURIComponent(slotContent.trim())
-            return `<div data-component="${name}"${attrs} data-slot="${encodedSlot}"></div>`
-        })
-
-        processed = processed.replace(reNoSlot, (match, propsStr) => {
-            const attrs = parseComponentAttrs(propsStr || '')
-            return `<div data-component="${name}"${attrs}></div>`
-        })
-    }
-
-    container.innerHTML = rewriteBindingAttrs(processed)
-    compileNode(container, context, components, effects)
-
-    return { effects }
-}
-
-const TAG_RE = /<[a-zA-Z][a-zA-Z0-9-]*(?:"[^"]*"|'[^']*'|[^'">])*>/g
-const BINDING_IN_TAG_RE = /("[^"]*"|'[^']*')|(\s):([a-zA-Z][a-zA-Z0-9-]*)=/g
-
-/**
- * Rewrites every `:attr=` inside an element tag to `data-bind-attr=`, since `:` is not a
- * valid attribute name for the HTML parser. Quoted values are skipped, so expressions
- * containing ` :x=` or `>` are left intact. Runs after component tags are lowered, so
- * component props keep their own `data-bind-prop-` encoding.
- */
-function rewriteBindingAttrs(template) {
-    return template.replace(TAG_RE, tag => tag.replace(BINDING_IN_TAG_RE, (match, quoted, space, name) =>
-        quoted ? quoted : `${space}data-bind-${name}=`
-    ))
-}
-
-function transformComponentTags(template, components) {
-    let processed = template
-    const componentNames = Object.keys(components).sort((a, b) => b.length - a.length)
-
-    for (const name of componentNames) {
-        const escapedName = escapeRegExp(name)
-        const withChildren = new RegExp(
-            `<${escapedName}(\\s[^>]*)?>([\\s\\S]*?)<\\/${escapedName}\\s*>`,
-            'gi'
-        )
-        const selfClosing = new RegExp(
-            `<${escapedName}(\\s[^>]*?)?\\s*/>`,
-            'gi'
-        )
-
-        processed = processed.replace(withChildren, (match, propsStr, slotContent) => {
-            const attrs = parseComponentAttrs(propsStr || '')
-            const encodedSlot = encodeURIComponent(slotContent.trim())
-            return `<div data-component="${name}"${attrs} data-slot="${encodedSlot}"></div>`
-        })
-
-        processed = processed.replace(selfClosing, (match, propsStr) => {
-            const attrs = parseComponentAttrs(propsStr || '')
-            return `<div data-component="${name}"${attrs}></div>`
-        })
-    }
-
-    return processed
-}
-
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')
-}
-
-function parseComponentAttrs(propsStr) {
-    let attrs = ''
-    if (!propsStr || !propsStr.trim()) return attrs
-
-    const attrRegex = /(@?:?[a-zA-Z0-9-]+)="([^"]*)"/g
-    let attrMatch
-    while ((attrMatch = attrRegex.exec(propsStr)) !== null) {
-        const attrName = attrMatch[1]
-        const attrValue = attrMatch[2]
-
-        if (attrName.startsWith('@')) {
-            attrs += ` data-on-${attrName.slice(1).toLowerCase()}="${attrValue}"`
-        } else if (attrName.startsWith(':')) {
-            attrs += ` data-bind-prop-${attrName.slice(1).toLowerCase()}="${attrValue}"`
-        } else {
-            attrs += ` data-prop-${attrName.toLowerCase()}="${attrValue}"`
-        }
-    }
-    return attrs
-}
-
-export function compileNode(node, context, components, effects) {
-    if (node.nodeType === 1 && node.hasAttribute('f-once')) {
-        node.removeAttribute('f-once')
-        const temporaryEffects = []
-
-        processDirectives(node, context, components, temporaryEffects)
-        processBindingAttrs(node, context, temporaryEffects)
-        processMustaches(node, context, temporaryEffects)
-        bindComponents(node, components, context, temporaryEffects)
-
-        let child = node.firstChild
-        while (child) {
-            compileOnce(child, context, components, temporaryEffects)
-            child = child.nextSibling
-        }
-
-        for (let i = temporaryEffects.length - 1; i >= 0; i--) {
-            const cleanup = temporaryEffects[i]
-            if (typeof cleanup === 'function') cleanup()
-        }
-        return
-    }
-
-    if (node.nodeType === 1) {
-        if (processDirectives(node, context, components, effects)) return
-        processBindingAttrs(node, context, effects)
-        bindComponents(node, components, context, effects)
-    } else if (node.nodeType === 3) {
-        processMustaches(node, context, effects)
-    }
-
-    let child = node.firstChild
-    while (child) {
-        compileNode(child, context, components, effects)
-        child = child.nextSibling
-    }
-}
-
-function compileOnce(node, context, components, effects) {
-    if (node.nodeType === 1) {
-        if (processDirectives(node, context, components, effects)) return
-        processBindingAttrs(node, context, effects)
-        bindComponents(node, components, context, effects)
-    } else if (node.nodeType === 3) {
-        processMustaches(node, context, effects)
-    }
-
-    let child = node.firstChild
-    while (child) {
-        compileOnce(child, context, components, effects)
-        child = child.nextSibling
-    }
-}
-
-function processMustaches(node, context, effects) {
-    if (node.nodeType !== 3) return
-    const text = node.textContent
-    if (!MUSTACHE_RE.test(text)) return
-
-    const parts = parseInterpolation(text)
-    const fragment = document.createDocumentFragment()
-
-    for (const part of parts) {
-        if (part.type === 'static') {
-            fragment.appendChild(document.createTextNode(part.value))
-        } else {
-            const reactiveNode = document.createTextNode('')
-            fragment.appendChild(reactiveNode)
-            const key = part.key
-            const e = effect(() => {
-                const resolved = evaluateExpression(key, context)
-                reactiveNode.textContent = String(resolved ?? '')
-            })
-            effects.push(e)
-        }
-    }
-    node.parentNode.replaceChild(fragment, node)
-}
-
-function processBindingAttrs(el, context, effects) {
-    if (el.nodeType !== 1) return
-    for (const attr of [...el.attributes]) {
-        if (attr.name.startsWith('data-bind-') && !attr.name.startsWith('data-bind-prop-')) {
-            const realAttr = attr.name.slice(10)
-            const expr = attr.value
-            el.removeAttribute(attr.name)
-
-            const e = effect(() => {
-                let resolved = evaluateExpression(expr, context)
-                const elementProp = realAttr !== 'class' && realAttr !== 'style'
-                    ? resolveElementProperty(el, realAttr, resolved)
-                    : null
-                if (elementProp) {
-                    el[elementProp] = resolved
-                } else if (realAttr === 'class') {
-                    if (!el._staticClass) el._staticClass = el.getAttribute('class') || ''
-                    let dynamicClass = ''
-                    if (Array.isArray(resolved)) dynamicClass = resolved.filter(Boolean).join(' ')
-                    else if (resolved !== null && typeof resolved === 'object') {
-                        dynamicClass = Object.entries(resolved).filter(([_, v]) => !!v).map(([k]) => k).join(' ')
-                    } else dynamicClass = String(resolved ?? '')
-                    el.className = (el._staticClass + ' ' + dynamicClass).trim()
-                } else if (realAttr === 'style') {
-                    if (resolved !== null && typeof resolved === 'object') {
-                        for (const k in resolved) el.style[k] = resolved[k]
-                    } else el.style.cssText = String(resolved ?? '')
-                } else {
-                    if (typeof resolved === 'boolean') {
-                        resolved ? el.setAttribute(realAttr, '') : el.removeAttribute(realAttr)
-                    } else el.setAttribute(realAttr, sanitizeAttr(realAttr, String(resolved)))
-                }
-            })
-            effects.push(e)
-            continue
-        }
-
-        if (MUSTACHE_RE.test(attr.value)) {
-            const attrName = attr.name
-            const parts = parseInterpolation(attr.value)
-            el.removeAttribute(attrName)
-            const e = effect(() => {
-                let result = ''
-                for (const part of parts) {
-                    result += part.type === 'static' ? part.value : String(evaluateExpression(part.key, context) ?? '')
-                }
-                el.setAttribute(attrName, sanitizeAttr(attrName, result))
-            })
-            effects.push(e)
-        }
-    }
-}
-
-function bindComponents(el, components, context, effects) {
-    if (el.nodeType !== 1) return
-    const name = el.getAttribute('data-component')
-    if (!name) return
-
-    el.removeAttribute('data-component')
-
-    const ComponentFn = components[name]
-    if (!ComponentFn) return
-
-    const props = {}
-    const listeners = {}
-
-    for (const attr of [...el.attributes]) {
-        const attrName = attr.name.toLowerCase()
-
-        if (attrName.startsWith('data-prop-')) {
-            props[attrName.slice(10)] = attr.value
-
-        } else if (attrName.startsWith('data-bind-prop-')) {
-            const propName = attrName.slice(15)
-            const expression = attr.value.trim()
-
-            if (expression in context) {
-                Object.defineProperty(props, propName, {
-                    get() {
-                        const val = context[expression]
-                        return typeof val === 'function' && val.isSignal ? val() : val
-                    },
-                    enumerable: true,
-                    configurable: true
-                })
-            } else {
-                Object.defineProperty(props, propName, {
-                    get() { return evaluateExpression(expression, context) },
-                    enumerable: true,
-                    configurable: true
-                })
-            }
-
-        } else if (attrName.startsWith('data-on-')) {
-            const eventName = attrName.slice(8)
-            const handlerExpr = attr.value.trim()
-
-            listeners[eventName] = (...args) => {
-                const handler = context[handlerExpr]
-                if (typeof handler === 'function') {
-                    handler(...args)
-                } else {
-                    evaluateExpression(handlerExpr, context)
-                }
-            }
-        }
-    }
-
-    const rawSlot = el.getAttribute('data-slot')
-    const slots = rawSlot ? parseSlots(decodeURIComponent(rawSlot)) : {}
-    el.removeAttribute('data-slot')
-
-    const childComponent = ComponentFn(props, { listeners, slots, parent: context._instance })
-    childComponent.render(el)
-
-    if (effects) {
-        effects.push(() => childComponent.unmount())
-    }
+import { effect, batch } from './signal.js'
+import { processDirectives } from './directives.js'
+import { parseSlots } from './component-core.js'
+import { resolveElementProperty } from './element-props.js'
+import {
+    evaluateExpression,
+    parseInterpolation,
+    sanitizeAttr,
+    MUSTACHE_RE
+} from './evaluator.js'
+
+export function mountTemplate(template, container, context, components) {
+    const effects = []
+
+    // Lower component tags before the browser parses the template as HTML.
+    let processed = transformComponentTags(template, components)
+
+    for (const name of Object.keys(components)) {
+        const escapedName = escapeRegExp(name)
+        const reWithSlot = new RegExp(
+            `\\{\\{\\s*${escapedName}(\\s[^}]*?|\\s*)\\}\\}([\\s\\S]*?)\\{\\{\\s*\\/${escapedName}\\s*\\}\\}`,
+            'g'
+        )
+        const reNoSlot = new RegExp(`\\{\\{\\s*${escapedName}(\\s+.*?|\\s*)\\}\\}`, 'g')
+
+        processed = processed.replace(reWithSlot, (match, propsStr, slotContent) => {
+            const attrs = parseComponentAttrs(propsStr || '')
+            const encodedSlot = encodeURIComponent(slotContent.trim())
+            return `<div data-component="${name}"${attrs} data-slot="${encodedSlot}"></div>`
+        })
+
+        processed = processed.replace(reNoSlot, (match, propsStr) => {
+            const attrs = parseComponentAttrs(propsStr || '')
+            return `<div data-component="${name}"${attrs}></div>`
+        })
+    }
+
+    container.innerHTML = rewriteBindingAttrs(processed)
+    compileNode(container, context, components, effects)
+
+    return { effects }
+}
+
+const TAG_RE = /<[a-zA-Z][a-zA-Z0-9-]*(?:"[^"]*"|'[^']*'|[^'">])*>/g
+const BINDING_IN_TAG_RE = /("[^"]*"|'[^']*')|(\s):([a-zA-Z][a-zA-Z0-9-]*)=/g
+
+/**
+ * Rewrites every `:attr=` inside an element tag to `data-bind-attr=`, since `:` is not a
+ * valid attribute name for the HTML parser. Quoted values are skipped, so expressions
+ * containing ` :x=` or `>` are left intact. Runs after component tags are lowered, so
+ * component props keep their own `data-bind-prop-` encoding.
+ */
+function rewriteBindingAttrs(template) {
+    return template.replace(TAG_RE, tag => tag.replace(BINDING_IN_TAG_RE, (match, quoted, space, name) =>
+        quoted ? quoted : `${space}data-bind-${name}=`
+    ))
+}
+
+function transformComponentTags(template, components) {
+    let processed = template
+    const componentNames = Object.keys(components).sort((a, b) => b.length - a.length)
+
+    for (const name of componentNames) {
+        const escapedName = escapeRegExp(name)
+        const withChildren = new RegExp(
+            `<${escapedName}(\\s[^>]*)?>([\\s\\S]*?)<\\/${escapedName}\\s*>`,
+            'gi'
+        )
+        const selfClosing = new RegExp(
+            `<${escapedName}(\\s[^>]*?)?\\s*/>`,
+            'gi'
+        )
+
+        processed = processed.replace(withChildren, (match, propsStr, slotContent) => {
+            const attrs = parseComponentAttrs(propsStr || '')
+            const encodedSlot = encodeURIComponent(slotContent.trim())
+            return `<div data-component="${name}"${attrs} data-slot="${encodedSlot}"></div>`
+        })
+
+        processed = processed.replace(selfClosing, (match, propsStr) => {
+            const attrs = parseComponentAttrs(propsStr || '')
+            return `<div data-component="${name}"${attrs}></div>`
+        })
+    }
+
+    return processed
+}
+
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')
+}
+
+function parseComponentAttrs(propsStr) {
+    let attrs = ''
+    if (!propsStr || !propsStr.trim()) return attrs
+
+    const attrRegex = /(@?:?[a-zA-Z0-9-]+)="([^"]*)"/g
+    let attrMatch
+    while ((attrMatch = attrRegex.exec(propsStr)) !== null) {
+        const attrName = attrMatch[1]
+        const attrValue = attrMatch[2]
+
+        if (attrName.startsWith('@')) {
+            attrs += ` data-on-${attrName.slice(1).toLowerCase()}="${attrValue}"`
+        } else if (attrName.startsWith(':')) {
+            attrs += ` data-bind-prop-${attrName.slice(1).toLowerCase()}="${attrValue}"`
+        } else {
+            attrs += ` data-prop-${attrName.toLowerCase()}="${attrValue}"`
+        }
+    }
+    return attrs
+}
+
+export function compileNode(node, context, components, effects) {
+    if (node.nodeType === 1 && node.hasAttribute('f-once')) {
+        node.removeAttribute('f-once')
+        const temporaryEffects = []
+        const ownsContent = setsOwnContent(node)
+
+        processDirectives(node, context, components, temporaryEffects)
+        processBindingAttrs(node, context, temporaryEffects)
+        processMustaches(node, context, temporaryEffects)
+        bindComponents(node, components, context, temporaryEffects)
+
+        if (!ownsContent) forEachChild(node, child => compileOnce(child, context, components, temporaryEffects))
+
+        for (let i = temporaryEffects.length - 1; i >= 0; i--) {
+            const cleanup = temporaryEffects[i]
+            if (typeof cleanup === 'function') cleanup()
+        }
+        return
+    }
+
+    if (node.nodeType === 1) {
+        const ownsContent = setsOwnContent(node)
+        if (processDirectives(node, context, components, effects)) return
+        processBindingAttrs(node, context, effects)
+        bindComponents(node, components, context, effects)
+        if (ownsContent) return
+    } else if (node.nodeType === 3) {
+        processMustaches(node, context, effects)
+    }
+
+    forEachChild(node, child => compileNode(child, context, components, effects))
+}
+
+/**
+ * f-text / f-html write the element's content from data. That content is output, not
+ * template: compiling it would evaluate any {{ }} or directives a value happens to contain.
+ */
+function setsOwnContent(node) {
+    return node.hasAttribute('f-text') || node.hasAttribute('f-html')
+}
+
+/**
+ * Visits the children present when the walk starts. Compiling a child can replace it
+ * (interpolated text becomes a fragment) or detach later siblings (an f-if group), so
+ * following child.nextSibling would stop early or visit detached nodes.
+ */
+function forEachChild(node, visit) {
+    for (const child of Array.from(node.childNodes)) {
+        if (child.parentNode === node) visit(child)
+    }
+}
+
+function compileOnce(node, context, components, effects) {
+    if (node.nodeType === 1) {
+        const ownsContent = setsOwnContent(node)
+        if (processDirectives(node, context, components, effects)) return
+        processBindingAttrs(node, context, effects)
+        bindComponents(node, components, context, effects)
+        if (ownsContent) return
+    } else if (node.nodeType === 3) {
+        processMustaches(node, context, effects)
+    }
+
+    forEachChild(node, child => compileOnce(child, context, components, effects))
+}
+
+function processMustaches(node, context, effects) {
+    if (node.nodeType !== 3) return
+    const text = node.textContent
+    if (!MUSTACHE_RE.test(text)) return
+
+    const parts = parseInterpolation(text)
+    const fragment = document.createDocumentFragment()
+
+    for (const part of parts) {
+        if (part.type === 'static') {
+            fragment.appendChild(document.createTextNode(part.value))
+        } else {
+            const reactiveNode = document.createTextNode('')
+            fragment.appendChild(reactiveNode)
+            const key = part.key
+            const e = effect(() => {
+                const resolved = evaluateExpression(key, context)
+                reactiveNode.textContent = String(resolved ?? '')
+            })
+            effects.push(e)
+        }
+    }
+    node.parentNode.replaceChild(fragment, node)
+}
+
+function processBindingAttrs(el, context, effects) {
+    if (el.nodeType !== 1) return
+    for (const attr of [...el.attributes]) {
+        if (attr.name.startsWith('data-bind-') && !attr.name.startsWith('data-bind-prop-')) {
+            const realAttr = attr.name.slice(10)
+            const expr = attr.value
+            el.removeAttribute(attr.name)
+
+            const e = effect(() => {
+                let resolved = evaluateExpression(expr, context)
+                const elementProp = realAttr !== 'class' && realAttr !== 'style'
+                    ? resolveElementProperty(el, realAttr, resolved)
+                    : null
+                if (elementProp) {
+                    el[elementProp] = resolved
+                } else if (realAttr === 'class') {
+                    if (!el._staticClass) el._staticClass = el.getAttribute('class') || ''
+                    let dynamicClass = ''
+                    if (Array.isArray(resolved)) dynamicClass = resolved.filter(Boolean).join(' ')
+                    else if (resolved !== null && typeof resolved === 'object') {
+                        dynamicClass = Object.entries(resolved).filter(([_, v]) => !!v).map(([k]) => k).join(' ')
+                    } else dynamicClass = String(resolved ?? '')
+                    el.className = (el._staticClass + ' ' + dynamicClass).trim()
+                } else if (realAttr === 'style') {
+                    if (resolved !== null && typeof resolved === 'object') {
+                        for (const k in resolved) el.style[k] = resolved[k]
+                    } else el.style.cssText = String(resolved ?? '')
+                } else {
+                    if (typeof resolved === 'boolean') {
+                        resolved ? el.setAttribute(realAttr, '') : el.removeAttribute(realAttr)
+                    } else el.setAttribute(realAttr, sanitizeAttr(realAttr, String(resolved)))
+                }
+            })
+            effects.push(e)
+            continue
+        }
+
+        if (MUSTACHE_RE.test(attr.value)) {
+            const attrName = attr.name
+            const parts = parseInterpolation(attr.value)
+            el.removeAttribute(attrName)
+            const e = effect(() => {
+                let result = ''
+                for (const part of parts) {
+                    result += part.type === 'static' ? part.value : String(evaluateExpression(part.key, context) ?? '')
+                }
+                el.setAttribute(attrName, sanitizeAttr(attrName, result))
+            })
+            effects.push(e)
+        }
+    }
+}
+
+function bindComponents(el, components, context, effects) {
+    if (el.nodeType !== 1) return
+    const name = el.getAttribute('data-component')
+    if (!name) return
+
+    el.removeAttribute('data-component')
+
+    const ComponentFn = components[name]
+    if (!ComponentFn) return
+
+    const props = {}
+    const listeners = {}
+
+    for (const attr of [...el.attributes]) {
+        const attrName = attr.name.toLowerCase()
+
+        if (attrName.startsWith('data-prop-')) {
+            props[attrName.slice(10)] = attr.value
+
+        } else if (attrName.startsWith('data-bind-prop-')) {
+            const propName = attrName.slice(15)
+            const expression = attr.value.trim()
+
+            if (expression in context) {
+                Object.defineProperty(props, propName, {
+                    get() {
+                        const val = context[expression]
+                        return typeof val === 'function' && val.isSignal ? val() : val
+                    },
+                    enumerable: true,
+                    configurable: true
+                })
+            } else {
+                Object.defineProperty(props, propName, {
+                    get() { return evaluateExpression(expression, context) },
+                    enumerable: true,
+                    configurable: true
+                })
+            }
+
+        } else if (attrName.startsWith('data-on-')) {
+            const eventName = attrName.slice(8)
+            const handlerExpr = attr.value.trim()
+
+            listeners[eventName] = (...args) => {
+                const handler = context[handlerExpr]
+                if (typeof handler === 'function') {
+                    handler(...args)
+                } else {
+                    evaluateExpression(handlerExpr, context)
+                }
+            }
+        }
+    }
+
+    const rawSlot = el.getAttribute('data-slot')
+    const slots = rawSlot ? parseSlots(decodeURIComponent(rawSlot)) : {}
+    el.removeAttribute('data-slot')
+
+    const childComponent = ComponentFn(props, { listeners, slots, parent: context._instance })
+    childComponent.render(el)
+
+    if (effects) {
+        effects.push(() => childComponent.unmount())
+    }
 }

package/framework/di/index.js

@@ -0,0 +1,9 @@
+// fusee-framework/di — injection tokens and the root injector.
+// Component-level provide() / inject() stay in the core entry.
+export {
+    InjectionToken,
+    provideGlobal,
+    EnvironmentInjector,
+    rootInjector,
+    runInContext
+} from '../core/di.js'