Skip to content

Commit d5be8fa

Browse files
tobyhedetobyhede
committed
test(stack): migrate v3-matrix suite to eql/v3 types namespace
The v3-matrix domain suite (catalog.ts + matrix tests) landed on the base branch via PR #540 after this branch was cut, and used the pre-refactor `@/schema/v3` path and `encrypted<Domain>Column` factories. Retarget it to `@/eql/v3` and the `types.*` namespace so the base's matrix coverage keeps working on top of the refactor. `EqlTypeForColumn` (which #540's catalog.ts consumes) is preserved — ported into eql/v3/columns.ts and re-exported from the barrel during the rebase. Post-rebase reconciliation only; no behavior change.
1 parent 2856315 commit d5be8fa

7 files changed

Lines changed: 52 additions & 106 deletions

File tree

‎packages/stack/__tests__/v3-matrix/catalog.ts‎

Lines changed: 40 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
* instanceof check, `castAs` + `indexes` by the `build()` `toStrictEqual`, and
1717
* `capabilities` by `getQueryCapabilities()`/`isQueryable()`.
1818
*/
19-
import type { ColumnSchema } from '@/schema'
19+
2020
import type {
2121
AnyEncryptedV3Column,
2222
EqlTypeForColumn,
2323
QueryCapabilities,
24-
} from '@/schema/v3'
24+
} from '@/eql/v3'
2525
import {
2626
EncryptedBoolColumn,
2727
EncryptedDateColumn,
@@ -58,42 +58,9 @@ import {
5858
EncryptedTimestamptzEqColumn,
5959
EncryptedTimestamptzOrdColumn,
6060
EncryptedTimestamptzOrdOreColumn,
61-
encryptedBoolColumn,
62-
encryptedDateColumn,
63-
encryptedDateEqColumn,
64-
encryptedDateOrdColumn,
65-
encryptedDateOrdOreColumn,
66-
encryptedFloat4Column,
67-
encryptedFloat4EqColumn,
68-
encryptedFloat4OrdColumn,
69-
encryptedFloat4OrdOreColumn,
70-
encryptedFloat8Column,
71-
encryptedFloat8EqColumn,
72-
encryptedFloat8OrdColumn,
73-
encryptedFloat8OrdOreColumn,
74-
encryptedInt2Column,
75-
encryptedInt2EqColumn,
76-
encryptedInt2OrdColumn,
77-
encryptedInt2OrdOreColumn,
78-
encryptedInt4Column,
79-
encryptedInt4EqColumn,
80-
encryptedInt4OrdColumn,
81-
encryptedInt4OrdOreColumn,
82-
encryptedNumericColumn,
83-
encryptedNumericEqColumn,
84-
encryptedNumericOrdColumn,
85-
encryptedNumericOrdOreColumn,
86-
encryptedTextColumn,
87-
encryptedTextEqColumn,
88-
encryptedTextMatchColumn,
89-
encryptedTextOrdColumn,
90-
encryptedTextOrdOreColumn,
91-
encryptedTextSearchColumn,
92-
encryptedTimestamptzColumn,
93-
encryptedTimestamptzEqColumn,
94-
encryptedTimestamptzOrdColumn,
95-
encryptedTimestamptzOrdOreColumn,
96-
} from '@/schema/v3'
61+
types,
62+
} from '@/eql/v3'
63+
import type { ColumnSchema } from '@/schema'
9764

