lilact 0.21.0 → 0.22.0

package/impexptest.js

@@ -0,0 +1,51 @@
+// Imports
+import foo from "foo";
+import { a, b } from "foo";
+import {a as alpha, b as beta} from "foo";
+import * as utils from "foo";
+import foo, { a, b as c, d } from "foo";
+import "foo";
+
+// Re-exports from other modules
+export * from "foo";
+export { a, b } from "foo";
+export { default as Foo } from "foo";
+
+export * from "./some-module.js";
+export { exportedThing } from "./another-module.js";
+export { default as depDefault } from "./yet-another-module.js";
+export { default as depDefault, a, b, c as depC } from "./...";
+
+// Default export forms
+const defaultValue = { ok: true };
+export default defaultValue;
+
+export default function defaultFn() {
+  return "defaultFn";
+}
+
+export default class DefaultClass {
+  constructor() {}
+}
+
+
+export {localA as a, localB as b, localC as c};
+
+
+export { localFn as renamedFn };
+
+// Additional named exports (declared bindings)
+export const namedConst = 1;
+export let namedLet = 2;
+export var namedVar = 3;
+
+export function namedFn() {
+  return "namedFn";
+}
+
+
+export class NamedClass {}
+
+// Re-exporting local bindings is OK (examples)
+export defaultValue;
+export { defaultValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lilact",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "A Little React/JSX Runtime Implementation for Browser",
   "repository": "github:arashkazemi/lilact",
   "homepage": "https://arashkazemi.github.io/lilact/",
@@ -41,9 +41,9 @@
     "typedoc": "^0.28.19"
   },
   "dependencies": {
-    "@emotion/css": "^11.13.5",
-    "esbuild": "^0.28.1",
-    "redux": "^5.0.1"
+    "@emotion/css": ">=11.13.0",
+    "esbuild": ">=0.28.1",
+    "redux": ">=5.0.1"
   },
   "exports": {
     ".": "./dist/lilact.development.js",

package/src/components.jsx

@@ -198,7 +198,7 @@ if(DEBUG) {
 			if(this?.parent?.component?.context || this?.parent?.component?.getChildContext ) {
 				this.context = { ...this.parent.component.context, ...this.parent.component.getChildContext?.() };
 
-				if(this.component.constructor.contextTypes) {
+				if(DEBUG && this.component.constructor.contextTypes) {
 					PropTypes.checkPropTypes(this.component.constructor.contextTypes, this.context, 'context', this.entity.name);
 				}
 			}
@@ -384,11 +384,6 @@ if(DEBUG) {
 		}
 
 		catch(e) {
-			// todo: should did catch be called? and state be modified?
-			/*if(this.component.componentDidCatch) {
-				this.component.componentDidCatch(e);
-			}
-			else */
 			throw(e);
 		}
 	}

package/src/expscan.js

@@ -0,0 +1,404 @@
+/*
+
+	Lilact
+	Copyright (C) 2024-2026 Arash Kazemi <contact.arash.kazemi@gmail.com>
+	All rights reserved.
+
+	BSD-2-Clause
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright
+		notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+		notice, this list of conditions and the following disclaimer in the
+		documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+const keywords = new Set([
+  "break","case","catch","class","const","continue","debugger","default",
+  "do","else","export","extends","finally","for","function","if","import","in",
+  "instanceof","super","switch","this","throw","try",
+  "var","while","with","yield",  "return",
+  "true","false","null","undefined",
+  "enum","implements","interface","let","package","private","protected",
+  "public","static","yield",
+  "as","from","of","async","get","set","static","super",
+  "delete", "void", "typeof", "new", "await",
+]);
+
+const operators = new Set([
+  "(", ")", "{", "}", "[", "]", "...", ".",
+  "=>", ",", ";", ":" , "?",
+  "++", "--",
+  "+", "-", "*", "/", "%", "**",
+  ">>", "<<", ">>>", "<<<",
+  "&", "|", "^", "~",
+  "==", "!=", "===", "!==",
+  ">", "<", ">=", "<=",
+  "&&", "||", "??", "?.", "=",
+  "+=", "-=", "*=", "/=", "%=",
+  "**=", "<<=", ">>=", ">>>=",
+  "&=", "|=", "^=",
+  "??=", "&&=", "||=",
+  "!",
+]);
+
+function isNumber(s) {
+  if (!/^(?:[+-]?(?:(?:\d(?:\d|_)*)(?:\.(?:\d(?:\d|_)*))?|\.(?:\d(?:\d|_)*))(?:[eE][+-]?(?:\d(?:\d|_)*))?|[+-]?Infinity|[+-]?NaN|[+-]?(?:(?:0[xX](?:[0-9a-fA-F](?:[0-9a-fA-F]|_)*))|(?:0[oO](?:[0-7](?:[0-7]|_)*))|(?:0[bB](?:[01](?:[01]|_)*))|(?:\d(?:\d|_)*))n)$/u.test(s)) return false;
+  return !keywords.has(s);
+}
+
+function isUnicodeEscapeSequence(s) {
+  if (!/(?:\\u\{[0-9a-fA-F]+\}|\\u[0-9a-fA-F]{4})/g.test(s)) return false;
+  return !keywords.has(s);
+}
+
+function isValidIdentifierName(s) {
+  if (!/^(?:[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*)$/u.test(s)) return false;
+  return !keywords.has(s);
+}
+
+export function labeler(custom_words, x) {
+	if( typeof(x)==='string' ) {
+		if(custom_words && custom_words.hasOwnProperty(x)) return custom_words[x];
+
+		if(x.trim()==='') {
+			if(x.indexOf('\n')!==-1) return '\n';
+			return ' ';
+		}
+		if(keywords.has(x)) return 'K';
+		if(operators.has(x)) return 'O';
+		if(isValidIdentifierName(x)) return 'I';
+		if(isUnicodeEscapeSequence(x)) return 'U';
+		if(isNumber(x)) return 'N';
+	}
+	else if(typeof(x)==='object') {
+		if(x.type==='comment') return 'C';
+		if(x.type==='regexp') return 'R';
+		if(x.type==='js') return 'J';
+		if(x.type==='paranthesis') return 'P';
+		if(x.type==='string') return 'S';
+		if(x.type==='xml') return 'X';
+	}
+	return "?"
+} 
+
+export function generateSequence(arr, labeler = labeler.bind(null, null))
+{
+	return arr.map(labeler).join('');
+}
+
+const import_export_regexp = /(?:i[C \n]*(?:(?:I|J|(?:\*[C \n]*a[C \n]*I))[C \n]*,[C \n]*)*(?:(?:(?:I(?:[C \n]*a[C \n]*I)?)|J|(?:\*[C \n]*a[C \n]*I))[C \n]*f[C \n]*)?S)|(?:e[C \n]*(?:(?:[*J][C \n]*f[C \n]*S)|(?:d[C \n]*[IFJ])|J|(?:[VF][c \n]*I)|I))|(?:r[c \n]*P)/mg;
+const props_regexp = /O[C \n]*(?:[Id](?:[C \n]*a[C \n]*I)?[C \n]*,[C \n]*)*(?:I(?:[C \n]*a[C \n]*I)?)[C \n]*O/mg;
+
+export function processImportExports(node, jsx)
+{
+	const s = generateSequence(node.out, 
+					labeler.bind(null, 
+						{'import': 'i', 'export': 'e', 'as': 'a', 'from': 'f', 
+									',': ',', '.': '.', '*': '*', ';': ';', 
+									'var': 'V', 'let': 'V', 'const': 'V',
+									'function': 'F', 'class': 'F', '=':'=', 'default': 'd',
+									'require': 'r'
+								})
+			  );
+
+	// todo: should detect illegal imports too: "i"s that are not matched. 
+	// but it may cause problems. x.import = ... is correct, but it will raise error this way.
+
+	let i;
+	const skip_spaces = (dir=1) => { 
+										while(s[i]===' ' || s[i]==='\n' || s[i]==='C') {
+											if(dir===1) node.out[i]=null;
+											i+=dir 
+										}
+									};
+
+
+	// Parse Imports
+
+	let begin = node.begin;
+	
+	const begins = [];
+
+	for(i=0;i<node.out.length;i++) {
+		if(i==0) begins.push(node.begin);
+		else {
+			if( typeof(node.out[i-1]) === 'string' ) {
+				begins.push(begins[i-1]+node.out[i-1].length);
+			}
+			else {
+				begins.push(node.out[i-1].end);
+			}
+		}
+	}
+
+	begins.push(node.end);
+	
+	for (const m of s.matchAll(import_export_regexp)) {
+
+		// Require (to inject requirer argument)
+		// todo: should also check for . before require, but this is more complex than import
+		// and export, and also much less likely to collide with user space.
+		if(m[0].startsWith('r')) {
+			const req = m[0];
+			const args = node.out[m.index+req.length-1].out;
+			if(args.length===1) {
+				args.push(', {requirer:module}');
+			}
+		}
+		// Import
+		else if(m[0].startsWith('i')) {
+
+			const imp = m[0];
+
+			i = m.index-1;
+
+			skip_spaces(-1); // check if this is a member (x.import)
+			if(s[i]==='.') continue;
+
+			const src = jsx.substring(node.out[m.index+imp.length-1].begin, node.out[m.index+imp.length-1].end);
+			const imports = {};
+			let star_imports = [];
+
+			for(i = m.index+1;i<m.index+imp.length-1;i++) {
+
+				node.out.splice(m.index, 1, {
+							type: "import",
+							begin: begins[m.index],
+							end: begins[m.index+imp.length],
+						});
+
+				skip_spaces();
+
+				switch(s[i]) {
+				case ',':
+					break;
+				case 'I': {
+					const prop = node.out[i];
+					imports[prop] = 'default'; 
+					continue;
+				}
+				case 'J': {
+					let sj = generateSequence(node.out[i].out, 
+									labeler.bind(null, 
+										{'as': 'a', ',': ','})
+							  );
+
+					props_regexp.lastIndex=-1;
+					if(!props_regexp.test(sj)) throw "incorrect import properties definition."
+
+					const ps = node.out[i].out;
+
+					for(let j=1; j<sj.length-1; j++) {
+						while(sj[j]===' ' || sj[j]==='\n' || sj[j]==='C' || sj[j]===',') j++;
+						const prop = ps[j];
+						j++;
+						while(sj[j]===' ' || sj[j]==='\n' || sj[j]==='C') j++;
+						if(sj[j]==='a') {
+							j++;
+							while(sj[j]===' ' || sj[j]==='\n' || sj[j]==='C') j++;
+							imports[ps[j]] = prop;
+							j++;
+						}
+						else {
+							imports[prop] = prop; 
+						}
+					}
+					continue;
+
+				}
+				case '*': {
+					i++;
+					skip_spaces();
+					i++;
+					skip_spaces();
+
+					star_imports.push(node.out[i]); 
+					continue;
+				}
+				case 'S':
+					// 1. mark unnecessary nodes to be removed
+					for(i = m.index+1;i<m.index+imp.length;i++) {
+						node.out[i]=null;
+					}
+
+					let cjs = '';
+					for(const s of star_imports) {
+						cjs+=`const ${s} = require(${src},{requirer:module});\n`;
+					}
+					if(Object.keys(imports).length) {
+						let o = '{';
+						let ls = '[';
+
+						for(const p in imports) {
+							if(o.length>1) {
+								o+=',';
+								ls+=',';
+							}
+							if(p===imports[p]) {
+								o+=p;
+								ls+=`'${p}'`;
+							}
+							else {
+								o+=p+":"+imports[p];
+								ls+=`'${imports[p]}'`;
+							}
+
+						}
+						o+='}';
+						ls+=']';
+
+						cjs+=`const ${o} = require(${src}, {checkExport: ${ls},requirer:module})`;
+					}
+					else {
+						cjs+=`require(${src},{requirer:module})`;
+					}
+
+					// 2. add nodes
+					node.out[m.index].cjs = cjs;
+					continue;
+				}
+			}
+		}
+		// Export
+		else {
+			const exp = m[0];
+
+			node.out.splice(m.index, 1, {
+						type: "export",
+						begin: begins[m.index],
+						end: begins[m.index+1],
+					});
+
+			i = m.index-1;
+
+			skip_spaces(-1); // check if this is a member (x.export)
+			if(s[i]==='.') continue;
+
+			i = m.index+1;
+			skip_spaces();
+
+			switch(s[i]) {
+				case 'd':
+					node.out[i] = null;
+					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 '*':
+					node.out[i] = null;
+					i++;
+					skip_spaces();
+					node.out[i] = null;
+					i++;
+					skip_spaces();
+					const src = jsx.substring(node.out[i].begin, node.out[i].end);
+					node.out[i] = null;
+					node.out[m.index].cjs = `Object.assign(module.exports, require(${src},{requirer:module}))`;
+					continue;
+
+				case 'I':
+					node.out[m.index].cjs = `module.exports.${node.out[i]} = `;
+					continue;
+
+				case 'J': {
+					const exports = {};
+					let sj = generateSequence(node.out[i].out, 
+									labeler.bind(null, 
+										{'as': 'a', ',': ',', 'default': 'I'})
+							  );
+
+					props_regexp.lastIndex=-1;
+					if(!props_regexp.test(sj)) throw "incorrect export properties definition."
+
+					const ps = node.out[i].out;
+					for(let j=1; j<sj.length-1; j++) {
+						while(sj[j]===' ' || sj[j]==='\n' || sj[j]==='C' || sj[j]===',') j++;
+						const prop = ps[j];
+						j++;
+						while(sj[j]===' ' || sj[j]==='\n' || sj[j]==='C') j++;
+						if(sj[j]==='a') {
+							j++;
+							while(sj[j]===' ' || sj[j]==='\n' || sj[j]==='C') j++;
+							exports[ps[j]] = prop; 
+							j++;
+						}
+						else {
+							exports[prop] = prop; 
+						}
+					}
+
+					let o = '{';
+					let ls = '{';
+
+					for(const p in exports) {
+						if(o.length>1) {
+							o+=',';
+							ls+=',';
+						}
+						if(p===exports[p]) {
+							o+=p;
+							ls+=p;
+						}
+						else {
+							o+=p+":"+exports[p];
+							ls+=exports[p];
+						}
+
+					}
+					o+='}';
+					ls+='}';
+
+					node.out[i] = null;
+					i++;
+					skip_spaces();
+
+					if(node.out[i]==='from') {
+						node.out[i] = null;
+						i++;
+						skip_spaces();
+
+						const src = jsx.substring(node.out[i].begin, node.out[i].end);
+						node.out[i]=null;
+
+						node.out[m.index].cjs = `{ const ${o} = require(${src},{requirer:module}); Object.assign(module.exports, ${ls}); }`;
+					}
+					else {
+						node.out[m.index].cjs = `Object.assign(module.exports, ${o})`;
+					}
+					continue;
+				}
+			}
+		}
+	}
+}

package/src/jsx.js

@@ -46,11 +46,8 @@
 // note: JSX or preprocessors are not processed inside template strings
 // todo: injected string try catchs should be generated by a function
 
-//import * as jsxAddons from './jsx.addons.js';
-
 /** @ignore */
 export const transpilerConfig = {
-	//addons: jsxAddons, // addons are not used anymore
 	setBlockLabels: true,
 	enableLabelStack: false,
 	injectLabels: true,
@@ -59,14 +56,17 @@ export const transpilerConfig = {
 	preprocessorDelimiter: 'ʔ', // alt+shift+. on apple abc extended layout   
 }
 
-
-const TRANSPILER_OUTPUT = Symbol.for("LILACT:TRANSPILER_OUTPUT");
-
-import * as vlq from './vlq.js';
+import * as vlq from './vlq.js' 
+import {processImportExports} from './expscan.js'
 
 let raiseError;
 let tab=0;
 
+
+const TOKENIZE_RE =
+  /(\{|\}|\[|\]|\(|\)|\.\.\.|=>|\?\?=|\?\?|\?\.|===|!==|>>>|<<=|>>=|>>>=|\*\*=|\*\*|&&=|\|\|=|<=|>=|==|!=|<<|>>|\+\+|--|\+=|-=|\*=|\/=|%=|&=|\^=|\|=|=|\+|-|\*|\/|%|&|\^|\||!|~|\?|:|<|>|=|\.|,|;|\n+|[\s^\n]+)/gm;
+
+
 function lookAhead(f, code, index, ...args)
 {
 	const b = f(code, index, ...args);
@@ -347,7 +347,7 @@ function parseString(code, index, q, container)
 		case '$':
 			if(q==='`') {
 				if(code[index+1]==='{') {
-					[index] = lookAhead( parseJS, code, index+1, true, container );
+					[index] = lookAhead( parseJS, code, index+1, true );
 					index--;
 				}
 			}
@@ -639,7 +639,7 @@ function parseParanthesis(code, index, container)
 		case '\"':
 		case '\'':
 		case '\`': 
-			[index] = lookAhead( parseString, code, index, ch );
+			[index] = lookAhead( parseString, code, index, ch, b );
 			break;
 
 		case '{':
@@ -703,7 +703,7 @@ function parseJS(code, index=0, is_block=false, container)
 		case '\"':
 		case '\'':
 		case '\`': 
-			[index] = lookAhead( parseString, code, index, ch );
+			[index] = lookAhead( parseString, code, index, ch, b );
 			break;
 
 		case '{':  {
@@ -855,6 +855,7 @@ function labelFunctions(node, eols, blocks_info)
 
 }
 
+
 function scanEOLs(code)
 {
 	const endlines = [0];
@@ -903,14 +904,13 @@ function generateSourceMap(json, path, jsx_eols, out_eols, mappings=[])
 
 
 	const scan_leaves = (node)=>{
-		//console.log("SCAN", node, node.begin, node.out_index);
-		if(node.out?.length>0) {
+		if(node?.out?.length>0) {
 
 			for(const ch of node.out) {
 				scan_leaves(ch);
 			}
 		}
-		if(node.begin!==undefined && node.out_index!==undefined) {
+		if(node?.begin!==undefined && node?.out_index!==undefined) {
 			mpps.push( [ ...getRowCol(out_eols,node.out_index), ...getRowCol(jsx_eols,node.begin), node ] );
 		}
 	}
@@ -975,6 +975,8 @@ export function transpileJSX( jsx, {
 	injectTraceLabels = false,
 	discardComments = false,
 
+	produceCJS = false,
+
 	// lilact internal
 	blocks_info = {
 		labels: {},
@@ -998,8 +1000,6 @@ export function transpileJSX( jsx, {
 		throw er;
 	}).bind(null, eols);
 
-	const tokenize_re = /([\{\}\(\),;\[\]\n]|[\s^\n]+)/g; 
-
 	const json = parseJS(jsx);
 	json.data = jsx;
 
@@ -1028,7 +1028,7 @@ export function transpileJSX( jsx, {
 							node.children.splice(chi, 0, '"'+s.replaceAll("\n", "\\\n").replaceAll("\"", "\\\"")+'"');
 						}
 						else {
-							node.children.splice(chi, 0, ...s.split(tokenize_re)); 
+							node.children.splice(chi, 0, ...s.split(TOKENIZE_RE)); 
 						}
 						chi++;
 					}
@@ -1052,7 +1052,7 @@ export function transpileJSX( jsx, {
 														}[m]))+'"' );
 					}
 					else {
-						node.children.push( ...s.split(tokenize_re) );
+						node.children.push( ...s.split(TOKENIZE_RE) );
 					}
 				}
 			}
@@ -1060,7 +1060,7 @@ export function transpileJSX( jsx, {
 			node.children = node.children.filter( (x)=>x!=="" );
 
 			if(transpilerConfig.setBlockLabels && !node.already_labeled) {
-				labelFunctions(node,eols, blocks_info);
+				labelFunctions(node, eols, blocks_info);
 			}
 		}
 	}
@@ -1072,11 +1072,15 @@ export function transpileJSX( jsx, {
 	const codify = (outlen, node, is_attr=false, is_xml=false)=> {
 
 		if(typeof(node)!=='object') return node;
+		if(node===null) return '';
 
 		node.out_index = outlen;
+
 		//console.log("CODIFY", node, node.out_index);
 
 		if(node.type==='string') return jsx.substring(node.begin, node.end);
+		if(node.type==='import') return node.cjs;
+		if(node.type==='export') return node.cjs;
 		if(node.type==='regex') return jsx.substring(node.begin, node.end);
 		if(node.type==='comment') return (discardComments || is_attr)?'':jsx.substring(node.begin, node.end);
 		if(node.type==='directive') return node.value;
@@ -1086,6 +1090,7 @@ export function transpileJSX( jsx, {
 			let out = "(";
 
 			if(node.out) {
+				if(produceCJS) processImportExports(node, jsx);
 				for(const ch of node.out) {
 					out+=codify(outlen+out.length-1, ch);
 				}
@@ -1094,9 +1099,12 @@ export function transpileJSX( jsx, {
 		}
 
 		if(node.type==='js') {
+
+
 			let out = "";
 
 			if(node.out) {
+				if(produceCJS) processImportExports(node, jsx);
 				for(const ch of node.out) {
 					if(is_xml && ch.type==='comment') continue;
 					out+=codify( outlen + out.length - (is_attr?1:0), ch);
@@ -1182,16 +1190,6 @@ export function transpileJSX( jsx, {
 	if(appendSourcemap) {
 		out += inline_sm;
 	}
-
-	// if(globalThis[TRANSPILER_OUTPUT]) {
-	// 	try {
-	// 		const fs = import('fs');
-	// 		fs.writeFileSync(globalThis[TRANSPILER_OUTPUT], out);	
-	// 	}
-	// 	catch(e) {}
-	// 	globalThis[TRANSPILER_OUTPUT] = undefined;
-	// }
-	
 	//console.log(out);
 
 	return out;

package/src/lilact.jsx

@@ -92,7 +92,7 @@ export {transpileJSX, transpilerConfig} from "./jsx";
 export const Lilact = 
 {	
 
-	VERSION: "beta.21",
+	VERSION: "beta.22",
 	
 	// Configuration
 
@@ -123,11 +123,20 @@ export const Lilact =
 	redux,
 	emotion,
 
+	default: Lilact,
+
+}
+
+Lilact.importObjectPaths = {
+	"lilact": Lilact,
+	"@emotion/css": Lilact.emotion,
+	"redux": Lilact.redux
 }
 
 globalThis.Lilact = Lilact;
 globalThis.createComponent = Lilact.createComponent;
 globalThis.Fragment = Lilact.Fragment;
+globalThis.require = Lilact.require;
 
 document.addEventListener('DOMContentLoaded', () => {
   Lilact.runScripts();