rads-db 3.0.52 → 3.0.54

package/dist/index.d.ts

@@ -5,12 +5,12 @@ type MaybePromise$1<T> = Promise<T> | T;
 type Change<T> = {
     [K in keyof T]?: T[K] extends any[] ? T[K] : T[K] extends {} ? Change<T[K]> : T[K];
 };
-interface GetManyArgs<E, EN extends keyof EntityMeta, W> extends GetArgs<E, EN, W> {
+interface GetManyArgs<EN extends keyof EntityMeta, W> extends GetArgs<EN, W> {
     cursor?: string | null;
     maxItemCount?: number;
     orderBy?: string;
 }
-interface VerifyManyArgs<E, EN extends keyof EntityMeta, W> extends GetManyArgs<E, EN, W> {
+interface VerifyManyArgs<EN extends keyof EntityMeta, W> extends GetManyArgs<EN, W> {
     recompute?: string[];
     dryRun?: boolean;
 }
@@ -29,37 +29,39 @@ type GetArgsWhere<W> = W & {
     _and?: GetArgsWhere<W>[];
     _or?: GetArgsWhere<W>[];
 };
-interface GetArgs<E, EN extends keyof EntityMeta, W> {
+interface GetArgs<EN extends keyof EntityMeta, W> {
     where?: GetArgsWhere<W>;
-    include?: GetArgsInclude<E, EN>;
+    include?: GetArgsInclude<EN>;
 }
 interface GetAggArgs<EN extends keyof EntityMeta, W> {
     where?: GetArgsWhere<W>;
     agg: GetAggArgsAgg<EN>;
 }
 type GetAggArgsAgg<EN extends keyof EntityMeta, F extends string = EntityMeta[EN]['aggregates']> = ('_count' | `${F}_min` | `${F}_max`)[];
-type GetManyArgsAny = GetManyArgs<any, any, any>;
-type GetArgsAny = GetArgs<any, any, any>;
+type GetManyArgsAny = GetManyArgs<any, any>;
+type GetArgsAny = GetArgs<any, any>;
 type GetAggArgsAny = GetAggArgs<any, any>;
-type VerifyManyArgsAny = VerifyManyArgs<any, any, any>;
-type GetArgsInclude<E, EN extends keyof EntityMeta, R extends keyof E = keyof EntityMeta[EN]['relations'] & keyof E> = [R] extends [never] ? Record<string, never> : {
+type VerifyManyArgsAny = VerifyManyArgs<any, any>;
+type GetArgsInclude<EN extends keyof EntityMeta, R extends keyof EntityMeta[EN]['relations'] = keyof EntityMeta[EN]['relations']> = [R] extends [never] ? {
+    _pick?: EntityMeta[EN]['primitives'][];
+} : {
     _pick?: EntityMeta[EN]['primitives'][];
 } & {
-    [K in R]?: GetArgsInclude<NonNullable<E[K]>, EntityMeta[EN]['relations'][K]['entityName']>;
+    [K in R]?: GetArgsInclude<EntityMeta[EN]['relations'][K]['entityName']>;
 };
 type GetAggResponse<EN extends keyof EntityMeta, A extends GetAggArgs<EN, any>> = {
     [K in A['agg'][0]]: K extends '_count' ? number : number | undefined;
 };
-interface GetManyResponse<E, EN extends keyof EntityMeta, A extends GetArgs<E, EN, any>> {
+interface GetManyResponse<E, EN extends keyof EntityMeta, A extends GetArgs<EN, any>> {
     nodes: GetResponse<E, EN, A>[];
     cursor: string | null;
 }
-type GetResponse<E, EN extends keyof EntityMeta, A extends GetArgs<E, EN, any>> = A extends {
+type GetResponse<E, EN extends keyof EntityMeta, A extends GetArgs<EN, any>> = A extends {
     include: any;
 } ? GetResponseInclude<E, EN, A['include']> : GetResponseNoInclude<E, EN>;
 type RelationData<EN extends keyof EntityMeta, K extends keyof EntityMeta[EN]['relations']> = Pick<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['denormFields']>;
 type KeepArray<TMaybeArray, TType> = NonNullable<TMaybeArray> extends any[] ? TType[] : TType;
-type GetResponseInclude<E, EN extends keyof EntityMeta, I extends GetArgsInclude<E, EN>> = I extends {
+type GetResponseInclude<E, EN extends keyof EntityMeta, I extends GetArgsInclude<EN>> = I extends {
     _pick: string[];
 } ? GetResponseIncludeSelect<E, I> : {
     [K in keyof E]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof I ? KeepArray<E[K], GetResponseInclude<EntityMeta[EN]['relations'][K]['entity'], EntityMeta[EN]['relations'][K]['entityName'], I[K]>> : KeepArray<E[K], RelationData<EN, K>> : E[K];
@@ -70,18 +72,19 @@ type GetResponseNoInclude<E, EN extends keyof EntityMeta> = {
     [K in keyof E]: K extends keyof EntityMeta[EN]['relations'] ? KeepArray<E[K], RelationData<EN, K>> : E[K];
 };
 type DeepPartialWithNulls<T> = {
-    [K in keyof T]?: NonNullable<T[K]> extends any[] ? DeepPartialWithNulls<NonNullable<T[K]>[number]>[] : NonNullable<T[K]> extends {
-        id: string;
-    } ? {
-        id: string;
-    } | null : NonNullable<T[K]> extends Record<string, any> ? DeepPartialWithNulls<T[K]> | null : T[K] | null;
+    [K in keyof T]?: NonNullable<T[K]> extends any[] ? DeepPartialWithNullsItem<NonNullable<T[K]>[number]>[] : DeepPartialWithNullsItem<NonNullable<T[K]>>;
 };
+type DeepPartialWithNullsItem<T> = T extends {
+    id: string;
+} ? {
+    id: string;
+} | null : T extends Record<string, any> ? DeepPartialWithNulls<T> | null : T | null;
 type DeepPartial<T> = {
     [K in keyof T]?: NonNullable<T[K]> extends any[] ? DeepPartial<NonNullable<T[K]>[number]>[] : NonNullable<T[K]> extends Record<string, any> ? DeepPartial<T[K]> : T[K];
 };
 type Relation<T extends {
     id: any;
-}, K extends Exclude<keyof T, 'id'> = never> = Pick<T, K | 'id'> & DeepPartial<T>;
+}, K extends Exclude<keyof T, 'id'> = never> = Pick<T, K | 'id'>;
 type PutArgs<T> = {
     id: string;
 } & DeepPartialWithNulls<T>;
@@ -94,14 +97,14 @@ interface EntityMethods<E, EN extends keyof EntityMeta, W> {
     /** Used to access underlying mechanism of storage directly.
      * Warning: bypasses all rads features - schema won't be validated, default values won't be filled, etc. */
     driver: Driver;
-    get<A extends GetArgs<E, EN, W>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetResponse<E, EN, A>>;
-    getMany<A extends GetManyArgs<E, EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<E, EN, A>>;
+    get<A extends GetArgs<EN, W>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetResponse<E, EN, A>>;
+    getMany<A extends GetManyArgs<EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<E, EN, A>>;
     getAgg<A extends GetAggArgs<EN, W>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetAggResponse<EN, A>>;
-    getAll<A extends GetManyArgs<E, EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<E, EN, A>['nodes']>;
+    getAll<A extends GetManyArgs<EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<E, EN, A>['nodes']>;
     put(data: PutArgs<E>, ctx?: RadsRequestContext): MaybePromise$1<GetResponseNoInclude<E, EN>>;
     putMany(data: PutArgs<E>[], ctx?: RadsRequestContext): MaybePromise$1<GetResponseNoInclude<E, EN>[]>;
-    verifyMany<A extends VerifyManyArgs<E, EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<VerifyManyResponse>;
-    verifyAll<A extends VerifyManyArgs<E, EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<Pick<VerifyManyResponse, 'correctCount' | 'incorrectCount'>>;
+    verifyMany<A extends VerifyManyArgs<EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<VerifyManyResponse>;
+    verifyAll<A extends VerifyManyArgs<EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<Pick<VerifyManyResponse, 'correctCount' | 'incorrectCount'>>;
 }
 
 type MaybePromise<T> = Promise<T> | T;
@@ -437,4 +440,4 @@ declare function createRadsDb(args?: CreateRadsDbArgs): RadsDb;
  */
 declare function createRadsDbClient(args?: CreateRadsDbClientArgs): RadsDb;
 
-export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepKeys, DeepPartial, DeepPartialWithNulls, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, FileUploadResult, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetArgsWhere, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsHookDoc, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, WhereJsonContains, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };
+export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepKeys, DeepPartial, DeepPartialWithNulls, DeepPartialWithNullsItem, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, FileUploadResult, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetArgsWhere, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsHookDoc, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, WhereJsonContains, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.52",
+  "version": "3.0.54",
   "packageManager": "pnpm@8.6.1",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",
@@ -107,9 +107,8 @@
     "test": "vitest --run && vitest typecheck --run",
     "link-rads-db": "symlink-dir ./test/_rads-db ./node_modules/_rads-db",
     "generate-test-schema": "ts-node ./src/integrations/cli -d './test/entities'",
-    "dev": "pnpm install && pnpm link-rads-db && pnpm build && pnpm generate-test-schema && vitest --ui --test-timeout 300000",
+    "dev": "pnpm install && pnpm link-rads-db && pnpm build && pnpm generate-test-schema && vitest --ui --test-timeout 300000 --typecheck",
     "lint": "cross-env NODE_ENV=production eslint src/**/*.* test/**/*.*",
-    "dev-typecheck": "pnpm install && pnpm build && pnpm generate-test-schema && pnpm link-rads-db && vitest typecheck",
     "build": "unbuild"
   }
 }