rads-db 3.0.13 → 3.0.18

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

@@ -99,7 +99,7 @@ interface ValidateNumberDecoratorArgs {
 }
 interface ValidateStringDecoratorArgs {
     preset?: 'text' | 'html' | 'markdown' | 'alpha' | 'alphanum' | 'number' | 'decimalNumber' | 'email' | 'icon' | 'imageUrl' | 'fileUrl' | 'absoluteUrl' | 'relativeUrl' | 'phoneNumber' | 'datetime' | 'date' | 'time' | 'timeInterval' | 'duration';
-    regex?: RegExp;
+    regex?: RegExp | string;
     minLength?: number;
     maxLength?: number;
 }
@@ -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/integrations/restEndpointsDev.cjs

@@ -7,8 +7,10 @@ module.exports = void 0;
 var _promises = _interopRequireDefault(require("node:fs/promises"));
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _klaw = _interopRequireDefault(require("klaw"));
+var _ignore = _interopRequireDefault(require("ignore"));
 var _restEndpointsDevLint = _interopRequireDefault(require("./restEndpointsDev/restEndpointsDevLint.cjs"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+let gitignore;
 const root = _nodePath.default.resolve(".");
 var _default = {
   lint: _restEndpointsDevLint.default.lint,
@@ -91,17 +93,16 @@ function sanitizeFilepath(filepath) {
   if (!result.startsWith(root)) throw new Error("Invalid path");
 }
 async function readdirRecursive(dir, options) {
+  await initGitignore();
   options = {
     ...options
   };
   const klawIterator = await (0, _klaw.default)(dir, {
-    depthLimit: options.recursive ? 15 : 0,
+    depthLimit: options.recursive ? options.depthLimit ?? 15 : 0,
     preserveSymlinks: true,
     filter: p => {
       const rp = _nodePath.default.relative(".", p);
-      if (rp.startsWith(".git")) return false;
-      if (rp.startsWith("node_modules")) return false;
-      return true;
+      return !gitignore.ignores(rp);
     }
   });
   const results = [];
@@ -110,10 +111,16 @@ async function readdirRecursive(dir, options) {
     const rp = _nodePath.default.relative(dir, file.path).replaceAll("\\", "/");
     if (!rp) continue;
     results.push({
-      path: rp,
+      path: `./${rp}`,
       type: file.stats.isDirectory() ? "tree" : "blob",
       size: file.stats.size
     });
   }
   return results;
+}
+async function initGitignore() {
+  if (gitignore) return;
+  const gitignoreStr = await _promises.default.readFile("./.gitignore", "utf-8");
+  gitignore = (0, _ignore.default)().add(["node_modules", ".git"]);
+  if (gitignoreStr) gitignore = gitignore.add(gitignoreStr.split("\n").filter(x => x));
 }

package/integrations/restEndpointsDev.mjs

@@ -1,7 +1,9 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import klaw from "klaw";
+import ignore from "ignore";
 import restEndpointsDevLint from "./restEndpointsDev/restEndpointsDevLint.mjs";
+let gitignore;
 const root = path.resolve(".");
 export default {
   lint: restEndpointsDevLint.lint,
@@ -83,17 +85,14 @@ function sanitizeFilepath(filepath) {
     throw new Error("Invalid path");
 }
 async function readdirRecursive(dir, options) {
+  await initGitignore();
   options = { ...options };
   const klawIterator = await klaw(dir, {
-    depthLimit: options.recursive ? 15 : 0,
+    depthLimit: options.recursive ? options.depthLimit ?? 15 : 0,
     preserveSymlinks: true,
     filter: (p) => {
       const rp = path.relative(".", p);
-      if (rp.startsWith(".git"))
-        return false;
-      if (rp.startsWith("node_modules"))
-        return false;
-      return true;
+      return !gitignore.ignores(rp);
     }
   });
   const results = [];
@@ -104,10 +103,18 @@ async function readdirRecursive(dir, options) {
     if (!rp)
       continue;
     results.push({
-      path: rp,
+      path: `./${rp}`,
       type: file.stats.isDirectory() ? "tree" : "blob",
       size: file.stats.size
     });
   }
   return results;
 }
+async function initGitignore() {
+  if (gitignore)
+    return;
+  const gitignoreStr = await fs.readFile("./.gitignore", "utf-8");
+  gitignore = ignore().add(["node_modules", ".git"]);
+  if (gitignoreStr)
+    gitignore = gitignore.add(gitignoreStr.split("\n").filter((x) => x));
+}

package/package.json

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