@singularsystems/neo-core 0.10.61 → 0.10.63

package/dist/Components/ButtonOptions.d.ts

@@ -4,7 +4,7 @@ import { ITooltipOptions } from "./TooltipOptions";
 export interface IButtonOptions {
     /** True if the click event of this button must be invoked when the parent form of this button is submitted. */
     isSubmit?: boolean;
-    /** The id of the form this button should attached to. Use this if the button is not a descendent of the form. */
+    /** The id of the form this button should attach to. Use this if the button is not nested within the form. */
     form?: string;
     /** Bootstrap variant */
     variant?: variant;

package/dist/Components/DatePicker/DatePicker.d.ts

@@ -27,10 +27,11 @@ export default class DatePicker {
     constructor(container: HTMLDivElement, options?: IPartialDateProps);
     inputFocused(e: FocusEvent): void;
     inputBlurred(): void;
+    onInputBlurred(closePopup: boolean): void;
     inputChanged(): void;
     inputKeyDown(e: KeyboardEvent): void;
     private removePopup;
-    private setBindValueAndClose;
+    private setBindValue;
     private setBindProperty;
     private setInputValue;
     private show;

package/dist/Components/DatePicker/DatePicker.js

@@ -47,24 +47,27 @@ var DatePicker = /** @class */ (function () {
         }
     };
     DatePicker.prototype.inputBlurred = function () {
+        this.onInputBlurred(true);
+    };
+    DatePicker.prototype.onInputBlurred = function (closePopup) {
         if (this.inputHasChanged) {
             if (this.input.value) {
                 // if this is time only, use the existing value to preserve the date.
                 var refDate = this.options.timeOnly && this.bindProperty.value;
                 var parsedDate = DateUtils.tryParse(this.input.value, this.options.formatString, false, refDate || new Date());
                 if (parsedDate) {
-                    this.setBindValueAndClose(parsedDate, false);
+                    this.setBindValue(parsedDate, { preserveTime: false, close: closePopup });
                 }
                 else {
-                    this.setBindValueAndClose(this.bindProperty.value, false);
+                    this.setBindValue(this.bindProperty.value, { preserveTime: false, close: closePopup });
                 }
             }
             else {
-                this.setBindValueAndClose(null, true);
+                this.setBindValue(null, { preserveTime: true, close: closePopup });
             }
         }
         else {
-            if (this.options.autoClose)
+            if (this.options.autoClose && closePopup)
                 this.removePopup(true);
         }
         this.input.readOnly = this.isReadOnly;
@@ -78,6 +81,9 @@ var DatePicker = /** @class */ (function () {
                 this.setCurrentViewDate(parsedDate);
                 this.populateContentContainer(true);
             }
+            if (!this.popup) {
+                this.show();
+            }
         }
     };
     DatePicker.prototype.inputKeyDown = function (e) {
@@ -85,13 +91,22 @@ var DatePicker = /** @class */ (function () {
         if (e.key === "Escape") {
             // Revert to previous value
             e.preventDefault();
-            this.setBindValueAndClose(this.bindProperty.value, false);
+            this.setBindValue(this.bindProperty.value, { preserveTime: false, close: false });
         }
         else if (e.key === "Enter") {
-            // Set date to today if the current value is null
-            e.preventDefault();
-            if (!this.bindProperty.value) {
-                this.setBindValueAndClose(new Date(), true);
+            var prevValue = this.input.value;
+            if (!this.bindProperty.value && !this.input.value) {
+                // Set date to today if the current value is null
+                this.setBindValue(new Date(), { preserveTime: true, close: false });
+            }
+            else {
+                this.onInputBlurred(false);
+            }
+            if (this.input.value !== prevValue) {
+                e.preventDefault();
+            }
+            else {
+                this.removePopup(true);
             }
         }
     };
@@ -109,17 +124,17 @@ var DatePicker = /** @class */ (function () {
             this.popup = null;
         }
     };
-    DatePicker.prototype.setBindValueAndClose = function (dateValue, preserveTime) {
+    DatePicker.prototype.setBindValue = function (dateValue, options) {
         this.inputHasChanged = false;
         var oldValue = this.bindProperty.value;
-        if (oldValue && dateValue && preserveTime) {
+        if (oldValue && dateValue && options.preserveTime) {
             // preserve the time component of the original date.
             dateValue.setHours(oldValue.getHours(), oldValue.getMinutes(), oldValue.getSeconds(), oldValue.getMilliseconds());
         }
         // Note: this may have the side effect of calling update().
         this.setBindProperty(dateValue, false);
         this.setInputValue();
-        if (!this.options.alwaysShow) {
+        if (!this.options.alwaysShow && options.close) {
             this.removePopup(true);
         }
     };
@@ -156,7 +171,7 @@ var DatePicker = /** @class */ (function () {
     };
     DatePicker.prototype.positionPopup = function (fromBottom) {
         if (this.popup) {
-            PositionHelper.checkScreenBounds(this.container, this.popup, fromBottom);
+            PositionHelper.checkScreenBounds(this.container, this.popup, fromBottom, this.options.popupAlignRight);
         }
     };
     /**
@@ -319,8 +334,7 @@ var DatePicker = /** @class */ (function () {
                 var cell = this.createAndAppend(trBody, "td");
                 var date = currentDate.getDate();
                 var month = currentDate.getMonth();
-                cell.innerText = date.toString();
-                this.setupCell(cell, currentDate.getFullYear() + "," + month + "," + date, currentDate.getTime() >= this.options.minDateNoTime.getTime() && currentDate.getTime() <= this.options.maxDateNoTime.getTime(), currentDate.getTime() == this.today.getTime(), this.boundDateNoTime != null && currentDate.getTime() == this.boundDateNoTime.getTime());
+                this.setupCell(cell, date.toString(), currentDate.getFullYear() + "," + month + "," + date, currentDate.getTime() >= this.options.minDateNoTime.getTime() && currentDate.getTime() <= this.options.maxDateNoTime.getTime(), currentDate.getTime() == this.today.getTime(), this.boundDateNoTime != null && currentDate.getTime() == this.boundDateNoTime.getTime());
                 if (month != this.currentViewDate.getMonth()) {
                     cell.classList.add("outside-month");
                 }
@@ -345,8 +359,7 @@ var DatePicker = /** @class */ (function () {
                 trBody = this.createAndAppend(tBody, "tr");
             }
             var cell = this.createAndAppend(trBody, "td");
-            cell.innerText = DateUtils.i18n.monthNames[i];
-            this.setupCell(cell, i, monthEndDate > this.options.minDateNoTime.getTime() && monthStartDate <= this.options.maxDateNoTime.getTime(), this.today.getFullYear() == year && this.today.getMonth() == i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year && this.boundDateNoTime.getMonth() == i);
+            this.setupCell(cell, DateUtils.i18n.monthNames[i], i, monthEndDate > this.options.minDateNoTime.getTime() && monthStartDate <= this.options.maxDateNoTime.getTime(), this.today.getFullYear() == year && this.today.getMonth() == i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year && this.boundDateNoTime.getMonth() == i);
         }
         this.prevButton.disabled = this.options.minDateNoTime.getFullYear() >= year;
         this.nextButton.disabled = this.options.maxDateNoTime.getFullYear() <= year;
@@ -361,13 +374,12 @@ var DatePicker = /** @class */ (function () {
                 trBody = this.createAndAppend(tBody, "tr");
             }
             var cell = this.createAndAppend(trBody, "td");
-            cell.innerText = (year + i).toString();
-            this.setupCell(cell, cell.innerText, year + i >= this.options.minDateNoTime.getFullYear() && year + i <= this.options.maxDateNoTime.getFullYear(), this.today.getFullYear() == year + i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year + i);
+            this.setupCell(cell, (year + i).toString(), (year + i).toString(), year + i >= this.options.minDateNoTime.getFullYear() && year + i <= this.options.maxDateNoTime.getFullYear(), this.today.getFullYear() == year + i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year + i);
         }
         this.prevButton.disabled = this.options.minDateNoTime.getFullYear() >= year;
         this.nextButton.disabled = this.options.maxDateNoTime.getFullYear() < year + YearsInYearView;
     };
-    DatePicker.prototype.setupCell = function (cell, data, selectable, current, isSelected) {
+    DatePicker.prototype.setupCell = function (cell, innerText, data, selectable, current, isSelected) {
         if (selectable) {
             cell.classList.add("selectable");
             cell.dataset["date"] = data;
@@ -381,55 +393,56 @@ var DatePicker = /** @class */ (function () {
         if (isSelected) {
             cell.classList.add("selected");
         }
+        var cellContent = this.createAndAppend(cell, "span");
+        cellContent.innerText = innerText;
     };
     DatePicker.prototype.contentClick = function (e) {
+        var _a;
         e.preventDefault();
         if (e.target) {
-            if (this.currentViewType == ViewType.Days) {
-                this.dayClicked(e.target);
-            }
-            else if (this.currentViewType == ViewType.Months) {
-                this.monthClicked(e.target);
+            var element = e.target;
+            if (!element.dataset["date"]) {
+                element = element.parentElement;
             }
-            else {
-                this.yearClicked(e.target);
+            var dateString = (_a = element) === null || _a === void 0 ? void 0 : _a.dataset["date"];
+            if (dateString) {
+                if (this.currentViewType == ViewType.Days) {
+                    this.dayClicked(dateString);
+                }
+                else if (this.currentViewType == ViewType.Months) {
+                    this.monthClicked(dateString);
+                }
+                else {
+                    this.yearClicked(dateString);
+                }
             }
         }
     };
-    DatePicker.prototype.dayClicked = function (element) {
-        var datePartsString = element.dataset["date"];
-        if (datePartsString) {
-            var dateParts = datePartsString.split(",");
-            this.setBindValueAndClose(new Date(parseInt(dateParts[0]), parseInt(dateParts[1]), parseInt(dateParts[2])), true);
-        }
+    DatePicker.prototype.dayClicked = function (datePartsString) {
+        var dateParts = datePartsString.split(",");
+        this.setBindValue(new Date(parseInt(dateParts[0]), parseInt(dateParts[1]), parseInt(dateParts[2])), { preserveTime: true, close: true });
     };
-    DatePicker.prototype.monthClicked = function (element) {
-        var monthString = element.dataset["date"];
-        if (monthString) {
-            this.currentViewDate.setMonth(parseInt(monthString));
-            if (this.options.monthView) {
-                this.setBindValueAndClose(this.currentViewDate, true);
-            }
-            else {
-                this.currentViewType = ViewType.Days;
-                this.canAutoSetDate = true;
-                this.populateContentContainer(false);
-                this.contentAnimationHelper.fadeAndScale(true);
-            }
+    DatePicker.prototype.monthClicked = function (monthString) {
+        this.currentViewDate.setMonth(parseInt(monthString));
+        if (this.options.monthView) {
+            this.setBindValue(this.currentViewDate, { preserveTime: true, close: true });
+        }
+        else {
+            this.currentViewType = ViewType.Days;
+            this.canAutoSetDate = true;
+            this.populateContentContainer(false);
+            this.contentAnimationHelper.fadeAndScale(true);
         }
     };
-    DatePicker.prototype.yearClicked = function (element) {
-        var yearString = element.dataset["date"];
-        if (yearString) {
-            this.currentViewDate.setFullYear(parseInt(yearString));
-            if (this.options.yearView) {
-                this.setBindValueAndClose(this.currentViewDate, true);
-            }
-            else {
-                this.currentViewType = ViewType.Months;
-                this.populateContentContainer(false);
-                this.contentAnimationHelper.fadeAndScale(true);
-            }
+    DatePicker.prototype.yearClicked = function (yearString) {
+        this.currentViewDate.setFullYear(parseInt(yearString));
+        if (this.options.yearView) {
+            this.setBindValue(this.currentViewDate, { preserveTime: true, close: true });
+        }
+        else {
+            this.currentViewType = ViewType.Months;
+            this.populateContentContainer(false);
+            this.contentAnimationHelper.fadeAndScale(true);
         }
     };
     DatePicker.prototype.headerClick = function (e) {

package/dist/Components/DatePicker/DatePickerOptions.d.ts

@@ -26,6 +26,10 @@ export default class DatePickerOptions {
      * `isClosing` will be false during scrolling with `autoChangeDate` set.
      * */
     onDateSelected?: (isClosing: boolean) => void;
+    /**
+     * If the datepicker popup should be aligned to the right of the input.
+     */
+    popupAlignRight?: boolean;
 }
 export declare class ProcessedDatePickerOptions extends DatePickerOptions {
     minDateNoTime: Date;

package/dist/Model/BaseModels/CriteriaBase.d.ts

@@ -1,6 +1,7 @@
-import { ModelFieldInfo } from "../ModelFieldInfo";
+import { IModelFieldInfoContainer, ModelFieldInfo } from "../ModelFieldInfo";
+import PropertyInfo from "../PropertyInfo";
 import ValueObject from "../ValueObject";
-export declare abstract class CriteriaBase extends ValueObject {
+export declare abstract class CriteriaBase extends ValueObject implements IModelFieldInfoContainer {
     /**
      * Extra information about lookup fields in this object.
      */
@@ -13,4 +14,5 @@ export declare abstract class CriteriaBase extends ValueObject {
      * You must also call this.makeObservable(); instead of using the @NeoModel decorator.
      */
     protected initialiseFieldInfo(fields: (keyof this)[]): void;
+    setModelFieldInfo(property: PropertyInfo, displayValue: string): any;
 }

package/dist/Model/BaseModels/CriteriaBase.js

@@ -25,6 +25,17 @@ var CriteriaBase = /** @class */ (function (_super) {
             }
         }
     };
+    CriteriaBase.prototype.setModelFieldInfo = function (property, displayValue) {
+        var fieldInfo = this.fieldInfo[property.propertyName];
+        if (!fieldInfo) {
+            fieldInfo = new ModelFieldInfo(property.readableName, displayValue);
+            this.fieldInfo[property.propertyName] = fieldInfo;
+        }
+        else {
+            fieldInfo.valueString = displayValue;
+        }
+        return fieldInfo;
+    };
     __decorate([
         Dictionary(ModelFieldInfo),
         __metadata("design:type", Object)

package/dist/Model/BindableBase.d.ts

@@ -1,4 +1,4 @@
-import { TransformMetaType, PartialPlainObject, PlainFlatObject, PartialOrNull } from './IModelBase';
+import { TransformMetaType, PartialPlainObject, PlainFlatObject, PartialOrNull, IMakeBindableOptions } from './IModelBase';
 import { NeoTypeInfo } from './NeoTypeInfo';
 import { IDeserialiseOptions } from '../Data/Deserialiser';
 export declare abstract class BindableBase {
@@ -30,6 +30,12 @@ export declare abstract class BindableBase {
      * This method can be used as an alternative to the @NeoModel decorator.
      */
     protected makeObservable(): void;
+    /**
+     * Makes the model bindable (and observable if it inherits from ModelBase) by creating its 'meta' object.
+     * Must be called in the constructor, preferably directly after the super() call.
+     * This method can be used as an alternative to the @NeoModel decorator.
+     */
+    protected makeBindable(options?: IMakeBindableOptions): void;
     static neo: NeoTypeInfo;
     /**
      * Creates a new instance of this type, and deserialises the plain javascript object graph into it.

package/dist/Model/BindableBase.js

@@ -1,7 +1,7 @@
 import { __assign, __decorate, __metadata } from "tslib";
 import { NoTracking, Observable } from './Decorators';
 import { JSFormatter } from '../Data/Serialiser';
-import { ensureTypeInfo } from './NeoTypeInfo';
+import { NeoTypeInfo } from './NeoTypeInfo';
 import { Utils } from '../Utils';
 import { SerialiseType } from './Misc';
 var BindableBase = /** @class */ (function () {
@@ -42,11 +42,15 @@ var BindableBase = /** @class */ (function () {
      * This method can be used as an alternative to the @NeoModel decorator.
      */
     BindableBase.prototype.makeObservable = function () {
-        // Ensure neo info is set
-        var ctor = this.constructor;
-        // Call this in case no property decorators were added
-        ensureTypeInfo(ctor);
-        ctor.neo.makeObservable(this);
+        this.makeBindable({ makeObservable: true });
+    };
+    /**
+     * Makes the model bindable (and observable if it inherits from ModelBase) by creating its 'meta' object.
+     * Must be called in the constructor, preferably directly after the super() call.
+     * This method can be used as an alternative to the @NeoModel decorator.
+     */
+    BindableBase.prototype.makeBindable = function (options) {
+        NeoTypeInfo.makeObservable(this, options);
     };
     /**
      * Creates a new instance of this type, and deserialises the plain javascript object graph into it.

package/dist/Model/IModelBase.d.ts

@@ -41,6 +41,19 @@ export declare type PartialPlainNonTrackedObject<T> = PartialPlainObject<T> & {
 export interface NeoModelConstructor extends Function {
     neo: NeoTypeInfo;
 }
+export interface IMakeBindableOptions {
+    /**
+     * Specifies whether properties should be observable
+     * * If this is `true`, all properties will be observable by default.
+     * * If `false` only properties decorated with @Attributes.Observable will be made observable.
+     * * If `undefined`, only types that inherit from `ModelBase` will be observable by default.
+     */
+    makeObservable?: boolean;
+    /**
+     * If `true`, this instance will not be converted. In inheritence heirarchies, use this to ensure only the last derived type converts the instance.
+     */
+    skipConversion?: boolean;
+}
 export interface IDebounceOptions {
     delayMs?: number;
 }

package/dist/Model/IModelCreatorBase.d.ts

@@ -1,9 +1,9 @@
 import { NeoTypeInfo } from './NeoTypeInfo';
-import { NeoModelConstructor } from './IModelBase';
+import { IMakeBindableOptions, NeoModelConstructor } from './IModelBase';
 export default interface IModelCreatorBase {
     shouldInitialiseAllMembers: boolean;
     initialise(typeInfo: NeoTypeInfo, originalConstructor: NeoModelConstructor): void;
     isBindableBase(type: NeoModelConstructor): boolean;
     isModelBase(type: NeoModelConstructor): boolean;
-    convertInstance(instance: {}): {};
+    convertInstance(instance: {}, options: IMakeBindableOptions): {};
 }

package/dist/Model/List.js

@@ -2,6 +2,7 @@ import { __assign, __extends } from "tslib";
 import { JSFormatter } from '../Data/Serialiser';
 import { Utils } from '../Utils';
 import { ObservableValue } from './ObservableValue';
+import { NeoTypeInfo } from './NeoTypeInfo';
 var List = /** @class */ (function (_super) {
     __extends(List, _super);
     function List(childObjectType) {
@@ -179,8 +180,7 @@ var List = /** @class */ (function (_super) {
         }
         else {
             var ctor = this.childObjectType.prototype.constructor;
-            ctor.neo.ensureInitialised();
-            return ctor.neo.metaItem;
+            return NeoTypeInfo.ensureInitialised(ctor).metaItem;
         }
     };
     Object.defineProperty(List.prototype, "isValid", {

package/dist/Model/ModelCreatorBase.d.ts

@@ -1,7 +1,8 @@
 import { NeoTypeInfo } from './NeoTypeInfo';
-import { NeoModelConstructor } from './IModelBase';
+import { IMakeBindableOptions, NeoModelConstructor } from './IModelBase';
 import PropertyInfo from './PropertyInfo';
-export declare abstract class ModelCreatorBase {
+import IModelCreatorBase from './IModelCreatorBase';
+export declare abstract class ModelCreatorBase implements IModelCreatorBase {
     protected typeInfo: NeoTypeInfo;
     protected alwaysInitialiseMembers: boolean;
     /**
@@ -19,5 +20,5 @@ export declare abstract class ModelCreatorBase {
     protected ensureChildInfo(instance: {}, propertyInfo: PropertyInfo): void;
     protected addMethodInfo(methodName: string, method: Function): void;
     protected addProperty(propertyName: string, descriptor: PropertyDescriptor): void;
-    abstract convertInstance(instance: {}): {};
+    abstract convertInstance(instance: {}, options: IMakeBindableOptions): {};
 }

package/dist/Model/ModelFieldInfo.d.ts

@@ -1,4 +1,17 @@
 import ValueObject from "./ValueObject";
+import PropertyInfo from "./PropertyInfo";
+export interface IModelFieldInfoContainer {
+    /**
+     * Extra information about lookup fields in this object.
+     */
+    fieldInfo: {
+        [K in keyof this]?: ModelFieldInfo;
+    };
+    /**
+     * Sets the model field info for a property.
+     */
+    setModelFieldInfo(property: PropertyInfo, displayValue: string): ModelFieldInfo;
+}
 export declare class ModelFieldInfo extends ValueObject {
     constructor(displayName: string, valueString: string);
     /**
@@ -9,4 +22,8 @@ export declare class ModelFieldInfo extends ValueObject {
      * Lookup of the field value
      */
     valueString: string;
+    /**
+     * If the instance is a container of ModelFieldInfo, the instance is returned, otherwise null is returned.
+     */
+    static asModelFieldInfoContainer(instance: any): IModelFieldInfoContainer | null;
 }

package/dist/Model/ModelFieldInfo.js

@@ -17,6 +17,16 @@ var ModelFieldInfo = /** @class */ (function (_super) {
         _this.valueString = valueString;
         return _this;
     }
+    /**
+     * If the instance is a container of ModelFieldInfo, the instance is returned, otherwise null is returned.
+     */
+    ModelFieldInfo.asModelFieldInfoContainer = function (instance) {
+        if (instance.fieldInfo &&
+            instance.setModelFieldInfo) {
+            return instance;
+        }
+        return null;
+    };
     ModelFieldInfo = __decorate([
         NeoModel,
         __metadata("design:paramtypes", [String, String])

package/dist/Model/NeoTypeInfo.d.ts

@@ -1,10 +1,11 @@
 import { Rule } from '../Validation/Rules';
 import { PropertyInstanceMap } from './PropertyInstance';
 import PropertyInfo, { PropertyInfoMap } from './PropertyInfo';
-import { NeoModelConstructor, IModelBase, IMetaItem } from './IModelBase';
+import { NeoModelConstructor, IModelBase, IMetaItem, IMakeBindableOptions } from './IModelBase';
 export declare class NeoTypeInfo {
     private modelCreator;
     private objectConstructor;
+    private wrapperConstructor?;
     private _inheritsBindableBase;
     private _inheritsModelBase;
     private _metaItem;
@@ -35,7 +36,16 @@ export declare class NeoTypeInfo {
     ensureInitialised(): void;
     /** Gets the override constructor which can setup a neo model. */
     getOverrideConstructor(): Function;
-    makeObservable(instance: any): {};
+    private createWrapperConstructor;
+    makeObservable(instance: any, options?: IMakeBindableOptions): any;
     private defineProxyProperty;
+    /**
+     * Makes a class instance observable.
+     * Must be called in the constructor, preferably directly after the super() call.
+     * This method can be used as an alternative to the @NeoModel decorator.
+     */
+    static makeObservable(instance: any, options?: IMakeBindableOptions): void;
+    /** Ensures the type and its metadata are initialised. */
+    static ensureInitialised(constructor: NeoModelConstructor): NeoTypeInfo;
 }
 export declare function ensureTypeInfo(constructor: NeoModelConstructor): NeoModelConstructor;

package/dist/Model/NeoTypeInfo.js

@@ -9,6 +9,7 @@ import NeoTypes from '../AppServices/NeoTypes';
 import { RelationType } from './Misc';
 var ignoredPropertyNames = ["$mobx"];
 var inversifyMetadataKey = "inversify:tagged";
+var hasConvertedSymbol = Symbol("hasConvertedModel");
 var NeoTypeInfo = /** @class */ (function () {
     function NeoTypeInfo() {
         this._inheritsBindableBase = false;
@@ -164,11 +165,22 @@ var NeoTypeInfo = /** @class */ (function () {
     NeoTypeInfo.prototype.ensureInitialised = function () {
         if (!this.modelCreator) {
             // create a new instance which will cause the type to be setup.
-            this.getOverrideConstructor()();
+            if (this.wrapperConstructor) {
+                this.wrapperConstructor();
+            }
+            else {
+                void new this.objectConstructor();
+            }
         }
     };
     /** Gets the override constructor which can setup a neo model. */
     NeoTypeInfo.prototype.getOverrideConstructor = function () {
+        if (!this.wrapperConstructor) {
+            this.wrapperConstructor = this.createWrapperConstructor();
+        }
+        return this.wrapperConstructor;
+    };
+    NeoTypeInfo.prototype.createWrapperConstructor = function () {
         var _a;
         var self = this;
         var baseType = Object.getPrototypeOf(self.objectConstructor);
@@ -214,9 +226,22 @@ var NeoTypeInfo = /** @class */ (function () {
         newConstructor.prototype = self.objectConstructor.prototype;
         return newConstructor;
     };
-    NeoTypeInfo.prototype.makeObservable = function (instance) {
-        this.ensureStaticRuntimeInfo(instance);
-        return this.modelCreator.convertInstance(instance);
+    NeoTypeInfo.prototype.makeObservable = function (instance, options) {
+        options = (options !== null && options !== void 0 ? options : {});
+        if (!options.skipConversion) {
+            this.ensureStaticRuntimeInfo(instance);
+            if (options.makeObservable === undefined) {
+                options.makeObservable = this.inheritsModelBase;
+            }
+            if (instance[hasConvertedSymbol]) {
+                throw Error("makeObservable() or makeBindable() has been called multiple times on type " + this.objectConstructor.name + ". Make sure this is only called on the last derived type.");
+            }
+            else {
+                instance[hasConvertedSymbol] = true;
+            }
+            return this.modelCreator.convertInstance(instance, options);
+        }
+        return instance;
     };
     NeoTypeInfo.prototype.defineProxyProperty = function (baseType, newConstructor, propertyKey) {
         Object.defineProperty(newConstructor, propertyKey, {
@@ -224,6 +249,22 @@ var NeoTypeInfo = /** @class */ (function () {
             set: function (value) { return baseType[propertyKey] = value; }
         });
     };
+    /**
+     * Makes a class instance observable.
+     * Must be called in the constructor, preferably directly after the super() call.
+     * This method can be used as an alternative to the @NeoModel decorator.
+     */
+    NeoTypeInfo.makeObservable = function (instance, options) {
+        var ctor = instance.constructor;
+        ensureTypeInfo(ctor);
+        ctor.neo.makeObservable(instance, options);
+    };
+    /** Ensures the type and its metadata are initialised. */
+    NeoTypeInfo.ensureInitialised = function (constructor) {
+        var typeInfo = ensureTypeInfo(constructor).neo;
+        typeInfo.ensureInitialised();
+        return typeInfo;
+    };
     return NeoTypeInfo;
 }());
 export { NeoTypeInfo };

package/dist/Model/index.d.ts

@@ -1,10 +1,10 @@
-export { IBindableBase, IModelBase, NeoModelConstructor, PlainObject, PlainTrackedObject, PartialPlainObject, PartialPlainNonTrackedObject, TransformMetaType } from './IModelBase';
+export { IBindableBase, IModelBase, NeoModelConstructor, PlainObject, PlainTrackedObject, PartialPlainObject, PartialPlainNonTrackedObject, TransformMetaType, IMakeBindableOptions } from './IModelBase';
 export { ILookupBase } from './LookupBase';
 export { IPropertyInstance, PropertyAccessor } from './PropertyInstance';
 export { IObservableValue, ObservableValue } from './ObservableValue';
 export { ObservableProperty } from './ObservableProperty';
 export { ISelectedItem } from './Misc';
-export { ModelFieldInfo } from './ModelFieldInfo';
+export { ModelFieldInfo, IModelFieldInfoContainer } from './ModelFieldInfo';
 import * as GraphTraverser from './ModelGraphTraverser';
 export { GraphTraverser };
 export { AuditValues, AuditValuesBase } from './BaseModels/AuditValues';

package/dist/Settings.d.ts

@@ -16,14 +16,16 @@ export declare const Settings: {
         infoIcon: any;
         expanded: any;
         collapsed: any;
+        sortAsc: any;
+        sortDesc: any;
     };
     /** Grid default settings */
     grid: {
-        /** When specified, the default bootstrap table borders (sides and cells) will be added */
+        /** Causes the table to have a border, cells will also have a left and right border. True by default. */
         isBordered: boolean;
         /** When specified, every alternating row will receive a slightly darker background color. */
         isStriped: boolean;
-        /** When specified, the standard bootstrap table borders (sides and cells) will be removed. */
+        /** Removes the default top and bottom borders from rows. */
         isBorderless: boolean;
         /** When specified, a background color will be applied on a row if it is being hovered over. */
         showHover: boolean;

package/dist/Settings.js

@@ -14,15 +14,17 @@ export var Settings = {
         warningIcon: "fa-exclamation-triangle",
         infoIcon: "fa-exclamation-circle",
         expanded: "far-minus-square",
-        collapsed: "far-plus-square"
+        collapsed: "far-plus-square",
+        sortAsc: "sort-up",
+        sortDesc: "sort-down",
     },
     /** Grid default settings */
     grid: {
-        /** When specified, the default bootstrap table borders (sides and cells) will be added */
+        /** Causes the table to have a border, cells will also have a left and right border. True by default. */
         isBordered: true,
         /** When specified, every alternating row will receive a slightly darker background color. */
         isStriped: false,
-        /** When specified, the standard bootstrap table borders (sides and cells) will be removed. */
+        /** Removes the default top and bottom borders from rows. */
         isBorderless: false,
         /** When specified, a background color will be applied on a row if it is being hovered over. */
         showHover: false,

package/dist/Validation/Validators/ModelValidator.js

@@ -1,5 +1,4 @@
 import { __decorate, __metadata } from "tslib";
-import NeoModel from '../../Model/NeoModel';
 import { Observable, Computed } from '../../Model/Decorators';
 import PropertyInstance from '../../Model/PropertyInstance';
 import RuleValidator from './RuleValidator';
@@ -7,6 +6,7 @@ import { ContainerValidationState } from '../ValidationState';
 import PropertyValidator from './PropertyValidator';
 import PropertyInfo from '../../Model/PropertyInfo';
 import ValidationDisplayHelper from '../DisplayHelper';
+import { NeoTypeInfo } from '../../Model/NeoTypeInfo';
 var ModelValidator = /** @class */ (function () {
     function ModelValidator(model, objectRules) {
         var _this = this;
@@ -25,6 +25,7 @@ var ModelValidator = /** @class */ (function () {
                 _this.objectRules.push(new RuleValidator(tempPropertyInstance_1, rule));
             });
         }
+        NeoTypeInfo.makeObservable(this);
     }
     ModelValidator.prototype.addProperty = function (property) {
         this.ruleProperties.push(property);
@@ -128,10 +129,6 @@ var ModelValidator = /** @class */ (function () {
         __metadata("design:type", ContainerValidationState),
         __metadata("design:paramtypes", [])
     ], ModelValidator.prototype, "ruleState", null);
-    ModelValidator = __decorate([
-        NeoModel,
-        __metadata("design:paramtypes", [Object, Array])
-    ], ModelValidator);
     return ModelValidator;
 }());
 export default ModelValidator;

package/dist/Validation/Validators/PropertyValidator.js

@@ -2,14 +2,15 @@ import { __decorate, __metadata } from "tslib";
 import { ContainerValidationState } from '../ValidationState';
 import { ValidationDisplayMode } from '../Misc';
 import { ValidationDisplayInfo } from '../DisplayHelper';
-import NeoModel from '../../Model/NeoModel';
 import { Observable, Computed } from '../../Model/Decorators';
+import { NeoTypeInfo } from '../../Model/NeoTypeInfo';
 var PropertyValidator = /** @class */ (function () {
     function PropertyValidator(propertyInstance, ruleList) {
         this.propertyInstance = propertyInstance;
         this.ruleList = ruleList;
         /** True if an element bound to this property has lost focus. Used for displaying rules. */
         this.hasBlurred = false;
+        NeoTypeInfo.makeObservable(this);
     }
     Object.defineProperty(PropertyValidator.prototype, "ruleState", {
         get: function () {
@@ -58,10 +59,6 @@ var PropertyValidator = /** @class */ (function () {
         __metadata("design:type", ContainerValidationState),
         __metadata("design:paramtypes", [])
     ], PropertyValidator.prototype, "ruleState", null);
-    PropertyValidator = __decorate([
-        NeoModel,
-        __metadata("design:paramtypes", [Object, Array])
-    ], PropertyValidator);
     return PropertyValidator;
 }());
 export default PropertyValidator;

package/dist/Validation/Validators/RuleValidator.js

@@ -1,8 +1,7 @@
 import { __decorate, __metadata } from "tslib";
-import { Rule } from '../Rules';
 import { RuleContext, AsyncStage } from '../RuleContext';
-import NeoModel from '../../Model/NeoModel';
 import { Observable, Computed } from '../../Model/Decorators';
+import { NeoTypeInfo } from '../../Model/NeoTypeInfo';
 var RuleValidator = /** @class */ (function () {
     function RuleValidator(propertyInstance, rule) {
         this.propertyInstance = propertyInstance;
@@ -13,6 +12,7 @@ var RuleValidator = /** @class */ (function () {
         // Properties this rule has been added to, including the primary property.
         this.properties = [];
         this.refreshValue = 0;
+        NeoTypeInfo.makeObservable(this);
     }
     Object.defineProperty(RuleValidator.prototype, "ruleId", {
         get: function () {
@@ -46,10 +46,6 @@ var RuleValidator = /** @class */ (function () {
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], RuleValidator.prototype, "ruleContext", null);
-    RuleValidator = __decorate([
-        NeoModel,
-        __metadata("design:paramtypes", [Object, Rule])
-    ], RuleValidator);
     return RuleValidator;
 }());
 export default RuleValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-core",
-  "version": "0.10.61",
+  "version": "0.10.63",
   "description": "Core functionality for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",