rads-db 0.1.42 → 0.1.44

package/dist/index.cjs

@@ -2,12 +2,14 @@
 
 const zod = require('zod');
 const _ = require('lodash');
+const createMerge = require('@fastify/deepmerge');
 const uuid = require('uuid');
 const _radsDb = require('_rads-db');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const ___default = /*#__PURE__*/_interopDefaultCompat(_);
+const createMerge__default = /*#__PURE__*/_interopDefaultCompat(createMerge);
 
 function generateValidators(schema) {
   const zodSchemas = {};
@@ -60,7 +62,7 @@ function getFieldZodSchema(zodSchemas, schema, field, shouldBeLazy) {
   if (field.isArray)
     fieldSchema = fieldSchema.array();
   if (!field.isRequired)
-    fieldSchema = fieldSchema.optional();
+    fieldSchema = fieldSchema.optional().nullable();
   if (field.defaultValue !== void 0)
     fieldSchema = fieldSchema.default(field.defaultValue);
   if (field.defaultValueCopyFrom !== void 0)
@@ -96,13 +98,40 @@ function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
   throw new Error(`Unknown type: ${field.type}`);
 }
 
-function merge(oldEntity, ...changes) {
-  return ___default.mergeWith({}, oldEntity, ...changes, (objValue, srcValue) => {
-    if (___default.isArray(objValue) && ___default.isArray(srcValue)) {
-      return srcValue;
-    }
-    return void 0;
-  });
+const mergeFn = createMerge__default({
+  mergeArray(options) {
+    const clone = options.clone;
+    return function(target, source) {
+      return clone(source);
+    };
+  }
+});
+function merge(target, source) {
+  cleanUndefined(source);
+  const result = mergeFn(target, source);
+  return result;
+}
+function cleanUndefined(obj) {
+  if (!obj || !___default.isPlainObject(obj))
+    return;
+  cleanUndefinedInner(obj);
+}
+function cleanUndefinedInner(obj) {
+  for (const key in obj) {
+    if (obj[key] === void 0)
+      delete obj[key];
+    if (___default.isPlainObject(obj[key]))
+      cleanUndefinedInner(obj[key]);
+  }
+}
+
+function cleanUndefinedAndNull(obj) {
+  for (const key in obj) {
+    if (obj[key] == null)
+      delete obj[key];
+    if (___default.isPlainObject(obj[key]))
+      cleanUndefinedAndNull(obj[key]);
+  }
 }
 
 const operatorFns = {
@@ -586,6 +615,8 @@ function generateMethods(schema, validators, options) {
     uploadFile(args) {
       if (!opts.fileUploadDriver)
         throw new Error(`Missing configuration. Please specify "fileUploadDriver" argument in "createRads()".`);
+      if (!args.containerName)
+        args.containerName = "files";
       return opts.fileUploadDriver.uploadFile(args);
     }
   };
@@ -612,6 +643,7 @@ function generateMethods(schema, validators, options) {
       db
     };
     const driverInstance = getDriverInstance(schema, key, opts.driver, drivers);
+    const mustCleanNulls = driverInstance.driverName !== "restApi";
     db[handle] = {
       getAgg: async (args, ctx) => {
         if (!args?.agg)
@@ -652,6 +684,8 @@ function generateMethods(schema, validators, options) {
         const oldDoc = await driverInstance.get({ where: { id: doc.id } });
         if (oldDoc)
           doc = merge(oldDoc, doc);
+        if (mustCleanNulls)
+          cleanUndefinedAndNull(doc);
         doc = validators[key](doc);
         const docArgsToSave = [{ doc, oldDoc }];
         await fillDenormFieldsBeforePut(computedContext, docArgsToSave);
@@ -674,6 +708,8 @@ function generateMethods(schema, validators, options) {
         const docArgsToSave = docs.map((doc) => {
           const oldDoc = oldDocsById[doc.id];
           doc = merge(oldDoc, doc);
+          if (mustCleanNulls)
+            cleanUndefinedAndNull(doc);
           doc = validators[key](doc);
           return { oldDoc, doc };
         });

package/dist/index.d.ts

@@ -51,12 +51,15 @@ type GetResponseNoInclude<E, EN extends keyof EntityMeta> = {
 type DeepPartial<T> = {
     [K in keyof T]?: DeepPartial<T[K]>;
 };
+type DeepPartialNullable<T> = {
+    [K in keyof T]?: DeepPartialNullable<T[K]> | null;
+};
 type Relation<T extends {
     id: any;
 }, K extends Exclude<keyof T, 'id'> = never> = Pick<T, K | 'id'> & DeepPartial<T>;
 type PutArgs<T> = {
     id: string;
-} & DeepPartial<T>;
+} & DeepPartialNullable<T>;
 interface EntityMethods<E, EN extends keyof EntityMeta, W> {
     get<A extends GetArgs<E, EN, W>>(args: A): MaybePromise$1<GetResponse<E, EN, A>>;
     getMany<A extends GetManyArgs<E, EN, W>>(args?: A): MaybePromise$1<GetManyResponse<E, EN, A>>;
@@ -78,7 +81,7 @@ interface ValidateNumberDecoratorArgs {
     max?: number;
 }
 interface ValidateStringDecoratorArgs {
-    preset?: 'number' | 'decimalNumber' | 'email' | 'icon' | 'imageUrl' | 'fileUrl' | 'absoluteUrl' | 'relativeUrl' | 'phoneNumber' | 'datetime' | 'date' | 'time' | 'timeInterval' | 'duration';
+    preset?: 'text' | 'html' | 'markdown' | 'alpha' | 'alphanum' | 'number' | 'decimalNumber' | 'email' | 'icon' | 'imageUrl' | 'fileUrl' | 'absoluteUrl' | 'relativeUrl' | 'phoneNumber' | 'datetime' | 'date' | 'time' | 'timeInterval' | 'duration';
     regex?: RegExp;
     minLength?: number;
     maxLength?: number;
@@ -159,8 +162,8 @@ interface FileUploadDriver {
 }
 interface FileUploadArgs {
     blob: Blob;
+    fileName: string;
     containerName?: string;
-    fileName?: string;
     options?: any;
 }
 interface MinimalDriver {
@@ -263,4 +266,4 @@ declare function computed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassField
 declare function createRads(args?: CreateRadsArgs): RadsDb;
 declare function getRestRoutes(db: RadsDb, prefix?: string): Record<string, Record<string, Function>>;
 
-export { AzureCosmosDriverOptions, AzureStorageBlobUploadDriverOptions, Change, ComputedContext, ComputedDecoratorArgs, CreateRadsArgs, DeepPartial, Driver, DriverConstructor, DriverOptions, EntityDecoratorArgs, EntityMethods, FieldDecoratorArgs, FieldDefinition, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, MemoryDriverOptions, MemoryFileUploadDriverOptions, MinimalDriver, PutArgs, PutEffect, RadsRequestContext, Relation, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, computed, createRads, entity, field, getRestRoutes, precomputed, ui, validate };
+export { AzureCosmosDriverOptions, AzureStorageBlobUploadDriverOptions, Change, ComputedContext, ComputedDecoratorArgs, CreateRadsArgs, DeepPartial, DeepPartialNullable, Driver, DriverConstructor, DriverOptions, EntityDecoratorArgs, EntityMethods, FieldDecoratorArgs, FieldDefinition, FileUploadArgs, FileUploadDriver, GenerateClientNormalizedOptions, GenerateClientOptions, GetAggArgs, GetAggArgsAgg, GetAggArgsAny, GetAggResponse, GetArgs, GetArgsAny, GetArgsInclude, GetManyArgs, GetManyArgsAny, GetManyResponse, GetResponse, GetResponseInclude, GetResponseIncludeSelect, GetResponseNoInclude, MemoryDriverOptions, MemoryFileUploadDriverOptions, MinimalDriver, PutArgs, PutEffect, RadsRequestContext, Relation, RestDriverOptions, RestFileUploadDriverOptions, Schema, SchemaValidators, TypeDefinition, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, ValidateStringDecoratorArgs, computed, createRads, entity, field, getRestRoutes, precomputed, ui, validate };

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import _ from 'lodash';
+import createMerge from '@fastify/deepmerge';
 import { v4 } from 'uuid';
 import { schema } from '_rads-db';
 
@@ -54,7 +55,7 @@ function getFieldZodSchema(zodSchemas, schema, field, shouldBeLazy) {
   if (field.isArray)
     fieldSchema = fieldSchema.array();
   if (!field.isRequired)
-    fieldSchema = fieldSchema.optional();
+    fieldSchema = fieldSchema.optional().nullable();
   if (field.defaultValue !== void 0)
     fieldSchema = fieldSchema.default(field.defaultValue);
   if (field.defaultValueCopyFrom !== void 0)
@@ -90,13 +91,40 @@ function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
   throw new Error(`Unknown type: ${field.type}`);
 }
 
-function merge(oldEntity, ...changes) {
-  return _.mergeWith({}, oldEntity, ...changes, (objValue, srcValue) => {
-    if (_.isArray(objValue) && _.isArray(srcValue)) {
-      return srcValue;
-    }
-    return void 0;
-  });
+const mergeFn = createMerge({
+  mergeArray(options) {
+    const clone = options.clone;
+    return function(target, source) {
+      return clone(source);
+    };
+  }
+});
+function merge(target, source) {
+  cleanUndefined(source);
+  const result = mergeFn(target, source);
+  return result;
+}
+function cleanUndefined(obj) {
+  if (!obj || !_.isPlainObject(obj))
+    return;
+  cleanUndefinedInner(obj);
+}
+function cleanUndefinedInner(obj) {
+  for (const key in obj) {
+    if (obj[key] === void 0)
+      delete obj[key];
+    if (_.isPlainObject(obj[key]))
+      cleanUndefinedInner(obj[key]);
+  }
+}
+
+function cleanUndefinedAndNull(obj) {
+  for (const key in obj) {
+    if (obj[key] == null)
+      delete obj[key];
+    if (_.isPlainObject(obj[key]))
+      cleanUndefinedAndNull(obj[key]);
+  }
 }
 
 const operatorFns = {
@@ -580,6 +608,8 @@ function generateMethods(schema, validators, options) {
     uploadFile(args) {
       if (!opts.fileUploadDriver)
         throw new Error(`Missing configuration. Please specify "fileUploadDriver" argument in "createRads()".`);
+      if (!args.containerName)
+        args.containerName = "files";
       return opts.fileUploadDriver.uploadFile(args);
     }
   };
@@ -606,6 +636,7 @@ function generateMethods(schema, validators, options) {
       db
     };
     const driverInstance = getDriverInstance(schema, key, opts.driver, drivers);
+    const mustCleanNulls = driverInstance.driverName !== "restApi";
     db[handle] = {
       getAgg: async (args, ctx) => {
         if (!args?.agg)
@@ -646,6 +677,8 @@ function generateMethods(schema, validators, options) {
         const oldDoc = await driverInstance.get({ where: { id: doc.id } });
         if (oldDoc)
           doc = merge(oldDoc, doc);
+        if (mustCleanNulls)
+          cleanUndefinedAndNull(doc);
         doc = validators[key](doc);
         const docArgsToSave = [{ doc, oldDoc }];
         await fillDenormFieldsBeforePut(computedContext, docArgsToSave);
@@ -668,6 +701,8 @@ function generateMethods(schema, validators, options) {
         const docArgsToSave = docs.map((doc) => {
           const oldDoc = oldDocsById[doc.id];
           doc = merge(oldDoc, doc);
+          if (mustCleanNulls)
+            cleanUndefinedAndNull(doc);
           doc = validators[key](doc);
           return { oldDoc, doc };
         });

package/fileUploadDrivers/restApi.cjs

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 module.exports = void 0;
-var _formData = _interopRequireDefault(require("form-data"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = options => {
   options = {
     baseUrl: "/api",
@@ -17,7 +15,7 @@ var _default = options => {
   const driver = {
     driverName: "restApi",
     async uploadFile(args) {
-      const form = new _formData.default();
+      const form = new FormData();
       form.append("containerName", args.containerName || "");
       form.append("blob", args.blob, args.fileName);
       const response = await fetch(`${options.baseUrl}/uploadFile`, {

package/fileUploadDrivers/restApi.mjs

@@ -1,4 +1,3 @@
-import FormData from "form-data";
 export default (options) => {
   options = { baseUrl: "/api", fetch: globalThis.fetch, ...options };
   const fetch = options.fetch || globalThis.fetch;

package/package.json

@@ -34,7 +34,7 @@
       "require": "./integrations/*.cjs"
     }
   },
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "keywords": [],
   "author": "",
@@ -74,9 +74,9 @@
     "vitest": "^0.31.0"
   },
   "dependencies": {
+    "@fastify/deepmerge": "^1.3.0",
     "@nuxt/kit": "^3.5.1",
     "dataloader": "^2.2.2",
-    "form-data": "^4.0.0",
     "lodash": "^4.17.21",
     "pluralize": "^8.0.0",
     "uuid": ">=8",