remult 0.23.0-exp.35 → 0.23.0-exp.37

package/esm/index.d.ts

@@ -1,7 +1,7 @@
 import type { ClassType } from './classType';
 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 { MembersOnly, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, 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, FieldsRefBase, FieldsRefForEntityBase, RepositoryRelationsForEntityBase, ControllerRefForControllerBase, ControllerRefBase, ControllerRef, EntityRefForEntityBase, IdMetadata, FindFirstOptionsBase, } from './src/remult3/remult3';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation';
 export { Entity } from './src/remult3/entity';
 export { getEntityRef } from './src/remult3/getEntityRef';
@@ -10,7 +10,7 @@ export { IdEntity } from './src/remult3/IdEntity';
 export { describeClass } from './src/remult3/DecoratorReplacer';
 export { EntityOptions } from './src/entity';
 export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider, } from './src/data-interfaces';
-export { SqlCommand, SqlImplementation, SqlResult } from './src/sql-command';
+export { SqlCommand, SqlCommandWithParameters, SqlImplementation, SqlResult, } from './src/sql-command';
 export { FieldMetadata, FieldOptions, FieldValidator, ValueConverter, ValueListItem, // reconsider, maybe it should go to remult angular as the abstraction ?
 ValueOrExpression, } from './src/column-interfaces';
 export { RestDataProvider } from './src/data-providers/rest-data-provider';
@@ -18,14 +18,14 @@ export { InMemoryDataProvider } from './src/data-providers/in-memory-database';
 export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-provider';
 export { WebSqlDataProvider } from './src/data-providers/web-sql-data-provider';
 export { SqlDatabase } from './src/data-providers/sql-database';
-export { CustomSqlFilterObject, CustomSqlFilterBuilder, dbNamesOf, } from './src/filter/filter-consumer-bridge-to-sql-request';
+export { CustomSqlFilterObject, CustomSqlFilterBuilder, dbNamesOf, CustomSqlFilterBuilderFunction, EntityDbNames, } from './src/filter/filter-consumer-bridge-to-sql-request';
 export { JsonDataProvider, JsonEntityStorage, } from './src/data-providers/json-data-provider';
 export { Controller, BackendMethodOptions, BackendMethod, ProgressListener, } from './src/server-action';
 export { Allowed, Allow, Remult, RemultContext, ApiClient, isBackend, AllowedForInstance, EventDispatcher, EventSource, UserInfo, } from './src/context';
 export { ExternalHttpProvider } from './src/buildRestDataProvider';
 export { SortSegment, Sort } from './src/sort';
 export { CompoundIdField } from './src/CompoundIdField';
-export { Filter } from './src/filter/filter-interfaces';
+export { Filter, FilterConsumer, customFilterInfo, } from './src/filter/filter-interfaces';
 export { UrlBuilder } from './urlBuilder';
 export { Validators } from './src/validators';
 export { ValueConverters } from './src/valueConverters';

package/esm/index.js

@@ -16,7 +16,7 @@ export { Controller, BackendMethod, ProgressListener, } from './src/server-actio
 export { Allow, Remult, isBackend, EventSource, } from './src/context';
 export { Sort } from './src/sort';
 export { CompoundIdField } from './src/CompoundIdField';
-export { Filter } from './src/filter/filter-interfaces';
+export { Filter, } from './src/filter/filter-interfaces';
 export { UrlBuilder } from './urlBuilder';
 export { Validators } from './src/validators';
 export { ValueConverters } from './src/valueConverters';

package/esm/src/column.d.ts

@@ -3,6 +3,7 @@ export declare function makeTitle(name: string): string;
 export declare class LookupColumn<T> {
     private repository;
     private isReferenceRelation;
+    private allowNull;
     toJson(): any;
     setId(val: any): void;
     waitLoadOf(id: any): Promise<T>;
@@ -12,7 +13,7 @@ export declare class LookupColumn<T> {
     };
     set(item: T): void;
     id: idType<T>;
-    constructor(repository: Repository<T>, isReferenceRelation: any);
+    constructor(repository: Repository<T>, isReferenceRelation: any, allowNull: any);
     get item(): T;
     waitLoad(): Promise<T>;
 }

