remult 0.26.23-next.0 → 0.26.23-next.2

package/esm/src/filter/filter-interfaces.js

@@ -285,8 +285,8 @@ export class Filter {
         this.__applyToConsumer(r);
         return r.result;
     }
-    //@internal
     static async translateCustomWhere(r, entity, remult) {
+        // Used in hagai
         let f = new customTranslator(async (filterKey, custom) => {
             let r = [];
             for (const key in entity.entityType) {

package/esm/src/remult3/Fields.js

@@ -6,6 +6,7 @@ import { Validators, createValueValidator, getEnumValues, } from '../validators.
 import { relationInfoMemberInOptions } from './relationInfoMember.js';
 import { remultStatic } from '../remult-static.js';
 import { addValidator } from './addValidator.js';
+import { isOfType } from '../isOfType.js';
 const validateNumber = createValueValidator((x) => {
     return !isNaN(x) && isFinite(x);
 });
@@ -98,7 +99,7 @@ export class Fields {
             },
         }, ...options);
     }
-    // static id<entityType = any>(
+    // static id<entityType = unknown>(
     //   options?: FieldOptions<entityType, string> & { idFactory?: () => string },
     // ): ClassFieldDecorator<entityType, string | undefined> {
     //   let buildId = options?.idFactory ?? createId
@@ -267,18 +268,24 @@ export class Relations {
  */
 export function Field(valueType, ...options) {
     // import ANT!!!! if you call this in another decorator, make sure to set It's return type correctly with the | undefined
-    return (target, context) => {
+    return (target, context, c) => {
         const key = typeof context === 'string' ? context : context.name.toString();
         let factory = (remult) => {
             let r = buildOptions(options, remult);
             if (r.required) {
                 r.validate = addValidator(r.validate, Validators.required, true);
             }
-            if (r.maxLength) {
-                r.validate = addValidator(r.validate, Validators.maxLength(r.maxLength));
+            if (isOfType(r, 'maxLength')) {
+                let z = r;
+                if (z.maxLength) {
+                    z.validate = addValidator(z.validate, Validators.maxLength(z.maxLength));
+                }
             }
-            if (r.minLength) {
-                r.validate = addValidator(r.validate, Validators.minLength(r.minLength));
+            if (isOfType(r, 'minLength')) {
+                let z = r;
+                if (z.minLength) {
+                    z.validate = addValidator(z.validate, Validators.minLength(z.minLength));
+                }
             }
             if (!r.valueType && valueType) {
                 r.valueType = valueType();

package/esm/src/remult3/RepositoryImplementation.js

@@ -1161,15 +1161,16 @@ class rowHelperBase {
 }
 export class rowHelperImplementation extends rowHelperBase {
     info;
-    repository;
+    repo;
     edp;
     _isNew;
-    constructor(info, instance, repository, edp, remult, _isNew) {
+    constructor(info, instance, repo, edp, remult, _isNew) {
         super(info.fieldsMetadata, instance, remult, _isNew);
         this.info = info;
-        this.repository = repository;
+        this.repo = repo;
         this.edp = edp;
         this._isNew = _isNew;
+        this.repository = repo;
         this.metadata = info;
         if (_isNew) {
             for (const col of info.fieldsMetadata) {
@@ -1183,17 +1184,18 @@ export class rowHelperImplementation extends rowHelperBase {
                 }
             }
         }
-        if (this.info.options.entityRefInit)
-            this.info.options.entityRefInit(this, instance);
+        if (this.info.entityInfo.entityRefInit)
+            this.info.entityInfo.entityRefInit(this, instance);
         if (Remult.entityRefInit)
             Remult.entityRefInit(this, instance);
     }
+    repository;
     clone() {
         const data = this.toApiJson(true, true);
-        return this.repository.fromJson(data, this.isNew());
+        return this.repo.fromJson(data, this.isNew());
     }
     get relations() {
-        return this.repository.relations(this.instance);
+        return this.repo.relations(this.instance);
     }
     get apiUpdateAllowed() {
         return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate);
@@ -1233,7 +1235,7 @@ export class rowHelperImplementation extends rowHelperBase {
             .find({ where: await this.getIdFilter() })
             .then(async (newData) => {
             if (newData.length === 0)
-                throw this.repository._notFoundError(this.id);
+                throw this.repo._notFoundError(this.id);
             await this.loadDataFrom(newData[0]);
             this.saveOriginalData();
         });
@@ -1276,7 +1278,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 await this.__validateEntity();
             let doNotSave = false;
             let e = this.buildLifeCycleEvent(() => (doNotSave = true));
-            if (!this.repository._dataProvider.isProxy) {
+            if (!this.repo._dataProvider.isProxy) {
                 for (const col of this.fields) {
                     if (col.metadata.options.saving)
                         await col.metadata.options.saving(this.instance, col, e);
@@ -1338,15 +1340,15 @@ export class rowHelperImplementation extends rowHelperBase {
                 if (updatedRow)
                     await this.loadDataFrom(updatedRow);
                 e.id = this.getId();
-                if (!this.repository._dataProvider.isProxy) {
+                if (!this.repo._dataProvider.isProxy) {
                     if (this.info.entityInfo.saved)
                         await this.info.entityInfo.saved(this.instance, e);
-                    if (this.repository.listeners)
-                        for (const listener of this.repository.listeners) {
+                    if (this.repo.listeners)
+                        for (const listener of this.repo.listeners) {
                             await listener.saved?.(this.instance, isNew);
                         }
                 }
-                await this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
+                await this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
                 this.saveOriginalData();
                 this._isNew = false;
                 return this.instance;
@@ -1389,20 +1391,20 @@ export class rowHelperImplementation extends rowHelperBase {
             fields: self.fields,
             id: self.getId(),
             originalId: self.getOriginalId(),
-            metadata: self.repository.metadata,
-            repository: self.repository,
+            metadata: self.repo.metadata,
+            repository: self.repo,
             preventDefault: () => preventDefault(),
-            relations: self.repository.relations(self.instance),
+            relations: self.repo.relations(self.instance),
         };
     }
     async getIdFilter() {
-        return await this.repository._translateWhereToFilter(this.repository.metadata.idMetadata.getIdFilter(this.id));
+        return await this.repo._translateWhereToFilter(this.repo.metadata.idMetadata.getIdFilter(this.id));
     }
     async delete() {
         this.__clearErrorsAndReportChanged();
         let doDelete = true;
         let e = this.buildLifeCycleEvent(() => (doDelete = false));
-        if (!this.repository._dataProvider.isProxy) {
+        if (!this.repo._dataProvider.isProxy) {
             if (this.info.entityInfo.deleting)
                 await this.info.entityInfo.deleting(this.instance, e);
         }
@@ -1410,15 +1412,15 @@ export class rowHelperImplementation extends rowHelperBase {
         try {
             if (doDelete)
                 await this.edp.delete(this.id);
-            if (!this.repository._dataProvider.isProxy) {
+            if (!this.repo._dataProvider.isProxy) {
                 if (this.info.entityInfo.deleted)
                     await this.info.entityInfo.deleted(this.instance, e);
             }
-            if (this.repository.listeners)
-                for (const listener of this.repository.listeners) {
+            if (this.repo.listeners)
+                for (const listener of this.repo.listeners) {
                     await listener.deleted?.(this.instance);
                 }
-            await this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }]);
+            await this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }]);
             this._wasDeleted = true;
         }
         catch (err) {
@@ -1456,7 +1458,7 @@ export class rowHelperImplementation extends rowHelperBase {
             for (const col of this.info.fieldsMetadata) {
                 if (col.options.serverExpression) {
                     this.instance[col.key] =
-                        await col.options.serverExpression(this.instance);
+                        (await col.options.serverExpression(this.instance));
                 }
             }
     }
@@ -1485,8 +1487,8 @@ export class rowHelperImplementation extends rowHelperBase {
             let e = this.buildLifeCycleEvent(() => { });
             await this.info.entityInfo.validation(this.instance, e);
         }
-        if (this.repository.listeners)
-            for (const listener of this.repository.listeners) {
+        if (this.repo.listeners)
+            for (const listener of this.repo.listeners) {
                 await listener.validating?.(this.instance);
             }
     }
@@ -1581,15 +1583,21 @@ export class FieldRefImplementation {
         let lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     }
+    get key() {
+        return this.metadata.key;
+    }
+    get repo() {
+        return this.helper?.repository;
+    }
     async load() {
         let lu = this.rowBase.lookups.get(this.metadata.key);
         let rel = getRelationFieldInfo(this.metadata);
         if (rel && this.helper) {
             if (rel.type === 'toMany') {
-                return (this.container[this.metadata.key] = await this.helper.repository.relations(this.container)[this.metadata.key].find());
+                return (this.container[this.metadata.key] = await this.repo.relations(this.container)[this.key].find());
             }
             else {
-                let val = await this.helper.repository
+                let val = await this.repo
                     .relations(this.container)[this.metadata.key].findOne();
                 if (val)
                     this.container[this.metadata.key] = val;
@@ -1865,11 +1873,11 @@ class EntityFullInfo {
             else
                 crud = this.options.allowApiCrud;
             if (this.options.allowApiDelete === undefined)
-                this.options.allowApiDelete = crud;
+                this.entityInfo.allowApiDelete = crud;
             if (this.options.allowApiInsert === undefined)
-                this.options.allowApiInsert = crud;
+                this.entityInfo.allowApiInsert = crud;
             if (this.options.allowApiUpdate === undefined)
-                this.options.allowApiUpdate = crud;
+                this.entityInfo.allowApiUpdate = crud;
             if (this.options.allowApiRead === undefined)
                 this.options.allowApiRead = this.options.allowApiCrud;
         }
@@ -2003,7 +2011,7 @@ class EntityFullInfo {
     caption;
 }
 export function FieldType(...options) {
-    return (target) => {
+    return (target, context) => {
         if (!options) {
             options = [];
         }
@@ -2016,7 +2024,7 @@ export function isAutoIncrement(f) {
     return f.options?.valueConverter?.fieldTypeInDb === 'autoincrement';
 }
 export function ValueListFieldType(...options) {
-    return (type) => {
+    return (type, context) => {
         FieldType((o) => {
             ;
             (o.valueConverter = ValueListInfo.get(type)),

package/esm/src/remult3/remult3.js

@@ -1,16 +1,16 @@
 export const flags = {
     error500RetryCount: 4,
 };
-/*y1 - typing discussion:
- * all fields required in fields
- * key as key of entity
- * continue with?
- * should and / or accept also undefined members? the code supports it, not sure if the api should
- * Sql server expression supports undefined as a response
+/*p1
+ * field, fieldType ,ValueListFieldType, - return optional parameter for decorators
+ * options to remultExpress tc... should be mandatory
+ * return value converter to previous typing
+ * add breaking change notification about findOne and findFirst and findId
  */
 //p1 - fix query docs to also explain how it can be used for infinite scroll and pagination.
 //y1 - 'test expression columns without aliases'
 //y1 - ts issue with fields - when a field is optional, it's $ is also optional and thats a problem
+//p1 - vite 5.3 supports ts5 decorators - check and adapt.
 //p1 - see if I can fix the no alias problem in selects
 //p1 - add luid - it's cool for order by.
 //p1 - replace uuid with crypto.randomUUID and allow custom fallback

package/package.json

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

package/postgres/schema-builder.d.ts

@@ -11,7 +11,7 @@ export declare class PostgresSchemaBuilder {
     private schemaAndName;
     private schemaOnly;
     verifyStructureOfAllEntities(remult?: Remult): Promise<void>;
-    ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
+    ensureSchema(entities: EntityMetadata[]): Promise<void>;
     createIfNotExist(entity: EntityMetadata): Promise<void>;
     addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: (e: T) => FieldMetadata): Promise<void>;
     verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;

package/remult-knex/index.d.ts

@@ -29,7 +29,7 @@ export declare class KnexSchemaBuilder {
     verifyStructureOfAllEntities(remult?: Remult): Promise<void>;
     ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
     createIfNotExist(entity: EntityMetadata): Promise<void>;
-    createTableKnexCommand(entity: EntityMetadata<any>, e: EntityDbNamesBase): Knex.SchemaBuilder;
+    createTableKnexCommand(entity: EntityMetadata, e: EntityDbNamesBase): Knex.SchemaBuilder;
     addColumnIfNotExist(entity: EntityMetadata, c: (e: EntityMetadata) => FieldMetadata): Promise<void>;
     createColumnKnexCommand(e: EntityDbNamesBase, col: FieldMetadata<any, any>, colName: string): Knex.SchemaBuilder;
     verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;

package/remult-next.d.ts

@@ -1,7 +1,7 @@
 import type { GetServerSideProps, NextApiHandler, NextApiRequest, PreviewData } from 'next';
 import type { ParsedUrlQuery } from 'querystring';
 import type { RemultServerCore, RemultServerOptions } from './server/index.js';
-export declare function remultNext(options?: RemultServerOptions<NextApiRequest>): RemultNextServer;
+export declare function remultNext(options: RemultServerOptions<NextApiRequest>): RemultNextServer;
 export type RemultNextServer = RemultServerCore<NextApiRequest> & NextApiHandler & {
     getServerSideProps<P extends {
         [key: string]: any;

package/remult-sveltekit.d.ts

@@ -1,6 +1,6 @@
 import type { Handle, RequestEvent, RequestHandler } from '@sveltejs/kit';
 import type { RemultServerCore, RemultServerOptions, RemultServer } from './server/index.js';
-export declare function remultSveltekit(options?: RemultServerOptions<RequestEvent>): RemultSveltekitServer;
+export declare function remultSveltekit(options: RemultServerOptions<RequestEvent>): RemultSveltekitServer;
 export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle & {
     withRemult: RemultServer<RequestEvent>['withRemultAsync'];
     GET: RequestHandler;

package/server/index.d.ts

@@ -3,4 +3,4 @@ export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
 export { GenericRequestHandler, GenericRequestInfo, GenericResponse, GenericRouter, InitRequestOptions, QueueStorage, RemultServer, RemultServerCore, RemultServerOptions, SpecificRoute, queuedJobInfo, } from './remult-api-server.js';
-export declare function createRemultServer<RequestType>(options: RemultServerOptions<RequestType> | undefined, serverCoreOptions?: ServerCoreOptions<RequestType>): RemultServer<RequestType>;
+export declare function createRemultServer<RequestType>(options: RemultServerOptions<RequestType>, serverCoreOptions?: ServerCoreOptions<RequestType>): RemultServer<RequestType>;

package/server/remult-api-server.d.ts

@@ -92,7 +92,7 @@ export interface InitRequestOptions {
     liveQueryStorage: LiveQueryStorage;
     readonly remult: Remult;
 }
-export declare function createRemultServerCore<RequestType>(options: RemultServerOptions<RequestType> | undefined, serverCoreOptions: ServerCoreOptions<RequestType>): RemultServer<RequestType>;
+export declare function createRemultServerCore<RequestType>(options: RemultServerOptions<RequestType>, serverCoreOptions: ServerCoreOptions<RequestType>): RemultServer<RequestType>;
 export type GenericRequestHandler<RequestType> = (req: RequestType, res: GenericResponse, next: VoidFunction) => void;
 export interface ServerHandleResponse {
     data?: any;

package/src/CompoundIdField.d.ts

@@ -11,7 +11,7 @@ export declare class CompoundIdField implements FieldMetadata<string> {
     fromInput(inputValue: string, inputType?: string): string;
     getDbName(): Promise<string>;
     getId(instance: any): string;
-    options: FieldOptions<any, any>;
+    options: FieldOptions;
     get valueConverter(): Required<ValueConverter<string>>;
     target: ClassType<any>;
     readonly: boolean;

package/src/column-interfaces.d.ts

@@ -1,7 +1,7 @@
 import type { ClassType } from '../classType.js';
 import type { AllowedForInstance } from './context.js';
 import type { EntityMetadata, FieldRef, LifecycleEvent, ValidateFieldEvent } from './remult3/remult3.js';
-export interface FieldOptions<entityType = any, valueType = any> {
+export interface FieldOptions<entityType = unknown, valueType = unknown> {
     /** A human readable name for the field. Can be used to achieve a consistent caption for a field throughout the app
      * @example
      * <input placeholder={taskRepo.metadata.fields.title.caption}/>
@@ -119,14 +119,14 @@ export interface FieldOptions<entityType = any, valueType = any> {
     key?: string;
 }
 /**Metadata for a `Field`, this metadata can be used in the user interface to provide a richer UI experience */
-export interface FieldMetadata<valueType = any, entityType = any> {
+export interface FieldMetadata<valueType = unknown, entityType = unknown> {
     /** The field's member name in an object.
      * @example
      * const taskRepo = remult.repo(Task);
      * console.log(taskRepo.metadata.fields.title.key);
      * // result: title
      */
-    readonly key: string;
+    readonly key: entityType extends object ? keyof entityType & string : string;
     /** A human readable caption for the field. Can be used to achieve a consistent caption for a field throughout the app
      * @example
      * <input placeholder={taskRepo.metadata.fields.title.caption}/>
@@ -211,7 +211,7 @@ export interface FieldMetadata<valueType = any, entityType = any> {
      * input.value = repo.fields.birthDate.toInput(person) // will return '1976-06-16'
      * @see {@link ValueConverter#toInput} for configuration details
      */
-    toInput(value: valueType | null | undefined, inputType?: string): string;
+    toInput(value: valueType, inputType?: string): string;
     /** Adapts the value for usage with html input
      * @example
      * @Fields.dateOnly()
@@ -239,7 +239,7 @@ export interface ValueConverter<valueType> {
      * @example
      * fromJson: val => new Date(val)
      */
-    fromJson?(val: any): valueType | null | undefined;
+    fromJson?(val: any): valueType;
     /**
      * Converts a value of valueType to a JSON DTO. This method is typically used when sending data
      * to a REST API or serializing an object to a JSON payload.
@@ -250,7 +250,7 @@ export interface ValueConverter<valueType> {
      * @example
      * toJson: val => val?.toISOString()
      */
-    toJson?(val: valueType | null | undefined): any;
+    toJson?(val: valueType): any;
     /**
      * Converts a value from the database format to the valueType.
      *
@@ -260,7 +260,7 @@ export interface ValueConverter<valueType> {
      * @example
      * fromDb: val => new Date(val)
      */
-    fromDb?(val: any): valueType | null | undefined;
+    fromDb?(val: any): valueType;
     /**
      * Converts a value of valueType to the database format.
      *
@@ -270,7 +270,7 @@ export interface ValueConverter<valueType> {
      * @example
      * toDb: val => val?.toISOString()
      */
-    toDb?(val: valueType | null | undefined): any;
+    toDb?(val: valueType): any;
     /**
      * Converts a value of valueType to a string suitable for an HTML input element.
      *
@@ -281,7 +281,7 @@ export interface ValueConverter<valueType> {
      * @example
      * toInput: (val, inputType) => val?.toISOString().substring(0, 10)
      */
-    toInput?(val: valueType | null | undefined, inputType?: string): string;
+    toInput?(val: valueType, inputType?: string): string;
     /**
      * Converts a string from an HTML input element to the valueType.
      *
@@ -292,7 +292,7 @@ export interface ValueConverter<valueType> {
      * @example
      * fromInput: (val, inputType) => new Date(val)
      */
-    fromInput?(val: string, inputType?: string): valueType | null | undefined;
+    fromInput?(val: string, inputType?: string): valueType;
     /**
      * Returns a displayable string representation of a value of valueType.
      *
@@ -302,7 +302,7 @@ export interface ValueConverter<valueType> {
      * @example
      * displayValue: val => val?.toLocaleDateString()
      */
-    displayValue?(val: valueType | null | undefined): string;
+    displayValue?(val: valueType): string;
     /**
      * 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.
      *
@@ -324,7 +324,7 @@ export interface ValueConverter<valueType> {
      */
     readonly inputType?: string;
 }
-export declare type FieldValidator<entityType = any, valueType = any> = (entity: entityType, event: ValidateFieldEvent<entityType, valueType>) => boolean | string | void | undefined | Promise<boolean | string | void | undefined>;
+export declare type FieldValidator<entityType = unknown, valueType = unknown> = (entity: entityType, event: ValidateFieldEvent<entityType, valueType>) => boolean | string | void | undefined | Promise<boolean | string | void | undefined>;
 export declare type ValueOrExpression<valueType> = valueType | (() => valueType);
 export declare function valueOrExpressionToValue<valueType>(f: ValueOrExpression<valueType>): valueType;
 export interface ValueListItem {

package/src/data-api.d.ts

@@ -2,7 +2,7 @@ import type { Remult } from './context.js';
 import type { ErrorInfo } from './data-interfaces.js';
 import type { EntityMetadata, FindOptions, Repository } from './remult3/remult3.js';
 import type { rowHelperImplementation } from './remult3/RepositoryImplementation.js';
-export declare class DataApi<T = any> {
+export declare class DataApi<T = unknown> {
     private repository;
     private remult;
     constructor(repository: Repository<T>, remult: Remult);
@@ -45,4 +45,4 @@ export interface DataApiRequest {
     get(key: string): any;
 }
 export declare function determineSort(sortUrlParm: string, dirUrlParam: string): any;
-export declare function serializeError(data: ErrorInfo): ErrorInfo<any>;
+export declare function serializeError(data: ErrorInfo): ErrorInfo<unknown>;

package/src/data-interfaces.d.ts

@@ -35,7 +35,7 @@ export interface RestDataProviderHttpProvider {
     get(url: string): Promise<any>;
 }
 export declare function extractSort(sort: any): Sort;
-export interface ErrorInfo<entityType = any> {
+export interface ErrorInfo<entityType = unknown> {
     message?: string;
     modelState?: {
         [Properties in keyof Partial<MembersOnly<entityType>>]?: string;

package/src/data-providers/sql-database.d.ts

@@ -37,7 +37,7 @@ export declare class SqlDatabase implements DataProvider, HasWrapIdentifier, Can
      * Wraps an identifier with the database's identifier syntax.
      */
     wrapIdentifier: (name: string) => string;
-    ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
+    ensureSchema(entities: EntityMetadata[]): Promise<void>;
     /**
      * Gets the entity data provider.
      * @param entity  - The entity metadata.

package/src/data-providers/web-sql-data-provider.d.ts

@@ -10,9 +10,9 @@ export declare class WebSqlDataProvider implements SqlImplementation, __RowsOfDa
     end(): Promise<void>;
     getLimitSqlSyntax(limit: number, offset: number): string;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
-    ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
+    ensureSchema(entities: EntityMetadata[]): Promise<void>;
     dropTable(entity: EntityMetadata): Promise<void>;
-    createTable(entity: EntityMetadata<any>): Promise<void>;
+    createTable(entity: EntityMetadata): Promise<void>;
     createCommand(): SqlCommand;
     transaction(action: (dataProvider: SqlImplementation) => Promise<void>): Promise<void>;
     private addColumnSqlSyntax;

package/src/entity.d.ts

@@ -2,7 +2,7 @@ import type { Allowed, AllowedForInstance } from './context.js';
 import type { FieldMetadata } from './column-interfaces.js';
 import type { EntityFilter, EntityIdFields, EntityMetadata, EntityOrderBy, EntityRef, FieldsMetadata, LifecycleEvent } from './remult3/remult3.js';
 import type { FilterPreciseValues } from './filter/filter-interfaces.js';
-export interface EntityOptions<entityType = any> {
+export interface EntityOptions<entityType = unknown> {
     /**A human readable name for the entity */
     caption?: string;
     /**

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -68,7 +68,7 @@ export declare class CustomSqlFilterBuilder implements SqlCommandWithParameters,
 }
 export declare function isDbReadonly<entityType>(field: FieldMetadata, dbNames: EntityDbNames<entityType>): boolean | "" | undefined;
 export declare function shouldNotCreateField<entityType>(field: FieldMetadata, dbNames: EntityDbNames<entityType>): boolean;
-export declare function shouldCreateEntity(entity: EntityMetadata<unknown>, e: EntityDbNamesBase): boolean;
+export declare function shouldCreateEntity(entity: EntityMetadata, e: EntityDbNamesBase): boolean;
 export declare type EntityDbNamesBase = {
     $entityName: string;
     $dbNameOf(field: FieldMetadata<any> | string): string;

package/src/filter/filter-interfaces.d.ts

@@ -182,6 +182,7 @@ export declare class Filter {
      */
     static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
     toJson(): any;
+    static translateCustomWhere<T>(r: Filter, entity: EntityMetadata<T>, remult: Remult): Promise<Filter>;
 }
 export interface FilterConsumer {
     or(orElements: Filter[]): void;

package/src/filter/filter-interfaces.js

@@ -349,7 +349,6 @@ var Filter = /** @class */ (function () {
         this.__applyToConsumer(r);
         return r.result;
     };
-    //@internal
     Filter.translateCustomWhere = function (r, entity, remult) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var f;

package/src/remult3/Fields.d.ts

@@ -6,22 +6,22 @@ export declare class Fields {
     /**
      * Stored as a JSON.stringify - to store as json use Fields.json
      */
-    static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
-    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
-    static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
-    static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
-    static integer<entityType = any>(...options: (FieldOptions<entityType, number> | ((options: FieldOptions<entityType, number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
-    static autoIncrement<entityType = any>(...options: (FieldOptions<entityType, number> | ((options: FieldOptions<entityType, number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
-    static number<entityType = any>(...options: (FieldOptions<entityType, number> | ((options: FieldOptions<entityType, number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
-    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>;
+    static object<entityType = unknown, valueType = unknown>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static json<entityType = unknown, valueType = unknown>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static dateOnly<entityType = unknown>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static date<entityType = unknown>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static integer<entityType = unknown>(...options: (FieldOptions<entityType, number> | ((options: FieldOptions<entityType, number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static autoIncrement<entityType = unknown>(...options: (FieldOptions<entityType, number> | ((options: FieldOptions<entityType, number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static number<entityType = unknown>(...options: (FieldOptions<entityType, number> | ((options: FieldOptions<entityType, number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static createdAt<entityType = unknown>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static updatedAt<entityType = unknown>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static uuid<entityType = unknown>(...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>;
+    static cuid<entityType = unknown>(...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.
@@ -51,10 +51,10 @@ export declare class Fields {
    *
    * // 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 = object>(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>;
+    static literal<entityType = unknown, valueType extends string = string>(optionalValues: () => readonly valueType[], ...options: (StringFieldOptions<entityType, valueType> | ((options: StringFieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static enum<entityType = unknown, theEnum = object>(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 = unknown, valueType = string>(...options: (StringFieldOptions<entityType, valueType> | ((options: StringFieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static boolean<entityType = unknown>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, boolean | undefined>;
 }
 export declare class Relations {
     /**
@@ -162,8 +162,8 @@ export declare class Relations {
  * @Fields.string((options,remult) => options.includeInApi = true)
  * title='';
  */
-export declare function Field<entityType = any, valueType = any>(valueType: (() => valueType extends number ? Number : valueType extends string ? String : valueType extends boolean ? Boolean : ClassType<valueType>) | undefined, ...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, context: ClassFieldDecoratorContextStub<entityType, valueType | undefined> | string) => void;
-export interface StringFieldOptions<entityType = any, valueType = string> extends FieldOptions<entityType, valueType> {
+export declare function Field<entityType = unknown, valueType = unknown>(valueType: (() => valueType extends number ? Number : valueType extends string ? String : valueType extends boolean ? Boolean : ClassType<valueType>) | undefined, ...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, context: ClassFieldDecoratorContextStub<entityType, valueType | undefined> | string, c?: any) => void;
+export interface StringFieldOptions<entityType = unknown, valueType = string> extends FieldOptions<entityType, valueType> {
     maxLength?: number;
     minLength?: number;
 }

package/src/remult3/Fields.js

@@ -12,6 +12,7 @@ var validators_js_1 = require("../validators.js");
 var relationInfoMember_js_1 = require("./relationInfoMember.js");
 var remult_static_js_1 = require("../remult-static.js");
 var addValidator_js_1 = require("./addValidator.js");
+var isOfType_js_1 = require("../isOfType.js");
 var validateNumber = (0, validators_js_1.createValueValidator)(function (x) {
     return !isNaN(x) && isFinite(x);
 });
@@ -157,7 +158,7 @@ var Fields = /** @class */ (function () {
                 },
             }], tslib_1.__read(options), false));
     };
-    // static id<entityType = any>(
+    // static id<entityType = unknown>(
     //   options?: FieldOptions<entityType, string> & { idFactory?: () => string },
     // ): ClassFieldDecorator<entityType, string | undefined> {
     //   let buildId = options?.idFactory ?? createId
@@ -351,18 +352,24 @@ function Field(valueType) {
     for (var _i = 1; _i < arguments.length; _i++) {
         options[_i - 1] = arguments[_i];
     }
-    return function (target, context) {
+    return function (target, context, c) {
         var key = typeof context === 'string' ? context : context.name.toString();
         var factory = function (remult) {
             var r = (0, RepositoryImplementation_js_1.buildOptions)(options, remult);
             if (r.required) {
                 r.validate = (0, addValidator_js_1.addValidator)(r.validate, validators_js_1.Validators.required, true);
             }
-            if (r.maxLength) {
-                r.validate = (0, addValidator_js_1.addValidator)(r.validate, validators_js_1.Validators.maxLength(r.maxLength));
+            if ((0, isOfType_js_1.isOfType)(r, 'maxLength')) {
+                var z = r;
+                if (z.maxLength) {
+                    z.validate = (0, addValidator_js_1.addValidator)(z.validate, validators_js_1.Validators.maxLength(z.maxLength));
+                }
             }
-            if (r.minLength) {
-                r.validate = (0, addValidator_js_1.addValidator)(r.validate, validators_js_1.Validators.minLength(r.minLength));
+            if ((0, isOfType_js_1.isOfType)(r, 'minLength')) {
+                var z = r;
+                if (z.minLength) {
+                    z.validate = (0, addValidator_js_1.addValidator)(z.validate, validators_js_1.Validators.minLength(z.minLength));
+                }
             }
             if (!r.valueType && valueType) {
                 r.valueType = valueType();

package/src/remult3/RepositoryImplementation.d.ts

@@ -103,7 +103,7 @@ declare abstract class rowHelperBase<T> {
         [key: string]: string | undefined;
     };
     protected __assertValidity(): void;
-    buildErrorInfoObject(): ErrorInfo<any>;
+    buildErrorInfoObject(): ErrorInfo<unknown>;
     abstract get fields(): FieldsRef<T>;
     catchSaveErrors(err: any): any;
     __clearErrorsAndReportChanged(): void;
@@ -113,7 +113,7 @@ declare abstract class rowHelperBase<T> {
     originalValues: any;
     saveOriginalData(): void;
     saveMoreOriginalData(): void;
-    validate(): Promise<ErrorInfo<any> | undefined>;
+    validate(): Promise<ErrorInfo<unknown> | undefined>;
     __validateEntity(): Promise<void>;
     __performColumnAndEntityValidations(): Promise<void>;
     toApiJson(includeRelatedEntities?: boolean, notJustApi?: boolean): any;
@@ -121,10 +121,11 @@ declare abstract class rowHelperBase<T> {
 }
 export declare class rowHelperImplementation<T> extends rowHelperBase<T> implements EntityRef<T> {
     private info;
-    repository: RepositoryImplementation<T>;
+    private repo;
     private edp;
     private _isNew;
-    constructor(info: EntityFullInfo<T>, instance: T, repository: RepositoryImplementation<T>, edp: EntityDataProvider, remult: Remult, _isNew: boolean);
+    constructor(info: EntityFullInfo<T>, instance: T, repo: RepositoryImplementation<T>, edp: EntityDataProvider, remult: Remult, _isNew: boolean);
+    repository: Repository<unknown>;
     clone(): T;
     get relations(): RepositoryRelations<T>;
     get apiUpdateAllowed(): boolean;
@@ -157,22 +158,24 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
 }
 export declare function getFields<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): FieldsRef<fieldsContainerType>;
 export declare function getControllerRef<fieldsContainerType>(container: fieldsContainerType, remultArg?: Remult): ControllerRef<fieldsContainerType>;
-export declare class controllerRefImpl<T = any> extends rowHelperBase<T> implements ControllerRef<T> {
+export declare class controllerRefImpl<T = unknown> extends rowHelperBase<T> implements ControllerRef<T> {
     constructor(columnsInfo: FieldMetadata[], instance: any, remult: Remult);
     __performColumnAndEntityValidations(): Promise<void>;
     fields: FieldsRef<T>;
 }
 export declare class FieldRefImplementation<entityType, valueType> implements FieldRef<entityType, valueType> {
     private settings;
-    metadata: FieldMetadata;
+    metadata: FieldMetadata<valueType, entityType>;
     container: any;
     private helper;
     private rowBase;
-    constructor(settings: FieldOptions, metadata: FieldMetadata, container: any, helper: EntityRef<entityType> | undefined, rowBase: rowHelperBase<entityType>);
+    constructor(settings: FieldOptions, metadata: FieldMetadata<valueType, entityType>, container: any, helper: EntityRef<entityType> | undefined, rowBase: rowHelperBase<entityType>);
     _subscribers?: SubscribableImp;
     subscribe(listener: RefSubscriber): Unsubscribe;
     valueIsNull(): boolean;
     originalValueIsNull(): boolean;
+    get key(): keyof entityType;
+    get repo(): Repository<entityType>;
     load(): Promise<valueType>;
     target?: ClassType<any>;
     reportObserved(): void;
@@ -230,14 +233,14 @@ export declare class columnDefsImpl implements FieldMetadata {
     private settings;
     private entityDefs;
     private remult;
-    constructor(settings: FieldOptions, entityDefs: EntityFullInfo<any>, remult: Remult);
+    constructor(settings: FieldOptions<unknown, unknown>, entityDefs: EntityFullInfo<any>, remult: Remult);
     apiUpdateAllowed(item?: any): boolean;
     displayValue(item: any): string;
     includedInApi(item?: any): boolean;
     toInput(value: any, inputType?: string): string;
     fromInput(inputValue: string, inputType?: string): any;
     getDbName(): Promise<string>;
-    options: FieldOptions<any, any>;
+    options: FieldOptions<unknown, unknown>;
     target: ClassType<any>;
     readonly: boolean;
     valueConverter: Required<ValueConverter<any>>;
@@ -255,9 +258,9 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
     private remult;
     readonly entityType: ClassType<T>;
     readonly key: string;
-    options: EntityOptions<T>;
+    options: EntityOptions<unknown>;
     fieldsMetadata: FieldMetadata[];
-    constructor(columnsInfo: FieldOptions[], entityInfo: EntityOptions<T>, remult: Remult, entityType: ClassType<T>, key: string);
+    constructor(columnsInfo: FieldOptions<unknown, unknown>[], entityInfo: EntityOptions<T>, remult: Remult, entityType: ClassType<T>, key: string);
     apiUpdateAllowed(item: T): boolean;
     get apiReadAllowed(): boolean;
     apiDeleteAllowed(item: T): boolean;
@@ -269,9 +272,9 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
     dbName: string;
     caption: string;
 }
-export declare function FieldType<valueType = any>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any) => any;
+export declare function FieldType<valueType = unknown>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any, context?: any) => any;
 export declare function isAutoIncrement(f: FieldMetadata): boolean;
-export declare function ValueListFieldType<valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => void;
+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[];
 }
@@ -284,12 +287,12 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
     private constructor();
     getValues(): T[];
     byId(key: any): T | undefined;
-    fromJson(val: any): T | undefined;
+    fromJson(val: any): T;
     toJson(val: T): any;
-    fromDb(val: any): T | undefined;
+    fromDb(val: any): T;
     toDb(val: T): any;
     toInput(val: T, inputType: string): string;
-    fromInput(val: string, inputType: string): T | undefined | null;
+    fromInput(val: string, inputType: string): T;
     displayValue?(val: T): string;
     fieldTypeInDb?: string;
     inputType?: string;
@@ -299,8 +302,8 @@ export declare function getValueList<T>(field: FieldMetadata<T>): T[];
 export declare function getValueList<T>(type: ClassType<T>): T[];
 export declare const storableMember: unique symbol;
 export declare const fieldOptionalValuesFunctionKey: unique symbol;
-export declare function buildOptions<entityType = any, valueType = any>(options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[], remult: Remult): FieldOptions<entityType, valueType>;
-export declare function decorateColumnSettings<valueType>(settings: FieldOptions<any, valueType>, remult: Remult): FieldOptions<any, valueType>;
+export declare function buildOptions<entityType = unknown, valueType = unknown>(options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[], remult: Remult): FieldOptions<entityType, valueType>;
+export declare function decorateColumnSettings<valueType>(settings: FieldOptions<unknown, valueType>, remult: Remult): FieldOptions<unknown, valueType>;
 export declare class EntityBase {
     get _(): EntityRefForEntityBase<this>;
     save(): Promise<this>;

package/src/remult3/RepositoryImplementation.js

@@ -1925,15 +1925,16 @@ var rowHelperBase = /** @class */ (function () {
 }());
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
-    function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
+    function rowHelperImplementation(info, instance, repo, edp, remult, _isNew) {
         var e_30, _a;
         var _this = _super.call(this, info.fieldsMetadata, instance, remult, _isNew) || this;
         _this.info = info;
-        _this.repository = repository;
+        _this.repo = repo;
         _this.edp = edp;
         _this._isNew = _isNew;
         _this._wasDeleted = false;
         _this._saving = false;
+        _this.repository = repo;
         _this.metadata = info;
         if (_isNew) {
             try {
@@ -1957,19 +1958,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                 finally { if (e_30) throw e_30.error; }
             }
         }
-        if (_this.info.options.entityRefInit)
-            _this.info.options.entityRefInit(_this, instance);
+        if (_this.info.entityInfo.entityRefInit)
+            _this.info.entityInfo.entityRefInit(_this, instance);
         if (context_js_1.Remult.entityRefInit)
             context_js_1.Remult.entityRefInit(_this, instance);
         return _this;
     }
     rowHelperImplementation.prototype.clone = function () {
         var data = this.toApiJson(true, true);
-        return this.repository.fromJson(data, this.isNew());
+        return this.repo.fromJson(data, this.isNew());
     };
     Object.defineProperty(rowHelperImplementation.prototype, "relations", {
         get: function () {
-            return this.repository.relations(this.instance);
+            return this.repo.relations(this.instance);
         },
         enumerable: false,
         configurable: true
@@ -2037,7 +2038,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 switch (_a.label) {
                                     case 0:
                                         if (newData.length === 0)
-                                            throw this.repository._notFoundError(this.id);
+                                            throw this.repo._notFoundError(this.id);
                                         return [4 /*yield*/, this.loadDataFrom(newData[0])];
                                     case 1:
                                         _a.sent();
@@ -2117,7 +2118,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 2:
                         doNotSave_1 = false;
                         e = this.buildLifeCycleEvent(function () { return (doNotSave_1 = true); });
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 12];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 12];
                         _t.label = 3;
                     case 3:
                         _t.trys.push([3, 8, 9, 10]);
@@ -2232,18 +2233,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _t.label = 26;
                     case 26:
                         e.id = this.getId();
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 36];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 36];
                         if (!this.info.entityInfo.saved) return [3 /*break*/, 28];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
                     case 27:
                         _t.sent();
                         _t.label = 28;
                     case 28:
-                        if (!this.repository.listeners) return [3 /*break*/, 36];
+                        if (!this.repo.listeners) return [3 /*break*/, 36];
                         _t.label = 29;
                     case 29:
                         _t.trys.push([29, 34, 35, 36]);
-                        _j = tslib_1.__values(this.repository.listeners), _k = _j.next();
+                        _j = tslib_1.__values(this.repo.listeners), _k = _j.next();
                         _t.label = 30;
                     case 30:
                         if (!!_k.done) return [3 /*break*/, 33];
@@ -2266,7 +2267,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         finally { if (e_33) throw e_33.error; }
                         return [7 /*endfinally*/];
-                    case 36: return [4 /*yield*/, this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
+                    case 36: return [4 /*yield*/, this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
                     case 37:
                         _t.sent();
                         this.saveOriginalData();
@@ -2344,17 +2345,17 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             fields: self.fields,
             id: self.getId(),
             originalId: self.getOriginalId(),
-            metadata: self.repository.metadata,
-            repository: self.repository,
+            metadata: self.repo.metadata,
+            repository: self.repo,
             preventDefault: function () { return preventDefault(); },
-            relations: self.repository.relations(self.instance),
+            relations: self.repo.relations(self.instance),
         };
     };
     rowHelperImplementation.prototype.getIdFilter = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repository._translateWhereToFilter(this.repository.metadata.idMetadata.getIdFilter(this.id))];
+                    case 0: return [4 /*yield*/, this.repo._translateWhereToFilter(this.repo.metadata.idMetadata.getIdFilter(this.id))];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2371,7 +2372,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         this.__clearErrorsAndReportChanged();
                         doDelete = true;
                         e = this.buildLifeCycleEvent(function () { return (doDelete = false); });
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 2];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 2];
                         if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.info.entityInfo.deleting(this.instance, e)];
                     case 1:
@@ -2388,18 +2389,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _e.sent();
                         _e.label = 5;
                     case 5:
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 7];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 7];
                         if (!this.info.entityInfo.deleted) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.info.entityInfo.deleted(this.instance, e)];
                     case 6:
                         _e.sent();
                         _e.label = 7;
                     case 7:
-                        if (!this.repository.listeners) return [3 /*break*/, 15];
+                        if (!this.repo.listeners) return [3 /*break*/, 15];
                         _e.label = 8;
                     case 8:
                         _e.trys.push([8, 13, 14, 15]);
-                        _a = tslib_1.__values(this.repository.listeners), _b = _a.next();
+                        _a = tslib_1.__values(this.repo.listeners), _b = _a.next();
                         _e.label = 9;
                     case 9:
                         if (!!_b.done) return [3 /*break*/, 12];
@@ -2422,7 +2423,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         finally { if (e_36) throw e_36.error; }
                         return [7 /*endfinally*/];
-                    case 15: return [4 /*yield*/, this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
+                    case 15: return [4 /*yield*/, this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
                     case 16:
                         _e.sent();
                         this._wasDeleted = true;
@@ -2518,7 +2519,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [4 /*yield*/, col.options.serverExpression(this.instance)];
                     case 3:
                         _c[_d] =
-                            _f.sent();
+                            (_f.sent());
                         _f.label = 4;
                     case 4:
                         _b = _a.next();
@@ -2608,11 +2609,11 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _h.sent();
                         _h.label = 9;
                     case 9:
-                        if (!this.repository.listeners) return [3 /*break*/, 17];
+                        if (!this.repo.listeners) return [3 /*break*/, 17];
                         _h.label = 10;
                     case 10:
                         _h.trys.push([10, 15, 16, 17]);
-                        _c = tslib_1.__values(this.repository.listeners), _d = _c.next();
+                        _c = tslib_1.__values(this.repo.listeners), _d = _c.next();
                         _h.label = 11;
                     case 11:
                         if (!!_d.done) return [3 /*break*/, 14];
@@ -2776,6 +2777,21 @@ var FieldRefImplementation = /** @class */ (function () {
         var lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     };
+    Object.defineProperty(FieldRefImplementation.prototype, "key", {
+        get: function () {
+            return this.metadata.key;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(FieldRefImplementation.prototype, "repo", {
+        get: function () {
+            var _a;
+            return (_a = this.helper) === null || _a === void 0 ? void 0 : _a.repository;
+        },
+        enumerable: false,
+        configurable: true
+    });
     FieldRefImplementation.prototype.load = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var lu, rel, _a, _b, val;
@@ -2788,9 +2804,9 @@ var FieldRefImplementation = /** @class */ (function () {
                         if (!(rel.type === 'toMany')) return [3 /*break*/, 2];
                         _a = this.container;
                         _b = this.metadata.key;
-                        return [4 /*yield*/, this.helper.repository.relations(this.container)[this.metadata.key].find()];
+                        return [4 /*yield*/, this.repo.relations(this.container)[this.key].find()];
                     case 1: return [2 /*return*/, (_a[_b] = _c.sent())];
-                    case 2: return [4 /*yield*/, this.helper.repository
+                    case 2: return [4 /*yield*/, this.repo
                             .relations(this.container)[this.metadata.key].findOne()];
                     case 3:
                         val = _c.sent();
@@ -3207,11 +3223,11 @@ var EntityFullInfo = /** @class */ (function () {
             else
                 crud = this.options.allowApiCrud;
             if (this.options.allowApiDelete === undefined)
-                this.options.allowApiDelete = crud;
+                this.entityInfo.allowApiDelete = crud;
             if (this.options.allowApiInsert === undefined)
-                this.options.allowApiInsert = crud;
+                this.entityInfo.allowApiInsert = crud;
             if (this.options.allowApiUpdate === undefined)
-                this.options.allowApiUpdate = crud;
+                this.entityInfo.allowApiUpdate = crud;
             if (this.options.allowApiRead === undefined)
                 this.options.allowApiRead = this.options.allowApiCrud;
         }
@@ -3312,7 +3328,7 @@ function FieldType() {
     for (var _i = 0; _i < arguments.length; _i++) {
         options[_i] = arguments[_i];
     }
-    return function (target) {
+    return function (target, context) {
         if (!options) {
             options = [];
         }
@@ -3330,7 +3346,7 @@ function ValueListFieldType() {
     for (var _i = 0; _i < arguments.length; _i++) {
         options[_i] = arguments[_i];
     }
-    return function (type) {
+    return function (type, context) {
         FieldType.apply(void 0, tslib_1.__spreadArray([function (o) {
                 ;
                 (o.valueConverter = ValueListInfo.get(type)),

package/src/remult3/addValidator.d.ts

@@ -1,2 +1,2 @@
 import type { FieldOptions } from '../column-interfaces.js';
-export declare function addValidator(validators: FieldOptions['validate'], newValidator: FieldOptions['validate'], atStart?: boolean): import("../column-interfaces.js").FieldValidator<any, any> | import("../column-interfaces.js").FieldValidator<any, any>[] | undefined;
+export declare function addValidator<entityType, valueType>(validators: FieldOptions<entityType, valueType>['validate'], newValidator: FieldOptions<entityType, valueType>['validate'], atStart?: boolean): import("../column-interfaces.js").FieldValidator<entityType, valueType> | import("../column-interfaces.js").FieldValidator<entityType, valueType>[] | undefined;

package/src/remult3/classDescribers.d.ts

@@ -1,7 +1,7 @@
 import type { ClassType } from '../../classType.js';
 import type { EntityOptions } from '../entity.js';
 import { type BackendMethodOptions } from '../server-action.js';
-type Descriptor<T = any> = (a: T, b: string, c?: any) => void;
+type Descriptor<T = unknown> = (a: T, b: string, c?: any) => void;
 type FieldsDescriptor<T> = T extends new (...args: any[]) => infer R ? {
     [K in keyof R]?: Descriptor;
 } : never;

package/src/remult3/columnInfo.d.ts

@@ -2,5 +2,5 @@ import type { FieldOptions } from '../column-interfaces.js';
 import type { Remult } from '../context.js';
 export interface columnInfo {
     key: string;
-    settings: (remult: Remult) => FieldOptions;
+    settings: (remult: Remult) => FieldOptions<unknown, unknown>;
 }

package/src/remult3/relationInfoMember.d.ts

@@ -15,10 +15,10 @@ export interface RelationInfo {
     toType: () => any;
     type: RelationFieldInfo['type'];
 }
-export declare function getRelationFieldInfo(field: FieldMetadata<unknown, unknown>): RelationFieldInfo | undefined;
+export declare function getRelationFieldInfo(field: FieldMetadata): RelationFieldInfo | undefined;
 export interface RelationFieldInfo {
     type: 'reference' | 'toOne' | 'toMany';
-    options: RelationOptions<any, any, any>;
+    options: RelationOptions<unknown, unknown, unknown>;
     toEntity: any;
     toRepo: Repository<unknown>;
     getFields(): RelationFields;

package/src/remult3/remult3.d.ts

@@ -18,8 +18,8 @@ export interface EntityRefBase<entityType> extends Subscribable {
     error: string | undefined;
     getId(): idType<entityType>;
     getOriginalId(): idType<entityType>;
-    repository: Repository<entityType>;
-    metadata: EntityMetadata<entityType>;
+    repository: Repository<unknown>;
+    metadata: EntityMetadata<unknown>;
     toApiJson(): any;
     validate(): Promise<ErrorInfo<entityType> | undefined>;
     readonly apiUpdateAllowed: boolean;
@@ -36,7 +36,7 @@ export interface EntityRefForEntityBase<entityType> extends EntityRefBase<entity
     fields: FieldsRefForEntityBase<entityType>;
     relations: RepositoryRelationsForEntityBase<entityType>;
 }
-export interface ValidateFieldEvent<entityType = any, valueType = any> {
+export interface ValidateFieldEvent<entityType = unknown, valueType = unknown> {
     error?: string;
     value: valueType;
     originalValue: valueType;
@@ -119,19 +119,19 @@ export type FieldsRefBase<entityType> = {
     toArray(): FieldRef<entityType, any>[];
 };
 export type FieldsMetadata<entityType> = {
-    [Properties in keyof MembersOnly<entityType>]: FieldMetadata<entityType[Properties], entityType>;
+    [Properties in keyof MembersOnly<entityType>]-?: FieldMetadata<entityType[Properties], entityType>;
 } & {
-    find(fieldMetadataOrKey: FieldMetadata | string): FieldMetadata<any, entityType>;
+    find(fieldMetadataOrKey: FieldMetadata | string): FieldMetadata<unknown, entityType>;
     [Symbol.iterator]: () => IterableIterator<FieldMetadata<any, entityType>>;
     toArray(): FieldMetadata<any, entityType>[];
 };
 export type FieldsRef<entityType> = FieldsRefBase<entityType> & {
-    [Properties in keyof MembersOnly<entityType>]: NonNullable<entityType[Properties]> extends {
+    [Properties in keyof MembersOnly<entityType>]-?: NonNullable<entityType[Properties]> extends {
         id?: number | string;
     } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
 };
 export type FieldsRefForEntityBase<entityType> = FieldsRefBase<entityType> & {
-    [Properties in keyof Omit<entityType, keyof EntityBase>]: NonNullable<entityType[Properties]> extends {
+    [Properties in keyof Omit<entityType, keyof EntityBase>]-?: NonNullable<entityType[Properties]> extends {
         id?: number | string;
     } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
 };
@@ -152,7 +152,7 @@ export interface IdFieldRef<entityType, valueType> extends FieldRef<entityType,
         id?: string;
     } ? string : string | number;
 }
-export interface FieldRef<entityType = any, valueType = any> extends Subscribable {
+export interface FieldRef<entityType = unknown, valueType = unknown> extends Subscribable {
     error: string | undefined;
     displayValue: string;
     value: valueType;
@@ -170,7 +170,7 @@ export interface FieldRef<entityType = any, valueType = any> extends Subscribabl
     originalValueIsNull(): boolean;
     validate(): Promise<boolean>;
 }
-export interface IdMetadata<entityType = any> {
+export interface IdMetadata<entityType = unknown> {
     /** Extracts the id value of an entity item. Useful in cases where the id column is not called id
      * @example
      * repo.metadata.idMetadata.getId(task)
@@ -183,7 +183,7 @@ export interface IdMetadata<entityType = any> {
     createIdInFilter(items: Partial<MembersOnly<entityType>>[]): EntityFilter<entityType>;
 }
 /** Metadata for an `Entity`, this metadata can be used in the user interface to provide a richer UI experience  */
-export interface EntityMetadata<entityType = any> {
+export interface EntityMetadata<entityType = unknown> {
     /** The Entity's key also used as it's url  */
     readonly key: string;
     /** Metadata for the Entity's fields */

package/src/remult3/remult3.js

@@ -4,16 +4,16 @@ exports.flags = void 0;
 exports.flags = {
     error500RetryCount: 4,
 };
-/*y1 - typing discussion:
- * all fields required in fields
- * key as key of entity
- * continue with?
- * should and / or accept also undefined members? the code supports it, not sure if the api should
- * Sql server expression supports undefined as a response
+/*p1
+ * field, fieldType ,ValueListFieldType, - return optional parameter for decorators
+ * options to remultExpress tc... should be mandatory
+ * return value converter to previous typing
+ * add breaking change notification about findOne and findFirst and findId
  */
 //p1 - fix query docs to also explain how it can be used for infinite scroll and pagination.
 //y1 - 'test expression columns without aliases'
 //y1 - ts issue with fields - when a field is optional, it's $ is also optional and thats a problem
+//p1 - vite 5.3 supports ts5 decorators - check and adapt.
 //p1 - see if I can fix the no alias problem in selects
 //p1 - add luid - it's cool for order by.
 //p1 - replace uuid with crypto.randomUUID and allow custom fallback

package/src/server-action.d.ts

@@ -54,7 +54,7 @@ export interface ClassMethodDecoratorContextStub<This = unknown, Value extends (
     };
 }
 /** Indicates that the decorated methods runs on the backend. See: [Backend Methods](https://remult.dev/docs/backendMethods.html) */
-export declare function BackendMethod<type = any>(options: BackendMethodOptions<type>): (target: any, context: ClassMethodDecoratorContextStub<type> | string, descriptor?: any) => any;
+export declare function BackendMethod<type = unknown>(options: BackendMethodOptions<type>): (target: any, context: ClassMethodDecoratorContextStub<type> | string, descriptor?: any) => any;
 export interface jobWasQueuedResult {
     queuedJobId?: string;
 }