9865
/**
9966
* The canonical union of every v3 domain name — derived STRAIGHT from the real
@@ -223,47 +190,47 @@ const NUM_ERR = [
223190
// biome-ignore format: one row per domain reads as a table; keep it dense.
224191
export const V3_MATRIX = {
225192
// int4
226-
'eql_v3.int4': { builder: encryptedInt4Column, ColumnClass: EncryptedInt4Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: INT4_S, errorSamples: NUM_ERR },
227-
'eql_v3.int4_eq': { builder: encryptedInt4EqColumn, ColumnClass: EncryptedInt4EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: INT4_S, errorSamples: NUM_ERR },
228-
'eql_v3.int4_ord_ore': { builder: encryptedInt4OrdOreColumn, ColumnClass: EncryptedInt4OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT4_S, errorSamples: NUM_ERR },
229-
'eql_v3.int4_ord': { builder: encryptedInt4OrdColumn, ColumnClass: EncryptedInt4OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT4_S, errorSamples: NUM_ERR },
193+
'eql_v3.int4': { builder: types.Int4, ColumnClass: EncryptedInt4Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: INT4_S, errorSamples: NUM_ERR },
194+
'eql_v3.int4_eq': { builder: types.Int4Eq, ColumnClass: EncryptedInt4EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: INT4_S, errorSamples: NUM_ERR },
195+
'eql_v3.int4_ord_ore': { builder: types.Int4OrdOre, ColumnClass: EncryptedInt4OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT4_S, errorSamples: NUM_ERR },
196+
'eql_v3.int4_ord': { builder: types.Int4Ord, ColumnClass: EncryptedInt4OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT4_S, errorSamples: NUM_ERR },
230197
// int2
231-
'eql_v3.int2': { builder: encryptedInt2Column, ColumnClass: EncryptedInt2Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: INT2_S, errorSamples: NUM_ERR },
232-
'eql_v3.int2_eq': { builder: encryptedInt2EqColumn, ColumnClass: EncryptedInt2EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: INT2_S, errorSamples: NUM_ERR },
233-
'eql_v3.int2_ord_ore': { builder: encryptedInt2OrdOreColumn, ColumnClass: EncryptedInt2OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT2_S, errorSamples: NUM_ERR },
234-
'eql_v3.int2_ord': { builder: encryptedInt2OrdColumn, ColumnClass: EncryptedInt2OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT2_S, errorSamples: NUM_ERR },
198+
'eql_v3.int2': { builder: types.Int2, ColumnClass: EncryptedInt2Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: INT2_S, errorSamples: NUM_ERR },
199+
'eql_v3.int2_eq': { builder: types.Int2Eq, ColumnClass: EncryptedInt2EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: INT2_S, errorSamples: NUM_ERR },
200+
'eql_v3.int2_ord_ore': { builder: types.Int2OrdOre, ColumnClass: EncryptedInt2OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT2_S, errorSamples: NUM_ERR },
201+
'eql_v3.int2_ord': { builder: types.Int2Ord, ColumnClass: EncryptedInt2OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: INT2_S, errorSamples: NUM_ERR },
235202
// date
236-
'eql_v3.date': { builder: encryptedDateColumn, ColumnClass: EncryptedDateColumn, castAs: 'date', capabilities: STORAGE, indexes: NONE, samples: DATE_S },
237-
'eql_v3.date_eq': { builder: encryptedDateEqColumn, ColumnClass: EncryptedDateEqColumn, castAs: 'date', capabilities: EQ, indexes: UNIQUE_IDX, samples: DATE_S },
238-
'eql_v3.date_ord_ore': { builder: encryptedDateOrdOreColumn, ColumnClass: EncryptedDateOrdOreColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
239-
'eql_v3.date_ord': { builder: encryptedDateOrdColumn, ColumnClass: EncryptedDateOrdColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
203+
'eql_v3.date': { builder: types.Date, ColumnClass: EncryptedDateColumn, castAs: 'date', capabilities: STORAGE, indexes: NONE, samples: DATE_S },
204+
'eql_v3.date_eq': { builder: types.DateEq, ColumnClass: EncryptedDateEqColumn, castAs: 'date', capabilities: EQ, indexes: UNIQUE_IDX, samples: DATE_S },
205+
'eql_v3.date_ord_ore': { builder: types.DateOrdOre, ColumnClass: EncryptedDateOrdOreColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
206+
'eql_v3.date_ord': { builder: types.DateOrd, ColumnClass: EncryptedDateOrdColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
240207
// timestamptz
241-
'eql_v3.timestamptz': { builder: encryptedTimestamptzColumn, ColumnClass: EncryptedTimestamptzColumn, castAs: 'date', capabilities: STORAGE, indexes: NONE, samples: DATE_S },
242-
'eql_v3.timestamptz_eq': { builder: encryptedTimestamptzEqColumn, ColumnClass: EncryptedTimestamptzEqColumn, castAs: 'date', capabilities: EQ, indexes: UNIQUE_IDX, samples: DATE_S },
243-
'eql_v3.timestamptz_ord_ore': { builder: encryptedTimestamptzOrdOreColumn, ColumnClass: EncryptedTimestamptzOrdOreColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
244-
'eql_v3.timestamptz_ord': { builder: encryptedTimestamptzOrdColumn, ColumnClass: EncryptedTimestamptzOrdColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
208+
'eql_v3.timestamptz': { builder: types.Timestamptz, ColumnClass: EncryptedTimestamptzColumn, castAs: 'date', capabilities: STORAGE, indexes: NONE, samples: DATE_S },
209+
'eql_v3.timestamptz_eq': { builder: types.TimestamptzEq, ColumnClass: EncryptedTimestamptzEqColumn, castAs: 'date', capabilities: EQ, indexes: UNIQUE_IDX, samples: DATE_S },
210+
'eql_v3.timestamptz_ord_ore': { builder: types.TimestamptzOrdOre, ColumnClass: EncryptedTimestamptzOrdOreColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
211+
'eql_v3.timestamptz_ord': { builder: types.TimestamptzOrd, ColumnClass: EncryptedTimestamptzOrdColumn, castAs: 'date', capabilities: ORD, indexes: ORE_IDX, samples: DATE_S },
245212
// numeric
246-
'eql_v3.numeric': { builder: encryptedNumericColumn, ColumnClass: EncryptedNumericColumn, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: NUMERIC_S, errorSamples: NUM_ERR },
247-
'eql_v3.numeric_eq': { builder: encryptedNumericEqColumn, ColumnClass: EncryptedNumericEqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: NUMERIC_S, errorSamples: NUM_ERR },
248-
'eql_v3.numeric_ord_ore': { builder: encryptedNumericOrdOreColumn, ColumnClass: EncryptedNumericOrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: NUMERIC_S, errorSamples: NUM_ERR },
249-
'eql_v3.numeric_ord': { builder: encryptedNumericOrdColumn, ColumnClass: EncryptedNumericOrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: NUMERIC_S, errorSamples: NUM_ERR },
213+
'eql_v3.numeric': { builder: types.Numeric, ColumnClass: EncryptedNumericColumn, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: NUMERIC_S, errorSamples: NUM_ERR },
214+
'eql_v3.numeric_eq': { builder: types.NumericEq, ColumnClass: EncryptedNumericEqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: NUMERIC_S, errorSamples: NUM_ERR },
215+
'eql_v3.numeric_ord_ore': { builder: types.NumericOrdOre, ColumnClass: EncryptedNumericOrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: NUMERIC_S, errorSamples: NUM_ERR },
216+
'eql_v3.numeric_ord': { builder: types.NumericOrd, ColumnClass: EncryptedNumericOrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: NUMERIC_S, errorSamples: NUM_ERR },
250217
// text
251-
'eql_v3.text': { builder: encryptedTextColumn, ColumnClass: EncryptedTextColumn, castAs: 'string', capabilities: STORAGE, indexes: NONE, samples: TEXT_S },
252-
'eql_v3.text_eq': { builder: encryptedTextEqColumn, ColumnClass: EncryptedTextEqColumn, castAs: 'string', capabilities: EQ, indexes: UNIQUE_IDX, samples: TEXT_S },
253-
'eql_v3.text_match': { builder: encryptedTextMatchColumn, ColumnClass: EncryptedTextMatchColumn, castAs: 'string', capabilities: MATCH_ONLY, indexes: MATCH_IDX, samples: TEXT_S },
254-
'eql_v3.text_ord_ore': { builder: encryptedTextOrdOreColumn, ColumnClass: EncryptedTextOrdOreColumn, castAs: 'string', capabilities: ORD, indexes: ORE_IDX, samples: TEXT_S },
255-
'eql_v3.text_ord': { builder: encryptedTextOrdColumn, ColumnClass: EncryptedTextOrdColumn, castAs: 'string', capabilities: ORD, indexes: ORE_IDX, samples: TEXT_S },
256-
'eql_v3.text_search': { builder: encryptedTextSearchColumn, ColumnClass: EncryptedTextSearchColumn, castAs: 'string', capabilities: FULL, indexes: TEXT_SEARCH_IDX, samples: TEXT_S },
218+
'eql_v3.text': { builder: types.Text, ColumnClass: EncryptedTextColumn, castAs: 'string', capabilities: STORAGE, indexes: NONE, samples: TEXT_S },
219+
'eql_v3.text_eq': { builder: types.TextEq, ColumnClass: EncryptedTextEqColumn, castAs: 'string', capabilities: EQ, indexes: UNIQUE_IDX, samples: TEXT_S },
220+
'eql_v3.text_match': { builder: types.TextMatch, ColumnClass: EncryptedTextMatchColumn, castAs: 'string', capabilities: MATCH_ONLY, indexes: MATCH_IDX, samples: TEXT_S },
221+
'eql_v3.text_ord_ore': { builder: types.TextOrdOre, ColumnClass: EncryptedTextOrdOreColumn, castAs: 'string', capabilities: ORD, indexes: ORE_IDX, samples: TEXT_S },
222+
'eql_v3.text_ord': { builder: types.TextOrd, ColumnClass: EncryptedTextOrdColumn, castAs: 'string', capabilities: ORD, indexes: ORE_IDX, samples: TEXT_S },
223+
'eql_v3.text_search': { builder: types.TextSearch, ColumnClass: EncryptedTextSearchColumn, castAs: 'string', capabilities: FULL, indexes: TEXT_SEARCH_IDX, samples: TEXT_S },
257224
// bool
258-
'eql_v3.bool': { builder: encryptedBoolColumn, ColumnClass: EncryptedBoolColumn, castAs: 'boolean', capabilities: STORAGE, indexes: NONE, samples: BOOL_S },
225+
'eql_v3.bool': { builder: types.Bool, ColumnClass: EncryptedBoolColumn, castAs: 'boolean', capabilities: STORAGE, indexes: NONE, samples: BOOL_S },
259226
// float4
260-
'eql_v3.float4': { builder: encryptedFloat4Column, ColumnClass: EncryptedFloat4Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: FLOAT4_S, errorSamples: NUM_ERR },
261-
'eql_v3.float4_eq': { builder: encryptedFloat4EqColumn, ColumnClass: EncryptedFloat4EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: FLOAT4_S, errorSamples: NUM_ERR },
262-
'eql_v3.float4_ord_ore': { builder: encryptedFloat4OrdOreColumn, ColumnClass: EncryptedFloat4OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT4_S, errorSamples: NUM_ERR },
263-
'eql_v3.float4_ord': { builder: encryptedFloat4OrdColumn, ColumnClass: EncryptedFloat4OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT4_S, errorSamples: NUM_ERR },
227+
'eql_v3.float4': { builder: types.Float4, ColumnClass: EncryptedFloat4Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: FLOAT4_S, errorSamples: NUM_ERR },
228+
'eql_v3.float4_eq': { builder: types.Float4Eq, ColumnClass: EncryptedFloat4EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: FLOAT4_S, errorSamples: NUM_ERR },
229+
'eql_v3.float4_ord_ore': { builder: types.Float4OrdOre, ColumnClass: EncryptedFloat4OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT4_S, errorSamples: NUM_ERR },
230+
'eql_v3.float4_ord': { builder: types.Float4Ord, ColumnClass: EncryptedFloat4OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT4_S, errorSamples: NUM_ERR },
264231
// float8
265-
'eql_v3.float8': { builder: encryptedFloat8Column, ColumnClass: EncryptedFloat8Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: FLOAT8_S, errorSamples: NUM_ERR },
266-
'eql_v3.float8_eq': { builder: encryptedFloat8EqColumn, ColumnClass: EncryptedFloat8EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: FLOAT8_S, errorSamples: NUM_ERR },
267-
'eql_v3.float8_ord_ore': { builder: encryptedFloat8OrdOreColumn, ColumnClass: EncryptedFloat8OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT8_S, errorSamples: NUM_ERR },
268-
'eql_v3.float8_ord': { builder: encryptedFloat8OrdColumn, ColumnClass: EncryptedFloat8OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT8_S, errorSamples: NUM_ERR },
232+
'eql_v3.float8': { builder: types.Float8, ColumnClass: EncryptedFloat8Column, castAs: 'number', capabilities: STORAGE, indexes: NONE, samples: FLOAT8_S, errorSamples: NUM_ERR },
233+
'eql_v3.float8_eq': { builder: types.Float8Eq, ColumnClass: EncryptedFloat8EqColumn, castAs: 'number', capabilities: EQ, indexes: UNIQUE_IDX, samples: FLOAT8_S, errorSamples: NUM_ERR },
234+
'eql_v3.float8_ord_ore': { builder: types.Float8OrdOre, ColumnClass: EncryptedFloat8OrdOreColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT8_S, errorSamples: NUM_ERR },
235+
'eql_v3.float8_ord': { builder: types.Float8Ord, ColumnClass: EncryptedFloat8OrdColumn, castAs: 'number', capabilities: ORD, indexes: ORE_IDX, samples: FLOAT8_S, errorSamples: NUM_ERR },
269236
} as const satisfies Record<EqlV3TypeName, DomainSpec>

‎packages/stack/__tests__/v3-matrix/matrix-audit.test-d.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
*/
1010
import { describe, expectTypeOf, it } from 'vitest'
1111
import type { EncryptionClient } from '@/encryption'
12-
import {
13-
encryptedTable,
14-
encryptedTextEqColumn,
15-
typedClient,
16-
} from '@/encryption/v3'
12+
import { encryptedTable, typedClient, types } from '@/encryption/v3'
1713

