Merge pull request #1 from basarat/master

pull upstream

Author: spences10

README.md

@@ -27,6 +27,8 @@ I've been looking at the issues that turn up commonly when people start using Ty
 * Thank you for writing TypeScript Deep Dive. I have learned so much. [link](https://twitter.com/buctwbzs/status/857198618704355328?refsrc=email&s=11)
 * Loving @basarat's @typescriptlang online book basarat.gitbooks.io/typescript/# loaded with great recipes! [link](https://twitter.com/ericliprandi/status/857608837309677568)
 * Microsoft doc is great already, but if want to "dig deeper" into TypeScript I find this book of great value  [link](https://twitter.com/caludio/status/876729910550831104)
+* Thanks, this is a great book 🤓🤓 [link](https://twitter.com/jjwonmin/status/885666375548547073)
+* Deep dive to typescript is awesome in so many levels. i find it very insightful. Thanks [link](https://twitter.com/orenmizr/status/891083492787970053)
 
 ## Get Started
 If you are here to read the book online [get started](http://basarat.gitbooks.io/typescript/content/docs/getting-started.html).

SUMMARY.md

@@ -3,13 +3,16 @@
 * [Getting Started](docs/getting-started.md)
   * [Why TypeScript](docs/why-typescript.md)
 * [JavaScript](docs/javascript/recap.md)
-  * [Awful](docs/javascript/awful.md)
+  * [Equality](docs/javascript/equality.md)
+  * [References](docs/javascript/references.md)
+  * [Null vs. Undefined](docs/javascript/null-undefined.md)
+  * [this](docs/javascript/this.md)
   * [Closure](docs/javascript/closure.md)
+  * [Number](docs/javascript/number.md)
 * [Future JavaScript Now](docs/future-javascript.md)
   * [Classes](docs/classes.md)
     * [Classes Emit](docs/classes-emit.md)
     * [Classes Super](docs/classes-super.md)
-    * [Classes Extensibility](docs/classes-extensibility-wip.md)
   * [Arrow Functions](docs/arrow-functions.md)
   * [Rest Parameters](docs/rest-parameters.md)
   * [let](docs/let.md)
@@ -31,7 +34,8 @@
     * [File Module Details](docs/project/external-modules.md)
     * [globals.d.ts](docs/project/globals.md)
   * [Namespaces](docs/project/namespaces.md)
-* [NodeJS QuickStart](docs/quick/nodejs.md)
+  * [Dynamic Import Expressions](docs/project/dynamic-import-expressions.md)
+* [Node.js QuickStart](docs/quick/nodejs.md)
 * [Browser QuickStart](docs/quick/browser.md)
 * [TypeScript's Type System](docs/types/type-system.md)
   * [JS Migration Guide](docs/types/migrating.md)
@@ -43,6 +47,7 @@
   * [Enums](docs/enums.md)
   * [`lib.d.ts`](docs/types/lib.d.ts.md)
   * [Functions](docs/types/functions.md)
+  * [Callable](docs/types/callable.md)
   * [Type Assertion](docs/types/type-assertion.md)
   * [Freshness](docs/types/freshness.md)
   * [Type Guard](docs/types/typeGuard.md)
@@ -82,7 +87,7 @@
   * [Build Toggles](docs/tips/build-toggles.md)
   * [Barrel](docs/tips/barrel.md)
   * [Create Arrays](docs/tips/create-arrays.md)
-  * [Promise Safety](docs/tips/promise-safety.md)
+  * [Typesafe Event Emitter](docs/tips/typed-event.md)
 * [StyleGuide](docs/styleguide/styleguide.md)
 * [Common Errors](docs/errors/main.md)
 * [TypeScript Compiler Internals](docs/compiler/overview.md)

book.json

@@ -1,13 +1,25 @@
 {
-  "gitbook": ">=3.2.1",
-  "plugins": ["edit-link", "github"],
+  "plugins": ["edit-link", "github", "adsense","header"],
   "pluginsConfig": {
+    "layout": {
+      "headerPath" : "header.html"
+    },
+    "lunr": {
+      "ignoreSpecialCharacters": true
+    },
     "edit-link": {
       "base": "https://github.com/basarat/typescript-book/tree/master",
       "label": "Edit This Page"
     },
     "github": {
       "url": "https://github.com/basarat/typescript-book/"
+    },
+    "adsense": {
+      "client": "ca-pub-4656761253552116",
+      "slot": "2017468453",
+      "format": "auto",
+      "element": ".page-inner section",
+      "position": "bottom"
     }
   }
 }

code/async-await/es5/asyncAwaitES5.js

@@ -40,7 +40,7 @@ function delay(milliseconds, count) {
         }, milliseconds);
     });
 }
-// async function allways return a Promise
+// async function always return a Promise
 function dramaticWelcome() {
     return __awaiter(this, void 0, void 0, function () {
         var i, count;

code/async-await/es5/asyncAwaitES5.ts

@@ -6,7 +6,7 @@ function delay(milliseconds: number, count: number): Promise<number> {
         });
 }
 
-// async function allways return a Promise
+// async function always return a Promise
 async function dramaticWelcome(): Promise<void> {
     console.log("Hello");
 

code/async-await/es6/asyncAwaitES6.js

@@ -13,7 +13,7 @@ function delay(milliseconds, count) {
         }, milliseconds);
     });
 }
-// async function allways return a Promise
+// async function always return a Promise
 function dramaticWelcome() {
     return __awaiter(this, void 0, void 0, function* () {
         console.log("Hello");

code/async-await/es6/asyncAwaitES6.ts

@@ -6,7 +6,7 @@ function delay(milliseconds: number, count: number): Promise<number> {
         });
 }
 
-// async function allways return a Promise
+// async function always return a Promise
 async function dramaticWelcome(): Promise<void> {
     console.log("Hello");
 

code/dynamic-import-expressions/dynamicImportExpression.js

@@ -0,0 +1,14 @@
+"use strict";
+function myApp() {
+    import(/* webpackChunkName: "momentjs" */ "moment")
+        .then(function (moment) {
+        // lazyModule has all of the proper types, autocomplete works,
+        // type checking works, code references work \o/
+        var time = moment().format();
+        console.log("TypeScript >= 2.4.0 Dynamic Import Expression:");
+        console.log(time);
+    })
+        .catch(function (err) {
+        console.log("Failed to load moment", err);
+    });
+}

code/dynamic-import-expressions/dynamicImportExpression.ts

@@ -0,0 +1,14 @@
+
+function myApp() {
+    import(/* webpackChunkName: "momentjs" */ "moment")
+        .then((moment) => {
+            // lazyModule has all of the proper types, autocomplete works,
+            // type checking works, code references work \o/
+            const time = moment().format();
+            console.log("TypeScript >= 2.4.0 Dynamic Import Expression:");
+            console.log(time);
+        })
+        .catch((err) => {
+            console.log("Failed to load moment", err);
+        });
+}

code/dynamic-import-expressions/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "dynamic-import-expressions",
+  "version": "1.0.0",
+  "description": "",
+  "main": "dynamicImportExpression.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Jose Quinto Zamora - https://blog.josequinto.com",
+  "license": "ISC",
+  "devDependencies": {
+    "typescript": "^2.4.1"
+  },
+  "dependencies": {
+    "moment": "^2.18.1"
+  }
+}