@dataloop-ai/components 0.19.168 → 0.19.170

package/package.json

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

package/src/components/compound/DlSearches/DlSmartSearch/components/DlSmartSearchInput.vue

@@ -296,9 +296,11 @@ export default defineComponent({
 
             showSuggestions.value = false
 
-            // to handle typing . after accepting a suggestion
-            if (/\s+\.$/.test(value)) {
-                value = value.replace(/\s+\.$/, '.')
+            // to handle typing . or , after accepting a suggestion
+            const dotOrCommaRegEx = /\s+([\.|\,]\s?)$/
+            const dotOrCommaMatch = value.match(dotOrCommaRegEx)
+            if (dotOrCommaMatch) {
+                value = value.replace(dotOrCommaRegEx, dotOrCommaMatch[1])
             }
 
             // to handle date suggestion modal to open automatically.
@@ -589,7 +591,7 @@ export default defineComponent({
 
         const onInput = (e: Event) => {
             const text = (e.target as HTMLElement).textContent
-            if (text.endsWith('.')) {
+            if (text.endsWith('.') || text.endsWith(',')) {
                 setInputValue(text)
             } else {
                 debouncedSetInputValue.value(text)

package/src/hooks/use-suggestions.ts

@@ -96,8 +96,8 @@ const mergeWords = (words: string[]) => {
 
         if (currentItem === 'IN' || currentItem === 'NOT-IN') {
             merging = true
-            mergeIndex = i + 1
             result.push(currentItem)
+            mergeIndex = result.length
             continue
         } else if (
             Object.values(Logical).includes(currentItem as any) ||
@@ -108,9 +108,10 @@ const mergeWords = (words: string[]) => {
 
         if (merging) {
             if (!result[mergeIndex]) {
-                result[mergeIndex] = ''
+                result[mergeIndex] = currentItem
+            } else if (currentItem) {
+                result[mergeIndex] += ' ' + currentItem
             }
-            result[mergeIndex] += ' ' + currentItem
             continue
         }
 
@@ -322,6 +323,10 @@ export const useSuggestions = (
 
             localSuggestions = [Logical.AND, Logical.OR]
 
+            if (operator === operators.$in || operator === operators.$nin) {
+                localSuggestions.unshift(',')
+            }
+
             if (!keyword) continue
 
             localSuggestions = getMatches(localSuggestions, keyword)
@@ -559,10 +564,23 @@ const getOperatorByDataType = (dataType: string) => {
 const getOperators = (op: string[]) => op.map((o) => operators[o])
 
 const mapWordsToExpression = (words: string[]): Expression => {
+    let operator = words[1] ?? null
+    let value = words[2] ?? null
+
+    if (operator === operators.$in || operator === operators.$nin) {
+        if (value && /\,\s?$/.test(value)) {
+            value = ''
+        }
+    }
+
+    if (value === null) {
+        operator = null
+    }
+
     return {
         field: words[0] ?? null,
-        operator: words[1] ?? null,
-        value: words[2] ?? null,
+        operator,
+        value,
         keyword: words[3] ?? null
     }
 }