();
var isMounted: boolean = classicComponent.isMounted();
diff --git a/react/react-0.13.0.d.ts b/react/react-0.13.0.d.ts
index b5a1d14952..9ee1025410 100644
--- a/react/react-0.13.0.d.ts
+++ b/react/react-0.13.0.d.ts
@@ -17,6 +17,9 @@ declare module React {
ref: string;
}
+ interface ReactClassicElement extends ReactElement
{
+ }
+
interface ReactHTMLElement extends ReactElement {}
interface ReactSVGElement extends ReactElement {}
@@ -112,8 +115,10 @@ declare module React {
interface TopLevelAPI {
createClass(spec: ComponentSpec): ClassicComponentClass;
+ createElement(type: ClassicComponentClass, props: P, ...children: ReactNode[]): ReactClassicElement;
createElement
(type: ComponentClass | string, props: P, ...children: ReactNode[]): ReactElement;
createFactory
(type: ComponentClass | string): ComponentFactory;
+ render(element: ReactClassicElement, container: Element, callback?: () => any): ClassicComponent;
render(element: ReactElement, container: Element, callback?: () => any): Component;
unmountComponentAtNode(container: Element): boolean;
renderToString(element: ReactElement): string;
diff --git a/restify/restify.d.ts b/restify/restify.d.ts
index 6e0ee450a9..7128ca3d07 100644
--- a/restify/restify.d.ts
+++ b/restify/restify.d.ts
@@ -95,6 +95,7 @@ declare module "restify" {
listen(... args: any[]): any;
close(... args: any[]): any;
pre(routeCallBack: RequestHandler): any;
+ server: http.Server;
}
diff --git a/shelljs/shelljs-tests.ts b/shelljs/shelljs-tests.ts
index d28b723989..835f177a69 100644
--- a/shelljs/shelljs-tests.ts
+++ b/shelljs/shelljs-tests.ts
@@ -85,8 +85,34 @@ shell.ln("-sf", "file", "existing");
var testPath = shell.env["path"];
+import child = require("child_process");
+
var version = shell.exec("node --version").output;
+var version2 = shell.exec("node --version", { async: false });
+var output = version2.output;
+
+var asyncVersion3 = shell.exec("node --version", { async: true });
+var pid = asyncVersion3.pid;
+
+shell.exec("node --version", { silent: true }, function (code, output) {
+ var version = output;
+});
+shell.exec("node --version", { silent: true, async: true }, function (code, output) {
+ var version = output;
+});
+shell.exec("node --version", function (code, output) {
+ var version = output;
+});
+shell.exec("node --version", function (code: number) {
+ var num: number = code;
+});
+
+var childProc = shell.exec("node --version", function (code: number) {
+ var num: number = code;
+});
+var pid = childProc.pid;
+
shell.chmod(755, "/Users/brandon");
shell.chmod("755", "/Users/brandon"); // same as above
shell.chmod("u+x", "/Users/brandon");
diff --git a/shelljs/shelljs.d.ts b/shelljs/shelljs.d.ts
index b3b732d052..c4608caeeb 100644
--- a/shelljs/shelljs.d.ts
+++ b/shelljs/shelljs.d.ts
@@ -8,6 +8,8 @@
declare module "shelljs"
{
+ import child = require("child_process");
+
/**
* Changes to directory dir for the duration of the script
* @param {string} dir Directory to change in.
@@ -434,31 +436,44 @@ declare module "shelljs"
* Object containing environment variables (both getter and setter). Shortcut to process.env.
*/
export var env: { [key: string]: string };
-
- /*
-
- // Not yet implemented due to implementation issues (constant overloads and return types).
- // See: https://github.com/arturadib/shelljs#execcommand--options--callback
-
- export function exec(command: string, options: ExecOptions, callback: (code: number, output: string) => any): any;
- export function exec(command: string, options: ExecOptions): any;
-
- interface ExecOptions
- {
- silent: boolean;
- async: boolean;
- }
-
- */
-
+
/**
* Executes the given command synchronously.
- * @param {string} command The commadn to execute.
- * @return {ExecReturnValue} Returns an object containing the return code and output as string.
+ * @param {string} command The command to execute.
+ * @return {ExecOutputReturnValue} Returns an object containing the return code and output as string.
*/
- export function exec(command: string): ExecReturnValue;
+ export function exec(command: string): ExecOutputReturnValue;
+ /**
+ * Executes the given command synchronously.
+ * @param {string} command The command to execute.
+ * @param {ExecOptions} options Silence and synchronous options.
+ * @return {ExecOutputReturnValue | child.ChildProcess} Returns an object containing the return code and output as string, or if {async:true} was passed, a ChildProcess.
+ */
+ export function exec(command: string, options: ExecOptions): ExecOutputReturnValue | child.ChildProcess;
+ /**
+ * Executes the given command synchronously.
+ * @param {string} command The command to execute.
+ * @param {ExecOptions} options Silence and synchronous options.
+ * @param {ExecCallback} callback Receives code and output asynchronously.
+ */
+ export function exec(command: string, options: ExecOptions, callback: ExecCallback): child.ChildProcess;
+ /**
+ * Executes the given command synchronously.
+ * @param {string} command The command to execute.
+ * @param {ExecCallback} callback Receives code and output asynchronously.
+ */
+ export function exec(command: string, callback: ExecCallback): child.ChildProcess;
- interface ExecReturnValue
+ export interface ExecCallback {
+ (code: number, output: string): any;
+ }
+
+ export interface ExecOptions {
+ silent?: boolean;
+ async?: boolean;
+ }
+
+ export interface ExecOutputReturnValue
{
code: number;
output: string;
diff --git a/webcola/webcola.d.ts b/webcola/webcola.d.ts
index b8794f31e3..177039b139 100644
--- a/webcola/webcola.d.ts
+++ b/webcola/webcola.d.ts
@@ -30,6 +30,13 @@ declare module WebCola{
stop(): void;
}
+ interface Constraint {
+ axis: string;
+ gap: number;
+ left: number;
+ right: number;
+ }
+
interface FlowLayout{
axis: string;
minSeparation?: number;
diff --git a/webspeechapi/webspeechapi-tests.ts b/webspeechapi/webspeechapi-tests.ts
new file mode 100644
index 0000000000..91e623b0ff
--- /dev/null
+++ b/webspeechapi/webspeechapi-tests.ts
@@ -0,0 +1,153 @@
+///
+
+/*
+Examples from the spec:
+https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#examples-recognition
+*/
+
+// 6.1 Speech Recognition Examples
+
+// Example 1
+declare var q: HTMLInputElement;
+() => {
+ var recognition = new SpeechRecognition();
+ recognition.onresult = function (event) {
+ if (event.results.length > 0) {
+ q.value = event.results[0][0].transcript;
+ q.form.submit();
+ }
+ }
+}
+
+// Example 2
+declare var select: HTMLSelectElement;
+() => {
+ var recognition = new SpeechRecognition();
+ recognition.maxAlternatives = 10;
+ recognition.onresult = function (event) {
+ if (event.results.length > 0) {
+ var result = event.results[0];
+ for (var i = 0; i < result.length; ++i) {
+ var text = result[i].transcript;
+ select.options[i] = new Option(text, text);
+ }
+ }
+ }
+
+ function start() {
+ select.options.length = 0;
+ recognition.start();
+ }
+}
+
+// Example 3
+/*
+This example has some changes from the one in spec.
+`var i = resultIndex` -> `var i = event.resultIndex` (Recorded as Errata 16)
+`event.results.final` -> `event.results[i].isFinal` (Recorded as Errata 02)
+*/
+declare var textarea: HTMLTextAreaElement;
+declare var button: HTMLButtonElement;
+() => {
+ var recognizing: boolean;
+ var recognition = new SpeechRecognition();
+ recognition.continuous = true;
+ reset();
+ recognition.onend = reset;
+
+ recognition.onresult = function (event) {
+ for (var i = event.resultIndex; i < event.results.length; ++i) {
+ if (event.results[i].isFinal) {
+ textarea.value += event.results[i][0].transcript;
+ }
+ }
+ }
+
+ function reset() {
+ recognizing = false;
+ button.innerHTML = "Click to Speak";
+ }
+
+ function toggleStartStop() {
+ if (recognizing) {
+ recognition.stop();
+ reset();
+ } else {
+ recognition.start();
+ recognizing = true;
+ button.innerHTML = "Click to Stop";
+ }
+ }
+}
+
+// Example 4
+/*
+This example has a change from the one in spec.
+`recognition.interim = true;` -> `recognition.interimResults = true;` (Recorded as Errata 01)
+`event.results[i].final` -> `event.results[i].isFinal` (Recorded as Errata 02)
+*/
+declare var button: HTMLButtonElement;
+declare var final_span: HTMLSpanElement;
+declare var interim_span: HTMLSpanElement;
+() => {
+ var recognizing: boolean;
+ var recognition = new SpeechRecognition();
+ recognition.continuous = true;
+ recognition.interimResults = true;
+ reset();
+ recognition.onend = reset;
+
+ recognition.onresult = function (event) {
+ var final = "";
+ var interim = "";
+ for (var i = 0; i < event.results.length; ++i) {
+ if (event.results[i].isFinal) {
+ final += event.results[i][0].transcript;
+ } else {
+ interim += event.results[i][0].transcript;
+ }
+ }
+ final_span.innerHTML = final;
+ interim_span.innerHTML = interim;
+ }
+
+ function reset() {
+ recognizing = false;
+ button.innerHTML = "Click to Speak";
+ }
+
+ function toggleStartStop() {
+ if (recognizing) {
+ recognition.stop();
+ reset();
+ } else {
+ recognition.start();
+ recognizing = true;
+ button.innerHTML = "Click to Stop";
+ final_span.innerHTML = "";
+ interim_span.innerHTML = "";
+ }
+ }
+}
+
+
+// 6.2 Speech Synthesis Examples
+
+// Example 1
+/*
+This example has a change from the one in spec.
+`SpeechSynthesisUtterance('Hello World')` -> `new SpeechSynthesisUtterance('Hello World')` (Recorded as Errata 09)
+*/
+() => {
+ speechSynthesis.speak(new SpeechSynthesisUtterance('Hello World'));
+}
+
+//Example 2
+() => {
+ var u = new SpeechSynthesisUtterance();
+ u.text = 'Hello World';
+ u.lang = 'en-US';
+ u.rate = 1.2;
+ u.onend = function (event) { alert('Finished in ' + event.elapsedTime + ' seconds.'); }
+ speechSynthesis.speak(u);
+}
\ No newline at end of file
diff --git a/webspeechapi/webspeechapi.d.ts b/webspeechapi/webspeechapi.d.ts
new file mode 100644
index 0000000000..1b554af6a0
--- /dev/null
+++ b/webspeechapi/webspeechapi.d.ts
@@ -0,0 +1,164 @@
+// Type definitions for Web Speech API
+// Project: https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html
+// Definitions by: SaschaNaz
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// Spec version: 19 October 2012
+// Errata version: 6 June 2014
+// Corrected unofficial spec version: 6 June 2014
+
+interface SpeechRecognition extends EventTarget {
+ grammars: SpeechGrammarList;
+ lang: string;
+ continuous: boolean;
+ interimResults: boolean;
+ maxAlternatives: number;
+ serviceURI: string;
+
+ start(): void;
+ stop(): void;
+ abort(): void;
+
+ onaudiostart: (ev: Event) => any;
+ onsoundstart: (ev: Event) => any;
+ onspeechstart: (ev: Event) => any;
+ onspeechend: (ev: Event) => any;
+ onsoundend: (ev: Event) => any;
+ onresult: (ev: SpeechRecognitionEvent) => any;
+ onnomatch: (ev: SpeechRecognitionEvent) => any;
+ onerror: (ev: SpeechRecognitionError) => any;
+ onstart: (ev: Event) => any;
+ onend: (ev: Event) => any;
+}
+interface SpeechRecognitionStatic {
+ prototype: SpeechRecognition;
+ new (): SpeechRecognition;
+}
+declare var SpeechRecognition: SpeechRecognitionStatic;
+declare var webkitSpeechRecognition: SpeechRecognitionStatic;
+
+interface SpeechRecognitionError extends Event {
+ error: string;
+ message: string;
+}
+
+interface SpeechRecognitionAlternative {
+ transcript: string;
+ confidence: number;
+}
+
+interface SpeechRecognitionResult {
+ length: number;
+ item(index: number): SpeechRecognitionAlternative;
+ [index: number]: SpeechRecognitionAlternative;
+ /* Errata 02 */
+ isFinal: boolean;
+}
+
+interface SpeechRecognitionResultList {
+ length: number;
+ item(index: number): SpeechRecognitionResult;
+ [index: number]: SpeechRecognitionResult;
+}
+
+interface SpeechRecognitionEvent extends Event {
+ resultIndex: number;
+ results: SpeechRecognitionResultList;
+ interpretation: any;
+ emma: Document;
+}
+
+interface SpeechGrammar {
+ src: string;
+ weight: number;
+}
+interface SpeechGrammarStatic {
+ prototype: SpeechGrammar;
+ new (): SpeechGrammar;
+}
+declare var SpeechGrammar: SpeechGrammarStatic;
+declare var webkitSpeechGrammar: SpeechGrammarStatic;
+
+interface SpeechGrammarList {
+ length: number;
+ item(index: number): SpeechGrammar;
+ [index: number]: SpeechGrammar;
+ addFromURI(src: string, weight: number): void;
+ addFromString(string: string, weight: number): void;
+}
+interface SpeechGrammarListStatic {
+ prototype: SpeechGrammarList;
+ new (): SpeechGrammarList;
+}
+declare var SpeechGrammarList: SpeechGrammarListStatic;
+declare var webkitSpeechGrammarList: SpeechGrammarListStatic;
+
+/* Errata 08 */
+interface SpeechSynthesis extends EventTarget {
+ pending: boolean;
+ speaking: boolean;
+ paused: boolean;
+
+ /* Errata 11 */
+ onvoiceschanged: (ev: Event) => any;
+
+ speak(utterance: SpeechSynthesisUtterance): void;
+ cancel(): void;
+ pause(): void;
+ resume(): void;
+ /* Errata 05 */
+ getVoices(): SpeechSynthesisVoice[];
+}
+
+interface SpeechSynthesisGetter {
+ speechSynthesis: SpeechSynthesis;
+}
+interface Window extends SpeechSynthesisGetter {
+}
+declare var speechSynthesis: SpeechSynthesis;
+
+interface SpeechSynthesisUtterance extends EventTarget {
+ text: string;
+ lang: string;
+ /* Errata 07 */
+ voice: SpeechSynthesisVoice;
+ volume: number;
+ rate: number;
+ pitch: number;
+
+ onstart: (ev: SpeechSynthesisEvent) => any;
+ onend: (ev: SpeechSynthesisEvent) => any;
+ /* Errata 12 */
+ onerror: (ev: SpeechSynthesisErrorEvent) => any;
+ onpause: (ev: SpeechSynthesisEvent) => any;
+ onresume: (ev: SpeechSynthesisEvent) => any;
+ onmark: (ev: SpeechSynthesisEvent) => any;
+ onboundary: (ev: SpeechSynthesisEvent) => any;
+}
+interface SpeechSynthesisUtteranceStatic {
+ prototype: SpeechSynthesisUtterance;
+ new (): SpeechSynthesisUtterance;
+ new (text: string): SpeechSynthesisUtterance;
+}
+declare var SpeechSynthesisUtterance: SpeechSynthesisUtteranceStatic;
+
+interface SpeechSynthesisEvent extends Event {
+ /* Errata 08 */
+ utterance: SpeechSynthesisUtterance;
+ charIndex: number;
+ elapsedTime: number;
+ name: string;
+}
+
+/* Errata 12 */
+interface SpeechSynthesisErrorEvent extends SpeechSynthesisEvent {
+ error: string;
+}
+
+interface SpeechSynthesisVoice {
+ voiceURI: string;
+ name: string;
+ lang: string;
+ localService: boolean;
+ default: boolean;
+}
\ No newline at end of file