Make undefined checks more explicit

jvalue · Jan 17, 2024 · 5c479d9 · 5c479d9
1 parent 492e876
commit 5c479d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/libs/language-server/src/lib/validation/checks/composite-blocktype-definition.ts b/libs/language-server/src/lib/validation/checks/composite-blocktype-definition.ts
@@ -31,7 +31,11 @@ function checkHasPipeline(
   context: ValidationContext,
 ): void {
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if (blockType.pipes?.length === 0) {
+  if (blockType.pipes === undefined) {
+    return;
+  }
+
+  if (blockType.pipes.length === 0) {
     context.accept(
       'error',
       `Composite blocktypes must define one pipeline '${blockType.name}'`,
@@ -48,7 +52,11 @@ function checkExactlyOnePipeline(
   context: ValidationContext,
 ): void {
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if (blockType.pipes?.length > 1) {
+  if (blockType.pipes === undefined) {
+    return;
+  }
+
+  if (blockType.pipes.length > 1) {
     blockType.pipes.forEach((pipe) => {
       context.accept(
         'error',
@@ -87,7 +95,7 @@ function doCheckDefinedBlockIsUsed(
   context: ValidationContext,
 ): void {
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if (!BlockTypeWrapper.canBeWrapped(block?.type)) {
+  if (block.type === undefined || !BlockTypeWrapper.canBeWrapped(block.type)) {
     return;
   }
   const pipes = pipelineWrapper.astNode.pipes;

diff --git a/libs/language-server/src/lib/validation/checks/pipeline-definition.ts b/libs/language-server/src/lib/validation/checks/pipeline-definition.ts
@@ -144,7 +144,7 @@ function doCheckDefinedBlockIsUsed(
   context: ValidationContext,
 ): void {
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if (!BlockTypeWrapper.canBeWrapped(block?.type)) {
+  if (block.type === undefined || !BlockTypeWrapper.canBeWrapped(block.type)) {
     return;
   }
   const blockType = new BlockTypeWrapper(block.type);