1
0
mirror of https://github.com/jaandrle/deka-dom-el synced 2025-07-01 20:32:13 +02:00

♻️ Simplify signals logic (use functions to read/set)

This commit is contained in:
2023-08-24 14:52:46 +02:00
parent 404971f484
commit acdfb4ef57
4 changed files with 26 additions and 32 deletions

View File

@ -20,12 +20,7 @@ export function createElementNS(tag, attributes, attributes_todo){
}
export { createElementNS as elNS };
import { watch } from './signals.js';
function isReactive(key, attr){
if(typeof attr !== "function") return false;
if(key.startsWith("on")) return false;
return true;
}
import { watch, isSignal } from './signals.js';
export function assign(element, ...attributes){
if(!attributes.length) return element;
const is_svg= element instanceof SVGElement;
@ -34,7 +29,7 @@ export function assign(element, ...attributes){
Object.entries(Object.assign({}, ...attributes)).forEach(function assignNth([ key, attr ]){
if(key[0]==="=") return setRemoveAttr(key.slice(1), attr);
if(key[0]===".") return setDelete(element, key.slice(1), attr);
if(isReactive(key, attr))
if(isSignal(attr)) //TODO: unmounted
return watch(()=> assignNth([ key, attr() ]));
if(typeof attr === "object"){
switch(key){

View File

@ -1,23 +1,16 @@
const mark= Symbol.for("signal");
export function isSignal(candidate){
try{
return Reflect.has(candidate, mark);
} catch(e){
return false;
}
try{ return Reflect.has(candidate, mark); }
catch(e){ return false; }
}
export function S(signal, ...value){
if(typeof signal==="function"){
const out= create();
watch(()=> S(out, signal()));
return out;
}
if(!isSignal(signal))
export function S(signal){
if(typeof signal!=="function")
return create(signal);
if(isSignal(signal)) return signal;
if(value.length===0)
return read(signal);
return write(signal, value[0]);
const out= create();
watch(()=> out(signal()));
return out;
}
const stack= [];
export function watch(context){
@ -30,16 +23,22 @@ function currentContext(){
return stack[stack.length - 1];
}
function create(value){
if(isSignal(value)) return value;
if(typeof value==="object" && value!==null)
//TODO Array?
return Object.fromEntries(
Object.entries(value)
.map(([ key, value ])=> [ key, create(value) ])
);
return {
const signal= (...value)=>
value.length ? write(signal, value[0]) : read(signal);
Object.assign(signal, {
[mark]: true,
value,
listeners: new Set()
};
});
return signal;
}
function read({ value, listeners }){
const context= currentContext();