@singularsystems/neo-core 1.0.2 → 1.0.4

package/dist/Model/ModelGraphTraverser.d.ts

@@ -4,12 +4,15 @@ import PropertyInfo from './PropertyInfo';
 export declare class RecursionState {
     stop: boolean;
     canRecurse: (model: IModelBase, property: PropertyInfo) => boolean;
+    canRecurseType(item: any): boolean;
     pushState(): void;
     popState(): void;
     /**
      * Overwrites the canRecurse callback to always return true.
      */
     includeNonTrackedProperties(): this;
+    /** Child objects / lists of any type will be included. By default only types extending ModelBase are included. */
+    includeNonModelBaseTypes(): this;
 }
 export declare class BooleanRecursionState extends RecursionState {
     flag: boolean;

package/dist/Model/ModelGraphTraverser.js

@@ -1,10 +1,14 @@
 import { __extends } from "tslib";
 import { RelationType } from './Misc';
+import ModelBase from "./ModelBase";
 var RecursionState = /** @class */ (function () {
     function RecursionState() {
         this.stop = false;
         this.canRecurse = function (model, property) { return !property.noTrack; };
     }
+    RecursionState.prototype.canRecurseType = function (item) {
+        return item instanceof ModelBase;
+    };
     RecursionState.prototype.pushState = function () {
     };
     RecursionState.prototype.popState = function () {
@@ -16,6 +20,11 @@ var RecursionState = /** @class */ (function () {
         this.canRecurse = function (model, property) { return true; };
         return this;
     };
+    /** Child objects / lists of any type will be included. By default only types extending ModelBase are included. */
+    RecursionState.prototype.includeNonModelBaseTypes = function () {
+        this.canRecurseType = function () { return true; };
+        return this;
+    };
     return RecursionState;
 }());
 export { RecursionState };
@@ -67,32 +76,34 @@ function invokeOnSelfAndChildren(model, state, callback, listCallback, relationT
         for (var i = 0; i < ctor.neo.children.length; i++) {
             var cpi = ctor.neo.children[i];
             if (state.canRecurse(model, cpi)) {
-                if (cpi.relationType == RelationType.ChildList) {
-                    // @ts-ignore
-                    var childList = model[cpi.propertyName];
-                    if (listCallback)
-                        listCallback(childList, state);
-                    if (state.stop)
-                        return state;
-                    state.pushState();
-                    invokeOnItemsAndChildren(childList, state, callback, listCallback, RelationType.ChildList);
-                    state.popState();
-                    if (state.stop)
-                        return state;
-                }
-                else {
-                    try {
+                try {
+                    if (cpi.relationType == RelationType.ChildList) {
+                        // @ts-ignore
+                        var childList = model[cpi.propertyName];
+                        if (listCallback)
+                            listCallback(childList, state);
+                        if (state.stop)
+                            return state;
+                        if (childList.length && state.canRecurseType(childList[0])) {
+                            state.pushState();
+                            invokeOnItemsAndChildren(childList, state, callback, listCallback, RelationType.ChildList);
+                            state.popState();
+                            if (state.stop)
+                                return state;
+                        }
+                    }
+                    else {
                         // @ts-ignore
                         var child = model[cpi.propertyName];
-                        if (child) {
+                        if (child && state.canRecurseType(child)) {
                             state.pushState();
                             invokeOnSelfAndChildren(child, state, callback, listCallback, cpi.relationType);
                             state.popState();
                         }
                     }
-                    catch (error) {
-                        throw "Error on property '".concat(cpi.propertyName, "' on type '").concat(model.constructor.name, "': ").concat(error);
-                    }
+                }
+                catch (error) {
+                    throw "Error on property '".concat(cpi.propertyName, "' on type '").concat(model.constructor.name, "': ").concat(error, ".");
                 }
             }
         }

package/dist/Model/NeoTypeInfo.js

@@ -128,8 +128,8 @@ var NeoTypeInfo = /** @class */ (function () {
         if (instance.addBusinessRules !== undefined) {
             var validationRules = new ValidationRules();
             instance.addBusinessRules(validationRules);
-            if (validationRules.rules.some(function (c) { return c instanceof CallbackRule && c.hasBoundFunction; })) {
-                console.error("Warning: ".concat(this.objectConstructor.name, " has rules which have been added using a bound function, or arrow function."));
+            if (validationRules.rules.some(function (c) { return c instanceof CallbackRule && c.hasArrowFunction; })) {
+                console.error("Warning: ".concat(this.objectConstructor.name, " has rules which have been added using an arrow function."));
             }
             var modelProxy = new ModelProxy(instance);
             for (var _i = 0, _a = validationRules.rules; _i < _a.length; _i++) {

package/dist/Settings.d.ts

@@ -75,6 +75,7 @@ export declare const Settings: {
         /** Global allowed extensions. Can be changed on each file upload manager. Must be lower case. */
         allowedExtensions: string[];
         fileEditorButton: IButtonOptions;
+        browseButton: IButtonOptions;
     };
     progressBar: {
         /** True if you want the animation to be reversed globally. */
@@ -86,4 +87,8 @@ export declare const Settings: {
         /** The standard notification duration in seconds. */
         standardDuration: number;
     };
+    alerts: {
+        isOutline: boolean;
+        iconPosition: "left" | "body";
+    };
 };

package/dist/Settings.js

@@ -106,7 +106,8 @@ export var Settings = {
         disallowedFileExtensions: [".exe", ".bat", ".cmd", ".sh", ".com", ".ps", ".ps1", ".dll"],
         /** Global allowed extensions. Can be changed on each file upload manager. Must be lower case. */
         allowedExtensions: [],
-        fileEditorButton: { variant: "dark" }
+        fileEditorButton: { variant: "dark" },
+        browseButton: { variant: "light" },
     },
     progressBar: {
         /** True if you want the animation to be reversed globally. */
@@ -117,5 +118,9 @@ export var Settings = {
     notifications: {
         /** The standard notification duration in seconds. */
         standardDuration: 4
+    },
+    alerts: {
+        isOutline: false,
+        iconPosition: "body",
     }
 };

package/dist/Validation/Rules.d.ts

@@ -57,7 +57,7 @@ export declare abstract class CustomRule<T extends IModelBase> extends Rule impl
 }
 export declare class CallbackRule<T extends IModelBase> extends CustomRule<T> {
     private validateFn;
-    hasBoundFunction: boolean;
+    hasArrowFunction: boolean;
     constructor(validateFn: (context: RuleContext) => void);
     checkRule(propertyInstance: IPropertyInstance, context: RuleContext): void;
 }

package/dist/Validation/Rules.js

@@ -125,14 +125,14 @@ var CallbackRule = /** @class */ (function (_super) {
     function CallbackRule(validateFn) {
         var _this = _super.call(this) || this;
         _this.validateFn = validateFn;
-        _this.hasBoundFunction = false;
-        if (!validateFn.hasOwnProperty("prototype")) {
-            _this.hasBoundFunction = true;
+        _this.hasArrowFunction = false;
+        if (!validateFn.hasOwnProperty("prototype") && !validateFn.name) {
+            _this.hasArrowFunction = true;
         }
         return _this;
     }
     CallbackRule.prototype.checkRule = function (propertyInstance, context) {
-        if (this.hasBoundFunction) {
+        if (this.hasArrowFunction) {
             var reboundFn = this.validateFn.bind(propertyInstance.attachedTo);
             reboundFn(context);
         }

package/dist/Validation/ValidationRules.d.ts

@@ -5,7 +5,7 @@ export declare class ValidationRules<T extends IModelBase> {
     rules: CustomRule<T>[];
     /**
      * Registers a custom rule.
-     * NOTE: Do not use an arrow function: add(context => {}), either pass in the address of a function: add(this.myRule), or pass an anonymous function: add(function(context) {}).
+     * **NOTE: Do not use `.bind(this)`, and do not use an arrow function:**, either pass in the address of a function: add(this.myRule), or pass an anonymous function: add(function(context) {}).
      * @param ruleFunction
      */
     add(ruleFunction: (context: IRuleContext) => void): ICustomRule<T>;

package/dist/Validation/ValidationRules.js

@@ -6,7 +6,7 @@ var ValidationRules = /** @class */ (function () {
     }
     /**
      * Registers a custom rule.
-     * NOTE: Do not use an arrow function: add(context => {}), either pass in the address of a function: add(this.myRule), or pass an anonymous function: add(function(context) {}).
+     * **NOTE: Do not use `.bind(this)`, and do not use an arrow function:**, either pass in the address of a function: add(this.myRule), or pass an anonymous function: add(function(context) {}).
      * @param ruleFunction
      */
     ValidationRules.prototype.add = function (ruleFunction) {

package/package.json

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