@dataloop-ai/components 0.20.146 → 0.20.148

package/package.json

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

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

@@ -164,7 +164,8 @@ import {
     setAliases,
     revertAliases,
     setValueAliases,
-    revertValueAliases
+    revertValueAliases,
+    isInsideQuotedString
 } from '../utils'
 import { v4 } from 'uuid'
 import {
@@ -399,14 +400,7 @@ export default defineComponent({
 
         const _normalizeInputValue = (value: string): string => {
             // Normalize logical operators (' and ' -> ' AND ', ' or ' -> ' OR ')
-            const logicalOperatorsRegEx = /\s(and|or)\s/g
-            const logicalMatch = value.match(logicalOperatorsRegEx)
-            if (logicalMatch) {
-                value = value.replace(
-                    logicalOperatorsRegEx,
-                    (_, match) => ` ${match.toUpperCase()} `
-                )
-            }
+            value = _normalizeLogicalOperators(value)
 
             // Handle typing '.' or ',' after accepting a suggestion
             const dotOrCommaRegEx = /\s+([.,]\s?)$/
@@ -434,6 +428,18 @@ export default defineComponent({
             return value
         }
 
+        const _normalizeLogicalOperators = (value: string): string => {
+            const logicalOperatorsRegEx = /\s(and|or)\s/g
+            return value.replace(
+                logicalOperatorsRegEx,
+                (match, op, offset) => {
+                    const textBeforeTheMatch = value.substring(0, offset)
+                    const isMatchInsideQuotes = isInsideQuotedString(textBeforeTheMatch)
+                    return isMatchInsideQuotes ? match : ` ${op.toUpperCase()} `
+                }
+            )
+        }
+
         const setInputFromSuggestion = (suggestion: any) => {
             const value = '' + suggestion
             let stringValue = ''
@@ -729,9 +735,7 @@ export default defineComponent({
                         .getRangeAt(0)
                         .insertNode(
                             document.createTextNode(
-                                (preceedingText.endsWith(' ') ? '' : ' ') +
-                                    text +
-                                    ' '
+                                text
                             )
                         )
                     selection.collapseToEnd()

package/src/components/compound/DlSearches/DlSmartSearch/utils/index.ts

@@ -409,3 +409,11 @@ export const isEligibleToChange = (target: HTMLElement, expanded: boolean) => {
         return [-target.clientWidth, 5]
     }
 }
+
+export const isInsideQuotedString = (textBeforePosition: string): boolean => {
+    // Count unescaped single and double quotes (using negative lookbehind to exclude escaped quotes)
+    const unescapedSingleQuotes = (textBeforePosition.match(/(?<!\\)'/g) || []).length
+    const unescapedDoubleQuotes = (textBeforePosition.match(/(?<!\\)"/g) || []).length
+    
+    return unescapedSingleQuotes % 2 === 1 || unescapedDoubleQuotes % 2 === 1
+}