rads-db 3.2.33 → 3.2.35

package/dist/config.d.ts

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

package/dist/index.cjs

@@ -11,6 +11,66 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const ___default = /*#__PURE__*/_interopDefaultCompat(_);
 const createMerge__default = /*#__PURE__*/_interopDefaultCompat(createMerge);
 
+function stashUnknownEnumValues(doc, oldDoc, typeName, schema) {
+  const ctx = { stash: [], path: [] };
+  walkType(doc, oldDoc, typeName, schema, ctx);
+  return ctx.stash;
+}
+function walkType(doc, oldDoc, typeName, schema, ctx) {
+  const type = schema[typeName];
+  if (!type?.fields || !doc || typeof doc !== "object")
+    return;
+  for (const [fieldName, field] of Object.entries(type.fields)) {
+    if (field.decorators?.computed || field.decorators?.precomputed)
+      continue;
+    if (field.isInverseRelation || field.isRelation || field.isChange)
+      continue;
+    const val = doc[fieldName];
+    if (val == null)
+      continue;
+    const fieldType = schema[field.type];
+    if (!fieldType)
+      continue;
+    if (fieldType.enumValues) {
+      stashEnumField({ doc, oldDoc, fieldName }, field, fieldType, ctx);
+    } else if (fieldType.fields) {
+      walkNestedField(doc[fieldName], oldDoc?.[fieldName], field, schema, {
+        stash: ctx.stash,
+        path: [...ctx.path, fieldName]
+      });
+    }
+  }
+}
+function stashEnumField({ doc, oldDoc, fieldName }, field, fieldType, ctx) {
+  const knownValues = new Set(Object.values(fieldType.enumValues).map((v) => v.name));
+  const placeholder = Object.values(fieldType.enumValues)[0]?.name;
+  if (!placeholder)
+    return;
+  const val = doc[fieldName];
+  const fieldPath = [...ctx.path, fieldName];
+  if (field.isArray && Array.isArray(val)) {
+    const oldArr = Array.isArray(oldDoc?.[fieldName]) ? oldDoc[fieldName] : [];
+    const oldSet = new Set(oldArr);
+    const hasUnknownFromDb = val.some((v) => !knownValues.has(v) && oldSet.has(v));
+    if (hasUnknownFromDb) {
+      ctx.stash.push({ path: fieldPath, original: val });
+      doc[fieldName] = val.map((v) => !knownValues.has(v) && oldSet.has(v) ? placeholder : v);
+    }
+  } else if (!field.isArray && !knownValues.has(val) && val === oldDoc?.[fieldName]) {
+    ctx.stash.push({ path: fieldPath, original: val });
+    doc[fieldName] = placeholder;
+  }
+}
+function walkNestedField(val, oldVal, field, schema, ctx) {
+  if (field.isArray && Array.isArray(val)) {
+    const oldArr = Array.isArray(oldVal) ? oldVal : [];
+    val.forEach((item, i) => {
+      walkType(item, oldArr[i], field.type, schema, { stash: ctx.stash, path: [...ctx.path, i] });
+    });
+  } else if (!field.isArray) {
+    walkType(val, oldVal, field.type, schema, ctx);
+  }
+}
 function generateValidators(schema) {
   const zodSchemas = {};
   for (const key in schema) {
@@ -19,7 +79,8 @@ function generateValidators(schema) {
   }
   const result = {};
   for (const key in zodSchemas) {
-    result[key] = (value) => {
+    result[key] = (value, oldDoc) => {
+      const stash = oldDoc ? stashUnknownEnumValues(value, oldDoc, key, schema) : [];
       try {
         value = zodSchemas[key].parse(value);
       } catch (error) {
@@ -28,6 +89,9 @@ function generateValidators(schema) {
         else
           throw error;
       }
+      for (const { path, original } of stash) {
+        ___default.set(value, path, original);
+      }
       fillDefaultValues(schema, key, value);
       return value;
     };
@@ -887,7 +951,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     await beforePut(docArgsToSave, ctx, computedContext);
     const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
     for (const d of docArgsToSave) {
-      const validatedDoc = validators[key](d.doc);
+      const validatedDoc = validators[key](d.doc, d.oldDoc);
       for (const f of precomputedFields || []) {
         ___default.set(validatedDoc, f, ___default.get(d.doc, f));
       }
@@ -941,7 +1005,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
     await beforePut(docArgsToSave, ctx, computedContext);
     for (const d of docArgsToSave) {
-      const validatedDoc = validators[key](d.doc);
+      const validatedDoc = validators[key](d.doc, d.oldDoc);
       for (const f of precomputedFields || []) {
         ___default.set(validatedDoc, f, ___default.get(d.doc, f));
       }
@@ -1061,7 +1125,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await handlePrecomputed(computedContext, docArgsToSave, ctx);
       await beforePut(docArgsToSave, ctx, computedContext);
       const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
-      const validatedDoc = validators[key](doc);
+      const validatedDoc = validators[key](doc, oldDoc);
       docArgsToSave[0].doc = validatedDoc;
       if (precomputedFields) {
         for (const f of precomputedFields) {

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-c56a76fe.js';
-export { O as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, an as DeepKeys, ai as DeepPartial, af as DeepPartialArrayItem, ad as DeepPartialWithNulls, ae as DeepPartialWithNullsItem, ag as DeepPartialWithoutNulls, ah as DeepPartialWithoutNullsItem, ao 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, ak as InverseRelation, am as JsonPutOperations, M as MinimalDriver, al 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, aj 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-c56a76fe.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-1fc744a4.js';
+export { O as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, an as DeepKeys, ai as DeepPartial, af as DeepPartialArrayItem, ad as DeepPartialWithNulls, ae as DeepPartialWithNullsItem, ag as DeepPartialWithoutNulls, ah as DeepPartialWithoutNullsItem, ao 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, ak as InverseRelation, am as JsonPutOperations, M as MinimalDriver, al 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, aj 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-1fc744a4.js';
 import { RadsDb } from '_rads-db';
 export { RadsDb } from '_rads-db';
 import 'mssql';

package/dist/index.mjs

@@ -4,6 +4,66 @@ import { v4 } from 'uuid';
 import createMerge from '@fastify/deepmerge';
 import { schemas } from '_rads-db';
 
+function stashUnknownEnumValues(doc, oldDoc, typeName, schema) {
+  const ctx = { stash: [], path: [] };
+  walkType(doc, oldDoc, typeName, schema, ctx);
+  return ctx.stash;
+}
+function walkType(doc, oldDoc, typeName, schema, ctx) {
+  const type = schema[typeName];
+  if (!type?.fields || !doc || typeof doc !== "object")
+    return;
+  for (const [fieldName, field] of Object.entries(type.fields)) {
+    if (field.decorators?.computed || field.decorators?.precomputed)
+      continue;
+    if (field.isInverseRelation || field.isRelation || field.isChange)
+      continue;
+    const val = doc[fieldName];
+    if (val == null)
+      continue;
+    const fieldType = schema[field.type];
+    if (!fieldType)
+      continue;
+    if (fieldType.enumValues) {
+      stashEnumField({ doc, oldDoc, fieldName }, field, fieldType, ctx);
+    } else if (fieldType.fields) {
+      walkNestedField(doc[fieldName], oldDoc?.[fieldName], field, schema, {
+        stash: ctx.stash,
+        path: [...ctx.path, fieldName]
+      });
+    }
+  }
+}
+function stashEnumField({ doc, oldDoc, fieldName }, field, fieldType, ctx) {
+  const knownValues = new Set(Object.values(fieldType.enumValues).map((v) => v.name));
+  const placeholder = Object.values(fieldType.enumValues)[0]?.name;
+  if (!placeholder)
+    return;
+  const val = doc[fieldName];
+  const fieldPath = [...ctx.path, fieldName];
+  if (field.isArray && Array.isArray(val)) {
+    const oldArr = Array.isArray(oldDoc?.[fieldName]) ? oldDoc[fieldName] : [];
+    const oldSet = new Set(oldArr);
+    const hasUnknownFromDb = val.some((v) => !knownValues.has(v) && oldSet.has(v));
+    if (hasUnknownFromDb) {
+      ctx.stash.push({ path: fieldPath, original: val });
+      doc[fieldName] = val.map((v) => !knownValues.has(v) && oldSet.has(v) ? placeholder : v);
+    }
+  } else if (!field.isArray && !knownValues.has(val) && val === oldDoc?.[fieldName]) {
+    ctx.stash.push({ path: fieldPath, original: val });
+    doc[fieldName] = placeholder;
+  }
+}
+function walkNestedField(val, oldVal, field, schema, ctx) {
+  if (field.isArray && Array.isArray(val)) {
+    const oldArr = Array.isArray(oldVal) ? oldVal : [];
+    val.forEach((item, i) => {
+      walkType(item, oldArr[i], field.type, schema, { stash: ctx.stash, path: [...ctx.path, i] });
+    });
+  } else if (!field.isArray) {
+    walkType(val, oldVal, field.type, schema, ctx);
+  }
+}
 function generateValidators(schema) {
   const zodSchemas = {};
   for (const key in schema) {
@@ -12,7 +72,8 @@ function generateValidators(schema) {
   }
   const result = {};
   for (const key in zodSchemas) {
-    result[key] = (value) => {
+    result[key] = (value, oldDoc) => {
+      const stash = oldDoc ? stashUnknownEnumValues(value, oldDoc, key, schema) : [];
       try {
         value = zodSchemas[key].parse(value);
       } catch (error) {
@@ -21,6 +82,9 @@ function generateValidators(schema) {
         else
           throw error;
       }
+      for (const { path, original } of stash) {
+        _.set(value, path, original);
+      }
       fillDefaultValues(schema, key, value);
       return value;
     };
@@ -880,7 +944,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     await beforePut(docArgsToSave, ctx, computedContext);
     const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
     for (const d of docArgsToSave) {
-      const validatedDoc = validators[key](d.doc);
+      const validatedDoc = validators[key](d.doc, d.oldDoc);
       for (const f of precomputedFields || []) {
         _.set(validatedDoc, f, _.get(d.doc, f));
       }
@@ -934,7 +998,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
     await beforePut(docArgsToSave, ctx, computedContext);
     for (const d of docArgsToSave) {
-      const validatedDoc = validators[key](d.doc);
+      const validatedDoc = validators[key](d.doc, d.oldDoc);
       for (const f of precomputedFields || []) {
         _.set(validatedDoc, f, _.get(d.doc, f));
       }
@@ -1054,7 +1118,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await handlePrecomputed(computedContext, docArgsToSave, ctx);
       await beforePut(docArgsToSave, ctx, computedContext);
       const beforePutResults = await handleEffectsBeforePut(computedContext, docArgsToSave, ctx);
-      const validatedDoc = validators[key](doc);
+      const validatedDoc = validators[key](doc, oldDoc);
       docArgsToSave[0].doc = validatedDoc;
       if (precomputedFields) {
         for (const f of precomputedFields) {

package/dist/{types-c56a76fe.d.ts → types-1fc744a4.d.ts}

@@ -77,12 +77,12 @@ type KeepArray<TMaybeArray, TType> = NonNullable<TMaybeArray> extends any[] ? TT
 type GetResponseInclude<EN extends keyof EntityMeta, I extends GetArgsInclude<EN>> = I extends {
     _pick: readonly string[];
 } ? GetResponseIncludeSelect<EN, I> : {
-    [K in keyof EntityMeta[EN]['type']]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof I ? KeepArray<EntityMeta[EN]['type'][K], GetResponseInclude<EntityMeta[EN]['relations'][K]['entityName'], I[K]>> : KeepArray<EntityMeta[EN]['type'][K], RelationData<EN, K>> : EntityMeta[EN]['type'][K];
+    [K in keyof EntityMeta[EN]['type']]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof I ? KeepArray<EntityMeta[EN]['type'][K], GetResponseInclude<EntityMeta[EN]['relations'][K]['entityName'], I[K]>> : KeepArray<EntityMeta[EN]['type'][K], RelationData<EN, K>> : K extends keyof EntityMeta[EN]['nestedObjects'] ? K extends keyof I ? GetResponseInclude<EntityMeta[EN]['nestedObjects'][K]['entityName'], I[K]> : EntityMeta[EN]['type'][K] : EntityMeta[EN]['type'][K];
 };
 type GetResponseIncludeSelect<EN extends keyof EntityMeta, I extends GetArgsInclude<EN>> = I extends {
     _pick: readonly (infer P)[];
 } ? Pick<{
-    [K in keyof EntityMeta[EN]['type']]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof Omit<I, '_pick'> ? KeepArray<EntityMeta[EN]['type'][K], GetResponseInclude<EntityMeta[EN]['relations'][K]['entityName'], Omit<I, '_pick'>[K]>> : KeepArray<EntityMeta[EN]['type'][K], RelationData<EN, K>> : K extends EntityMeta[EN]['jsonFields'] ? K extends keyof Omit<I, '_pick'> ? Omit<I, '_pick'>[K] extends {
+    [K in keyof EntityMeta[EN]['type']]: K extends keyof EntityMeta[EN]['relations'] ? K extends keyof Omit<I, '_pick'> ? KeepArray<EntityMeta[EN]['type'][K], GetResponseInclude<EntityMeta[EN]['relations'][K]['entityName'], Omit<I, '_pick'>[K]>> : KeepArray<EntityMeta[EN]['type'][K], RelationData<EN, K>> : K extends keyof EntityMeta[EN]['nestedObjects'] ? K extends keyof Omit<I, '_pick'> ? GetResponseInclude<EntityMeta[EN]['nestedObjects'][K]['entityName'], Omit<I, '_pick'>[K]> : EntityMeta[EN]['type'][K] : K extends EntityMeta[EN]['jsonFields'] ? K extends keyof Omit<I, '_pick'> ? Omit<I, '_pick'>[K] extends {
         _pick: (infer JP)[];
     } ? Pick<NonNullable<EntityMeta[EN]['type'][K]>, JP & string> : EntityMeta[EN]['type'][K] : EntityMeta[EN]['type'][K] : EntityMeta[EN]['type'][K];
 }, ((P & string) | (Exclude<keyof I, '_pick'> & string)) & keyof EntityMeta[EN]['type']> : never;
@@ -288,7 +288,7 @@ interface SchemaLoadResult {
     schema: Schema;
     entitiesDir?: string;
 }
-type SchemaValidators = Record<string, (item: any) => any>;
+type SchemaValidators = Record<string, (item: any, oldDoc?: any) => any>;
 interface TypeDefinition {
     name: string;
     decorators: Record<string, Record<string, any>>;

package/package.json

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