lilact 0.26.4 → 0.26.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lilact",
-  "version": "0.26.4",
+  "version": "0.26.6",
   "description": "A Little React/JSX Runtime Implementation for Browser",
   "repository": "github:arashkazemi/lilact",
   "homepage": "https://arashkazemi.github.io/lilact/",

package/src/errors.jsx

@@ -62,7 +62,8 @@ function getErrorLocation(err) // works for both error and error-event, and also
 // Firefox:       fn@eval:xxx:LINE:COL
 // Safari:        @eval:xxx:LINE:COL   (sometimes)
 /** @ignore */
-function parseEvalLocationFromStack(stack, urlPrefix = "eval:/") {
+function parseEvalLocationFromStack(stack, urlPrefix = "eval:/")
+{
   const raw = typeof stack === "string" ? stack : String(stack || "");
   const lines = raw.split(/\r?\n/);
 
@@ -89,7 +90,8 @@ function parseEvalLocationFromStack(stack, urlPrefix = "eval:/") {
   return { url: null, line: null, col: null, matched: null, stackPreview: lines.slice(0, 6).join("\n") };
 }
 
-function escapeRegExp(s) {
+function escapeRegExp(s)
+{
   return String(s).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 

package/src/events.jsx

@@ -59,7 +59,8 @@ const _pool = [];
 const MAX_POOL_SIZE = 10;
 const POINTER_TYPES = ["mouse", "pen", "touch"];
 
-export function createSyntheticEvent(nativeEvent, currentTarget) {
+export function createSyntheticEvent(nativeEvent, currentTarget) 
+{
   const e = _pool.length ? _pool.pop() : {};
 
   e.nativeEvent = nativeEvent;
@@ -181,7 +182,8 @@ export function createSyntheticEvent(nativeEvent, currentTarget) {
   return e;
 }
 
-export function releaseSyntheticEvent(e) {
+export function releaseSyntheticEvent(e)
+{
   if (e && !e.isPersistent) {
     e.nativeEvent = null;
     e.type = null;
@@ -261,7 +263,8 @@ export function releaseSyntheticEvent(e) {
 // Main wrapper factory
 // fn: function(syntheticEvent) { ... }
 // opts: { capture: bool, passive: bool, once: bool, stopPropagationOnTrueReturn: bool }
-export function wrapListener(fn, opts = {}) {
+export function wrapListener(fn, opts = {})
+{
 	const { stopPropagationOnTrueReturn = false } = opts;
 
 	return function handler(nativeEvent) {
@@ -284,7 +287,8 @@ export function wrapListener(fn, opts = {}) {
 }
 
 // Convenience: add/remove wrapper-managed listener
-export function addWrappedEventListener(target, type, fn, options = {}) {
+export function addWrappedEventListener(target, type, fn, options = {})
+{
 	const handler = wrapListener(fn, options);
 
 	target.addEventListener(type, handler, options);

package/src/expscan.js

@@ -72,7 +72,8 @@ function isValidIdentifierName(s) {
   return !keywords.has(s);
 }
 
-export function labeler(custom_words, x) {
+export function labeler(custom_words, x)
+{
 	if( typeof(x)==='string' ) {
 		if(custom_words && custom_words.hasOwnProperty(x)) return custom_words[x];
 
@@ -269,7 +270,7 @@ export function processImportExports(node, jsx)
 
 						cjs+=`const ${o} = require(${src}, {checkExport: ${ls},requirer:module})`;
 					}
-					else {
+					else if(cjs.length===0) {
 						cjs+=`require(${src},{requirer:module})`;
 					}
 
@@ -303,22 +304,34 @@ export function processImportExports(node, jsx)
 					node.out[m.index].cjs = 'module.exports.default =';
 					continue;
 
-				case 'V':
-				case 'F':
-					const j = i;
-					const type = s[i]==='F'?`= ${node.out[i]} `:'';
-					node.out[i] = null;
-					i++;
-					skip_spaces();
-					const name = node.out[i];
-					if(s[j]==='V') {
-						node.out[i] = null;
-						i++;
-					}
-					skip_spaces();				
-					node.out[m.index].cjs = `module.exports.${name} ${type}`;
-					continue;
-
+				case 'V':{
+									const tp = node.out[i];
+									node.out[i] = null;
+									i++;
+									skip_spaces();
+									const name = node.out[i];
+				
+									node.out[i] = null;
+									i++;
+				
+									skip_spaces();				
+									node.out[m.index].cjs = `${tp} ${name} = module.exports.${name} `;
+									continue;
+				}
+				case 'F':{
+									const tp = node.out[i];
+									node.out[i] = null;
+									i++;
+									skip_spaces();
+									const name = node.out[i];
+				
+									// node.out[i] = null;
+									// i++;
+									// skip_spaces();				
+				
+									node.out[m.index].cjs = `module.exports.${name} = ${tp} `;
+									continue;
+				}
 				case '*':
 					node.out[i] = null;
 					i++;

package/src/run.jsx

@@ -87,7 +87,6 @@ export function run(jsx, path=`InlineJSX-${++Lilact.eval_num}`, {isInline, isMod
 
 	required_scripts[path] = module;
 
-
 	try {
 		processed = Lilact.transpileJSX( jsx,
 		{
@@ -180,32 +179,45 @@ export function require(path)
 		if(Lilact?.[LAZY] || isLazy) {
 			Lilact[LAZY]=false;
 
-			return fetch(path)
-				.then(res => {
+			let p = Lilact.resolver?.(path);
+
+			if(p) {
+				p = Promise.resolve(p);
+			}
+			else {
+				p = fetch(path).then(res => {
 					if (!res.ok) throw new Error(`HTTP ${res.status}`);
 					return res.text();
-				})
-				.then(res => {
+				});
+			}
+			return  p.then(res => {
+						if(path.endsWith(".css")) {
+							injectGlobal(res);
+							return;
+						}
+						res = run(res, path, false);
+						return res?.default ?? res;
+					})
+					.catch(err => {
+						throw err;
+					});
+		}
+		else {
+			const p = Lilact.resolver?.(path);
+			if(p) {
+				return run(p, path, false);
+			}
+			else {
+				const request = new XMLHttpRequest();
+				request.open("GET", path, {isInline:false});
+				request.send(null);
+				if (request.status === 200) {
 					if(path.endsWith(".css")) {
 						injectGlobal(res);
 						return;
 					}
-					res = run(res, path, false);
-					return res?.default ?? res;
-				})
-				.catch(err => {
-					throw err;
-				});
-		}
-		else {
-			// note: this makes a sync request. this is not advised,
-			// but import should be sync. for an async solution use lazy and suspense.
-
-			const request = new XMLHttpRequest();
-			request.open("GET", path, {isInline:false});
-			request.send(null);
-			if (request.status === 200) {
-				return run(request.responseText, path, false);
+					return run(request.responseText, path, false);
+				}
 			}
 		}
 	}