@lwc/ssr-compiler 9.2.2 → 9.3.4

package/dist/compile-js/decorators/wire.d.ts

@@ -1,8 +1,8 @@
 import type { NodePath } from 'estree-toolkit';
-import type { PropertyDefinition, MethodDefinition, Identifier, BlockStatement, Decorator, CallExpression } from 'estree';
+import type { ArrayExpression, PropertyDefinition, MethodDefinition, Identifier, Decorator, CallExpression } from 'estree';
 import type { ComponentMetaState, WireAdapter } from '../types';
 export declare function catalogWireAdapters(path: NodePath<PropertyDefinition | MethodDefinition>, state: ComponentMetaState): void;
-export declare function bWireAdaptersPlumbing(adapters: WireAdapter[]): BlockStatement[];
+export declare function bWireAdaptersPlumbing(adapters: WireAdapter[]): ArrayExpression;
 export declare function isWireDecorator(decorator: Decorator | undefined): decorator is Decorator & {
     expression: CallExpression & {
         callee: Identifier & {

package/dist/compile-js/generate-markup.d.ts

@@ -1,3 +1,4 @@
+import type { CompilationMode } from '@lwc/shared';
 import type { Program } from 'estree';
 import type { ComponentMetaState } from './types';
 /**
@@ -12,5 +13,5 @@ import type { ComponentMetaState } from './types';
  *  - yielding the tag name & attributes
  *  - deferring to the template function for yielding child content
  */
-export declare function addGenerateMarkupFunction(program: Program, state: ComponentMetaState, tagName: string, filename: string): void;
+export declare function addGenerateMarkupFunction(program: Program, state: ComponentMetaState, tagName: string, filename: string, compilationMode: CompilationMode): void;
 //# sourceMappingURL=generate-markup.d.ts.map

package/dist/compile-js/types.d.ts

@@ -1,7 +1,7 @@
-import { type traverse } from 'estree-toolkit';
+import { type traverse, type NodePath } from 'estree-toolkit';
 import type { ImportManager } from '../imports';
 import type { ComponentTransformOptions } from '../shared';
-import type { ClassDeclaration, Identifier, MemberExpression, MethodDefinition, Node, ObjectExpression, PropertyDefinition } from 'estree';
+import type { ClassDeclaration, ClassExpression, ExportDefaultDeclaration, Identifier, MemberExpression, MethodDefinition, Node, ObjectExpression, PropertyDefinition } from 'estree';
 export type Visitors = Parameters<typeof traverse<Node, ComponentMetaState, never>>[1];
 export interface WireAdapter {
     adapterId: Identifier | MemberExpression;
@@ -12,7 +12,7 @@ export interface ComponentMetaState {
     /** indicates whether a subclass of LightningElement is found in the JS being traversed */
     isLWC: boolean;
     /** the class declaration currently being traversed, if it is an LWC component */
-    currentComponent: ClassDeclaration | null;
+    currentComponent: ClassDeclaration | ClassExpression | null;
     /** indicates whether the LightningElement subclass includes a constructor method */
     hasConstructor: boolean;
     /** indicates whether the subclass has a connectedCallback method */
@@ -27,6 +27,10 @@ export interface ComponentMetaState {
     lightningElementIdentifier: string | null;
     /** the class name of the subclass */
     lwcClassName: string | null;
+    /** the identifier name of the default export (may differ from lwcClassName for wrapped exports) */
+    lwcDefaultExportName: string | null;
+    /** path to an expression-form `export default <expr>` node, deferred for extraction in Program.leave */
+    exportDefaultExpressionPath: NodePath<ExportDefaultDeclaration> | null;
     /** ties local variable names to explicitly-imported CSS files */
     cssExplicitImports: Map<string, string> | null;
     /** the set of variable names associated with explicitly imported CSS files */

package/dist/index.cjs

@@ -680,36 +680,26 @@ const bSetWiredProp = (esTemplate `
 const bCallWiredMethod = (esTemplate `
     instance.${ /*wire-decorated method*/estreeToolkit.is.identifier}(newValue)
 `);
-const bWireAdapterPlumbing = (esTemplate `{
-    // Callable adapters are expressed as a function having an 'adapter' property, which
-    // is the actual wire constructor.
-    const AdapterCtor = ${ /*wire adapter constructor*/estreeToolkit.is.expression}?.adapter ?? ${ /*wire adapter constructor*/0};
-    const wireInstance = new AdapterCtor((newValue) => {
-        ${ /*update the decorated property or call the decorated method*/estreeToolkit.is.expressionStatement};
-    });
-    wireInstance.connect?.();
-    if (wireInstance.update) {
-        const getLiveConfig = () => {
-            return ${ /* reactive wire config */estreeToolkit.is.objectExpression};
-        };
-        // This may look a bit weird, in that the 'update' function is called twice: once with
-        // an 'undefined' value and possibly again with a context-provided value. While weird,
-        // this preserves the behavior of the browser-side wire implementation as well as the
-        // original SSR implementation.
-        wireInstance.update(getLiveConfig(), undefined);
-        __connectContext(AdapterCtor, instance, (newContextValue) => {
-            wireInstance.update(getLiveConfig(), newContextValue);
-        });
-    }
-}`);
+// Object expression must be wrapped in () to be parsed correctly,
+// which turns it into an expression statement
+const bWireAdapterInfo = (esTemplate `({
+  adapter: ${
+// ideally would be or(is.memberExpression, is.identifier), but we don't have `or()`
+estreeToolkit.is.expression},
+  dataCallback: (instance) => (newValue) => { ${estreeToolkit.is.expressionStatement} },
+  config: (instance) => (${estreeToolkit.is.objectExpression})
+})`);
 function bWireAdaptersPlumbing(adapters) {
-    return adapters.map(({ adapterId, config, field }) => {
+    const info = adapters.map(({ adapterId, config, field }) => {
         const actionUponNewValue = estreeToolkit.is.methodDefinition(field) && field.kind === 'method'
             ? // Validation in compile-js/index.ts `visitors` ensures `key` is an identifier
                 bCallWiredMethod(field.key)
             : bSetWiredProp(field.key);
-        return bWireAdapterPlumbing(adapterId, actionUponNewValue, config);
+        // parsed as expression statement rather than object expression, so let's unwrap
+        const { expression } = bWireAdapterInfo(adapterId, actionUponNewValue, config);
+        return expression;
     });
+    return estreeToolkit.builders.arrayExpression(info);
 }
 function isWireDecorator(decorator) {
     return (estreeToolkit.is.callExpression(decorator?.expression) &&
@@ -723,100 +713,14 @@ function isWireDecorator(decorator) {
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
-const bGenerateMarkup = (esTemplate `
-    // These variables may mix with component-authored variables, so should be reasonably unique
-    const __lwcSuperPublicProperties__ = Array.from(Object.getPrototypeOf(${ /* Component class */estreeToolkit.is.identifier})?.__lwcPublicProperties__?.values?.() ?? []);
-    const __lwcPublicProperties__ = new Set(${ /*public properties*/estreeToolkit.is.arrayExpression}.concat(__lwcSuperPublicProperties__));
-
-    Object.defineProperty(
-    ${ /* component class */0},
-    __SYMBOL__GENERATE_MARKUP,
-    {
-        configurable: false,
-        enumerable: false,
-        writable: false,
-        value: async function* __lwcGenerateMarkup(
-            tagName, 
-            props, 
-            attrs,
-            parent, 
-            scopeToken,
-            contextfulParent,
-            renderContext,
-            shadowSlottedContent,
-            lightSlottedContent, 
-            scopedSlottedContent,
-        ) {
-            tagName = tagName ?? ${ /*component tag name*/estreeToolkit.is.literal};
-            attrs = attrs ?? Object.create(null);
-            props = props ?? Object.create(null);
-            const instance = new ${ /* Component class */0}({
-                tagName: tagName.toUpperCase(),
-            });
-
-            __establishContextfulRelationship(contextfulParent, instance);
-
-            instance[__SYMBOL__SET_INTERNALS](
-                props,
-                attrs,
-                __lwcPublicProperties__
-            );
-            ${ /*connect wire*/estreeToolkit.is.statement}
-            instance.isConnected = true;
-            if (instance.connectedCallback) {
-                __mutationTracker.enable(instance);
-                instance.connectedCallback();
-                __mutationTracker.disable(instance);
-            }
-            // If a render() function is defined on the class or any of its superclasses, then that takes priority.
-            // Next, if the class or any of its superclasses has an implicitly-associated template, then that takes
-            // second priority (e.g. a foo.html file alongside a foo.js file). Finally, there is a fallback empty template.
-            const tmplFn = instance.render?.() ?? ${ /*component class*/0}[__SYMBOL__DEFAULT_TEMPLATE] ?? __fallbackTmpl;
-            yield \`<\${tagName}\`;
-
-            const hostHasScopedStylesheets =
-                tmplFn.hasScopedStylesheets ||
-                hasScopedStaticStylesheets(${ /*component class*/0});
-            const hostScopeToken = hostHasScopedStylesheets ? tmplFn.stylesheetScopeToken + "-host" : undefined;
-
-            yield* __renderAttrs(instance, attrs, hostScopeToken, scopeToken);
-            yield '>';
-            yield* tmplFn(
-                shadowSlottedContent,
-                lightSlottedContent,
-                scopedSlottedContent,
-                ${ /*component class*/0},
-                instance,
-                renderContext
-            );
-            yield \`</\${tagName}>\`;
-        }
-    });
-    Object.defineProperty(
-        ${ /* component class */0},
-        '__lwcPublicProperties__',
-        {
-            configurable: false,
-            enumerable: false,
-            writable: false,
-            value: __lwcPublicProperties__
-        }
-    );
-`);
-const bExposeTemplate = (esTemplate `
-    if (${ /*template*/estreeToolkit.is.identifier}) {
-        Object.defineProperty(
-            ${ /* component class */estreeToolkit.is.identifier},
-            __SYMBOL__DEFAULT_TEMPLATE,
-            {
-                configurable: false,
-                enumerable: false,
-                writable: false,
-                value: ${ /*template*/0}
-            }
-        );
-    }
-`);
+const bSetStaticInternals = esTemplate `__setStaticInternals(
+${ /* Component */estreeToolkit.is.identifier},
+${ /* tag name */estreeToolkit.is.literal},
+${ /* public props */estreeToolkit.is.arrayExpression},
+${ /* wire adapters */estreeToolkit.is.expression} ?? null,
+${ /* compilation mode */estreeToolkit.is.literal},
+${ /* default template */estreeToolkit.is.identifier}
+)`;
 /**
  * This builds a generator function `generateMarkup` and adds it to the component JS's
  * compilation output. `generateMarkup` acts as the glue between component JS and its
@@ -829,38 +733,24 @@ const bExposeTemplate = (esTemplate `
  *  - yielding the tag name & attributes
  *  - deferring to the template function for yielding child content
  */
-function addGenerateMarkupFunction(program, state, tagName, filename) {
+function addGenerateMarkupFunction(program, state, tagName, filename, compilationMode) {
     const { publicProperties } = state;
     // The default tag name represents the component name that's passed to the transformer.
     // This is needed to generate markup for dynamic components which are invoked through
     // the generateMarkup function on the constructor.
     // At the time of generation, the invoker does not have reference to its tag name to pass as an argument.
     const defaultTagName = estreeToolkit.builders.literal(tagName);
-    const classIdentifier = estreeToolkit.builders.identifier(state.lwcClassName);
+    // Use the default export identifier if available; fall back to the class name.
+    const exportedIdentifier = estreeToolkit.builders.identifier((state.lwcDefaultExportName ?? state.lwcClassName));
     const defaultTmplPath = `./${node_path.parse(filename).name}.html`;
     const tmplVar = estreeToolkit.builders.identifier('__lwcTmpl');
     program.body.unshift(bImportDeclaration({ default: tmplVar.name }, defaultTmplPath));
-    program.body.unshift(bImportDeclaration({ SYMBOL__DEFAULT_TEMPLATE: '__SYMBOL__DEFAULT_TEMPLATE' }));
-    const exposeTemplateBlock = bExposeTemplate(tmplVar, classIdentifier);
     // If no wire adapters are detected on the component, we don't bother injecting the wire-related code.
-    let connectWireAdapterCode = [];
-    if (state.wireAdapters.length) {
-        connectWireAdapterCode = bWireAdaptersPlumbing(state.wireAdapters);
-        program.body.unshift(bImportDeclaration({ connectContext: '__connectContext' }));
-    }
+    const wireAdapterInfo = state.wireAdapters.length > 0 ? bWireAdaptersPlumbing(state.wireAdapters) : estreeToolkit.builders.literal(null);
     program.body.unshift(bImportDeclaration({
-        fallbackTmpl: '__fallbackTmpl',
-        hasScopedStaticStylesheets: undefined,
-        mutationTracker: '__mutationTracker',
-        renderAttrs: '__renderAttrs',
-        SYMBOL__GENERATE_MARKUP: '__SYMBOL__GENERATE_MARKUP',
-        SYMBOL__SET_INTERNALS: '__SYMBOL__SET_INTERNALS',
-        establishContextfulRelationship: '__establishContextfulRelationship',
+        setStaticInternals: '__setStaticInternals',
     }));
-    program.body.push(...bGenerateMarkup(classIdentifier, estreeToolkit.builders.arrayExpression([...publicProperties.keys()].map(estreeToolkit.builders.literal)), defaultTagName, connectWireAdapterCode));
-    if (exposeTemplateBlock) {
-        program.body.push(exposeTemplateBlock);
-    }
+    program.body.push(bSetStaticInternals(exportedIdentifier, defaultTagName, estreeToolkit.builders.arrayExpression([...publicProperties.keys()].map(estreeToolkit.builders.literal)), wireAdapterInfo, estreeToolkit.builders.literal(compilationMode), tmplVar));
 }
 
 /*
@@ -986,6 +876,31 @@ const visitors = {
     ExportAllDeclaration(path) {
         replaceAllLwcExport(path);
     },
+    ExportDefaultDeclaration(path, state) {
+        const { node } = path;
+        if (!node)
+            return;
+        const decl = node.declaration;
+        if (decl.type === 'ClassDeclaration') {
+            // export default class Foo extends LE {}
+            // lwcClassName will be set by the ClassDeclaration visitor; mirror it here
+            state.lwcDefaultExportName = decl.id?.name ?? 'DefaultComponentName';
+        }
+        else if (decl.type === 'ClassExpression') {
+            state.lwcDefaultExportName =
+                decl.id?.name ?? state.lwcClassName ?? 'DefaultComponentName';
+        }
+        else if (decl.type === 'Identifier') {
+            // export default Foo
+            state.lwcDefaultExportName = decl.name;
+        }
+        else if (decl.type !== 'FunctionDeclaration' && decl.type !== 'FunctionExpression') {
+            // export default <expression> — store the path for deferred extraction in Program.leave,
+            // where we know whether this is an LWC file (state.isLWC). We don't want to mutate
+            // non-LWC modules (e.g. wire adapters with `export default { Adapter }`).
+            state.exportDefaultExpressionPath = path;
+        }
+    },
     ImportDeclaration(path, state) {
         if (!path.node || !path.node.source.value || typeof path.node.source.value !== 'string') {
             return;
@@ -1026,15 +941,16 @@ const visitors = {
                 (estreeToolkit.is.exportDefaultDeclaration(path.parentPath) ||
                     // class Cmp extends LightningElement {}; export default Cmp
                     path.scope
-                        ?.getBinding(node.id.name)
+                        ?.getBinding(node.id?.name ?? '')
                         ?.references.some((ref) => estreeToolkit.is.exportDefaultDeclaration(ref.parent)))) {
-                // If it's a default-exported class with a superclass, then it's an LWC component!
                 state.isLWC = true;
                 state.currentComponent = node;
                 if (node.id) {
                     state.lwcClassName = node.id.name;
                 }
                 else {
+                    // A class declaration can omit a name if and only if it is default-exported.
+                    // There is only one default export, so this won't cause collisions.
                     node.id = estreeToolkit.builders.identifier('DefaultComponentName');
                     state.lwcClassName = 'DefaultComponentName';
                 }
@@ -1060,6 +976,44 @@ const visitors = {
             }
         },
     },
+    ClassExpression: {
+        enter(path, state) {
+            const { node } = path;
+            if (node?.superClass &&
+                estreeToolkit.is.identifier(node.superClass) &&
+                node.superClass.name === state.lightningElementIdentifier) {
+                state.isLWC = true;
+                state.currentComponent = node;
+                // Get the class name from the enclosing variable declarator, if any
+                // e.g. `const Component = class extends LightningElement {}`
+                if (estreeToolkit.is.variableDeclarator(path.parentPath?.node) &&
+                    estreeToolkit.is.identifier(path.parentPath.node.id)) {
+                    state.lwcClassName = path.parentPath.node.id.name;
+                }
+                else if (node.id) {
+                    state.lwcClassName = node.id.name;
+                }
+                // There's no builder for comment nodes :\
+                const lwcVersionComment = {
+                    type: 'Block',
+                    value: shared.LWC_VERSION_COMMENT,
+                };
+                // Add LWC version comment to end of class body
+                const { body } = node;
+                if (body.trailingComments) {
+                    body.trailingComments.push(lwcVersionComment);
+                }
+                else {
+                    body.trailingComments = [lwcVersionComment];
+                }
+            }
+        },
+        leave(path, state) {
+            if (state.currentComponent && path.node === state.currentComponent) {
+                state.currentComponent = null;
+            }
+        },
+    },
     PropertyDefinition(path, state) {
         // Don't do anything unless we're in a component
         if (!state.currentComponent) {
@@ -1176,6 +1130,24 @@ const visitors = {
     },
     Program: {
         leave(path, state) {
+            // If the default export is an expression (not class/identifier), extract it into a
+            // const so setStaticInternals has a stable identifier to call. Only do this for LWC
+            // files — non-LWC modules (e.g. wire adapters) must not be mutated.
+            if (state.isLWC && state.exportDefaultExpressionPath) {
+                const exportPath = state.exportDefaultExpressionPath;
+                const exportedExpr = exportPath.node.declaration;
+                // Each b.identifier() call creates a distinct node object; all must be trusted
+                const declId = estreeToolkit.builders.identifier('__lwcDefaultExport');
+                const exportId = estreeToolkit.builders.identifier('__lwcDefaultExport');
+                state.trustedLwcIdentifiers.add(declId);
+                state.trustedLwcIdentifiers.add(exportId);
+                // insertBefore must precede replaceWith: replaceWith marks the path as removed
+                exportPath.insertBefore([
+                    estreeToolkit.builders.variableDeclaration('const', [estreeToolkit.builders.variableDeclarator(declId, exportedExpr)]),
+                ]);
+                exportPath.replaceWith(estreeToolkit.builders.exportDefaultDeclaration(exportId));
+                state.lwcDefaultExportName = '__lwcDefaultExport';
+            }
             // After parsing the whole tree, insert needed imports
             const importDeclarations = state.importManager.getImportDeclarations();
             if (importDeclarations.length > 0) {
@@ -1208,6 +1180,8 @@ function compileJS(src, filename, tagName, options, compilationMode) {
         hadErrorCallback: false,
         lightningElementIdentifier: null,
         lwcClassName: null,
+        lwcDefaultExportName: null,
+        exportDefaultExpressionPath: null,
         cssExplicitImports: null,
         staticStylesheetIds: null,
         publicProperties: new Map(),
@@ -1226,7 +1200,7 @@ function compileJS(src, filename, tagName, options, compilationMode) {
             code: astring.generate(ast, {}),
         };
     }
-    addGenerateMarkupFunction(ast, state, tagName, filename);
+    addGenerateMarkupFunction(ast, state, tagName, filename, compilationMode);
     if (compilationMode === 'async' || compilationMode === 'sync') {
         ast = transmogrify(ast, compilationMode);
     }
@@ -1857,10 +1831,9 @@ estreeToolkit.is.statement}
 
         if (generateMarkup) {
             yield* generateMarkup(
-                tagName, 
-                childProps, 
+                tagName,
+                childProps,
                 childAttrs,
-                instance,
                 scopeToken,
                 contextfulParent,
                 renderContext,
@@ -1921,12 +1894,11 @@ const bYieldFromDynamicComponentConstructorGenerator = (esTemplateWithYield `
 estreeToolkit.is.statement}
 
         const scopeToken = hasScopedStylesheets ? stylesheetScopeToken : undefined;
-        
+
         yield* Ctor[__SYMBOL__GENERATE_MARKUP](
-            null, 
+            null,
             childProps,
             childAttrs,
-            instance,
             scopeToken,
             contextfulParent,
             renderContext,
@@ -2158,6 +2130,7 @@ const Element = function Element(node, cxt) {
     }
     const isForeignSelfClosingElement = node.namespace !== shared.HTML_NAMESPACE && childContent.length === 0;
     const isSelfClosingElement = shared.isVoidElement(node.name, shared.HTML_NAMESPACE) || isForeignSelfClosingElement;
+    cxt.import('hasScopedStaticStylesheets');
     return [
         bYield(estreeToolkit.builders.literal(`<${node.name}`)),
         bConditionallyYieldDanglingSlotName(),
@@ -2654,7 +2627,7 @@ function compileTemplate(src, filename, options, compilationMode) {
         experimentalComplexExpressions,
         apiVersion,
     });
-    addImport(['renderStylesheets', 'hasScopedStaticStylesheets']);
+    addImport(['renderStylesheets']);
     for (const [imports, source] of getStylesheetImports(filename)) {
         addImport(imports, source);
     }
@@ -2715,5 +2688,5 @@ function compileTemplateForSSR(src, filename, options, mode = shared.DEFAULT_SSR
 
 exports.compileComponentForSSR = compileComponentForSSR;
 exports.compileTemplateForSSR = compileTemplateForSSR;
-/** version: 9.2.2 */
+/** version: 9.3.4 */
 //# sourceMappingURL=index.cjs.map

package/dist/index.js

@@ -676,36 +676,26 @@ const bSetWiredProp = (esTemplate `
 const bCallWiredMethod = (esTemplate `
     instance.${ /*wire-decorated method*/is.identifier}(newValue)
 `);
-const bWireAdapterPlumbing = (esTemplate `{
-    // Callable adapters are expressed as a function having an 'adapter' property, which
-    // is the actual wire constructor.
-    const AdapterCtor = ${ /*wire adapter constructor*/is.expression}?.adapter ?? ${ /*wire adapter constructor*/0};
-    const wireInstance = new AdapterCtor((newValue) => {
-        ${ /*update the decorated property or call the decorated method*/is.expressionStatement};
-    });
-    wireInstance.connect?.();
-    if (wireInstance.update) {
-        const getLiveConfig = () => {
-            return ${ /* reactive wire config */is.objectExpression};
-        };
-        // This may look a bit weird, in that the 'update' function is called twice: once with
-        // an 'undefined' value and possibly again with a context-provided value. While weird,
-        // this preserves the behavior of the browser-side wire implementation as well as the
-        // original SSR implementation.
-        wireInstance.update(getLiveConfig(), undefined);
-        __connectContext(AdapterCtor, instance, (newContextValue) => {
-            wireInstance.update(getLiveConfig(), newContextValue);
-        });
-    }
-}`);
+// Object expression must be wrapped in () to be parsed correctly,
+// which turns it into an expression statement
+const bWireAdapterInfo = (esTemplate `({
+  adapter: ${
+// ideally would be or(is.memberExpression, is.identifier), but we don't have `or()`
+is.expression},
+  dataCallback: (instance) => (newValue) => { ${is.expressionStatement} },
+  config: (instance) => (${is.objectExpression})
+})`);
 function bWireAdaptersPlumbing(adapters) {
-    return adapters.map(({ adapterId, config, field }) => {
+    const info = adapters.map(({ adapterId, config, field }) => {
         const actionUponNewValue = is.methodDefinition(field) && field.kind === 'method'
             ? // Validation in compile-js/index.ts `visitors` ensures `key` is an identifier
                 bCallWiredMethod(field.key)
             : bSetWiredProp(field.key);
-        return bWireAdapterPlumbing(adapterId, actionUponNewValue, config);
+        // parsed as expression statement rather than object expression, so let's unwrap
+        const { expression } = bWireAdapterInfo(adapterId, actionUponNewValue, config);
+        return expression;
     });
+    return builders.arrayExpression(info);
 }
 function isWireDecorator(decorator) {
     return (is.callExpression(decorator?.expression) &&
@@ -719,100 +709,14 @@ function isWireDecorator(decorator) {
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
-const bGenerateMarkup = (esTemplate `
-    // These variables may mix with component-authored variables, so should be reasonably unique
-    const __lwcSuperPublicProperties__ = Array.from(Object.getPrototypeOf(${ /* Component class */is.identifier})?.__lwcPublicProperties__?.values?.() ?? []);
-    const __lwcPublicProperties__ = new Set(${ /*public properties*/is.arrayExpression}.concat(__lwcSuperPublicProperties__));
-
-    Object.defineProperty(
-    ${ /* component class */0},
-    __SYMBOL__GENERATE_MARKUP,
-    {
-        configurable: false,
-        enumerable: false,
-        writable: false,
-        value: async function* __lwcGenerateMarkup(
-            tagName, 
-            props, 
-            attrs,
-            parent, 
-            scopeToken,
-            contextfulParent,
-            renderContext,
-            shadowSlottedContent,
-            lightSlottedContent, 
-            scopedSlottedContent,
-        ) {
-            tagName = tagName ?? ${ /*component tag name*/is.literal};
-            attrs = attrs ?? Object.create(null);
-            props = props ?? Object.create(null);
-            const instance = new ${ /* Component class */0}({
-                tagName: tagName.toUpperCase(),
-            });
-
-            __establishContextfulRelationship(contextfulParent, instance);
-
-            instance[__SYMBOL__SET_INTERNALS](
-                props,
-                attrs,
-                __lwcPublicProperties__
-            );
-            ${ /*connect wire*/is.statement}
-            instance.isConnected = true;
-            if (instance.connectedCallback) {
-                __mutationTracker.enable(instance);
-                instance.connectedCallback();
-                __mutationTracker.disable(instance);
-            }
-            // If a render() function is defined on the class or any of its superclasses, then that takes priority.
-            // Next, if the class or any of its superclasses has an implicitly-associated template, then that takes
-            // second priority (e.g. a foo.html file alongside a foo.js file). Finally, there is a fallback empty template.
-            const tmplFn = instance.render?.() ?? ${ /*component class*/0}[__SYMBOL__DEFAULT_TEMPLATE] ?? __fallbackTmpl;
-            yield \`<\${tagName}\`;
-
-            const hostHasScopedStylesheets =
-                tmplFn.hasScopedStylesheets ||
-                hasScopedStaticStylesheets(${ /*component class*/0});
-            const hostScopeToken = hostHasScopedStylesheets ? tmplFn.stylesheetScopeToken + "-host" : undefined;
-
-            yield* __renderAttrs(instance, attrs, hostScopeToken, scopeToken);
-            yield '>';
-            yield* tmplFn(
-                shadowSlottedContent,
-                lightSlottedContent,
-                scopedSlottedContent,
-                ${ /*component class*/0},
-                instance,
-                renderContext
-            );
-            yield \`</\${tagName}>\`;
-        }
-    });
-    Object.defineProperty(
-        ${ /* component class */0},
-        '__lwcPublicProperties__',
-        {
-            configurable: false,
-            enumerable: false,
-            writable: false,
-            value: __lwcPublicProperties__
-        }
-    );
-`);
-const bExposeTemplate = (esTemplate `
-    if (${ /*template*/is.identifier}) {
-        Object.defineProperty(
-            ${ /* component class */is.identifier},
-            __SYMBOL__DEFAULT_TEMPLATE,
-            {
-                configurable: false,
-                enumerable: false,
-                writable: false,
-                value: ${ /*template*/0}
-            }
-        );
-    }
-`);
+const bSetStaticInternals = esTemplate `__setStaticInternals(
+${ /* Component */is.identifier},
+${ /* tag name */is.literal},
+${ /* public props */is.arrayExpression},
+${ /* wire adapters */is.expression} ?? null,
+${ /* compilation mode */is.literal},
+${ /* default template */is.identifier}
+)`;
 /**
  * This builds a generator function `generateMarkup` and adds it to the component JS's
  * compilation output. `generateMarkup` acts as the glue between component JS and its
@@ -825,38 +729,24 @@ const bExposeTemplate = (esTemplate `
  *  - yielding the tag name & attributes
  *  - deferring to the template function for yielding child content
  */
-function addGenerateMarkupFunction(program, state, tagName, filename) {
+function addGenerateMarkupFunction(program, state, tagName, filename, compilationMode) {
     const { publicProperties } = state;
     // The default tag name represents the component name that's passed to the transformer.
     // This is needed to generate markup for dynamic components which are invoked through
     // the generateMarkup function on the constructor.
     // At the time of generation, the invoker does not have reference to its tag name to pass as an argument.
     const defaultTagName = builders.literal(tagName);
-    const classIdentifier = builders.identifier(state.lwcClassName);
+    // Use the default export identifier if available; fall back to the class name.
+    const exportedIdentifier = builders.identifier((state.lwcDefaultExportName ?? state.lwcClassName));
     const defaultTmplPath = `./${parse$1(filename).name}.html`;
     const tmplVar = builders.identifier('__lwcTmpl');
     program.body.unshift(bImportDeclaration({ default: tmplVar.name }, defaultTmplPath));
-    program.body.unshift(bImportDeclaration({ SYMBOL__DEFAULT_TEMPLATE: '__SYMBOL__DEFAULT_TEMPLATE' }));
-    const exposeTemplateBlock = bExposeTemplate(tmplVar, classIdentifier);
     // If no wire adapters are detected on the component, we don't bother injecting the wire-related code.
-    let connectWireAdapterCode = [];
-    if (state.wireAdapters.length) {
-        connectWireAdapterCode = bWireAdaptersPlumbing(state.wireAdapters);
-        program.body.unshift(bImportDeclaration({ connectContext: '__connectContext' }));
-    }
+    const wireAdapterInfo = state.wireAdapters.length > 0 ? bWireAdaptersPlumbing(state.wireAdapters) : builders.literal(null);
     program.body.unshift(bImportDeclaration({
-        fallbackTmpl: '__fallbackTmpl',
-        hasScopedStaticStylesheets: undefined,
-        mutationTracker: '__mutationTracker',
-        renderAttrs: '__renderAttrs',
-        SYMBOL__GENERATE_MARKUP: '__SYMBOL__GENERATE_MARKUP',
-        SYMBOL__SET_INTERNALS: '__SYMBOL__SET_INTERNALS',
-        establishContextfulRelationship: '__establishContextfulRelationship',
+        setStaticInternals: '__setStaticInternals',
     }));
-    program.body.push(...bGenerateMarkup(classIdentifier, builders.arrayExpression([...publicProperties.keys()].map(builders.literal)), defaultTagName, connectWireAdapterCode));
-    if (exposeTemplateBlock) {
-        program.body.push(exposeTemplateBlock);
-    }
+    program.body.push(bSetStaticInternals(exportedIdentifier, defaultTagName, builders.arrayExpression([...publicProperties.keys()].map(builders.literal)), wireAdapterInfo, builders.literal(compilationMode), tmplVar));
 }
 
 /*
@@ -982,6 +872,31 @@ const visitors = {
     ExportAllDeclaration(path) {
         replaceAllLwcExport(path);
     },
+    ExportDefaultDeclaration(path, state) {
+        const { node } = path;
+        if (!node)
+            return;
+        const decl = node.declaration;
+        if (decl.type === 'ClassDeclaration') {
+            // export default class Foo extends LE {}
+            // lwcClassName will be set by the ClassDeclaration visitor; mirror it here
+            state.lwcDefaultExportName = decl.id?.name ?? 'DefaultComponentName';
+        }
+        else if (decl.type === 'ClassExpression') {
+            state.lwcDefaultExportName =
+                decl.id?.name ?? state.lwcClassName ?? 'DefaultComponentName';
+        }
+        else if (decl.type === 'Identifier') {
+            // export default Foo
+            state.lwcDefaultExportName = decl.name;
+        }
+        else if (decl.type !== 'FunctionDeclaration' && decl.type !== 'FunctionExpression') {
+            // export default <expression> — store the path for deferred extraction in Program.leave,
+            // where we know whether this is an LWC file (state.isLWC). We don't want to mutate
+            // non-LWC modules (e.g. wire adapters with `export default { Adapter }`).
+            state.exportDefaultExpressionPath = path;
+        }
+    },
     ImportDeclaration(path, state) {
         if (!path.node || !path.node.source.value || typeof path.node.source.value !== 'string') {
             return;
@@ -1022,15 +937,16 @@ const visitors = {
                 (is.exportDefaultDeclaration(path.parentPath) ||
                     // class Cmp extends LightningElement {}; export default Cmp
                     path.scope
-                        ?.getBinding(node.id.name)
+                        ?.getBinding(node.id?.name ?? '')
                         ?.references.some((ref) => is.exportDefaultDeclaration(ref.parent)))) {
-                // If it's a default-exported class with a superclass, then it's an LWC component!
                 state.isLWC = true;
                 state.currentComponent = node;
                 if (node.id) {
                     state.lwcClassName = node.id.name;
                 }
                 else {
+                    // A class declaration can omit a name if and only if it is default-exported.
+                    // There is only one default export, so this won't cause collisions.
                     node.id = builders.identifier('DefaultComponentName');
                     state.lwcClassName = 'DefaultComponentName';
                 }
@@ -1056,6 +972,44 @@ const visitors = {
             }
         },
     },
+    ClassExpression: {
+        enter(path, state) {
+            const { node } = path;
+            if (node?.superClass &&
+                is.identifier(node.superClass) &&
+                node.superClass.name === state.lightningElementIdentifier) {
+                state.isLWC = true;
+                state.currentComponent = node;
+                // Get the class name from the enclosing variable declarator, if any
+                // e.g. `const Component = class extends LightningElement {}`
+                if (is.variableDeclarator(path.parentPath?.node) &&
+                    is.identifier(path.parentPath.node.id)) {
+                    state.lwcClassName = path.parentPath.node.id.name;
+                }
+                else if (node.id) {
+                    state.lwcClassName = node.id.name;
+                }
+                // There's no builder for comment nodes :\
+                const lwcVersionComment = {
+                    type: 'Block',
+                    value: LWC_VERSION_COMMENT,
+                };
+                // Add LWC version comment to end of class body
+                const { body } = node;
+                if (body.trailingComments) {
+                    body.trailingComments.push(lwcVersionComment);
+                }
+                else {
+                    body.trailingComments = [lwcVersionComment];
+                }
+            }
+        },
+        leave(path, state) {
+            if (state.currentComponent && path.node === state.currentComponent) {
+                state.currentComponent = null;
+            }
+        },
+    },
     PropertyDefinition(path, state) {
         // Don't do anything unless we're in a component
         if (!state.currentComponent) {
@@ -1172,6 +1126,24 @@ const visitors = {
     },
     Program: {
         leave(path, state) {
+            // If the default export is an expression (not class/identifier), extract it into a
+            // const so setStaticInternals has a stable identifier to call. Only do this for LWC
+            // files — non-LWC modules (e.g. wire adapters) must not be mutated.
+            if (state.isLWC && state.exportDefaultExpressionPath) {
+                const exportPath = state.exportDefaultExpressionPath;
+                const exportedExpr = exportPath.node.declaration;
+                // Each b.identifier() call creates a distinct node object; all must be trusted
+                const declId = builders.identifier('__lwcDefaultExport');
+                const exportId = builders.identifier('__lwcDefaultExport');
+                state.trustedLwcIdentifiers.add(declId);
+                state.trustedLwcIdentifiers.add(exportId);
+                // insertBefore must precede replaceWith: replaceWith marks the path as removed
+                exportPath.insertBefore([
+                    builders.variableDeclaration('const', [builders.variableDeclarator(declId, exportedExpr)]),
+                ]);
+                exportPath.replaceWith(builders.exportDefaultDeclaration(exportId));
+                state.lwcDefaultExportName = '__lwcDefaultExport';
+            }
             // After parsing the whole tree, insert needed imports
             const importDeclarations = state.importManager.getImportDeclarations();
             if (importDeclarations.length > 0) {
@@ -1204,6 +1176,8 @@ function compileJS(src, filename, tagName, options, compilationMode) {
         hadErrorCallback: false,
         lightningElementIdentifier: null,
         lwcClassName: null,
+        lwcDefaultExportName: null,
+        exportDefaultExpressionPath: null,
         cssExplicitImports: null,
         staticStylesheetIds: null,
         publicProperties: new Map(),
@@ -1222,7 +1196,7 @@ function compileJS(src, filename, tagName, options, compilationMode) {
             code: generate(ast, {}),
         };
     }
-    addGenerateMarkupFunction(ast, state, tagName, filename);
+    addGenerateMarkupFunction(ast, state, tagName, filename, compilationMode);
     if (compilationMode === 'async' || compilationMode === 'sync') {
         ast = transmogrify(ast, compilationMode);
     }
@@ -1853,10 +1827,9 @@ is.statement}
 
         if (generateMarkup) {
             yield* generateMarkup(
-                tagName, 
-                childProps, 
+                tagName,
+                childProps,
                 childAttrs,
-                instance,
                 scopeToken,
                 contextfulParent,
                 renderContext,
@@ -1917,12 +1890,11 @@ const bYieldFromDynamicComponentConstructorGenerator = (esTemplateWithYield `
 is.statement}
 
         const scopeToken = hasScopedStylesheets ? stylesheetScopeToken : undefined;
-        
+
         yield* Ctor[__SYMBOL__GENERATE_MARKUP](
-            null, 
+            null,
             childProps,
             childAttrs,
-            instance,
             scopeToken,
             contextfulParent,
             renderContext,
@@ -2154,6 +2126,7 @@ const Element = function Element(node, cxt) {
     }
     const isForeignSelfClosingElement = node.namespace !== HTML_NAMESPACE && childContent.length === 0;
     const isSelfClosingElement = isVoidElement(node.name, HTML_NAMESPACE) || isForeignSelfClosingElement;
+    cxt.import('hasScopedStaticStylesheets');
     return [
         bYield(builders.literal(`<${node.name}`)),
         bConditionallyYieldDanglingSlotName(),
@@ -2650,7 +2623,7 @@ function compileTemplate(src, filename, options, compilationMode) {
         experimentalComplexExpressions,
         apiVersion,
     });
-    addImport(['renderStylesheets', 'hasScopedStaticStylesheets']);
+    addImport(['renderStylesheets']);
     for (const [imports, source] of getStylesheetImports(filename)) {
         addImport(imports, source);
     }
@@ -2710,5 +2683,5 @@ function compileTemplateForSSR(src, filename, options, mode = DEFAULT_SSR_MODE)
 }
 
 export { compileComponentForSSR, compileTemplateForSSR };
-/** version: 9.2.2 */
+/** version: 9.3.4 */
 //# sourceMappingURL=index.js.map

package/package.json

@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/ssr-compiler",
-    "version": "9.2.2",
+    "version": "9.3.4",
     "description": "Compile component for use during server-side rendering",
     "keywords": [
         "compiler",
@@ -53,18 +53,18 @@
         }
     },
     "dependencies": {
-        "@babel/types": "7.29.0",
-        "@lwc/errors": "9.2.2",
-        "@lwc/shared": "9.2.2",
-        "@lwc/template-compiler": "9.2.2",
+        "@babel/types": "7.29.7",
+        "@lwc/errors": "9.3.4",
+        "@lwc/shared": "9.3.4",
+        "@lwc/template-compiler": "9.3.4",
         "acorn": "8.16.0",
         "astring": "^1.9.0",
-        "estree-toolkit": "^1.7.13",
-        "immer": "^11.1.4",
+        "estree-toolkit": "^1.7.14",
+        "immer": "^11.1.8",
         "meriyah": "^7.1.0"
     },
     "devDependencies": {
-        "@lwc/babel-plugin-component": "9.2.2",
+        "@lwc/babel-plugin-component": "9.3.4",
         "@types/estree": "^1.0.8"
     }
 }