@atscript/utils-db 0.1.28 → 0.1.30

package/dist/index.cjs

@@ -23,6 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const __atscript_typescript_utils = __toESM(require("@atscript/typescript/utils"));
+const __uniqu_core = __toESM(require("@uniqu/core"));
 
 //#region packages/utils-db/src/logger.ts
 const NoopLogger = {
@@ -187,15 +188,15 @@ var AtscriptDbTable = class {
 		return this._fieldDescriptors;
 	}
 	/**
-	* Resolves a projection to a list of field names to include.
+	* Resolves `$select` from {@link UniqueryControls} to a list of field names.
 	* - `undefined` → `undefined` (all fields)
 	* - `string[]` → pass through
 	* - `Record<K, 1>` → extract included keys
 	* - `Record<K, 0>` → invert using known field names
-	*/ resolveProjection(projection) {
-		if (!projection) return undefined;
-		if (Array.isArray(projection)) return projection.length > 0 ? projection : undefined;
-		const entries = Object.entries(projection);
+	*/ resolveProjection(select) {
+		if (!select) return undefined;
+		if (Array.isArray(select)) return select.length > 0 ? select : undefined;
+		const entries = Object.entries(select);
 		if (entries.length === 0) return undefined;
 		const firstVal = entries[0][1];
 		if (firstVal === 1) return entries.filter(([, v]) => v === 1).map(([k]) => k);
@@ -290,19 +291,23 @@ var AtscriptDbTable = class {
 		return this.adapter.deleteOne(filter);
 	}
 	/**
-	* Finds a single record matching the filter.
-	*/ async findOne(filter, options) {
-		return this.adapter.findOne(filter, options);
+	* Finds a single record matching the query.
+	*/ async findOne(query) {
+		return this.adapter.findOne(query);
 	}
 	/**
-	* Finds all records matching the filter.
-	*/ async findMany(filter, options) {
-		return this.adapter.findMany(filter, options);
+	* Finds all records matching the query.
+	*/ async findMany(query) {
+		return this.adapter.findMany(query);
 	}
 	/**
-	* Counts records matching the filter.
-	*/ async count(filter = {}) {
-		return this.adapter.count(filter);
+	* Counts records matching the query.
+	*/ async count(query) {
+		query ?? (query = {
+			filter: {},
+			controls: {}
+		});
+		return this.adapter.count(query);
 	}
 	async updateMany(filter, data) {
 		return this.adapter.updateMany(filter, data);
@@ -592,4 +597,16 @@ exports.BaseDbAdapter = BaseDbAdapter
 exports.NoopLogger = NoopLogger
 exports.decomposePatch = decomposePatch
 exports.getKeyProps = getKeyProps
-exports.resolveDesignType = resolveDesignType
+Object.defineProperty(exports, 'isPrimitive', {
+  enumerable: true,
+  get: function () {
+    return __uniqu_core.isPrimitive;
+  }
+});
+exports.resolveDesignType = resolveDesignType
+Object.defineProperty(exports, 'walkFilter', {
+  enumerable: true,
+  get: function () {
+    return __uniqu_core.walkFilter;
+  }
+});

package/dist/index.d.ts

@@ -1,60 +1,7 @@
 import { TAtscriptAnnotatedType, TValidatorPlugin, TMetadataMap, TAtscriptDataType, Validator, TAtscriptTypeObject, TValidatorOptions, TAtscriptTypeArray } from '@atscript/typescript/utils';
+import { FilterExpr, Uniquery, UniqueryControls } from '@uniqu/core';
+export { FieldOpsFor, FilterExpr, FilterVisitor, Uniquery, UniqueryControls, isPrimitive, walkFilter } from '@uniqu/core';
 
-/**
- * Comparison and set operators for a single field value.
- * Used inside filter objects: `{ age: { $gt: 18, $lt: 65 } }`.
- */
-type TFilterOperators<V = unknown> = {
-    $gt?: V;
-    $gte?: V;
-    $lt?: V;
-    $lte?: V;
-    $ne?: V | null;
-    $in?: V[];
-    $nin?: V[];
-    $exists?: boolean;
-    $regex?: string;
-};
-/**
- * Typed filter for database queries. Root-level keys from `T` get
- * autocompletion and value type checking. Arbitrary string keys
- * (e.g. dot-notation paths like `"address.city"`) are allowed via
- * index signature fallback.
- *
- * When used without a type parameter, behaves as `Record<string, unknown>`.
- *
- * @example
- * ```typescript
- * // Typed — autocompletion + value checking
- * const filter: TDbFilter<User> = { name: 'John', age: { $gt: 18 } }
- *
- * // Dot-notation — accepted via string fallback
- * const filter2: TDbFilter<User> = { 'address.city': 'NYC' }
- * ```
- */
-type TDbFilter<T = Record<string, unknown>> = {
-    [K in keyof T & string]?: T[K] | TFilterOperators<T[K]> | null;
-} & Record<string, unknown> & {
-    $and?: Array<TDbFilter<T>>;
-    $or?: Array<TDbFilter<T>>;
-    $not?: TDbFilter<T>;
-};
-/**
- * Projection for selecting/excluding fields.
- * Accepts either an object `{ name: 1, email: 1 }` or an array `['name', 'email']`.
- * Root-level keys get autocompletion, arbitrary strings allowed for dot-notation.
- */
-type TDbProjection<T = Record<string, unknown>> = (Partial<Record<keyof T & string, 0 | 1>> & Record<string, 0 | 1>) | (keyof T & string | string)[];
-/**
- * Options for find operations: sort, pagination, projection.
- * Root-level keys get autocompletion, arbitrary strings allowed for dot-notation.
- */
-interface TDbFindOptions<T = Record<string, unknown>> {
-    sort?: Partial<Record<keyof T & string, 1 | -1>> & Record<string, 1 | -1>;
-    skip?: number;
-    limit?: number;
-    projection?: TDbProjection<T>;
-}
 interface TDbInsertResult {
     insertedId: unknown;
 }
@@ -175,7 +122,7 @@ declare abstract class BaseDbAdapter {
      * @param patch - The patch payload with array operations.
      * @returns Update result.
      */
-    nativePatch(filter: TDbFilter, patch: unknown): Promise<TDbUpdateResult>;
+    nativePatch(filter: FilterExpr, patch: unknown): Promise<TDbUpdateResult>;
     /**
      * Called before field flattening begins.
      * Use to extract table-level adapter-specific annotations.
@@ -244,15 +191,15 @@ declare abstract class BaseDbAdapter {
     }): Promise<void>;
     abstract insertOne(data: Record<string, unknown>): Promise<TDbInsertResult>;
     abstract insertMany(data: Array<Record<string, unknown>>): Promise<TDbInsertManyResult>;
-    abstract replaceOne(filter: TDbFilter, data: Record<string, unknown>): Promise<TDbUpdateResult>;
-    abstract updateOne(filter: TDbFilter, data: Record<string, unknown>): Promise<TDbUpdateResult>;
-    abstract deleteOne(filter: TDbFilter): Promise<TDbDeleteResult>;
-    abstract findOne(filter: TDbFilter, options?: TDbFindOptions): Promise<Record<string, unknown> | null>;
-    abstract findMany(filter: TDbFilter, options?: TDbFindOptions): Promise<Array<Record<string, unknown>>>;
-    abstract count(filter: TDbFilter): Promise<number>;
-    abstract updateMany(filter: TDbFilter, data: Record<string, unknown>): Promise<TDbUpdateResult>;
-    abstract replaceMany(filter: TDbFilter, data: Record<string, unknown>): Promise<TDbUpdateResult>;
-    abstract deleteMany(filter: TDbFilter): Promise<TDbDeleteResult>;
+    abstract replaceOne(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+    abstract updateOne(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+    abstract deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
+    abstract findOne(query: Uniquery): Promise<Record<string, unknown> | null>;
+    abstract findMany(query: Uniquery): Promise<Array<Record<string, unknown>>>;
+    abstract count(query: Uniquery): Promise<number>;
+    abstract updateMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+    abstract replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+    abstract deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
     /**
      * Synchronizes indexes between the Atscript definitions and the database.
      * Uses `this._table.indexes` for the full index definitions.
@@ -343,13 +290,13 @@ declare class AtscriptDbTable<T extends TAtscriptAnnotatedType = TAtscriptAnnota
      */
     get fieldDescriptors(): readonly TDbFieldMeta[];
     /**
-     * Resolves a projection to a list of field names to include.
+     * Resolves `$select` from {@link UniqueryControls} to a list of field names.
      * - `undefined` → `undefined` (all fields)
      * - `string[]` → pass through
      * - `Record<K, 1>` → extract included keys
      * - `Record<K, 0>` → invert using known field names
      */
-    resolveProjection(projection?: TDbProjection<DataType>): string[] | undefined;
+    resolveProjection(select?: UniqueryControls['$select']): string[] | undefined;
     /**
      * Creates a new validator with custom options.
      * Adapter plugins are NOT automatically included — use {@link getValidator}
@@ -389,20 +336,20 @@ declare class AtscriptDbTable<T extends TAtscriptAnnotatedType = TAtscriptAnnota
      */
     deleteOne(id: unknown): Promise<TDbDeleteResult>;
     /**
-     * Finds a single record matching the filter.
+     * Finds a single record matching the query.
      */
-    findOne(filter: TDbFilter<DataType>, options?: TDbFindOptions<DataType>): Promise<DataType | null>;
+    findOne(query: Uniquery<DataType>): Promise<DataType | null>;
     /**
-     * Finds all records matching the filter.
+     * Finds all records matching the query.
      */
-    findMany(filter: TDbFilter<DataType>, options?: TDbFindOptions<DataType>): Promise<DataType[]>;
+    findMany(query: Uniquery<DataType>): Promise<DataType[]>;
     /**
-     * Counts records matching the filter.
+     * Counts records matching the query.
      */
-    count(filter?: TDbFilter<DataType>): Promise<number>;
-    updateMany(filter: TDbFilter<DataType>, data: Partial<DataType> & Record<string, unknown>): Promise<TDbUpdateResult>;
-    replaceMany(filter: TDbFilter<DataType>, data: Record<string, unknown>): Promise<TDbUpdateResult>;
-    deleteMany(filter: TDbFilter<DataType>): Promise<TDbDeleteResult>;
+    count(query?: Uniquery<DataType>): Promise<number>;
+    updateMany(filter: FilterExpr<DataType>, data: Partial<DataType> & Record<string, unknown>): Promise<TDbUpdateResult>;
+    replaceMany(filter: FilterExpr<DataType>, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+    deleteMany(filter: FilterExpr<DataType>): Promise<TDbDeleteResult>;
     /**
      * Synchronizes indexes between Atscript definitions and the database.
      * Delegates to the adapter, which uses `this._table.indexes`.
@@ -433,7 +380,7 @@ declare class AtscriptDbTable<T extends TAtscriptAnnotatedType = TAtscriptAnnota
     /**
      * Extracts primary key field(s) from a payload to build a filter.
      */
-    protected _extractPrimaryKeyFilter(payload: Record<string, unknown>): TDbFilter;
+    protected _extractPrimaryKeyFilter(payload: Record<string, unknown>): FilterExpr;
     /**
      * Builds a validator for a given purpose with adapter plugins.
      */
@@ -485,4 +432,4 @@ type TDbPatch<T> = {
 declare function getKeyProps(def: TAtscriptAnnotatedType<TAtscriptTypeArray>): Set<string>;
 
 export { AtscriptDbTable, BaseDbAdapter, NoopLogger, decomposePatch, getKeyProps, resolveDesignType };
-export type { TArrayPatch, TDbDefaultValue, TDbDeleteResult, TDbFieldMeta, TDbFilter, TDbFindOptions, TDbIndex, TDbIndexField, TDbInsertManyResult, TDbInsertResult, TDbPatch, TDbProjection, TDbUpdateResult, TFilterOperators, TGenericLogger, TIdDescriptor };
+export type { TArrayPatch, TDbDefaultValue, TDbDeleteResult, TDbFieldMeta, TDbIndex, TDbIndexField, TDbInsertManyResult, TDbInsertResult, TDbPatch, TDbUpdateResult, TGenericLogger, TIdDescriptor };

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { flattenAnnotatedType, isAnnotatedType } from "@atscript/typescript/utils";
+import { isPrimitive, walkFilter } from "@uniqu/core";
 
 //#region packages/utils-db/src/logger.ts
 const NoopLogger = {
@@ -163,15 +164,15 @@ var AtscriptDbTable = class {
 		return this._fieldDescriptors;
 	}
 	/**
-	* Resolves a projection to a list of field names to include.
+	* Resolves `$select` from {@link UniqueryControls} to a list of field names.
 	* - `undefined` → `undefined` (all fields)
 	* - `string[]` → pass through
 	* - `Record<K, 1>` → extract included keys
 	* - `Record<K, 0>` → invert using known field names
-	*/ resolveProjection(projection) {
-		if (!projection) return undefined;
-		if (Array.isArray(projection)) return projection.length > 0 ? projection : undefined;
-		const entries = Object.entries(projection);
+	*/ resolveProjection(select) {
+		if (!select) return undefined;
+		if (Array.isArray(select)) return select.length > 0 ? select : undefined;
+		const entries = Object.entries(select);
 		if (entries.length === 0) return undefined;
 		const firstVal = entries[0][1];
 		if (firstVal === 1) return entries.filter(([, v]) => v === 1).map(([k]) => k);
@@ -266,19 +267,23 @@ var AtscriptDbTable = class {
 		return this.adapter.deleteOne(filter);
 	}
 	/**
-	* Finds a single record matching the filter.
-	*/ async findOne(filter, options) {
-		return this.adapter.findOne(filter, options);
+	* Finds a single record matching the query.
+	*/ async findOne(query) {
+		return this.adapter.findOne(query);
 	}
 	/**
-	* Finds all records matching the filter.
-	*/ async findMany(filter, options) {
-		return this.adapter.findMany(filter, options);
+	* Finds all records matching the query.
+	*/ async findMany(query) {
+		return this.adapter.findMany(query);
 	}
 	/**
-	* Counts records matching the filter.
-	*/ async count(filter = {}) {
-		return this.adapter.count(filter);
+	* Counts records matching the query.
+	*/ async count(query) {
+		query ?? (query = {
+			filter: {},
+			controls: {}
+		});
+		return this.adapter.count(query);
 	}
 	async updateMany(filter, data) {
 		return this.adapter.updateMany(filter, data);
@@ -563,4 +568,4 @@ var BaseDbAdapter = class {
 };
 
 //#endregion
-export { AtscriptDbTable, BaseDbAdapter, NoopLogger, decomposePatch, getKeyProps, resolveDesignType };
+export { AtscriptDbTable, BaseDbAdapter, NoopLogger, decomposePatch, getKeyProps, isPrimitive, resolveDesignType, walkFilter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/utils-db",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Database adapter utilities for atscript.",
   "keywords": [
     "atscript",
@@ -36,8 +36,9 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.28",
-    "@atscript/typescript": "^0.1.28"
+    "@uniqu/core": "^0.0.1",
+    "@atscript/core": "^0.1.30",
+    "@atscript/typescript": "^0.1.30"
   },
   "scripts": {
     "pub": "pnpm publish --access public",