Merge branch 'legacy-undefined' into legacy-undefined-noBatch

Polymer · Feb 20, 2019 · 4658b08 · 4658b08
2 parents e29a315 + 8e6b786
commit 4658b08
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 63 deletions.
diff --git a/externs/polymer-externs.js b/externs/polymer-externs.js
@@ -47,6 +47,8 @@ PolymerInit.prototype.template;
 PolymerInit.prototype.hostAttributes;
 /** @type {(!Object<string, string> | undefined)} */
 PolymerInit.prototype.listeners;
+/** @type {(!Object| !Array<!Object> | undefined)} */
+PolymerInit.prototype.behaviors;
 
 /** @record */
 let PolymerElementConstructor = function () {};
@@ -110,6 +112,8 @@ function JSCompiler_renameProperty(string, obj) {}
 function PolymerTelemetry() {}
 /** @type {number} */
 PolymerTelemetry.instanceCount;
+/** @type {function():void} */
+PolymerTelemetry.incrementInstanceCount;
 /** @type {Array<HTMLElement>} */
 PolymerTelemetry.registrations;
 /** @type {function(HTMLElement)} */
@@ -125,6 +129,12 @@ Polymer.telemetry;
 /** @type {string} */
 Polymer.version;
 
+/** @type {boolean} */
+Polymer.legacyOptimizations;
+
+/** @type {boolean} */
+Polymer.syncInitialRender;
+
 // nb. This is explicitly 'var', as Closure Compiler checks that this is the case.
 /**
  * @constructor

diff --git a/externs/webcomponents-externs.js b/externs/webcomponents-externs.js
@@ -18,8 +18,8 @@ var HTMLImports = {
    */
   whenReady(callback) {},
   /**
-   * @param {Element} element
-   * @returns {Document} document
+   * @param {!Node} element
+   * @return {?HTMLLinkElement|?Document|undefined}
    */
   importForElement(element) {}
 };
@@ -42,7 +42,11 @@ var ShadyDOM = {
   /**
    * @param {Node} node
    */
-  patch(node) {}
+  patch(node) {},
+  /**
+   * @param {!ShadowRoot} shadowroot
+   */
+  flushInitial(shadowroot) {}
 };
 
 window.ShadyDOM = ShadyDOM;

