Fixed bad cuts

Author: mattpocock

book-content/chapters/04-essential-types-and-annotations.md

@@ -90,7 +90,7 @@ But this one would show an error:
 // @errors: 2322
 let isReleased: boolean = true;
 
-isReleased = "yes"; // red squiggly line under `isReleased`
+isReleased = "yes";
 ```
 
 TypeScript's static type checking is able to spot errors at compile time, which is happening behind the scenes as you write your code.
@@ -259,7 +259,6 @@ export const add = (a: boolean, b: boolean) => {
 };
 
 // ---cut---
-
 const result = add(1, 2);
 
 type test = Expect<Equal<typeof result, number>>;
@@ -283,7 +282,7 @@ Finally, we can see that our `test` result has an error because the `result` is
 
 Your challenge is to consider how we can change the types to make the errors go away, and to ensure that `result` is a `number`. You can hover over `result` to check it.
 
-<Exercise title="Exercise 1: Basic Types with Function Parameters" filePath="/src/015-essential-types-and-annotations/020-basic-types-with-function-parameters.problem.ts"></Exercise>
+<Exercise title="Exercise 1: Basic Types with Function Parameters" filePath="/src/015-essential-types-and-annotations/020-basic-types-with-function-parameters.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAd9N"></Exercise>
 
 #### Exercise 2: Annotating Empty Parameters
 
@@ -309,15 +308,14 @@ const concatTwoStrings = (a, b) => {
 };
 
 // ---cut---
-
 const result = concatTwoStrings("Hello", "World");
 
 type test = Expect<Equal<typeof result, string>>;
 ```
 
 Your job is to add some function paramater annotations to the `concatTwoStrings` function to make the errors go away.
 
-<Exercise title="Exercise 2: Annotating Empty Parameters" filePath="/src/015-essential-types-and-annotations/021-annotating-empty-parameters.problem.ts"></Exercise>
+<Exercise title="Exercise 2: Annotating Empty Parameters" filePath="/src/015-essential-types-and-annotations/021-annotating-empty-parameters.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAdKe"></Exercise>
 
 #### Exercise 3: The Basic Types
 
@@ -354,13 +352,13 @@ Type 'boolean' is not assignable to type 'string'.
 
 Change the types of the annotations on each variable to make the errors go away.
 
-<Exercise title="Exercise 3: The Basic Types" filePath="/src/015-essential-types-and-annotations/022-all-types.problem.ts"></Exercise>
+<Exercise title="Exercise 3: The Basic Types" filePath="/src/015-essential-types-and-annotations/022-all-types.problem.ts" resourceId="NMpTvrI4rUCyVa4GVzY1iN"></Exercise>
 
 #### Exercise 4: The `any` Type
 
 Here is a function called `handleFormData` that accepts an `e` typed as `any`. The function prevents the default form submission behavior, then creates an object from the form data and returns it:
 
