From 4b4f6365210d1004a781f1a6a75239732573c0c1 Mon Sep 17 00:00:00 2001
From: "David A. Wheeler" <dwheeler@dwheeler.com>
Date: Wed, 29 Jan 2025 15:23:28 -0500
Subject: [PATCH 1/3] Lab oob1: Remove yaml

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
---
 docs/labs/oob1.html | 112 +-------------------------------------------
 docs/labs/oob1.js   |  66 ++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 111 deletions(-)
 create mode 100644 docs/labs/oob1.js

diff --git a/docs/labs/oob1.html b/docs/labs/oob1.html
index 2e7d202b..35f3b296 100644
--- a/docs/labs/oob1.html
+++ b/docs/labs/oob1.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="checker.css">
 <script src="js-yaml.min.js"></script>
 <script src="checker.js"></script>
+<script src="oob1.js"></script>
 <link rel="license" href="https://creativecommons.org/licenses/by/4.0/">
 
 <!-- See create_labs.md for how to create your own lab! -->
@@ -37,117 +38,6 @@
 \s*
 </script>
 
-<script id="info" type="application/yaml">
----
-hints:
-- absent: "if"
-  text: Begin with "if" as we will return 0 when there is a problem.
-- absent: |
-    \(
-  text: Need "(...)" around the condition after an if statement.
-- absent: |
-    >
-  text: Need comparison "if ( ... > ....)"
-- absent: s -> s3 -> rrec \. length
-  text: Need to compare a value with s->s3->rrec.length
-- absent: return
-  text: Need "return 0;" to skip attempts to send a too-long response.
-definitions:
-- term: NINETEEN
-  value: |
-      (1 \+ 2 \+ 16|19)
-- term: NINETEEN
-  value: |
-      (NINETEEN|\( NINETEEN \))
-- term: PAYLOAD_LENGTH
-  value: (1 \+ 2|3) \+ payload \+ 16
-- term: PAYLOAD_LENGTH
-  value: (PAYLOAD_LENGTH|payload \+ NINETEEN|NINETEEN \+ payload)
-- term: PAYLOAD_LENGTH
-  value: |
-      (PAYLOAD_LENGTH|\( PAYLOAD_LENGTH \))
-- term: RETURN0
-  value: |
-    return \s+ 0 ;
-- term: FULL_LENGTH
-  value: |
-    s -> s3 -> rrec \. length
-- term: RETURN0
-  value: |
-    (RETURN0|\{ RETURN0 \})
-# - present: "import"
-#   text: Yes, many JavaScript implementations support an import statement.
-#     However, in this exercise we will use a require form. Please use that
-#     instead.
-#   examples:
-#   - - 'import express from "express";'
-# - absent: "const"
-#   text: Start with const.
-# - absent: 'const\s+helmet ='
-#   text: Create a constant name named helmet using the form const helmet = ...
-#   examples:
-#   - - 'const'
-#   - - 'consthelmet = '
-# - present: 'require \( helmet \)'
-#   text: The parameter of a requirement statement must be string.
-#     Surround the term helment with double-quotes.
-#   examples:
-#   - - '  const helmet = require(helmet);'
-# - absent: "; $"
-#   text: JavaScript doesn''t require semicolon terminators, but the rest of
-#     the code uses them. You should try to match a coding style when modifying
-#     existing code unless there''s an important reason not to.
-#     Please update the first statment.
-#   examples:
-#   - - '  const helmet = require("helmet")'
-# - absent: '\s* app \. use \( helmet \( \{'
-#   index: 1
-#   text: Your code should begin with app.use(helmet({
-# - absent: |
-#     \s* app \. use \( helmet \( \{
-#           contentSecurityPolicy: \{ \s*
-#   index: 1
-#   text: |
-#     Your code should begin with:
-#     app.use(helmet({
-#       contentSecurityPolicy: {
-# - absent: |
-#     \s* app \. use \( helmet \( \{
-#           contentSecurityPolicy: \{
-#             directives: \{ \s*
-#   index: 1
-#   text: |
-#     Your code should begin with:
-#     app.use(helmet({
-#       contentSecurityPolicy: {
-#             directives: {
-# - absent: |
-#     \s* app \. use \( helmet \( \{
-#           contentSecurityPolicy: \{
-#             directives: \{
-#                 "script-src": \[ "'self'" , ["']https://example.com["'] \] , \s*
-#   index: 1
-#   text: |
-#     Your code should continue with:
-#     app.use(helmet({
-#       contentSecurityPolicy: {
-#             directives: {
-#               "script-src": ["'self'", "https://example.com"],
-# - absent: |
-#     "style-src": \[ "'self'" \]
-#   index: 1
-#   text: |
-#     Don't forget to include "style-src": ["'self'"]
-# - absent: '; $'
-#   index: 1
-#   text: JavaScript doesn''t require semicolon terminators, but the rest of
-#     the code uses them. You should try to match a coding style when modifying
-#     existing code unless there''s an important reason not to.
-#     Please update the second statment.
-# - text: I do not have more specific hints to provide. Please ensure that
-#     the parentheses, braces, and brackets pair correctly.
-# # debug: true
-</script>
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/oob1.js b/docs/labs/oob1.js
new file mode 100644
index 00000000..ac8337ff
--- /dev/null
+++ b/docs/labs/oob1.js
@@ -0,0 +1,66 @@
+info =
+{
+  hints: [
+    {
+      absent: "if",
+      text: "Begin with \"if\" as we will return 0 when there is a problem."
+    },
+    {
+      absent: String.raw`\(
+`,
+      text: "Need \"(...)\" around the condition after an if statement."
+    },
+    {
+      absent: ">\n",
+      text: "Need comparison \"if ( ... > ....)\""
+    },
+    {
+      absent: String.raw`s -> s3 -> rrec \. length`,
+      text: "Need to compare a value with s->s3->rrec.length"
+    },
+    {
+      absent: "return",
+      text: "Need \"return 0;\" to skip attempts to send a too-long response."
+    }
+  ],
+  definitions: [
+    {
+      term: "NINETEEN",
+      value: String.raw`(1 \+ 2 \+ 16|19)
+`
+    },
+    {
+      term: "NINETEEN",
+      value: String.raw`(NINETEEN|\( NINETEEN \))
+`
+    },
+    {
+      term: "PAYLOAD_LENGTH",
+      value: String.raw`(1 \+ 2|3) \+ payload \+ 16`
+    },
+    {
+      term: "PAYLOAD_LENGTH",
+      value: String.raw`(PAYLOAD_LENGTH|payload \+ NINETEEN|NINETEEN \+ payload)`
+    },
+    {
+      term: "PAYLOAD_LENGTH",
+      value: String.raw`(PAYLOAD_LENGTH|\( PAYLOAD_LENGTH \))
+`
+    },
+    {
+      term: "RETURN0",
+      value: String.raw`return \s+ 0 ;
+`
+    },
+    {
+      term: "FULL_LENGTH",
+      value: String.raw`s -> s3 -> rrec \. length
+`
+    },
+    {
+      term: "RETURN0",
+      value: String.raw`(RETURN0|\{ RETURN0 \})
+`
+    }
+  ]
+}

From 16f15a42d98de64af92a0999f88beb232a021efa Mon Sep 17 00:00:00 2001
From: "David A. Wheeler" <dwheeler@dwheeler.com>
Date: Wed, 29 Jan 2025 15:26:10 -0500
Subject: [PATCH 2/3] Simplify oob1.js

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
---
 docs/labs/oob1.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/docs/labs/oob1.js b/docs/labs/oob1.js
index ac8337ff..0be492f5 100644
--- a/docs/labs/oob1.js
+++ b/docs/labs/oob1.js
@@ -6,12 +6,11 @@ info =
       text: "Begin with \"if\" as we will return 0 when there is a problem."
     },
     {
-      absent: String.raw`\(
-`,
+      absent: String.raw`\(`,
       text: "Need \"(...)\" around the condition after an if statement."
     },
     {
-      absent: ">\n",
+      absent: ">",
       text: "Need comparison \"if ( ... > ....)\""
     },
     {
@@ -26,13 +25,11 @@ info =
   definitions: [
     {
       term: "NINETEEN",
-      value: String.raw`(1 \+ 2 \+ 16|19)
-`
+      value: String.raw`(1 \+ 2 \+ 16|19)`
     },
     {
       term: "NINETEEN",
-      value: String.raw`(NINETEEN|\( NINETEEN \))
-`
+      value: String.raw`(NINETEEN|\( NINETEEN \))`
     },
     {
       term: "PAYLOAD_LENGTH",
@@ -44,23 +41,19 @@ info =
     },
     {
       term: "PAYLOAD_LENGTH",
-      value: String.raw`(PAYLOAD_LENGTH|\( PAYLOAD_LENGTH \))
-`
+      value: String.raw`(PAYLOAD_LENGTH|\( PAYLOAD_LENGTH \))`
     },
     {
       term: "RETURN0",
-      value: String.raw`return \s+ 0 ;
-`
+      value: String.raw`return \s+ 0 ;`
     },
     {
       term: "FULL_LENGTH",
-      value: String.raw`s -> s3 -> rrec \. length
-`
+      value: String.raw`s -> s3 -> rrec \. length`
     },
     {
       term: "RETURN0",
-      value: String.raw`(RETURN0|\{ RETURN0 \})
-`
+      value: String.raw`(RETURN0|\{ RETURN0 \})`
     }
   ]
 }

