Lab input1: Move answers into JavaScript

david-a-wheeler · david-a-wheeler · commit fe493786f720 · 2025-01-29T15:49:29.000-05:00
Signed-off-by: David A. Wheeler &lt;dwheeler@dwheeler.com&gt;
diff --git a/docs/labs/input1.html b/docs/labs/input1.html
@@ -12,17 +12,6 @@
 
 <!-- See create_labs.md for how to create your own lab! -->
 
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">
-  query('id').isInt({min: 1, max: 9999}),
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-\s* query \( ('id'|"id"|`id`) \) \.
-    isInt \( \{ min: 1 , max: 9_?999 ,? \} \) , \s*
-</script>
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/input1.js b/docs/labs/input1.js
@@ -88,6 +88,13 @@ info =
       ]
     }
   ],
+  expected: [
+    "query('id').isInt({min: 1, max: 9999}),"
+  ],
+  correct: [
+     String.raw`\s* query \( ('id'|"id"|${BACKQUOTE}id${BACKQUOTE}) \) \.
+                \s* isInt \( \{ min: 1 , max: 9_?999 ,? \} \) , \s*`
+  ],
   successes: [
     [ " query ( 'id' ) . isInt ( {min: 1 , max: 9999 } ) ," ],
     [ " query ( `id` ) . isInt ( {min: 1 , max: 9_999 } ) ,   " ],

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,13 @@ info =`
`88`	`88`	`]`
`89`	`89`	`}`
`90`	`90`	`],`
	`91`	`+ expected: [`
	`92`	`+ "query('id').isInt({min: 1, max: 9999}),"`
	`93`	`+ ],`
	`94`	`+ correct: [`
	`95`	+ String.raw`\s* query \( ('id'\|"id"\|${BACKQUOTE}id${BACKQUOTE}) \) \.
	`96`	+ \s* isInt \( \{ min: 1 , max: 9_?999 ,? \} \) , \s*`
	`97`	`+ ],`
`91`	`98`	`successes: [`
`92`	`99`	`[ " query ( 'id' ) . isInt ( {min: 1 , max: 9999 } ) ," ],`
`93`	`100`	[ " query ( `id` ) . isInt ( {min: 1 , max: 9_999 } ) , " ],