Update VM arguments with backward compatibility

Author: blakeembrey

0.12/node.d.ts

@@ -958,17 +958,26 @@ declare module "readline" {
 declare module "vm" {
     export interface Context {}
 
+    export interface ScriptOptions {
+        filename?: string;
+        displayErrors?: boolean;
+    }
+
+    export interface RunInContextOptions extends ScriptOptions {
+        timeout?: number;
+    }
+
     export class Script {
-        constructor (code: string, filename?: string);
+        constructor (code: string, options?: string | ScriptOptions);
         runInThisContext(): void;
         runInNewContext(sandbox?: Context): void;
     }
 
-    export function runInThisContext(code: string, filename?: string): void;
-    export function runInNewContext(code: string, sandbox?: Context, filename?: string): void;
-    export function runInContext(code: string, context: Context, filename?: string): any;
+    export function runInThisContext(code: string, options?: string | RunInContextOptions): void;
+    export function runInNewContext(code: string, sandbox?: Context, options?: string | RunInContextOptions): void;
+    export function runInContext(code: string, context: Context, options?: string | RunInContextOptions): any;
     export function createContext(initSandbox?: Context): Context;
-    export function createScript(code: string, filename?: string): Script;
+    export function createScript(code: string, options?: string | ScriptOptions): Script;
 }
 
 declare module "child_process" {

4.0/node.d.ts

@@ -1202,22 +1202,22 @@ declare module "vm" {
     }
 
     export class Script {
-        constructor(code: string, options?: ScriptOptions);
-        runInContext(contextifiedSandbox: Context, options?: RunningScriptOptions): any;
-        runInNewContext(sandbox?: Context, options?: RunningScriptOptions): any;
-        runInThisContext(options?: RunningScriptOptions): any;
+        constructor(code: string, options?: string | ScriptOptions);
+        runInContext(contextifiedSandbox: Context, options?: string | RunningScriptOptions): any;
+        runInNewContext(sandbox?: Context, options?: string | RunningScriptOptions): any;
+        runInThisContext(options?: string | RunningScriptOptions): any;
     }
 
     export function createContext(sandbox?: Context): Context;
     export function isContext(sandbox: Context): boolean;
-    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: string | RunningScriptOptions): any;
     export function runInDebugContext(code: string): any;
-    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
-    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: string | RunningScriptOptions): any;
+    export function runInThisContext(code: string, options?: string | RunningScriptOptions): any;
     /**
      * @deprecated
      */
-    export function createScript(code: string, filename?: string): Script;
+    export function createScript(code: string, options?: string | ScriptOptions): Script;
 }
 
 declare module "child_process" {

6.0/node.d.ts

@@ -1229,22 +1229,22 @@ declare module "vm" {
     }
 
     export class Script {
-        constructor(code: string, options?: ScriptOptions);
+        constructor(code: string, options?: string | ScriptOptions);
         runInContext(contextifiedSandbox: Context, options?: RunInContextOptions): any;
         runInNewContext(sandbox?: Context, options?: RunInNewContextOptions): any;
         runInThisContext(options?: RunInNewContextOptions): any;
     }
 
     export function createContext(sandbox?: Context): Context;
     export function isContext(sandbox: Context): boolean;
-    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunInNewContextOptions): any;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: string | RunInNewContextOptions): any;
     export function runInDebugContext(code: string): any;
-    export function runInNewContext(code: string, sandbox?: Context, options?: RunInNewContextOptions): any;
-    export function runInThisContext(code: string, options?: RunInNewContextOptions): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: string | RunInNewContextOptions): any;
+    export function runInThisContext(code: string, options?: string | RunInNewContextOptions): any;
     /**
      * @deprecated
      */
-    export function createScript(code: string, filename?: string): Script;
+    export function createScript(code: string, options?: string | ScriptOptions): Script;
 }
 
 declare module "child_process" {