rads-db 3.0.13 → 3.0.15

package/dist/index.cjs

@@ -983,10 +983,19 @@ function generateMethods(schema, validators, options) {
   const db = {
     _schema: schema,
     _radsUiSlots: getRadsUiSlots(opts.features),
-    uploadFile(args) {
+    async uploadFile(args) {
+      for (const f of opts.features) {
+        const result2 = await f.beforeUploadFile?.(args);
+        if (result2)
+          return result2;
+      }
       if (!opts.fileUploadDriver)
         throw new Error(`Missing configuration. Please specify "fileUploadDriver" argument in "createRads()".`);
-      return opts.fileUploadDriver.uploadFile(args);
+      const result = await opts.fileUploadDriver.uploadFile(args);
+      for (const f of opts.features) {
+        await f.afterUploadFile?.(result, args);
+      }
+      return result;
     }
   };
   const effects = {};

package/dist/index.d.ts

@@ -207,12 +207,13 @@ interface TypeDefinition {
     handle?: string;
     handlePlural?: string;
 }
+interface FileUploadResult {
+    url: string;
+}
 interface FileUploadDriver {
     driverName: string;
     client?: any;
-    uploadFile(args: FileUploadArgs, ctx?: RadsRequestContext): Promise<{
-        url: string;
-    }>;
+    uploadFile(args: FileUploadArgs, ctx?: RadsRequestContext): Promise<FileUploadResult>;
 }
 interface GetRestRoutesOptions {
     /** Instance of RadsDb */
@@ -366,6 +367,8 @@ interface RadsFeature {
         oldDoc: any;
         doc: any;
     }[], ctx: RadsRequestContext, computedContext: ComputedContext) => void;
+    beforeUploadFile?: (args: FileUploadArgs) => MaybePromise<any>;
+    afterUploadFile?: (result: FileUploadResult, args: FileUploadArgs) => MaybePromise<void>;
 }
 
 declare function entity<T>(meta?: EntityDecoratorArgs): (classConstructor: new () => T, _ctx?: ClassDecoratorContext<any>) => void;
@@ -389,4 +392,4 @@ declare function createRadsDb(args?: CreateRadsDbArgs): RadsDb;
  */
 declare function createRadsDbClient(args?: CreateRadsDbClientArgs): RadsDb;
 
-export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepPartial, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, computed, createRadsDb, createRadsDbClient, entity, field, getDriverInstance, precomputed, ui, validate };
+export { Change, ComputedContext, ComputedContextGlobal, ComputedDecoratorArgs, CreateRadsArgsDrivers, CreateRadsDbArgs, CreateRadsDbArgsNormalized, CreateRadsDbClientArgs, DeepPartial, Driver, DriverConstructor, EntityDecoratorArgs, EntityMethods, EnumDefinition, FieldDecoratorArgs, FieldDefinition, FileSystemNode, FileUploadArgs, FileUploadDriver, FileUploadResult, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, GetRestRoutesArgs, GetRestRoutesOptions, GetRestRoutesResponse, MinimalDriver, PutArgs, PutEffect, RadsFeature, RadsRequestContext, RadsUiSlotDefinition, RadsUiSlotName, RadsVitePluginOptions, Relation, RequiredFields, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, VerifyManyArgs, VerifyManyArgsAny, VerifyManyResponse, computed, createRadsDb, createRadsDbClient, entity, field, getDriverInstance, precomputed, ui, validate };

package/dist/index.mjs

@@ -975,10 +975,19 @@ function generateMethods(schema, validators, options) {
   const db = {
     _schema: schema,
     _radsUiSlots: getRadsUiSlots(opts.features),
-    uploadFile(args) {
+    async uploadFile(args) {
+      for (const f of opts.features) {
+        const result2 = await f.beforeUploadFile?.(args);
+        if (result2)
+          return result2;
+      }
       if (!opts.fileUploadDriver)
         throw new Error(`Missing configuration. Please specify "fileUploadDriver" argument in "createRads()".`);
-      return opts.fileUploadDriver.uploadFile(args);
+      const result = await opts.fileUploadDriver.uploadFile(args);
+      for (const f of opts.features) {
+        await f.afterUploadFile?.(result, args);
+      }
+      return result;
     }
   };
   const effects = {};

package/features/softDelete.cjs

@@ -11,9 +11,7 @@ var _default = () => {
       if (!context.schema[context.typeName]?.fields?.isDeleted) return;
       if (args.where.isDeleted || args.where.isDeleted_in) return;
       args.where._and = [...(args.where._and || []), {
-        _not: {
-          isDeleted: true
-        }
+        isDeleted: false
       }];
     }
   };

package/features/softDelete.mjs

@@ -6,7 +6,7 @@ export default () => {
         return;
       if (args.where.isDeleted || args.where.isDeleted_in)
         return;
-      args.where._and = [...args.where._and || [], { _not: { isDeleted: true } }];
+      args.where._and = [...args.where._and || [], { isDeleted: false }];
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "files": [
     "dist",
     "drivers",