check the type

algolia · Jan 23, 2025 · 110aa81 · 110aa81
1 parent de89966
commit 110aa81
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/eslint/src/rules/hasType.ts b/eslint/src/rules/hasType.ts
@@ -1,6 +1,6 @@
 import { createRule } from 'eslint-plugin-yml/lib/utils';
 
-import { isPairWithKey } from '../utils.js';
+import { isPairWithKey, isPairWithValue } from '../utils.js';
 
 export const hasType = createRule('hasType', {
   meta: {
@@ -27,15 +27,15 @@ export const hasType = createRule('hasType', {
           return; // allow everything in properties
         }
 
-        const hasType = !!node.parent.pairs.find((pair) => isPairWithKey(pair, 'type'));
-        if (isPairWithKey(node, 'properties') && !hasType) {
+        const type = node.parent.pairs.find((pair) => isPairWithKey(pair, 'type'));
+        if (isPairWithKey(node, 'properties') && (!type || !isPairWithValue(type, 'object'))) {
           return context.report({
             node: node as any,
             messageId: 'hasType',
           });
         }
 
-        if (isPairWithKey(node, 'items') && !hasType) {
+        if (isPairWithKey(node, 'items') && (!type || !isPairWithValue(type, 'array'))) {
           return context.report({
             node: node as any,
             messageId: 'hasType',

diff --git a/eslint/src/utils.ts b/eslint/src/utils.ts
@@ -26,6 +26,13 @@ export function isPairWithKey(node: AST.YAMLNode | null, key: string): node is A
   return isScalar(node.key) && node.key.value === key;
 }
 
+export function isPairWithValue(node: AST.YAMLNode | null, value: string): node is AST.YAMLPair {
+  if (node === null || node.type !== 'YAMLPair' || node.value === null) {
+    return false;
+  }
+  return isScalar(node.value) && node.value.value === value;
+}
+
 export function isNullable(node: AST.YAMLNode | null): boolean {
   return (
     isSequence(node) &&

diff --git a/eslint/tests/hasType.test.ts b/eslint/tests/hasType.test.ts
@@ -33,6 +33,16 @@ simple:
       },
       {
         code: `
+wrongType:
+  type: string
+  properties:
+    noType:
+      type: string
+    `,
+        errors: [{ messageId: 'hasType' }],
+      },
+      {
+        code: `
 array:
   items:
     type: string