fix: v2 non-field api support

packages/@lwc/engine-server/src/__tests__/fixtures/api/property/expected.html

@@ -0,0 +1,14 @@
+<x-parent>
+  <template shadowrootmode="open">
+    <x-child>
+      <template shadowrootmode="open">
+        const field api value
+      </template>
+    </x-child>
+    <x-child>
+      <template shadowrootmode="open">
+        field api value
+      </template>
+    </x-child>
+  </template>
+</x-parent>

packages/@lwc/engine-server/src/__tests__/fixtures/api/property/index.js

@@ -0,0 +1,3 @@
+export const tagName = 'x-parent';
+export { default } from 'x/parent';
+export * from 'x/parent';

packages/@lwc/engine-server/src/__tests__/fixtures/api/property/modules/x/child/child.html

@@ -0,0 +1,3 @@
+<template>
+    {fieldApi}
+</template>

packages/@lwc/engine-server/src/__tests__/fixtures/api/property/modules/x/child/child.js

@@ -0,0 +1,5 @@
+import { LightningElement, api } from 'lwc';
+
+export default class Child extends LightningElement {
+    @api fieldApi;
+}

packages/@lwc/engine-server/src/__tests__/fixtures/api/property/modules/x/parent/parent.html

@@ -0,0 +1,4 @@
+<template>
+    <x-child field-api="const field api value"></x-child>
+    <x-child field-api={fieldApiValue}></x-child>
+</template>

packages/@lwc/engine-server/src/__tests__/fixtures/api/property/modules/x/parent/parent.js

@@ -0,0 +1,5 @@
+import { LightningElement } from 'lwc';
+
+export default class Parent extends LightningElement {
+    fieldApiValue = 'field api value';
+}

packages/@lwc/engine-server/src/__tests__/fixtures/api/setter/expected.html

@@ -0,0 +1,14 @@
+<x-parent>
+  <template shadowrootmode="open">
+    <x-child>
+      <template shadowrootmode="open">
+        const setter getter api value
+      </template>
+    </x-child>
+    <x-child>
+      <template shadowrootmode="open">
+        setter getter api value
+      </template>
+    </x-child>
+  </template>
+</x-parent>

packages/@lwc/engine-server/src/__tests__/fixtures/api/setter/index.js

@@ -0,0 +1,3 @@
+export const tagName = 'x-parent';
+export { default } from 'x/parent';
+export * from 'x/parent';

packages/@lwc/engine-server/src/__tests__/fixtures/api/setter/modules/x/child/child.html

@@ -0,0 +1,3 @@
+<template>
+    {setterGetterApi}
+</template>

packages/@lwc/engine-server/src/__tests__/fixtures/api/setter/modules/x/child/child.js

@@ -0,0 +1,11 @@
+import { LightningElement, api } from 'lwc';
+
+export default class Child extends LightningElement {
+    @api set setterGetterApi(value) {
+        this._someApi = value;
+    }
+
+    get setterGetterApi() {
+        return this._someApi;
+    }
+}

packages/@lwc/engine-server/src/__tests__/fixtures/api/setter/modules/x/parent/parent.html

@@ -0,0 +1,4 @@
+<template>
+    <x-child setter-getter-api="const setter getter api value"></x-child>
+    <x-child setter-getter-api={setterGetterApiValue}></x-child>
+</template>

packages/@lwc/engine-server/src/__tests__/fixtures/api/setter/modules/x/parent/parent.js

@@ -0,0 +1,5 @@
+import { LightningElement } from 'lwc';
+
+export default class Parent extends LightningElement {
+    setterGetterApiValue = 'setter getter api value';
+}

packages/@lwc/engine-server/src/__tests__/fixtures/reserved-keywords/modules/x/cmp/cmp.js

@@ -1,7 +1,7 @@
 import { LightningElement } from 'lwc';
 
 const privateFields = undefined;
-const publicFields = undefined;
+const api = undefined;
 const stylesheetScopeToken = undefined;
 const hasScopedStylesheets = undefined;
 const defaultScopedStylesheets = undefined;
