@quatrain/core 0.4.1 → 0.4.4

package/lib/Core.d.ts

@@ -7,6 +7,9 @@ export declare type BackendRegistry<T extends AbstractAdapter> = {
 export declare class Core {
     static defaultBackend: string;
     static currentUser: UserClass;
+    static classRegistry: {
+        [key: string]: any;
+    };
     static logger: {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;

package/lib/Core.js

@@ -40,10 +40,11 @@ class Core {
      * @param level string
      */
     static log(message, src = 'Core', level = 'NOTICE') {
-        Core.logger(`[${src}] ${message}`, level);
+        Core.logger(`${Date.now()} - [${src}] ${message}`);
     }
 }
 exports.Core = Core;
 Core.defaultBackend = '@default';
+Core.classRegistry = {};
 Core.logger = console.log;
 Core._backends = {};

package/lib/backends/AbstractAdapter.js

@@ -40,7 +40,7 @@ class AbstractAdapter {
      */
     query(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.find(yield query.obj.daoFactory(), query.filters, query.sortAndLimit);
+            return yield this.find(yield query.obj.daoFactory(), query.filters, query.sortAndLimit);
         });
     }
     log(message) {

package/lib/components/AbstractObject.d.ts

@@ -20,7 +20,7 @@ export declare abstract class AbstractObject {
         ref: string;
         label: string;
     };
-    save(): Promise<DataObjectClass<any>>;
+    save(): Promise<this>;
     delete(): Promise<DataObjectClass<any>>;
     static query(): Query<typeof AbstractObject>;
 }

package/lib/components/AbstractObject.js

@@ -14,7 +14,6 @@ const Query_1 = require("../backends/Query");
 class AbstractObject {
     constructor(dao) {
         this._dataObject = dao;
-        AbstractObject.COLLECTION = this.constructor.name.toLowerCase();
     }
     get(key) {
         return this._dataObject.get(key);
@@ -52,7 +51,8 @@ class AbstractObject {
     }
     save() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this._dataObject.save();
+            yield this._dataObject.save();
+            return this;
         });
     }
     delete() {

package/lib/components/BaseObject.js

@@ -28,13 +28,13 @@ class BaseObject extends AbstractObject_1.AbstractObject {
     static daoFactory(src = undefined, child = this) {
         return __awaiter(this, void 0, void 0, function* () {
             // merge base properties with additional or redefined ones
-            const base = BaseObjectProperties_1.BaseObjectProperties;
+            const base = [...BaseObject.PROPS_DEFINITION];
             // this.PROPS_DEFINITION &&
-            this.PROPS_DEFINITION.forEach((property) => {
+            child.PROPS_DEFINITION.forEach((property) => {
                 // manage parent properties potential redeclaration
                 const found = base.findIndex((el) => el.name === property.name);
                 if (found !== -1) {
-                    base[found] = Object.assign(base[found], property);
+                    base[found] = property;
                 }
                 else {
                     base.push(property);
@@ -66,8 +66,7 @@ class BaseObject extends AbstractObject_1.AbstractObject {
                 return Reflect.construct(this, [dao]);
             }
             catch (err) {
-                console.log(err.message);
-                throw new Error(`Unable to build instance for '${this.constructor.name}': ${err.message}`);
+                throw new Error(`Unable to build instance for '${this.name}': ${err.message}`);
             }
         });
     }

package/lib/components/DataObject.d.ts

@@ -67,7 +67,7 @@ export declare class DataObject implements DataObjectClass<any> {
      * @returns any
      */
     val(key: string): any;
-    toJSON(): {
+    toJSON(objectsAsReferences?: boolean): {
         [x: string]: any;
     };
     toReference(): {
@@ -75,7 +75,7 @@ export declare class DataObject implements DataObjectClass<any> {
         ref: string;
         uri: string;
     };
-    protected _dataToJSON(): {};
+    protected _dataToJSON(objectsAsReferences?: boolean): {};
     read(): Promise<DataObjectClass<any>>;
     save(): Promise<DataObjectClass<any>>;
     delete(): Promise<DataObjectClass<any>>;

package/lib/components/DataObject.js

@@ -159,23 +159,30 @@ class DataObject {
             throw new Error(`Unknown property '${key}'`);
         }
     }
-    toJSON() {
-        return Object.assign(Object.assign({}, (this._uid && { uid: this._uid })), this._dataToJSON());
+    toJSON(objectsAsReferences = false) {
+        return Object.assign(Object.assign({}, (this._uid && { uid: this._uid })), this._dataToJSON(objectsAsReferences));
     }
     toReference() {
         return Object.assign(Object.assign({}, this._objectUri.toReference()), { label: this.val('name') || '' });
     }
-    _dataToJSON() {
+    _dataToJSON(objectsAsReferences = false) {
         const data = {};
         Object.keys(this._properties).forEach((key) => {
             const prop = Reflect.get(this._properties, key);
-            const value = prop.val();
             switch (prop.constructor.name) {
+                case 'CollectionProperty':
+                    // ignore
+                    break;
                 case 'ObjectProperty':
-                    Reflect.set(data, key, value ? value.toJSON() : null);
+                    const value = prop.val();
+                    Reflect.set(data, key, value
+                        ? objectsAsReferences
+                            ? value.toReference()
+                            : value.toJSON()
+                        : null);
                     break;
                 default:
-                    Reflect.set(data, key, value || null);
+                    Reflect.set(data, key, prop.val() || null);
             }
         });
         return data;
@@ -192,12 +199,10 @@ class DataObject {
         });
     }
     save() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const backend = Core_1.Core.getBackend(this.backend || Core_1.Core.defaultBackend);
-            this._persisted = true;
-            this._modified = false;
-            return this.uid ? backend.update(this) : backend.create(this);
-        });
+        const backend = Core_1.Core.getBackend(this.backend || Core_1.Core.defaultBackend);
+        this._persisted = true;
+        this._modified = false;
+        return this.uid ? backend.update(this) : backend.create(this);
     }
     delete() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/components/Entity.d.ts

@@ -1,5 +1,6 @@
 import { BaseObject } from './BaseObject';
 import { EntityClass } from './types/EntityClass';
+export declare const EntityProperties: any;
 export declare class Entity extends BaseObject implements EntityClass {
     static PROPS_DEFINITION: any;
     static factory(src?: any): Promise<Entity>;

package/lib/components/Entity.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,9 +32,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Entity = void 0;
+exports.Entity = exports.EntityProperties = void 0;
 const BaseObject_1 = require("./BaseObject");
-const EntityProperties_1 = require("./EntityProperties");
+const CollectionProperty_1 = require("../properties/CollectionProperty");
+const StringProperty_1 = require("../properties/StringProperty");
+const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
+exports.EntityProperties = [
+    {
+        // surcharge property minLength and htmlType
+        name: 'name',
+        type: StringProperty_1.StringProperty.TYPE,
+        mandatory: true,
+        minLength: 1,
+        htmlType: htmlType.ORG,
+    },
+    {
+        name: 'users',
+        mandatory: true,
+        type: CollectionProperty_1.CollectionProperty.TYPE,
+        instanceOf: 'User',
+        parentKey: 'entity',
+    },
+];
 class Entity extends BaseObject_1.BaseObject {
     static factory(src = undefined) {
         const _super = Object.create(null, {
@@ -23,4 +65,4 @@ class Entity extends BaseObject_1.BaseObject {
     }
 }
 exports.Entity = Entity;
-Entity.PROPS_DEFINITION = EntityProperties_1.EntityProperties;
+Entity.PROPS_DEFINITION = exports.EntityProperties;

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

@@ -19,5 +19,5 @@ export interface DataObjectClass<T extends DataObjectClass<any>> {
     delete(): Promise<T>;
     clone(data?: any): Promise<T>;
     toReference(): any;
-    toJSON(): any;
+    toJSON(objectsAsReferences?: boolean): any;
 }

package/lib/properties/CollectionProperty.js

@@ -19,7 +19,13 @@ class CollectionProperty extends BaseProperty_1.BaseProperty {
         super(config);
         this._value = undefined;
         this._filters = undefined;
-        this._instanceOf = config.instanceOf;
+        if (!config.instanceOf) {
+            throw new Error('Parameter instanceOf is mandatory');
+        }
+        this._instanceOf =
+            typeof config.instanceOf === 'string'
+                ? Core_1.Core.classRegistry[config.instanceOf]
+                : config.instanceOf;
         this._backend = config.backend
             ? Core_1.Core.getBackend(config.backend)
             : undefined;

package/lib/properties/ObjectProperty.js

@@ -19,9 +19,10 @@ class ObjectProperty extends BaseProperty_1.BaseProperty {
         return super.set(value);
     }
     toJSON() {
-        return this._value && this._value.dataObject
+        return this._value &&
+            (this._value.dataObject || this._value instanceof DataObject_1.DataObject)
             ? this._value.dataObject.toReference()
-            : undefined;
+            : null;
     }
 }
 exports.ObjectProperty = ObjectProperty;

package/lib/utils/DataGenerator.js

@@ -33,6 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataGenerator = void 0;
+const Core_1 = require("../Core");
 const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
 const faker_1 = require("@faker-js/faker");
 /**
@@ -44,8 +45,9 @@ const faker_1 = require("@faker-js/faker");
  */
 const DataGenerator = (model, qty = 5, forcedValues = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const promises = [];
+    Core_1.Core.log(`Starting to create ${qty} ${model.constructor.name} records`);
     for (let i = 0; i < qty; i++) {
-        const dao = yield model.dataObject.clone(model.dataObject.toJSON());
+        const dao = yield model.dataObject.clone(); //model.dataObject.toJSON())
         Object.keys(dao.properties).forEach((key) => {
             const property = dao.get(key);
             if (forcedValues[key]) {
@@ -91,8 +93,9 @@ const DataGenerator = (model, qty = 5, forcedValues = {}) => __awaiter(void 0, v
                     break;
             }
         });
-        promises.push(dao.save());
+        yield dao.save();
+        promises.push(dao);
     }
-    return Promise.all(promises);
+    return promises;
 });
 exports.DataGenerator = DataGenerator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/core",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Core objects for business apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/lib/components/EntityProperties.d.ts

@@ -1 +0,0 @@
-export declare const EntityProperties: any;

package/lib/components/EntityProperties.js

@@ -1,47 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityProperties = void 0;
-const properties_1 = require("../properties");
-const StringProperty_1 = require("../properties/StringProperty");
-const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
-const User_1 = require("./User");
-exports.EntityProperties = [
-    {
-        // surcharge property minLength and htmlType
-        name: 'name',
-        type: StringProperty_1.StringProperty.TYPE,
-        mandatory: true,
-        minLength: 1,
-        htmlType: htmlType.ORG,
-    },
-    {
-        name: 'users',
-        mandatory: true,
-        type: properties_1.CollectionProperty.TYPE,
-        instanceOf: User_1.User,
-        parentKey: 'entity',
-    },
-];