@bagelink/vue 1.8.7 → 1.8.12

package/dist/utils/index.d.ts

@@ -26,7 +26,7 @@ export * as bagelFormUtils from './BagelFormUtils';
 export { useForm } from './BagelFormUtils';
 export { useLang } from './lang';
 export type { ComparisonOperator, FilterCondition, LogicalOperator, QueryConditions, QueryFilter } from './queryFilter';
-export { anyOf, parseQuery, query, range, search } from './queryFilter';
+export { anyOf, parseQuery, queryFilter, range, search } from './queryFilter';
 export { formatString } from './strings';
 export declare function pathKeyToURL(pathKey?: string): string | undefined;
 export declare function getNestedValue(obj: any, path?: string, defaultValue?: any): any;

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/dist/utils/queryFilter.d.ts

@@ -57,7 +57,7 @@ export type QueryConditions<T extends Record<string, any> = Record<string, any>>
  * // → 'name eq "John" and age gt 18'
  * ```
  */
-export declare function buildQuery<T extends Record<string, any>>(conditions: QueryConditions<T>): string;
+export declare function buildQuery<T extends Record<string, any>>(conditions?: QueryConditions<T>): string;
 /**
  * Query Builder for SCIM 2.0 filtering
  */
@@ -145,22 +145,26 @@ export declare class QueryFilter<T extends Record<string, any>> {
     private formatValue;
 }
 /**
- * Build a query string from conditions
+ * Build a query string from conditions or create a chainable query builder
  *
  * @example
  * ```typescript
  * // From conditions array
- * query<Person>([
+ * queryFilter<Person>([
  *   { field: 'first_name', op: 'eq', value: 'John' },
  *   { field: 'age', op: 'gt', value: 18, connector: 'and' },
- * ])
+ * ]).build()
+ * // → 'first_name eq "John" and age gt 18'
+ *
+ * // Chainable builder
+ * queryFilter<Person>().eq('first_name', 'John').and().gt('age', 18).build()
  * // → 'first_name eq "John" and age gt 18'
  *
- * // Empty returns empty string
- * query([]) // → ''
+ * // Empty returns empty builder
+ * queryFilter() // → QueryFilter instance
  * ```
  */
-export declare function query<T extends Record<string, any>>(conditions: QueryConditions<T>): string;
+export declare function queryFilter<T extends Record<string, any>>(conditions?: QueryConditions<T>): QueryFilter<T>;
 /**
  * Create a query that checks if any of the fields match the value
  */
@@ -188,6 +192,6 @@ export declare function search<T extends Record<string, any>>(fields: Array<Deep
  * // → [{ field: 'email', op: 'pr' }]
  * ```
  */
-export declare function parseQuery<T extends Record<string, any> = Record<string, any>>(queryString: string): QueryConditions<T>;
+export declare function parseQuery<T extends Record<string, any> = Record<string, any>>(queryString?: string): QueryConditions<T>;
 export {};
 //# sourceMappingURL=queryFilter.d.ts.map

package/dist/utils/queryFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryFilter.d.ts","sourceRoot":"","sources":["../../src/utils/queryFilter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queryFilter.d.ts","sourceRoot":"","sources":["../../src/utils/queryFilter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/vue",
   "type": "module",
-  "version": "1.8.7",
+  "version": "1.8.12",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Bagel Studio",

package/src/components/Filter.vue

@@ -1,25 +1,18 @@
 <script setup lang="ts" generic="T extends Record<string, any>">
 import type { Option } from '@bagelink/vue'
-import type { ComparisonOperator } from '../utils/queryFilter'
+import type { ComparisonOperator, LogicalOperator, QueryConditions } from './queryFilter'
 import { Btn, DateInput, Dropdown, Icon, SelectInput, TextInput } from '@bagelink/vue'
 import { computed } from 'vue'
 
 type OptionsSource = Option[] | ((query: string) => Promise<Option[]>)
 type Language = 'he' | 'en'
 
