Merge pull request #45 from Llandy3d/fix-check-block-not-generating-s…

…cript

fix checks breaking codegen

src/lib/stores/blocks/codegen.ts

@@ -56,7 +56,7 @@ function emitStep(step: Step, substitutions: Substitution[]): string {
                   return `body: (r) => r.body.includes(${JSON.stringify(substitute(check.value, substitutions))})`;
               }
             })
-            .join(",")},
+            .join(",\n")},
 				})
 			`;
 

src/lib/stores/blocks/convert.ts

@@ -1,5 +1,5 @@
 import type { Environment } from "$lib/backend-client";
-import type { HttpRequestStep, Scenario, Step, Test } from "$lib/types";
+import type { Check, HttpRequestStep, Scenario, Step, Test } from "$lib/types";
 import { exhaustive } from "$lib/utils/typescript";
 import { emitScript } from "./codegen";
 import type * as loose from "./model/loose";
@@ -26,6 +26,22 @@ function toHttpRequestStep(model: model.LibraryBlock | model.HttpRequestBlock):
   };
 }
 
+function toCheck(model: model.Check): Check {
+  switch (model.type) {
+    case "status":
+      return {
+        type: "has-status",
+        status: model.value,
+      };
+
+    case "contains":
+      return {
+        type: "body-contains",
+        value: model.value,
+      };
+  }
+}
+
 function toStep(model: model.StepBlock): Step {
   switch (model.type) {
     case "group":
@@ -39,7 +55,7 @@ function toStep(model: model.StepBlock): Step {
       return {
         type: "check",
         target: toHttpRequestStep(model.target),
-        checks: [],
+        checks: model.checks.map(toCheck),
       };
 
     case "http-request":

src/lib/stores/blocks/model/strict.ts

@@ -132,7 +132,7 @@ type Check = Output<typeof check>;
 
 interface CheckBlock extends ChainableBlock {
   type: "check";
-  target: LibraryBlock;
+  target: LibraryBlock | HttpRequestBlock;
   checks: Check[];
   next: StepBlock | null;
 }
@@ -141,7 +141,7 @@ const checkBlock: BaseSchema<CheckBlock> = merge([
   blockBase,
   object({
     type: literal("check"),
-    target: libraryBlock,
+    target: union([libraryBlock, httpRequestBlock]),
     checks: array(check),
     next: nullable(lazy(() => stepBlock)),
   }),

src/lib/types.ts

@@ -65,6 +65,7 @@ interface Test {
 
 export type {
   BodyContainsCheck,
+  Check,
   CheckStep,
   Executor,
   GroupStep,