From 72022f2739895aa75241ae8e3cf8e452c34652d4 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Fri, 30 Jun 2017 16:50:34 -0700
Subject: [PATCH] [ci skip] clean up mixin fn and regen externs

---
 externs/closure-types.js   |  2 +-
 externs/polymer-externs.js | 23 ++++++++++++++---------
 lib/utils/mixin.html       |  6 +++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/externs/closure-types.js b/externs/closure-types.js
index 2f905083ec..98d2679f18 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -197,7 +197,7 @@ Polymer_TemplateStamp._parseTemplateNodeAttributes = function(node, templateInfo
 * @param {!TemplateInfo} templateInfo Template metadata for current template
 * @param {!NodeInfo} nodeInfo Node metadata for current template.
 * @param {string} name Attribute name
-* @param {*} value Attribute value
+* @param {string} value Attribute value
 * @return {boolean}
 */
 Polymer_TemplateStamp._parseTemplateNodeAttribute = function(node, templateInfo, nodeInfo, name, value){};
diff --git a/externs/polymer-externs.js b/externs/polymer-externs.js
index 8cafac8ed0..99b54b3f82 100644
--- a/externs/polymer-externs.js
+++ b/externs/polymer-externs.js
@@ -6,15 +6,20 @@
 /* eslint-disable */
 
 /**
- * @typedef {Object<string, {
- *   value: *,
- *   type: (Function | undefined),
- *   readOnly: (boolean | undefined),
- *   computed: (string | undefined),
- *   reflectToAttribute: (boolean | undefined),
- *   notify: (boolean | undefined),
- *   observer: (string | undefined)
- * }>}
+ * @typedef {{
+ * value: *,
+ * type: (!Function | undefined),
+ * readOnly: (boolean | undefined),
+ * computed: (string | undefined),
+ * reflectToAttribute: (boolean | undefined),
+ * notify: (boolean | undefined),
+ * observer: (string | undefined)
+ * }}
+ */
+let PolymerElementPropertiesMeta;
+
+/**
+ * @typedef {Object<string, !PolymerElementPropertiesMeta>}
  */
 let PolymerElementProperties;
 
diff --git a/lib/utils/mixin.html b/lib/utils/mixin.html
index 0678a9fcc6..070ea03261 100644
--- a/lib/utils/mixin.html
+++ b/lib/utils/mixin.html
@@ -29,6 +29,7 @@
   /** @type {(Object | undefined)} */
   MixinFunction.prototype.__mixinSet;
 
+  /* eslint-disable valid-jsdoc */
   /**
    * Wraps an ES6 class expression mixin such that the mixin is only applied
    * if it has not already been applied its base argument.  Also memoizes mixin
@@ -37,8 +38,6 @@
    * @memberof Polymer
    * @template T
    * @param {T} mixin ES6 class expression mixin to wrap
-   * @return {T} Wrapped mixin that deduplicates and memoizes
-   *   mixin applications to base
    * @suppress {invalidCasts}
    */
   Polymer.dedupingMixin = function(mixin) {
@@ -69,8 +68,9 @@
       return extended;
     }
 
-    return /** @type {T} */(dedupingMixin);
+    return dedupingMixin;
   };
+  /* eslint-enable valid-jsdoc */
 
 })();