Remove call function

Author: dy

core.js

@@ -113,7 +113,7 @@ export const parse = (expr) => {
     try {
       let result = fn?.call(this, state)
       // if cb is given (to handle async/await exprs, usually directive update) - call it with result and return a cleanup function
-      if (cb) return result?.then ? (result.then(v => _out = cb(v)), () => _out && call(_out)) : cb(result)
+      if (cb) return result?.then ? (result.then(v => _out = cb(v)), () => typeof _out === 'function' && _out()) : cb(result)
       else return result
     } catch (e) {
       console.error(`∴ ${e}\n\n${currentDir}="${expr}"`)
@@ -178,9 +178,6 @@ export const frag = (tpl) => {
   }
 }
 
-// if value is function - return result of its call
-export const call = (v, arg) => typeof v === 'function' ? v(arg) : v
-
 // camel to kebab
 export const dashcase = (str) => str.replace(/[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g, (match, i) => (i ? '-' : '') + match.toLowerCase());
 

directive/_.js

@@ -1,3 +1,3 @@
-import { attr, call } from "../core.js";
+import { attr } from "../core.js";
 
-export default (el, st, ex, name) => v => attr(el, name, v && call(v, el.getAttribute(name)))
+export default (el, st, ex, name) => v => attr(el, name, typeof v === 'function' ? v(el.getAttribute(name)) : v)

directive/class.js

@@ -1,4 +1,4 @@
-import { clsx, call, decorate } from "../core.js";
+import { clsx, decorate } from "../core.js";
 
 export default (el, st, ex, name) => {
   let _cur = new Set, _new
@@ -8,7 +8,7 @@ export default (el, st, ex, name) => {
 
   return (v) => {
     _new = new Set
-    if (v) clsx(call(v, el.className)).split(' ').map(c => c && _new.add(c))
+    if (v) clsx(typeof v === 'function' ? v(el.className) : v).split(' ').map(c => c && _new.add(c))
     for (let c of _cur) if (_new.has(c)) _new.delete(c); else el.classList.remove(c);
     for (let c of _cur = _new) el.classList.add(c)
   }

directive/event.js

@@ -1,12 +1,12 @@
-import { call, parse, decorate } from "../core.js"
+import { parse, decorate } from "../core.js"
 
 export default (el, state, expr, name) => {
   // wrap inline cb into function
   // if (!/^(?:[\w$]+|\([^()]*\))\s*=>/.test(expr) && !/^function\b/.test(expr)) expr = `()=>{${expr}}`;
 
   const [type, ...mods] = name.slice(2).split('.'),
     evaluate = parse(expr).bind(el),
-    trigger = decorate(Object.assign(e => evaluate(state, (fn) => fn && call(fn, e)), { target: el }), mods);
+    trigger = decorate(Object.assign(e => evaluate(state, (fn) => typeof fn === 'function' ? fn(e) : fn), { target: el }), mods);
 
   trigger.target.addEventListener(type, trigger, trigger)
   return {

directive/fx.js

@@ -1,3 +1 @@
-import { call } from "../core.js"
-
-export default () => call
+export default () => (fn) => typeof fn === 'function' && fn()

directive/scope.js

@@ -1,4 +1,4 @@
-import sprae, { store, call, untracked, _state, _signals, signal } from '../core.js'
+import sprae, { store, untracked, _state, _signals, signal } from '../core.js'
 
 export default (el, rootState) => {
   // 0 run pre-creates state to provide scope for the first effect - it can write vars in it, so we should already have it
@@ -8,7 +8,7 @@ export default (el, rootState) => {
   // 1st run spraes subtree with values from scope - it can be postponed by modifiers (we isolate reads from parent effect)
   // 2nd+ runs update subscope
   return values => {
-    values = call(values, state);
+    values = typeof values === 'function' ? values(state) : values;
 
     // we bind to subscope to alleviate friction using scope method directly
     // also returned props should force-create signals in subscope, not overwriting parent

directive/sequence.js

@@ -1,5 +1,5 @@
 // events directive with enabled aliases and sequences like :onclick.ctrl.once..keyup.enter
-import { _dispose, call, parse, decorate } from "../core.js"
+import { _dispose, parse, decorate } from "../core.js"
 
 export default (el, state, expr, names) => {
   let cur, // current step callback
@@ -12,7 +12,7 @@ export default (el, state, expr, names) => {
       const evaluate = parse(expr).bind(el)
 
       const trigger = decorate(Object.assign(
-        e => (!i ? evaluate(state, (fn) => cur = fn && call(fn, e)) : (cur = cur(e)), off(), off = steps[(i + 1) % length]()),
+        e => (!i ? evaluate(state, (fn) => cur = typeof fn === 'function' ? fn(e) : fn) : (cur = cur(e)), off(), off = steps[(i + 1) % length]()),
         { target: el }
       ), mods)
 

directive/style.js

@@ -1,4 +1,4 @@
-import { call, attr, decorate } from "../core.js";
+import { attr, decorate } from "../core.js";
 
 export default (el, st, ex, name) => {
   let _static;
@@ -8,7 +8,7 @@ export default (el, st, ex, name) => {
 
   return v => {
     if (!_static) { _static = el.getAttribute("style") }
-    if (v) v = call(v, el.style)
+    v = typeof v === "function" ? v(el.style) : v
     if (typeof v === "string") attr(el, "style", _static + '; ' + v);
     else {
       if (_static) attr(el, "style", _static);

directive/text.js

@@ -1,7 +1,7 @@
-import { frag, call } from "../core.js"
+import { frag } from "../core.js"
 
 export default el => (
   // <template :text="a"/> or previously initialized template
   el.content && el.replaceWith(el = frag(el).childNodes[0]),
-  v => (v = v && call(v, el.textContent), el.textContent = v == null ? "" : v)
+  v => (v = typeof v === 'function' ? v(el.textContent) : v, el.textContent = v == null ? "" : v)
 )

sprae.js

@@ -1,7 +1,7 @@
 import store from "./store.js";
 import { batch, computed, effect, signal, untracked } from './core.js';
 import * as signals from './signal.js';
-import sprae, { use, decorate, directive, modifier, parse, throttle, debounce, _off, _state, _on, _dispose, _add, call } from './core.js';
+import sprae, { use, decorate, directive, modifier, parse, throttle, debounce, _off, _state, _on, _dispose, _add } from './core.js';
 import pkg from './package.json' with { type: 'json' };
 
 import _if from "./directive/if.js";
@@ -53,7 +53,7 @@ const dir = (target, name, expr, state) => {
       change = signal(0), // signal authorized to trigger effect: 0 = init; >0 = trigger
       count = 0, // called effect count
       evaluate = update.eval ?? parse(expr).bind(target),
-      _out, out = () => (_out && call(_out), _out=null) // effect trigger and invoke may happen in the same tick, so it will be effect-within-effect call - we need to store output of evaluate to return from trigger effect
+      _out, out = () => (typeof _out === 'function' && _out(), _out=null) // effect trigger and invoke may happen in the same tick, so it will be effect-within-effect call - we need to store output of evaluate to return from trigger effect
 
     state =  target[_state] ?? state