remult 0.25.8-exp.7 → 0.25.8-exp.8

package/esm/src/isOfType.js

@@ -1,5 +1,5 @@
 export function isOfType(obj, checkMethod) {
-    return typeof obj[checkMethod] === 'function';
+    return typeof obj[checkMethod] !== 'undefined';
 }
 export function cast(obj, checkMethod) {
     if (isOfType(obj, checkMethod)) {

package/esm/src/remult3/Fields.js

@@ -5,6 +5,7 @@ import { buildOptions } from './RepositoryImplementation.js';
 import { Validators } from '../validators.js';
 import { relationInfoMemberInOptions } from './relationInfoMember.js';
 import { remultStatic } from '../remult-static.js';
+import { addValidatorKey } from './addValidatorKey.js';
 export class Fields {
     /**
      * Stored as a JSON.stringify - to store as json use Fields.json
@@ -76,6 +77,11 @@ export class Fields {
             },
         }, ...options);
     }
+    /**
+   * A CUID (Collision Resistant Unique Identifier) field.
+   * This id value is determined on the backend on insert, and can't be updated through the API.
+   * The CUID is generated using the `@paralleldrive/cuid2` npm package.
+   */
     static cuid(...options) {
         return Field(() => String, {
             allowApiUpdate: false,
@@ -86,6 +92,63 @@ export class Fields {
             },
         }, ...options);
     }
+    /**
+   * Defines a field that can hold a value from a specified set of string literals.
+   * @param {() => readonly valueType[]} optionalValues - A function that returns an array of allowed string literals.
+   * @returns {ClassFieldDecorator<entityType, valueType | undefined>} - A class field decorator.
+   *
+   * @example
+   
+   * class MyEntity {
+   *   .@Fields.literal(() => ['open', 'closed', 'frozen', 'in progress'] as const)
+   *   status: 'open' | 'closed' | 'frozen' | 'in progress' = 'open';
+   * }
+   
+   *
+   * // This defines a field `status` in `MyEntity` that can only hold the values 'open', 'closed', 'frozen', or 'in progress'.
+   *
+   * @example
+   * // For better reusability and maintainability:
+   
+   * const statuses = ['open', 'closed', 'frozen', 'in progress'] as const;
+   * type StatusType = typeof statuses[number];
+   *
+   * class MyEntity {
+   *   .@Fields.literal(() => statuses)
+   *   status: StatusType = 'open';
+   * }
+   
+   *
+   * // This approach allows easy management and updates of the allowed values for the `status` field.
+   */
+    static literal(optionalValues, ...options) {
+        return Fields.string({
+            //@ts-ignore
+            [addValidatorKey]: (entity, event) => Validators.in(optionalValues())(entity, event)
+        }, ...options);
+    }
+    static enum(enumType, ...options) {
+        let valueConverter;
+        return Field(() => 
+        //@ts-ignore
+        enumType(), {
+            [addValidatorKey]: (entity, event) => Validators.enum(enumType())(entity, event)
+        }, ...options, (options) => {
+            if (valueConverter === undefined) {
+                let enumObj = enumType();
+                let enumValues = Object.values(enumObj)
+                    .filter((x) => typeof enumObj[x] !== 'number');
+                valueConverter = enumValues.find(x => typeof x === "string") ? ValueConverters.String : ValueConverters.Integer;
+            }
+            if (!options.valueConverter) {
+                options.valueConverter = valueConverter;
+            }
+            else if (!options.valueConverter.fieldTypeInDb) {
+                //@ts-ignore
+                options.valueConverter.fieldTypeInDb = valueConverter.fieldTypeInDb;
+            }
+        });
+    }
     static string(...options) {
         return Field(() => String, ...options);
     }
@@ -188,6 +251,9 @@ export function Field(valueType, ...options) {
             if (r.required) {
                 r.validate = addValidator(r.validate, Validators.required);
             }
+            if (r[addValidatorKey]) {
+                r.validate = addValidator(r.validate, r[addValidatorKey]);
+            }
             if (r.maxLength) {
                 r.validate = addValidator(r.validate, Validators.maxLength(r.maxLength));
             }

package/esm/src/remult3/RepositoryImplementation.js

@@ -14,6 +14,7 @@ import { RelationLoader } from './relation-loader.js';
 import { getInternalKey, } from './repository-internals.js';
 import { entityDbName, fieldDbName, } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { remultStatic } from '../remult-static.js';
+import { Validators } from '../validators.js';
 //import  { remult } from "../remult-proxy";
 let classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -1961,6 +1962,7 @@ export function ValueListFieldType(...options) {
             ;
             (o.valueConverter = ValueListInfo.get(type)),
                 (o.displayValue = (item, val) => val?.caption);
+            o.validate = (entity, ref) => Validators.in(ValueListInfo.get(type).getValues())(entity, ref);
         }, ...options)(type, context);
     };
 }

package/esm/src/remult3/addValidatorKey.js

@@ -0,0 +1 @@
+export const addValidatorKey = '__addValidator';

package/esm/src/remult3/remult3.js

@@ -1,46 +1,27 @@
 export {};
-//p1 - should the remult api be deleteMany({id:[1,2]}) or deleteMany({where:{id:[1,2]}})
-//p1 - document cuid entity, usage of https://www.npmjs.com/package/@paralleldrive/cuid2
-//p1 - example of creating your own id column
+//p1 - `preprocessApiFindOptions`,  naming - allow find options preprocessor for api calls, to use for authorization
+//p1 - admin url1 - pocketbase use /_ for the admin //{allowed?:Allowed,url?:string}
+//p1 - Validate for NAN
+//p1 - Make async hooks gracefully handle non async hooks environment
+//p1 - chain validators with options
+//y2 - should we validate relations
+//y1 - consider replacing all errors with error classes that extend the base Error class
+//y2 - consider if field types should include validation in them by default (string,number that it's not NaN etc...) and if so, what message?
+//y2 - should enforce integer - currently we probably round / truncate it
+/*y1 - talk about modules in init express with entities/controllers,initRequest,initApi
+ - support get with backend method, with url search params as the first parameter, & url as second parameter
+   - support returning redirect, and plain html (For sign in scenarios)
+
+ */
 //p1 - in this video I'll use remult to turn a frontend app to a fullstack app
 //y1 - getFields didn't work for kobi in the home component
-//y1 - consider replacing all errors with error classes that extend the base Error class
 //p1 - document offline support
-//p1 - add section to Fields doc, explaining field type in db
-//p1 - add section about union type
-//p1 - add section about value list field type
 /*y1 - Talk JYC - JYC - add some integrity checks on delete
   - soft delete
   - delete restrict (implicit, or user selected - and if so, how) (delete & update of id)
 
 */
-/*y1 currency.ts:10 Uncaught TypeError: Currency_1 is not a constructor
-// - ValueListFieldType - the decorator gives an error in react vite project - see langulage yedidya
-// happens in target 2022, ts<5.1.6
-//typescript 5.1.6
-@ValueListFieldType()
-export class Currency {
-  constructor(
-    public id: number,
-    public caption: string,
-    public symbol: string
-  ) {}
-  static shekel = new Currency(1, 'Shekel', '₪');
-  static dollar = new Currency(2, 'Dollar', '$');
-  static euro = new Currency(3, 'Euro', '€');
-  static pound = new Currency(4, 'Pound', '£');
-  static yen = new Currency(5, 'Yen', '¥');
-}
-
-*/
-//y1 - allow api read to also support instance and filter. - problem with promise
-//y1 - admin url1 - pocketbase use /_ for the admin
 //y1 - consider sql expression gets a dbnames of it's own (that already has the "tableName" defined correctly) maybe also the filter translator
-/*y1 - talk about modules in init express with entities/controllers,initRequest,initApi
- - support get with backend method, with url search params as the first parameter, & url as second parameter
-   - support returning redirect, and plain html (For sign in scenarios)
-
- */
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
 //y1 - I think that the tests you've setup don't cover next app router - I added to the setup, but not sure where else
 //y1 - talk about the parameter issue with backend methods
@@ -55,8 +36,6 @@ export class Currency {
   })
   Description = ""*/
 //y2 - get backend methods to work when specifying types for date, and entities as poco's
