@dataloop-ai/components 0.19.161 → 0.19.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.19.161",
+  "version": "0.19.163",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/hooks/use-suggestions.ts

@@ -123,7 +123,11 @@ const mergeWords = (words: string[]) => {
 export const useSuggestions = (
     schema: Ref<Schema>,
     aliases: Ref<Alias[]>,
-    options: { strict?: Ref<boolean>; forbiddenKeys?: Ref<string[]>; omitSuggestions?: Ref<string[]> } = {}
+    options: {
+        strict?: Ref<boolean>
+        forbiddenKeys?: Ref<string[]>
+        omitSuggestions?: Ref<string[]>
+    } = {}
 ) => {
     const { strict, forbiddenKeys, omitSuggestions } = options
     const aliasesArray = aliases.value ?? []
@@ -159,7 +163,10 @@ export const useSuggestions = (
         const expressions = mapWordsToExpressions(mergedWords)
 
         error.value = input.length
-            ? getError(schemaValue, aliasesArray, expressions, { strict, forbiddenKeys })
+            ? getError(schemaValue, aliasesArray, expressions, {
+                  strict,
+                  forbiddenKeys
+              })
             : null
     }
 
@@ -191,7 +198,9 @@ export const useSuggestions = (
             if (!matchedField && isNextCharSpace(input, field)) {
                 localSuggestions =
                     value && input.endsWith(space)
-                        ? [Logical.AND, Logical.OR]
+                        ? keyword
+                            ? sortedSuggestions
+                            : [Logical.AND, Logical.OR]
                         : []
                 continue
             }
@@ -274,19 +283,25 @@ export const useSuggestions = (
             }
 
             if (Array.isArray(dataType)) {
-                localSuggestions = dataType
-                    .filter(
-                        (type) =>
-                            !knownDataTypes.includes(type as string) &&
-                            typeof type !== 'object'
-                    )
-                    .map((type) =>
-                        typeof type === 'string' ? `'${type}'` : type
-                    ) as string[]
+                const filteredTypes = dataType.filter(
+                    (type) => !knownDataTypes.includes(type as string)
+                )
+                const mappedTypes: string[] = []
+                for (const type of filteredTypes) {
+                    if (typeof type === 'string') {
+                        mappedTypes.push(`'${type}'`)
+                    } else if (typeof type === 'object') {
+                        mappedTypes.push(
+                            ...Object.keys(type).map((key) => `'${key}'`)
+                        )
+                    } else {
+                        mappedTypes.push(type)
+                    }
+                }
 
                 if (!value) continue
 
-                localSuggestions = getMatches(localSuggestions, value)
+                localSuggestions = getMatches(mappedTypes, value)
             } else if (
                 dataType === 'datetime' ||
                 dataType === 'date' ||
@@ -362,7 +377,7 @@ const getError = (
     schema: Schema,
     aliases: Alias[],
     expressions: Expression[],
-    options: { strict?: Ref<boolean>; forbiddenKeys?: Ref<string[]>; } = {}
+    options: { strict?: Ref<boolean>; forbiddenKeys?: Ref<string[]> } = {}
 ): string | null => {
     const { strict, forbiddenKeys } = options
     const hasErrorInStructure = expressions
@@ -438,7 +453,7 @@ const getError = (
                 return (acc = errors.INVALID_VALUE(field))
             }
 
-            return (acc === 'warning' ? acc : acc = null)
+            return acc === 'warning' ? acc : (acc = null)
         }, null)
 }
 
@@ -628,10 +643,12 @@ const getValueMatch = (
     }
     return null
 }
-const getMatches = (strArr: string[], str: string | number | boolean) =>
-    strArr.filter((val) =>
+const getMatches = (strArr: string[], str: string | number | boolean) => {
+    const filtered = strArr.filter((val) =>
         insensitive(val.toString()).includes(insensitive(str.toString()))
     )
+    return filtered
+}
 
 const isNextCharSpace = (input: string, str: string) => {
     const insensitiveInput = insensitive(input)