@lwc/engine-core 2.5.0 → 2.5.1

package/dist/engine-core.cjs.js

@@ -2943,18 +2943,33 @@ function createObservedFieldPropertyDescriptor(key) {
 
 function getClassDescriptorType(descriptor) {
   if (shared.isFunction(descriptor.value)) {
-    return 'method';
+    return "method"
+    /* Method */
+    ;
   } else if (shared.isFunction(descriptor.set) || shared.isFunction(descriptor.get)) {
-    return 'accessor';
+    return "accessor"
+    /* Accessor */
+    ;
   } else {
-    return 'field';
+    return "field"
+    /* Field */
+    ;
   }
 }
 
 function validateObservedField(Ctor, fieldName, descriptor) {
   if (!shared.isUndefined(descriptor)) {
     const type = getClassDescriptorType(descriptor);
-    shared.assert.fail(`Invalid observed ${fieldName} field. Found a duplicate ${type} with the same name.`);
+    const message = `Invalid observed ${fieldName} field. Found a duplicate ${type} with the same name.`; // [W-9927596] Ideally we always throw an error when detecting duplicate observed field.
+    // This branch is only here for backward compatibility reasons.
+
+    if (type === "accessor"
+    /* Accessor */
+    ) {
+      logError(message);
+    } else {
+      shared.assert.fail(message);
+    }
   }
 }
 
@@ -2981,7 +2996,16 @@ function validateMethodDecoratedWithWire(Ctor, methodName, descriptor) {
 function validateFieldDecoratedWithApi(Ctor, fieldName, descriptor) {
   if (!shared.isUndefined(descriptor)) {
     const type = getClassDescriptorType(descriptor);
-    shared.assert.fail(`Invalid @api ${fieldName} field. Found a duplicate ${type} with the same name.`);
+    const message = `Invalid @api ${fieldName} field. Found a duplicate ${type} with the same name.`; // [W-9927596] Ideally we always throw an error when detecting duplicate public properties.
+    // This branch is only here for backward compatibility reasons.
+
+    if (type === "accessor"
+    /* Accessor */
+    ) {
+      logError(message);
+    } else {
+      shared.assert.fail(message);
+    }
   }
 }
 
@@ -3044,9 +3068,16 @@ function registerDecorators(Ctor, meta) {
         // field declaration
         if (process.env.NODE_ENV !== 'production') {
           validateFieldDecoratedWithApi(Ctor, fieldName, descriptor);
-        }
+        } // [W-9927596] If a component has both a public property and a private setter/getter
+        // with the same name, the property is defined as a public accessor. This branch is
+        // only here for backward compatibility reasons.
+
 
-        descriptor = createPublicPropertyDescriptor(fieldName);
+        if (!shared.isUndefined(descriptor) && !shared.isUndefined(descriptor.get)) {
+          descriptor = createPublicAccessorDescriptor(fieldName, descriptor);
+        } else {
+          descriptor = createPublicPropertyDescriptor(fieldName);
+        }
       }
 
       apiFields[fieldName] = descriptor;
@@ -3126,9 +3157,16 @@ function registerDecorators(Ctor, meta) {
 
       if (process.env.NODE_ENV !== 'production') {
         validateObservedField(Ctor, fieldName, descriptor);
-      }
+      } // [W-9927596] Only mark a field as observed whenever it isn't a duplicated public nor
+      // tracked property. This is only here for backward compatibility purposes.
+
 
-      observedFields[fieldName] = createObservedFieldPropertyDescriptor(fieldName);
+      const isDuplicatePublicProp = !shared.isUndefined(publicProps) && fieldName in publicProps;
+      const isDuplicateTrackedProp = !shared.isUndefined(track) && fieldName in track;
+
+      if (!isDuplicatePublicProp && !isDuplicateTrackedProp) {
+        observedFields[fieldName] = createObservedFieldPropertyDescriptor(fieldName);
+      }
     }
   }
 
@@ -6763,4 +6801,4 @@ exports.swapTemplate = swapTemplate;
 exports.track = track;
 exports.unwrap = unwrap;
 exports.wire = wire;
-/* version: 2.5.0 */
+/* version: 2.5.1 */

package/dist/engine-core.js

