Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/bigquery-export-style.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@filter-def/bigquery": patch
---

Separate value and type exports in barrel file
11 changes: 11 additions & 0 deletions .changeset/cleanup-exports.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions .oxfmtrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"printWidth": 80,
"tabWidth": 4,
"ignorePatterns": [".local"],

"overrides": [
{
"files": "*.yml",
Expand Down
3 changes: 2 additions & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/bigquery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"scripts": {
"build": "tsdown",
"dev": "tsdown --watch",
"test": "vitest run",
"test": "vitest",
"typecheck": "tsc --noEmit"
},
"dependencies": {
Expand Down
14 changes: 7 additions & 7 deletions packages/bigquery/src/index.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"scripts": {
"build": "tsdown",
"dev": "tsdown --watch",
"test": "vitest",
"typecheck": "tsc --noEmit"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/drizzle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"scripts": {
"build": "tsdown",
"dev": "tsdown --watch",
"test": "vitest run",
"test": "vitest",
"typecheck": "tsc --noEmit"
},
"dependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/drizzle/src/drizzle-filter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 25 additions & 3 deletions packages/drizzle/src/index.ts
Original file line number Diff line number Diff line change
@@ -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";
32 changes: 0 additions & 32 deletions packages/in-memory/src/in-memory-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import type {
CoreFilter,
CoreFilterField,
CoreFilterInput,
CoreFilterKind,
PrimitiveFilter,
Simplify,
ValidateFilterDef,
Expand Down Expand Up @@ -119,37 +118,6 @@ export type InMemoryFilterField<Entity> =
| CoreFilterField<Entity>
| InMemoryCustomFilter<Entity, any>;

// ----------------------------------------------------------------
// 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> = 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> = TFilterField extends (
...args: any[]
) => any
? true
: false;

/**
* Extracts the input type for a custom filter function.
*/
export type ExtractCustomFilterInput<TFilterField> =
TFilterField extends InMemoryCustomFilter<any, infer Input> ? Input : never;

// ----------------------------------------------------------------
// Filter input types
// ----------------------------------------------------------------
Expand Down
23 changes: 23 additions & 0 deletions packages/in-memory/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";