rads-db 3.2.8 → 3.2.9

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { g as RadsConfig, T as TypeDefinition } from './types-efed26f9.js';
+import { g as RadsConfig, T as TypeDefinition } from './types-98e90d7b.js';
 import 'mssql';
 import '_rads-db';
 

package/dist/index.cjs

@@ -581,12 +581,17 @@ async function handleEffectsAfterPut(context, docs, beforePutResults, ctx) {
   );
 }
 
-function cleanUndefinedAndNull(obj, isChange = false) {
+function cleanEntity(obj, isChange = false) {
   for (const key in obj) {
     if (obj[key] == null && !isChange)
       delete obj[key];
+    if (key.endsWith("_replace")) {
+      obj[key.slice(0, -8)] = obj[key];
+      delete obj[key];
+      continue;
+    }
     if (___default.isPlainObject(obj[key]))
-      cleanUndefinedAndNull(obj[key], isChange || key === "change");
+      cleanEntity(obj[key], isChange || key === "change");
   }
 }
 
@@ -872,7 +877,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       const oldDoc = oldDocsById[doc.id];
       doc = merge(oldDoc, doc);
       if (!options.keepNulls)
-        cleanUndefinedAndNull(doc);
+        cleanEntity(doc);
       return { oldDoc, doc };
     });
     await handlePrecomputed(computedContext, docArgsToSave, ctx);
@@ -915,7 +920,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
         }
       }
       if (!options.keepNulls)
