mnfst 0.5.229 → 0.5.231

package/lib/manifest.toasts.js

@@ -3,6 +3,57 @@
 (function () {
 
 
+// mnfst:expressions:start — synced by the build from scripts/snippets/manifest.expressions.js; edit there
+// Directive values: any JS expression evaluates; text that isn't one stays verbatim.
+
+const EXPR_BARE_IDENTIFIER = /^[\p{ID_Start}$_][\p{ID_Continue}$]*$/u;
+// No name, string or template: numbers, dates, ratios ("24/7", "2026-10-13") stay text
+const EXPR_HAS_TOKEN = /[\p{L}$_'"`]/u;
+
+function exprParses(src) {
+    try { new Function('return (' + src + '\n)'); return true; } catch { return false; }
+}
+
+function exprInScope(el, name) {
+    try { return name in Alpine.$data(el); } catch { return false; }
+}
+
+// Errors come back as values: unresolved names read as plain text
+// ("Re-run", "Hello, world"); other errors warn against the authored expression
+const exprGuarded = (src) =>
+    '(() => { try { return (' + src + '\n) } catch (e) { return { __exprError: e } } })()';
+
+function exprUnwrap(v, el, src) {
+    const err = v && typeof v === 'object' && v.__exprError;
+    if (!(err instanceof Error)) return v;
+    if (err instanceof ReferenceError) return undefined;
+    console.warn(`Alpine Expression Error: ${err.message}\n\nExpression: "${src}"\n\n`, el);
+    return null;
+}
+
+// null for static text; else (cb) => cb(value, asText), asText meaning the
+// authored text shows instead (unresolved name, undefined, NaN)
+function expressionResolver(el, src, evaluateLater) {
+    if (src.startsWith('$x.')) {
+        const getValue = evaluateLater(src);
+        return (cb) => getValue(v => cb(v, false));
+    }
+    if (!EXPR_HAS_TOKEN.test(src) || !exprParses(src)) return null;
+    let getValue;
+    if (EXPR_BARE_IDENTIFIER.test(src)) {
+        // Single word: a scope value or magic, else text (never a global like Image or close)
+        const getWord = evaluateLater(exprGuarded(src));
+        getValue = (cb) => (src.startsWith('$') || exprInScope(el, src)) ? getWord(cb) : cb(undefined);
+    } else {
+        getValue = evaluateLater(exprGuarded(src));
+    }
+    return (cb) => getValue(raw => {
+        const v = exprUnwrap(raw, el, src);
+        cb(v, v === undefined || Number.isNaN(v));
+    });
+}
+// mnfst:expressions:end
+
 const TOAST_DURATION = 3000; // Default duration in ms
 
 function initializeToastPlugin() {
@@ -127,7 +178,7 @@ function initializeToastPlugin() {
     };
 
     // Add toast directive
-    Alpine.directive('toast', (el, { modifiers, expression }, { evaluate }) => {
+    Alpine.directive('toast', (el, { modifiers, expression }, { evaluateLater }) => {
         // Parse options from modifiers
         const options = {
             type: modifiers.includes('brand') ? 'brand' :
@@ -146,32 +197,11 @@ function initializeToastPlugin() {
             options.duration = modifiers.includes('long') ? TOAST_DURATION * 2 : TOAST_DURATION;
         }
 
-        // Handle both static and dynamic expressions
-        let message;
-        try {
-            // Check if expression starts with $x (data sources)
-            if (expression.startsWith('$x.')) {
-                // Use evaluate for $x expressions to access collections
-                message = evaluate(expression);
-            } else if (expression.includes('<') && expression.includes('>')) {
-                // Treat as literal HTML string - preserve spaces and formatting
-                // Escape quotes to prevent syntax errors, but keep the HTML intact
-                const escapedExpression = expression.replace(/'/g, "\\'");
-                message = evaluate(`'${escapedExpression}'`);
-            } else if (expression.includes('+') || expression.includes('`') || expression.includes('${')) {
-                // Try to evaluate as a dynamic expression
-                message = evaluate(expression);
-            } else {
-                // Use as static string
-                message = expression;
-            }
-        } catch (e) {
-            // If evaluation fails, use the expression as a static string
-            message = expression;
-        }
-
-        // Store the toast options on the element
-        el._toastOptions = { message, options };
+        // Static text (author HTML included) shows as written; expressions
+        // evaluate on every click. Empty results (null, false, '') show nothing.
+        const src = expression.trim();
+        const evaluate = expressionResolver(el, src, evaluateLater);
+        if (evaluate && src.startsWith('$x.')) evaluate(() => {}); // starts the source loading
 
         // Add click handler that works with other handlers
         const originalClick = el.onclick;
@@ -181,7 +211,13 @@ function initializeToastPlugin() {
                 originalClick.call(el, e);
             }
             // Show toast after original handler
-            showToast(message, options);
+            if (!evaluate) { showToast(expression, options); return; }
+            // After the element's other click listeners, so state they change shows
+            setTimeout(() => evaluate((v, asText) => {
+                if (asText) { showToast(expression, options); return; }
+                const message = v == null || v === false ? '' : String(v);
+                if (message !== '') showToast(message, options);
+            }));
         };
     });
 

package/lib/manifest.tooltips.js

@@ -3,6 +3,57 @@
 (function () {
 
 
+// mnfst:expressions:start — synced by the build from scripts/snippets/manifest.expressions.js; edit there
+// Directive values: any JS expression evaluates; text that isn't one stays verbatim.
+
+const EXPR_BARE_IDENTIFIER = /^[\p{ID_Start}$_][\p{ID_Continue}$]*$/u;
+// No name, string or template: numbers, dates, ratios ("24/7", "2026-10-13") stay text
+const EXPR_HAS_TOKEN = /[\p{L}$_'"`]/u;
+
+function exprParses(src) {
+    try { new Function('return (' + src + '\n)'); return true; } catch { return false; }
+}
+
+function exprInScope(el, name) {
+    try { return name in Alpine.$data(el); } catch { return false; }
+}
+
+// Errors come back as values: unresolved names read as plain text
+// ("Re-run", "Hello, world"); other errors warn against the authored expression
+const exprGuarded = (src) =>
+    '(() => { try { return (' + src + '\n) } catch (e) { return { __exprError: e } } })()';
+
+function exprUnwrap(v, el, src) {
+    const err = v && typeof v === 'object' && v.__exprError;
+    if (!(err instanceof Error)) return v;
+    if (err instanceof ReferenceError) return undefined;
+    console.warn(`Alpine Expression Error: ${err.message}\n\nExpression: "${src}"\n\n`, el);
+    return null;
+}
+
+// null for static text; else (cb) => cb(value, asText), asText meaning the
+// authored text shows instead (unresolved name, undefined, NaN)
+function expressionResolver(el, src, evaluateLater) {
+    if (src.startsWith('$x.')) {
+        const getValue = evaluateLater(src);
+        return (cb) => getValue(v => cb(v, false));
+    }
+    if (!EXPR_HAS_TOKEN.test(src) || !exprParses(src)) return null;
+    let getValue;
+    if (EXPR_BARE_IDENTIFIER.test(src)) {
+        // Single word: a scope value or magic, else text (never a global like Image or close)
+        const getWord = evaluateLater(exprGuarded(src));
+        getValue = (cb) => (src.startsWith('$') || exprInScope(el, src)) ? getWord(cb) : cb(undefined);
+    } else {
+        getValue = evaluateLater(exprGuarded(src));
+    }
+    return (cb) => getValue(raw => {
+        const v = exprUnwrap(raw, el, src);
+        cb(v, v === undefined || Number.isNaN(v));
+    });
+}
+// mnfst:expressions:end
+
 // Hover delay from CSS var (with time-unit parsing). Defaults to 500ms.
 function getTooltipHoverDelay(element) {
     let computedStyle = getComputedStyle(element);
@@ -157,33 +208,8 @@ function initializeTooltipPlugin() {
         if (wasOpen) markTooltipHidden();
     }
 
-    // ---- Content classification ----
-    // Any JS expression evaluates; text that isn't one renders verbatim.
-
-    const BARE_IDENTIFIER = /^[\p{ID_Start}$_][\p{ID_Continue}$]*$/u;
     const looksLikeHtml = (s) => s.includes('<') && s.includes('>');
 
-    function parsesAsExpression(src) {
-        try { new Function('return (' + src + '\n)'); return true; } catch { return false; }
-    }
-
-    function inScope(el, name) {
-        try { return name in Alpine.$data(el); } catch { return false; }
-    }
-
-    // Errors come back as values: unresolved names read as plain text
-    // ("Re-run", "Hello, world"); other errors warn against the authored expression
-    const guarded = (src) =>
-        '(() => { try { return (' + src + '\n) } catch (e) { return { __tooltipError: e } } })()';
-
-    function unwrapError(v, el, src) {
-        const err = v && typeof v === 'object' && v.__tooltipError;
-        if (!(err instanceof Error)) return { value: v };
-        if (err instanceof ReferenceError) return { value: undefined };
-        console.warn(`Alpine Expression Error: ${err.message}\n\nExpression: "${src}"\n\n`, el);
-        return { value: null };
-    }
-
     // ---- Directive ----
 
     Alpine.directive('tooltip', (el, { modifiers, expression }, { effect, evaluateLater }) => {
@@ -193,25 +219,16 @@ function initializeTooltipPlugin() {
         const htmlOptIn = modifiers.includes('html') || modifiers.includes('safe');
         const literal = expression ? { text: expression, html: htmlOptIn || looksLikeHtml(expression) } : null;
         const src = expression.trim();
-        let evaluate = null;
-        let fallback = true;
+        const evaluate = expressionResolver(el, src, evaluateLater);
 
         if (src.startsWith('$x.')) {
             const [contentType] = src.substring(3).split('.');
-            evaluate = evaluateLater(src);
-            fallback = false;
             effect(() => {
                 const store = Alpine.store('collections');
                 if (store && typeof store.loadCollection === 'function' && !store[contentType]) {
                     store.loadCollection(contentType);
                 }
             });
-        } else if (BARE_IDENTIFIER.test(src)) {
-            // Single word: a scope value or magic, else text (never a global like Image or close)
-            const getValue = evaluateLater(guarded(src));
-            evaluate = (cb) => (src.startsWith('$') || inScope(el, src)) ? getValue(cb) : cb(undefined);
-        } else if (parsesAsExpression(src)) {
-            evaluate = evaluateLater(guarded(src));
         }
 
         // --- Positioning modifiers ---
@@ -222,11 +239,10 @@ function initializeTooltipPlugin() {
         // Empty results (null, false, '') show nothing.
         const resolveContent = (cb) => {
             if (!evaluate) { cb(literal); return; }
-            evaluate(raw => {
-                const v = fallback ? unwrapError(raw, el, src).value : raw;
-                if (fallback && (v === undefined || Number.isNaN(v))) { cb(literal); return; }
-                if (v == null || v === false || v === '') { cb(null); return; }
-                cb({ text: String(v), html: htmlOptIn });
+            evaluate((v, asText) => {
+                if (asText) { cb(literal); return; }
+                const text = v == null || v === false ? '' : String(v);
+                cb(text === '' ? null : { text, html: htmlOptIn });
             });
         };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mnfst",
-    "version": "0.5.229",
+    "version": "0.5.231",
     "private": false,
     "workspaces": [
         "templates/starter",