package/esm/src/column.js

@@ -12,6 +12,7 @@ export function makeTitle(name) {
 export class LookupColumn {
     repository;
     isReferenceRelation;
+    allowNull;
     toJson() {
         if (!this.storedItem)
             return undefined;
@@ -32,12 +33,23 @@ export class LookupColumn {
     get(id) {
         if (id === undefined || id === null)
             return null;
-        if (this.isReferenceRelation && !this.storedItem)
+        const result = getRepositoryInternals(this.repository).getCachedById(id, this.isReferenceRelation);
+        if (this.isReferenceRelation && !this.storedItem) {
+            if (!this.allowNull && (this.id === 0 || this.id === ''))
+                return null;
             return undefined;
-        return getRepositoryInternals(this.repository).getCachedById(id, this.isReferenceRelation);
+        }
+        return result;
     }
     storedItem;
     set(item) {
+        if (item === null &&
+            !this.allowNull &&
+            this.isReferenceRelation &&
+            (this.id == 0 || this.id == '')) {
+            this.storedItem = { item: null };
+            return;
+        }
         this.storedItem = undefined;
         if (item) {
             if (typeof item === 'string' || typeof item === 'number')
@@ -62,9 +74,10 @@ export class LookupColumn {
         }
     }
     id;
-    constructor(repository, isReferenceRelation) {
+    constructor(repository, isReferenceRelation, allowNull) {
         this.repository = repository;
         this.isReferenceRelation = isReferenceRelation;
+        this.allowNull = allowNull;
     }
     get item() {
         if (this.storedItem)

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, MembersOnly, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
+import type { ControllerRef, ControllerRefForControllerBase, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, EntityRefForEntityBase, FieldRef, FieldsMetadata, FieldsRef, FieldsRefForEntityBase, 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';
@@ -98,7 +98,7 @@ declare abstract class rowHelperBase<T> {
     __clearErrorsAndReportChanged(): void;
     _reportChangedToEntityAndFields(): void;
     hasErrors(): boolean;
-    copyDataToObject(): any;
+    copyDataToObject(isNew?: boolean): any;
     originalValues: any;
     saveOriginalData(): void;
     saveMoreOriginalData(): void;
@@ -259,20 +259,19 @@ 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 {
-    ['י'](): EntityRef<this>;
-    get _(): ReturnType<this["י"]>;
+    get _(): EntityRefForEntityBase<this>;
     save(): Promise<this>;
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     delete(): Promise<void>;
     isNew(): boolean;
-    get $(): this["_"]["fields"];
+    get $(): FieldsRefForEntityBase<this>;
 }
 export declare class ControllerBase {
     protected remult: Remult;
     constructor(remult?: Remult);
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
-    get $(): FieldsRef<this>;
-    get _(): ControllerRef<this>;
+    get $(): FieldsRefForEntityBase<this>;
+    get _(): ControllerRefForControllerBase<this>;
 }
 declare class SubscribableImp implements Subscribable {
     reportChanged(): void;

package/esm/src/remult3/RepositoryImplementation.js

@@ -560,6 +560,8 @@ export class RepositoryImplementation {
             let val = rel.type === 'reference'
                 ? getEntityRef(row).fields.find(requireField(field.key, this.metadata)).getId()
                 : row[field.key];
+            if (!field.allowNull && (val === 0 || val === ''))
+                val = null;
             if (val === null)
                 returnNull = true;
             if (val === undefined)
@@ -828,7 +830,7 @@ class rowHelperBase {
         for (const col of columnsInfo) {
             let ei = getEntitySettings(col.valueType, false);
             if (ei && remult) {
-                let lookup = new LookupColumn(remult.repo(col.valueType), Boolean(col?.[relationInfoMember]));
+                let lookup = new LookupColumn(remult.repo(col.valueType), Boolean(col?.[relationInfoMember]), col.allowNull);
                 this.lookups.set(col.key, lookup);
                 let val = instance[col.key];
                 let refImpl;
@@ -1004,21 +1006,28 @@ class rowHelperBase {
         this._subscribers?.reportObserved();
         return !!!this.error && this.errors == undefined;
     }
-    copyDataToObject() {
+    copyDataToObject(isNew = false) {
         let d = {};
         for (const col of this.columnsInfo) {
             let lu = this.lookups.get(col.key);
             let val = undefined;
+            const rel = getRelationInfo(col);
             if (lu)
                 val = lu.id;
             else
                 val = this.instance[col.key];
+            if (rel && isNew && !col.allowNull && (val === undefined || null)) {
+                if (this.remult.repo(rel.toType()).metadata.idMetadata.field.valueType ===
+                    Number)
+                    val = 0;
+                else
+                    val = '';
+            }
             if (val !== undefined) {
                 val = col.valueConverter.toJson(val);
                 if (val !== undefined && val !== null)
                     val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
             }
-            const rel = getRelationInfo(col);
             if (!rel || rel.type === 'reference')
                 d[col.key] = val;
         }
@@ -1217,7 +1226,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 }
             }
             this.__assertValidity();
-            let d = this.copyDataToObject();
+            let d = this.copyDataToObject(this.isNew());
             let ignoreKeys = [];
             for (const field of this.metadata.fields) {
                 if (field.dbReadOnly ||
@@ -2115,9 +2124,6 @@ export function decorateColumnSettings(settings, remult) {
     return settings;
 }
 export class EntityBase {
-    ['י']() {
-        return getEntityRef(this);
-    }
     get _() {
         return getEntityRef(this);
     }

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

@@ -6,7 +6,7 @@ import type { EntityOptions } from '../entity';
 import type { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { SortSegment } from '../sort';
 import type { EntityBase } from './RepositoryImplementation';
-export interface EntityRef<entityType> extends Subscribable {
+export interface EntityRefBase<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
     save(): Promise<entityType>;
@@ -15,7 +15,6 @@ export interface EntityRef<entityType> extends Subscribable {
     isNew(): boolean;
     wasChanged(): boolean;
     wasDeleted(): boolean;
-    fields: FieldsRef<entityType>;
     error: string;
     getId(): idType<entityType>;
     getOriginalId(): idType<entityType>;
@@ -23,12 +22,19 @@ export interface EntityRef<entityType> extends Subscribable {
     metadata: EntityMetadata<entityType>;
     toApiJson(): any;
     validate(): Promise<ErrorInfo<entityType> | undefined>;
-    relations: RepositoryRelations<entityType>;
     readonly apiUpdateAllowed: boolean;
     readonly apiDeleteAllowed: boolean;
     readonly apiInsertAllowed: boolean;
     readonly isLoading: boolean;
 }
+export interface EntityRef<entityType> extends EntityRefBase<entityType> {
+    fields: FieldsRef<entityType>;
+    relations: RepositoryRelations<entityType>;
+}
+export interface EntityRefForEntityBase<entityType> extends EntityRefBase<entityType> {
+    fields: FieldsRefForEntityBase<entityType>;
+    relations: RepositoryRelationsForEntityBase<entityType>;
+}
 /**
  * Represents a lifecycle event associated with an entity instance. These events
  * are triggered during various stages of the entity's lifecycle, such as validation,
@@ -73,13 +79,18 @@ export interface LifecycleEvent<entityType> {
      */
     relations: RepositoryRelations<entityType>;
 }
-export interface ControllerRef<entityType> extends Subscribable {
+export interface ControllerRefBase<entityType> extends Subscribable {
     hasErrors(): boolean;
-    fields: FieldsRef<entityType>;
     error: string;
     validate(): Promise<ErrorInfo<entityType> | undefined>;
     readonly isLoading: boolean;
 }
+export interface ControllerRef<entityType> extends ControllerRefBase<entityType> {
+    fields: FieldsRef<entityType>;
+}
+export interface ControllerRefForControllerBase<entityType> extends ControllerRefBase<entityType> {
+    fields: FieldsRefForEntityBase<entityType>;
+}
 export interface RefSubscriberBase {
     reportChanged: () => void;
     reportObserved: () => void;
@@ -88,11 +99,7 @@ export declare type RefSubscriber = (() => void) | RefSubscriberBase;
 export interface Subscribable {
     subscribe(listener: RefSubscriber): Unsubscribe;
 }
-export type FieldsRef<entityType> = {
-    [Properties in keyof MembersOnly<entityType>]: NonNullable<entityType[Properties]> extends {
-        id?: number | string;
-    } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
-} & {
+export type FieldsRefBase<entityType> = {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldRef<entityType, any>;
     [Symbol.iterator]: () => IterableIterator<FieldRef<entityType, any>>;
     toArray(): FieldRef<entityType, any>[];
@@ -104,6 +111,16 @@ export type FieldsMetadata<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 {
+        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 {
+        id?: number | string;
+    } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
+};
 export type SortSegments<entityType> = {
     [Properties in keyof entityType]: SortSegment & {
         descending(): SortSegment;
@@ -200,7 +217,7 @@ export interface EntityMetadata<entityType = any> {
     readonly idMetadata: IdMetadata<entityType>;
 }
 export declare type MembersOnly<T> = {
-    [K in keyof Omit<T, keyof Pick<EntityBase, '$' | '_' | 'י'>> as T[K] extends Function ? never : K]: T[K];
+    [K in keyof T as T[K] extends Function ? never : K]: T[K];
 };
 export declare type idType<entityType> = entityType extends {
     id?: number;
@@ -537,6 +554,11 @@ export type RepositoryRelations<entityType> = {
         findOne: (options?: FindOptionsBase<R>) => Promise<R>;
     } : never;
 };
+export type RepositoryRelationsForEntityBase<entityType> = {
+    [K in keyof Omit<entityType, keyof EntityBase>]-?: NonNullable<entityType[K]> extends Array<infer R> ? Repository<R> : entityType[K] extends infer R ? {
+        findOne: (options?: FindOptionsBase<R>) => Promise<R>;
+    } : never;
+};
 export declare type EntityIdFields<entityType> = {
     [Properties in keyof Partial<MembersOnly<entityType>>]?: true;
 };
@@ -571,4 +593,11 @@ remult.apiClient.httpClient = (
 remult.apiClient.url='localhost:3007/api
 
 
+ */
+/**
+* our default is allow null false.
+* for sql databases we add a db default of 0/''/false
+* when we set a relation to null - we update the related field to null
+* we do not enforce allow null false (mongo, json it'll get stored)
+
  */

package/esm/src/remult3/remult3.js

@@ -50,3 +50,15 @@ remult.apiClient.url='localhost:3007/api
 //y2 - remove __dirname from tutorials
 //y2 - add some api testing framework for user unit tests (will help with codesandbox based discussions)
 //y2 - I tihnk there should be a way to throw a forbidden exception
+//p2 - conside law-q db based on schema issue - I think that while running the dataProvider function, we should have a valid remult - maybe even have a valid remult, that will be valid until api is run
+//p2 - allow api read to also support instance and filter.
+//p2 - investigate why did lawq didn't run after build - even though it ran with tsx
+//y2 - we should really reconsider allow null by default to be true - I think that what we're doing is confusing for most . In my case I added a volunteer relation, and didn't set any value to it - and I get an error that null value is not allowed for it
+/**
+* our default is allow null false.
+* for sql databases we add a db default of 0/''/false
+* when we set a relation to null - we update the related field to null
+* we do not enforce allow null false (mongo, json it'll get stored)
+
+ */
+//y2 - i had a question about find first's different syntax from find that confused a user

package/index.d.ts

@@ -1,7 +1,7 @@
 import type { ClassType } from './classType';
 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 { MembersOnly, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, 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, FieldsRefBase, FieldsRefForEntityBase, RepositoryRelationsForEntityBase, ControllerRefForControllerBase, ControllerRefBase, ControllerRef, EntityRefForEntityBase, IdMetadata, FindFirstOptionsBase, } from './src/remult3/remult3';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation';
 export { Entity } from './src/remult3/entity';
 export { getEntityRef } from './src/remult3/getEntityRef';
@@ -10,7 +10,7 @@ export { IdEntity } from './src/remult3/IdEntity';
 export { describeClass } from './src/remult3/DecoratorReplacer';
 export { EntityOptions } from './src/entity';
 export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider, } from './src/data-interfaces';
-export { SqlCommand, SqlImplementation, SqlResult } from './src/sql-command';
+export { SqlCommand, SqlCommandWithParameters, SqlImplementation, SqlResult, } from './src/sql-command';
 export { FieldMetadata, FieldOptions, FieldValidator, ValueConverter, ValueListItem, // reconsider, maybe it should go to remult angular as the abstraction ?
 ValueOrExpression, } from './src/column-interfaces';
 export { RestDataProvider } from './src/data-providers/rest-data-provider';
@@ -18,14 +18,14 @@ export { InMemoryDataProvider } from './src/data-providers/in-memory-database';
 export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-provider';
 export { WebSqlDataProvider } from './src/data-providers/web-sql-data-provider';
 export { SqlDatabase } from './src/data-providers/sql-database';
-export { CustomSqlFilterObject, CustomSqlFilterBuilder, dbNamesOf, } from './src/filter/filter-consumer-bridge-to-sql-request';
+export { CustomSqlFilterObject, CustomSqlFilterBuilder, dbNamesOf, CustomSqlFilterBuilderFunction, EntityDbNames, } from './src/filter/filter-consumer-bridge-to-sql-request';
 export { JsonDataProvider, JsonEntityStorage, } from './src/data-providers/json-data-provider';
 export { Controller, BackendMethodOptions, BackendMethod, ProgressListener, } from './src/server-action';
 export { Allowed, Allow, Remult, RemultContext, ApiClient, isBackend, AllowedForInstance, EventDispatcher, EventSource, UserInfo, } from './src/context';
 export { ExternalHttpProvider } from './src/buildRestDataProvider';
 export { SortSegment, Sort } from './src/sort';
 export { CompoundIdField } from './src/CompoundIdField';
-export { Filter } from './src/filter/filter-interfaces';
+export { Filter, FilterConsumer, customFilterInfo, } from './src/filter/filter-interfaces';
 export { UrlBuilder } from './urlBuilder';
 export { Validators } from './src/validators';
 export { ValueConverters } from './src/valueConverters';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.23.0-exp.35",
+    "version": "0.23.0-exp.37",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/src/column.d.ts

@@ -3,6 +3,7 @@ export declare function makeTitle(name: string): string;
 export declare class LookupColumn<T> {
     private repository;
     private isReferenceRelation;
+    private allowNull;
     toJson(): any;
     setId(val: any): void;
     waitLoadOf(id: any): Promise<T>;
@@ -12,7 +13,7 @@ export declare class LookupColumn<T> {
     };
     set(item: T): void;
     id: idType<T>;
-    constructor(repository: Repository<T>, isReferenceRelation: any);
+    constructor(repository: Repository<T>, isReferenceRelation: any, allowNull: any);
     get item(): T;
     waitLoad(): Promise<T>;
 }

package/src/column.js

@@ -15,9 +15,10 @@ function makeTitle(name) {
 }
 exports.makeTitle = makeTitle;
 var LookupColumn = /** @class */ (function () {
-    function LookupColumn(repository, isReferenceRelation) {
+    function LookupColumn(repository, isReferenceRelation, allowNull) {
         this.repository = repository;
         this.isReferenceRelation = isReferenceRelation;
+        this.allowNull = allowNull;
     }
     LookupColumn.prototype.toJson = function () {
         if (!this.storedItem)
@@ -39,11 +40,22 @@ var LookupColumn = /** @class */ (function () {
     LookupColumn.prototype.get = function (id) {
         if (id === undefined || id === null)
             return null;
-        if (this.isReferenceRelation && !this.storedItem)
+        var result = (0, repository_internals_1.getRepositoryInternals)(this.repository).getCachedById(id, this.isReferenceRelation);
+        if (this.isReferenceRelation && !this.storedItem) {
+            if (!this.allowNull && (this.id === 0 || this.id === ''))
+                return null;
             return undefined;
-        return (0, repository_internals_1.getRepositoryInternals)(this.repository).getCachedById(id, this.isReferenceRelation);
+        }
+        return result;
     };
     LookupColumn.prototype.set = function (item) {
+        if (item === null &&
+            !this.allowNull &&
+            this.isReferenceRelation &&
+            (this.id == 0 || this.id == '')) {
+            this.storedItem = { item: null };
+            return;
+        }
         this.storedItem = undefined;
         if (item) {
             if (typeof item === 'string' || typeof item === 'number')

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, MembersOnly, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
+import type { ControllerRef, ControllerRefForControllerBase, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, EntityRefForEntityBase, FieldRef, FieldsMetadata, FieldsRef, FieldsRefForEntityBase, 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';
@@ -98,7 +98,7 @@ declare abstract class rowHelperBase<T> {
     __clearErrorsAndReportChanged(): void;
     _reportChangedToEntityAndFields(): void;
     hasErrors(): boolean;
-    copyDataToObject(): any;
+    copyDataToObject(isNew?: boolean): any;
     originalValues: any;
     saveOriginalData(): void;
     saveMoreOriginalData(): void;
@@ -259,20 +259,19 @@ 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 {
-    ['י'](): EntityRef<this>;
-    get _(): ReturnType<this["י"]>;
+    get _(): EntityRefForEntityBase<this>;
     save(): Promise<this>;
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     delete(): Promise<void>;
     isNew(): boolean;
-    get $(): this["_"]["fields"];
+    get $(): FieldsRefForEntityBase<this>;
 }
 export declare class ControllerBase {
     protected remult: Remult;
     constructor(remult?: Remult);
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
-    get $(): FieldsRef<this>;
-    get _(): ControllerRef<this>;
+    get $(): FieldsRefForEntityBase<this>;
+    get _(): ControllerRefForControllerBase<this>;
 }
 declare class SubscribableImp implements Subscribable {
     reportChanged(): void;

package/src/remult3/RepositoryImplementation.js

@@ -913,6 +913,8 @@ var RepositoryImplementation = /** @class */ (function () {
             var val = rel.type === 'reference'
                 ? (0, getEntityRef_1.getEntityRef)(row).fields.find(requireField(field.key, this.metadata)).getId()
                 : row[field.key];
+            if (!field.allowNull && (val === 0 || val === ''))
+                val = null;
             if (val === null)
                 returnNull = true;
             if (val === undefined)
@@ -1300,7 +1302,7 @@ var rowHelperBase = /** @class */ (function () {
         var _loop_5 = function (col) {
             var ei = (0, getEntityRef_1.getEntitySettings)(col.valueType, false);
             if (ei && remult) {
-                var lookup_1 = new column_1.LookupColumn(remult.repo(col.valueType), Boolean(col === null || col === void 0 ? void 0 : col[relationInfoMember_1.relationInfoMember]));
+                var lookup_1 = new column_1.LookupColumn(remult.repo(col.valueType), Boolean(col === null || col === void 0 ? void 0 : col[relationInfoMember_1.relationInfoMember]), col.allowNull);
                 this_2.lookups.set(col.key, lookup_1);
                 var val = instance[col.key];
                 var refImpl_1;
@@ -1556,24 +1558,32 @@ var rowHelperBase = /** @class */ (function () {
         (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
         return !!!this.error && this.errors == undefined;
     };
-    rowHelperBase.prototype.copyDataToObject = function () {
+    rowHelperBase.prototype.copyDataToObject = function (isNew) {
         var e_25, _a;
+        if (isNew === void 0) { isNew = false; }
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
                 var lu = this.lookups.get(col.key);
                 var val = undefined;
+                var rel = (0, relationInfoMember_1.getRelationInfo)(col);
                 if (lu)
                     val = lu.id;
                 else
                     val = this.instance[col.key];
+                if (rel && isNew && !col.allowNull && (val === undefined || null)) {
+                    if (this.remult.repo(rel.toType()).metadata.idMetadata.field.valueType ===
+                        Number)
+                        val = 0;
+                    else
+                        val = '';
+                }
                 if (val !== undefined) {
                     val = col.valueConverter.toJson(val);
                     if (val !== undefined && val !== null)
                         val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
                 }
-                var rel = (0, relationInfoMember_1.getRelationInfo)(col);
                 if (!rel || rel.type === 'reference')
                     d[col.key] = val;
             }
@@ -1943,7 +1953,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _l.label = 12;
                     case 12:
                         this.__assertValidity();
-                        d = this.copyDataToObject();
+                        d = this.copyDataToObject(this.isNew());
                         ignoreKeys = [];
                         try {
                             for (_d = tslib_1.__values(this.metadata.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
@@ -3283,9 +3293,6 @@ 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);

package/src/remult3/remult3.d.ts

@@ -6,7 +6,7 @@ import type { EntityOptions } from '../entity';
 import type { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { SortSegment } from '../sort';
 import type { EntityBase } from './RepositoryImplementation';
-export interface EntityRef<entityType> extends Subscribable {
+export interface EntityRefBase<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
     save(): Promise<entityType>;
@@ -15,7 +15,6 @@ export interface EntityRef<entityType> extends Subscribable {
     isNew(): boolean;
     wasChanged(): boolean;
     wasDeleted(): boolean;
-    fields: FieldsRef<entityType>;
     error: string;
     getId(): idType<entityType>;
     getOriginalId(): idType<entityType>;
@@ -23,12 +22,19 @@ export interface EntityRef<entityType> extends Subscribable {
     metadata: EntityMetadata<entityType>;
     toApiJson(): any;
     validate(): Promise<ErrorInfo<entityType> | undefined>;
-    relations: RepositoryRelations<entityType>;
     readonly apiUpdateAllowed: boolean;
     readonly apiDeleteAllowed: boolean;
     readonly apiInsertAllowed: boolean;
     readonly isLoading: boolean;
 }
+export interface EntityRef<entityType> extends EntityRefBase<entityType> {
+    fields: FieldsRef<entityType>;
+    relations: RepositoryRelations<entityType>;
+}
+export interface EntityRefForEntityBase<entityType> extends EntityRefBase<entityType> {
+    fields: FieldsRefForEntityBase<entityType>;
+    relations: RepositoryRelationsForEntityBase<entityType>;
+}
 /**
  * Represents a lifecycle event associated with an entity instance. These events
  * are triggered during various stages of the entity's lifecycle, such as validation,
@@ -73,13 +79,18 @@ export interface LifecycleEvent<entityType> {
      */
     relations: RepositoryRelations<entityType>;
 }
-export interface ControllerRef<entityType> extends Subscribable {
+export interface ControllerRefBase<entityType> extends Subscribable {
     hasErrors(): boolean;
-    fields: FieldsRef<entityType>;
     error: string;
     validate(): Promise<ErrorInfo<entityType> | undefined>;
     readonly isLoading: boolean;
 }
+export interface ControllerRef<entityType> extends ControllerRefBase<entityType> {
+    fields: FieldsRef<entityType>;
+}
+export interface ControllerRefForControllerBase<entityType> extends ControllerRefBase<entityType> {
+    fields: FieldsRefForEntityBase<entityType>;
+}
 export interface RefSubscriberBase {
     reportChanged: () => void;
     reportObserved: () => void;
@@ -88,11 +99,7 @@ export declare type RefSubscriber = (() => void) | RefSubscriberBase;
 export interface Subscribable {
     subscribe(listener: RefSubscriber): Unsubscribe;
 }
-export type FieldsRef<entityType> = {
-    [Properties in keyof MembersOnly<entityType>]: NonNullable<entityType[Properties]> extends {
-        id?: number | string;
-    } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
-} & {
+export type FieldsRefBase<entityType> = {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldRef<entityType, any>;
     [Symbol.iterator]: () => IterableIterator<FieldRef<entityType, any>>;
     toArray(): FieldRef<entityType, any>[];
@@ -104,6 +111,16 @@ export type FieldsMetadata<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 {
+        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 {
+        id?: number | string;
+    } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
+};
 export type SortSegments<entityType> = {
     [Properties in keyof entityType]: SortSegment & {
         descending(): SortSegment;
@@ -200,7 +217,7 @@ export interface EntityMetadata<entityType = any> {
     readonly idMetadata: IdMetadata<entityType>;
 }
 export declare type MembersOnly<T> = {
-    [K in keyof Omit<T, keyof Pick<EntityBase, '$' | '_' | 'י'>> as T[K] extends Function ? never : K]: T[K];
+    [K in keyof T as T[K] extends Function ? never : K]: T[K];
 };
 export declare type idType<entityType> = entityType extends {
     id?: number;
@@ -537,6 +554,11 @@ export type RepositoryRelations<entityType> = {
         findOne: (options?: FindOptionsBase<R>) => Promise<R>;
     } : never;
 };
+export type RepositoryRelationsForEntityBase<entityType> = {
+    [K in keyof Omit<entityType, keyof EntityBase>]-?: NonNullable<entityType[K]> extends Array<infer R> ? Repository<R> : entityType[K] extends infer R ? {
+        findOne: (options?: FindOptionsBase<R>) => Promise<R>;
+    } : never;
+};
 export declare type EntityIdFields<entityType> = {
     [Properties in keyof Partial<MembersOnly<entityType>>]?: true;
 };
@@ -571,4 +593,11 @@ remult.apiClient.httpClient = (
 remult.apiClient.url='localhost:3007/api
 
 
+ */
+/**
+* our default is allow null false.
+* for sql databases we add a db default of 0/''/false
+* when we set a relation to null - we update the related field to null
+* we do not enforce allow null false (mongo, json it'll get stored)
+
  */

package/src/remult3/remult3.js

@@ -51,3 +51,15 @@ remult.apiClient.url='localhost:3007/api
 //y2 - remove __dirname from tutorials
 //y2 - add some api testing framework for user unit tests (will help with codesandbox based discussions)
 //y2 - I tihnk there should be a way to throw a forbidden exception
+//p2 - conside law-q db based on schema issue - I think that while running the dataProvider function, we should have a valid remult - maybe even have a valid remult, that will be valid until api is run
+//p2 - allow api read to also support instance and filter.
+//p2 - investigate why did lawq didn't run after build - even though it ran with tsx
+//y2 - we should really reconsider allow null by default to be true - I think that what we're doing is confusing for most . In my case I added a volunteer relation, and didn't set any value to it - and I get an error that null value is not allowed for it
+/**
+* our default is allow null false.
+* for sql databases we add a db default of 0/''/false
+* when we set a relation to null - we update the related field to null
+* we do not enforce allow null false (mongo, json it'll get stored)
+
+ */
+//y2 - i had a question about find first's different syntax from find that confused a user