-        cleanUndefinedAndNull(doc);
+        cleanEntity(doc);
       return { oldDoc, doc, events: [] };
     });
     if (entitySchema.decorators.precomputed?.preset === "eventSourcing") {
@@ -1045,10 +1050,11 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
         throw new Error("Id is required");
       ctx = { ...options.context, ...ctx };
       const oldDoc = await driverInstance.get({ where: { id: doc.id } }, ctx);
+      console.log(___default.cloneDeep(doc), oldDoc, merge(oldDoc || {}, doc));
       if (oldDoc)
         doc = merge(oldDoc, doc);
       if (!options.keepNulls)
-        cleanUndefinedAndNull(doc);
+        cleanEntity(doc);
       const docArgsToSave = [{ doc, oldDoc }];
       await handlePrecomputed(computedContext, docArgsToSave, ctx);
       await beforePut(docArgsToSave, ctx, computedContext);
@@ -1418,7 +1424,7 @@ function createRadsDbClient(dataSourceKey, args) {
   return generateMethods(s, validators, radsDbArgs);
 }
 
-exports.cleanUndefinedAndNull = cleanUndefinedAndNull;
+exports.cleanEntity = cleanEntity;
 exports.computed = computed;
 exports.createRadsDb = createRadsDb;
 exports.createRadsDbClient = createRadsDbClient;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-efed26f9.js';
-export { O as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, ak as DeepKeys, af as DeepPartial, ad as DeepPartialWithNulls, ae as DeepPartialWithNullsItem, al as EntityMethods, w as EnumDefinition, v as FieldDefinition, J as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, H as GenerateClientNormalizedOptions, B as GenerateClientOptions, a9 as Get, $ as GetAggArgs, a0 as GetAggArgsAgg, a3 as GetAggArgsAny, a6 as GetAggResponse, _ as GetArgs, a2 as GetArgsAny, a5 as GetArgsInclude, Q as GetManyArgs, a1 as GetManyArgsAny, a7 as GetManyResponse, a8 as GetResponse, aa as GetResponseInclude, ab as GetResponseIncludeSelect, ac as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ah as InverseRelation, M as MinimalDriver, aj as Put, ai as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, N as RadsFeature, y as RadsHookDoc, L as RadsUiSlotDefinition, K as RadsUiSlotName, I as RadsVitePluginOptions, ag as Relation, i as RequiredFields, l as RestDriverOptions, A as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, z as SqlDriverOptions, T as TypeDefinition, j as ValidateStringDecoratorArgs, X as VerifyManyArgs, a4 as VerifyManyArgsAny, Y as VerifyManyResponse, Z as Where, W as WhereJsonContains } from './types-efed26f9.js';
+import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-98e90d7b.js';
+export { O as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, ak as DeepKeys, af as DeepPartial, ad as DeepPartialWithNulls, ae as DeepPartialWithNullsItem, al as EntityMethods, w as EnumDefinition, v as FieldDefinition, J as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, H as GenerateClientNormalizedOptions, B as GenerateClientOptions, a9 as Get, $ as GetAggArgs, a0 as GetAggArgsAgg, a3 as GetAggArgsAny, a6 as GetAggResponse, _ as GetArgs, a2 as GetArgsAny, a5 as GetArgsInclude, Q as GetManyArgs, a1 as GetManyArgsAny, a7 as GetManyResponse, a8 as GetResponse, aa as GetResponseInclude, ab as GetResponseIncludeSelect, ac as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ah as InverseRelation, aj as JsonPutOperations, M as MinimalDriver, ai as Put, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, N as RadsFeature, y as RadsHookDoc, L as RadsUiSlotDefinition, K as RadsUiSlotName, I as RadsVitePluginOptions, ag as Relation, i as RequiredFields, l as RestDriverOptions, A as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, z as SqlDriverOptions, T as TypeDefinition, j as ValidateStringDecoratorArgs, X as VerifyManyArgs, a4 as VerifyManyArgsAny, Y as VerifyManyResponse, Z as Where, W as WhereJsonContains } from './types-98e90d7b.js';
 import { RadsDb } from '_rads-db';
 export { RadsDb } from '_rads-db';
 import 'mssql';
@@ -21,7 +21,7 @@ declare function merge<T extends Record<string, any>>(target: T, source: any): T
 
 declare function diff(object: any, base: any, includeDenormFields?: boolean): any;
 
-declare function cleanUndefinedAndNull(obj: Record<string, any>, isChange?: boolean): void;
+declare function cleanEntity(obj: Record<string, any>, isChange?: boolean): void;
 
 /**
  * Creates instance of rads db - object that provides access to all entities.
@@ -35,4 +35,4 @@ declare function createRadsDb<T extends keyof RadsDb>(dataSourceKey: T, args?: C
  */
 declare function createRadsDbClient<T extends keyof RadsDb>(dataSourceKey: T, args?: CreateRadsDbClientArgs): RadsDb[T];
 
-export { ComputedContext, ComputedDecoratorArgs, CreateRadsDbArgs, CreateRadsDbClientArgs, Driver, DriverConstructor, EntityDecoratorArgs, FieldDecoratorArgs, RadsRequestContext, Schema, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };
+export { ComputedContext, ComputedDecoratorArgs, CreateRadsDbArgs, CreateRadsDbClientArgs, Driver, DriverConstructor, EntityDecoratorArgs, FieldDecoratorArgs, RadsRequestContext, Schema, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, cleanEntity, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/dist/index.mjs

@@ -574,12 +574,17 @@ async function handleEffectsAfterPut(context, docs, beforePutResults, ctx) {
   );
 }
 
-function cleanUndefinedAndNull(obj, isChange = false) {
+function cleanEntity(obj, isChange = false) {
   for (const key in obj) {
     if (obj[key] == null && !isChange)
       delete obj[key];
+    if (key.endsWith("_replace")) {
+      obj[key.slice(0, -8)] = obj[key];
+      delete obj[key];
+      continue;
+    }
     if (_.isPlainObject(obj[key]))
-      cleanUndefinedAndNull(obj[key], isChange || key === "change");
+      cleanEntity(obj[key], isChange || key === "change");
   }
 }
 
@@ -865,7 +870,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       const oldDoc = oldDocsById[doc.id];
       doc = merge(oldDoc, doc);
       if (!options.keepNulls)
-        cleanUndefinedAndNull(doc);
+        cleanEntity(doc);
       return { oldDoc, doc };
     });
     await handlePrecomputed(computedContext, docArgsToSave, ctx);
@@ -908,7 +913,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
         }
       }
       if (!options.keepNulls)