@@ -13,7 +13,7 @@ export default class extends LightningElement {
             {},
             {
                 privateFields,
-                publicFields,
+                api,
                 stylesheetScopeToken,
                 hasScopedStylesheets,
                 defaultScopedStylesheets,

packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts

@@ -16,7 +16,7 @@ import type { ComponentMetaState } from './types';
 
 const bGenerateMarkup = esTemplate`
     // These variables may mix with component-authored variables, so should be reasonably unique
-    const __lwcPublicFields__ = new Set(${/*public fields*/ is.arrayExpression});
+    const __lwcApi__ = new Set(${/*api*/ is.arrayExpression});
     const __lwcPrivateFields__ = new Set(${/*private fields*/ is.arrayExpression});
 
     async function* generateMarkup(
@@ -43,7 +43,7 @@ const bGenerateMarkup = esTemplate`
         instance[__SYMBOL__SET_INTERNALS](
             props,
             attrs,
-            __lwcPublicFields__,
+            __lwcApi__,
             __lwcPrivateFields__,
         );
         instance.isConnected = true;
@@ -101,7 +101,7 @@ export function addGenerateMarkupFunction(
     tagName: string,
     filename: string
 ) {
-    const { privateFields, publicFields, tmplExplicitImports } = state;
+    const { privateFields, api, tmplExplicitImports } = 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
@@ -141,7 +141,7 @@ export function addGenerateMarkupFunction(
     );
     program.body.push(
         ...bGenerateMarkup(
-            b.arrayExpression(publicFields.map(b.literal)),
+            b.arrayExpression(api.map(b.literal)),
             b.arrayExpression(privateFields.map(b.literal)),
             defaultTagName,
             classIdentifier,

packages/@lwc/ssr-compiler/src/compile-js/index.ts

@@ -101,7 +101,7 @@ const visitors: Visitors = {
         validateUniqueDecorator(decorators);
         const decoratedExpression = decorators?.[0]?.expression;
         if (is.identifier(decoratedExpression) && decoratedExpression.name === 'api') {
-            state.publicFields.push(node.key.name);
+            state.api.push(node.key.name);
         } else if (
             is.callExpression(decoratedExpression) &&
             is.identifier(decoratedExpression.callee) &&
@@ -164,6 +164,8 @@ const visitors: Visitors = {
             } else {
                 catalogWireAdapters(path, state);
             }
+        } else if (is.identifier(decoratedExpression) && decoratedExpression.name === 'api') {
+            state.api.push(node.key.name);
         }
 
         switch (node.key.name) {
@@ -269,7 +271,7 @@ export default function compileJS(
         tmplExplicitImports: null,
         cssExplicitImports: null,
         staticStylesheetIds: null,
-        publicFields: [],
+        api: [],
         privateFields: [],
         wireAdapters: [],
         experimentalDynamicComponent: options.experimentalDynamicComponent,

packages/@lwc/ssr-compiler/src/compile-js/types.ts

@@ -48,8 +48,8 @@ export interface ComponentMetaState {
     cssExplicitImports: Map<string, string> | null;
     // the set of variable names associated with explicitly imported CSS files
     staticStylesheetIds: Set<string> | null;
-    // the public (`@api`-annotated) fields of the component class
-    publicFields: Array<string>;
+    // the public (`@api`-annotated) fields and methods of the component class
+    api: Array<string>;
     // the private fields of the component class
     privateFields: Array<string>;
     // indicates whether the LightningElement has any wired props

packages/@lwc/ssr-runtime/src/lightning-element.ts

@@ -78,7 +78,7 @@ export class LightningElement implements PropsAvailableAtConstruction {
     [SYMBOL__SET_INTERNALS](
         props: Properties,
         attrs: Attributes,
-        publicFields: Set<string>,
+        api: Set<string>,
         privateFields: Set<string>
     ) {
         this.#props = props;
@@ -91,7 +91,7 @@ export class LightningElement implements PropsAvailableAtConstruction {
         for (const propName of keys(props)) {
             const attrName = htmlPropertyToAttribute(propName);
             if (
-                publicFields.has(propName) ||
+                api.has(propName) ||
                 ((REFLECTIVE_GLOBAL_PROPERTY_SET.has(propName) || isAriaAttribute(attrName)) &&
                     !privateFields.has(propName))
             ) {