-//y2 - conside law-q db based on schema issue - I think that while running the dataProvider function, we should have a valid remult - maybe even have a valid remult, that will be valid until api is run
-//y2 - #239 - (@JY) add a way to get from fieldMetadata back to entity repo (like we have in fieldRef)
 //y2 - constraints (@JY)
 /*p2 remult admin
 
@@ -71,11 +50,9 @@ export class Currency {
  - remult-admin didn't show a update for a table with a uniqua that is numeric
 */
 //remult
-//p1 - better support union types (status, etc... so it'll work also in filter etc...)
 //p1 - when a tasks table exists in a different schema - we get many errors
 //p1 - live query with include
 //p1 - adjust angular tutorial starter kit for latest angular (as is in tutorial)
-//p2 - allow find options preprocessor for api calls, to use for authorization
 //p2 - when subscribe is forbidden - the query still runs after the renew process
 //p2 - 'update tasks set  where id = $1
 //p2 - type metadata.key - to keyof entity - based on cwis input
@@ -83,23 +60,15 @@ export class Currency {
 //p2 - when value changes for field with error, clear error - so the user will feel comfortable
 //p2 - allowApiUpdate should be false for include in api false
 //docs
-//p2 - make sure that internal members do not appear in the documentation - try running it on the d.ts instead of the code itself.
 //------
 //y2 - from the crm-demo(https://crm-demo.up.railway.app/deals), after editing a deal: - _updateEntityBasedOnApi
 //y2 - Backend methods are transactions, it's not intuitive and maybe should be optional / opt in
 //y2 - how to run a transaction as a user
-//p2 - enum column
-//y2 - message for invalid value
 //y2 - message for relation that is missing
 //y2 - consider multi tenancies
-//p2 - more column types
-//p2 - document validators
 //p2 - and validators to reference
 //y2 - discuss a default date formatter
 //y2 - add some api testing framework for user unit tests (will help with codesandbox based discussions)
 //[ ] V2 - what to do about for relations count?
 //[ ] V2 - condition? not to fetch if null etc....
-//[ ] V3 - all these fields will also appear in the where etc... in the typescript api - but we will not enforce them
-//y2 - consider if field types should include validation in them by default (string,number that it's not NaN etc...) and if so, what message?
-//y2 - should enforce integer - currently we probably round / truncate it
 //p1 - adjust react tutorial to esm

package/esm/src/validators.js

@@ -26,7 +26,7 @@ export class Validators {
     static regex = createValueValidatorWithArgs((val, regex) => regex.test(val));
     static email = createValueValidator((val) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val), 'Invalid Email');
     static url = createValueValidator((val) => !!new URL(val), 'Invalid Url');
-    static in = createValueValidatorWithArgs((val, values) => values.includes(val), (values) => `Value must be one of ${values.join(', ')}`);
+    static in = createValueValidatorWithArgs((val, values) => values.includes(val), (values) => `Value must be one of ${values.map(y => typeof y === "object" ? y['id'] !== undefined ? y['id'] : y.toString() : y).join(', ')}`);
     static notNull = createValueValidator((val) => val != null, 'Should not be null');
     static enum = createValueValidatorWithArgs((value, enumObj) => Object.values(enumObj).includes(value), (enumObj) => `Value must be one of ${Object.values(enumObj)
         .filter((x) => typeof enumObj[x] !== 'number')

package/package.json

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

package/src/column-interfaces.d.ts

@@ -247,17 +247,23 @@ export interface ValueConverter<valueType> {
      */
     displayValue?(val: valueType): string;
     /**
-     * Specifies the storage type used in the database for this field.
+     * Specifies the storage type used in the database for this field. This can be used to explicitly define the data type and precision of the field in the database.
      *
      * @example
-     * readonly fieldTypeInDb = 'decimal(18,2)';
+     * // Define a field with a specific decimal precision in the database
+     * @Fields.number({
+     *   valueConverter: {
+     *     fieldTypeInDb: 'decimal(18,8)'
+     *   }
+     * })
+     * price=0;
      */
     readonly fieldTypeInDb?: string;
     /**
      * Specifies the type of HTML input element suitable for values of valueType.
      *
      * @example
-     * readonly inputType = 'date';
+     * inputType = 'date';
      */
     readonly inputType?: string;
 }

package/src/isOfType.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cast = exports.isOfType = void 0;
 function isOfType(obj, checkMethod) {
-    return typeof obj[checkMethod] === 'function';
+    return typeof obj[checkMethod] !== 'undefined';
 }
 exports.isOfType = isOfType;
 function cast(obj, checkMethod) {

package/src/remult3/Fields.d.ts

@@ -16,7 +16,43 @@ export declare class Fields {
     static createdAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
     static updatedAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
     static uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    /**
+   * A CUID (Collision Resistant Unique Identifier) field.
+   * This id value is determined on the backend on insert, and can't be updated through the API.
+   * The CUID is generated using the `@paralleldrive/cuid2` npm package.
+   */
     static cuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    /**
+   * Defines a field that can hold a value from a specified set of string literals.
+   * @param {() => readonly valueType[]} optionalValues - A function that returns an array of allowed string literals.
+   * @returns {ClassFieldDecorator<entityType, valueType | undefined>} - A class field decorator.
+   *
+   * @example
+   
+   * class MyEntity {
+   *   .@Fields.literal(() => ['open', 'closed', 'frozen', 'in progress'] as const)
+   *   status: 'open' | 'closed' | 'frozen' | 'in progress' = 'open';
+   * }
+   
+   *
+   * // This defines a field `status` in `MyEntity` that can only hold the values 'open', 'closed', 'frozen', or 'in progress'.
+   *
+   * @example
+   * // For better reusability and maintainability:
+   
+   * const statuses = ['open', 'closed', 'frozen', 'in progress'] as const;
+   * type StatusType = typeof statuses[number];
+   *
+   * class MyEntity {
+   *   .@Fields.literal(() => statuses)
+   *   status: StatusType = 'open';
+   * }
+   
+   *
+   * // This approach allows easy management and updates of the allowed values for the `status` field.
+   */
+    static literal<entityType = any, valueType extends string = any>(optionalValues: () => readonly valueType[], ...options: (StringFieldOptions<entityType, valueType> | ((options: StringFieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static enum<entityType = any, theEnum = any>(enumType: () => theEnum, ...options: (FieldOptions<entityType, theEnum[keyof theEnum]> | ((options: FieldOptions<entityType, theEnum[keyof theEnum]>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, theEnum[keyof theEnum] | undefined>;
     static string<entityType = any, valueType = string>(...options: (StringFieldOptions<entityType, valueType> | ((options: StringFieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
     static boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, boolean | undefined>;
 }

package/src/remult3/Fields.js

@@ -9,6 +9,7 @@ var RepositoryImplementation_js_1 = require("./RepositoryImplementation.js");
 var validators_js_1 = require("../validators.js");
 var relationInfoMember_js_1 = require("./relationInfoMember.js");
 var remult_static_js_1 = require("../remult-static.js");
+var addValidatorKey_js_1 = require("./addValidatorKey.js");
 var Fields = /** @class */ (function () {
     function Fields() {
     }
@@ -127,6 +128,11 @@ var Fields = /** @class */ (function () {
                 },
             }], tslib_1.__read(options), false));
     };
+    /**
+   * A CUID (Collision Resistant Unique Identifier) field.
+   * This id value is determined on the backend on insert, and can't be updated through the API.
+   * The CUID is generated using the `@paralleldrive/cuid2` npm package.
+   */
     Fields.cuid = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
@@ -142,6 +148,74 @@ var Fields = /** @class */ (function () {
                 },
             }], tslib_1.__read(options), false));
     };
+    /**
+   * Defines a field that can hold a value from a specified set of string literals.
+   * @param {() => readonly valueType[]} optionalValues - A function that returns an array of allowed string literals.
+   * @returns {ClassFieldDecorator<entityType, valueType | undefined>} - A class field decorator.
+   *
+   * @example
+   
+   * class MyEntity {
+   *   .@Fields.literal(() => ['open', 'closed', 'frozen', 'in progress'] as const)
+   *   status: 'open' | 'closed' | 'frozen' | 'in progress' = 'open';
+   * }
+   
+   *
+   * // This defines a field `status` in `MyEntity` that can only hold the values 'open', 'closed', 'frozen', or 'in progress'.
+   *
+   * @example
+   * // For better reusability and maintainability:
+   
+   * const statuses = ['open', 'closed', 'frozen', 'in progress'] as const;
+   * type StatusType = typeof statuses[number];
+   *
+   * class MyEntity {
+   *   .@Fields.literal(() => statuses)
+   *   status: StatusType = 'open';
+   * }
+   
+   *
+   * // This approach allows easy management and updates of the allowed values for the `status` field.
+   */
+    Fields.literal = function (optionalValues) {
+        var _a;
+        var options = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            options[_i - 1] = arguments[_i];
+        }
+        return Fields.string.apply(Fields, tslib_1.__spreadArray([(_a = {},
+                //@ts-ignore
+                _a[addValidatorKey_js_1.addValidatorKey] = function (entity, event) { return validators_js_1.Validators.in(optionalValues())(entity, event); },
+                _a)], tslib_1.__read(options), false));
+    };
+    Fields.enum = function (enumType) {
+        var _a;
+        var options = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            options[_i - 1] = arguments[_i];
+        }
+        var valueConverter;
+        return Field.apply(void 0, tslib_1.__spreadArray(tslib_1.__spreadArray([function () {
+                //@ts-ignore
+                return (enumType());
+            }, (_a = {},
+                _a[addValidatorKey_js_1.addValidatorKey] = function (entity, event) { return validators_js_1.Validators.enum(enumType())(entity, event); },
+                _a)], tslib_1.__read(options), false), [function (options) {
+                if (valueConverter === undefined) {
+                    var enumObj_1 = enumType();
+                    var enumValues = Object.values(enumObj_1)
+                        .filter(function (x) { return typeof enumObj_1[x] !== 'number'; });
+                    valueConverter = enumValues.find(function (x) { return typeof x === "string"; }) ? valueConverters_js_1.ValueConverters.String : valueConverters_js_1.ValueConverters.Integer;
+                }
+                if (!options.valueConverter) {
+                    options.valueConverter = valueConverter;
+                }
+                else if (!options.valueConverter.fieldTypeInDb) {
+                    //@ts-ignore
+                    options.valueConverter.fieldTypeInDb = valueConverter.fieldTypeInDb;
+                }
+            }], false));
+    };
     Fields.string = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
@@ -251,6 +325,9 @@ function Field(valueType) {
             if (r.required) {
                 r.validate = addValidator(r.validate, validators_js_1.Validators.required);
             }
+            if (r[addValidatorKey_js_1.addValidatorKey]) {
+                r.validate = addValidator(r.validate, r[addValidatorKey_js_1.addValidatorKey]);
+            }
             if (r.maxLength) {
                 r.validate = addValidator(r.validate, validators_js_1.Validators.maxLength(r.maxLength));
             }

package/src/remult3/RepositoryImplementation.js

@@ -18,6 +18,7 @@ var relation_loader_js_1 = require("./relation-loader.js");
 var repository_internals_js_1 = require("./repository-internals.js");
 var filter_consumer_bridge_to_sql_request_js_1 = require("../filter/filter-consumer-bridge-to-sql-request.js");
 var remult_static_js_1 = require("../remult-static.js");
+var validators_js_1 = require("../validators.js");
 //import  { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -3249,6 +3250,7 @@ function ValueListFieldType() {
                 ;
                 (o.valueConverter = ValueListInfo.get(type)),
                     (o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; });
+                o.validate = function (entity, ref) { return validators_js_1.Validators.in(ValueListInfo.get(type).getValues())(entity, ref); };
             }], tslib_1.__read(options), false))(type, context);
     };
 }

package/src/remult3/addValidatorKey.d.ts

@@ -0,0 +1 @@
+export declare const addValidatorKey = "__addValidator";

package/src/remult3/addValidatorKey.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addValidatorKey = void 0;
+exports.addValidatorKey = '__addValidator';

package/src/remult3/remult3.js

@@ -1,47 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//p1 - should the remult api be deleteMany({id:[1,2]}) or deleteMany({where:{id:[1,2]}})
-//p1 - document cuid entity, usage of https://www.npmjs.com/package/@paralleldrive/cuid2
-//p1 - example of creating your own id column
+//p1 - `preprocessApiFindOptions`,  naming - allow find options preprocessor for api calls, to use for authorization
+//p1 - admin url1 - pocketbase use /_ for the admin //{allowed?:Allowed,url?:string}
+//p1 - Validate for NAN
+//p1 - Make async hooks gracefully handle non async hooks environment
+//p1 - chain validators with options
+//y2 - should we validate relations
+//y1 - consider replacing all errors with error classes that extend the base Error class
+//y2 - consider if field types should include validation in them by default (string,number that it's not NaN etc...) and if so, what message?
+//y2 - should enforce integer - currently we probably round / truncate it
+/*y1 - talk about modules in init express with entities/controllers,initRequest,initApi
+ - support get with backend method, with url search params as the first parameter, & url as second parameter
+   - support returning redirect, and plain html (For sign in scenarios)
+
+ */
 //p1 - in this video I'll use remult to turn a frontend app to a fullstack app
 //y1 - getFields didn't work for kobi in the home component
-//y1 - consider replacing all errors with error classes that extend the base Error class
 //p1 - document offline support
-//p1 - add section to Fields doc, explaining field type in db
-//p1 - add section about union type
-//p1 - add section about value list field type
 /*y1 - Talk JYC - JYC - add some integrity checks on delete
   - soft delete
   - delete restrict (implicit, or user selected - and if so, how) (delete & update of id)
 
 */
-/*y1 currency.ts:10 Uncaught TypeError: Currency_1 is not a constructor
-// - ValueListFieldType - the decorator gives an error in react vite project - see langulage yedidya
-// happens in target 2022, ts<5.1.6
-//typescript 5.1.6
-@ValueListFieldType()
-export class Currency {
-  constructor(
-    public id: number,
-    public caption: string,
-    public symbol: string
-  ) {}
-  static shekel = new Currency(1, 'Shekel', '₪');
-  static dollar = new Currency(2, 'Dollar', '$');
-  static euro = new Currency(3, 'Euro', '€');
-  static pound = new Currency(4, 'Pound', '£');
-  static yen = new Currency(5, 'Yen', '¥');
-}
-
-*/
-//y1 - allow api read to also support instance and filter. - problem with promise
-//y1 - admin url1 - pocketbase use /_ for the admin
 //y1 - consider sql expression gets a dbnames of it's own (that already has the "tableName" defined correctly) maybe also the filter translator
-/*y1 - talk about modules in init express with entities/controllers,initRequest,initApi
- - support get with backend method, with url search params as the first parameter, & url as second parameter
-   - support returning redirect, and plain html (For sign in scenarios)
-
- */
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
 //y1 - I think that the tests you've setup don't cover next app router - I added to the setup, but not sure where else
 //y1 - talk about the parameter issue with backend methods
@@ -56,8 +37,6 @@ export class Currency {
   })
   Description = ""*/
 //y2 - get backend methods to work when specifying types for date, and entities as poco's
-//y2 - conside law-q db based on schema issue - I think that while running the dataProvider function, we should have a valid remult - maybe even have a valid remult, that will be valid until api is run
-//y2 - #239 - (@JY) add a way to get from fieldMetadata back to entity repo (like we have in fieldRef)
 //y2 - constraints (@JY)
 /*p2 remult admin
 
@@ -72,11 +51,9 @@ export class Currency {
  - remult-admin didn't show a update for a table with a uniqua that is numeric
 */
 //remult
-//p1 - better support union types (status, etc... so it'll work also in filter etc...)
 //p1 - when a tasks table exists in a different schema - we get many errors
 //p1 - live query with include
 //p1 - adjust angular tutorial starter kit for latest angular (as is in tutorial)
-//p2 - allow find options preprocessor for api calls, to use for authorization
 //p2 - when subscribe is forbidden - the query still runs after the renew process
 //p2 - 'update tasks set  where id = $1
 //p2 - type metadata.key - to keyof entity - based on cwis input
@@ -84,23 +61,15 @@ export class Currency {
 //p2 - when value changes for field with error, clear error - so the user will feel comfortable
 //p2 - allowApiUpdate should be false for include in api false
 //docs
-//p2 - make sure that internal members do not appear in the documentation - try running it on the d.ts instead of the code itself.
 //------
 //y2 - from the crm-demo(https://crm-demo.up.railway.app/deals), after editing a deal: - _updateEntityBasedOnApi
 //y2 - Backend methods are transactions, it's not intuitive and maybe should be optional / opt in
 //y2 - how to run a transaction as a user
-//p2 - enum column
-//y2 - message for invalid value
 //y2 - message for relation that is missing
 //y2 - consider multi tenancies
-//p2 - more column types
-//p2 - document validators
 //p2 - and validators to reference
 //y2 - discuss a default date formatter
 //y2 - add some api testing framework for user unit tests (will help with codesandbox based discussions)
 //[ ] V2 - what to do about for relations count?
 //[ ] V2 - condition? not to fetch if null etc....
-//[ ] V3 - all these fields will also appear in the where etc... in the typescript api - but we will not enforce them
-//y2 - consider if field types should include validation in them by default (string,number that it's not NaN etc...) and if so, what message?
-//y2 - should enforce integer - currently we probably round / truncate it
 //p1 - adjust react tutorial to esm

package/src/validators.js

@@ -48,7 +48,9 @@ var Validators = /** @class */ (function () {
     });
     Validators.email = createValueValidator(function (val) { return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val); }, 'Invalid Email');
     Validators.url = createValueValidator(function (val) { return !!new URL(val); }, 'Invalid Url');
-    Validators.in = createValueValidatorWithArgs(function (val, values) { return values.includes(val); }, function (values) { return "Value must be one of ".concat(values.join(', ')); });
+    Validators.in = createValueValidatorWithArgs(function (val, values) { return values.includes(val); }, function (values) { return "Value must be one of ".concat(values.map(function (y) {
+        return typeof y === "object" ? y['id'] !== undefined ? y['id'] : y.toString() : y;
+    }).join(', ')); });
     Validators.notNull = createValueValidator(function (val) { return val != null; }, 'Should not be null');
     Validators.enum = createValueValidatorWithArgs(function (value, enumObj) { return Object.values(enumObj).includes(value); }, function (enumObj) {
         return "Value must be one of ".concat(Object.values(enumObj)