rads-db 3.0.56 → 3.0.58

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<EN extends keyof EntityMeta, W> extends GetArgs<EN, W> {
+interface GetManyArgs<EN extends keyof EntityMeta> extends GetArgs<EN> {
     cursor?: string | null;
     maxItemCount?: number;
     orderBy?: string;
 }
-interface VerifyManyArgs<EN extends keyof EntityMeta, W> extends GetManyArgs<EN, W> {
+interface VerifyManyArgs<EN extends keyof EntityMeta> extends GetManyArgs<EN> {
     recompute?: string[];
     dryRun?: boolean;
 }
@@ -24,24 +24,24 @@ interface VerifyManyResponse {
         toRemove?: any;
     }[];
 }
-type GetArgsWhere<W> = W & {
-    _not?: GetArgsWhere<W>;
-    _and?: GetArgsWhere<W>[];
-    _or?: GetArgsWhere<W>[];
+type Where<EN extends keyof EntityMeta> = EntityMeta[EN]['whereType'] & {
+    _not?: Where<EN>;
+    _and?: Where<EN>[];
+    _or?: Where<EN>[];
 };
-interface GetArgs<EN extends keyof EntityMeta, W> {
-    where?: GetArgsWhere<W>;
+interface GetArgs<EN extends keyof EntityMeta> {
+    where?: Where<EN>;
     include?: GetArgsInclude<EN>;
 }
-interface GetAggArgs<EN extends keyof EntityMeta, W> {
-    where?: GetArgsWhere<W>;
+interface GetAggArgs<EN extends keyof EntityMeta> {
+    where?: Where<EN>;
     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>;
-type GetArgsAny = GetArgs<any, any>;
-type GetAggArgsAny = GetAggArgs<any, any>;
-type VerifyManyArgsAny = VerifyManyArgs<any, any>;
+type GetManyArgsAny = GetManyArgs<any>;
+type GetArgsAny = GetArgs<any>;
+type GetAggArgsAny = GetAggArgs<any>;
+type VerifyManyArgsAny = VerifyManyArgs<any>;
 type GetArgsInclude<EN extends keyof EntityMeta, R extends keyof EntityMeta[EN]['relations'] = keyof EntityMeta[EN]['relations']> = [R] extends [never] ? {
     _pick?: EntityMeta[EN]['primitives'][];
 } : {
@@ -49,14 +49,14 @@ type GetArgsInclude<EN extends keyof EntityMeta, R extends keyof EntityMeta[EN][
 } & {
     [K in R]?: GetArgsInclude<EntityMeta[EN]['relations'][K]['entityName']>;
 };
-type GetAggResponse<EN extends keyof EntityMeta, A extends GetAggArgs<EN, any>> = {
+type GetAggResponse<EN extends keyof EntityMeta, A extends GetAggArgs<EN>> = {
     [K in A['agg'][0]]: K extends '_count' ? number : number | undefined;
 };
-interface GetManyResponse<EN extends keyof EntityMeta, A extends GetArgs<EN, any>> {
+interface GetManyResponse<EN extends keyof EntityMeta, A extends GetArgs<EN>> {
     nodes: GetResponse<EN, A>[];
     cursor: string | null;
 }
-type GetResponse<EN extends keyof EntityMeta, A extends GetArgs<EN, any>> = A extends {
+type GetResponse<EN extends keyof EntityMeta, A extends GetArgs<EN>> = A extends {
     include: any;
 } ? GetResponseInclude<EN, A['include']> : GetResponseNoInclude<EN>;
 type Get<EntityName extends keyof EntityMeta, Include extends keyof EntityMeta[EntityName]['relations'] | GetArgsInclude<EntityName> = {}> = Include extends GetArgsInclude<EntityName> ? GetResponse<EntityName, {
@@ -99,20 +99,20 @@ type Put<EntityName extends keyof EntityMeta> = PutArgs<EntityMeta[EntityName]['
 type DeepKeys<T> = T extends object ? {
     [K in (string | number) & keyof T]: `${`.${K}` | (`${K}` extends `${number}` ? `[${K}]` : never)}${'' | DeepKeys<T[K]>}`;
 }[(string | number) & keyof T] : never;
-interface EntityMethods<E, EN extends keyof EntityMeta, W> {
+interface EntityMethods<E, EN extends keyof EntityMeta> {
     /** Returns object with with random UUID as `id` and prefilled default values */
     construct(): E;
     /** 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<EN, W>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetResponse<EN, A>>;
-    getMany<A extends GetManyArgs<EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<EN, A>>;
-    getAgg<A extends GetAggArgs<EN, W>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetAggResponse<EN, A>>;
-    getAll<A extends GetManyArgs<EN, W>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<EN, A>['nodes']>;
+    get<A extends GetArgs<EN>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetResponse<EN, A>>;
+    getMany<A extends GetManyArgs<EN>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<EN, A>>;
+    getAgg<A extends GetAggArgs<EN>>(args: A, ctx?: RadsRequestContext): MaybePromise$1<GetAggResponse<EN, A>>;
+    getAll<A extends GetManyArgs<EN>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<GetManyResponse<EN, A>['nodes']>;
     put(data: PutArgs<E>, ctx?: RadsRequestContext): MaybePromise$1<GetResponseNoInclude<EN>>;
     putMany(data: PutArgs<E>[], ctx?: RadsRequestContext): MaybePromise$1<GetResponseNoInclude<EN>[]>;
-    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'>>;
+    verifyMany<A extends VerifyManyArgs<EN>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<VerifyManyResponse>;
+    verifyAll<A extends VerifyManyArgs<EN>>(args?: A, ctx?: RadsRequestContext): MaybePromise$1<Pick<VerifyManyResponse, 'correctCount' | 'incorrectCount'>>;
 }
 
 type MaybePromise<T> = Promise<T> | T;
@@ -408,7 +408,7 @@ interface RadsFeature {
     name: string;
     radsUiSlots?: Record<RadsUiSlotName, RadsUiSlotDefinition[]>;
     init?: (db: Record<string, any>, context: ComputedContextGlobal) => void;
-    enhanceEntityMethods?: (context: ComputedContext, entityMethodsObj: EntityMethods<any, any, any>) => void;
+    enhanceEntityMethods?: (context: ComputedContext, entityMethodsObj: EntityMethods<any, any>) => void;
     beforeGet?: (args: GetArgsAny, ctx: RadsRequestContext, context: ComputedContext) => MaybePromise<any>;
     afterGet?: (items: any[], args: GetArgsAny, ctx: RadsRequestContext, context: ComputedContext) => MaybePromise<void>;
     beforePut?: (items: RadsHookDoc[], ctx: RadsRequestContext, computedContext: ComputedContext) => void;
@@ -448,4 +448,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, DeepPartialWithNullsItem, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, FileUploadResult, GenerateClientNormalizedOptions, GenerateClientOptions, Get, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetArgsWhere, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, Put, 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, Get, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, Put, PutArgs, PutEffect, RadsFeature, RadsHookDoc, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, Where, WhereJsonContains, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/integrations/node.cjs

@@ -106,7 +106,7 @@ function getIndexDts(schema, options) {
     if (options.entitiesDir) {
       imports.push(`import type { ${type.name} } from '../../${options.entitiesDir}/${key}'`);
     }
-    rootFields.push(`${type.handle}: EntityMethods<${type.name}, '${type.name}', ${type.name}_Where>`);
+    rootFields.push(`${type.handle}: EntityMethods<${type.name}, '${type.name}'>`);
     const fieldsArray = Object.values(type.fields);
     const relations = _lodash.default.fromPairs(fieldsArray.filter(f => f.isRelation).map(f => [f.name, {
       entity: f.type,
@@ -114,6 +114,7 @@ function getIndexDts(schema, options) {
     }]));
     entityMeta.push({
       type: type.name,
+      whereType: `${type.name}_Where`,
       relationsStr: _lodash.default.keys(relations).map(k => `${k}: { entityName: '${relations[k].entity}', entity: ${relations[k].entity}, denormFields: ${relations[k].denormFields} }`),
       aggregates: fieldsArray.filter(f => f.type === "number" && !f.isArray).map(x => `'${x.name}'`).join(" | "),
       primitives: fieldsArray.filter(f => !schema[f.type]?.decorators?.entity).map(x => `'${x.name}'`).join(" | ")
@@ -131,6 +132,7 @@ ${whereFields.join("\n")}
   const entityMetaStr = entityMeta.map(x => `
   '${x.type}': {
     type: ${x.type}
+    whereType: ${x.whereType}
     primitives: ${x.primitives || "never"}
     aggregates: ${x.aggregates || "never"}
     relations: {${x.relationsStr}}

package/integrations/node.mjs

@@ -97,7 +97,7 @@ export function getIndexDts(schema, options) {
     if (options.entitiesDir) {
       imports.push(`import type { ${type.name} } from '../../${options.entitiesDir}/${key}'`);
     }
-    rootFields.push(`${type.handle}: EntityMethods<${type.name}, '${type.name}', ${type.name}_Where>`);
+    rootFields.push(`${type.handle}: EntityMethods<${type.name}, '${type.name}'>`);
     const fieldsArray = Object.values(type.fields);
     const relations = _.fromPairs(
       fieldsArray.filter((f) => f.isRelation).map((f) => [
@@ -107,6 +107,7 @@ export function getIndexDts(schema, options) {
     );
     entityMeta.push({
       type: type.name,
+      whereType: `${type.name}_Where`,
       relationsStr: _.keys(relations).map(
         (k) => `${k}: { entityName: '${relations[k].entity}', entity: ${relations[k].entity}, denormFields: ${relations[k].denormFields} }`
       ),
@@ -130,6 +131,7 @@ ${whereFields.join("\n")}
     (x) => `
   '${x.type}': {
     type: ${x.type}
+    whereType: ${x.whereType}
     primitives: ${x.primitives || "never"}
     aggregates: ${x.aggregates || "never"}
     relations: {${x.relationsStr}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.56",
+  "version": "3.0.58",
   "packageManager": "pnpm@8.6.1",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",