Fix some solutions in sandbox

marijnh · marijnh · commit abff4fe4f31d · 2024-03-01T11:07:55.000+01:00
diff --git a/code/index.html b/code/index.html
@@ -15,13 +15,6 @@
   </style>
 </head>
 
-<div style="background: #ffb; border-bottom: 1px solid silver; padding: 6px 4em; text-align: center">
-  <strong>Note:</strong> If you are reading the <strong>third edition</strong> of the book,
-  you'll want to go
-  to <a href="https://eloquentjavascript.net/3nd_edition/code/">that
-  edition's sandbox</a> instead!
-</div>
-
 <article style="max-width: 50em;">
   <h1>Code Sandbox<div style="font-size: 70%"><a class="subtlelink" href="../index.html">Eloquent JavaScript</a></div></h2>
 
diff --git a/code/solutions/06_4_borrowing_a_method.js b/code/solutions/06_4_borrowing_a_method.js
@@ -0,0 +1,4 @@
+let map = {one: true, two: true, hasOwnProperty: true};
+
+console.log(Object.prototype.hasOwnProperty.call(map, "one"));
+// → true
diff --git a/code/solutions/11_1_tracking_the_scalpel.js b/code/solutions/11_1_tracking_the_scalpel.js
@@ -0,0 +1,23 @@
+async function locateScalpel(nest) {
+  let current = nest.name;
+  for (;;) {
+    let next = await anyStorage(nest, current, "scalpel");
+    if (next == current) return current;
+    current = next;
+  }
+}
+
+function locateScalpel2(nest) {
+  function loop(current) {
+    return anyStorage(nest, current, "scalpel").then(next => {
+      if (next == current) return current;
+      else return loop(next);
+    });
+  }
+  return loop(nest.name);
+}
+
+locateScalpel(bigOak).then(console.log);
+// → Butcher's Shop
+locateScalpel2(bigOak).then(console.log);
+// → Butcher's Shop
diff --git a/src/chapter_info.mjs b/src/chapter_info.mjs
@@ -4,12 +4,11 @@
 
 import * as PJSON from "./pseudo_json.mjs"
 import * as fs from "fs"
+import * as path from "path"
 import jszip from "jszip"
 
 let output = [], failed = false;
 
-let allSolutions = fs.readdirSync("code/solutions/").filter(file => !/^(\.|2[012])/.test(file));
-
 for (let file of fs.readdirSync(".").sort()) {
   let match = /^((\d+).*).md$/.exec(file), chapNum = match && match[2];
   if (!match || chapNum == 22) continue;
@@ -36,7 +35,6 @@ for (let file of fs.readdirSync(".").sort()) {
       solution = fs.readFileSync("code/solutions/" + file, "utf8");
       extra = /^\s*<!doctype html>\s*(<base .*\n(<script src=.*\n)*)?/.exec(solution);
       if (extra) solution = solution.slice(extra[0].length);
-      allSolutions.splice(allSolutions.indexOf(file), 1);
     } catch(e) {
       console.error("File ", file, " does not exist.", e);
       failed = true;
@@ -74,6 +72,22 @@ for (let file of fs.readdirSync(".").sort()) {
   }
 
   let nodeInfo = "// Node exercises can not be ran in the browser,\n// but you can look at their solution here.\n";
+  if (chapter.number == 6) chapter.exercises.push({
+    name: "Borrowing a method [3rd ed]",
+    file: "code/solutions/06_4_borrowing_a_method.js",
+    number: "4[3]",
+    type: "js",
+    code: "let map = {one: true, two: true, hasOwnProperty: true};\n\n// Fix this call\nconsole.log(map.hasOwnProperty(\"one\"));\n// → true",
+    solution: "let map = {one: true, two: true, hasOwnProperty: true};\n\nconsole.log(Object.prototype.hasOwnProperty.call(map, \"one\"));\n// → true"
+  })
+  if (chapter.number == 11) chapter.exercises.push({
+    name: "Tracking the scalpel [3rd ed]",
+    file: "code/solutions/11_1_tracking_the_scalpel.js",
+    number: "1[3]",
+    type: "js",
+    code: "async function locateScalpel(nest) {\n  // Your code here.\n}\n\nfunction locateScalpel2(nest) {\n  // Your code here.\n}\n\nlocateScalpel(bigOak).then(console.log);\n// → Butcher Shop",
+    solution: "async function locateScalpel(nest) {\n  let current = nest.name;\n  for (;;) {\n    let next = await anyStorage(nest, current, \"scalpel\");\n    if (next == current) return current;\n    current = next;\n  }\n}\n\nfunction locateScalpel2(nest) {\n  function loop(current) {\n    return anyStorage(nest, current, \"scalpel\").then(next => {\n      if (next == current) return current;\n      else return loop(next);\n    });\n  }\n  return loop(nest.name);\n}\n\nlocateScalpel(bigOak).then(console.log);\n// → Butcher's Shop\nlocateScalpel2(bigOak).then(console.log);\n// → Butcher's Shop"
+  })
   if (chapter.number == 20) chapter.exercises = [
     {name: "Search tool",
      file: "code/solutions/20_1_search_tool.mjs",
@@ -147,8 +161,10 @@ output.push({
   ]
 });
 
-if (allSolutions.length) {
-  console.error("Solution files " + allSolutions + " were not used.");
+let usedSolutions = new Set()
+for (let ch of output) for (let ex of ch.exercises) usedSolutions.add(path.basename(ex.file).replace(/\..*/, ""))
+for (let file of fs.readdirSync("code/solutions/")) if (!usedSolutions.has(file.replace(/\..*/, ""))) {
+  console.error("Solution file " + file + " was not used.");
   failed = true;
 }
 
diff --git a/src/client/code.mjs b/src/client/code.mjs
@@ -100,6 +100,8 @@ class CodeSandbox {
       if (chapter.start_code) code += "\n\n" + chapter.start_code
       this.setEditorState(code, {include: chapter.include})
       visible = "box"
+    } else if (value == "11.1[3]") {
+      document.location = "https://eloquentjavascript.net/3rd_edition/code/#11.1"
     } else {
       let exercise = findExercise(value, chapter)
       this.setEditorState(exercise.code, {
@@ -177,7 +179,7 @@ class CodeSandbox {
 
   parseFragment() {
     let hash = document.location.hash.slice(1)
-    let valid = /^(\d+)(?:\.(\d+))?$/.exec(hash)
+    let valid = /^(\d+)(?:\.(\d+.*))?$/.exec(hash)
     let chapter, exercise
     if (valid) {
       chapter = getChapter(Number(valid[1]))
@@ -233,7 +235,7 @@ function findExercise(id, chapter) {
   let parts = id.split(".")
   if (!chapter) chapter = getChapter(parts[0])
   for (let i = 0; i < chapter.exercises.length; i++)
-    if (chapter.exercises[i].number == +parts[1])
+    if (chapter.exercises[i].number == parts[1])
       return chapter.exercises[i]
 }
 
