From 42e938f9791d1a30058d33dff2311331be8e8ec2 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 26 Jan 2017 15:14:52 +0100 Subject: [PATCH] git: remove denodeify dependency --- extensions/git/package.json | 1 - extensions/git/src/git.ts | 7 ++--- extensions/git/src/typings.json | 5 --- .../src/typings/globals/denodeify/index.d.ts | 31 ------------------- .../typings/globals/denodeify/typings.json | 8 ----- extensions/git/src/typings/index.d.ts | 1 - extensions/git/src/util.ts | 6 +++- 7 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 extensions/git/src/typings.json delete mode 100644 extensions/git/src/typings/globals/denodeify/index.d.ts delete mode 100644 extensions/git/src/typings/globals/denodeify/typings.json delete mode 100644 extensions/git/src/typings/index.d.ts diff --git a/extensions/git/package.json b/extensions/git/package.json index e51b3727172..03e4423cd88 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -350,7 +350,6 @@ } }, "dependencies": { - "denodeify": "^1.2.1", "vscode-nls": "^2.0.1" } } \ No newline at end of file diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index c8aed3775f6..a3f7040cca3 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -9,14 +9,13 @@ import * as fs from 'fs'; import * as path from 'path'; import * as os from 'os'; import * as cp from 'child_process'; -import * as denodeify from 'denodeify'; -import { assign, uniqBy, groupBy, IDisposable, toDisposable, dispose } from './util'; +import { assign, uniqBy, groupBy, denodeify, IDisposable, toDisposable, dispose } from './util'; import { EventEmitter, Event } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); -const readdir = denodeify(fs.readdir); -const readfile = denodeify(fs.readFile); +const readdir = denodeify(fs.readdir); +const readfile = denodeify(fs.readFile); export interface IGit { path: string; diff --git a/extensions/git/src/typings.json b/extensions/git/src/typings.json deleted file mode 100644 index 50db63299be..00000000000 --- a/extensions/git/src/typings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "globalDependencies": { - "denodeify": "registry:dt/denodeify#1.2.1+20160316155526" - } -} \ No newline at end of file diff --git a/extensions/git/src/typings/globals/denodeify/index.d.ts b/extensions/git/src/typings/globals/denodeify/index.d.ts deleted file mode 100644 index 8988e3d9c3a..00000000000 --- a/extensions/git/src/typings/globals/denodeify/index.d.ts +++ /dev/null @@ -1,31 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/56295f5058cac7ae458540423c50ac2dcf9fc711/denodeify/denodeify.d.ts -declare module "denodeify" { - function _(fn: _.F0, transformer?: _.M): () => Promise; - function _(fn: _.F1, transformer?: _.M): (a:A) => Promise; - function _(fn: _.F2, transformer?: _.M): (a:A, b:B) => Promise; - function _(fn: _.F3, transformer?: _.M): (a:A, b:B, c:C) => Promise; - function _(fn: _.F4, transformer?: _.M): (a:A, b:B, c:C, d:D) => Promise; - function _(fn: _.F5, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E) => Promise; - function _(fn: _.F6, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F) => Promise; - function _(fn: _.F7, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F, g:G) => Promise; - function _(fn: _.F8, transformer?: _.M): (a:A, b:B, c:C, d:D, e:E, f:F, g:G, h:H) => Promise; - function _(fn: _.F, transformer?: _.M): (...args: any[]) => Promise; - - module _ { - type Callback = (err: Error, result: R) => any; - type F0 = (cb: Callback) => any; - type F1 = (a:A, cb: Callback) => any; - type F2 = (a:A, b:B, cb: Callback) => any; - type F3 = (a:A, b:B, c:C, cb: Callback) => any; - type F4 = (a:A, b:B, c:C, d:D, cb: Callback) => any; - type F5 = (a:A, b:B, c:C, d:D, e:E, cb: Callback) => any; - type F6 = (a:A, b:B, c:C, d:D, e:E, f:F, cb: Callback) => any; - type F7 = (a:A, b:B, c:C, d:D, e:E, f:F, g:G, cb: Callback) => any; - type F8 = (a:A, b:B, c:C, d:D, e:E, f:F, g:G, h:H, cb: Callback) => any; - type F = (...args: any[]) => any; - type M = (err: Error, ...args: any[]) => any[]; - } - - export = _; -} diff --git a/extensions/git/src/typings/globals/denodeify/typings.json b/extensions/git/src/typings/globals/denodeify/typings.json deleted file mode 100644 index ebb2a938aea..00000000000 --- a/extensions/git/src/typings/globals/denodeify/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/56295f5058cac7ae458540423c50ac2dcf9fc711/denodeify/denodeify.d.ts", - "raw": "registry:dt/denodeify#1.2.1+20160316155526", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/56295f5058cac7ae458540423c50ac2dcf9fc711/denodeify/denodeify.d.ts" - } -} diff --git a/extensions/git/src/typings/index.d.ts b/extensions/git/src/typings/index.d.ts deleted file mode 100644 index a2869e8d4ed..00000000000 --- a/extensions/git/src/typings/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts index 66a3ed70d1f..2c6a1eaf206 100644 --- a/extensions/git/src/util.ts +++ b/extensions/git/src/util.ts @@ -88,4 +88,8 @@ export function groupBy(arr: T[], fn: (el: T) => string): { [key: string]: T[ result[key] = [...(result[key] || []), el]; return result; }, Object.create(null)); -} \ No newline at end of file +} + +export function denodeify(fn: Function): (...args) => Promise { + return (...args) => new Promise((c, e) => fn(...args, (err, r) => err ? e(err) : c(r))); +} -- GitLab