From 01131c8c964ac3ff4aab28b37bdc4d74217ddfc5 Mon Sep 17 00:00:00 2001 From: Ryan Marganti Date: Tue, 10 Feb 2026 09:16:07 -0500 Subject: [PATCH 1/2] chore: consistent testing entry --- .oxfmtrc.json | 2 ++ packages/bigquery/package.json | 2 +- packages/core/package.json | 1 + packages/drizzle/package.json | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.oxfmtrc.json b/.oxfmtrc.json index 3b3bff6..2c6f401 100644 --- a/.oxfmtrc.json +++ b/.oxfmtrc.json @@ -2,6 +2,8 @@ "$schema": "./node_modules/oxfmt/configuration_schema.json", "printWidth": 80, "tabWidth": 4, + "ignorePatterns": [".local"], + "overrides": [ { "files": "*.yml", diff --git a/packages/bigquery/package.json b/packages/bigquery/package.json index bddda3b..aff60b8 100644 --- a/packages/bigquery/package.json +++ b/packages/bigquery/package.json @@ -30,7 +30,7 @@ "scripts": { "build": "tsdown", "dev": "tsdown --watch", - "test": "vitest run", + "test": "vitest", "typecheck": "tsc --noEmit" }, "dependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 3658a16..066bef3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -30,6 +30,7 @@ "scripts": { "build": "tsdown", "dev": "tsdown --watch", + "test": "vitest", "typecheck": "tsc --noEmit" }, "devDependencies": { diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json index 8eac324..282da54 100644 --- a/packages/drizzle/package.json +++ b/packages/drizzle/package.json @@ -30,7 +30,7 @@ "scripts": { "build": "tsdown", "dev": "tsdown --watch", - "test": "vitest run", + "test": "vitest", "typecheck": "tsc --noEmit" }, "dependencies": { From 73e6e8e7eaacd0d01b0680e9324eff8958082042 Mon Sep 17 00:00:00 2001 From: Ryan Marganti Date: Tue, 10 Feb 2026 18:54:16 -0500 Subject: [PATCH 2/2] chore: package consistency --- .changeset/bigquery-export-style.md | 5 ++++ .changeset/cleanup-exports.md | 11 +++++++ .oxlintrc.json | 3 +- packages/bigquery/src/index.ts | 14 ++++----- packages/drizzle/src/drizzle-filter.spec.ts | 3 +- packages/drizzle/src/index.ts | 28 ++++++++++++++++-- packages/in-memory/src/in-memory-filter.ts | 32 --------------------- packages/in-memory/src/index.ts | 23 +++++++++++++++ 8 files changed, 75 insertions(+), 44 deletions(-) create mode 100644 .changeset/bigquery-export-style.md create mode 100644 .changeset/cleanup-exports.md diff --git a/.changeset/bigquery-export-style.md b/.changeset/bigquery-export-style.md new file mode 100644 index 0000000..cca688a --- /dev/null +++ b/.changeset/bigquery-export-style.md @@ -0,0 +1,5 @@ +--- +"@filter-def/bigquery": patch +--- + +Separate value and type exports in barrel file diff --git a/.changeset/cleanup-exports.md b/.changeset/cleanup-exports.md new file mode 100644 index 0000000..924244c --- /dev/null +++ b/.changeset/cleanup-exports.md @@ -0,0 +1,11 @@ +--- +"@filter-def/drizzle": major +"@filter-def/in-memory": major +--- + +Remove unused utility types and re-export core types + +- drizzle: Remove `DrizzleFilterDefInput` export +- drizzle: Re-export all core types (`CoreFilter`, `CoreFilterDef`, `EqFilter`, etc.) for convenience +- in-memory: Remove `ExtractFilterKind`, `IsCustomFilter`, and `ExtractCustomFilterInput` utility types +- in-memory: Re-export all core types (`CoreFilter`, `CoreFilterDef`, `EqFilter`, etc.) for convenience diff --git a/.oxlintrc.json b/.oxlintrc.json index 3bdb6ee..4f9a18e 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -1,8 +1,9 @@ { "$schema": "./node_modules/oxlint/configuration_schema.json", - "plugins": ["unicorn", "typescript", "oxc"], + "plugins": ["import", "unicorn", "typescript", "oxc"], "categories": {}, "rules": { + "import/consistent-type-specifier-style": ["warn", "prefer-top-level"], "constructor-super": "warn", "for-direction": "warn", "no-async-promise-executor": "warn", diff --git a/packages/bigquery/src/index.ts b/packages/bigquery/src/index.ts index aca4d86..b289888 100644 --- a/packages/bigquery/src/index.ts +++ b/packages/bigquery/src/index.ts @@ -1,10 +1,10 @@ -export { - bigqueryFilter, - type BigQueryCustomFilter, - type BigQueryFilter, - type BigQueryFilterDef, - type BigQueryFilterInput, - type BigQueryFilterResult, +export { bigqueryFilter } from "./bigquery-filter.ts"; +export type { + BigQueryCustomFilter, + BigQueryFilter, + BigQueryFilterDef, + BigQueryFilterInput, + BigQueryFilterResult, } from "./bigquery-filter.ts"; // Re-export core types for convenience diff --git a/packages/drizzle/src/drizzle-filter.spec.ts b/packages/drizzle/src/drizzle-filter.spec.ts index a289e8b..3e2e770 100644 --- a/packages/drizzle/src/drizzle-filter.spec.ts +++ b/packages/drizzle/src/drizzle-filter.spec.ts @@ -10,7 +10,8 @@ import { expectTypeOf, it, } from "vitest"; -import { drizzleFilter, type DrizzleFilterInput } from "./drizzle-filter.ts"; +import { drizzleFilter } from "./drizzle-filter.ts"; +import type { DrizzleFilterInput } from "./drizzle-filter.ts"; // ---------------------------------------------------------------- // Schema Definition diff --git a/packages/drizzle/src/index.ts b/packages/drizzle/src/index.ts index 50b50c6..e62d4b9 100644 --- a/packages/drizzle/src/index.ts +++ b/packages/drizzle/src/index.ts @@ -1,8 +1,30 @@ -export { drizzleFilter } from "./drizzle-filter.js"; +export { drizzleFilter } from "./drizzle-filter.ts"; export type { DrizzleCustomFilter, DrizzleFilter, DrizzleFilterDef, - DrizzleFilterDefInput, DrizzleFilterInput, -} from "./drizzle-filter.js"; +} from "./drizzle-filter.ts"; + +// Re-export core types for convenience +export type { + AndFilter, + BooleanFilter, + ContainsFilter, + CoreFilter, + CoreFilterDef, + CoreFilterField, + CoreFilterInput, + CoreFilterKind, + EqFilter, + GTEFilter, + GTFilter, + InArrayFilter, + IsNotNullFilter, + IsNullFilter, + LTEFilter, + LTFilter, + NeqFilter, + OrFilter, + PrimitiveFilter, +} from "@filter-def/core"; diff --git a/packages/in-memory/src/in-memory-filter.ts b/packages/in-memory/src/in-memory-filter.ts index e6a81c7..fa5a45a 100644 --- a/packages/in-memory/src/in-memory-filter.ts +++ b/packages/in-memory/src/in-memory-filter.ts @@ -3,7 +3,6 @@ import type { CoreFilter, CoreFilterField, CoreFilterInput, - CoreFilterKind, PrimitiveFilter, Simplify, ValidateFilterDef, @@ -119,37 +118,6 @@ export type InMemoryFilterField = | CoreFilterField | InMemoryCustomFilter; -// ---------------------------------------------------------------- -// Adapter utilities -// ---------------------------------------------------------------- - -/** - * Extracts the filter kind from a filter field definition. - * Returns the string literal kind for primitive/boolean filters, or 'custom' for custom filters. - */ -export type ExtractFilterKind = TFilterField extends { - kind: infer K extends CoreFilterKind; -} - ? K - : TFilterField extends (...args: any[]) => any - ? "custom" - : never; - -/** - * Checks if a filter field is a custom filter function. - */ -export type IsCustomFilter = TFilterField extends ( - ...args: any[] -) => any - ? true - : false; - -/** - * Extracts the input type for a custom filter function. - */ -export type ExtractCustomFilterInput = - TFilterField extends InMemoryCustomFilter ? Input : never; - // ---------------------------------------------------------------- // Filter input types // ---------------------------------------------------------------- diff --git a/packages/in-memory/src/index.ts b/packages/in-memory/src/index.ts index 763af0f..855cfe4 100644 --- a/packages/in-memory/src/index.ts +++ b/packages/in-memory/src/index.ts @@ -7,3 +7,26 @@ export type { InMemoryFilterDef, InMemoryFilterInput, } from "./in-memory-filter.ts"; + +// Re-export core types for convenience +export type { + AndFilter, + BooleanFilter, + ContainsFilter, + CoreFilter, + CoreFilterDef, + CoreFilterField, + CoreFilterInput, + CoreFilterKind, + EqFilter, + GTEFilter, + GTFilter, + InArrayFilter, + IsNotNullFilter, + IsNullFilter, + LTEFilter, + LTFilter, + NeqFilter, + OrFilter, + PrimitiveFilter, +} from "@filter-def/core";