@@ -2940,18 +2940,33 @@ function createObservedFieldPropertyDescriptor(key) {
 
 function getClassDescriptorType(descriptor) {
   if (isFunction$1(descriptor.value)) {
-    return 'method';
+    return "method"
+    /* Method */
+    ;
   } else if (isFunction$1(descriptor.set) || isFunction$1(descriptor.get)) {
-    return 'accessor';
+    return "accessor"
+    /* Accessor */
+    ;
   } else {
-    return 'field';
+    return "field"
+    /* Field */
+    ;
   }
 }
 
 function validateObservedField(Ctor, fieldName, descriptor) {
   if (!isUndefined$1(descriptor)) {
     const type = getClassDescriptorType(descriptor);
-    assert.fail(`Invalid observed ${fieldName} field. Found a duplicate ${type} with the same name.`);
+    const message = `Invalid observed ${fieldName} field. Found a duplicate ${type} with the same name.`; // [W-9927596] Ideally we always throw an error when detecting duplicate observed field.
+    // This branch is only here for backward compatibility reasons.
+
+    if (type === "accessor"
+    /* Accessor */
+    ) {
+      logError(message);
+    } else {
+      assert.fail(message);
+    }
   }
 }
 
@@ -2978,7 +2993,16 @@ function validateMethodDecoratedWithWire(Ctor, methodName, descriptor) {
 function validateFieldDecoratedWithApi(Ctor, fieldName, descriptor) {
   if (!isUndefined$1(descriptor)) {
     const type = getClassDescriptorType(descriptor);
-    assert.fail(`Invalid @api ${fieldName} field. Found a duplicate ${type} with the same name.`);
+    const message = `Invalid @api ${fieldName} field. Found a duplicate ${type} with the same name.`; // [W-9927596] Ideally we always throw an error when detecting duplicate public properties.
+    // This branch is only here for backward compatibility reasons.
+
+    if (type === "accessor"
+    /* Accessor */
+    ) {
+      logError(message);
+    } else {
+      assert.fail(message);
+    }
   }
 }
 
@@ -3041,9 +3065,16 @@ function registerDecorators(Ctor, meta) {
         // field declaration
         if (process.env.NODE_ENV !== 'production') {
           validateFieldDecoratedWithApi(Ctor, fieldName, descriptor);
-        }
+        } // [W-9927596] If a component has both a public property and a private setter/getter
+        // with the same name, the property is defined as a public accessor. This branch is
+        // only here for backward compatibility reasons.
+
 
-        descriptor = createPublicPropertyDescriptor(fieldName);
+        if (!isUndefined$1(descriptor) && !isUndefined$1(descriptor.get)) {
+          descriptor = createPublicAccessorDescriptor(fieldName, descriptor);
+        } else {
+          descriptor = createPublicPropertyDescriptor(fieldName);
+        }
       }
 
       apiFields[fieldName] = descriptor;
@@ -3123,9 +3154,16 @@ function registerDecorators(Ctor, meta) {
 
       if (process.env.NODE_ENV !== 'production') {
         validateObservedField(Ctor, fieldName, descriptor);
-      }
+      } // [W-9927596] Only mark a field as observed whenever it isn't a duplicated public nor
+      // tracked property. This is only here for backward compatibility purposes.
+
 
-      observedFields[fieldName] = createObservedFieldPropertyDescriptor(fieldName);
+      const isDuplicatePublicProp = !isUndefined$1(publicProps) && fieldName in publicProps;
+      const isDuplicateTrackedProp = !isUndefined$1(track) && fieldName in track;
+
+      if (!isDuplicatePublicProp && !isDuplicateTrackedProp) {
+        observedFields[fieldName] = createObservedFieldPropertyDescriptor(fieldName);
+      }
     }
   }
 
@@ -6725,4 +6763,4 @@ function readonly(obj) {
 }
 
 export { LightningElement, profilerControl as __unstable__ProfilerControl, api$1 as api, connectRootElement, createContextProvider, createVM, disconnectRootElement, getAssociatedVMIfPresent, getComponentDef, getComponentInternalDef, getUpgradableConstructor, isComponentConstructor, readonly, register, registerComponent, registerDecorators, registerTemplate, sanitizeAttribute, swapComponent, swapStyle, swapTemplate, track, unwrap, wire };
-/* version: 2.5.0 */
+/* version: 2.5.1 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lwc/engine-core",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "description": "Core LWC engine APIs.",
     "homepage": "https://lwc.dev/",
     "repository": {
@@ -24,8 +24,8 @@
         "types/"
     ],
     "dependencies": {
-        "@lwc/features": "2.5.0",
-        "@lwc/shared": "2.5.0"
+        "@lwc/features": "2.5.1",
+        "@lwc/shared": "2.5.1"
     },
     "devDependencies": {
         "observable-membrane": "1.0.1"
@@ -33,5 +33,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "29e9766d5dd3ac93c157a950aa533ab668c0e423"
+    "gitHead": "443fa2e0a54c8940814292aac84d40e7eb69b22f"
 }