+ this only matters for ssr-compiler; engine-server does not have the same internals +
++ generateMarkup overridden: false +
++ tmpl overridden: false +
++ public props overridden: false +
+ +this only matters for ssr-compiler; engine-server does not have the same internals
+generateMarkup overridden: {isGenerateMarkupOverridden}
+tmpl overridden: {isTmplOverridden}
+public props overridden: {isPublicPropsOverridden}
+ diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/ssr-internals/modules/x/component/component.js b/packages/@lwc/engine-server/src/__tests__/fixtures/ssr-internals/modules/x/component/component.js new file mode 100644 index 0000000000..a39cc98b8f --- /dev/null +++ b/packages/@lwc/engine-server/src/__tests__/fixtures/ssr-internals/modules/x/component/component.js @@ -0,0 +1,24 @@ +import { LightningElement } from 'lwc'; +import { SYMBOL__DEFAULT_TEMPLATE, SYMBOL__GENERATE_MARKUP } from '@lwc/ssr-runtime'; + +const myGenerateMarkup = () => 'hili
'; +const myPublicProperties = ['philip']; +const myTmpl = () => { + throw new Error('PHILIP'); +}; + +export default class Component extends LightningElement { + static [SYMBOL__DEFAULT_TEMPLATE] = myTmpl; + static [SYMBOL__GENERATE_MARKUP] = myGenerateMarkup; + static ['__lwcPublicProperties__'] = myPublicProperties; + + get isGenerateMarkupOverridden() { + return Component[SYMBOL__DEFAULT_TEMPLATE] === myGenerateMarkup; + } + get isTmplOverridden() { + return Component[SYMBOL__GENERATE_MARKUP] === myTmpl; + } + get isPublicPropsOverridden() { + return Component['__lwcPublicProperties__'] === myPublicProperties; + } +} diff --git a/packages/@lwc/errors/package.json b/packages/@lwc/errors/package.json index 7c5c8a58c9..e357c1d273 100644 --- a/packages/@lwc/errors/package.json +++ b/packages/@lwc/errors/package.json @@ -4,7 +4,7 @@ "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten." ], "name": "@lwc/errors", - "version": "8.13.1", + "version": "8.13.2", "description": "LWC Error Utilities", "keywords": [ "lwc" diff --git a/packages/@lwc/features/package.json b/packages/@lwc/features/package.json index 64a64f02f7..1d96322d7d 100644 --- a/packages/@lwc/features/package.json +++ b/packages/@lwc/features/package.json @@ -4,7 +4,7 @@ "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten." ], "name": "@lwc/features", - "version": "8.13.1", + "version": "8.13.2", "description": "LWC Features Flags", "keywords": [ "lwc" @@ -46,6 +46,6 @@ } }, "dependencies": { - "@lwc/shared": "8.13.1" + "@lwc/shared": "8.13.2" } } diff --git a/packages/@lwc/integration-karma/package.json b/packages/@lwc/integration-karma/package.json index 2be7c8d1e6..cf50cbc58c 100644 --- a/packages/@lwc/integration-karma/package.json +++ b/packages/@lwc/integration-karma/package.json @@ -1,7 +1,7 @@ { "name": "@lwc/integration-karma", "private": true, - "version": "8.13.1", + "version": "8.13.2", "scripts": { "start": "KARMA_MODE=watch karma start ./scripts/karma-configs/test/local.js", "test": "karma start ./scripts/karma-configs/test/local.js --single-run --browsers ChromeHeadless", @@ -17,11 +17,11 @@ "karma-sauce-launcher-fix-firefox": "using a fork to work around https://github.com/karma-runner/karma-sauce-launcher/issues/275" }, "devDependencies": { - "@lwc/compiler": "8.13.1", - "@lwc/engine-dom": "8.13.1", - "@lwc/engine-server": "8.13.1", - "@lwc/rollup-plugin": "8.13.1", - "@lwc/synthetic-shadow": "8.13.1", + "@lwc/compiler": "8.13.2", + "@lwc/engine-dom": "8.13.2", + "@lwc/engine-server": "8.13.2", + "@lwc/rollup-plugin": "8.13.2", + "@lwc/synthetic-shadow": "8.13.2", "@types/jasmine": "^5.1.5", "chokidar": "^4.0.3", "istanbul-lib-coverage": "^3.2.2", diff --git a/packages/@lwc/integration-tests/package.json b/packages/@lwc/integration-tests/package.json index 362c740125..db51dcf03d 100644 --- a/packages/@lwc/integration-tests/package.json +++ b/packages/@lwc/integration-tests/package.json @@ -1,7 +1,7 @@ { "name": "@lwc/integration-tests", "private": true, - "version": "8.13.1", + "version": "8.13.2", "scripts": { "build": "node scripts/build.js", "build:dev": "MODE=dev yarn build", @@ -18,16 +18,16 @@ "sauce:prod:ci": "MODE=prod yarn build:prod && MODE=prod ../../../scripts/ci/retry.sh wdio ./scripts/wdio.sauce.conf.js" }, "devDependencies": { - "@lwc/rollup-plugin": "8.13.1", - "@wdio/cli": "^9.7.2", - "@wdio/local-runner": "^9.7.2", - "@wdio/mocha-framework": "^9.7.2", - "@wdio/sauce-service": "^9.7.2", - "@wdio/spec-reporter": "^9.6.3", + "@lwc/rollup-plugin": "8.13.2", + "@wdio/cli": "^9.8.0", + "@wdio/local-runner": "^9.8.0", + "@wdio/mocha-framework": "^9.7.3", + "@wdio/sauce-service": "^9.8.0", + "@wdio/spec-reporter": "^9.8.0", "@wdio/static-server-service": "^9.6.3", "deepmerge": "^4.3.1", "dotenv": "^16.4.7", - "lwc": "8.13.1", + "lwc": "8.13.2", "minimist": "^1.2.8", "webdriverio": "^9.0.7" }, diff --git a/packages/@lwc/integration-types/package.json b/packages/@lwc/integration-types/package.json index 6433e2ce9a..4ab818e953 100644 --- a/packages/@lwc/integration-types/package.json +++ b/packages/@lwc/integration-types/package.json @@ -1,7 +1,7 @@ { "name": "@lwc/integration-types", "private": true, - "version": "8.13.1", + "version": "8.13.2", "description": "Type validation for LWC packages", "type": "module", "scripts": { @@ -9,13 +9,13 @@ "playground": "rollup -c src/playground/rollup.config.js --watch" }, "dependencies": { - "@lwc/rollup-plugin": "8.13.1", - "lwc": "8.13.1" + "@lwc/rollup-plugin": "8.13.2", + "lwc": "8.13.2" }, "devDependencies": { "@rollup/plugin-replace": "^6.0.2", "@rollup/plugin-typescript": "^12.1.2", - "rollup": "^4.34.1", + "rollup": "^4.34.6", "rollup-plugin-livereload": "^2.0.5", "rollup-plugin-serve": "^3.0.0" } diff --git a/packages/@lwc/module-resolver/package.json b/packages/@lwc/module-resolver/package.json index 5b5fac23a2..628eab9e0b 100644 --- a/packages/@lwc/module-resolver/package.json +++ b/packages/@lwc/module-resolver/package.json @@ -4,7 +4,7 @@ "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten." ], "name": "@lwc/module-resolver", - "version": "8.13.1", + "version": "8.13.2", "description": "Resolves paths for LWC components", "keywords": [ "lwc" diff --git a/packages/@lwc/perf-benchmarks-components/package.json b/packages/@lwc/perf-benchmarks-components/package.json index 61a076d317..cf8bf7157c 100644 --- a/packages/@lwc/perf-benchmarks-components/package.json +++ b/packages/@lwc/perf-benchmarks-components/package.json @@ -1,12 +1,12 @@ { "name": "@lwc/perf-benchmarks-components", - "version": "8.13.1", + "version": "8.13.2", "private": true, "scripts": { "build": "rm -fr dist && rollup -c ./rollup.config.mjs" }, "devDependencies": { - "@lwc/rollup-plugin": "8.13.1" + "@lwc/rollup-plugin": "8.13.2" }, "nx": { "targets": { diff --git a/packages/@lwc/perf-benchmarks/package.json b/packages/@lwc/perf-benchmarks/package.json index 7d29f5727b..15afcd0e03 100644 --- a/packages/@lwc/perf-benchmarks/package.json +++ b/packages/@lwc/perf-benchmarks/package.json @@ -1,6 +1,6 @@ { "name": "@lwc/perf-benchmarks", - "version": "8.13.1", + "version": "8.13.2", "private": true, "scripts": { "build": "rm -fr dist && rollup -c ./rollup.config.mjs && node scripts/build.js && ./scripts/fix-deps.sh", @@ -15,11 +15,11 @@ "Don't forget to add these to fix-deps.sh as well." ], "dependencies": { - "@lwc/engine-dom": "8.13.1", - "@lwc/engine-server": "8.13.1", - "@lwc/perf-benchmarks-components": "8.13.1", - "@lwc/ssr-runtime": "8.13.1", - "@lwc/synthetic-shadow": "8.13.1" + "@lwc/engine-dom": "8.13.2", + "@lwc/engine-server": "8.13.2", + "@lwc/perf-benchmarks-components": "8.13.2", + "@lwc/ssr-runtime": "8.13.2", + "@lwc/synthetic-shadow": "8.13.2" }, "devDependencies": { "@best/cli": "^14.0.0", diff --git a/packages/@lwc/rollup-plugin/package.json b/packages/@lwc/rollup-plugin/package.json index a3cacf6669..098fb7c5db 100644 --- a/packages/@lwc/rollup-plugin/package.json +++ b/packages/@lwc/rollup-plugin/package.json @@ -4,7 +4,7 @@ "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten." ], "name": "@lwc/rollup-plugin", - "version": "8.13.1", + "version": "8.13.2", "description": "Rollup plugin to compile LWC", "keywords": [ "lwc" @@ -46,13 +46,13 @@ } }, "dependencies": { - "@lwc/compiler": "8.13.1", - "@lwc/module-resolver": "8.13.1", - "@lwc/shared": "8.13.1", + "@lwc/compiler": "8.13.2", + "@lwc/module-resolver": "8.13.2", + "@lwc/shared": "8.13.2", "@rollup/pluginutils": "~5.1.4" }, "devDependencies": { - "@lwc/errors": "8.13.1" + "@lwc/errors": "8.13.2" }, "peerDependencies": { "rollup": "^1.2.0||^2.0.0||^3.0.0||^4.0.0" diff --git a/packages/@lwc/shared/package.json b/packages/@lwc/shared/package.json index f5f1801a4d..bb3b893f9e 100644 --- a/packages/@lwc/shared/package.json +++ b/packages/@lwc/shared/package.json @@ -4,7 +4,7 @@ "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten." ], "name": "@lwc/shared", - "version": "8.13.1", + "version": "8.13.2", "description": "Utilities and methods that are shared across packages", "keywords": [ "lwc" diff --git a/packages/@lwc/shared/src/html-attributes.ts b/packages/@lwc/shared/src/html-attributes.ts index ac37b419fc..c35367767d 100644 --- a/packages/@lwc/shared/src/html-attributes.ts +++ b/packages/@lwc/shared/src/html-attributes.ts @@ -194,3 +194,26 @@ export function kebabCaseToCamelCase(attrName: string): string { return result; } + +/** + * This set is for attributes that have a camel cased property name + * For example, div.tabIndex. + * We do not want users to define `@api` properties with these names + * Because the template will never call them. It'll always call the camel + * cased version. + */ +export const AMBIGUOUS_PROP_SET = /*@__PURE__@*/ new Map([ + ['bgcolor', 'bgColor'], + ['accesskey', 'accessKey'], + ['contenteditable', 'contentEditable'], + ['tabindex', 'tabIndex'], + ['maxlength', 'maxLength'], + ['maxvalue', 'maxValue'], +]); + +/** + * This set is for attributes that can never be defined + * by users on their components. + * We throw for these. + */ +export const DISALLOWED_PROP_SET = /*@__PURE__@*/ new Set(['is', 'class', 'slot', 'style']); diff --git a/packages/@lwc/signals/package.json b/packages/@lwc/signals/package.json index b74c5b47ed..7198243051 100644 --- a/packages/@lwc/signals/package.json +++ b/packages/@lwc/signals/package.json @@ -4,7 +4,7 @@ "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten." ], "name": "@lwc/signals", - "version": "8.13.1", + "version": "8.13.2", "description": "Provides the interface to interact with reactivity from outside the framework", "keywords": [ "lwc" @@ -46,6 +46,6 @@ } }, "devDependencies": { - "@lwc/shared": "8.13.1" + "@lwc/shared": "8.13.2" } } diff --git a/packages/@lwc/ssr-compiler/package.json b/packages/@lwc/ssr-compiler/package.json index f1505db516..ae3660e4de 100644 --- a/packages/@lwc/ssr-compiler/package.json +++ b/packages/@lwc/ssr-compiler/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": "8.13.1", + "version": "8.13.2", "description": "Compile component for use during server-side rendering", "keywords": [ "compiler", @@ -48,10 +48,10 @@ } }, "dependencies": { - "@babel/types": "7.26.7", - "@lwc/shared": "8.13.1", - "@lwc/errors": "8.13.1", - "@lwc/template-compiler": "8.13.1", + "@babel/types": "7.26.8", + "@lwc/shared": "8.13.2", + "@lwc/errors": "8.13.2", + "@lwc/template-compiler": "8.13.2", "acorn": "8.14.0", "astring": "^1.9.0", "estree-toolkit": "^1.7.8", @@ -59,7 +59,7 @@ "meriyah": "^5.0.0" }, "devDependencies": { - "@lwc/babel-plugin-component": "8.13.1", + "@lwc/babel-plugin-component": "8.13.2", "@types/estree": "^1.0.6" } } diff --git a/packages/@lwc/ssr-compiler/src/__tests__/api-decorator.spec.ts b/packages/@lwc/ssr-compiler/src/__tests__/api-decorator.spec.ts new file mode 100644 index 0000000000..dc03c08f75 --- /dev/null +++ b/packages/@lwc/ssr-compiler/src/__tests__/api-decorator.spec.ts @@ -0,0 +1,168 @@ +import { describe, test, expect } from 'vitest'; +import { compileComponentForSSR } from '../index'; + +const compile = + (src: string, filename = 'test.js') => + () => { + return compileComponentForSSR(src, filename, {}); + }; + +describe('thows error', () => { + test('combined with @track', () => { + const src = /* js */ ` + import { api, track, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @track + @api + apiWithTrack = "foo"; + } + `; + expect(compile(src)).toThrow(`LWC1093: @api method or property cannot be used with @track`); + }); + + describe('conflicting api properties', () => { + test.for([ + [ + 'getter/setter', + /* js */ ` + @api foo = 1; + _internal = 1; + @api + get foo() { + return "foo"; + } + set foo(val) { + this._internal = val; + }`, + ], + [ + 'method', + /* js */ ` + @api foo = 1; + @api foo() { + return "foo"; + }`, + ], + ])(`%s`, ([, body]) => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + ${body} + } + `; + expect(compile(src)).toThrow(`LWC1096: Duplicate @api property "foo".`); + }); + }); + + test('default value is true', () => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api publicProp = true; + } + `; + expect(compile(src)).toThrow(`LWC1099: Boolean public property must default to false.`); + }); + + test('computed api getters and setters', () => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api + set [x](value) {} + get [x]() {} + } + `; + expect(compile(src)).toThrow( + `LWC1106: @api cannot be applied to a computed property, getter, setter or method.` + ); + }); + + test('property name prefixed with data', () => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api dataFooBar; + } + `; + expect(compile(src)).toThrow( + `LWC1107: Invalid property name "dataFooBar". Properties starting with "data" are reserved attributes.` + ); + }); + + test('property name prefixed with on', () => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api onChangeHandler; + } + `; + expect(compile(src)).toThrow( + `LWC1108: Invalid property name "onChangeHandler". Properties starting with "on" are reserved for event handlers` + ); + }); + + describe('property name is ambiguous', () => { + test.for([ + ['bgcolor', 'bgColor'], + ['accesskey', 'accessKey'], + ['contenteditable', 'contentEditable'], + ['tabindex', 'tabIndex'], + ['maxlength', 'maxLength'], + ['maxvalue', 'maxValue'], + ] as [prop: string, suggestion: string][])('%s', ([prop, suggestion]) => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api ${prop}; + } + `; + expect(compile(src)).toThrow( + `LWC1109: Ambiguous attribute name "${prop}". "${prop}" will never be called from template because its corresponding property is camel cased. Consider renaming to "${suggestion}"` + ); + }); + }); + + describe('disallowed props', () => { + test.for(['class', 'is', 'slot', 'style'])('%s', (prop) => { + const src = /* js */ ` + import { api, LightningElement } from 'lwc' + export default class Test extends LightningElement { + @api ${prop} + } + `; + expect(compile(src)).toThrow( + `LWC1110: Invalid property name "${prop}". "${prop}" is a reserved attribute.` + ); + }); + }); + + test('property name is part', () => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api part; + } + `; + expect(compile(src)).toThrow( + `LWC1111: Invalid property name "part". "part" is a future reserved attribute for web components.` + ); + }); + + test('both getter and a setter', () => { + const src = /* js */ ` + import { api, LightningElement } from "lwc"; + export default class Test extends LightningElement { + @api get something() { + return this.s; + } + @api set something(value) { + this.s = value; + } + } + `; + expect(compile(src)).toThrow( + `LWC1112: @api get something and @api set something detected in class declaration. Only one of the two needs to be decorated with @api.` + ); + }); +}); diff --git a/packages/@lwc/ssr-compiler/src/compile-js/decorators/api/index.ts b/packages/@lwc/ssr-compiler/src/compile-js/decorators/api/index.ts new file mode 100644 index 0000000000..bbb791b887 --- /dev/null +++ b/packages/@lwc/ssr-compiler/src/compile-js/decorators/api/index.ts @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2024, Salesforce, Inc. + * All rights reserved. + * SPDX-License-Identifier: MIT + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT + */ +import type { Decorator, Identifier } from 'estree'; + +export function isApiDecorator(decorator: Decorator | undefined): decorator is Decorator & { + expression: Identifier & { + name: 'api'; + }; +} { + return decorator?.expression.type === 'Identifier' && decorator.expression.name === 'api'; +} diff --git a/packages/@lwc/ssr-compiler/src/compile-js/decorators/api/validate.ts b/packages/@lwc/ssr-compiler/src/compile-js/decorators/api/validate.ts new file mode 100644 index 0000000000..65a905d5a3 --- /dev/null +++ b/packages/@lwc/ssr-compiler/src/compile-js/decorators/api/validate.ts @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2024, Salesforce, Inc. + * All rights reserved. + * SPDX-License-Identifier: MIT + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT + */ + +import { DecoratorErrors } from '@lwc/errors'; +import { DISALLOWED_PROP_SET, AMBIGUOUS_PROP_SET } from '@lwc/shared'; +import { is } from 'estree-toolkit'; +import { generateError } from '../../errors'; +import { type ComponentMetaState } from '../../types'; +import type { Identifier, MethodDefinition, PropertyDefinition } from 'estree'; +export type ApiMethodDefinition = MethodDefinition & { + key: Identifier; +}; +export type ApiPropertyDefinition = PropertyDefinition & { + key: Identifier; +}; + +export type ApiDefinition = ApiPropertyDefinition | ApiMethodDefinition; + +function validateName(definition: ApiDefinition) { + if (definition.computed) { + throw generateError(definition, DecoratorErrors.PROPERTY_CANNOT_BE_COMPUTED); + } + + const propertyName = definition.key.name; + + switch (true) { + case propertyName === 'part': + throw generateError( + definition, + DecoratorErrors.PROPERTY_NAME_PART_IS_RESERVED, + propertyName + ); + case propertyName.startsWith('on'): + throw generateError( + definition, + DecoratorErrors.PROPERTY_NAME_CANNOT_START_WITH_ON, + propertyName + ); + case propertyName.startsWith('data') && propertyName.length > 4: + throw generateError( + definition, + DecoratorErrors.PROPERTY_NAME_CANNOT_START_WITH_DATA, + propertyName + ); + case DISALLOWED_PROP_SET.has(propertyName): + throw generateError( + definition, + DecoratorErrors.PROPERTY_NAME_IS_RESERVED, + propertyName + ); + case AMBIGUOUS_PROP_SET.has(propertyName): + throw generateError( + definition, + DecoratorErrors.PROPERTY_NAME_IS_AMBIGUOUS, + propertyName, + AMBIGUOUS_PROP_SET.get(propertyName)! + ); + } +} + +function validatePropertyValue(property: ApiPropertyDefinition) { + if (is.literal(property.value) && property.value.value === true) { + throw generateError(property, DecoratorErrors.INVALID_BOOLEAN_PUBLIC_PROPERTY); + } +} + +function validatePropertyUnique(node: ApiPropertyDefinition, state: ComponentMetaState) { + if (state.publicProperties.has(node.key.name)) { + throw generateError(node, DecoratorErrors.DUPLICATE_API_PROPERTY, node.key.name); + } +} + +export function validateApiProperty(node: ApiPropertyDefinition, state: ComponentMetaState) { + validatePropertyUnique(node, state); + validateName(node); + validatePropertyValue(node); +} + +function validateUniqueMethod(node: ApiMethodDefinition, state: ComponentMetaState) { + const field = state.publicProperties.get(node.key.name); + + if (!field) { + return; + } + + if ( + field.type === 'MethodDefinition' && + (field.kind === 'get' || field.kind === 'set') && + (node.kind === 'get' || node.kind === 'set') + ) { + throw generateError( + node, + DecoratorErrors.SINGLE_DECORATOR_ON_SETTER_GETTER_PAIR, + node.key.name + ); + } + + throw generateError(node, DecoratorErrors.DUPLICATE_API_PROPERTY, node.key.name); +} + +export function validateApiMethod(node: ApiMethodDefinition, state: ComponentMetaState) { + validateUniqueMethod(node, state); + validateName(node); +} diff --git a/packages/@lwc/ssr-compiler/src/compile-js/decorators/index.ts b/packages/@lwc/ssr-compiler/src/compile-js/decorators/index.ts new file mode 100644 index 0000000000..d831ba661b --- /dev/null +++ b/packages/@lwc/ssr-compiler/src/compile-js/decorators/index.ts @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024, Salesforce, Inc. + * All rights reserved. + * SPDX-License-Identifier: MIT + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT + */ +import { DecoratorErrors } from '@lwc/errors'; +import { generateError } from '../errors'; +import { isApiDecorator } from './api'; +import { isTrackDecorator } from './track'; +import { isWireDecorator } from './wire'; +import type { Decorator as EsDecorator } from 'estree'; + +export function validateUniqueDecorator(decorators: EsDecorator[]) { + if (decorators.length < 2) { + return; + } + + const wire = decorators.find(isWireDecorator); + const api = decorators.find(isApiDecorator); + const track = decorators.find(isTrackDecorator); + + if (wire) { + if (api) { + throw generateError(wire, DecoratorErrors.CONFLICT_WITH_ANOTHER_DECORATOR, 'api'); + } + + if (track) { + throw generateError(wire, DecoratorErrors.CONFLICT_WITH_ANOTHER_DECORATOR, 'track'); + } + } + + if (api && track) { + throw generateError(api, DecoratorErrors.API_AND_TRACK_DECORATOR_CONFLICT); + } +} diff --git a/packages/@lwc/ssr-compiler/src/compile-js/decorators/track.ts b/packages/@lwc/ssr-compiler/src/compile-js/decorators/track.ts new file mode 100644 index 0000000000..d72f9f4156 --- /dev/null +++ b/packages/@lwc/ssr-compiler/src/compile-js/decorators/track.ts @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2024, Salesforce, Inc. + * All rights reserved. + * SPDX-License-Identifier: MIT + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT + */ +import type { Decorator, Identifier } from 'estree'; + +export function isTrackDecorator( + decorator: Decorator | undefined +): decorator is Decorator & { expression: Identifier & { name: 'track' } } { + return decorator?.expression.type === 'Identifier' && decorator.expression.name === 'track'; +} diff --git a/packages/@lwc/ssr-compiler/src/compile-js/wire.ts b/packages/@lwc/ssr-compiler/src/compile-js/decorators/wire.ts similarity index 93% rename from packages/@lwc/ssr-compiler/src/compile-js/wire.ts rename to packages/@lwc/ssr-compiler/src/compile-js/decorators/wire.ts index 69d68ac899..b733ace220 100644 --- a/packages/@lwc/ssr-compiler/src/compile-js/wire.ts +++ b/packages/@lwc/ssr-compiler/src/compile-js/decorators/wire.ts @@ -8,8 +8,8 @@ import { is, builders as b } from 'estree-toolkit'; import { produce } from 'immer'; import { DecoratorErrors } from '@lwc/errors'; -import { esTemplate } from '../estemplate'; -import { generateError } from './errors'; +import { esTemplate } from '../../estemplate'; +import { generateError } from '../errors'; import type { NodePath } from 'estree-toolkit'; import type { @@ -22,8 +22,10 @@ import type { MemberExpression, Property, BlockStatement, + Decorator, + CallExpression, } from 'estree'; -import type { ComponentMetaState, WireAdapter } from './types'; +import type { ComponentMetaState, WireAdapter } from '../types'; interface NoSpreadObjectExpression extends Omit