From fd826eea845e022acf546df756bb4511b0f48412 Mon Sep 17 00:00:00 2001
From: "David A. Wheeler" <dwheeler@dwheeler.com>
Date: Wed, 29 Jan 2025 15:35:42 -0500
Subject: [PATCH 3/3] oob1: Move answers into JavaScript file

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
---
 docs/labs/oob1.html | 26 --------------------------
 docs/labs/oob1.js   | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/docs/labs/oob1.html b/docs/labs/oob1.html
index 35f3b296..9837a624 100644
--- a/docs/labs/oob1.html
+++ b/docs/labs/oob1.html
@@ -12,32 +12,6 @@
 
 <!-- See create_labs.md for how to create your own lab! -->
 
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">
-  if (1 + 2 + 16 > s->s3->rrec.length)
-    return 0;
-</script>
-<!--
--->
-<script id="expected1" type="plain/text">
-  if (1 + 2 + payload + 16 > s->s3->rrec.length)
-    return 0;
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-\s*
-  if \( (NINETEEN > FULL_LENGTH|FULL_LENGTH < NINETEEN) \)
-  RETURN0
-\s*
-</script>
-<script id="correct1" type="plain/text">
-\s*
-  if \( (PAYLOAD_LENGTH > FULL_LENGTH|FULL_LENGTH < PAYLOAD_LENGTH) \)
-  RETURN0
-\s*
-</script>
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/oob1.js b/docs/labs/oob1.js
index 0be492f5..f87acd8c 100644
--- a/docs/labs/oob1.js
+++ b/docs/labs/oob1.js
@@ -54,6 +54,34 @@ info =
     {
       term: "RETURN0",
       value: String.raw`(RETURN0|\{ RETURN0 \})`
-    }
-  ]
+    },
+  ],
+  expected: [
+    `if (1 + 2 + 16 > s->s3->rrec.length)
+       return 0;`,
+    `if (1 + 2 + payload + 16 > s->s3->rrec.length)
+      return 0;`
+  ],
+  correct: [
+    String.raw` \s*
+      if \( (NINETEEN > FULL_LENGTH|FULL_LENGTH < NINETEEN) \)
+        RETURN0 \s*`,
+    String.raw` \s*
+      if \( (PAYLOAD_LENGTH > FULL_LENGTH|FULL_LENGTH < PAYLOAD_LENGTH) \)
+        RETURN0 \s*`,
+  ],
+  successes: [
+    [
+      ` if ( s -> s3 -> rrec . length < 19 )
+         return 0 ;`,
+      ` if ( s -> s3 -> rrec . length < payload + 19 )
+         return 0;`
+    ],
+    [
+      `if(s->s3->rrec.length<19)
+         return 0 ;`,
+      `if(s->s3->rrec.length<payload+19)
+         return 0;`
+    ],
+  ],
 }