lilact 0.28.5 → 0.29.0

package/src/jsx.js

@@ -46,18 +46,21 @@
 // note: JSX or preprocessors are not processed inside template strings
 // todo: injected string try/catches should be generated by a function
 
+
+import * as vlq from './vlq.js' 
+import {processImportExports} from './expscan.js'
+
+
+
 /** @ignore */
 export const transpilerConfig = {
 	setBlockLabels: true,
 	enableLabelStack: false,
-	injectLabels: true,
 	// todo: alt+shift+7 on apple abc extended layout is better i think, 
 	// but my current editor doesn't support syntax highlighting with it.
 	preprocessorDelimiter: 'ʔ', // alt+shift+. on apple abc extended layout   
 }
 
-import * as vlq from './vlq.js' 
-import {processImportExports} from './expscan.js'
 
 let raiseError;
 let tab=0;
@@ -766,7 +769,7 @@ function parseJS(code, index=0, is_block=false, container)
 // this is for lilact internal use, it is a workaround for approximating error location
 // in eval when transpiling and running jsx directly in browser.
 
-function labelFunctions(node, eols, blocks_info)
+function labelFunctions(node, eols, blocksInfo)
 {
 
 	node.already_labeled = true;
@@ -809,12 +812,12 @@ function labelFunctions(node, eols, blocks_info)
 
 			if(transpilerConfig.injectTraceLabels && typeof(nxt)==='object' && nxt.type==='js') {
 				const begin = getRowCol(eols, chi); // begin is always the location of function args parenthesis
-				nxt.children.splice(1,0, `/*LILACTBLOCK${++blocks_info.counter}:${begin}:${label}*/try{`);
+				nxt.children.splice(1,0, `/*LILACTBLOCK${++blocksInfo.counter}:${begin}:${label}*/try{`);
 				if(transpilerConfig.enableLabelStack) {
-					nxt.children.splice(nxt.children.length-1, 0, `} catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=[${blocks_info.counter},e.lilact_trace];throw e}`);
+					nxt.children.splice(nxt.children.length-1, 0, `} catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=[${blocksInfo.counter},e.lilact_trace];throw e}`);
 				}
 				else {
-					nxt.children.splice(nxt.children.length-1, 0, `} catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocks_info.counter};throw e}`);
+					nxt.children.splice(nxt.children.length-1, 0, `} catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocksInfo.counter};throw e}`);
 				}
 				chi += 2;				
 			}
@@ -834,15 +837,15 @@ function labelFunctions(node, eols, blocks_info)
 					if(transpilerConfig.injectTraceLabels) {
 
 						nxt.children.splice(1,0, 
-							`/*LILACTBLOCK${++blocks_info.counter}:${begin}:<ARROW>*/try {`);
+							`/*LILACTBLOCK${++blocksInfo.counter}:${begin}:<ARROW>*/try {`);
 
 						if(transpilerConfig.enableLabelStack) {
 							nxt.children.splice(nxt.children.length-1, 0, 
-								`} catch(e){if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=[${blocks_info.counter},e.lilact_trace];throw e}`);
+								`} catch(e){if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=[${blocksInfo.counter},e.lilact_trace];throw e}`);
 						}
 						else {
 							nxt.children.splice(nxt.children.length-1, 0, 
-								`} catch(e){if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocks_info.counter};throw e}`);
+								`} catch(e){if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocksInfo.counter};throw e}`);
 						}
 
 					}					
@@ -970,25 +973,29 @@ function generateSourceMap(json, path, jsx_eols, out_eols, mappings=[])
 
 /** @ignore */
 export function transpileJSX( jsx, { 
-	factory = "createComponent", 
-	fragment = "Fragment", 
-	path = "anonymous", 
-	appendSourcemap = true,
-	injectTraceLabels = false,
-	discardComments = false,
-
-	produceCJS = false,
-	logErrors = false,
-
-	// lilact internal
-	blocks_info = {
-		labels: {},
-		counter: 0
-	},
-	mappings = []
-} = {} )
+		factory = "createComponent", 
+		fragment = "Fragment", 
+		path = "anonymous", 
+
+		appendSourcemap = true,
+		injectTraceLabels = false,
+		discardComments = false,
+		produceCJS = false,
+		referentiateImports = false,
+		importsObject = "Lilact.scriptImportsObject", // first letter must be capital so components work as expected
+		importsObjectVar = "LilactImports", // first letter must be capital so components work as expected
+		logErrors = false,
+
+		// lilact internal
+		mappings = [],
+		meta,
+		blocksInfo = {
+			labels: {},
+			counter: 0
+		},
+
+	} = {} )
 {
-
 	transpilerConfig.preprocessorDelimiter ??= 'ʔ'; // alt+shift+. on apple abc extended layout  
 	transpilerConfig.injectTraceLabels ??= injectTraceLabels;
 
@@ -1066,7 +1073,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, blocksInfo);
 			}
 		}
 	}
