@signaldb/core 1.2.3 → 1.2.4

package/dist/types/Selector.d.ts

@@ -1,54 +1,52 @@
 export interface FieldExpression<T> {
-    $eq?: T | undefined;
-    $gt?: T | undefined;
-    $gte?: T | undefined;
-    $lt?: T | undefined;
-    $lte?: T | undefined;
+    $eq?: T;
+    $gt?: T;
+    $gte?: T;
+    $lt?: T;
+    $lte?: T;
     $in?: T[] | undefined;
-    $nin?: T[] | undefined;
-    $ne?: T | undefined;
-    $exists?: boolean | undefined;
-    $not?: FieldExpression<T> | undefined;
-    $expr?: FieldExpression<T> | undefined;
+    $nin?: T[];
+    $ne?: T;
+    $exists?: boolean;
+    $not?: FieldExpression<T>;
+    $expr?: FieldExpression<T>;
     $jsonSchema?: any;
-    $mod?: number[] | undefined;
-    $regex?: RegExp | string | undefined;
-    $options?: string | undefined;
+    $mod?: number[];
+    $regex?: RegExp | string;
+    $options?: string;
     $text?: {
         $search: string;
-        $language?: string | undefined;
-        $caseSensitive?: boolean | undefined;
-        $diacriticSensitive?: boolean | undefined;
-    } | undefined;
-    $where?: string | ((item: T) => boolean) | undefined;
-    $all?: T[] | undefined;
-    $elemMatch?: T extends object ? Query<T> : FieldExpression<T> | undefined;
-    $size?: number | undefined;
+        $language?: string;
+        $caseSensitive?: boolean;
+        $diacriticSensitive?: boolean;
+    };
+    $where?: string | ((item: T) => boolean);
+    $all?: T[];
+    $elemMatch?: T extends object ? Query<T> : FieldExpression<T>;
+    $size?: number;
     $bitsAllClear?: any;
     $bitsAllSet?: any;
     $bitsAnyClear?: any;
     $bitsAnySet?: any;
 }
-type IsObject<T> = T extends object ? (T extends Array<any> ? false : true) : false;
-type DotNotationKeys<T> = {
-    [K in keyof T & (string | number)]: T[K] extends Array<infer U> ? `${K}` | `${K}.$` | `${K}.${DotNotationKeys<U>}` : IsObject<T[K]> extends true ? `${K}` | `${K}.${DotNotationKeys<T[K]>}` : `${K}`;
-}[keyof T & (string | number)];
-type Split<S extends string, Delimiter extends string> = S extends `${infer Head}${Delimiter}${infer Tail}` ? [Head, ...Split<Tail, Delimiter>] : [S];
-type GetTypeByParts<T, Parts extends readonly string[]> = Parts extends [infer Head, ...infer Tail] ? Head extends keyof T ? GetTypeByParts<T[Head], Extract<Tail, string[]>> : Head extends '$' ? T extends Array<infer U> ? GetTypeByParts<U, Extract<Tail, string[]>> : never : never : T;
-type Get<T, Path extends string> = GetTypeByParts<T, Split<Path, '.'>>;
-type Flatten<T> = T extends any[] ? T[0] : T;
+type DotNotation<T> = {
+    [K in keyof T & string]: T[K] extends Array<infer U> ? `${K}` | `${K}.$` | `${K}.${DotNotation<U>}` : T[K] extends object ? `${K}` | `${K}.${DotNotation<T[K]>}` : `${K}`;
+}[keyof T & string];
+type GetType<T, P extends string> = P extends `${infer H}.${infer R}` ? H extends keyof T ? T[H] extends Array<infer U> ? GetType<U, R> : GetType<T[H], R> : H extends '$' ? T extends Array<infer U> ? GetType<U, R> : never : never : P extends keyof T ? T[P] : never;
 type FlatQuery<T> = {
-    [P in DotNotationKeys<T>]?: Flatten<Get<T, P>> | RegExp | FieldExpression<Flatten<Get<T, P>>>;
+    [P in DotNotation<T>]?: FlatQueryValue<T, P>;
 };
+type FieldValue<U> = U extends string ? string | RegExp | FieldExpression<string> : U | FieldExpression<U>;
+type FlatQueryValue<T, P extends string> = GetType<T, P> extends never ? never : GetType<T, P> extends Array<infer U> ? FieldValue<U> | FieldValue<U[]> : FieldValue<GetType<T, P>>;
 type Query<T> = FlatQuery<T> & {
-    $or?: Query<T>[] | undefined;
-    $and?: Query<T>[] | undefined;
-    $nor?: Query<T>[] | undefined;
+    $or?: Query<T>[];
+    $and?: Query<T>[];
+    $nor?: Query<T>[];
 };
-export type FlatSelector<T extends Record<string, any> = Record<string, any>> = FlatQuery<T> & {
+export type FlatSelector<T extends Record<string, any>> = FlatQuery<T> & {
     $or?: never;
     $and?: never;
     $nor?: never;
 };
-type Selector<T extends Record<string, any> = Record<string, any>> = Query<T>;
+type Selector<T extends Record<string, any>> = Query<T>;
 export default Selector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signaldb/core",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "SignalDB is a client-side database that provides a simple MongoDB-like interface to the data with first-class typescript support to achieve an optimistic UI. Data persistence can be achieved by using storage providers that store the data through a JSON interface to places such as localStorage.",
   "scripts": {
     "build": "rimraf dist && vite build"