-// Define missing types locally
-type QueryObject<T = Record<string, any>> = Record<string, any> & T
-interface Condition {
-	pr?: boolean
-	[operator: string]: any
-}
-
-interface FilterCondition {
+interface UICondition {
 	id: string
 	field: string
 	operator: ComparisonOperator
 	value: string
-	connector: 'and' | 'or' | ''
+	connector: LogicalOperator | ''
 }
 
 const props = defineProps<{
@@ -33,10 +26,15 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-	change: [value: QueryObject<T>]
+	change: [value: QueryConditions<T>]
 }>()
 
-const model = defineModel<QueryObject<T>>({ default: () => ({}) })
+const model = defineModel<QueryConditions<T>>({ default: () => [] })
+
+let conditionIdCounter = 0
+function generateId() {
+	return `cond_${++conditionIdCounter}_${Date.now()}`
+}
 
 // Localization data
 const texts = {
@@ -113,45 +111,27 @@ const texts = {
 // Get current language texts
 const currentTexts = computed(() => texts[props.language || 'en'])
 
-// Derive conditions directly from model (read-only view)
-const conditions = computed(() => {
-	const obj = model.value
-	if (Object.keys(obj).filter(k => !k.startsWith('_')).length === 0) {
-		return [] as FilterCondition[]
-	}
-
-	const result: FilterCondition[] = []
-	const useOr = (obj as any)._or === true
-
-	for (const [field, value] of Object.entries(obj)) {
-		if (field.startsWith('_')) continue
+// Map model conditions to UI conditions with stable IDs
+const conditionIds = new Map<number, string>()
 
-		const condition: FilterCondition = {
-			id: field, // use field as id for stability
-			field,
-			operator: 'eq',
-			value: '',
-			connector: result.length > 0 ? (useOr ? 'or' : 'and') : '',
+const conditions = computed(() => {
+	const arr = model.value || []
+	return arr.map((cond, index) => {
+		// Get or create stable ID for this index
+		if (!conditionIds.has(index)) {
+			conditionIds.set(index, generateId())
 		}
-
-		if (value !== null && value !== undefined && typeof value === 'object' && !Array.isArray(value)) {
-			const cond = value as Condition
-			if (cond.pr === true) {
-				condition.operator = 'pr'
-			} else {
-				const op = Object.keys(cond)[0] as ComparisonOperator
-				condition.operator = op
-				const val = (cond as any)[op]
-				condition.value = val === null ? 'null' : String(val)
-			}
-		} else if (value !== undefined) {
-			condition.value = value === null ? 'null' : String(value)
+		const id = conditionIds.get(index)!
+
+		const uiCond: UICondition = {
+			id,
+			field: cond.field as string,
+			operator: cond.op,
+			value: cond.value === null ? 'null' : cond.value === undefined ? '' : String(cond.value),
+			connector: index > 0 ? (cond.connector || 'and') : '',
 		}
-
-		result.push(condition)
-	}
-
-	return result
+		return uiCond
+	})
 })
 
 const allOperatorOptions = computed(() => [
@@ -191,43 +171,60 @@ const booleanOptions = computed(() => [
 	{ label: currentTexts.value.boolean.false, value: 'false' },
 ])
 
-// Update a single field in model
-function updateCondition(field: string, operator: ComparisonOperator, value: string) {
-	const newModel = { ...model.value }
-
-	let parsedValue: any = value
-	if (value === 'true') parsedValue = true
-	else if (value === 'false') parsedValue = false
-	else if (value === 'null') parsedValue = null
-	else if (!Number.isNaN(Number(value)) && value.trim() !== '') parsedValue = Number(value)
-
-	if (operator === 'eq') {
-		(newModel as any)[field] = parsedValue
-	} else if (operator === 'pr') {
-		(newModel as any)[field] = { pr: true }
-	} else {
-		(newModel as any)[field] = { [operator]: parsedValue }
-	}
+function parseValue(value: string): string | number | boolean | null {
+	if (value === 'true') return true
+	if (value === 'false') return false
+	if (value === 'null') return null
+	if (!Number.isNaN(Number(value)) && value.trim() !== '') return Number(value)
+	return value
+}
+
+function updateConditionAtIndex(index: number, updates: Partial<{ field: string, op: ComparisonOperator, value: string, connector: LogicalOperator }>) {
+	const newModel = [...model.value]
+	const existing = newModel[index]
+	if (!existing) return
 
+	const updated = { ...existing }
+	if (updates.field !== undefined) updated.field = updates.field
+	if (updates.op !== undefined) updated.op = updates.op
+	if (updates.value !== undefined) updated.value = parseValue(updates.value)
+	if (updates.connector !== undefined) updated.connector = updates.connector
+
+	newModel[index] = updated
 	model.value = newModel
 	emit('change', newModel)
 }
 
 function addCondition() {
-	const field = props.fields[0]?.value || 'new_field'
-	updateCondition(field, 'eq', '')
+	const field = props.fields[0]?.value || 'field'
+	const newCondition = {
+		field,
+		op: 'eq' as ComparisonOperator,
+		value: '' as any,
+		connector: model.value.length > 0 ? 'and' as LogicalOperator : undefined,
+	}
+	const newModel = [...model.value, newCondition]
+	model.value = newModel
+	emit('change', newModel)
 }
 
-function removeCondition(field: string) {
-	const newModel = { ...model.value }
-	Reflect.deleteProperty(newModel, field)
+function removeCondition(index: number) {
+	const newModel = [...model.value]
+	newModel.splice(index, 1)
+	// Clear connector on new first item
+	if (newModel.length > 0 && newModel[0].connector) {
+		newModel[0] = { ...newModel[0], connector: undefined }
+	}
+	// Clean up ID mapping
+	conditionIds.delete(index)
 	model.value = newModel
 	emit('change', newModel)
 }
 
 function clearAll() {
-	model.value = {} as QueryObject<T>
-	emit('change', {} as QueryObject<T>)
+	conditionIds.clear()
+	model.value = []
+	emit('change', [])
 }
 
 function getFieldType(fieldValue: string): string {
@@ -242,35 +239,28 @@ const activeFiltersCount = computed(() => {
 	return conditions.value.filter(c => Boolean(c.field) && (c.operator === 'pr' || Boolean(c.value))).length
 })
 
-// Handle field change - need to rename the key in model
-function onFieldChange(oldField: string, newField: string, condition: FilterCondition) {
-	const newModel = { ...model.value }
-	Reflect.deleteProperty(newModel, oldField)
-
-	let parsedValue: any = condition.value
-	if (condition.value === 'true') parsedValue = true
-	else if (condition.value === 'false') parsedValue = false
-	else if (condition.value === 'null') parsedValue = null
-	else if (!Number.isNaN(Number(condition.value)) && condition.value.trim() !== '') parsedValue = Number(condition.value)
-
-	if (condition.operator === 'eq') {
-		(newModel as any)[newField] = parsedValue
-	} else if (condition.operator === 'pr') {
-		(newModel as any)[newField] = { pr: true }
-	} else {
-		(newModel as any)[newField] = { [condition.operator]: parsedValue }
-	}
+function getConditionIndex(id: string): number {
+	return conditions.value.findIndex(c => c.id === id)
+}
 
-	model.value = newModel
-	emit('change', newModel)
+function onFieldChange(id: string, newField: string) {
+	const index = getConditionIndex(id)
+	if (index >= 0) updateConditionAtIndex(index, { field: newField })
+}
+
+function onOperatorChange(id: string, operator: ComparisonOperator) {
+	const index = getConditionIndex(id)
+	if (index >= 0) updateConditionAtIndex(index, { op: operator })
 }
 
-function onOperatorChange(field: string, operator: ComparisonOperator, value: string) {
-	updateCondition(field, operator, value)
+function onValueChange(id: string, value: string) {
+	const index = getConditionIndex(id)
+	if (index >= 0) updateConditionAtIndex(index, { value })
 }
 
-function onValueChange(field: string, operator: ComparisonOperator, value: string) {
-	updateCondition(field, operator, value)
+function onConnectorChange(id: string, connector: LogicalOperator) {
+	const index = getConditionIndex(id)
+	if (index >= 0) updateConditionAtIndex(index, { connector })
 }
 </script>
 
@@ -293,21 +283,31 @@ function onValueChange(field: string, operator: ComparisonOperator, value: strin
 				<TransitionGroup name="condition">
 					<div
 						v-for="(condition, index) in conditions" :key="condition.id"
-						class="grid filter-row gap-025 align-items-center p-025"
+						class="grid filter-row gap-025 align-items-center pt-025"
+						:class="{
+							'mt-025': index > 0 && condition.connector === 'or',
+							'pt-075 border-top-or': index > 0 && condition.connector === 'or',
+						}"
 					>
-						<!-- Connector (AND/OR) - display only for now -->
-						<div v-if="index > 0" class="min-w-20px">
-							<span v-if="condition.connector === 'or'" class="txt12 opacity-6">{{
-								currentTexts.connectors.or }}</span>
-							<span v-else class="txt12 opacity-6">{{ currentTexts.connectors.and }}</span>
+						<!-- Connector (AND/OR) -->
+						<div v-if="index > 0" class="min-w-60px">
+							<SelectInput
+								:model-value="condition.connector || 'and'"
+								:options="[
+									{ label: currentTexts.connectors.and, value: 'and' },
+									{ label: currentTexts.connectors.or, value: 'or' },
+								]"
+								class="m-0 and-or-select txt-12"
+								@update:model-value="(v: LogicalOperator) => onConnectorChange(condition.id, v)"
+							/>
 						</div>
-						<div v-else class="min-w-20px" />
+						<div v-else class="" />
 
 						<!-- Field selector -->
 						<SelectInput
 							:model-value="condition.field" :options="fields"
 							:placeholder="currentTexts.placeholders.selectField" class="m-0 light-input borderHover"
-							@update:model-value="(v: string) => onFieldChange(condition.field, v, condition)"
+							@update:model-value="(v: string) => onFieldChange(condition.id, v)"
 						/>
 
 						<!-- Operator selector -->
@@ -315,7 +315,7 @@ function onValueChange(field: string, operator: ComparisonOperator, value: strin
 							:model-value="condition.operator"
 							:options="getOperatorsForType(getFieldType(condition.field), !!getFieldOptions(condition.field))"
 							class="m-0 light-input borderHover"
-							@update:model-value="(v: ComparisonOperator) => onOperatorChange(condition.field, v, condition.value)"
+							@update:model-value="(v: ComparisonOperator) => onOperatorChange(condition.id, v)"
 						/>
 
 						<!-- Value input - type-specific -->
@@ -325,31 +325,31 @@ function onValueChange(field: string, operator: ComparisonOperator, value: strin
 								:options="getFieldOptions(condition.field)!"
 								:placeholder="currentTexts.placeholders.selectOption"
 								class="m-0 light-input borderHover" searchable
-								@update:model-value="(v: string) => onValueChange(condition.field, condition.operator, v)"
+								@update:model-value="(v: string) => onValueChange(condition.id, v)"
 							/>
 							<SelectInput
 								v-else-if="getFieldType(condition.field) === 'boolean'"
 								:model-value="condition.value" :options="booleanOptions"
 								:placeholder="currentTexts.placeholders.selectOption"
 								class="m-0 light-input borderHover"
-								@update:model-value="(v: string) => onValueChange(condition.field, condition.operator, v)"
+								@update:model-value="(v: string) => onValueChange(condition.id, v)"
 							/>
 							<DateInput
 								v-else-if="getFieldType(condition.field) === 'date'"
 								:model-value="condition.value" :placeholder="currentTexts.placeholders.selectDate"
 								class="m-0 light-input borderHover"
-								@update:model-value="(v: any) => onValueChange(condition.field, condition.operator, String(v))"
+								@update:model-value="(v: any) => onValueChange(condition.id, String(v))"
 							/>
 							<TextInput
 								v-else-if="getFieldType(condition.field) === 'number'"
 								:model-value="condition.value" placeholder="0" type="number"
 								class="m-0 light-input borderHover"
-								@update:model-value="(v: string) => onValueChange(condition.field, condition.operator, v)"
+								@update:model-value="(v: string) => onValueChange(condition.id, v)"
 							/>
 							<TextInput
 								v-else :model-value="condition.value"
 								:placeholder="currentTexts.placeholders.enterValue" class="m-0 light-input borderHover"
-								@update:model-value="(v: string) => onValueChange(condition.field, condition.operator, v)"
+								@update:model-value="(v: string) => onValueChange(condition.id, v)"
 							/>
 						</template>
 						<div v-else />
@@ -357,7 +357,7 @@ function onValueChange(field: string, operator: ComparisonOperator, value: strin
 						<!-- Remove button -->
 						<Btn
 							icon="close" thin flat size="small" class="m_bg-gray-40 m_px-3 m_mx-auto"
-							@click="removeCondition(condition.field)"
+							@click="removeCondition(index)"
 						/>
 					</div>
 				</TransitionGroup>
@@ -375,8 +375,20 @@ function onValueChange(field: string, operator: ComparisonOperator, value: strin
 </template>
 
 <style scoped>
+.and-or-select {
+	--input-font-size: 12px !important;
+	--input-background-color: transparent !important;
+}
+.and-or-select .selectinput-btn {
+	border: none;
+	width: 100%;
+	box-shadow: none;
+	padding: 0.25rem !important;
+	font-size: 12px !important;
+}
+
 .filter-row {
-	grid-template-columns: auto minmax(90px, 0.5fr) minmax(170px, 0.75fr) minmax(120px, 0.5fr) auto;
+	grid-template-columns: 50px minmax(90px, 0.5fr) minmax(170px, 0.75fr) minmax(120px, 0.5fr) auto;
 }
 
 /* Transition animations */

package/src/index.ts

@@ -1,3 +1,5 @@
+import './styles/bagel.css'
+
 export * from './components'
 export * from './components/form/useBagelFormState'
 export * from './composables'
@@ -14,7 +16,6 @@ export * from './types'
 export * from './utils'
 export * from './utils/allCountries'
 export * from './utils/BagelFormUtils'
-import './styles/bagel.css'
 
 export * from './utils/calendar/dateUtils'
 export * from './utils/constants'

package/src/utils/index.ts

@@ -204,7 +204,7 @@ export { useForm } from './BagelFormUtils'
 export { useLang } from './lang'
 
 export type { ComparisonOperator, FilterCondition, LogicalOperator, QueryConditions, QueryFilter } from './queryFilter'
-export { anyOf, parseQuery, query, range, search } from './queryFilter'
+export { anyOf, parseQuery, queryFilter, range, search } from './queryFilter'
 export { formatString } from './strings'
 
 const URL_REGEX = /^https?:\/\/|^\/\//

package/src/utils/queryFilter.ts

@@ -32,17 +32,17 @@ type DeepKeyOf<T> = T extends Primitive
 /**
  * SCIM 2.0 comparison operators
  */
-export type ComparisonOperator =
-	| 'eq' // equal
-	| 'ne' // not equal
-	| 'gt' // greater than
-	| 'ge' // greater than or equal
-	| 'lt' // less than
-	| 'le' // less than or equal
-	| 'co' // contains
-	| 'sw' // starts with
-	| 'ew' // ends with
-	| 'pr' // present (has value)
+export type ComparisonOperator
+	= | 'eq' // equal
+		| 'ne' // not equal
+		| 'gt' // greater than
+		| 'ge' // greater than or equal
+		| 'lt' // less than
+		| 'le' // less than or equal
+		| 'co' // contains
+		| 'sw' // starts with
+		| 'ew' // ends with
+		| 'pr' // present (has value)
 
 /**
  * SCIM 2.0 logical operators
@@ -90,7 +90,7 @@ function formatValue(value: Primitive): string {
  * ```
  */
 export function buildQuery<T extends Record<string, any>>(
-	conditions: QueryConditions<T>
+	conditions?: QueryConditions<T>
 ): string {
 	if (!conditions || conditions.length === 0) return ''
 
@@ -298,25 +298,33 @@ export class QueryFilter<T extends Record<string, any>> {
 }
 
 /**
- * Build a query string from conditions
+ * Build a query string from conditions or create a chainable query builder
  *
  * @example
  * ```typescript
  * // From conditions array
- * query<Person>([
+ * queryFilter<Person>([
  *   { field: 'first_name', op: 'eq', value: 'John' },
  *   { field: 'age', op: 'gt', value: 18, connector: 'and' },
- * ])
+ * ]).build()
+ * // → 'first_name eq "John" and age gt 18'
+ *
+ * // Chainable builder
+ * queryFilter<Person>().eq('first_name', 'John').and().gt('age', 18).build()
  * // → 'first_name eq "John" and age gt 18'
  *
- * // Empty returns empty string
- * query([]) // → ''
+ * // Empty returns empty builder
+ * queryFilter() // → QueryFilter instance
  * ```
  */
-export function query<T extends Record<string, any>>(
-	conditions: QueryConditions<T>
-): string {
-	return buildQuery(conditions)
+export function queryFilter<T extends Record<string, any>>(
+	conditions?: QueryConditions<T>
+): QueryFilter<T> {
+	const builder = new QueryFilter<T>()
+	if (conditions && conditions.length > 0) {
+		builder.raw(buildQuery(conditions))
+	}
+	return builder
 }
 
 /**
@@ -401,7 +409,7 @@ function parseValue(valueStr: string): Primitive {
  * ```
  */
 export function parseQuery<T extends Record<string, any> = Record<string, any>>(
-	queryString: string
+	queryString?: string
 ): QueryConditions<T> {
 	if (!queryString || !queryString.trim()) return []