@@ -1075,9 +1082,26 @@ export function transpileJSX( jsx, {
 
 	preprocessPragmas(json);
 
+	const flattened_nodes = [];
+
 	const codify = (outlen, node, is_attr=false, is_xml=false)=> {
 
-		if(typeof(node)!=='object') return node;
+		flattened_nodes.push(node);
+
+		if(typeof(node)!=='object') {
+			if(referentiateImports && typeof(node)==='string') {
+				if(meta?.imported_names.has(node)) {
+					let j = flattened_nodes.length-2;
+					while( (typeof(flattened_nodes[j])==='string' && flattened_nodes[j].trim()==='') ||
+									(typeof(flattened_nodes[j])==='object' && flattened_nodes[j].type==='comment') ) j--;
+
+					if( typeof(flattened_nodes[j])!=='string' || flattened_nodes[j]!==".") {
+						return importsObjectVar+"."+node;
+					}
+				}
+			}
+			return node;
+		}
 		if(node===null) return '';
 
 		node.out_index = outlen;
@@ -1085,7 +1109,7 @@ export function transpileJSX( jsx, {
 		//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==='import') return referentiateImports?'':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);
@@ -1096,7 +1120,7 @@ export function transpileJSX( jsx, {
 			let out = "(";
 
 			if(node.out) {
-				if(produceCJS) processImportExports(node, jsx);
+				if(produceCJS || referentiateImports) processImportExports(node, jsx, meta);
 				for(const ch of node.out) {
 					out+=codify(outlen+out.length-1, ch);
 				}
@@ -1105,12 +1129,10 @@ export function transpileJSX( jsx, {
 		}
 
 		if(node.type==='js') {
-
-
 			let out = "";
 
 			if(node.out) {
-				if(produceCJS) processImportExports(node, jsx);
+				if(produceCJS || referentiateImports) processImportExports(node, jsx, meta);
 				for(const ch of node.out) {
 					if(is_xml && ch.type==='comment') continue;
 					out+=codify( outlen + out.length - (is_attr?1:0), ch);
@@ -1130,6 +1152,10 @@ export function transpileJSX( jsx, {
 		}
 
 		if(node.type==='xml') {
+			
+			if(referentiateImports && meta?.imported_names?.has(node.tag) && node.tag[0]===node.tag[0].toUpperCase()) {
+				node.tag=importsObjectVar+"."+node.tag;
+			}
 
 			if(node.tag.length===0) {
 				node.tag = fragment;
@@ -1179,16 +1205,19 @@ export function transpileJSX( jsx, {
 
 	let out = '';
 	if(injectTraceLabels) {
-		out=`/*LILACTBLOCK${++blocks_info.counter}:0,0:<EXEC>*/try{`
+		out=`/*LILACTBLOCK${++blocksInfo.counter}:0,0:<EXEC>*/try{`
+	}
+	if(referentiateImports) {
+		out+=`const ${importsObjectVar} = ${importsObject};`;
 	}
 	out+=codify(out.length, json);
 
 	if(injectTraceLabels) {
 		if(transpilerConfig.enableLabelStack) {
-			out += `}catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=[${blocks_info.counter},e.lilact_trace];throw e}`;
+			out += `}catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=[${blocksInfo.counter},e.lilact_trace];throw e}`;
 		}
 		else {
-			out += `}catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocks_info.counter};throw e}`;
+			out += `}catch(e){ if(typeof(e)!=='object') e=new Error(e);e.lilact_trace=${blocksInfo.counter};throw e}`;
 		}
 	}
 

package/src/run.jsx

@@ -110,19 +110,15 @@ function report(value, path) {
 export const required_scripts = {};
 
 function createModule(path, {
-	code = "",
-	isInline = false,
-	isModule = true,
+	code = ""
 } = {}) {
 	const module = {
 		path,
 		code: String(code),
 		mappings: [],
+		meta: {},
 		exports: {},
 
-		isInline,
-		isModule,
-
 		// True only after the module has been successfully evaluated.
 		loaded: false,
 
@@ -137,14 +133,40 @@ function createModule(path, {
 	return module;
 }
 
+function makeImportsObject(mod)
+{
+	mod.importsObject ??= {};
+
+	for(const path in mod.meta.imports) {
+		let exps = required_scripts[path];
+		let imps = mod.meta.imports[path];
+		if(!exps) {
+			exps = Lilact.require(path, {requirer: mod});
+		}
+
+		for(const i in imps.named_imports) {
+			if(i==='') continue;
+			const j = imps.named_imports[i];
+			if(!exps.hasOwnProperty(j)) throw new Error(`Imported module does not export any "${i}".`);
+			mod.importsObject[i] = exps[j];
+		}
+
+		for(const i of imps.import_defaults) {
+			if(!exps.hasOwnProperty('default')) throw new Error(`Imported module does not export a default.`);
+			mod.importsObject[i] = exps.default;
+		}
+
+
+		for(const i of imps.import_stars) {
+			mod.importsObject[i] = {...exps};
+		}
+	}
+}
+
 export function run(
 	jsx,
 	path = `InlineJSX-${++Lilact.eval_num}`,
-	{
-		isInline = true,
-		isModule = true,
-		hotReload = true
-	} = {}
+	{} = {}
 ) {
 	let module = required_scripts[path];
 
@@ -156,8 +178,6 @@ export function run(
 	if (!module) {
 		module = createModule(path, {
 			code: jsx,
-			isInline,
-			isModule,
 		});
 	} else {
 		/*
@@ -169,10 +189,10 @@ export function run(
 		module.code = String(jsx);
 		module.mappings = [];
 		module.exports = {};
-		module.isInline = isInline;
-		module.isModule = isModule;
 		module.loaded = false;
 		module.error = undefined;
+		module.importsObject = undefined;
+		module.meta = {};
 	}
 
 	let processed;
@@ -181,11 +201,13 @@ export function run(
 		processed = Lilact.transpileJSX(String(jsx), {
 			path,
 			mappings: module.mappings,
+			meta: module.meta,
 			factory: "createComponent",
 			appendSourcemap: true,
 			injectTraceLabels: true,
-			produceCJS: true,
-			blocks_info: Lilact.blocks_info,
+			produceCJS: false,
+			referentiateImports: true,
+			blocksInfo: Lilact.blocksInfo,
 		});
 	} 
 	catch (value) {
@@ -208,12 +230,13 @@ export function run(
 	*/
 
 	try {
-		new Function(processed);
-
 		globalThis.Lilact = Lilact;
 		globalThis.createComponent = Lilact.createComponent;
 		globalThis.Fragment = Lilact.Fragment;
 
+		if(!module.importsObject) makeImportsObject(module);
+
+		Lilact.scriptImportsObject = module.importsObject;
 		const result = eval(processed);
 		module.loaded = true;
 
@@ -277,10 +300,7 @@ function loadAsyncResource(path, module) {
 				return undefined;
 			}
 
-			return run(module.code, path, {
-				isInline: false,
-				isModule: true,
-			});
+			return run(module.code, path, {});
 		})
 		.then(result => result?.default ?? result)
 		.catch(error => {
@@ -289,7 +309,7 @@ function loadAsyncResource(path, module) {
 		})
 		.finally(() => {
 			/*
-			* Do not remove a newer request accidentally if a future forceUpdate
+			* Do not remove a newer request accidentally if a future forceReload
 			* request replaced this one.
 			*/
 			if (module.request === request) {
@@ -316,7 +336,7 @@ export function require(path) {
 		return Lilact.importObjectPaths[path];
 	}
 
-	if (options.requirer?.path) {
+	if (options?.requirer?.path) {
 		path = joinPaths(options.requirer.path, path);
 	}
 
@@ -325,16 +345,13 @@ export function require(path) {
 		Boolean(options.isLazy);
 
 
-	const module = getOrCreateModule(path, {
-		isInline: false,
-		isModule: true,
-	});
+	const module = getOrCreateModule(path, {});
 
 	/*
 	* A completed module can be returned synchronously unless the caller
 	* explicitly requests lazy loading.
 	*/
-	if (module.loaded && !options.forceUpdate) {
+	if (module.loaded && !options.forceReload) {
 		return module.exports;
 	}
 
@@ -348,7 +365,7 @@ export function require(path) {
 			);
 		}
 
-		return run(element.textContent || "", path);
+		return run(element.textContent || "", path, {forceReload: options.forceReload});
 	}
 
 	if (loadAsync) {
@@ -357,7 +374,7 @@ export function require(path) {
 		/*
 		* Every subsequent lazy require() receives the first request promise.
 		* This applies even when the module is still being fetched and even when
-		* the first caller used forceUpdate.
+		* the first caller used forceReload.
 		*/
 		if (module.request) {
 			return module.request;
@@ -376,10 +393,7 @@ export function require(path) {
 			return undefined;
 		}
 
-		return run(String(resolved), path, {
-			isInline: false,
-			isModule: true,
-		});
+		return run(String(resolved), path, {forceReload: options.forceReload});
 	}
 
 	const request = new XMLHttpRequest();
@@ -399,10 +413,7 @@ export function require(path) {
 			return undefined;
 		}
 
-		return run(request.responseText, path, {
-			isInline: false,
-			isModule: true,
-		});
+		return run(request.responseText, path, {forceReload: options.forceReload});
 	}
 
 	throw report(

package/docs/variables/errors.blocks_info.html

@@ -1 +0,0 @@
-<!DOCTYPE html><html class="default" lang="en" data-base="../"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>blocks_info | Lilact</title><meta name="description" content="Documentation for Lilact"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/icons.js" id="tsd-icons-script"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script><script async src="../assets/hierarchy.js" id="tsd-hierarchy-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => window.app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><a href="../index.html" class="title">Lilact</a><div id="tsd-toolbar-links"></div><button id="tsd-search-trigger" class="tsd-widget" aria-label="Search"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-search"></use></svg></button><dialog id="tsd-search" aria-label="Search"><input role="combobox" id="tsd-search-input" aria-controls="tsd-search-results" aria-autocomplete="list" aria-expanded="true" autocapitalize="off" autocomplete="off" placeholder="Search the docs" maxLength="100"/><ul role="listbox" id="tsd-search-results"></ul><div id="tsd-search-status" aria-live="polite" aria-atomic="true"><div>Preparing search index...</div></div></dialog><a href="#" class="tsd-widget menu" id="tsd-toolbar-menu-trigger" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-menu"></use></svg></a></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb" aria-label="Breadcrumb"><li><a href="../modules/errors.html">errors</a></li><li><a href="" aria-current="page">blocks_info</a></li></ul><h1>Variable blocks_info<code class="tsd-tag">Const</code></h1></div><div class="tsd-signature"><span class="tsd-kind-variable">blocks_info</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">{</span> <span class="tsd-kind-property">counter</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">;</span> <span class="tsd-kind-property">labels</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">{}</span> <span class="tsd-signature-symbol">}</span><span class="tsd-signature-symbol"> = ...</span></div><div class="tsd-type-declaration"><h4>Type Declaration</h4><ul class="tsd-parameters"><li class="tsd-parameter"><h5 id="counter"><span class="tsd-kind-property">counter</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">number</span></h5></li><li class="tsd-parameter"><h5 id="labels"><span class="tsd-kind-property">labels</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-symbol">{}</span></h5></li></ul></div><aside class="tsd-sources"><ul><li>Defined in errors.jsx:420</li></ul></aside></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><svg width="20" height="20" viewBox="0 0 24 24" fill="none" aria-hidden="true"><use href="../assets/icons.svg#icon-chevronDown"></use></svg><h3>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-protected" name="protected"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Protected</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-external" name="external"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>External</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="../modules.html">Lilact</a><ul class="tsd-small-nested-navigation" id="tsd-nav-container"><li>Loading...</li></ul></nav></div></div></div><footer><p class="tsd-generator">Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p></footer><div class="overlay"></div></body></html>