remult 0.23.0-exp.34 → 0.23.0-exp.35

package/esm/index.d.ts

@@ -1,5 +1,6 @@
 import type { ClassType } from './classType';
-export { OmitEB, OmitFunctions, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
+export type { ClassType } from './classType';
+export { MembersOnly, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
 LifecycleEvent, } from './src/remult3/remult3';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation';
 export { Entity } from './src/remult3/entity';

package/esm/src/column-interfaces.d.ts

@@ -1,6 +1,6 @@
 import type { ClassType } from '../classType';
 import type { AllowedForInstance } from './context';
-import type { EntityMetadata, FieldRef, LifecycleEvent, OmitEB } from './remult3/remult3';
+import type { EntityMetadata, FieldRef, LifecycleEvent } from './remult3/remult3';
 export interface FieldOptions<entityType = any, valueType = any> {
     /** A human readable name for the field. Can be used to achieve a consistent caption for a field throughout the app
      * @example
@@ -132,9 +132,9 @@ export interface FieldMetadata<valueType = any, entityType = any> {
      * @example
      * repo.fields.createDate.displayValue(task) //will display the date as defined in the `displayValue` option defined for it.
      */
-    displayValue(item: Partial<OmitEB<entityType>>): string;
-    apiUpdateAllowed(item?: Partial<OmitEB<entityType>>): boolean;
-    includedInApi(item?: Partial<OmitEB<entityType>>): boolean;
+    displayValue(item: Partial<entityType>): string;
+    apiUpdateAllowed(item?: Partial<entityType>): boolean;
+    includedInApi(item?: Partial<entityType>): boolean;
     /** Adapts the value for usage with html input
      * @example
      * @Fields.dateOnly()

package/esm/src/data-interfaces.d.ts

@@ -1,5 +1,5 @@
 import type { Filter } from './filter/filter-interfaces';
-import type { EntityMetadata, OmitEB, OmitFunctions } from './remult3/remult3';
+import type { EntityMetadata, MembersOnly } from './remult3/remult3';
 import { Sort } from './sort';
 export interface DataProvider {
     getEntityDataProvider(entity: EntityMetadata): EntityDataProvider;
@@ -33,7 +33,7 @@ export declare function extractSort(sort: any): Sort;
 export interface ErrorInfo<entityType = any> {
     message?: string;
     modelState?: {
-        [Properties in keyof Partial<OmitFunctions<OmitEB<entityType>>>]?: string;
+        [Properties in keyof Partial<MembersOnly<entityType>>]?: string;
     };
     stack?: string;
     exception?: any;

package/esm/src/data-providers/array-entity-data-provider.d.ts

@@ -1,24 +1,3 @@
-import type { EntityDataProvider, EntityDataProviderFindOptions } from '../data-interfaces';
-import { type EntityDbNamesBase } from '../filter/filter-consumer-bridge-to-sql-request';
-import { Filter } from '../filter/filter-interfaces';
-import type { EntityFilter, EntityMetadata } from '../remult3/remult3';
-export declare class ArrayEntityDataProvider implements EntityDataProvider {
-    private entity;
-    static rawFilter(filter: CustomArrayFilter): EntityFilter<any>;
-    private rows;
-    constructor(entity: EntityMetadata, rows?: any[]);
-    __names: EntityDbNamesBase;
-    init(): Promise<EntityDbNamesBase>;
-    private verifyThatRowHasAllNotNullColumns;
-    count(where?: Filter): Promise<number>;
-    find(options?: EntityDataProviderFindOptions): Promise<any[]>;
-    translateFromJson(row: any, dbNames: EntityDbNamesBase): {};
-    translateToJson(row: any, dbNames: EntityDbNamesBase): {};
-    private idMatches;
-    update(id: any, data: any): Promise<any>;
-    delete(id: any): Promise<void>;
-    insert(data: any): Promise<any>;
-}
 export type CustomArrayFilter = (item: any) => boolean;
 export interface CustomArrayFilterObject {
     arrayFilter: CustomArrayFilter;

package/esm/src/data-providers/array-entity-data-provider.js

@@ -1,6 +1,7 @@
 import { CompoundIdField } from '../CompoundIdField';
 import { dbNamesOf, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request';
 import { Filter, customDatabaseFilterToken } from '../filter/filter-interfaces';
+//@internal
 export class ArrayEntityDataProvider {
     entity;
     static rawFilter(filter) {
@@ -10,6 +11,7 @@ export class ArrayEntityDataProvider {
             },
         };
     }
+    //@internal
     rows;
     constructor(entity, rows) {
         this.entity = entity;
@@ -18,7 +20,9 @@ export class ArrayEntityDataProvider {
         else
             this.rows = rows;
     }
+    //@internal
     __names;
+    //@internal
     async init() {
         if (this.__names)
             return this.__names;
@@ -28,6 +32,7 @@ export class ArrayEntityDataProvider {
         }
         return this.__names;
     }
+    //@internal
     verifyThatRowHasAllNotNullColumns(r, names) {
         for (const f of this.entity.fields) {
             const key = names.$dbNameOf(f);
@@ -89,6 +94,7 @@ export class ArrayEntityDataProvider {
             });
         return [];
     }
+    //@internal
     translateFromJson(row, dbNames) {
         let result = {};
         for (const col of this.entity.fields) {
@@ -96,6 +102,7 @@ export class ArrayEntityDataProvider {
         }
         return result;
     }
+    //@internal
     translateToJson(row, dbNames) {
         let result = {};
         for (const col of this.entity.fields) {
@@ -104,6 +111,7 @@ export class ArrayEntityDataProvider {
         }
         return result;
     }
+    //@internal
     idMatches(id, names) {
         return (item) => {
             let x = new FilterConsumerBridgeToObject(item, names);

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

@@ -1,6 +1,6 @@
 import type { FieldMetadata } from '../column-interfaces';
 import type { EntityMetadataOverloads, RepositoryOverloads } from '../remult3/RepositoryImplementation';
-import type { EntityFilter, OmitEB, OmitFunctions } from '../remult3/remult3';
+import type { EntityFilter, MembersOnly } from '../remult3/remult3';
 import type { SqlCommandWithParameters } from '../sql-command';
 import type { Filter, FilterConsumer } from './filter-interfaces';
 export declare class FilterConsumerBridgeToSqlRequest implements FilterConsumer {
@@ -45,6 +45,6 @@ export declare type EntityDbNamesBase = {
     toString(): string;
 };
 export declare type EntityDbNames<entityType> = {
-    [Properties in keyof Required<OmitFunctions<OmitEB<entityType>>>]: string;
+    [Properties in keyof Required<MembersOnly<entityType>>]: string;
 } & EntityDbNamesBase;
 export declare function dbNamesOf<entityType>(repo: EntityMetadataOverloads<entityType>): Promise<EntityDbNames<entityType>>;

package/esm/src/remult3/DecoratorReplacer.d.ts

@@ -1,7 +1,6 @@
-import type { OmitEB } from './remult3';
 type Decorator<T = any> = (a: T, b: string, c?: any) => void;
 type Decorators<T> = T extends new (...args: any[]) => infer R ? {
-    [K in keyof OmitEB<R>]?: Decorator;
+    [K in keyof R]?: Decorator;
 } : never;
 type StaticDecorators<T> = {
     [K in keyof T]?: Decorator;

package/esm/src/remult3/Fields.d.ts

@@ -35,37 +35,27 @@ export declare class Relations {
      * @Relations.toOne(() => Customer)
      * customer?: Customer;
      * ```
-     */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: FieldOptions<entityType, toEntityType> & Pick<RelationOptions<entityType, toEntityType, any, any>, 'defaultIncluded'>): ClassFieldDecorator<entityType, toEntityType | undefined>;
-    /**
-     * Define a to-one relation between entities, indicating a one-to-one relationship.
-     * If no `fieldInMyEntity` is provided, this overload will automatically create a field in the database
-     * to represent the relation.
-     *
-     * @param toEntityType A function that returns the target entity type.
-     * @param fieldInMyEntity (Optional): The field in the current entity that represents the relation.
-     *                        Use this if you want to specify a custom field name for the relation.
-     * @returns A decorator function to apply the to-one relation to an entity field.
-     *
-     * Example usage:
      * ```
-     * @Relations.toOne(() => Customer)
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, "customerId")
      * customer?: Customer;
      * ```
-     */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, fieldInMyEntity?: keyof entityType): ClassFieldDecorator<entityType, toEntityType | undefined>;
-    /**
-     * Define a to-one relation between entities, indicating a one-to-one relationship.
-     * If no field or fields are provided, it will automatically create a field in the database
-     * to represent the relation.
-     *
-     * @param toEntityType A function that returns the target entity type.
-     * @param options An object containing options for configuring the to-one relation.
-     *                - fields (Optional): An object specifying custom field names for the relation.
-     * @returns A decorator function to apply the virtual to-one relation to an entity field.
+     * ```
+     * Fields.string()
+     * customerId?: string;
      *
-     * Example usage:
+     * @Relations.toOne(() => Customer, {
+     *   field: "customerId",
+     *   defaultIncluded: true
+     * })
+     * customer?: Customer;
      * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
      * @Relations.toOne(() => Customer, {
      *   fields: {
      *     customerId: "id",
@@ -73,10 +63,8 @@ export declare class Relations {
      * })
      * customer?: Customer;
      * ```
-     */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'field'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
-    /** A to one relation with fields defined in the field/fields parameter */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'fields'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: FieldOptions<entityType, toEntityType> & Pick<RelationOptions<entityType, toEntityType, any, any>, 'defaultIncluded'> | RelationOptions<entityType, toEntityType, entityType> | keyof entityType): (target: any, context: string | ClassFieldDecoratorContextStub<any, toEntityType>, c?: any) => void;
     /**
      * Define a toMany relation between entities, indicating a one-to-many relationship.
      * This method allows you to establish a relationship where one entity can have multiple related entities.

package/esm/src/remult3/Fields.js

@@ -88,6 +88,49 @@ export class Fields {
     }
 }
 export class Relations {
+    /**
+     * Define a to-one relation between entities, indicating a one-to-one relationship.
+     * If no field or fields are provided, it will automatically create a field in the database
+     * to represent the relation.
+     *
+     * @param toEntityType A function that returns the target entity type.
+     * @param options (Optional): An object containing options for configuring the to-one relation.
+     * @returns A decorator function to apply the to-one relation to an entity field.
+     *
+     * Example usage:
+     * ```
+     * @Relations.toOne(() => Customer)
+     * customer?: Customer;
+     * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, "customerId")
+     * customer?: Customer;
+     * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, {
+     *   field: "customerId",
+     *   defaultIncluded: true
+     * })
+     * customer?: Customer;
+     * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, {
+     *   fields: {
+     *     customerId: "id",
+     *   },
+     * })
+     * customer?: Customer;
+     * ```
+    */
     static toOne(toEntityType, options) {
         let op = (typeof options === 'string'
             ? { field: options }

package/esm/src/remult3/RepositoryImplementation.d.ts

@@ -3,7 +3,7 @@ import { LookupColumn } from '../column';
 import type { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from '../column-interfaces';
 import { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, LoadOptions, OmitEB, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
+import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, LoadOptions, MembersOnly, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
 import type { RefSubscriber } from './remult3';
 import type { entityEventListener } from '../__EntityValueProvider';
 import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces';
@@ -38,19 +38,19 @@ export declare class RepositoryImplementation<entityType> implements Repository<
         id?: string;
     } ? string : string | number): Promise<void>;
     delete(item: entityType): Promise<void>;
-    insert(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
-    insert(item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    insert(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    insert(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     get fields(): FieldsMetadata<entityType>;
-    validate(entity: Partial<OmitEB<entityType>>, ...fields: Extract<keyof OmitEB<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
+    validate(entity: Partial<MembersOnly<entityType>>, ...fields: Extract<keyof MembersOnly<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
     update(id: entityType extends {
         id?: number;
     } ? number : entityType extends {
         id?: string;
-    } ? string : string | number, item: Partial<OmitEB<entityType>>): Promise<entityType>;
-    update(originalItem: Partial<OmitEB<entityType>>, item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    } ? string : string | number, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
+    update(originalItem: Partial<MembersOnly<entityType>>, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     private getRefForExistingRow;
-    save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
-    save(item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    save(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    save(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     liveQuery(options?: FindOptions<entityType>): LiveQuery<entityType>;
     rawFind(options: FindOptions<entityType>, skipOrderByAndLimit: boolean, loader: RelationLoader): Promise<entityType[]>;
     find(options: FindOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType[]>;
@@ -64,7 +64,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     private cache;
     findFirst(where?: EntityFilter<entityType>, options?: FindFirstOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType>;
     private fieldsOf;
-    create(item?: Partial<OmitEB<entityType>>): entityType;
+    create(item?: Partial<MembersOnly<entityType>>): entityType;
     fixTypes(item: any): Promise<any>;
     findId(id: any, options?: FindFirstOptionsBase<entityType>): Promise<entityType>;
 }
@@ -259,12 +259,13 @@ export declare const storableMember: 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 class EntityBase {
-    get _(): EntityRef<this>;
+    ['י'](): EntityRef<this>;
+    get _(): ReturnType<this["י"]>;
     save(): Promise<this>;
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     delete(): Promise<void>;
     isNew(): boolean;
-    get $(): FieldsRef<this>;
+    get $(): this["_"]["fields"];
 }
 export declare class ControllerBase {
     protected remult: Remult;

package/esm/src/remult3/RepositoryImplementation.js

@@ -259,6 +259,7 @@ export class RepositoryImplementation {
                     let f = ref.fields[key];
                     if (entity[key] === undefined && getRelationInfo(f.metadata.options))
                         continue;
+                    //@ts-ignore
                     if (f)
                         r[key] = entity[key];
                 }
@@ -2114,11 +2115,14 @@ export function decorateColumnSettings(settings, remult) {
     return settings;
 }
 export class EntityBase {
+    ['י']() {
+        return getEntityRef(this);
+    }
     get _() {
         return getEntityRef(this);
     }
     save() {
-        return this._.save();
+        return getEntityRef(this).save();
     }
     assign(values) {
         assign(this, values);

package/esm/src/remult3/remult3.d.ts

@@ -89,7 +89,7 @@ export interface Subscribable {
     subscribe(listener: RefSubscriber): Unsubscribe;
 }
 export type FieldsRef<entityType> = {
-    [Properties in keyof OmitFunctions<OmitEB<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]>;
 } & {
@@ -98,7 +98,7 @@ export type FieldsRef<entityType> = {
     toArray(): FieldRef<entityType, any>[];
 };
 export type FieldsMetadata<entityType> = {
-    [Properties in keyof OmitFunctions<OmitEB<entityType>>]: FieldMetadata<entityType[Properties], entityType>;
+    [Properties in keyof MembersOnly<entityType>]: FieldMetadata<entityType[Properties], entityType>;
 } & {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldMetadata<any, entityType>;
     [Symbol.iterator]: () => IterableIterator<FieldMetadata<any, entityType>>;
@@ -141,11 +141,11 @@ export interface IdMetadata<entityType = any> {
      * @example
      * repo.metadata.idMetadata.getId(task)
      */
-    getId(item: Partial<OmitFunctions<OmitEB<entityType>>>): any;
+    getId(item: Partial<MembersOnly<entityType>>): any;
     field: FieldMetadata<any>;
     getIdFilter(...ids: any[]): EntityFilter<entityType>;
     isIdField(col: FieldMetadata): boolean;
-    createIdInFilter(items: Partial<OmitFunctions<OmitEB<entityType>>>[]): EntityFilter<entityType>;
+    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> {
@@ -199,8 +199,9 @@ export interface EntityMetadata<entityType = any> {
     /** Metadata for the Entity's id */
     readonly idMetadata: IdMetadata<entityType>;
 }
-export declare type OmitEB<T> = Omit<T, keyof EntityBase>;
-export type OmitFunctions<T> = T;
+export declare type MembersOnly<T> = {
+    [K in keyof Omit<T, keyof Pick<EntityBase, '$' | '_' | 'י'>> as T[K] extends Function ? never : K]: T[K];
+};
 export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {
@@ -249,21 +250,21 @@ export interface Repository<entityType> {
      * // Can also be used to validate specific fields
      * const error = repo.validate(task,"title")
      */
-    validate(item: Partial<entityType>, ...fields: Extract<keyof OmitFunctions<OmitEB<entityType>>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
+    validate(item: Partial<entityType>, ...fields: Extract<keyof MembersOnly<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
     /** saves an item or item[] to the data source. It assumes that if an `id` value exists, it's an existing row - otherwise it's a new row
      * @example
      * await taskRepo.save({...task, completed:true })
      */
-    save(item: Partial<OmitFunctions<OmitEB<entityType>>>[]): Promise<entityType[]>;
-    save(item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
+    save(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    save(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     /**Insert an item or item[] to the data source
      * @example
      * await taskRepo.insert({title:"task a"})
      * @example
      * await taskRepo.insert([{title:"task a"}, {title:"task b", completed:true }])
      */
-    insert(item: Partial<OmitFunctions<OmitEB<entityType>>>[]): Promise<entityType[]>;
-    insert(item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
+    insert(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    insert(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     /** Updates an item, based on its `id`
      * @example
      * taskRepo.update(task.id,{...task,completed:true})
@@ -272,17 +273,17 @@ export interface Repository<entityType> {
         id?: number;
     } ? number : entityType extends {
         id?: string;
-    } ? string : string | number, item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
-    update(id: Partial<OmitFunctions<OmitEB<entityType>>>, item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
+    } ? string : string | number, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
+    update(id: Partial<MembersOnly<entityType>>, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     /** Deletes an Item*/
     delete(id: entityType extends {
         id?: number;
     } ? number : entityType extends {
         id?: string;
     } ? string : string | number): Promise<void>;
-    delete(item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<void>;
+    delete(item: Partial<MembersOnly<entityType>>): Promise<void>;
     /** Creates an instance of an item. It'll not be saved to the data source unless `save` or `insert` will be called for that item */
-    create(item?: Partial<OmitFunctions<OmitEB<entityType>>>): entityType;
+    create(item?: Partial<MembersOnly<entityType>>): entityType;
     toJson(item: Promise<entityType[]>): Promise<any[]>;
     toJson(item: entityType[]): any[];
     toJson(item: Promise<entityType>): Promise<any>;
@@ -339,15 +340,15 @@ export interface FindOptions<entityType> extends FindOptionsBase<entityType> {
  * await this.remult.repo(Products).find({ orderBy: { price: "desc", name: "asc" }})
  */
 export declare type EntityOrderBy<entityType> = {
-    [Properties in keyof Partial<OmitEB<OmitFunctions<entityType>>>]?: 'asc' | 'desc';
+    [Properties in keyof Partial<MembersOnly<entityType>>]?: 'asc' | 'desc';
 };
 /**Used to filter the desired result set
  * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
  */
 export declare type EntityFilter<entityType> = {
-    [Properties in keyof Partial<OmitEB<OmitFunctions<entityType>>>]?: (Partial<OmitEB<entityType>>[Properties] extends number | Date | undefined ? ComparisonValueFilter<Partial<OmitEB<entityType>>[Properties]> : Partial<OmitEB<entityType>>[Properties] extends string | undefined ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<OmitEB<entityType>>[Properties] extends boolean | undefined ? ValueFilter<boolean> : Partial<OmitEB<entityType>>[Properties] extends {
+    [Properties in keyof Partial<MembersOnly<entityType>>]?: (Partial<entityType>[Properties] extends number | Date | undefined ? ComparisonValueFilter<Partial<entityType>[Properties]> : Partial<entityType>[Properties] extends string | undefined ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<entityType>[Properties] extends boolean | undefined ? ValueFilter<boolean> : Partial<entityType>[Properties] extends {
         id?: string | number;
-    } | undefined ? IdFilter<Partial<OmitEB<entityType>>[Properties]> : ValueFilter<Partial<OmitEB<entityType>>[Properties]>) | ContainsStringValueFilter;
+    } | undefined ? IdFilter<Partial<entityType>[Properties]> : ValueFilter<Partial<entityType>[Properties]>) | ContainsStringValueFilter;
 } & {
     $or?: EntityFilter<entityType>[];
     $and?: EntityFilter<entityType>[];
@@ -523,11 +524,11 @@ export type RelationOptions<fromEntity, toEntity, matchIdEntity, optionsType ext
      */
     defaultIncluded?: boolean;
 } & Pick<FieldOptions, 'caption'>;
-export type ObjectMembersOnly<T> = {
+export type ObjectMembersOnly<T> = MembersOnly<{
     [K in keyof Pick<T, {
         [K in keyof T]: T[K] extends object | undefined | null ? T[K] extends Date | undefined | null ? never : K : never;
     }[keyof T]>]: T[K];
-};
+}>;
 export type MembersToInclude<T> = {
     [K in keyof ObjectMembersOnly<T>]?: boolean | (NonNullable<T[K]> extends Array<any> ? FindOptions<NonNullable<T[K]>[number]> : FindFirstOptions<NonNullable<T[K]>>);
 };
@@ -537,7 +538,7 @@ export type RepositoryRelations<entityType> = {
     } : never;
 };
 export declare type EntityIdFields<entityType> = {
-    [Properties in keyof Partial<OmitFunctions<OmitEB<entityType>>>]?: true;
+    [Properties in keyof Partial<MembersOnly<entityType>>]?: true;
 };
 export interface ClassFieldDecoratorContextStub<entityType, valueType> {
     readonly access: {

package/esm/src/remult3/remult3.js

@@ -34,11 +34,6 @@ remult.apiClient.url='localhost:3007/api
 //p2 - Field(()=>String) - doesn't play nice with strict mode - it prevents people from extending basic types
 //p2 - with remult for remultexpress
 //p2 - Add a with remult promise to Remult!
-//y1 - YONI field didn't appear in intelisence of manyToNe
-//y1 - YONI with relation to one, fields doesn't appear well in the overload options when trying to set driver phone on trempim
-//y1 - YONI why didn't this._.relations.statusChanges.insert({})work?
-//y1 - YONI 'taskid' toOne field parameter did not autocomplete in task app - C:\repos\help-zahal\src\app\events\volunteerInTask.ts 49
-//y1 - YONI - trieed to implement this with  OmitFunctions - but it breaks this.$.[something] a good name from fields and relations
 //p2 - filterToRaw should get a dbnames of - and we should create a dbnames of that supports an alias
 //y2 - livequery for findfirst (@JY)
 //y2 - #239 - (@JY) add a way to get from fieldMetadata back to entity repo (like we have in fieldRef)
@@ -49,8 +44,6 @@ remult.apiClient.url='localhost:3007/api
 //p2 - fix sql log to console to make more sense
 //p2 - type metadata.key - to keyof entity - based on cwis input
 //p2 - processError in remult express
-//y1 - should we change relations to be a static const instead of a class (also for fields maybe) what's the point of doing new Relations
-//y1 - add Class type to index of remult - it is used in repo and is important
 //y2 - Backend methods are transactions, it's not intuitive and maybe should be optional / opt in
 //p2 - get backend methods to work when specifying types for date, and entities as poco's
 //p2 - allow find options preprocessor for api calls, to use for authorization

package/index.d.ts

@@ -1,5 +1,6 @@
 import type { ClassType } from './classType';
-export { OmitEB, OmitFunctions, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
+export type { ClassType } from './classType';
+export { MembersOnly, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
 LifecycleEvent, } from './src/remult3/remult3';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation';
 export { Entity } from './src/remult3/entity';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.23.0-exp.34",
+    "version": "0.23.0-exp.35",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",
@@ -69,6 +69,14 @@
             },
             "import": "./esm/remult-fastify.js"
         },
+        "./remult-hapi": {
+            "require": "./remult-hapi.js",
+            "node": {
+                "require": "./remult-hapi.js",
+                "import": "./remult-hapi.js"
+            },
+            "import": "./esm/remult-hapi.js"
+        },
         "./remult-fresh": {
             "require": "./remult-fresh.js",
             "node": {

package/src/column-interfaces.d.ts

@@ -1,6 +1,6 @@
 import type { ClassType } from '../classType';
 import type { AllowedForInstance } from './context';
-import type { EntityMetadata, FieldRef, LifecycleEvent, OmitEB } from './remult3/remult3';
+import type { EntityMetadata, FieldRef, LifecycleEvent } from './remult3/remult3';
 export interface FieldOptions<entityType = any, valueType = any> {
     /** A human readable name for the field. Can be used to achieve a consistent caption for a field throughout the app
      * @example
@@ -132,9 +132,9 @@ export interface FieldMetadata<valueType = any, entityType = any> {
      * @example
      * repo.fields.createDate.displayValue(task) //will display the date as defined in the `displayValue` option defined for it.
      */
-    displayValue(item: Partial<OmitEB<entityType>>): string;
-    apiUpdateAllowed(item?: Partial<OmitEB<entityType>>): boolean;
-    includedInApi(item?: Partial<OmitEB<entityType>>): boolean;
+    displayValue(item: Partial<entityType>): string;
+    apiUpdateAllowed(item?: Partial<entityType>): boolean;
+    includedInApi(item?: Partial<entityType>): boolean;
     /** Adapts the value for usage with html input
      * @example
      * @Fields.dateOnly()

package/src/data-interfaces.d.ts

@@ -1,5 +1,5 @@
 import type { Filter } from './filter/filter-interfaces';
-import type { EntityMetadata, OmitEB, OmitFunctions } from './remult3/remult3';
+import type { EntityMetadata, MembersOnly } from './remult3/remult3';
 import { Sort } from './sort';
 export interface DataProvider {
     getEntityDataProvider(entity: EntityMetadata): EntityDataProvider;
@@ -33,7 +33,7 @@ export declare function extractSort(sort: any): Sort;
 export interface ErrorInfo<entityType = any> {
     message?: string;
     modelState?: {
-        [Properties in keyof Partial<OmitFunctions<OmitEB<entityType>>>]?: string;
+        [Properties in keyof Partial<MembersOnly<entityType>>]?: string;
     };
     stack?: string;
     exception?: any;

package/src/data-providers/array-entity-data-provider.d.ts

@@ -1,24 +1,3 @@
-import type { EntityDataProvider, EntityDataProviderFindOptions } from '../data-interfaces';
-import { type EntityDbNamesBase } from '../filter/filter-consumer-bridge-to-sql-request';
-import { Filter } from '../filter/filter-interfaces';
-import type { EntityFilter, EntityMetadata } from '../remult3/remult3';
-export declare class ArrayEntityDataProvider implements EntityDataProvider {
-    private entity;
-    static rawFilter(filter: CustomArrayFilter): EntityFilter<any>;
-    private rows;
-    constructor(entity: EntityMetadata, rows?: any[]);
-    __names: EntityDbNamesBase;
-    init(): Promise<EntityDbNamesBase>;
-    private verifyThatRowHasAllNotNullColumns;
-    count(where?: Filter): Promise<number>;
-    find(options?: EntityDataProviderFindOptions): Promise<any[]>;
-    translateFromJson(row: any, dbNames: EntityDbNamesBase): {};
-    translateToJson(row: any, dbNames: EntityDbNamesBase): {};
-    private idMatches;
-    update(id: any, data: any): Promise<any>;
-    delete(id: any): Promise<void>;
-    insert(data: any): Promise<any>;
-}
 export type CustomArrayFilter = (item: any) => boolean;
 export interface CustomArrayFilterObject {
     arrayFilter: CustomArrayFilter;

package/src/data-providers/array-entity-data-provider.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var CompoundIdField_1 = require("../CompoundIdField");
 var filter_consumer_bridge_to_sql_request_1 = require("../filter/filter-consumer-bridge-to-sql-request");
 var filter_interfaces_1 = require("../filter/filter-interfaces");
+//@internal
 var ArrayEntityDataProvider = /** @class */ (function () {
     function ArrayEntityDataProvider(entity, rows) {
         this.entity = entity;
@@ -21,6 +22,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
             },
             _a;
     };
+    //@internal
     ArrayEntityDataProvider.prototype.init = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, _c, r;
@@ -52,6 +54,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
             });
         });
     };
+    //@internal
     ArrayEntityDataProvider.prototype.verifyThatRowHasAllNotNullColumns = function (r, names) {
         var e_2, _a;
         try {
@@ -145,6 +148,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
             });
         });
     };
+    //@internal
     ArrayEntityDataProvider.prototype.translateFromJson = function (row, dbNames) {
         var e_3, _a;
         var result = {};
@@ -163,6 +167,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
         }
         return result;
     };
+    //@internal
     ArrayEntityDataProvider.prototype.translateToJson = function (row, dbNames) {
         var e_4, _a;
         var result = {};
@@ -182,6 +187,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
         }
         return result;
     };
+    //@internal
     ArrayEntityDataProvider.prototype.idMatches = function (id, names) {
         var _this = this;
         return function (item) {

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

@@ -1,6 +1,6 @@
 import type { FieldMetadata } from '../column-interfaces';
 import type { EntityMetadataOverloads, RepositoryOverloads } from '../remult3/RepositoryImplementation';
-import type { EntityFilter, OmitEB, OmitFunctions } from '../remult3/remult3';
+import type { EntityFilter, MembersOnly } from '../remult3/remult3';
 import type { SqlCommandWithParameters } from '../sql-command';
 import type { Filter, FilterConsumer } from './filter-interfaces';
 export declare class FilterConsumerBridgeToSqlRequest implements FilterConsumer {
@@ -45,6 +45,6 @@ export declare type EntityDbNamesBase = {
     toString(): string;
 };
 export declare type EntityDbNames<entityType> = {
-    [Properties in keyof Required<OmitFunctions<OmitEB<entityType>>>]: string;
+    [Properties in keyof Required<MembersOnly<entityType>>]: string;
 } & EntityDbNamesBase;
 export declare function dbNamesOf<entityType>(repo: EntityMetadataOverloads<entityType>): Promise<EntityDbNames<entityType>>;

package/src/remult3/DecoratorReplacer.d.ts

@@ -1,7 +1,6 @@
-import type { OmitEB } from './remult3';
 type Decorator<T = any> = (a: T, b: string, c?: any) => void;
 type Decorators<T> = T extends new (...args: any[]) => infer R ? {
-    [K in keyof OmitEB<R>]?: Decorator;
+    [K in keyof R]?: Decorator;
 } : never;
 type StaticDecorators<T> = {
     [K in keyof T]?: Decorator;

package/src/remult3/Fields.d.ts

@@ -35,37 +35,27 @@ export declare class Relations {
      * @Relations.toOne(() => Customer)
      * customer?: Customer;
      * ```
-     */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: FieldOptions<entityType, toEntityType> & Pick<RelationOptions<entityType, toEntityType, any, any>, 'defaultIncluded'>): ClassFieldDecorator<entityType, toEntityType | undefined>;
-    /**
-     * Define a to-one relation between entities, indicating a one-to-one relationship.
-     * If no `fieldInMyEntity` is provided, this overload will automatically create a field in the database
-     * to represent the relation.
-     *
-     * @param toEntityType A function that returns the target entity type.
-     * @param fieldInMyEntity (Optional): The field in the current entity that represents the relation.
-     *                        Use this if you want to specify a custom field name for the relation.
-     * @returns A decorator function to apply the to-one relation to an entity field.
-     *
-     * Example usage:
      * ```
-     * @Relations.toOne(() => Customer)
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, "customerId")
      * customer?: Customer;
      * ```
-     */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, fieldInMyEntity?: keyof entityType): ClassFieldDecorator<entityType, toEntityType | undefined>;
-    /**
-     * Define a to-one relation between entities, indicating a one-to-one relationship.
-     * If no field or fields are provided, it will automatically create a field in the database
-     * to represent the relation.
-     *
-     * @param toEntityType A function that returns the target entity type.
-     * @param options An object containing options for configuring the to-one relation.
-     *                - fields (Optional): An object specifying custom field names for the relation.
-     * @returns A decorator function to apply the virtual to-one relation to an entity field.
+     * ```
+     * Fields.string()
+     * customerId?: string;
      *
-     * Example usage:
+     * @Relations.toOne(() => Customer, {
+     *   field: "customerId",
+     *   defaultIncluded: true
+     * })
+     * customer?: Customer;
      * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
      * @Relations.toOne(() => Customer, {
      *   fields: {
      *     customerId: "id",
@@ -73,10 +63,8 @@ export declare class Relations {
      * })
      * customer?: Customer;
      * ```
-     */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'field'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
-    /** A to one relation with fields defined in the field/fields parameter */
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'fields'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: FieldOptions<entityType, toEntityType> & Pick<RelationOptions<entityType, toEntityType, any, any>, 'defaultIncluded'> | RelationOptions<entityType, toEntityType, entityType> | keyof entityType): (target: any, context: string | ClassFieldDecoratorContextStub<any, toEntityType>, c?: any) => void;
     /**
      * Define a toMany relation between entities, indicating a one-to-many relationship.
      * This method allows you to establish a relationship where one entity can have multiple related entities.

package/src/remult3/Fields.js

@@ -156,6 +156,49 @@ exports.Fields = Fields;
 var Relations = /** @class */ (function () {
     function Relations() {
     }
+    /**
+     * Define a to-one relation between entities, indicating a one-to-one relationship.
+     * If no field or fields are provided, it will automatically create a field in the database
+     * to represent the relation.
+     *
+     * @param toEntityType A function that returns the target entity type.
+     * @param options (Optional): An object containing options for configuring the to-one relation.
+     * @returns A decorator function to apply the to-one relation to an entity field.
+     *
+     * Example usage:
+     * ```
+     * @Relations.toOne(() => Customer)
+     * customer?: Customer;
+     * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, "customerId")
+     * customer?: Customer;
+     * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, {
+     *   field: "customerId",
+     *   defaultIncluded: true
+     * })
+     * customer?: Customer;
+     * ```
+     * ```
+     * Fields.string()
+     * customerId?: string;
+     *
+     * @Relations.toOne(() => Customer, {
+     *   fields: {
+     *     customerId: "id",
+     *   },
+     * })
+     * customer?: Customer;
+     * ```
+    */
     Relations.toOne = function (toEntityType, options) {
         var _a, _b;
         var op = (typeof options === 'string'

package/src/remult3/RepositoryImplementation.d.ts

@@ -3,7 +3,7 @@ import { LookupColumn } from '../column';
 import type { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from '../column-interfaces';
 import { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, LoadOptions, OmitEB, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
+import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, LoadOptions, MembersOnly, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
 import type { RefSubscriber } from './remult3';
 import type { entityEventListener } from '../__EntityValueProvider';
 import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces';
@@ -38,19 +38,19 @@ export declare class RepositoryImplementation<entityType> implements Repository<
         id?: string;
     } ? string : string | number): Promise<void>;
     delete(item: entityType): Promise<void>;
-    insert(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
-    insert(item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    insert(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    insert(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     get fields(): FieldsMetadata<entityType>;
-    validate(entity: Partial<OmitEB<entityType>>, ...fields: Extract<keyof OmitEB<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
+    validate(entity: Partial<MembersOnly<entityType>>, ...fields: Extract<keyof MembersOnly<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
     update(id: entityType extends {
         id?: number;
     } ? number : entityType extends {
         id?: string;
-    } ? string : string | number, item: Partial<OmitEB<entityType>>): Promise<entityType>;
-    update(originalItem: Partial<OmitEB<entityType>>, item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    } ? string : string | number, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
+    update(originalItem: Partial<MembersOnly<entityType>>, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     private getRefForExistingRow;
-    save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
-    save(item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    save(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    save(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     liveQuery(options?: FindOptions<entityType>): LiveQuery<entityType>;
     rawFind(options: FindOptions<entityType>, skipOrderByAndLimit: boolean, loader: RelationLoader): Promise<entityType[]>;
     find(options: FindOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType[]>;
@@ -64,7 +64,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     private cache;
     findFirst(where?: EntityFilter<entityType>, options?: FindFirstOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType>;
     private fieldsOf;
-    create(item?: Partial<OmitEB<entityType>>): entityType;
+    create(item?: Partial<MembersOnly<entityType>>): entityType;
     fixTypes(item: any): Promise<any>;
     findId(id: any, options?: FindFirstOptionsBase<entityType>): Promise<entityType>;
 }
@@ -259,12 +259,13 @@ export declare const storableMember: 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 class EntityBase {
-    get _(): EntityRef<this>;
+    ['י'](): EntityRef<this>;
+    get _(): ReturnType<this["י"]>;
     save(): Promise<this>;
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     delete(): Promise<void>;
     isNew(): boolean;
-    get $(): FieldsRef<this>;
+    get $(): this["_"]["fields"];
 }
 export declare class ControllerBase {
     protected remult: Remult;

package/src/remult3/RepositoryImplementation.js

@@ -393,6 +393,7 @@ var RepositoryImplementation = /** @class */ (function () {
                                 f = ref.fields[key];
                                 if (entity[key] === undefined && (0, relationInfoMember_1.getRelationInfo)(f.metadata.options))
                                     continue;
+                                //@ts-ignore
                                 if (f)
                                     r[key] = entity[key];
                             }
@@ -3282,6 +3283,9 @@ exports.decorateColumnSettings = decorateColumnSettings;
 var EntityBase = /** @class */ (function () {
     function EntityBase() {
     }
+    EntityBase.prototype['י'] = function () {
+        return (0, getEntityRef_1.getEntityRef)(this);
+    };
     Object.defineProperty(EntityBase.prototype, "_", {
         get: function () {
             return (0, getEntityRef_1.getEntityRef)(this);
@@ -3290,7 +3294,7 @@ var EntityBase = /** @class */ (function () {
         configurable: true
     });
     EntityBase.prototype.save = function () {
-        return this._.save();
+        return (0, getEntityRef_1.getEntityRef)(this).save();
     };
     EntityBase.prototype.assign = function (values) {
         (0, assign_1.assign)(this, values);

package/src/remult3/remult3.d.ts

@@ -89,7 +89,7 @@ export interface Subscribable {
     subscribe(listener: RefSubscriber): Unsubscribe;
 }
 export type FieldsRef<entityType> = {
-    [Properties in keyof OmitFunctions<OmitEB<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]>;
 } & {
@@ -98,7 +98,7 @@ export type FieldsRef<entityType> = {
     toArray(): FieldRef<entityType, any>[];
 };
 export type FieldsMetadata<entityType> = {
-    [Properties in keyof OmitFunctions<OmitEB<entityType>>]: FieldMetadata<entityType[Properties], entityType>;
+    [Properties in keyof MembersOnly<entityType>]: FieldMetadata<entityType[Properties], entityType>;
 } & {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldMetadata<any, entityType>;
     [Symbol.iterator]: () => IterableIterator<FieldMetadata<any, entityType>>;
@@ -141,11 +141,11 @@ export interface IdMetadata<entityType = any> {
      * @example
      * repo.metadata.idMetadata.getId(task)
      */
-    getId(item: Partial<OmitFunctions<OmitEB<entityType>>>): any;
+    getId(item: Partial<MembersOnly<entityType>>): any;
     field: FieldMetadata<any>;
     getIdFilter(...ids: any[]): EntityFilter<entityType>;
     isIdField(col: FieldMetadata): boolean;
-    createIdInFilter(items: Partial<OmitFunctions<OmitEB<entityType>>>[]): EntityFilter<entityType>;
+    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> {
@@ -199,8 +199,9 @@ export interface EntityMetadata<entityType = any> {
     /** Metadata for the Entity's id */
     readonly idMetadata: IdMetadata<entityType>;
 }
-export declare type OmitEB<T> = Omit<T, keyof EntityBase>;
-export type OmitFunctions<T> = T;
+export declare type MembersOnly<T> = {
+    [K in keyof Omit<T, keyof Pick<EntityBase, '$' | '_' | 'י'>> as T[K] extends Function ? never : K]: T[K];
+};
 export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {
@@ -249,21 +250,21 @@ export interface Repository<entityType> {
      * // Can also be used to validate specific fields
      * const error = repo.validate(task,"title")
      */
-    validate(item: Partial<entityType>, ...fields: Extract<keyof OmitFunctions<OmitEB<entityType>>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
+    validate(item: Partial<entityType>, ...fields: Extract<keyof MembersOnly<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
     /** saves an item or item[] to the data source. It assumes that if an `id` value exists, it's an existing row - otherwise it's a new row
      * @example
      * await taskRepo.save({...task, completed:true })
      */
-    save(item: Partial<OmitFunctions<OmitEB<entityType>>>[]): Promise<entityType[]>;
-    save(item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
+    save(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    save(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     /**Insert an item or item[] to the data source
      * @example
      * await taskRepo.insert({title:"task a"})
      * @example
      * await taskRepo.insert([{title:"task a"}, {title:"task b", completed:true }])
      */
-    insert(item: Partial<OmitFunctions<OmitEB<entityType>>>[]): Promise<entityType[]>;
-    insert(item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
+    insert(item: Partial<MembersOnly<entityType>>[]): Promise<entityType[]>;
+    insert(item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     /** Updates an item, based on its `id`
      * @example
      * taskRepo.update(task.id,{...task,completed:true})
@@ -272,17 +273,17 @@ export interface Repository<entityType> {
         id?: number;
     } ? number : entityType extends {
         id?: string;
-    } ? string : string | number, item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
-    update(id: Partial<OmitFunctions<OmitEB<entityType>>>, item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<entityType>;
+    } ? string : string | number, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
+    update(id: Partial<MembersOnly<entityType>>, item: Partial<MembersOnly<entityType>>): Promise<entityType>;
     /** Deletes an Item*/
     delete(id: entityType extends {
         id?: number;
     } ? number : entityType extends {
         id?: string;
     } ? string : string | number): Promise<void>;
-    delete(item: Partial<OmitFunctions<OmitEB<entityType>>>): Promise<void>;
+    delete(item: Partial<MembersOnly<entityType>>): Promise<void>;
     /** Creates an instance of an item. It'll not be saved to the data source unless `save` or `insert` will be called for that item */
-    create(item?: Partial<OmitFunctions<OmitEB<entityType>>>): entityType;
+    create(item?: Partial<MembersOnly<entityType>>): entityType;
     toJson(item: Promise<entityType[]>): Promise<any[]>;
     toJson(item: entityType[]): any[];
     toJson(item: Promise<entityType>): Promise<any>;
@@ -339,15 +340,15 @@ export interface FindOptions<entityType> extends FindOptionsBase<entityType> {
  * await this.remult.repo(Products).find({ orderBy: { price: "desc", name: "asc" }})
  */
 export declare type EntityOrderBy<entityType> = {
-    [Properties in keyof Partial<OmitEB<OmitFunctions<entityType>>>]?: 'asc' | 'desc';
+    [Properties in keyof Partial<MembersOnly<entityType>>]?: 'asc' | 'desc';
 };
 /**Used to filter the desired result set
  * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
  */
 export declare type EntityFilter<entityType> = {
-    [Properties in keyof Partial<OmitEB<OmitFunctions<entityType>>>]?: (Partial<OmitEB<entityType>>[Properties] extends number | Date | undefined ? ComparisonValueFilter<Partial<OmitEB<entityType>>[Properties]> : Partial<OmitEB<entityType>>[Properties] extends string | undefined ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<OmitEB<entityType>>[Properties] extends boolean | undefined ? ValueFilter<boolean> : Partial<OmitEB<entityType>>[Properties] extends {
+    [Properties in keyof Partial<MembersOnly<entityType>>]?: (Partial<entityType>[Properties] extends number | Date | undefined ? ComparisonValueFilter<Partial<entityType>[Properties]> : Partial<entityType>[Properties] extends string | undefined ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<entityType>[Properties] extends boolean | undefined ? ValueFilter<boolean> : Partial<entityType>[Properties] extends {
         id?: string | number;
-    } | undefined ? IdFilter<Partial<OmitEB<entityType>>[Properties]> : ValueFilter<Partial<OmitEB<entityType>>[Properties]>) | ContainsStringValueFilter;
+    } | undefined ? IdFilter<Partial<entityType>[Properties]> : ValueFilter<Partial<entityType>[Properties]>) | ContainsStringValueFilter;
 } & {
     $or?: EntityFilter<entityType>[];
     $and?: EntityFilter<entityType>[];
@@ -523,11 +524,11 @@ export type RelationOptions<fromEntity, toEntity, matchIdEntity, optionsType ext
      */
     defaultIncluded?: boolean;
 } & Pick<FieldOptions, 'caption'>;
-export type ObjectMembersOnly<T> = {
+export type ObjectMembersOnly<T> = MembersOnly<{
     [K in keyof Pick<T, {
         [K in keyof T]: T[K] extends object | undefined | null ? T[K] extends Date | undefined | null ? never : K : never;
     }[keyof T]>]: T[K];
-};
+}>;
 export type MembersToInclude<T> = {
     [K in keyof ObjectMembersOnly<T>]?: boolean | (NonNullable<T[K]> extends Array<any> ? FindOptions<NonNullable<T[K]>[number]> : FindFirstOptions<NonNullable<T[K]>>);
 };
@@ -537,7 +538,7 @@ export type RepositoryRelations<entityType> = {
     } : never;
 };
 export declare type EntityIdFields<entityType> = {
-    [Properties in keyof Partial<OmitFunctions<OmitEB<entityType>>>]?: true;
+    [Properties in keyof Partial<MembersOnly<entityType>>]?: true;
 };
 export interface ClassFieldDecoratorContextStub<entityType, valueType> {
     readonly access: {

package/src/remult3/remult3.js

@@ -35,11 +35,6 @@ remult.apiClient.url='localhost:3007/api
 //p2 - Field(()=>String) - doesn't play nice with strict mode - it prevents people from extending basic types
 //p2 - with remult for remultexpress
 //p2 - Add a with remult promise to Remult!
-//y1 - YONI field didn't appear in intelisence of manyToNe
-//y1 - YONI with relation to one, fields doesn't appear well in the overload options when trying to set driver phone on trempim
-//y1 - YONI why didn't this._.relations.statusChanges.insert({})work?
-//y1 - YONI 'taskid' toOne field parameter did not autocomplete in task app - C:\repos\help-zahal\src\app\events\volunteerInTask.ts 49
-//y1 - YONI - trieed to implement this with  OmitFunctions - but it breaks this.$.[something] a good name from fields and relations
 //p2 - filterToRaw should get a dbnames of - and we should create a dbnames of that supports an alias
 //y2 - livequery for findfirst (@JY)
 //y2 - #239 - (@JY) add a way to get from fieldMetadata back to entity repo (like we have in fieldRef)
@@ -50,8 +45,6 @@ remult.apiClient.url='localhost:3007/api
 //p2 - fix sql log to console to make more sense
 //p2 - type metadata.key - to keyof entity - based on cwis input
 //p2 - processError in remult express
-//y1 - should we change relations to be a static const instead of a class (also for fields maybe) what's the point of doing new Relations
-//y1 - add Class type to index of remult - it is used in repo and is important
 //y2 - Backend methods are transactions, it's not intuitive and maybe should be optional / opt in
 //p2 - get backend methods to work when specifying types for date, and entities as poco's
 //p2 - allow find options preprocessor for api calls, to use for authorization