diff --git a/lib/mixins/property-effects.js b/lib/mixins/property-effects.js
@@ -2239,7 +2239,7 @@ export const PropertyEffects = dedupingMixin(superClass => {
         }
         // When the `legacyUndefined` flag is enabled, pass a no-op value
         // so that the observer, computed property, or compound binding is aborted.
-        if (legacyUndefined && value === undefined) {
+        if (legacyUndefined && value === undefined && args.length > 1) {
           return NOOP;
         }
         values[i] = value;

diff --git a/test/unit/legacy-undefined.html b/test/unit/legacy-undefined.html
@@ -211,7 +211,7 @@
           setupElement({singleProp});
           assertEffects({singlePropObserver: 1});
           el.singleProp = undefined;
-          assertEffects({singlePropObserver: 1});
+          assertEffects({singlePropObserver: 2});
         });
         test('one multiPropObserver arguments undefined', () => {
           setupElement({multiProp1, multiProp2});
@@ -277,65 +277,64 @@
 
       teardown(() => console.warn.restore());
 
-      suite('warn', () => {
-        test('no arguments defined', () => {
-          el = fixture('declarative-none');
-          assertEffects({});
-        });
-        test('singlePropObserver argument defined', () => {
-          el = fixture('declarative-single');
-          assertEffects({singlePropObserver: 1});
-        });
-        test('one multiPropObserver arguments defined', () => {
-          el = fixture('declarative-multi-one');
-          assertEffects({multiPropObserver: 0});
-        });
-        test('all multiPropObserver defined', () => {
-          el = fixture('declarative-multi-all');
-          assertEffects({multiPropObserver: 1});
-        });
-        test('computeSingle argument defined', () => {
-          el = fixture('declarative-single-computed');
-          assertEffects({computeSingle: 1});
-          assert.equal(el.computedSingle, '[a]');
-        });
-        test('one computeMulti arguments defined', () => {
-          el = fixture('declarative-multi-one-computed');
-          assertEffects({computeMulti: 0});
-          assert.equal(el.computedMulti, undefined);
-        });
-        test('all computeMulti defined', () => {
-          el = fixture('declarative-multi-all-computed');
-          assert.equal(el.computedMulti, '[b,c]');
-        });
-        test('inline computeSingle argument defined', () => {
-          el = fixture('declarative-single-computed-inline');
-          assertEffects({computeSingle: 1});
-          assert.equal(el.$.child.computedSingle, '[a]');
-        });
-        test('inline one computeMulti arguments defined', () => {
-          el = fixture('declarative-multi-one-computed-inline');
-          assertEffects({computeMulti: 0});
-          assert.equal(el.$.child.computedMulti, undefined);
-        });
-        test('inline all computeMulti defined', () => {
-          el = fixture('declarative-multi-all-computed-inline');
-          assertEffects({computeMulti: 1});
-          assert.equal(el.$.child.computedMulti, '[b,c]');
-        });
-        test('one inline computeMulti argument defined in dom-if', () => {
-          el = fixture('declarative-multi-if-one-computed-inline');
-          flush();
-          assertEffects({computeMulti: 0});
-          assert.equal(el.$$('#ifChild').computedMulti, undefined);
-        });
-        test('all inline computeMulti argument defined in dom-if', () => {
-          el = fixture('declarative-multi-if-all-computed-inline');
-          flush();
-          assertEffects({computeMulti: 1});
-          assert.equal(el.$$('#ifChild').computedMulti, '[b,c]');
-        });
+      test('no arguments defined', () => {
+        el = fixture('declarative-none');
+        assertEffects({});
+      });
+      test('singlePropObserver argument defined', () => {
+        el = fixture('declarative-single');
+        assertEffects({singlePropObserver: 1});
+      });
+      test('one multiPropObserver arguments defined', () => {
+        el = fixture('declarative-multi-one');
+        assertEffects({multiPropObserver: 0});
       });
+      test('all multiPropObserver defined', () => {
+        el = fixture('declarative-multi-all');
+        assertEffects({multiPropObserver: 1});
+      });
+      test('computeSingle argument defined', () => {
+        el = fixture('declarative-single-computed');
+        assertEffects({computeSingle: 1});
+        assert.equal(el.computedSingle, '[a]');
+      });
+      test('one computeMulti arguments defined', () => {
+        el = fixture('declarative-multi-one-computed');
+        assertEffects({computeMulti: 0});
+        assert.equal(el.computedMulti, undefined);
+      });
+      test('all computeMulti defined', () => {
+        el = fixture('declarative-multi-all-computed');
+        assert.equal(el.computedMulti, '[b,c]');
+      });
+      test('inline computeSingle argument defined', () => {
+        el = fixture('declarative-single-computed-inline');
+        assertEffects({computeSingle: 1});
+        assert.equal(el.$.child.computedSingle, '[a]');
+      });
+      test('inline one computeMulti arguments defined', () => {
+        el = fixture('declarative-multi-one-computed-inline');
+        assertEffects({computeMulti: 0});
+        assert.equal(el.$.child.computedMulti, undefined);
+      });
+      test('inline all computeMulti defined', () => {
+        el = fixture('declarative-multi-all-computed-inline');
+        assertEffects({computeMulti: 1});
+        assert.equal(el.$.child.computedMulti, '[b,c]');
+      });
+      test('one inline computeMulti argument defined in dom-if', () => {
+        el = fixture('declarative-multi-if-one-computed-inline');
+        flush();
+        assertEffects({computeMulti: 0});
+        assert.equal(el.$$('#ifChild').computedMulti, undefined);
+      });
+      test('all inline computeMulti argument defined in dom-if', () => {
+        el = fixture('declarative-multi-if-all-computed-inline');
+        flush();
+        assertEffects({computeMulti: 1});
+        assert.equal(el.$$('#ifChild').computedMulti, '[b,c]');
+      });
+
     });
 
   </script>