node: move Node* to NodeJS module

jsiegmund · Apr 28, 2014 · 25a3c76 · 25a3c76
1 parent c52e7bd
commit 25a3c76
Show file tree

Hide file tree

Showing 8 changed files with 212 additions and 203 deletions.
diff --git a/browserify/browserify.d.ts b/browserify/browserify.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../node/node.d.ts" />
 
-interface BrowserifyObject extends NodeEventEmitter {
+interface BrowserifyObject extends NodeJS.EventEmitter {
 	add(file: string): BrowserifyObject;
 	require(file: string, opts?: {
 		expose: string;
@@ -16,7 +16,7 @@ interface BrowserifyObject extends NodeEventEmitter {
 		debug?: boolean;
 		standalone?: string;
 		insertGlobalVars?: any;
-	}, cb?: (err: any, src: any) => void): NodeReadableStream;
+	}, cb?: (err: any, src: any) => void): NodeJS.ReadableStream;
 
 	external(file: string): BrowserifyObject;
 	ignore(file: string): BrowserifyObject;

diff --git a/highland/highland-tests.ts b/highland/highland-tests.ts
@@ -22,9 +22,9 @@ var strArr: string[];
 var numArr: string[];
 var funcArr: Function[];
 
-var readable: NodeReadableStream;
-var writable: NodeWritableStream;
-var emitter: NodeEventEmitter;
+var readable: NodeJS.ReadableStream;
+var writable: NodeJS.WritableStream;
+var emitter: NodeJS.EventEmitter;
 
 // - - - - - - - - - - - - - - - - -
 

diff --git a/highland/highland.d.ts b/highland/highland.d.ts
@@ -62,8 +62,8 @@ interface HighlandStatic {
 	<R>(xs: (push: (err: Error, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
 
 	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
-	<R>(xs: NodeReadableStream): Highland.Stream<R>;
-	<R>(xs: NodeEventEmitter): Highland.Stream<R>;
+	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
+	<R>(xs: NodeJS.EventEmitter): Highland.Stream<R>;
 
 	// moar (promise for everything?)
 	<R>(xs: Highland.Thenable<Highland.Stream<R>>): Highland.Stream<R>;
@@ -365,7 +365,7 @@ declare module Highland {
 	/**
 	 * Actual Stream constructor wrapped the the main exported function
 	 */
-	interface Stream<R> extends NodeEventEmitter {
+	interface Stream<R> extends NodeJS.EventEmitter {
 
 		/**
 		 * Pauses the stream. All Highland Streams start in the paused state.
@@ -419,8 +419,8 @@ declare module Highland {
 		 * @api public
 		 */
 		pipe<U>(dest: Stream<U>): Stream<U>;
-		pipe<U>(dest: NodeReadWriteStream): Stream<U>;
-		pipe(dest: NodeWritableStream): void;
+		pipe<U>(dest: NodeJS.ReadWriteStream): Stream<U>;
+		pipe(dest: NodeJS.WritableStream): void;
 
 		/**
 		 * Destroys a stream by unlinking it from any consumers and sources. This will

diff --git a/jake/jake.d.ts b/jake/jake.d.ts
@@ -133,7 +133,7 @@ declare module jake{
 	 * @event stderr When the stderr for the child-process recieves data. This streams the stderr data. Passes one arg, the chunk of data.
 	 * @event error When a shell-command
 	 */
-	export interface Exec extends NodeEventEmitter {
+	export interface Exec extends NodeJS.EventEmitter {
 		append(cmd:string): void;
 		run(): void;
 	}
@@ -187,7 +187,7 @@ declare module jake{
 	 *
 	 * @event complete
 	 */
-	export class Task implements NodeEventEmitter {
+	export class Task implements NodeJS.EventEmitter {
 		/**
 		 * @name name The name of the Task
 		 * @param prereqs Prerequisites to be run before this task
@@ -206,11 +206,11 @@ declare module jake{
 		 */
 		reenable(): void;
 
-		addListener(event: string, listener: Function): NodeEventEmitter;
-        on(event: string, listener: Function): NodeEventEmitter;
-        once(event: string, listener: Function): NodeEventEmitter;
-        removeListener(event: string, listener: Function): NodeEventEmitter;
-        removeAllListeners(event?: string): NodeEventEmitter;
+		addListener(event: string, listener: Function): NodeJS.EventEmitter;
+        on(event: string, listener: Function): NodeJS.EventEmitter;
+        once(event: string, listener: Function): NodeJS.EventEmitter;
+        removeListener(event: string, listener: Function): NodeJS.EventEmitter;
+        removeAllListeners(event?: string): NodeJS.EventEmitter;
         setMaxListeners(n: number): void;
         listeners(event: string): Function[];
         emit(event: string, ...args: any[]): boolean;
@@ -381,11 +381,11 @@ declare module jake{
 		constructor(name:string, definition?:()=>void);
 	}
 
-	export function addListener(event: string, listener: Function): NodeEventEmitter;
-	export function on(event: string, listener: Function): NodeEventEmitter;
-	export function once(event: string, listener: Function): NodeEventEmitter;
-	export function removeListener(event: string, listener: Function): NodeEventEmitter;
-	export function removeAllListener(event: string): NodeEventEmitter;
+	export function addListener(event: string, listener: Function): NodeJS.EventEmitter;
+	export function on(event: string, listener: Function): NodeJS.EventEmitter;
+	export function once(event: string, listener: Function): NodeJS.EventEmitter;
+	export function removeListener(event: string, listener: Function): NodeJS.EventEmitter;
+	export function removeAllListener(event: string): NodeJS.EventEmitter;
 	export function setMaxListeners(n: number): void;
 	export function listeners(event: string): Function[];
 	export function emit(event: string, ...args: any[]): boolean;