18-
const users = encryptedTable('u', { email: encryptedTextEqColumn('email') })
14+
const users = encryptedTable('u', { email: types.TextEq('email') })
1915
declare const client: EncryptionClient
2016
const typed = typedClient(client, users)
2117

‎packages/stack/__tests__/v3-matrix/matrix-bulk.test.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77
*/
88
import 'dotenv/config'
99
import { beforeAll, describe, expect, it } from 'vitest'
10-
import {
11-
EncryptionV3,
12-
encryptedInt4OrdColumn,
13-
encryptedTable,
14-
encryptedTextEqColumn,
15-
} from '@/encryption/v3'
10+
import { EncryptionV3, encryptedTable, types } from '@/encryption/v3'
1611
import { unwrapResult } from '../fixtures'
1712

1813
const LIVE_CIPHERSTASH_ENABLED = Boolean(
@@ -24,8 +19,8 @@ const LIVE_CIPHERSTASH_ENABLED = Boolean(
2419
const describeLive = LIVE_CIPHERSTASH_ENABLED ? describe : describe.skip
2520

2621
const people = encryptedTable('v3_bulk_people', {
27-
nickname: encryptedTextEqColumn('nickname'),
28-
age: encryptedInt4OrdColumn('age'),
22+
nickname: types.TextEq('nickname'),
23+
age: types.Int4Ord('age'),
2924
})
3025

3126
describeLive('v3 typed client bulk-at-scale (live)', () => {

‎packages/stack/__tests__/v3-matrix/matrix-identity-live.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
*/
99
import 'dotenv/config'
1010
import { beforeAll, describe, expect, it } from 'vitest'
11-
import {
12-
EncryptionV3,
13-
encryptedTable,
14-
encryptedTextEqColumn,
15-
} from '@/encryption/v3'
11+
import { EncryptionV3, encryptedTable, types } from '@/encryption/v3'
1612
import { LockContext } from '@/identity'
1713
import { unwrapResult } from '../fixtures'
1814

@@ -25,7 +21,7 @@ const LIVE_CIPHERSTASH_ENABLED = Boolean(
2521
const describeLive = LIVE_CIPHERSTASH_ENABLED ? describe : describe.skip
2622

2723
const users = encryptedTable('v3_identity_live_users', {
28-
email: encryptedTextEqColumn('email'),
24+
email: types.TextEq('email'),
2925
})
3026

3127
describeLive('v3 typed client identity-aware operations (live)', () => {

‎packages/stack/__tests__/v3-matrix/matrix-keyset.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@
66
import 'dotenv/config'
77
import { ensureKeyset } from '@cipherstash/protect-ffi'
88
import { beforeAll, describe, expect, it } from 'vitest'
9-
import {
10-
EncryptionV3,
11-
encryptedTable,
12-
encryptedTextEqColumn,
13-
} from '@/encryption/v3'
9+
import { EncryptionV3, encryptedTable, types } from '@/encryption/v3'
1410
import { unwrapResult } from '../fixtures'
1511

1612
const users = encryptedTable('v3_keyset_users', {
17-
email: encryptedTextEqColumn('email'),
13+
email: types.TextEq('email'),
1814
})
1915

2016
const LIVE_CIPHERSTASH_ENABLED = Boolean(

‎packages/stack/__tests__/v3-matrix/matrix-lock-context.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ vi.mock('@cipherstash/protect-ffi', () => ({
3737
}))
3838

3939
import * as ffi from '@cipherstash/protect-ffi'
40-
import {
41-
encryptedTable,
42-
encryptedTextEqColumn,
43-
typedClient,
44-
} from '@/encryption/v3'
40+
import { encryptedTable, typedClient, types } from '@/encryption/v3'
4541

4642
const users = encryptedTable('users', {
47-
email: encryptedTextEqColumn('email'),
43+
email: types.TextEq('email'),
4844
})
4945

5046
const IDENTITY_CLAIM = { identityClaim: ['sub'] }

‎packages/stack/__tests__/v3-matrix/matrix.test-d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
type InferPlaintext,
1717
type QueryableColumnsOf,
1818
type QueryTypesForColumn,
19-
} from '@/schema/v3'
19+
} from '@/eql/v3'
2020
import { type EqlV3TypeName, V3_MATRIX } from './catalog'
2121

2222
// One mixed-tier table spanning every capability tier + plaintext axis, built

0 commit comments

Comments
 (0)