test(query): align paramaters index when using identifiers

Signed-off-by: Vladislav Polyakov <[email protected]>

Author: polRk

packages/query/src/yql.ts

@@ -18,14 +18,16 @@ export function yql<P extends any[] = unknown[]>(
 	let params: Record<string, Value> = Object.assign({}, null)
 
 	if (Array.isArray(values)) {
+		let skip: number = 0
 		values.forEach((value, i) => {
 			if (value[SymbolUnsafe]) {
+				skip += 1
 				return
 			}
 
 			let ydbValue = isObject(value) && 'type' in value && 'kind' in value['type'] ? value : fromJs(value)
 
-			params[`$p${i}`] = ydbValue
+			params[`$p${i - skip}`] = ydbValue
 		})
 	}
 
@@ -34,10 +36,14 @@ export function yql<P extends any[] = unknown[]>(
 	}
 
 	if (Array.isArray(strings)) {
+		let skip: number = 0
 		text += strings.reduce((prev, curr, i) => {
 			let value = values[i]
+			if (value && value[SymbolUnsafe]) {
+				skip += 1
+			}
 
-			return prev + curr + (value ? value[SymbolUnsafe] ? value.toString() : `$p${i}` : '')
+			return prev + curr + (value ? value[SymbolUnsafe] ? value.toString() : `$p${i - skip}` : '')
 		}, '')
 	}
 

packages/query/tests/yql.test.ts

@@ -1,7 +1,7 @@
 import { expect, test } from 'vitest'
 
 import { Int32 } from '@ydbjs/value/primitive'
-import { table, yql } from '../dist/esm/yql.js'
+import { identifier, yql } from '../dist/esm/yql.js'
 
 test('string', () => {
 	let { text } = yql`SELECT 1;`
@@ -37,17 +37,17 @@ test('string with ydb value as parameter', () => {
 	`)
 })
 
-test('string with parameter and unsafe', () => {
-	let { text, params } = yql`FROM ${table('my_table')} SELECT ${1}, ${2};`
+test('string with parameters and identifiers', () => {
+	let { text, params } = yql`FROM ${identifier('my_table')}.${identifier('my_column')} SELECT ${1}, ${2};`
 
-	expect(text).eq('FROM `my_table` SELECT $p1, $p2;')
+	expect(text).eq('FROM `my_table`.`my_column` SELECT $p0, $p1;')
 	expect(params).toMatchInlineSnapshot(`
 		{
-		  "$p1": Int32 {
+		  "$p0": Int32 {
 		    "type": Int32Type {},
 		    "value": 1,
 		  },
-		  "$p2": Int32 {
+		  "$p1": Int32 {
 		    "type": Int32Type {},
 		    "value": 2,
 		  },