remult 3.4.0-next.6 → 3.4.0-next.7

package/esm/src/remult3/Fields.js

@@ -190,7 +190,12 @@ export class Fields {
    */
     static literal(optionalValues, ...options) {
         return Fields.string({
-            validate: (entity, event) => Validators.in(optionalValues())(entity, event),
+            validate: (entity, event) => {
+                // A value already stored is a fact. Only a new row or a new value has to be in the list.
+                if (!event.isNew && !event.valueChanged())
+                    return;
+                return Validators.in(optionalValues())(entity, event);
+            },
             //@ts-expect-error as we are adding this to options without it being defined in options
             [fieldOptionalValuesFunctionKey]: optionalValues,
         }, ...options);
@@ -200,7 +205,12 @@ export class Fields {
         return Field(
         //@ts-ignore
         () => enumType(), {
-            validate: (entity, event) => Validators.enum(enumType())(entity, event),
+            validate: (entity, event) => {
+                // A value already stored is a fact. Only a new row or a new value has to be in the enum.
+                if (!event.isNew && !event.valueChanged())
+                    return;
+                return Validators.enum(enumType())(entity, event);
+            },
             [fieldOptionalValuesFunctionKey]: () => getEnumValues(enumType()),
         }, ...options, (options) => {
             ;

package/esm/src/remult3/RepositoryImplementation.js

@@ -2389,6 +2389,9 @@ export function ValueListFieldType(...options) {
                 if (ref.value && !values.find((v) => v === ref.value)) {
                     ref.value = values.find((v) => v.id === ref.value.id) || ref.value;
                 }
+                // A value already stored is a fact. Only a new row or a new value has to be in the list.
+                if (!ref.isNew && !ref.valueChanged())
+                    return;
                 return Validators.in(values)(entity, ref);
             };
         }, ...options)(type);
@@ -2407,6 +2410,7 @@ export class ValueListInfo {
     byIdMap = new Map();
     values = [];
     isNumeric = false;
+    unknownIdValue;
     constructor(valueListType) {
         this.valueListType = valueListType;
         for (let member in this.valueListType) {
@@ -2427,7 +2431,9 @@ export class ValueListInfo {
         var options = this.valueListType[storableMember];
         if (options) {
             for (const op of options) {
-                if (op?.getValues) {
+                if (!op || typeof op === 'function')
+                    continue;
+                if (op.getValues) {
                     this.values.splice(0, this.values.length, ...op.getValues());
                     this.byIdMap.clear();
                     this.values.forEach((s) => {
@@ -2435,6 +2441,8 @@ export class ValueListInfo {
                         this.byIdMap.set(s.id, s);
                     });
                 }
+                if ('unknownIdValue' in op)
+                    this.unknownIdValue = op.unknownIdValue;
             }
             if (this.values.find((s) => s.id === undefined))
                 throw new Error(`ValueType ${this.valueListType} has values without an id`);
@@ -2452,7 +2460,15 @@ export class ValueListInfo {
         return this.byIdMap.get(key);
     }
     fromJson(val) {
-        return this.byId(val);
+        const known = this.byId(val);
+        if (known !== undefined)
+            return known;
+        if (val == null)
+            return undefined;
+        const fallback = this.unknownIdValue;
+        if (typeof fallback !== 'function')
+            return fallback;
+        return fallback(this.isNumeric ? +val : val);
     }
     toJson(val) {
         if (!val)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "3.4.0-next.6",
+    "version": "3.4.0-next.7",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/column-interfaces.d.ts

@@ -58,7 +58,11 @@ export interface FieldOptions<entityType = unknown, valueType = unknown> {
      * @type {AllowedForInstance<entityType>}
      */
     allowApiUpdate?: AllowedForInstance<entityType>;
-    /** An arrow function that'll be used to perform validations on it
+    /** An arrow function that'll be used to perform validations on it.
+     *
+     * `validate` from several option objects is additive: each one is appended.
+     * A function option is the only way to replace validators already set, including a built-in one:
+     * `(options) => { options.validate = ... }`.
      * @example
      * @Fields.string({
      *   validate: Validators.required

package/src/remult3/Fields.js

@@ -247,6 +247,9 @@ var Fields = /** @class */ (function () {
         }
         return Fields.string.apply(Fields, tslib_1.__spreadArray([(_a = {
                     validate: function (entity, event) {
+                        // A value already stored is a fact. Only a new row or a new value has to be in the list.
+                        if (!event.isNew && !event.valueChanged())
+                            return;
                         return validators_js_1.Validators.in(optionalValues())(entity, event);
                     }
                 },
@@ -265,6 +268,9 @@ var Fields = /** @class */ (function () {
             //@ts-ignore
             function () { return enumType(); }, (_a = {
                     validate: function (entity, event) {
+                        // A value already stored is a fact. Only a new row or a new value has to be in the enum.
+                        if (!event.isNew && !event.valueChanged())
+                            return;
                         return validators_js_1.Validators.enum(enumType())(entity, event);
                     }
                 },

package/src/remult3/RepositoryImplementation.d.ts

@@ -302,6 +302,8 @@ export declare function isAutoIncrement(f: FieldMetadata): boolean;
 export declare function ValueListFieldType<valueType extends ValueListItem = ValueListItem>(...options: (ValueListFieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>, context?: any) => void;
 export interface ValueListFieldOptions<entityType, valueType> extends FieldOptions<entityType, valueType> {
     getValues?: () => valueType[];
+    /** Value used when a stored id is not in the list. A value, or `(id) => value`. @default undefined */
+    unknownIdValue?: valueType | ((id: any) => valueType | undefined);
 }
 export declare class ValueListInfo<T extends ValueListItem> implements ValueConverter<T> {
     private valueListType;
@@ -309,6 +311,7 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
     private byIdMap;
     private values;
     isNumeric: boolean;
+    private unknownIdValue?;
     private constructor();
     getValues(): T[];
     byId(key: any): T | undefined;

package/src/remult3/RepositoryImplementation.js

@@ -3970,6 +3970,9 @@ function ValueListFieldType() {
                     if (ref.value && !values.find(function (v) { return v === ref.value; })) {
                         ref.value = values.find(function (v) { return v.id === ref.value.id; }) || ref.value;
                     }
+                    // A value already stored is a fact. Only a new row or a new value has to be in the list.
+                    if (!ref.isNew && !ref.valueChanged())
+                        return;
                     return validators_js_1.Validators.in(values)(entity, ref);
                 };
             }], tslib_1.__read(options), false))(type);
@@ -4003,7 +4006,9 @@ var ValueListInfo = /** @class */ (function () {
             try {
                 for (var options_1 = tslib_1.__values(options), options_1_1 = options_1.next(); !options_1_1.done; options_1_1 = options_1.next()) {
                     var op = options_1_1.value;
-                    if (op === null || op === void 0 ? void 0 : op.getValues) {
+                    if (!op || typeof op === 'function')
+                        continue;
+                    if (op.getValues) {
                         (_b = this.values).splice.apply(_b, tslib_1.__spreadArray([0, this.values.length], tslib_1.__read(op.getValues()), false));
                         this.byIdMap.clear();
                         this.values.forEach(function (s) {
@@ -4011,6 +4016,8 @@ var ValueListInfo = /** @class */ (function () {
                             _this.byIdMap.set(s.id, s);
                         });
                     }
+                    if ('unknownIdValue' in op)
+                        this.unknownIdValue = op.unknownIdValue;
                 }
             }
             catch (e_54_1) { e_54 = { error: e_54_1 }; }
@@ -4044,7 +4051,15 @@ var ValueListInfo = /** @class */ (function () {
         return this.byIdMap.get(key);
     };
     ValueListInfo.prototype.fromJson = function (val) {
-        return this.byId(val);
+        var known = this.byId(val);
+        if (known !== undefined)
+            return known;
+        if (val == null)
+            return undefined;
+        var fallback = this.unknownIdValue;
+        if (typeof fallback !== 'function')
+            return fallback;
+        return fallback(this.isNumeric ? +val : val);
     };
     ValueListInfo.prototype.toJson = function (val) {
         if (!val)