remult 0.12.7 → 0.13.1

package/src/data-providers/web-sql-data-provider.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSqlDataProvider = void 0;
 var tslib_1 = require("tslib");
+var remult3_1 = require("../remult3");
 var sql_database_1 = require("./sql-database");
 var filter_consumer_bridge_to_sql_request_1 = require("../filter/filter-consumer-bridge-to-sql-request");
 //SqlDatabase.LogToConsole = true;
@@ -59,15 +60,20 @@ var WebSqlDataProvider = /** @class */ (function () {
                         try {
                             for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 x = _b.value;
-                                if (!e.isDbReadonly(x)) {
+                                if (!e.isDbReadonly(x) || remult3_1.isAutoIncrement(x)) {
                                     if (result.length != 0)
                                         result += ',';
                                     result += '\r\n  ';
-                                    result += this.addColumnSqlSyntax(x, e.nameOf(x));
-                                    if (x.key == entity.idMetadata.field.key) {
-                                        result += ' primary key';
-                                        if (entity.options.dbAutoIncrementId)
-                                            result += " autoincrement";
+                                    if (remult3_1.isAutoIncrement(x)) {
+                                        if (x.key != entity.idMetadata.field.key)
+                                            throw "in web sql, autoincrement is only allowed for primary key";
+                                        result += e.nameOf(x) + ' integer primary key autoincrement';
+                                    }
+                                    else {
+                                        result += this.addColumnSqlSyntax(x, e.nameOf(x));
+                                        if (x.key == entity.idMetadata.field.key) {
+                                            result += ' primary key';
+                                        }
                                     }
                                 }
                             }

package/src/entity.d.ts

@@ -3,7 +3,6 @@ import { FieldMetadata as FieldMetadata } from './column-interfaces';
 import { EntityOrderBy, FieldsMetadata, EntityFilter, EntityRef } from "./remult3";
 export interface EntityOptions<entityType = any> {
     id?: (entity: FieldsMetadata<entityType>) => FieldMetadata;
-    dbAutoIncrementId?: boolean;
     /**
      * The name of the table in the database that holds the data for this entity.
      * If no name is set, the `key` will be used instead.

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

@@ -6,8 +6,8 @@ export declare class Filter {
     constructor(apply?: (add: FilterConsumer) => void);
     __applyToConsumer(add: FilterConsumer): void;
     static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
-    static createCustom<entityType>(customFilterTranslator: (r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
-    static createCustom<entityType, argsType>(customFilterTranslator: (r: Remult, args: argsType) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
+    static createCustom<entityType>(customFilterTranslator: (r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
+    static createCustom<entityType, argsType>(customFilterTranslator: (r: Remult, args: argsType) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
     static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
     toJson(): any;
     static entityFilterToJson<T>(entityDefs: EntityMetadata<T>, where: EntityFilter<T>): any;

package/src/filter/filter-interfaces.js

@@ -26,13 +26,16 @@ var Filter = /** @class */ (function () {
             });
         });
     };
-    Filter.createCustom = function (customFilterTranslator) {
-        var customFilterInfo = { key: '', customFilterTranslator: customFilterTranslator };
+    Filter.createCustom = function (customFilterTranslator, key) {
+        if (key === void 0) { key = ''; }
+        var customFilterInfo = { key: key, customFilterTranslator: customFilterTranslator };
         return Object.assign(function (x) {
             var _a;
             var z = {};
             if (x == undefined)
                 x = {};
+            if (!customFilterInfo.key)
+                throw "Usage of custom filter before a key was assigned to it";
             return _a = {},
                 _a[exports.customUrlToken + customFilterInfo.key] = x,
                 _a;

package/src/id-entity.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdEntity = void 0;
 var tslib_1 = require("tslib");
-var uuid_1 = require("uuid");
 var remult3_1 = require("./remult3");
 var IdEntity = /** @class */ (function (_super) {
     tslib_1.__extends(IdEntity, _super);
@@ -10,10 +9,7 @@ var IdEntity = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Field({
-            allowApiUpdate: false,
-            defaultValue: function () { return uuid_1.v4(); }
-        }),
+        remult3_1.Fields.Uuid(),
         tslib_1.__metadata("design:type", String)
     ], IdEntity.prototype, "id", void 0);
     return IdEntity;

package/src/remult3/RepositoryImplementation.d.ts

@@ -1,7 +1,7 @@
-import { FieldMetadata, FieldOptions, ValueListItem } from "../column-interfaces";
+import { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from "../column-interfaces";
 import { EntityOptions } from "../entity";
 import { LookupColumn } from '../column';
-import { EntityMetadata, FieldRef, Fields, EntityFilter, FindOptions, Repository, EntityRef, QueryOptions, QueryResult, EntityOrderBy, FieldsMetadata, IdMetadata, FindFirstOptionsBase, FindFirstOptions, OmitEB, Subscribable, ControllerRef } from "./remult3";
+import { EntityMetadata, FieldRef, FieldsRef, EntityFilter, FindOptions, Repository, EntityRef, QueryOptions, QueryResult, EntityOrderBy, FieldsMetadata, IdMetadata, FindFirstOptionsBase, FindFirstOptions, OmitEB, Subscribable, ControllerRef } from "./remult3";
 import { ClassType } from "../../classType";
 import { Remult, Unobserve } from "../context";
 import { entityEventListener } from "../__EntityValueProvider";
@@ -78,7 +78,7 @@ declare abstract class rowHelperBase<T> {
         [key: string]: string;
     };
     protected __assertValidity(): void;
-    abstract get fields(): Fields<T>;
+    abstract get fields(): FieldsRef<T>;
     catchSaveErrors(err: any): any;
     __clearErrorsAndReportChanged(): void;
     _reportChangedToEntityAndFields(): void;
@@ -108,7 +108,7 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
     undoChanges(): void;
     reload(): Promise<T>;
     private _columns;
-    get fields(): Fields<T>;
+    get fields(): FieldsRef<T>;
     private _saving;
     save(): Promise<T>;
     private getIdFilter;
@@ -121,7 +121,7 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
     wasChanged(): boolean;
     __performColumnAndEntityValidations(): Promise<void>;
 }
-export declare function getFields<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): Fields<fieldsContainerType>;
+export declare function getFields<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): FieldsRef<fieldsContainerType>;
 export declare function getControllerRef<fieldsContainerType>(container: fieldsContainerType, remult?: Remult): ControllerRef<fieldsContainerType>;
 export declare class controllerRefImpl<T = any> extends rowHelperBase<T> implements ControllerRef<T> {
     constructor(columnsInfo: FieldOptions[], instance: any, remult: Remult);
@@ -130,7 +130,7 @@ export declare class controllerRefImpl<T = any> extends rowHelperBase<T> impleme
         [key: string]: string;
     };
     originalValues: any;
-    fields: Fields<T>;
+    fields: FieldsRef<T>;
 }
 export declare class FieldRefImplementation<entityType, valueType> implements FieldRef<entityType, valueType> {
     private settings;
@@ -176,7 +176,7 @@ export declare class columnDefsImpl implements FieldMetadata {
     options: FieldOptions<any, any>;
     target: ClassType<any>;
     readonly: boolean;
-    valueConverter: import("../column-interfaces").ValueConverter<any>;
+    valueConverter: ValueConverter<any>;
     allowNull: boolean;
     caption: string;
     get dbName(): any;
@@ -201,18 +201,55 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
     dbNamePromise: Promise<string>;
     getDbName(): Promise<string>;
     idMetadata: IdMetadata<T>;
-    dbAutoIncrementId: boolean;
     fields: FieldsMetadata<T>;
     dbName: string;
     caption: string;
 }
 export declare function FieldType<valueType = any>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any) => any;
-export declare function JsonField<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function DateOnlyField<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function IntegerField<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => any;
-export declare function UuidField<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
-export declare function Field<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+export declare const Fields1: {
+    String: () => (a: any) => void;
+};
+export declare class Fields {
+    static Object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static DateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static AutoIncrement<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Number<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static String<entityType = any>(...options: (StringFieldOptions<entityType> | ((options: StringFieldOptions<entityType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static Boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+}
+export declare function isAutoIncrement(f: FieldMetadata): boolean;
+export interface StringFieldOptions<entityType = any> extends FieldOptions<entityType, string> {
+    maxLength?: number;
+}
+export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => any;
+export interface ValueListFieldOptions<entityType, valueType> extends FieldOptions<entityType, valueType> {
+    getValues?: () => valueType[];
+}
+export declare class ValueListInfo<T extends ValueListItem> implements ValueConverter<T> {
+    private valueListType;
+    static get<T extends ValueListItem>(type: ClassType<T>): ValueListInfo<T>;
+    private byIdMap;
+    private values;
+    isNumeric: boolean;
+    private constructor();
+    getValues(): T[];
+    byId(key: any): T;
+    fromJson(val: any): T;
+    toJson(val: T): any;
+    fromDb(val: any): T;
+    toDb(val: T): any;
+    toInput(val: T, inputType: string): string;
+    fromInput(val: string, inputType: string): T;
+    displayValue?(val: T): string;
+    fieldTypeInDb?: string;
+    inputType?: string;
+}
+export declare function getValueList<T>(type: ClassType<T>): T[];
+export declare function Field<entityType = any, valueType = any>(valueType: () => ClassType<valueType>, ...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+export declare const storableMember: unique symbol;
 export declare function decorateColumnSettings<valueType>(settings: FieldOptions<any, valueType>, remult: Remult): FieldOptions<any, valueType>;
 interface columnInfo {
     key: string;
@@ -229,12 +266,12 @@ export declare class EntityBase {
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     delete(): Promise<void>;
     isNew(): boolean;
-    get $(): Fields<this>;
+    get $(): FieldsRef<this>;
 }
 export declare class ControllerBase {
     protected remult: Remult;
     constructor(remult: Remult);
-    get $(): Fields<this>;
+    get $(): FieldsRef<this>;
     get _(): ControllerRef<this>;
 }
 declare class SubscribableImp implements Subscribable {