-        cleanUndefinedAndNull(doc);
+        cleanEntity(doc);
       return { oldDoc, doc, events: [] };
     });
     if (entitySchema.decorators.precomputed?.preset === "eventSourcing") {
@@ -1038,10 +1043,11 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
         throw new Error("Id is required");
       ctx = { ...options.context, ...ctx };
       const oldDoc = await driverInstance.get({ where: { id: doc.id } }, ctx);
+      console.log(_.cloneDeep(doc), oldDoc, merge(oldDoc || {}, doc));
       if (oldDoc)
         doc = merge(oldDoc, doc);
       if (!options.keepNulls)
-        cleanUndefinedAndNull(doc);
+        cleanEntity(doc);
       const docArgsToSave = [{ doc, oldDoc }];
       await handlePrecomputed(computedContext, docArgsToSave, ctx);
       await beforePut(docArgsToSave, ctx, computedContext);
@@ -1411,4 +1417,4 @@ function createRadsDbClient(dataSourceKey, args) {
   return generateMethods(s, validators, radsDbArgs);
 }
 
-export { cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };
+export { cleanEntity, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/dist/{types-efed26f9.d.ts → types-98e90d7b.d.ts}

@@ -101,10 +101,12 @@ type Relation<T extends {
  * If you need more control, please, use separate request instead.
  */
 type InverseRelation<EN extends keyof EntityMeta> = EntityMeta[EN]['type'];
-type PutArgs<T> = {
+type Put<EN extends keyof EntityMeta> = {
     id: string;
-} & DeepPartialWithNulls<T>;
-type Put<EntityName extends keyof EntityMeta> = PutArgs<EntityMeta[EntityName]['type']>;
+} & JsonPutOperations<EN> & DeepPartialWithNulls<EntityMeta[EN]['type']>;
+type JsonPutOperations<EN extends keyof EntityMeta> = {
+    [K in EntityMeta[EN]['jsonFields'] as `${K & string}_replace`]?: EntityMeta[EN]['type'][K] | string;
+};
 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;
@@ -118,8 +120,8 @@ interface EntityMethods<E, EN extends keyof EntityMeta> {
     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>[]>;
+    put(data: Put<EN>, ctx?: RadsRequestContext): MaybePromise$1<GetResponseNoInclude<EN>>;
+    putMany(data: Put<EN>[], ctx?: RadsRequestContext): MaybePromise$1<GetResponseNoInclude<EN>[]>;
     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'>>;
 }
@@ -476,4 +478,4 @@ interface RadsFeature {
     afterUploadFile?: (result: FileUploadResult, args: FileUploadArgs) => MaybePromise<void>;
 }
 
-export { GetAggArgs as $, RestFileUploadDriverOptions as A, GenerateClientOptions as B, ComputedDecoratorArgs as C, DriverConstructor as D, EntityDecoratorArgs as E, FieldDecoratorArgs as F, GetRestRoutesOptions as G, GenerateClientNormalizedOptions as H, RadsVitePluginOptions as I, FileSystemNode as J, RadsUiSlotName as K, RadsUiSlotDefinition as L, MinimalDriver as M, RadsFeature as N, Change as O, PutEffect as P, GetManyArgs as Q, RadsRequestContext as R, Schema as S, TypeDefinition as T, UiDecoratorArgs as U, ValidateEntityDecoratorArgs as V, WhereJsonContains as W, VerifyManyArgs as X, VerifyManyResponse as Y, Where as Z, GetArgs as _, UiFieldDecoratorArgs as a, GetAggArgsAgg as a0, GetManyArgsAny as a1, GetArgsAny as a2, GetAggArgsAny as a3, VerifyManyArgsAny as a4, GetArgsInclude as a5, GetAggResponse as a6, GetManyResponse as a7, GetResponse as a8, Get as a9, GetResponseInclude as aa, GetResponseIncludeSelect as ab, GetResponseNoInclude as ac, DeepPartialWithNulls as ad, DeepPartialWithNullsItem as ae, DeepPartial as af, Relation as ag, InverseRelation as ah, PutArgs as ai, Put as aj, DeepKeys as ak, EntityMethods as al, ValidateFieldDecoratorArgs as b, Driver as c, ComputedContext as d, CreateRadsDbArgs as e, CreateRadsDbClientArgs as f, RadsConfig as g, RadsConfigDataSource as h, RequiredFields as i, ValidateStringDecoratorArgs as j, CreateRadsArgsDrivers as k, RestDriverOptions as l, CreateRadsDbArgsNormalized as m, SchemaLoadResult as n, SchemaValidators as o, FileUploadResult as p, FileUploadDriver as q, RadsDbInstance as r, GetRestRoutesArgs as s, GetRestRoutesResponse as t, FileUploadArgs as u, FieldDefinition as v, EnumDefinition as w, ComputedContextGlobal as x, RadsHookDoc as y, SqlDriverOptions as z };
+export { GetAggArgs as $, RestFileUploadDriverOptions as A, GenerateClientOptions as B, ComputedDecoratorArgs as C, DriverConstructor as D, EntityDecoratorArgs as E, FieldDecoratorArgs as F, GetRestRoutesOptions as G, GenerateClientNormalizedOptions as H, RadsVitePluginOptions as I, FileSystemNode as J, RadsUiSlotName as K, RadsUiSlotDefinition as L, MinimalDriver as M, RadsFeature as N, Change as O, PutEffect as P, GetManyArgs as Q, RadsRequestContext as R, Schema as S, TypeDefinition as T, UiDecoratorArgs as U, ValidateEntityDecoratorArgs as V, WhereJsonContains as W, VerifyManyArgs as X, VerifyManyResponse as Y, Where as Z, GetArgs as _, UiFieldDecoratorArgs as a, GetAggArgsAgg as a0, GetManyArgsAny as a1, GetArgsAny as a2, GetAggArgsAny as a3, VerifyManyArgsAny as a4, GetArgsInclude as a5, GetAggResponse as a6, GetManyResponse as a7, GetResponse as a8, Get as a9, GetResponseInclude as aa, GetResponseIncludeSelect as ab, GetResponseNoInclude as ac, DeepPartialWithNulls as ad, DeepPartialWithNullsItem as ae, DeepPartial as af, Relation as ag, InverseRelation as ah, Put as ai, JsonPutOperations as aj, DeepKeys as ak, EntityMethods as al, ValidateFieldDecoratorArgs as b, Driver as c, ComputedContext as d, CreateRadsDbArgs as e, CreateRadsDbClientArgs as f, RadsConfig as g, RadsConfigDataSource as h, RequiredFields as i, ValidateStringDecoratorArgs as j, CreateRadsArgsDrivers as k, RestDriverOptions as l, CreateRadsDbArgsNormalized as m, SchemaLoadResult as n, SchemaValidators as o, FileUploadResult as p, FileUploadDriver as q, RadsDbInstance as r, GetRestRoutesArgs as s, GetRestRoutesResponse as t, FileUploadArgs as u, FieldDefinition as v, EnumDefinition as w, ComputedContextGlobal as x, RadsHookDoc as y, SqlDriverOptions as z };

package/features/eventSourcing.cjs

@@ -81,7 +81,7 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
             continue;
           }
           aggDoc = newAggDoc;
-          if (!context.options.keepNulls) (0, _radsDb.cleanUndefinedAndNull)(aggDoc);
+          if (!context.options.keepNulls) (0, _radsDb.cleanEntity)(aggDoc);
         }
         if (aggDoc) {
           result.push({

package/features/eventSourcing.mjs

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { cleanUndefinedAndNull, diff, handlePrecomputed, merge } from "rads-db";
+import { cleanEntity, diff, handlePrecomputed, merge } from "rads-db";
 export default (options) => {
   return {
     name: "eventSourcing",
@@ -70,7 +70,7 @@ function getEffectFor(entityName, aggregateRelationField, eventEntityName, schem
             continue;
           }
           aggDoc = newAggDoc;
-          if (!context.options.keepNulls) cleanUndefinedAndNull(aggDoc);
+          if (!context.options.keepNulls) cleanEntity(aggDoc);
         }
         if (aggDoc) {
           result.push({

package/integrations/node.cjs

@@ -115,7 +115,8 @@ function getIndexDtsInner(schema, rootTypeName, entitiesDir) {
       relationsStr: _lodash.default.keys(relations).map(k => `${k}: { entityName: '${relations[k].entity}', entity: ${relations[k].entity}, denormFields: ${relations[k].denormFields} }`),
       nestedObjectsStr: fieldsArray.filter(f => schema[f.type]?.fields && !f.isRelation && !f.isChange && !f.isInverseRelation).map(f => `${f.name}: { entityName: '${f.type}' }`),
       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(" | ")
+      primitives: fieldsArray.filter(f => !schema[f.type]?.decorators?.entity).map(x => `'${x.name}'`).join(" | "),
+      jsonFields: fieldsArray.filter(f => !f.isArray && (f.type === "Record<string, any>" || f.isChange)).map(x => `'${x.name}'`).join(" | ")
     });
   }
   for (const key in schema) {
@@ -135,6 +136,7 @@ ${whereFields.join("\n")}
     aggregates: ${x.aggregates || "never"}
     nestedObjects: {${x.nestedObjectsStr}}
     relations: {${x.relationsStr}}
+    jsonFields: ${x.jsonFields || "never"}
   }
       `.trim()).join("\n");
   return `

package/integrations/node.mjs

@@ -120,7 +120,8 @@ export function getIndexDtsInner(schema, rootTypeName, entitiesDir) {
       ),
       nestedObjectsStr: fieldsArray.filter((f) => schema[f.type]?.fields && !f.isRelation && !f.isChange && !f.isInverseRelation).map((f) => `${f.name}: { entityName: '${f.type}' }`),
       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(" | ")
+      primitives: fieldsArray.filter((f) => !schema[f.type]?.decorators?.entity).map((x) => `'${x.name}'`).join(" | "),
+      jsonFields: fieldsArray.filter((f) => !f.isArray && (f.type === "Record<string, any>" || f.isChange)).map((x) => `'${x.name}'`).join(" | ")
     });
   }
   for (const key in schema) {
@@ -143,6 +144,7 @@ ${whereFields.join("\n")}
     aggregates: ${x.aggregates || "never"}
     nestedObjects: {${x.nestedObjectsStr}}
     relations: {${x.relationsStr}}
+    jsonFields: ${x.jsonFields || "never"}
   }
       `.trim()
   ).join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",
   "license": "ISC",