From f3e207efe41c0816d04809c81872e98a1ba416b9 Mon Sep 17 00:00:00 2001 From: NN Date: Tue, 27 Jan 2015 12:46:38 +0200 Subject: [PATCH 1/6] Move common details to interface --- chrome/chrome.d.ts | 100 +++++++++++---------------------------------- 1 file changed, 24 insertions(+), 76 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index a5321d8537..cf3407f7fc 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2269,49 +2269,42 @@ declare module chrome.webRequest { file?: string; } - interface OnCompletedDetails { - tabId: number; - ip?: string; - statusLine?: string; - frameId: number; - responseHeaders?: HttpHeader[]; - parentFrameId: number; - fromCache: boolean; - url: string; - timeStamp: number; + interface BaseCallbackDetails { requestId: string; + url: string; + tabId: number; + frameId: number; + parentFrameId: number; + timeStamp: number; + } + + interface CallbackDetails extends BaseCallbackDetails { type: string; method: string; + } + + interface OnCompletedDetails extends CallbackDetails { + ip?: string; + statusLine?: string; + responseHeaders?: HttpHeader[]; + fromCache: boolean; statusCode: number; } - interface OnHeadersReceivedDetails { - tabId: number; + interface OnHeadersReceivedDetails extends CallbackDetails { parentFrameId: number; - url: string; timeStamp: number; statusLine?: string; - frameId: number; - requestId: string; responseHeaders?: HttpHeader[]; - type: string; - method: string; } - interface OnBeforeRedirectDetails { - tabId: number; + interface OnBeforeRedirectDetails extends CallbackDetails { ip?: string; statusLine?: string; - frameId: number; responseHeaders?: HttpHeader[]; parentFrameId: number; fromCache: boolean; - url: string; - timeStamp: number; - requestId: string; redirectUrl: string; - type: string; - method: string; statusCode: number; } @@ -2320,75 +2313,35 @@ declare module chrome.webRequest { port: number; } - interface OnAuthRequiredDetails { - tabId: number; + interface OnAuthRequiredDetails extends CallbackDetails { statusLine?: string; - frameId: number; challenger: Challenger; responseHeaders?: HttpHeader[]; isProxy: boolean; realm?: string; - parentFrameId: number; - url: string; - timeStamp: number; - requestId: string; scheme: string; - type: string; - method: string; } - interface OnBeforeSendHeadersDetails { - tabId: number; - parentFrameId: number; - url: string; - timeStamp: number; - frameId: number; - requestId: number; + interface OnBeforeSendHeadersDetails extends CallbackDetails { requestHeaders?: HttpHeader[]; - type: string; - method: string; } - interface OnErrorOccurredDetails { - tabId: number; + interface OnErrorOccurredDetails extends CallbackDetails { ip?: string; - frameId: number; - parentFrameId: number; fromCache: boolean; - url: string; - timeStamp: number; - requestId: string; error: string; - type: string; - method: string; } - interface OnResponseStartedDetails { - tabId: number; + interface OnResponseStartedDetails extends CallbackDetails { ip?: string; statusLine?: string; - frameId: number; responseHeaders?: HttpHeader[]; - parentFrameId: number; fromCache: boolean; - url: string; - timeStamp: number; - requestId: string; - type: string; - method: string; statusCode: number; } - interface OnSendHeadersDetails { - tabId: number; - parentFrameId: number; - url: string; - timeStamp: number; - frameId: number; - requestId: string; + interface OnSendHeadersDetails extends CallbackDetails { requestHeaders?: HttpHeader[]; - type: string; - method: string; } interface RequestBody { @@ -2397,12 +2350,7 @@ declare module chrome.webRequest { formData?: Object; } - interface OnBeforeRequestDetails { - tabId: number; - parentFrameId: number; - url: string; - timeStamp: number; - frameId: number; + interface OnBeforeRequestDetails extends BaseCallbackDetails { requestBody: RequestBody; } From fd4fb7b4a30108903c0b45845973a1cc84ef9141 Mon Sep 17 00:00:00 2001 From: NN Date: Tue, 27 Jan 2015 15:02:23 +0200 Subject: [PATCH 2/6] Update chrome.d.ts --- chrome/chrome.d.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index cf3407f7fc..8ab76f8ece 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2269,7 +2269,7 @@ declare module chrome.webRequest { file?: string; } - interface BaseCallbackDetails { + interface BasicCallbackDetails { requestId: string; url: string; tabId: number; @@ -2278,12 +2278,12 @@ declare module chrome.webRequest { timeStamp: number; } - interface CallbackDetails extends BaseCallbackDetails { + interface ExtendedCallbackDetails extends BasicCallbackDetails { type: string; method: string; } - interface OnCompletedDetails extends CallbackDetails { + interface OnCompletedDetails extends ExtendedCallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2291,14 +2291,14 @@ declare module chrome.webRequest { statusCode: number; } - interface OnHeadersReceivedDetails extends CallbackDetails { + interface OnHeadersReceivedDetails extends ExtendedCallbackDetails { parentFrameId: number; timeStamp: number; statusLine?: string; responseHeaders?: HttpHeader[]; } - interface OnBeforeRedirectDetails extends CallbackDetails { + interface OnBeforeRedirectDetails extends ExtendedCallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2313,7 +2313,7 @@ declare module chrome.webRequest { port: number; } - interface OnAuthRequiredDetails extends CallbackDetails { + interface OnAuthRequiredDetails extends ExtendedCallbackDetails { statusLine?: string; challenger: Challenger; responseHeaders?: HttpHeader[]; @@ -2322,17 +2322,17 @@ declare module chrome.webRequest { scheme: string; } - interface OnBeforeSendHeadersDetails extends CallbackDetails { + interface OnBeforeSendHeadersDetails extends ExtendedCallbackDetails { requestHeaders?: HttpHeader[]; } - interface OnErrorOccurredDetails extends CallbackDetails { + interface OnErrorOccurredDetails extends ExtendedCallbackDetails { ip?: string; fromCache: boolean; error: string; } - interface OnResponseStartedDetails extends CallbackDetails { + interface OnResponseStartedDetails extends ExtendedCallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2340,7 +2340,7 @@ declare module chrome.webRequest { statusCode: number; } - interface OnSendHeadersDetails extends CallbackDetails { + interface OnSendHeadersDetails extends ExtendedCallbackDetails { requestHeaders?: HttpHeader[]; } @@ -2350,7 +2350,7 @@ declare module chrome.webRequest { formData?: Object; } - interface OnBeforeRequestDetails extends BaseCallbackDetails { + interface OnBeforeRequestDetails extends BasicCallbackDetails { requestBody: RequestBody; } From 7713b86c7cdd6f36f3425cce637fb4fad1178f06 Mon Sep 17 00:00:00 2001 From: NN Date: Wed, 28 Jan 2015 12:08:35 +0200 Subject: [PATCH 3/6] Merge interfaces. --- chrome/chrome.d.ts | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index 8ab76f8ece..2ba31b1afb 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2269,21 +2269,18 @@ declare module chrome.webRequest { file?: string; } - interface BasicCallbackDetails { + interface CallbackDetails { requestId: string; - url: string; + url: string; + method: string; tabId: number; frameId: number; parentFrameId: number; timeStamp: number; - } - - interface ExtendedCallbackDetails extends BasicCallbackDetails { type: string; - method: string; } - interface OnCompletedDetails extends ExtendedCallbackDetails { + interface OnCompletedDetails extends CallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2291,14 +2288,14 @@ declare module chrome.webRequest { statusCode: number; } - interface OnHeadersReceivedDetails extends ExtendedCallbackDetails { + interface OnHeadersReceivedDetails extends CallbackDetails { parentFrameId: number; timeStamp: number; statusLine?: string; responseHeaders?: HttpHeader[]; } - interface OnBeforeRedirectDetails extends ExtendedCallbackDetails { + interface OnBeforeRedirectDetails extends CallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2313,7 +2310,7 @@ declare module chrome.webRequest { port: number; } - interface OnAuthRequiredDetails extends ExtendedCallbackDetails { + interface OnAuthRequiredDetails extends CallbackDetails { statusLine?: string; challenger: Challenger; responseHeaders?: HttpHeader[]; @@ -2322,17 +2319,17 @@ declare module chrome.webRequest { scheme: string; } - interface OnBeforeSendHeadersDetails extends ExtendedCallbackDetails { + interface OnBeforeSendHeadersDetails extends CallbackDetails { requestHeaders?: HttpHeader[]; } - interface OnErrorOccurredDetails extends ExtendedCallbackDetails { + interface OnErrorOccurredDetails extends CallbackDetails { ip?: string; fromCache: boolean; error: string; } - interface OnResponseStartedDetails extends ExtendedCallbackDetails { + interface OnResponseStartedDetails extends CallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2340,7 +2337,7 @@ declare module chrome.webRequest { statusCode: number; } - interface OnSendHeadersDetails extends ExtendedCallbackDetails { + interface OnSendHeadersDetails extends CallbackDetails { requestHeaders?: HttpHeader[]; } @@ -2350,7 +2347,7 @@ declare module chrome.webRequest { formData?: Object; } - interface OnBeforeRequestDetails extends BasicCallbackDetails { + interface OnBeforeRequestDetails extends CallbackDetails { requestBody: RequestBody; } From c73a7587ca7508356157af61a76bae906ac1bbcf Mon Sep 17 00:00:00 2001 From: NN Date: Wed, 28 Jan 2015 17:47:04 +0200 Subject: [PATCH 4/6] Restore original --- chrome/chrome.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index 2ba31b1afb..334390ebf8 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -10,7 +10,7 @@ //////////////////// declare module chrome.alarms { interface AlarmCreateInfo { - delayInMinutes?: number; + delayInMinutes?: number;ad periodInMinutes?: number; when?: number; } From 46b738810159b66c462a7c63bef1ab8b0aef3266 Mon Sep 17 00:00:00 2001 From: NN Date: Wed, 28 Jan 2015 17:56:49 +0200 Subject: [PATCH 5/6] Remove bad letters --- chrome/chrome.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index 334390ebf8..2ba31b1afb 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -10,7 +10,7 @@ //////////////////// declare module chrome.alarms { interface AlarmCreateInfo { - delayInMinutes?: number;ad + delayInMinutes?: number; periodInMinutes?: number; when?: number; } From bf0636260421e5f8891b79ab592f5d62c45927ea Mon Sep 17 00:00:00 2001 From: NN Date: Thu, 29 Jan 2015 12:30:02 +0200 Subject: [PATCH 6/6] Changes according to review. --- chrome/chrome.d.ts | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/chrome/chrome.d.ts b/chrome/chrome.d.ts index 2ba31b1afb..0095784dc3 100755 --- a/chrome/chrome.d.ts +++ b/chrome/chrome.d.ts @@ -2269,7 +2269,7 @@ declare module chrome.webRequest { file?: string; } - interface CallbackDetails { + interface WebRequestCallbackDetails { requestId: string; url: string; method: string; @@ -2280,7 +2280,7 @@ declare module chrome.webRequest { type: string; } - interface OnCompletedDetails extends CallbackDetails { + interface OnCompletedDetails extends WebRequestCallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2288,18 +2288,15 @@ declare module chrome.webRequest { statusCode: number; } - interface OnHeadersReceivedDetails extends CallbackDetails { - parentFrameId: number; - timeStamp: number; + interface OnHeadersReceivedDetails extends WebRequestCallbackDetails { statusLine?: string; responseHeaders?: HttpHeader[]; } - interface OnBeforeRedirectDetails extends CallbackDetails { + interface OnBeforeRedirectDetails extends WebRequestCallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; - parentFrameId: number; fromCache: boolean; redirectUrl: string; statusCode: number; @@ -2310,7 +2307,7 @@ declare module chrome.webRequest { port: number; } - interface OnAuthRequiredDetails extends CallbackDetails { + interface OnAuthRequiredDetails extends WebRequestCallbackDetails { statusLine?: string; challenger: Challenger; responseHeaders?: HttpHeader[]; @@ -2319,17 +2316,17 @@ declare module chrome.webRequest { scheme: string; } - interface OnBeforeSendHeadersDetails extends CallbackDetails { + interface OnBeforeSendHeadersDetails extends WebRequestCallbackDetails { requestHeaders?: HttpHeader[]; } - interface OnErrorOccurredDetails extends CallbackDetails { + interface OnErrorOccurredDetails extends WebRequestCallbackDetails { ip?: string; fromCache: boolean; error: string; } - interface OnResponseStartedDetails extends CallbackDetails { + interface OnResponseStartedDetails extends WebRequestCallbackDetails { ip?: string; statusLine?: string; responseHeaders?: HttpHeader[]; @@ -2337,7 +2334,7 @@ declare module chrome.webRequest { statusCode: number; } - interface OnSendHeadersDetails extends CallbackDetails { + interface OnSendHeadersDetails extends WebRequestCallbackDetails { requestHeaders?: HttpHeader[]; } @@ -2347,8 +2344,8 @@ declare module chrome.webRequest { formData?: Object; } - interface OnBeforeRequestDetails extends CallbackDetails { - requestBody: RequestBody; + interface OnBeforeRequestDetails extends WebRequestCallbackDetails { + requestBody?: RequestBody; } interface WebRequestCompletedEvent extends chrome.events.Event {