@quatrain/core 1.1.14 → 1.1.16

package/lib/Core.d.ts

@@ -1,6 +1,6 @@
 import { User } from './components/User';
 import { DataObjectClass } from './components/types/DataObjectClass';
-import logger from 'loglevel';
+import { AbstractLoggerAdapter, LogLevel } from '@quatrain/log';
 export declare class Core {
     static me: string;
     static storage: any;
@@ -9,7 +9,10 @@ export declare class Core {
     static classRegistry: {
         [key: string]: any;
     };
-    static logger: logger.RootLogger;
+    static logLevel: LogLevel;
+    static logger: AbstractLoggerAdapter;
+    static addLogger(alias?: string): any;
+    static setLogLevel(level: LogLevel): void;
     static timestamp: () => string;
     static definition(key: string): {
         manifest: {
@@ -27,16 +30,10 @@ export declare class Core {
      * @returns DataObjectClass
      */
     static getDataObjectClass(): DataObjectClass<any>;
-    protected static formatLogMessage: (message: any, prefix?: string) => string;
-    /**
-     * Log message using defined logger
-     * @param message string | object
-     * @param level string
-     */
-    static log(message: any, level?: any): void;
-    static debug(message: any): void;
-    static warn(message: any): void;
-    static info(message: any): void;
-    static error(message: any): void;
-    static trace(message: any): void;
+    static log(...message: any): void;
+    static debug(...message: any): void;
+    static warn(...message: any): void;
+    static info(...message: any): void;
+    static error(...message: any): void;
+    static trace(...message: any): void;
 }

package/lib/Core.js

@@ -8,16 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Core = void 0;
 const DataObject_1 = require("./components/DataObject");
 const User_1 = require("./components/User");
-const loglevel_1 = __importDefault(require("loglevel"));
+const log_1 = require("@quatrain/log");
 class Core {
+    static addLogger(alias = this.name) {
+        return log_1.Log.addLogger('@' + alias, new log_1.DefaultLoggerAdapter(alias, this.logLevel), true);
+    }
+    static setLogLevel(level) {
+        this.logger.logLevel(level);
+    }
     static definition(key) {
         return {
             manifest: {
@@ -56,28 +59,23 @@ class Core {
     static getDataObjectClass() {
         return DataObject_1.DataObject.prototype;
     }
-    /**
-     * Log message using defined logger
-     * @param message string | object
-     * @param level string
-     */
-    static log(message, level = loglevel_1.default.levels.WARN) {
-        _a.logger.log(_a.formatLogMessage(message));
+    static log(...message) {
+        return this.logger.log(message);
     }
-    static debug(message) {
-        _a.logger.debug(_a.formatLogMessage(message));
+    static debug(...message) {
+        return this.logger.debug(message);
     }
-    static warn(message) {
-        _a.logger.warn(_a.formatLogMessage(message));
+    static warn(...message) {
+        return this.logger.warn(message);
     }
-    static info(message) {
-        _a.logger.info(_a.formatLogMessage(message));
+    static info(...message) {
+        return this.logger.info(message);
     }
-    static error(message) {
-        _a.logger.error(_a.formatLogMessage(message));
+    static error(...message) {
+        return this.logger.error(message);
     }
-    static trace(message) {
-        _a.logger.trace(_a.formatLogMessage(message));
+    static trace(...message) {
+        return this.logger.trace(message);
     }
 }
 exports.Core = Core;
@@ -87,7 +85,7 @@ Core.storage = require('node-persist');
 Core.storagePrefix = 'core';
 Core.userClass = User_1.User;
 Core.classRegistry = {};
-Core.logger = loglevel_1.default;
+Core.logLevel = log_1.LogLevel.WARN;
+Core.logger = _a.addLogger();
 // How timestamp are formatted
 Core.timestamp = () => new Date().toISOString();
-Core.formatLogMessage = (message, prefix = _a.me) => `${_a.timestamp()} - [${_a.me}] ${typeof message === 'string' ? message : JSON.stringify(message)}`;

package/lib/components/DataObject.d.ts

@@ -100,7 +100,7 @@ export declare class DataObject implements DataObjectType {
         ref: string;
         uri: string;
     };
-    protected _dataToJSON(objectsAsReferences?: boolean, ignoreUnchanged?: boolean, converters?: {}): {};
+    protected _dataToJSON(objectsAsReferences?: boolean, ignoreUnchanged?: boolean, ignoreNulls?: boolean, converters?: {}): {};
     /**
      * Data object must be created from factory in order for async-loaded data to be available
      * @param className

package/lib/components/DataObject.js

@@ -228,24 +228,27 @@ class DataObject {
         }
     }
     toJSON(params = false) {
-        let objectsAsReferences = false, withoutURIData = false, ignoreUnchanged = false, converters = {};
+        let objectsAsReferences = false, withoutURIData = false, ignoreUnchanged = false, ignoreNulls = false, converters = {};
         if (typeof params === 'object') {
             // Any missing parameter should resolve to false
             objectsAsReferences = Boolean(params.objectsAsReferences);
             withoutURIData = Boolean(params.withoutURIData);
             ignoreUnchanged = Boolean(params.ignoreUnchanged);
+            ignoreNulls = Boolean(params.ignoreNulls);
             converters = params.converters;
         }
         return Object.assign(Object.assign({}, (!withoutURIData &&
-            this.uri && { uid: this.uri.uid, path: this.uri.path })), this._dataToJSON(objectsAsReferences, ignoreUnchanged, converters));
+            this.uri && { uid: this.uri.uid, path: this.uri.path })), this._dataToJSON(objectsAsReferences, ignoreUnchanged, ignoreNulls, converters));
     }
     toReference() {
         return Object.assign(Object.assign({}, this._objectUri.toReference()), { label: this.val('name') || '' });
     }
-    _dataToJSON(objectsAsReferences = false, ignoreUnchanged = false, converters = {}) {
+    _dataToJSON(objectsAsReferences = false, ignoreUnchanged = false, ignoreNulls = false, converters = {}) {
         const data = {};
         Object.keys(this._properties).forEach((key) => {
             const prop = Reflect.get(this._properties, key);
+            if (ignoreNulls && !prop.val())
+                return;
             if (ignoreUnchanged && prop.hasChanged === false)
                 return;
             //   console.log(prop.constructor.name);

package/lib/components/User.d.ts

@@ -7,6 +7,7 @@ export interface UserType extends BaseObjectType {
     birthday?: Date;
     password: string;
     email: string;
+    [x: string]: any;
 }
 export declare const UserProperties: any;
 export declare class User extends BaseObject {

package/lib/components/types/toJSONParams.d.ts

@@ -2,6 +2,7 @@ export type toJSONParams = {
     objectsAsReferences?: boolean;
     withoutURIData?: boolean;
     ignoreUnchanged?: boolean;
+    ignoreNulls?: boolean;
     converters?: {
         [propType: string]: Function;
     };

package/lib/properties/BaseProperty.js

@@ -14,7 +14,10 @@ class BaseProperty {
         this._name = config.name;
         this._protected = config.protected || false;
         this._mandatory = config.mandatory || false;
-        this._defaultValue = config.defaultValue;
+        this._defaultValue =
+            typeof config.defaultValue === 'function'
+                ? config.defaultValue()
+                : config.defaultValue;
         this._value = config.defaultValue;
         this._hasChanged = false;
         this._htmlType = config.htmlType || 'off';

package/lib/properties/types/AbstractPropertyType.d.ts

@@ -3,4 +3,5 @@ export interface AbstractPropertyType {
     name: string;
     id?: string;
     type?: PropertyTypes;
+    defaultValue?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/core",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "Core objects for business apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "^7.6.0",
+    "@quatrain/log": "^0.1.3",
     "loglevel": "^1.9.2",
     "node-persist": "^4.0.3"
   },