#135 - Temp TS < 2.0 support

dsherret · May 31, 2016 · 24d968c · 24d968c
1 parent a2c75b1
commit 24d968c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/build/generateDefinitionFile.ts b/src/build/generateDefinitionFile.ts
@@ -22,12 +22,6 @@ export function generateDefinitionFile() {
                                          m.name !== "addType");
             def.properties = def.properties.filter(p => p.name.indexOf("fill") === -1 && p.name !== "addType");
         }
-
-        // hack to support the return type expression being "this" in the definition file
-        // todo: remove in TS 2.0+
-        if (def.name === "BaseParameterDefinition" && def.isClassDefinition()) {
-            def.getMethod("addDestructuringProperties").returnTypeExpression.text = "this";
-        }
     });
 
     const definitionFileText = fileInfo.writeExportsAsDefinitionFile({

diff --git a/src/definitions/base/BaseParameterDefinition.ts b/src/definitions/base/BaseParameterDefinition.ts
@@ -36,7 +36,7 @@ export abstract class BaseParameterDefinition extends BaseDefinition implements
     name: string;
     // TypeExpressionedDefinition
     typeExpression: TypeExpressionDefinition;
-    setTypeExpression: (text: string) => this;
+    setTypeExpression: (text: string) => any;
     // DefaultExpressionedDefinition
     defaultExpression: ExpressionDefinition;
 }

diff --git a/src/definitions/base/BasePropertyDefinition.ts b/src/definitions/base/BasePropertyDefinition.ts
@@ -16,7 +16,7 @@ export abstract class BasePropertyDefinition extends BaseDefinition implements N
     name: string;
     // TypeExpressionedDefinition
     typeExpression: TypeExpressionDefinition;
-    setTypeExpression: (text: string) => this;
+    setTypeExpression: (text: string) => any;
 }
 
 applyMixins(BasePropertyDefinition, BaseDefinition, [NamedDefinition, TypeExpressionedDefinition]);
diff --git a/src/definitions/base/TypeExpressionedDefinition.ts b/src/definitions/base/TypeExpressionedDefinition.ts
@@ -6,6 +6,6 @@ export abstract class TypeExpressionedDefinition {
 
     setTypeExpression(text: string) {
         this.typeExpression = new StructureFactory().getTypeExpressionFromText(text);
-        return this;
+        return this as any;
     }
 }
diff --git a/src/definitions/general/TypeAliasDefinition.ts b/src/definitions/general/TypeAliasDefinition.ts
@@ -34,7 +34,7 @@ export class TypeAliasDefinition extends BaseDefinition
     isDefaultExportOfFile: boolean;
     // TypeExpressionedDefinition
     typeExpression: TypeExpressionDefinition;
-    setTypeExpression: (text: string) => this;
+    setTypeExpression: (text: string) => any;
     // TypeParameteredDefinition
     typeParameters: TypeParameterDefinition[];
     addTypeParameters: (...typeParameters: TypeParameterStructure[]) => this;

diff --git a/src/definitions/variable/VariableDefinition.ts b/src/definitions/variable/VariableDefinition.ts
@@ -30,7 +30,7 @@ export class VariableDefinition extends BaseDefinition
     isDefaultExportOfFile: boolean;
     // TypeExpressionedDefinition
     typeExpression: TypeExpressionDefinition;
-    setTypeExpression: (text: string) => this;
+    setTypeExpression: (text: string) => any;
     // DefaultExpressionedDefinition
     defaultExpression: ExpressionDefinition;
     // AmbientableDefinition

diff --git a/ts-type-info.d.ts b/ts-type-info.d.ts
@@ -108,6 +108,8 @@ export abstract class AsyncableDefinition {
 
 export abstract class TypeExpressionedDefinition {
     typeExpression: TypeExpressionDefinition;
+
+    setTypeExpression(text: string): any;
 }
 
 export abstract class DefaultExpressionedDefinition {
@@ -160,6 +162,7 @@ export abstract class BasePropertyDefinition extends BaseDefinition implements N
     isOptional: boolean;
     name: string;
     typeExpression: TypeExpressionDefinition;
+    setTypeExpression: (text: string) => any;
 
     constructor(definitionType: DefinitionType);
 }
@@ -205,11 +208,12 @@ export abstract class BaseParameterDefinition extends BaseDefinition implements
     destructuringProperties: ObjectPropertyDefinition[];
     name: string;
     typeExpression: TypeExpressionDefinition;
+    setTypeExpression: (text: string) => any;
     defaultExpression: ExpressionDefinition;
 
     constructor(definitionType: DefinitionType);
 
-    addDestructuringProperties(...properties: ObjectPropertyStructure[]): this;
+    addDestructuringProperties(...properties: ObjectPropertyStructure[]): any;
     getDestructuringProperty(nameOrSearchFunction: string | ((property: ObjectPropertyDefinition) => boolean)): ObjectPropertyDefinition;
 }
 
@@ -267,6 +271,7 @@ export class TypeAliasDefinition extends BaseDefinition implements NamedDefiniti
     isNamedExportOfFile: boolean;
     isDefaultExportOfFile: boolean;
     typeExpression: TypeExpressionDefinition;
+    setTypeExpression: (text: string) => any;
     typeParameters: TypeParameterDefinition[];
     addTypeParameters: (...typeParameters: TypeParameterStructure[]) => this;
     getTypeParameter: (nameOrSearchFunction: string | ((typeParameter: TypeParameterDefinition) => boolean)) => TypeParameterDefinition;
@@ -695,6 +700,7 @@ export class VariableDefinition extends BaseDefinition implements NamedDefinitio
     isNamedExportOfFile: boolean;
     isDefaultExportOfFile: boolean;
     typeExpression: TypeExpressionDefinition;
+    setTypeExpression: (text: string) => any;
     defaultExpression: ExpressionDefinition;
     isAmbient: boolean;
     hasDeclareKeyword: boolean;