http internal references refactored

Vladimir Enchev · Vladimir Enchev · commit 4faced08aa32 · 2014-05-16T09:53:34.000+03:00
diff --git a/BCL.csproj b/BCL.csproj
@@ -159,9 +159,6 @@
     <TypeScriptCompile Include="android17.d.ts" />
     <TypeScriptCompile Include="promises\promises.ts" />
     <TypeScriptCompile Include="promises\index.ts" />
-    <TypeScriptCompile Include="http\http.ts">
-      <DependentUpon>http.d.ts</DependentUpon>
-    </TypeScriptCompile>
     <TypeScriptCompile Include="ios7.d.ts" />
     <TypeScriptCompile Include="globals\index.ts" />
     <TypeScriptCompile Include="timer\index.ts" />
@@ -190,6 +187,7 @@
       <DependentUpon>http-request.d.ts</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="application\application-common.ts" />
+    <TypeScriptCompile Include="http\http-common.ts" />
     <Content Include="image-source\Readme.md" />
     <TypeScriptCompile Include="http\http.d.ts" />
     <TypeScriptCompile Include="local-settings\index.ts" />
diff --git a/http/http-common.ts b/http/http-common.ts
@@ -4,9 +4,6 @@ import http = require("http/http-request");
 
 // merge request
 export var request = http.request;
-export interface HttpResponse extends http.HttpResponse { }
-export interface HttpRequestOptions extends http.HttpRequestOptions { }
-export interface HttpContent extends http.HttpContent { }
 
 /**
   * Gets string from url.
diff --git a/http/http.d.ts b/http/http.d.ts
@@ -9,4 +9,27 @@ export declare function getJSON<T>(url: string): promises.Promise<T>
 export declare function getJSON<T>(options: request.HttpRequestOptions): promises.Promise<T>
 
 export declare function getImage(url: string): promises.Promise<image.ImageSource>
-export declare function getImage(options: request.HttpRequestOptions): promises.Promise<image.ImageSource>
+export declare function getImage(options: request.HttpRequestOptions): promises.Promise<image.ImageSource>
+
+export declare function request(options: HttpRequestOptions): promises.Promise<HttpResponse>;
+
+export interface HttpRequestOptions {
+    url: string;
+    method: string;
+    headers?: any;
+    content?: any;
+    timeout?: number;
+}
+
+export interface HttpResponse {
+    statusCode: number;
+    headers: any;
+    content?: HttpContent;
+}
+
+export interface HttpContent {
+    raw: any;
+    toString: () => string;
+    toJSON: () => any;
+    toImage: () => image.ImageSource;
+}
diff --git a/http/index.ts b/http/index.ts
@@ -1,2 +1,2 @@
 ﻿declare var module, require;
-module.exports = require("http/http");
+module.exports = require("http/http-common");

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`declare var module, require;`
`2`		`-module.exports = require("http/http");`
	`2`	`+module.exports = require("http/http-common");`