@arcmantle/lit-jsx 1.0.32 → 1.0.33

package/src/compiler/config.ts

@@ -1,12 +1,18 @@
 import type { BabelFile, PluginPass } from '@babel/core';
 
+
 export type BabelPlugins = NonNullable<NonNullable<babel.TransformOptions['parserOpts']>['plugins']>;
 
 
-export const babelPlugins: Set<BabelPlugins[number]> = new Set([ 'jsx', 'typescript', 'decorators', 'decoratorAutoAccessors' ]);
+export const babelPlugins: Set<BabelPlugins[number]> = new Set([
+	'jsx',
+	'typescript',
+	'decorators',
+	'decoratorAutoAccessors',
+]);
 export const debugMode = { value: false };
 
-
+export const CE_ATTR_IDENTIFIER = 'static';
 export const COMPONENT_LITERAL_PREFIX = '__$';
 export const WHITESPACE_TAGS: string[] = [ 'pre', 'textarea' ];
 export const SPECIAL_TAGS: string[] = [];
@@ -97,26 +103,40 @@ export const ERROR_MESSAGES = {
 } as const;
 
 
+interface PluginOptions {
+	useCompiledTemplates?: boolean;
+	useImportDiscovery?:   boolean;
+}
+
+
 export const initializePluginOptions = (file: BabelFile): { useCompiledTemplates?: boolean; } => {
 	if (optionsInitialized)
 		return options;
 
 	optionsInitialized = true;
 
-	const plugin = file.opts?.plugins
-		?.find(plugin => (plugin as PluginPass).key === 'lit-jsx-transform') as { options?: { useCompiledTemplates?: boolean; }; };
+	const plugin = file.opts?.plugins?.find(plugin =>
+		(plugin as PluginPass).key === 'lit-jsx-transform') as { options?: PluginOptions; };
 
 	const pluginOptions = plugin?.options || {};
+	pluginOptions.useCompiledTemplates ??= true;
 
 	for (const [ key, value ] of Object.entries(pluginOptions))
 		options[key as keyof typeof options] = value as any;
 
 	console.log(`Lit JSX plugin options initialized:`, options);
 
-
 	return pluginOptions;
 };
 
 
+export const getPluginOptions = (file: BabelFile): PluginOptions => {
+	const plugin = file.opts?.plugins?.find(plugin =>
+		(plugin as PluginPass).key === 'lit-jsx-transform') as { options?: PluginOptions; };
+
+	return plugin.options ?? {};
+};
+
+
 let optionsInitialized = false;
-export const options: { useCompiledTemplates?: boolean; } = {};
+export const options: PluginOptions = {};

package/src/compiler/transpiler.ts

@@ -16,6 +16,7 @@ import {
 	isJSXElementStatic,
 	isJSXFragmentPath,
 	isValidOpeningElement,
+	normalizeText,
 } from './compiler-utils.js';
 import {
 	Ensure,
@@ -160,10 +161,14 @@ export class TemplateTranspiler extends JSXTranspiler<TemplateContext> {
 	override children(context: TemplateContext): void {
 		for (const [ index, child ] of context.path.node.children.entries()) {
 			if (t.isJSXText(child)) {
-				if (WHITESPACE_TAGS.includes(context.tagName))
+				if (WHITESPACE_TAGS.includes(context.tagName)) {
 					context.builder.addText(child.value);
-				else
-					context.builder.addText(child.value.trim());
+				}
+				else {
+					const normalizedValue = normalizeText(child.value);
+					if (normalizedValue)
+						context.builder.addText(normalizedValue);
+				}
 			}
 			else if (t.isJSXExpressionContainer(child)) {
 				if (t.isJSXEmptyExpression(child.expression))
@@ -300,9 +305,14 @@ export class TemplateTranspiler extends JSXTranspiler<TemplateContext> {
 				const child = childPath.node;
 
 				if (t.isJSXText(child)) {
-					const trimmedValue = child.value.trim();
-					if (trimmedValue)
-						childrenArray.push(t.stringLiteral(trimmedValue));
+					if (WHITESPACE_TAGS.includes(context.tagName)) {
+						childrenArray.push(t.stringLiteral(child.value));
+					}
+					else {
+						const normalizedValue = normalizeText(child.value);
+						if (normalizedValue)
+							childrenArray.push(t.stringLiteral(normalizedValue));
+					}
 				}
 				else if (t.isJSXExpressionContainer(child)) {
 					if (t.isJSXEmptyExpression(child.expression))
@@ -463,10 +473,14 @@ export class CompiledTranspiler extends JSXTranspiler<CompiledContext> {
 			const child = childPath.node;
 
 			if (t.isJSXText(child)) {
-				if (WHITESPACE_TAGS.includes(context.tagName))
+				if (WHITESPACE_TAGS.includes(context.tagName)) {
 					context.builder.addText(child.value);
-				else
-					context.builder.addText(child.value.trim());
+				}
+				else {
+					const normalizedValue = normalizeText(child.value);
+					if (normalizedValue)
+						context.builder.addText(normalizedValue);
+				}
 			}
 			else if (t.isJSXExpressionContainer(child)) {
 				if (t.isJSXEmptyExpression(child.expression))
@@ -560,9 +574,14 @@ export class CompiledTranspiler extends JSXTranspiler<CompiledContext> {
 				const child = childPath.node;
 
 				if (t.isJSXText(child)) {
-					const trimmedValue = child.value.trim();
-					if (trimmedValue)
-						childrenArray.push(t.stringLiteral(trimmedValue));
+					if (WHITESPACE_TAGS.includes(context.tagName)) {
+						childrenArray.push(t.stringLiteral(child.value));
+					}
+					else {
+						const normalizedValue = normalizeText(child.value);
+						if (normalizedValue)
+							childrenArray.push(t.stringLiteral(normalizedValue));
+					}
 				}
 				else if (t.isJSXExpressionContainer(child)) {
 					if (t.isJSXEmptyExpression(child.expression))

package/src/compiler/vite-plugin.ts

@@ -16,8 +16,10 @@ import { ImportDiscovery } from './import-discovery.js';
 export const litJsx = (options: {
 	/**  Enable legacy decorators support */
 	legacyDecorators?:     boolean;
-	/** Enables experimental support for compiled templates */
+	/** Enables support for experimental compiled templates @default true */
 	useCompiledTemplates?: boolean;
+	/** Opts into the automatic discovery is custom elements instead of using the static attribute */
+	useImportDiscovery?:   boolean;
 	/** Enable debug mode for additional logging */
 	debug?:                boolean;
 	/** Options for the Babel transform */
@@ -65,6 +67,7 @@ export const litJsx = (options: {
 						plugins:        [
 							litJsxBabelPlugin({
 								useCompiledTemplates: options.useCompiledTemplates,
+								useImportDiscovery:   options.useImportDiscovery,
 							}),
 						],
 						ast:        false,