test: test unknown primitives

sanity-io · Mar 5, 2024 · d83871c · d83871c
1 parent 522bd9b
commit d83871c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 46 deletions.
diff --git a/src/typeEvaluator/evaluateQueryType.ts b/src/typeEvaluator/evaluateQueryType.ts
@@ -1,7 +1,6 @@
 import debug from 'debug'
 
 import {
-  gatherText,
   matchAnalyzePattern,
   matchText,
   matchTokenize,
@@ -28,7 +27,6 @@ import type {
   ValueNode,
 } from '../nodeTypes'
 import {parse} from '../parser'
-import {StaticValue} from '../values'
 import {handleFuncCallNode} from './functions'
 import {optimizeUnions} from './optimizations'
 import {createContext, createScope, Scope} from './scope'
@@ -194,6 +192,10 @@ function handleObjectNode(node: ObjectNode, scope: Scope) {
 function handleOpCallNode(node: OpCallNode, scope: Scope): TypeNode {
   const left = walk({node: node.left, scope})
   const right = walk({node: node.right, scope})
+  $trace('opCallNode "%s" %O', node.op, {left, right})
+  if (left.type === 'unknown' || right.type === 'unknown') {
+    return {type: 'unknown'} satisfies UnknownTypeNode
+  }
 
   switch (node.op) {
     case '==':
@@ -780,10 +782,7 @@ function isPrimitiveTypeNode(node: TypeNode): node is PrimitiveTypeNode {
 }
 
 function evaluateEquality(left: TypeNode, right: TypeNode): boolean | undefined {
-  $trace('opcall == %O', {left, right})
-  if (left.type === 'unknown' || right.type === 'unknown') {
-    return undefined
-  }
+  $trace('evaluateEquality %O', {left, right})
   if (left.type === 'null' && right.type === 'null') {
     return true
   }
@@ -822,6 +821,7 @@ function evaluateEquality(left: TypeNode, right: TypeNode): boolean | undefined
 // eslint-disable-next-line complexity, max-statements
 function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
   $trace('resolveCondition.expr %O', expr)
+
   switch (expr.type) {
     case 'Value': {
       const value = walk({node: expr, scope})
@@ -866,34 +866,26 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
       return false
     }
     case 'OpCall': {
+      const left = walk({node: expr.left, scope})
+      const right = walk({node: expr.right, scope})
+      $trace('opcall "%s" %O', expr.op, {left, right})
+
+      if (left.type === 'unknown' || right.type === 'unknown') {
+        return undefined
+      }
+
       switch (expr.op) {
         case '==': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
-          $trace('opcall == %O', {left, right})
-
           return evaluateEquality(left, right)
         }
         case '!=': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
-          $trace('opcall != %O', {left, right})
-
           const result = evaluateEquality(left, right)
           if (result === undefined) {
             return undefined
           }
           return !result
         }
         case 'in': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
-          $trace('opcall "in" %O', {left, right})
-
-          if (left.type === 'unknown' || right.type === 'unknown') {
-            return undefined
-          }
-
           if (right.type === 'array') {
             if (left.type === 'null' && right.of.type === 'unknown') {
               return undefined
@@ -932,7 +924,7 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
                     return true
                   }
                   // eslint-disable-next-line max-depth
-                  if (left.type === node.type) {
+                  if (left.type === node.type && node.value === undefined) {
                     return undefined
                   }
                 }
@@ -943,14 +935,6 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
           return false
         }
         case 'match': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
-          $trace('opcall "match" %O', {left, right})
-
-          if (left.type === 'unknown' || right.type === 'unknown') {
-            return undefined
-          }
-
           let tokens: Token[] = []
           let patterns: Pattern[] = []
           if (left.type === 'string') {
@@ -1021,12 +1005,6 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
           return matchText(tokens, patterns)
         }
         case '<': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
-          if (left.type === 'unknown' || right.type === 'unknown') {
-            return undefined
-          }
-
           if (isPrimitiveTypeNode(left) && isPrimitiveTypeNode(right)) {
             if (left.value === undefined || right.value === undefined) {
               return undefined
@@ -1037,8 +1015,6 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
           return undefined
         }
         case '<=': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
           if (isPrimitiveTypeNode(left) && isPrimitiveTypeNode(right)) {
             if (left.value === undefined || right.value === undefined) {
               return undefined
@@ -1049,8 +1025,6 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
           return undefined
         }
         case '>': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
           if (isPrimitiveTypeNode(left) && isPrimitiveTypeNode(right)) {
             if (left.value === undefined || right.value === undefined) {
               return undefined
@@ -1061,8 +1035,6 @@ function resolveCondition(expr: ExprNode, scope: Scope): boolean | undefined {
           return undefined
         }
         case '>=': {
-          const left = walk({node: expr.left, scope})
-          const right = walk({node: expr.right, scope})
           if (isPrimitiveTypeNode(left) && isPrimitiveTypeNode(right)) {
             if (left.value === undefined || right.value === undefined) {
               return undefined

diff --git a/test/evaluateQueryNode.test.ts b/test/evaluateQueryNode.test.ts
@@ -158,6 +158,7 @@ function inArray(input: AnnotatedValue[]): AnnotatedValue[] {
  * We have four different categories. This is mainly here so that we can exclude.
  */
 enum Category {
+  /** primitives + unknown. */
   PRIMITIVES,
   /** Objects of primitives + unknown. */
   OBJECTS,
@@ -178,8 +179,8 @@ const objects1InArrays = inArray(objects1)
 // object values actually have different keys. This tests a bit more stuff.
 
 const valuesForCategories: AnnotatedValue[][][] = [
-  [primitives, objects0, arrays, objects0InArrays],
-  [primitives, objects1, arrays, objects1InArrays],
+  [primitivesWithUnknown, objects0, arrays, objects0InArrays],
+  [primitivesWithUnknown, objects1, arrays, objects1InArrays],
 ]
 
 const SCHEMA: [] = []

diff --git a/test/evaluateQueryType.test.ts b/test/evaluateQueryType.test.ts
@@ -133,6 +133,12 @@ const authorDocument = {
         type: 'string',
       },
     },
+    age: {
+      type: 'objectAttribute',
+      value: {
+        type: 'number',
+      },
+    },
     object: {
       type: 'objectAttribute',
       value: {
@@ -567,7 +573,7 @@ t.test('values in projection', (t) => {
             "notEqualObject": 3 != {},
             "plus": 3 + 2,
             "plusStr": "3" + "2",
-            "plusVar": 3 + field,
+            "plusVar": 3 + age,
             "minus": 3 - 2,
             "mul": 3 * 3,
             "div": 100 / 5,
@@ -650,6 +656,7 @@ t.test('values in projection', (t) => {
           type: 'objectAttribute',
           value: {
             type: 'number',
+            value: undefined,
           },
         },
         minus: {