Simplify checking for incorrect extractor and loader blocks

jvalue · Jan 16, 2024 · 8e68450 · 8e68450
1 parent 00867cd
commit 8e68450
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/libs/language-server/src/lib/validation/checks/block-definition.ts b/libs/language-server/src/lib/validation/checks/block-definition.ts
@@ -40,24 +40,6 @@ function checkPipesOfBlock(
   const blockType = new BlockTypeWrapper(block?.type);
   const pipes = collectPipes(block, whatToCheck);
 
-  const isStartOrEnd =
-    (whatToCheck === 'input' && !blockType.hasInput()) ||
-    (whatToCheck === 'output' && !blockType.hasOutput());
-  if (isStartOrEnd) {
-    if (pipes.length > 0) {
-      for (const pipe of pipes) {
-        context.accept(
-          'error',
-          `Blocks of type ${blockType.type} do not have an ${whatToCheck}`,
-          whatToCheck === 'input'
-            ? pipe.getToDiagnostic()
-            : pipe.getFromDiagnostic(),
-        );
-      }
-    }
-    return;
-  }
-
   const hasMultipleInputPorts = pipes.length > 1 && whatToCheck === 'input';
   if (hasMultipleInputPorts) {
     for (const pipe of pipes) {
@@ -70,8 +52,6 @@ function checkPipesOfBlock(
     return;
   }
 
-  // above: there should be pipes (defined by blocktype)
-  // but there aren't any
   if (pipes.length === 0) {
     const isLastBlockOfCompositeBlocktype =
       isCompositeBlocktypeDefinition(block.$container) &&
@@ -81,9 +61,18 @@ function checkPipesOfBlock(
       isCompositeBlocktypeDefinition(block.$container) &&
       block.$container.blocks.at(0)?.name === block.name;
 
+    const isExtractorBlock = !blockType.hasInput();
+    const isLoaderBlock = !blockType.hasOutput();
+
     // exception: the first block in a composite block is connected to the input, not another block
     // exception: The last block in a composite block is connected to the output, not another block
-    if (!isLastBlockOfCompositeBlocktype && !isFirstBlockOfCompositeBlocktype) {
+    // exception: the extractor / loader block in a pipeline
+    if (
+      !isLastBlockOfCompositeBlocktype &&
+      !isFirstBlockOfCompositeBlocktype &&
+      !isExtractorBlock &&
+      !isLoaderBlock
+    ) {
       context.accept(
         'warning',
         `A pipe should be connected to the ${whatToCheck} of this block`,

diff --git a/libs/language-server/src/lib/validation/checks/pipe-definition.ts b/libs/language-server/src/lib/validation/checks/pipe-definition.ts
@@ -37,12 +37,10 @@ function checkBlockCompatibility(
     const fromBlockType = new BlockTypeWrapper(fromBlockTypeDefinition);
     const toBlockType = new BlockTypeWrapper(toBlockTypeDefinition);
 
-    if (fromBlockType.hasOutput() && toBlockType.hasInput()) {
-      if (!fromBlockType.canBeConnectedTo(toBlockType)) {
-        const errorMessage = `The output type "${fromBlockType.outputType}" of ${fromBlockType.type} is incompatible with the input type "${toBlockType.inputType}" of ${toBlockType.type}`;
-        context.accept('error', errorMessage, pipeWrapper.getFromDiagnostic());
-        context.accept('error', errorMessage, pipeWrapper.getToDiagnostic());
-      }
+    if (!fromBlockType.canBeConnectedTo(toBlockType)) {
+      const errorMessage = `The output type "${fromBlockType.outputType}" of ${fromBlockType.type} is incompatible with the input type "${toBlockType.inputType}" of ${toBlockType.type}`;
+      context.accept('error', errorMessage, pipeWrapper.getFromDiagnostic());
+      context.accept('error', errorMessage, pipeWrapper.getToDiagnostic());
     }
   }
 }