lilact 0.27.1 → 0.27.3

package/src/expscan.js

@@ -240,10 +240,10 @@ export function processImportExports(node, jsx)
 					}
 
 					let cjs = '';
-					for(const s of import_alls) {
+					for(const s of star_imports) {
 						cjs+=`const ${s} = require(${src},{requirer:module});\n`;
 					}
-					for(const s of star_imports) {
+					for(const s of import_alls) {
 						cjs+=`const ${s} = require(${src},{requirer:module, checkExport: ['default']}).default;\n`;
 					}
 					if(Object.keys(imports).length) {

package/src/hooks.jsx

@@ -88,9 +88,9 @@ export function useState(initialValue)
 export function useCallback(callback, deps=undefined)
 {
 	if(
-	    deps !== undefined && !Array.isArray(deps) &&
-	    deps !== null && typeof deps !== "object"
-	  ) 
+			deps !== undefined && !Array.isArray(deps) &&
+			deps !== null && typeof deps !== "object"
+		) 
 	{
 		throw new Error("Callback dependencies must be an array, object  or omitted.");
 	}
@@ -137,22 +137,17 @@ export function createContext(defaultValue)
  * @param {any} context - Context object created by `createContext`.
  * @returns {any} Current context value.
  */
-export function useContext(context)
-{
-	let core = Lilact.current_component[0].parent;
+export function useContext(context) {
+	let core = Lilact.current_component[0]?.parent;
 
-	while(core.entity!==context.Provider && core.parent) {
+	while (core && core.entity !== context.Provider) {
 		core = core.parent;
 	}
 
-	if(core.parent) {
-		let v = core.props?.value;
-		return v??=context.default;
-	}
-
-	return context.default;
+	return core
+		? core.props?.value ?? context.default
+		: context.default;
 }
-
 /**
  * Returns a stable, unique ID that is consistent across renders.
  *
@@ -182,26 +177,24 @@ export function useTransition()
 	if( isEmpty(hk) ) {
 		hk.count=0;
 
-		hk.func =
-
-		(async function(core, hk, fn) {
-
-			if(hk.count===0) {
+		hk.func = (async function(core, hk, fn) {
+			if (hk.count === 0) {
 				core.component.forceUpdate();
 			}
 
 			hk.count++;
 
-			await fn();
+			try {
+				return await fn();
+			} finally {
+				hk.count--;
 
-			hk.count--;
-
-			if(hk.count===0) {
-				core.component.forceUpdate();
+				if (hk.count === 0) {
+					core.component.forceUpdate();
+				}
 			}
-		}
+		}).bind(undefined, Lilact.current_component[0], hk);
 
-		).bind(undefined, Lilact.current_component[0], hk);
 	}
 
 	return [ hk.count!=0, hk.func ];
@@ -280,9 +273,9 @@ export function useRef(initialValue = null)
 export async function useLayoutEffect(effect, deps=undefined)
 {
 	if(
-	    deps !== undefined && !Array.isArray(deps) &&
-	    deps !== null && typeof deps !== "object"
-	  ) 
+			deps !== undefined && !Array.isArray(deps) &&
+			deps !== null && typeof deps !== "object"
+		) 
 	{
 		throw new Error("Layout effect dependencies must be an array, object or omitted.");
 	}
@@ -295,14 +288,14 @@ export async function useLayoutEffect(effect, deps=undefined)
 
 	if(hk?.cleanup) {
 		await hk.cleanup();
-  		hk.cleanup = undefined;
-  	}
+			hk.cleanup = undefined;
+		}
 
 	hk.deps = deps;
 	Lilact.layout_effects.add( async ()=>{ hk.cleanup = await effect(); });
 	
-	Lilact.clearTimeout( Lilact.effect_timeout );
-	Lilact.setTimeout( Lilact.processEffects, 0 );
+	Lilact._clearTimeout( Lilact.effect_timeout );
+	Lilact._setTimeout( Lilact.processEffects, 0 );
 }
 
 /**
@@ -316,9 +309,9 @@ export async function useLayoutEffect(effect, deps=undefined)
 export async function useEffect(effect, deps=undefined)
 {
 	if(
-	    deps !== undefined && !Array.isArray(deps) &&
-	    deps !== null && typeof deps !== "object"
-	  ) 
+			deps !== undefined && !Array.isArray(deps) &&
+			deps !== null && typeof deps !== "object"
+		) 
 	{
 		throw new Error("Effect dependencies must be an array, object or omitted.");
 	}
@@ -331,14 +324,14 @@ export async function useEffect(effect, deps=undefined)
 
 	if(hk?.cleanup) {
 		await hk.cleanup();
-  		hk.cleanup = undefined;
+			hk.cleanup = undefined;
 	}
 
 	hk.deps = deps;
 	Lilact.passive_effects.add( async ()=>{ hk.cleanup = await effect(); });
 
-	Lilact.clearTimeout( Lilact.effect_timeout );
-	Lilact.setTimeout( Lilact.processEffects, 0 );
+	Lilact._clearTimeout( Lilact.effect_timeout );
+	Lilact._setTimeout( Lilact.processEffects, 0 );
 }
 
 
@@ -353,9 +346,9 @@ export async function useEffect(effect, deps=undefined)
 export async function useInsertionEffect(effect, deps=undefined)
 {
 	if(
-	    deps !== undefined && !Array.isArray(deps) &&
-	    deps !== null && typeof deps !== "object"
-	  ) 
+			deps !== undefined && !Array.isArray(deps) &&
+			deps !== null && typeof deps !== "object"
+		) 
 	{
 		throw new Error("Insertion effect dependencies must be an array, object, or omitted.");
 	}
@@ -368,14 +361,14 @@ export async function useInsertionEffect(effect, deps=undefined)
 
 	if(hk?.cleanup) {
 		await hk.cleanup();
-  		hk.cleanup = undefined;
+			hk.cleanup = undefined;
 	}
 
 	hk.deps = deps;
 	Lilact.insertion_effects.add( async ()=>{ hk.cleanup = await effect(); });
 
-	Lilact.clearTimeout( Lilact.effect_timeout );
-	Lilact.setTimeout( Lilact.processEffects, 0 );
+	Lilact._clearTimeout( Lilact.effect_timeout );
+	Lilact._setTimeout( Lilact.processEffects, 0 );
 }
 
 
@@ -390,9 +383,9 @@ export async function useInsertionEffect(effect, deps=undefined)
 export function useMemo(factory,deps=undefined)
 {
 	if(
-	    deps !== undefined && !Array.isArray(deps) &&
-	    deps !== null && typeof deps !== "object"
-	  ) 
+			deps !== undefined && !Array.isArray(deps) &&
+			deps !== null && typeof deps !== "object"
+		) 
 	{
 		throw new Error("Memo dependencies must be an array or omitted.");
 	}
@@ -453,27 +446,30 @@ export function useActionState(action, initialState)
  * @param {Function} [init] - Optional initializer function for lazy initial state.
  * @returns {any} Hook result `[state, dispatch]`.
  */
-export function useReducer(reducer, initialArg, init)
-{
+export function useReducer(reducer, initialArg, init) {
 	const hk = useHook();
 
-	if( isEmpty(hk) ) {
-		hk.reducer = reducer;
-		hk.state = init?init(initialArg):initialArg;
+	if(isEmpty(hk)) {
+		hk.state = init ? init(initialArg) : initialArg;
+
 		hk.dispatch = function(core, hk, action) {
-			const newst = hk.reducer(hk.state, action);
-			if(!Lilact.defaultIsEqual(newst,hk.state)) {
-				hk.state = newst;
+			const newState = hk.reducer(hk.state, action);
+
+			if (!Lilact.defaultIsEqual(newState, hk.state)) {
+				hk.state = newState;
 				core.component.forceUpdate();
 			}
 		}.bind(undefined, Lilact.current_component[0], hk);
 	}
 
+	hk.reducer = reducer;
+
 	return [hk.state, hk.dispatch];
 }
 
 
 
+
 // todo: very simple implementation. and not lilactish at all! must be modified
 
 /**

package/src/lilact.jsx

@@ -126,10 +126,14 @@ export const Lilact =
 	redux,
 	emotion,
 
+	_setTimeout: window.setTimeout.bind(window),
+	_setInterval: window.setInterval.bind(window),
+	_clearTimeout: window.clearTimeout.bind(window),
+	_clearInterval: window.clearInterval.bind(window),
+
 }
 
 Lilact.default = Lilact;
-
 export default Lilact;
 
 Lilact.importObjectPaths = {
@@ -144,6 +148,8 @@ globalThis.Fragment = Lilact.Fragment;
 globalThis.require = Lilact.require;
 
 document.addEventListener("DOMContentLoaded", () => {
+	Lilact.grabTimers();
+
   Lilact.runScripts().catch(error => {
     Lilact.globalErrorHandler?.(error);
   });

package/src/misc.jsx

@@ -54,9 +54,12 @@ const typeOf = (input) => {
  * @param value - Value to inspect.
  * @returns True if the value is a class component; otherwise false.
  */
-export const isValidComponent = (value) => {
-	return value[CORE]!==undefined || value[TEXT]!==undefined;
-}
+export const isValidComponent = value => {
+  return Boolean(
+    value &&
+    (value[CORE] !== undefined || value[TEXT] !== undefined)
+  );
+};
 
 /**
  * Checks whether a value is a Lilact component. It is the same as `isValidComponent`.
@@ -359,23 +362,48 @@ export function isEmpty(value)  {
  * @returns True if shallowly equal; otherwise false.
  */
 export const shallowEqual = (source, target, ignore) => {
-	if (typeOf(source) !== typeOf(target)) {
-		return false;
-	}
+  if (Object.is(source, target)) {
+    return true;
+  }
 
-	if (typeOf(source) === "array") {
-		if (source.length !== target.length) {
-			return false;
-		}
-		return source.every((el, index) => el === target[index] || index===ignore );
-	} else if (typeOf(source) === "object") {
-		return Object.keys(source).every((key) => source[key] === target[key] || key===ignore );
-	} else if (typeOf(source) === "date") {
-		return source.getTime() === target.getTime();
-	}
+  if (typeOf(source) !== typeOf(target)) {
+    return false;
+  }
 
-	return source === target;
-}
+  if (typeOf(source) === "array") {
+    if (source.length !== target.length) {
+      return false;
+    }
+
+    return source.every(
+      (value, index) =>
+        index === ignore || Object.is(value, target[index])
+    );
+  }
+
+  if (typeOf(source) === "object") {
+    const sourceKeys = Object.keys(source)
+      .filter(key => key !== ignore);
+
+    const targetKeys = Object.keys(target)
+      .filter(key => key !== ignore);
+
+    if (sourceKeys.length !== targetKeys.length) {
+      return false;
+    }
+
+    return sourceKeys.every(key =>
+      Object.prototype.hasOwnProperty.call(target, key) &&
+      Object.is(source[key], target[key])
+    );
+  }
+
+  if (typeOf(source) === "date") {
+    return source.getTime() === target.getTime();
+  }
+
+  return Object.is(source, target);
+};
 
 
 /**