-```ts twoslash
+```ts
 const handleFormData = (e: any) => {
   e.preventDefault();
 
@@ -414,7 +412,7 @@ Why is this error happening? Why isn't TypeScript giving us an error here?
 
 I'll give you a clue. I've hidden a nasty typo in there. Can you fix it?
 
-<Exercise title="Exercise 4: The `any` Type" filePath="/src/015-essential-types-and-annotations/032.5-any.problem.ts"></Exercise>
+<Exercise title="Exercise 4: The `any` Type" filePath="/src/015-essential-types-and-annotations/032.5-any.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAeU3"></Exercise>
 
 #### Solution 1: Basic Types with Function Parameters
 
@@ -518,7 +516,7 @@ Using `any` also disables useful features like autocompletion, which can help yo
 
 That's right-- the error in the above code was caused by a typo of `e.terget` instead of `e.target` when creating the `FormData`!
 
-```ts twoslash
+```ts
 const handleFormData = (e: any) => {
   e.preventDefault();
 
@@ -604,7 +602,7 @@ We can tell from the `concatName` function body that it expects `user.first` and
 
 How could we type the `user` parameter to ensure that it has these properties and that they are of the correct type?
 
-<Exercise title="Exercise 1: Object Literal Types" filePath="/src/015-essential-types-and-annotations/025-object-literal-types.problem.ts"></Exercise>
+<Exercise title="Exercise 1: Object Literal Types" filePath="/src/015-essential-types-and-annotations/025-object-literal-types.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAdzz"></Exercise>
 
 #### Exercise 2: Optional Property Types
 
@@ -639,7 +637,7 @@ const concatName = (user: { first: string; last: string }) => {
 it("should only return the first name if last name not provided", () => {
   const result = concatName({
     first: "John",
-  }); // red squiggly line under `{first: "John"}`
+  });
 
   type test = Expect<Equal<typeof result, string>>;
 
@@ -653,7 +651,7 @@ The error tells us that we are missing a property, but the error is incorrect. W
 
 How would you update this function to fix the errors?
 
-<Exercise title="Exercise 2: Optional Property Types" filePath="/src/015-essential-types-and-annotations/026-optional-property-types.problem.ts"></Exercise>
+<Exercise title="Exercise 2: Optional Property Types" filePath="/src/015-essential-types-and-annotations/026-optional-property-types.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAeIm"></Exercise>
 
 #### Solution 1: Object Literal Types
 
@@ -839,7 +837,7 @@ Even though everything is working as expected, there's an opportunity for refact
 
 How could you use the `type` keyword to make this code more readable?
 
-<Exercise title="Exercise 1: The `type` Keyword" filePath="/src/015-essential-types-and-annotations/027-type-keyword.problem.ts"></Exercise>
+<Exercise title="Exercise 1: The `type` Keyword" filePath="/src/015-essential-types-and-annotations/027-type-keyword.problem.ts" resourceId="jUJqrXCHRph0Z4Fs6Ll3za"></Exercise>
 
 #### Solution 1: The `type` Keyword
 
@@ -1051,7 +1049,7 @@ As the error message points out, there is not currently a property called `items
 
 How would you fix this error?
 
-<Exercise title="Exercise 1: Array Type" filePath="/src/015-essential-types-and-annotations/028-arrays.problem.ts"></Exercise>
+<Exercise title="Exercise 1: Array Type" filePath="/src/015-essential-types-and-annotations/028-arrays.problem.ts" resourceId="jUJqrXCHRph0Z4Fs6Ll3za"></Exercise>
 
 #### Exercise 2: Arrays of Objects
 
@@ -1088,7 +1086,7 @@ Object literal may only specify known properties, and 'ingredients' does not exi
 
 By combining what you've seen with typing object properties and working with arrays, how would you specify ingredients for the `Recipe` type?
 
-<Exercise title="Exercise 2: Arrays of Objects" filePath="/src/015-essential-types-and-annotations/029-arrays-of-objects.problem.ts"></Exercise>
+<Exercise title="Exercise 2: Arrays of Objects" filePath="/src/015-essential-types-and-annotations/029-arrays-of-objects.problem.ts" resourceId="YgFRxBViy44CfW0H2dToDx"></Exercise>
 
 #### Exercise 3: Tuples
 
@@ -1143,7 +1141,7 @@ setRange([0, 10, 20]);
 
 The code for the `setRange` function needs an updated type annotation to specify that it only accepts a tuple of two numbers.
 
-<Exercise title="Exercise 3: Tuples" filePath="/src/015-essential-types-and-annotations/031-tuples.problem.ts"></Exercise>
+<Exercise title="Exercise 3: Tuples" filePath="/src/015-essential-types-and-annotations/031-tuples.problem.ts" resourceId="YgFRxBViy44CfW0H2dTomV"></Exercise>
 
 #### Exercise 4: Optional Members of Tuples
 
@@ -1162,16 +1160,16 @@ const goToLocation = (coordinates: Array<number>) => {
   // Do something with latitude, longitude, and elevation in here
 
   type tests = [
-    Expect<Equal<typeof latitude, number>>, // red squiggly line under Equal<> statement
-    Expect<Equal<typeof longitude, number>>, // red squiggly line under Equal<> statement
+    Expect<Equal<typeof latitude, number>>,
+    Expect<Equal<typeof longitude, number>>,
     Expect<Equal<typeof elevation, number | undefined>>,
   ];
 };
 ```
 
 Your challenge is to update the type annotation for the `coordinates` parameter to specify that it should be a tuple of three numbers, where the third number is optional.
 
-<Exercise title="Exercise 4: Optional Members of Tuples" filePath="/src/015-essential-types-and-annotations/032-optional-members-of-tuples.problem.ts"></Exercise>
+<Exercise title="Exercise 4: Optional Members of Tuples" filePath="/src/015-essential-types-and-annotations/032-optional-members-of-tuples.problem.ts" resourceId="jUJqrXCHRph0Z4Fs6Ll7aP"></Exercise>
 
 #### Solution 1: Array Type
 
@@ -1453,7 +1451,7 @@ new () => Map<any, any> (+3 overloads)
 
 How would we type the `userMap` so the key must be a number and the value is an object with `name` and `age` properties?
 
-<Exercise title="Exercise 1: Passing Types to Map" filePath="/src/015-essential-types-and-annotations/036-pass-types-to-map.problem.ts"></Exercise>
+<Exercise title="Exercise 1: Passing Types to Map" filePath="/src/015-essential-types-and-annotations/036-pass-types-to-map.problem.ts" resourceId="YgFRxBViy44CfW0H2dTq1H"></Exercise>
 
 #### Exercise 2: `JSON.parse()` Can't Receive Type Arguments
 
@@ -1484,7 +1482,6 @@ const parsedData = JSON.parse<{
 // ---cut---
 type test = Expect<
   Equal<
-    // red squiggly lines for the full Equal<>
     typeof parsedData,
     {
       name: string;
@@ -1507,7 +1504,7 @@ The test errors tell us that the type of `parsed` is not what we expect. The pro
 
 Why this is happening? What would be an different way to correct these type errors?
 
-<Exercise title="Exercise 2: `JSON.parse()` Can't Receive Type Arguments" filePath="/src/015-essential-types-and-annotations/037-json-parse-cant-receive-type-arguments.problem.ts"></Exercise>
+<Exercise title="Exercise 2: `JSON.parse()` Can't Receive Type Arguments" filePath="/src/015-essential-types-and-annotations/037-json-parse-cant-receive-type-arguments.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAfD9"></Exercise>
 
 #### Solution 1: Passing Types to Map
 
@@ -1866,13 +1863,12 @@ const concatName = (first: string, last: string) => {
   return `${first} ${last}`;
 };
 // ---cut---
-
 const result2 = concatName("John");
 ```
 
 Try to use an optional parameter annotation to fix the error.
 
-<Exercise title="Exercise 1: Optional Function Parameters" filePath="/src/015-essential-types-and-annotations/023-optional-function-parameters.problem.ts"></Exercise>
+<Exercise title="Exercise 1: Optional Function Parameters" filePath="/src/015-essential-types-and-annotations/023-optional-function-parameters.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAdVv"></Exercise>
 
 #### Exercise 2: Default Function Parameters
 
@@ -1930,7 +1926,7 @@ expect(result).toEqual("John Pocock");
 
 Update the `concatName` function to use `Pocock` as the default last name if one is not provided.
 
-<Exercise title="Exercise 2: Default Function Parameters" filePath="/src/015-essential-types-and-annotations/024-default-function-parameters.problem.ts"></Exercise>
+<Exercise title="Exercise 2: Default Function Parameters" filePath="/src/015-essential-types-and-annotations/024-default-function-parameters.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAdoi"></Exercise>
 
 #### Exercise 3: Rest Parameters
 
@@ -1959,7 +1955,7 @@ The test passes, but there's an error on the `...strings` rest parameter.
 
 How would you update the rest parameter to specify that it should be an array of strings?
 
-<Exercise title="Exercise 3: Rest Parameters" filePath="/src/015-essential-types-and-annotations/030-rest-parameters.problem.ts"></Exercise>
+<Exercise title="Exercise 3: Rest Parameters" filePath="/src/015-essential-types-and-annotations/030-rest-parameters.problem.ts" resourceId="jUJqrXCHRph0Z4Fs6Ll6T5"></Exercise>
 
 #### Exercise 4: Function Types
 
@@ -2011,7 +2007,6 @@ const users: User[] = [
 ];
 
 modifyUser(users, "1", (user) => {
-  // red squiggly line under `user`
   return { ...user, name: "Waqas" };
 });
 ```
@@ -2033,7 +2028,7 @@ modifyUser(
 
 How would you type `makeChange` as a function takes in a `User` and returns a `User`?
 
-<Exercise title="Exercise 4: Function Types" filePath="/src/015-essential-types-and-annotations/033-function-types.problem.ts"></Exercise>
+<Exercise title="Exercise 4: Function Types" filePath="/src/015-essential-types-and-annotations/033-function-types.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAeqb"></Exercise>
 
 #### Exercise 5: Functions Returning `void`
 
@@ -2063,7 +2058,6 @@ const addClickEventListener = (listener) => {
 };
 
 // ---cut---
-
 addClickEventListener(
   // @ts-expect-error
   "abc",
@@ -2074,7 +2068,7 @@ This is triggering our `@ts-expect-error` directive.
 
 How should `addClickEventListener` be typed so that each error is resolved?
 
-<Exercise title="Exercise 5: Functions Returning `void`" filePath="/src/015-essential-types-and-annotations/034-functions-returning-void.problem.ts"></Exercise>
+<Exercise title="Exercise 5: Functions Returning `void`" filePath="/src/015-essential-types-and-annotations/034-functions-returning-void.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAf1s"></Exercise>
 
 #### Exercise 6: `void` vs `undefined`
 
@@ -2175,7 +2169,7 @@ How can we type `data` as a number without changing the calls to `fetch` or `res
 
 There are two possible solutions here.
 
-<Exercise title="Exercise 7: Typing Async Functions" filePath="/src/015-essential-types-and-annotations/038-type-async-functions.problem.ts"></Exercise>
+<Exercise title="Exercise 7: Typing Async Functions" filePath="/src/015-essential-types-and-annotations/038-type-async-functions.problem.ts" resourceId="1fZdJK1AI9JNeRElmqAfhD"></Exercise>
 
 #### Solution 1: Optional Function Parameters
 
@@ -2242,7 +2236,6 @@ type User = {
 };
 
 // ---cut---
-
 const modifyUser = (user: User[], id: string, makeChange: () => any) => {
   return user.map((u) => {
     if (u.id === id) {

book-content/chapters/05-unions-literals-and-narrowing.md

@@ -125,7 +125,6 @@ This way, we can ensure that each function only handles the cases it's supposed
 // @errors: 2345
 type PhysicalFormat = "LP" | "CD" | "Cassette";
 // ---cut---
-
 const getAlbumFormats = (format: PhysicalFormat) => {
   // function body
 };
@@ -211,7 +210,6 @@ function move(direction: string, distance: number) {
   // Move the specified distance in the given direction
 }
 // ---cut---
-
 move(
   // @ts-expect-error - "up-right" is not a valid direction
   "up-right",
@@ -657,7 +655,6 @@ if (!appElement) {
 }
 
 // ---cut---
-
 console.log(appElement);
 //          ^?
 

book-content/chapters/07-mutability.md

@@ -23,7 +23,6 @@ Using `let`, we can declare a variable `albumGenre` and assign it the value `"ro
 type AlbumGenre = "rock" | "country" | "electronic";
 
 // ---cut---
-
 let albumGenre = "rock";
 
 const handleGenre = (genre: AlbumGenre) => {
@@ -39,7 +38,6 @@ Because `let` was used when declaring the variable, TypeScript understands that
 let albumGenre = "rock";
 
 // ---cut---
-
 albumGenre = "country";
 ```
 
@@ -52,7 +50,6 @@ We can fix the error above by assigning a specific type to the `let`:
 type AlbumGenre = "rock" | "country" | "electronic";
 
 // ---cut---
-
 let albumGenre: AlbumGenre = "rock";
 
 const handleGenre = (genre: AlbumGenre) => {
@@ -95,7 +92,6 @@ type AlbumGenre = "rock" | "country" | "electronic";
 const albumGenre = "rock";
 
 // ---cut---
-
 albumGenre = "country";
 ```
 
@@ -234,7 +230,6 @@ const readOnlyWhiteAlbum: Readonly<Album> = {
   status: "staff-pick",
 };
 // ---cut---
-
 readOnlyWhiteAlbum.genre = ["rock", "pop", "unclassifiable"];
 ```
 

book-content/chapters/10-deriving-types.md

@@ -681,7 +681,6 @@ A test has been written to check if an `AllPrograms` type is a union of all the
 import { Equal, Expect } from "@total-typescript/helpers";
 type AllPrograms = unknown;
 // ---cut---
-
 type test = Expect<
   Equal<
     AllPrograms,

book-content/chapters/11-annotations-and-assertions.md

@@ -731,7 +731,6 @@ In the third scenario, we're trying to use `satisfies` with `document.getElement
 // @errors: 1360 2344
 import { Equal, Expect } from "@total-typescript/helpers";
 // ---cut---
-
 // Third Scenario
 const element = document.getElementById("app") satisfies HTMLElement;
 

book-content/chapters/13-modules-scripts-declaration-files.md

@@ -904,7 +904,6 @@ Now that we've typed `DEBUG`, the error message has moved to be under `getState(
 import { Equal, Expect } from "@total-typescript/helpers";
 declare const DEBUG: {};
 // ---cut---
-
 const state = DEBUG.getState();
 
 type test = Expect<Equal<typeof state, { id: string }>>;

book-content/chapters/14-configuring-typescript.md

@@ -261,7 +261,6 @@ const egoMirror: VinylSingle = {
 };
 
 // ---cut---
-
 const ego = egoMirror.tracks[0];
 //    ^?
 const mirror = egoMirror.tracks[1];

book-content/chapters/15-designing-your-types.md

@@ -538,7 +538,6 @@ This means that our examples above now work as expected:
 type ToArray<T> = T extends any[] ? T : T[];
 
 // ---cut---
-
 type Example = ToArray<string>;
 //   ^?
 
@@ -863,7 +862,6 @@ type Result<TResult, TError = Error> =
     };
 
 // ---cut---
-
 type BadExample = Result<
   { id: string },
   // @ts-expect-error Should be an object with a message property

book-content/chapters/16-the-utils-folder.md

@@ -278,7 +278,6 @@ const createSet = <T = string>(arr?: T[]) => {
   return new Set(arr);
 };
 // ---cut---
-
 const numberSet = createSet<number>([1, 2, 3]);
 //    ^?
 ```