From c3dad5401bdd655b178e388123b6284242741762 Mon Sep 17 00:00:00 2001 From: Alexander Marks Date: Mon, 12 Feb 2018 22:44:59 -0800 Subject: [PATCH] Bump TS type generator to pick up transitive mixin handling. Fixes #5087. --- package-lock.json | 14 +++++++------- package.json | 2 +- types/lib/elements/array-selector.d.ts | 2 +- types/lib/legacy/legacy-element-mixin.d.ts | 2 +- types/lib/mixins/dir-mixin.d.ts | 2 +- types/lib/mixins/element-mixin.d.ts | 2 +- types/lib/mixins/property-effects.d.ts | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index dca1694686..9a1bb2de04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,15 +15,15 @@ } }, "@polymer/gen-typescript-declarations": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@polymer/gen-typescript-declarations/-/gen-typescript-declarations-1.1.1.tgz", - "integrity": "sha512-rUfH6USpiPYSHl2dC+/rGb3RYK8LPyqNhiuZCLv13F0fhYr01jdTogGuSphEoSLklm1gKRsDsrfZq7OvpzPYEg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@polymer/gen-typescript-declarations/-/gen-typescript-declarations-1.1.3.tgz", + "integrity": "sha512-NJriR/H/Jsc0XV0sBSNRn85jl4p0RUkX4fJCHqOfcjJY/9X360vpKXLeYdwvdF6bu0PuBsEsntsTxiEFsPFAZw==", "dev": true, "requires": { "@types/doctrine": "0.0.3", "@types/fs-extra": "5.0.0", "@types/glob": "5.0.35", - "command-line-args": "5.0.1", + "command-line-args": "5.0.2", "command-line-usage": "4.1.0", "doctrine": "2.1.0", "escodegen": "1.9.0", @@ -2209,9 +2209,9 @@ } }, "command-line-args": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.0.1.tgz", - "integrity": "sha512-gRJDcIjFSzMcmG/GrJlgL0wWoAxr11mVzCq32bjka0endupm9meLwvoJUKc4HDeFiEIB2X3GvNrhF5cKO4Bd4A==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.0.2.tgz", + "integrity": "sha512-/qPcbL8zpqg53x4rAaqMFlRV4opN3pbla7I7k9x8kyOBMQoGT6WltjN6sXZuxOXw6DgdK7Ad+ijYS5gjcr7vlA==", "dev": true, "requires": { "argv-tools": "0.1.1", diff --git a/package.json b/package.json index 9b0ca29abf..4e3f989a40 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@polymer/gen-closure-declarations": "^0.4.0", - "@polymer/gen-typescript-declarations": "^1.1.1", + "@polymer/gen-typescript-declarations": "^1.1.3", "@webcomponents/shadycss": "^1.1.0", "@webcomponents/webcomponentsjs": "^1.1.0", "babel-preset-minify": "^0.2.0", diff --git a/types/lib/elements/array-selector.d.ts b/types/lib/elements/array-selector.d.ts index 8a009f1248..1d99ee52e4 100644 --- a/types/lib/elements/array-selector.d.ts +++ b/types/lib/elements/array-selector.d.ts @@ -29,7 +29,7 @@ declare namespace Polymer { * representing the last selected item. When `multi` is true, `selected` * is an array of multiply selected items. */ - function ArraySelectorMixin {}>(base: T): T & ArraySelectorMixinConstructor & Polymer.ElementMixinConstructor; + function ArraySelectorMixin {}>(base: T): T & ArraySelectorMixinConstructor & Polymer.ElementMixinConstructor & Polymer.PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor & Polymer.PropertiesMixinConstructor; interface ArraySelectorMixinConstructor { new(...args: any[]): ArraySelectorMixin; diff --git a/types/lib/legacy/legacy-element-mixin.d.ts b/types/lib/legacy/legacy-element-mixin.d.ts index d8b1fb0dfa..cfe9164678 100644 --- a/types/lib/legacy/legacy-element-mixin.d.ts +++ b/types/lib/legacy/legacy-element-mixin.d.ts @@ -26,7 +26,7 @@ declare namespace Polymer { * found on the Polymer 1.x `Polymer.Base` prototype applied to all elements * defined using the `Polymer({...})` function. */ - function LegacyElementMixin {}>(base: T): T & LegacyElementMixinConstructor & Polymer.ElementMixinConstructor & Polymer.GestureEventListenersConstructor; + function LegacyElementMixin {}>(base: T): T & LegacyElementMixinConstructor & Polymer.ElementMixinConstructor & Polymer.PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor & Polymer.PropertiesMixinConstructor & Polymer.GestureEventListenersConstructor; interface LegacyElementMixinConstructor { new(...args: any[]): LegacyElementMixin; diff --git a/types/lib/mixins/dir-mixin.d.ts b/types/lib/mixins/dir-mixin.d.ts index 20f5050395..58aa8136b9 100644 --- a/types/lib/mixins/dir-mixin.d.ts +++ b/types/lib/mixins/dir-mixin.d.ts @@ -29,7 +29,7 @@ declare namespace Polymer { * - Changing `dir` at runtime is supported. * - Opting out of the global direction styling is permanent */ - function DirMixin {}>(base: T): T & DirMixinConstructor & Polymer.PropertyAccessorsConstructor; + function DirMixin {}>(base: T): T & DirMixinConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor; interface DirMixinConstructor { new(...args: any[]): DirMixin; diff --git a/types/lib/mixins/element-mixin.d.ts b/types/lib/mixins/element-mixin.d.ts index 3d98b8423a..d08da7e33d 100644 --- a/types/lib/mixins/element-mixin.d.ts +++ b/types/lib/mixins/element-mixin.d.ts @@ -76,7 +76,7 @@ declare namespace Polymer { * `observedAttributes` implementation will automatically return an array * of dash-cased attributes based on `properties`) */ - function ElementMixin {}>(base: T): T & ElementMixinConstructor & Polymer.PropertyEffectsConstructor & Polymer.PropertiesMixinConstructor; + function ElementMixin {}>(base: T): T & ElementMixinConstructor & Polymer.PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor & Polymer.PropertiesMixinConstructor; interface ElementMixinConstructor { new(...args: any[]): ElementMixin; diff --git a/types/lib/mixins/property-effects.d.ts b/types/lib/mixins/property-effects.d.ts index da3239df3c..572674abe3 100644 --- a/types/lib/mixins/property-effects.d.ts +++ b/types/lib/mixins/property-effects.d.ts @@ -46,7 +46,7 @@ declare namespace Polymer { * whereas the default when using `PropertyAccessors` standalone is to be * async by default. */ - function PropertyEffects {}>(base: T): T & PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor; + function PropertyEffects {}>(base: T): T & PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor; interface PropertyEffectsConstructor { new(...args: any[]): PropertyEffects;